From dc26569e3b2c4495947ac1e47ee5a6e7df44dfe9 Mon Sep 17 00:00:00 2001
From: breadcat
Date: Wed, 2 Oct 2013 21:24:59 +0100
Subject: Merge functions with main

Only contained a single function
---
 ahk-assistant.ahk | 38 ++++++++++++++++++++++++++++++++++----
 functions.ahk     | 32 --------------------------------
 2 files changed, 34 insertions(+), 36 deletions(-)
 delete mode 100644 functions.ahk

diff --git a/ahk-assistant.ahk b/ahk-assistant.ahk
index 44aa6d2..09f47db 100644
--- a/ahk-assistant.ahk
+++ b/ahk-assistant.ahk
@@ -81,6 +81,9 @@ Capslock::Backspace
 XButton1::Send {Click 2} ;double click
 XButton2::Send {MButton} ;wheel click
 
+;application specific hotkeys
+#Include, %A_ScriptDir%\appspecific.ahk ;too many to include in index, deserves separating
+
 
 ;auto replace text with symbols
 ::(c)::©
@@ -183,10 +186,37 @@ Return
 #Numpad8::Shift("T")
 #Numpad9::Shift("TR")
 
-
-;includes
-#Include, %A_ScriptDir%\appspecific.ahk ;too many to include in index, deserves separating
-#Include, %A_ScriptDir%\functions.ahk ;functions don't belong in index
+Shift(Pos)
+{
+  WinGetClass, class, A
+  IfInString , shell_TrayWnd,Progman,Button,DV2ControlHost, %class%
+  Return
+  IfWinExist,ahk_class Shell_TrayWnd
+    SysGet, m, MonitorWorkArea
+    Else SysGet, m, Monitor
+      WinGetPos, MWT_X, MWT_Y, MWT_W, MWT_H, A
+      SendMessage, 0x1F,,,, A
+      WinGet, MWT_active, MinMax, A
+    if (MWT_active = 1)
+      WinRestore, A
+    If (Pos = "T")
+      WinMove, A,, 0, 0, mRight, mBottom/2
+    If (Pos = "B")
+      WinMove, A,, 0, mBottom/2, mRight, mBottom/2
+    If (Pos = "L")
+      WinMove, A,, 0, 0, mRight/2, mBottom
+    If (Pos = "R")
+      WinMove, A,, mRight/2, 0, mRight/2, mBottom
+    If (Pos = "TL")
+      WinMove, A,, 0, 0, mRight/2, mBottom/2
+    If (Pos = "TR")
+      WinMove, A,, mRight/2, 0, mRight/2, mBottom/2
+    If (Pos = "BR")
+      WinMove, A,, mRight/2, mBottom/2, mRight/2, mBottom/2
+    If (Pos = "BL")
+      WinMove, A,, 0, mBottom/2, mRight/2, mBottom/2
+}
+Return
 
 
 ;auto-reload on change
diff --git a/functions.ahk b/functions.ahk
deleted file mode 100644
index cf438c2..0000000
--- a/functions.ahk
+++ /dev/null
@@ -1,32 +0,0 @@
-
-Shift(Pos)
-{
-  WinGetClass, class, A
-  IfInString , shell_TrayWnd,Progman,Button,DV2ControlHost, %class%
-  Return
-  IfWinExist,ahk_class Shell_TrayWnd
-    SysGet, m, MonitorWorkArea
-    Else SysGet, m, Monitor
-      WinGetPos, MWT_X, MWT_Y, MWT_W, MWT_H, A
-      SendMessage, 0x1F,,,, A
-      WinGet, MWT_active, MinMax, A
-    if (MWT_active = 1)
-      WinRestore, A
-    If (Pos = "T")
-      WinMove, A,, 0, 0, mRight, mBottom/2
-    If (Pos = "B")
-      WinMove, A,, 0, mBottom/2, mRight, mBottom/2
-    If (Pos = "L")
-      WinMove, A,, 0, 0, mRight/2, mBottom
-    If (Pos = "R")
-      WinMove, A,, mRight/2, 0, mRight/2, mBottom
-    If (Pos = "TL")
-      WinMove, A,, 0, 0, mRight/2, mBottom/2
-    If (Pos = "TR")
-      WinMove, A,, mRight/2, 0, mRight/2, mBottom/2
-    If (Pos = "BR")
-      WinMove, A,, mRight/2, mBottom/2, mRight/2, mBottom/2
-    If (Pos = "BL")
-      WinMove, A,, 0, mBottom/2, mRight/2, mBottom/2
-}
-Return
-- 
cgit v1.2.3