summaryrefslogtreecommitdiffstats
path: root/windows/neo-vars
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--windows/neo-vars/src/source/initialize.ahk1
-rw-r--r--windows/neo-vars/src/source/keydefinitions.ahk8
-rw-r--r--windows/neo-vars/src/source/keyhooks.ahk50
-rw-r--r--windows/neo-vars/src/source/resources.ahk22
-rw-r--r--windows/neo-vars/src/source/screenkeyboard.ahk7
-rw-r--r--windows/neo-vars/src/source/shortcuts.ahk8
-rw-r--r--windows/neo-vars/src/source/tray.ahk3
-rw-r--r--windows/neo-vars/src/source/trayfunctions.ahk6
-rw-r--r--windows/neo-vars/src/source/varsfunctions.ahk17
9 files changed, 86 insertions, 36 deletions
diff --git a/windows/neo-vars/src/source/initialize.ahk b/windows/neo-vars/src/source/initialize.ahk
index 48cecd5..fd2fce9 100644
--- a/windows/neo-vars/src/source/initialize.ahk
+++ b/windows/neo-vars/src/source/initialize.ahk
@@ -42,7 +42,6 @@ ApplicationFolder = %WindowsEnvAppDataFolder%\NEO2
FileCreateDir, %ApplicationFolder%
ini = %ApplicationFolder%\NEO2.ini
-bildschirmTastaturEinbinden := 1
IniRead,einHandNeo,%ini%,Global,einHandNeo,0
IniRead,lernModus,%ini%,Global,lernModus,0
IniRead,zeigeLockBox,%ini%,Global,zeigeLockBox,1
diff --git a/windows/neo-vars/src/source/keydefinitions.ahk b/windows/neo-vars/src/source/keydefinitions.ahk
index 050e896..5b1c23c 100644
--- a/windows/neo-vars/src/source/keydefinitions.ahk
+++ b/windows/neo-vars/src/source/keydefinitions.ahk
@@ -76,6 +76,14 @@ EDN("VK6ESC053","VK2ESC053",0,"SNDot","U002E","U002C","SNDel","U2032","U2033") ;
ED("space",0,"U0020","U0020","U0020","SN__0","U00A0","U202F")
ED("esc" ,0,"U001B","U001B","U001B","PRlod","U001B","U001B")
ED("tab" ,0,"U0009","U0009","SComp","U0009","PM2LT","U0009")
+ED("F1" ,0,"S__F1","S__F1","" ,"PBSTt","" ,"")
+ED("F2" ,0,"S__F2","S__F2","" ,"" ,"" ,"")
+ED("F3" ,0,"S__F3","S__F3","" ,"" ,"" ,"")
+ED("F4" ,0,"S__F4","S__F4","" ,"" ,"" ,"")
+ED("F5" ,0,"S__F5","S__F5","" ,"" ,"" ,"")
+ED("F6" ,0,"S__F6","S__F6","" ,"" ,"" ,"")
+ED("F7" ,0,"S__F7","S__F7","" ,"" ,"" ,"")
+ED("F8" ,0,"S__F8","S__F8","" ,"" ,"" ,"")
ED("F9" ,0,"S__F9","S__F9","" ,"P_LMt","" ,"")
ED("F10" ,0,"S_F10","S_F10","" ,"P_EHt","" ,"")
ED("F11" ,0,"S_F11","S_F11","" ,"PLnSt","" ,"")
diff --git a/windows/neo-vars/src/source/keyhooks.ahk b/windows/neo-vars/src/source/keyhooks.ahk
index c3707e4..9def2b8 100644
--- a/windows/neo-vars/src/source/keyhooks.ahk
+++ b/windows/neo-vars/src/source/keyhooks.ahk
@@ -1,3 +1,7 @@
+; Wir müssen F24 nicht hooken, aber bei einem Restart hat AHK den Bug,
+; dass manchmal der erste Hook ausgeführt wird, als wäre diese Taste
+; gedrückt worden. Da F24 auf den wenigsten Tastaturen vorkommt und daher für
+; NEO uninteressant ist, kehren wir einfach wieder zurück.
~F24::return
+pause::
@@ -105,6 +109,22 @@ return
;;;;;; DOWN EVENTS
+
+; Funktionstasten
+
+F1::
+F2::
+F3::
+F4::
+F5::
+F6::
+F7::
+F8::
+F9::
+F10::
+F11::
+F12::
+
; Reihe 1
*VKDCSC029:: ; Zirkumflex
@@ -194,6 +214,9 @@ return
*VK2DSC052:: ; NumPadIns
*VK6ESC053:: ; NumPadDot
*VK2ESC053:: ; NumPadDel
+
+; Navigation, Sonstiges
+
tab::
esc::
*enter::
@@ -208,13 +231,25 @@ esc::
*down::
*left::
*right::
-F9::
-F10::
-F11::
-F12::
numpadenter::
;;;;;; UP EVENTS
+
+; Funktionstasten
+
+F1 up::
+F2 up::
+F3 up::
+F4 up::
+F5 up::
+F6 up::
+F7 up::
+F8 up::
+F9 up::
+F10 up::
+F11 up::
+F12 up::
+
; Reihe 1
*VKDCSC029 up:: ; Zirkumflex
@@ -304,6 +339,9 @@ numpadenter::
*VK2DSC052 up:: ; NumPadIns
*VK6ESC053 up:: ; NumPadDot
*VK2ESC053 up:: ; NumPadDel
+
+; Navigation, Sonstiges
+
tab up::
esc up::
*enter up::
@@ -318,10 +356,6 @@ esc up::
*down up::
*left up::
*right up::
-F9 up::
-F10 up::
-F11 up::
-F12 up::
numpadenter up::
AllStar(A_ThisHotkey)
diff --git a/windows/neo-vars/src/source/resources.ahk b/windows/neo-vars/src/source/resources.ahk
index 56a8736..c921fe5 100644
--- a/windows/neo-vars/src/source/resources.ahk
+++ b/windows/neo-vars/src/source/resources.ahk
@@ -5,20 +5,12 @@ FileCreateDir, %ResourceFolder%
if (FileExist("ResourceFolder")<>false) {
FileInstall,neo_enabled.ico,%ResourceFolder%\neo_enabled.ico,1
FileInstall,neo_disabled.ico,%ResourceFolder%\neo_disabled.ico,1
- iconBenutzen=1
- if (bildschirmTastaturEinbinden=1) {
- FileInstall,ebene1.png,%ResourceFolder%\ebene1.png,1
- FileInstall,ebene2.png,%ResourceFolder%\ebene2.png,1
- FileInstall,ebene3.png,%ResourceFolder%\ebene3.png,1
- FileInstall,ebene4.png,%ResourceFolder%\ebene4.png,1
- FileInstall,ebene5.png,%ResourceFolder%\ebene5.png,1
- FileInstall,ebene6.png,%ResourceFolder%\ebene6.png,1
- FileInstall,deadkeys.png,%ResourceFolder%\deadkeys.png,1
- zeigeBildschirmTastatur := 1
- }
+ FileInstall,ebene1.png,%ResourceFolder%\ebene1.png,1
+ FileInstall,ebene2.png,%ResourceFolder%\ebene2.png,1
+ FileInstall,ebene3.png,%ResourceFolder%\ebene3.png,1
+ FileInstall,ebene4.png,%ResourceFolder%\ebene4.png,1
+ FileInstall,ebene5.png,%ResourceFolder%\ebene5.png,1
+ FileInstall,ebene6.png,%ResourceFolder%\ebene6.png,1
+ FileInstall,deadkeys.png,%ResourceFolder%\deadkeys.png,1
}
-if(FileExist("ebene1.png")&&FileExist("ebene2.png")&&FileExist("ebene3.png")&&FileExist("ebene4.png")&&FileExist("ebene5.png")&&FileExist("ebene6.png"))
- zeigeBildschirmTastatur=1
-if(FileExist("neo_enabled.ico")&&FileExist("neo_disabled.ico"))
- iconBenutzen=1
diff --git a/windows/neo-vars/src/source/screenkeyboard.ahk b/windows/neo-vars/src/source/screenkeyboard.ahk
index 8258a90..0bbf70c 100644
--- a/windows/neo-vars/src/source/screenkeyboard.ahk
+++ b/windows/neo-vars/src/source/screenkeyboard.ahk
@@ -25,11 +25,6 @@ BSTToggle() {
Gui, Show, y%yposition% Autosize
BSTEbeneAlt := 1
guiErstellt := 1
+ BSTSwitch(EbeneC)
}
}
-
-F1::
- if(isMod4Active() && zeigeBildschirmTastatur)
- BSTToggle()
- else send {blind}{F1}
-return
diff --git a/windows/neo-vars/src/source/shortcuts.ahk b/windows/neo-vars/src/source/shortcuts.ahk
index f8656bd..35ba2c3 100644
--- a/windows/neo-vars/src/source/shortcuts.ahk
+++ b/windows/neo-vars/src/source/shortcuts.ahk
@@ -98,6 +98,14 @@ CSSPgUp := "PgUp"
CSSPgDn := "PgDn"
CSSHome := "Home"
CSS_End := "End"
+CSS_F1 := "F1"
+CSS_F2 := "F2"
+CSS_F3 := "F3"
+CSS_F4 := "F4"
+CSS_F5 := "F5"
+CSS_F6 := "F6"
+CSS_F7 := "F7"
+CSS_F8 := "F8"
CSS_F9 := "F9"
CSS_F10 := "F10"
CSS_F11 := "F11"
diff --git a/windows/neo-vars/src/source/tray.ahk b/windows/neo-vars/src/source/tray.ahk
index 536641f..db9186c 100644
--- a/windows/neo-vars/src/source/tray.ahk
+++ b/windows/neo-vars/src/source/tray.ahk
@@ -1,5 +1,4 @@
-if (iconBenutzen)
- menu,tray,icon,%ResourceFolder%\neo_enabled.ico,,1
+menu,tray,icon,%ResourceFolder%\neo_enabled.ico,,1
menu,tray,nostandard
menu,tray,add,Öffnen,open
menu,helpmenu,add,About,about
diff --git a/windows/neo-vars/src/source/trayfunctions.ahk b/windows/neo-vars/src/source/trayfunctions.ahk
index ea48481..fabf55c 100644
--- a/windows/neo-vars/src/source/trayfunctions.ahk
+++ b/windows/neo-vars/src/source/trayfunctions.ahk
@@ -2,14 +2,12 @@ togglesuspend:
if A_IsSuspended {
menu, tray, rename, %enable%, %disable%
menu, tray, tip, %name%
- if (iconBenutzen)
- menu, tray, icon, %ResourceFolder%\neo_enabled.ico,,1
+ menu, tray, icon, %ResourceFolder%\neo_enabled.ico,,1
suspend , off ; Schaltet Suspend aus -> NEO
} else {
menu, tray, rename, %disable%, %enable%
menu, tray, tip, %name% : Deaktiviert
- if (iconBenutzen)
- menu, tray, icon, %ResourceFolder%\neo_disabled.ico,,1
+ menu, tray, icon, %ResourceFolder%\neo_disabled.ico,,1
suspend , on ; Schaltet Suspend ein -> QWERTZ
}
return
diff --git a/windows/neo-vars/src/source/varsfunctions.ahk b/windows/neo-vars/src/source/varsfunctions.ahk
index 4fe1195..e0fded9 100644
--- a/windows/neo-vars/src/source/varsfunctions.ahk
+++ b/windows/neo-vars/src/source/varsfunctions.ahk
@@ -268,6 +268,13 @@ CharProc(subroutine) {
}
} else if (subroutine == "_EH1") {
; Einhand-NEO aktivieren
+ ; Funktionstasten
+ TKEH_F7 := "F6" ; F7 -> F6
+ TKEH_F8 := "F5" ; F8 -> F5
+ TKEH_F9 := "F4" ; F9 -> F4
+ TKEH_F10 := "F3" ; F10 -> F3
+ TKEH_F11 := "F2" ; F11 -> F2
+ TKEH_F12 := "F1" ; F12 -> F1
; Reihe 1
TKEH_VK37SC008 := "VK36SC007" ; 7 -> 6
TKEH_VK38SC009 := "VK35SC006" ; 8 -> 5
@@ -300,6 +307,13 @@ CharProc(subroutine) {
ED("EHSpace",0,"U0020","U0020","U0020","SN__0","U00A0","U202F")
} else if (subroutine == "_EH0") {
; Einhand-NEO deaktivieren
+ ; Funktionstasten
+ TKEH_F7 := "" ; F7
+ TKEH_F8 := "" ; F8
+ TKEH_F9 := "" ; F9
+ TKEH_F10 := "" ; F10
+ TKEH_F11 := "" ; F11
+ TKEH_F12 := "" ; F12
; Reihe 1
TKEH_VK37SC008 := "" ; 7
TKEH_VK38SC009 := "" ; 8
@@ -402,6 +416,9 @@ CharProc(subroutine) {
; Mod2Lock Toggle
ToggleMod2Lock()
EbeneAktualisieren()
+ } else if (subroutine == "BSTt") {
+ ; Bildschirmtastatur Ein/Aus
+ BSTToggle()
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:48:17 +0000