From 891e56d24c190ea73d692f4df3f7ec4fb0e6eab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=B6si?= <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Mon, 3 Nov 2008 11:49:57 +0000
Subject: [PATCH] Modularisierung weiter vorangetrieben

git-svn-id: https://svn.neo-layout.org@1093 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/Make-Build.bat               |  2 +-
 windows/neo-vars/keydefinitions.ahk           |  2 ++
 windows/neo-vars/neo20-all.ahk                | 24 +++++++++++++++++
 windows/neo-vars/recycle.ahk                  |  2 ++
 .../{neo20-vars.ahk => varsfunctions.ahk}     | 26 -------------------
 5 files changed, 29 insertions(+), 27 deletions(-)
 create mode 100644 windows/neo-vars/neo20-all.ahk
 rename windows/neo-vars/{neo20-vars.ahk => varsfunctions.ahk} (93%)

diff --git a/windows/neo-vars/Make-Build.bat b/windows/neo-vars/Make-Build.bat
index 9024562..abd32fa 100644
--- a/windows/neo-vars/Make-Build.bat
+++ b/windows/neo-vars/Make-Build.bat
@@ -40,7 +40,7 @@ echo removing old version(s) of NEO AHK Exe file
 del %srcdir%\neo20-r*.exe 2> nul
 
 echo Compiling the new Driver using Autohotkey
-"%Ahk2Exe%" /in "neo20-vars.ahk" /out "%fn%.exe" /icon "%srcdir%\neo.ico"
+"%Ahk2Exe%" /in "neo20-all.ahk" /out "%fn%.exe" /icon "%srcdir%\neo.ico"
 
 echo Driver Update complete! You can now close this log-window.
 pause
\ No newline at end of file
diff --git a/windows/neo-vars/keydefinitions.ahk b/windows/neo-vars/keydefinitions.ahk
index c1cc6d0..cfc8821 100644
--- a/windows/neo-vars/keydefinitions.ahk
+++ b/windows/neo-vars/keydefinitions.ahk
@@ -118,3 +118,5 @@ EDN(pos1,pos2,caps,e1,e2,e3,e4,e5,e6) {
 ED1(pos,e1) {
  ED(pos,0,e1,e1,e1,e1,e1,e1)
 }
+
+Comp := ""
diff --git a/windows/neo-vars/neo20-all.ahk b/windows/neo-vars/neo20-all.ahk
new file mode 100644
index 0000000..def45a0
--- /dev/null
+++ b/windows/neo-vars/neo20-all.ahk
@@ -0,0 +1,24 @@
+; Revision Information
+#Include %a_scriptdir%\_subwcrev.ahk
+
+; die Compose-Definitionen
+#Include %a_scriptdir%\en_us.ahk
+#Include %a_scriptdir%\neocomp.ahk
+#Include %a_scriptdir%\neovarscomp.ahk
+
+; Hier liegt die Tastaturbelegung
+#Include %a_scriptdir%\keydefinitions.ahk
+
+; Shortcuts, um die Zeichen wieder sauber zur Applikation bringen zu können
+#Include %a_scriptdir%\shortcuts.ahk
+
+; Good-old AHK-Skripts, enthalten die ersten Key-Hooks für Mod-Tasten
+; Achtung: Hinter dem ersten Keyboard-Hook werden keine globalen Variablen
+; mehr gesetzt!
+#Include %a_scriptdir%\recycle.ahk
+
+; Normale Keyboard-Hooks
+#Include %a_scriptdir%\keyhooks.ahk
+
+; Das Herz von neo20.ahk: die Tasten- und Zeichen-Behandlungsroutinen
+#Include %a_scriptdir%\varsfunctions.ahk
diff --git a/windows/neo-vars/recycle.ahk b/windows/neo-vars/recycle.ahk
index ea732f7..78989dc 100644
--- a/windows/neo-vars/recycle.ahk
+++ b/windows/neo-vars/recycle.ahk
@@ -3,6 +3,8 @@
 *******************
 */
 
+#MaxThreadsPerHotKey 4
+
 EbeneAktualisieren()
 SetBatchLines -1
 SetCapsLockState Off
diff --git a/windows/neo-vars/neo20-vars.ahk b/windows/neo-vars/varsfunctions.ahk
similarity index 93%
rename from windows/neo-vars/neo20-vars.ahk
rename to windows/neo-vars/varsfunctions.ahk
index 5225856..4ea6229 100644
--- a/windows/neo-vars/neo20-vars.ahk
+++ b/windows/neo-vars/varsfunctions.ahk
@@ -1,29 +1,3 @@
-#MaxThreadsPerHotKey 4
-
-; Revision Information
-#Include %a_scriptdir%\_subwcrev.ahk
-
-; die Compose-Definitionen
-#Include %a_scriptdir%\en_us.ahk
-#Include %a_scriptdir%\neocomp.ahk
-#Include %a_scriptdir%\neovarscomp.ahk
-
-Comp := ""
-
-; Hier liegt die Tastaturbelegung
-#Include %a_scriptdir%\keydefinitions.ahk
-
-; Shortcuts, um die Zeichen wieder sauber zur Applikation bringen zu können
-#Include %a_scriptdir%\shortcuts.ahk
-
-; Good-old AHK-Skripts, enthalten die ersten Key-Hooks für Mod-Tasten
-; Achtung: Hinter dem ersten Keyboard-Hook werden keine globalen Variablen
-; mehr gesetzt!
-#Include %a_scriptdir%\recycle.ahk
-
-; Normale Keyboard-Hooks
-#Include %a_scriptdir%\keyhooks.ahk
-
 AllStar(This_HotKey) {
   global
   PhysKey := This_HotKey