summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--windows/neo-vars/neo20-vars.ahk14
-rw-r--r--windows/neo-vars/recycle.ahk8
2 files changed, 10 insertions, 12 deletions
diff --git a/windows/neo-vars/neo20-vars.ahk b/windows/neo-vars/neo20-vars.ahk
index 568bebd..ce5b917 100644
--- a/windows/neo-vars/neo20-vars.ahk
+++ b/windows/neo-vars/neo20-vars.ahk
@@ -33,7 +33,7 @@ AllStar(This_HotKey) {
} else
IsDown := 1
ActKey := PhysKey ; das könnte später für eine Transformation benutzt werden
- if (NOC%ActKey% == 1) {
+ if ((striktesMod2Lock == 0) && (NOC%ActKey% == 1)) {
Ebene := EbeneC
Ebene7 := Ebene7C
Ebene8 := Ebene8C
@@ -124,12 +124,12 @@ CharOut(char) {
global
if (DNCS%char% != "") {
seq := DNCS%char% . UPCS%char%
- if (GetKeyState("Shift","P") and (isMod2Locked or (char == "U00B4")))
+ if (isShiftPressed and (isMod2Locked or (char == "U00B4")))
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else if (CS%char% != "") {
seq := "{" . CS%char% . "}"
- if (GetKeyState("Shift","P") and (isMod2Locked or (char == "U20AC")))
+ if (isShiftPressed and (isMod2Locked or (char == "U20AC")))
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else
@@ -140,13 +140,13 @@ CharOutDown(char) {
global
if (DNCS%char% != "") {
seq := DNCS%char%
- if (GetKeyState("Shift","P") and (isMod2Locked or (char == "U00B4")))
+ if (isShiftPressed and (isMod2Locked or (char == "U00B4")))
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else if (CS%char% != "") {
seq := CS%char%
seq := "{". seq . " down}"
- if (GetKeyState("Shift","P") and (isMod2Locked or (char == "U20AC")))
+ if (isShiftPressed and (isMod2Locked or (char == "U20AC")))
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else
@@ -157,13 +157,13 @@ CharOutUp(char) {
global
if (DNCS%char% != "") {
seq := UPCS%char%
- if GetKeyState("Shift","P") and isMod2Locked
+ if (isShiftPressed and isMod2Locked)
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else if (CS%char% != "") {
seq := CS%char%
seq := "{". seq . " up}"
- if (GetKeyState("Shift","P") and (isMod2Locked or (char == "U20AC")))
+ if (isShiftPressed and (isMod2Locked or (char == "U20AC")))
seq := "{Shift Up}" . seq . "{Shift Down}"
send % "{blind}" . seq
} else
diff --git a/windows/neo-vars/recycle.ahk b/windows/neo-vars/recycle.ahk
index e35ac23..81737e6 100644
--- a/windows/neo-vars/recycle.ahk
+++ b/windows/neo-vars/recycle.ahk
@@ -68,11 +68,9 @@ IniRead,isVM,%ini%,Global,isVM,0
if (isVM)
CharProc("_VM1")
-; Sollen tote Tasten blind angezeigt werden?
-IniRead,DeadCompose,%ini%,Global,DeadCompose,0
-
-;Sollen Compose-Tasten blind angezeigt werden?
-IniRead,DeadSilence,%ini%,Global,DeadSilence,0
+;Soll der Mod2Lock auch auf die Akzente, die Ziffernreihe und das Numpad angewandt werden?
+; Wird striktesMod2Lock auf 1 gesetzt, wirkt CapsLock wie ShiftLock
+IniRead,striktesMod2Lock,%ini%,Global,striktesMod2Lock,0
/***********************