diff options
Diffstat (limited to 'windows/neo-vars/src')
-rw-r--r-- | windows/neo-vars/src/source/keyhooks.ahk | 10 | ||||
-rw-r--r-- | windows/neo-vars/src/source/levelfunctions.ahk | 2 | ||||
-rw-r--r-- | windows/neo-vars/src/source/screenkeyboard.ahk | 11 | ||||
-rw-r--r-- | windows/neo-vars/src/source/screenkeyboard_new.ahk | 49 | ||||
-rw-r--r-- | windows/neo-vars/src/source/varsfunctions.ahk | 2 |
5 files changed, 57 insertions, 17 deletions
diff --git a/windows/neo-vars/src/source/keyhooks.ahk b/windows/neo-vars/src/source/keyhooks.ahk index b5b3505..ff4d71b 100644 --- a/windows/neo-vars/src/source/keyhooks.ahk +++ b/windows/neo-vars/src/source/keyhooks.ahk @@ -12,3 +12,13 @@ return allstarhook:
AllStar(A_ThisHotkey)
return
+
+; Ein paar andere Hooks kommen hier auch noch. GUIs springen hier her, wenn
+; sich bei ihnen etwas auf die entsprechende Art tut.
+
+GuiClose:
+ if (GuiCurrent!="")
+ %GuiCurrent%OnClose()
+ else
+ Gui, Destroy
+return
diff --git a/windows/neo-vars/src/source/levelfunctions.ahk b/windows/neo-vars/src/source/levelfunctions.ahk index 129c95a..c7150dc 100644 --- a/windows/neo-vars/src/source/levelfunctions.ahk +++ b/windows/neo-vars/src/source/levelfunctions.ahk @@ -28,7 +28,7 @@ NEOEbeneAktualisieren() { else
BSTSwitch(EbeneNC)
}
- if (BSTNguiErstellt)
+ if (useBSTN)
BSTNUpdate()
}
diff --git a/windows/neo-vars/src/source/screenkeyboard.ahk b/windows/neo-vars/src/source/screenkeyboard.ahk index 7033e10..b4e2199 100644 --- a/windows/neo-vars/src/source/screenkeyboard.ahk +++ b/windows/neo-vars/src/source/screenkeyboard.ahk @@ -32,10 +32,20 @@ BSTSwitch(Eb) { }
}
+BSTOnClose() {
+ global
+ if (BSTguiErstellt) {
+ BSTguiErstellt := 0
+ GuiCurrent := ""
+ Gui, Destroy
+ }
+}
+
BSTToggle() {
global
if (BSTguiErstellt) {
BSTguiErstellt := 0
+ GuiCurrent := ""
Gui, Destroy
} else {
SysGet, WorkArea, MonitorWorkArea
@@ -55,6 +65,7 @@ BSTToggle() { BSTguiErstellt := 1
BSTSwitch(EbeneNC)
BSTalwaysOnTop := 1
+ GuiCurrent := "BST"
}
}
diff --git a/windows/neo-vars/src/source/screenkeyboard_new.ahk b/windows/neo-vars/src/source/screenkeyboard_new.ahk index ab3a85b..e29e877 100644 --- a/windows/neo-vars/src/source/screenkeyboard_new.ahk +++ b/windows/neo-vars/src/source/screenkeyboard_new.ahk @@ -3,8 +3,6 @@ BSTNguiErstellt := 0 BSTNalwaysOnTop := 1 -CP3F2 := "P_BSTNt"
-
UnZipLocalFile := ResourceFolder . "\unzip.exe"
UnZipSourceLink := "http://stahlworks.com/dev/unzip.exe" @@ -88,13 +86,31 @@ GuiAddKey(key,x,y) { GuiKeyList := GuiKeyList . key . "," } -BSTNToggle() {
+CharProc_BSTNt() { global - if (BSTNguiErstellt) {
- BSTNguiErstellt := 0
+ ; Bildschirmtastatur togglen
+ useBSTN := !(useBSTN)
+ if (useBSTN)
+ CharProc_BSTN1()
+ else
+ CharProc_BSTN0()
+}
+ +BSTNOnClose() { + global + useBSTN := 0 + CharProc_BSTN0() +} + +CharProc_BSTN0() { + global + GuiCurrent := "" Gui, Destroy DllCall( "GDI32.DLL\RemoveFontResourceEx", Str, UniFontLocalFile ,UInt,(FR_PRIVATE:=0x10), Int,0) - } else {
+} + +CharProc_BSTN1() { + global if (FileExist(ResourceFolder)!="") { FileInstall,ebene0.png,%ResourceFolder%\ebene0.png,1 } @@ -209,13 +225,11 @@ BSTNToggle() { GuiAddKeySN("052",601,168) GuiAddKeySN("053",658,168) -
Gui, +AlwaysOnTop +ToolWindow Gui, Show, y%yposition% w776 h200 NoActivate, NEO-Bildschirmtastatur (neu!) - BSTNguiErstellt := 1
BSTNUpdate() BSTNalwaysOnTop := 1 - }
+ GuiCurrent := "BSTN" } BSTNToggleAlwaysOnTop() { @@ -229,12 +243,6 @@ BSTNToggleAlwaysOnTop() { } } -CharProc_BSTNt() {
- global
- ; Bildschirmtastatur Ein/Aus
- BSTNToggle()
-}
-
CharProc_BSTNA() { global ; Bildschirmtastatur AlwaysOnTop @@ -339,4 +347,15 @@ BSTNSymbols() { GUISYM("U00202F",">⍽<") } +BSTNRegister() { + global + + CP3F2 := "P_BSTNt" BSTNSymbols() + + IniRead,useBSTN,%ini%,Global,useBSTN,0 + if (useBSTN) + CharProc_BSTN1() +} + +BSTNRegister() diff --git a/windows/neo-vars/src/source/varsfunctions.ahk b/windows/neo-vars/src/source/varsfunctions.ahk index 0532a64..5d05505 100644 --- a/windows/neo-vars/src/source/varsfunctions.ahk +++ b/windows/neo-vars/src/source/varsfunctions.ahk @@ -124,7 +124,7 @@ rerun: CharOutUp(PR%PhysKey%)
PR%PhysKey% := ""
}
- if (BSTNguiErstellt)
+ if (useBSTN)
BSTNUpdate()
}
|