summaryrefslogtreecommitdiffstats
path: root/windows/autohotkey/Source/Methods-Layers.ahk
diff options
context:
space:
mode:
authormartin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2008-09-08 16:54:00 +0000
committermartin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>2008-09-08 16:54:00 +0000
commit34c441881dc8396330834ab919a00ee9d2bd540c (patch)
tree859c9dba609bb3b59c802e7635db6053a10a89da /windows/autohotkey/Source/Methods-Layers.ahk
parentde5de233864a70e4bd3896b0b5a96efc2928a78c (diff)
Ticket 31: ahk: Shift+(Strg und/oder Alt)+Ziffer sendet nicht mehr (Strg und/oder Alt)+(Ebene 2 der Ziffer).
git-svn-id: https://svn.neo-layout.org@849 b9310e46-f624-0410-8ea1-cfbb3a30dc96
Diffstat (limited to '')
-rw-r--r--windows/autohotkey/Source/Methods-Layers.ahk25
1 files changed, 12 insertions, 13 deletions
diff --git a/windows/autohotkey/Source/Methods-Layers.ahk b/windows/autohotkey/Source/Methods-Layers.ahk
index 3138516..171fc8b 100644
--- a/windows/autohotkey/Source/Methods-Layers.ahk
+++ b/windows/autohotkey/Source/Methods-Layers.ahk
@@ -65,7 +65,6 @@ EbeneAktualisieren() {
DeadKey := ""
CompKey := ""
Modstate := IsMod4Pressed() . IsMod3Pressed() . IsShiftPressed()
- noCaps := 0
Ebene7 := 0
Ebene8 := 0
if (Modstate = "000") ; Ebene 1: Ohne Mod
@@ -88,24 +87,24 @@ EbeneAktualisieren() {
Ebene8 = 1
} Ebene12 := ((Ebene = 1) or (Ebene = 2))
Ebene14 := ((Ebene = 1) or (Ebene = 4))
- NumLock := GetKeyState("NumLock","T")
+ NumLock := GetKeyState("NumLock", "T")
+ noCaps := 0
}
IsShiftPressed()
{
global
- if striktesMod2Lock
- noCaps = 0
- if GetKeyState("Shift","P")
- if isMod2Locked and !noCaps
- return 0
- else
+ if !(NoCaps and GetKeyState("Shift", "P") and (GetKeyState("Alt", "P") or GetKeyState("Strg", "P"))) {
+ if striktesMod2Lock
+ noCaps = 0
+ if GetKeyState("Shift","P")
+ if isMod2Locked and !noCaps
+ return 0
+ else return 1
+ else if isMod2Locked and !noCaps
return 1
- else
- if isMod2Locked and !noCaps
- return 1
- else
- return 0
+ else return 0
+ }
}
IsMod3Pressed()