From 34c441881dc8396330834ab919a00ee9d2bd540c Mon Sep 17 00:00:00 2001
From: martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Mon, 8 Sep 2008 16:54:00 +0000
Subject: 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
---
 windows/autohotkey/Source/Keys-Neo.ahk          |  4 ++--
 windows/autohotkey/Source/Keys-Qwert-to-Neo.ahk |  2 +-
 windows/autohotkey/Source/Methods-Layers.ahk    | 25 ++++++++++++-------------
 windows/autohotkey/Source/Methods-Other.ahk     |  8 ++------
 4 files changed, 17 insertions(+), 22 deletions(-)

(limited to 'windows/autohotkey/Source')

diff --git a/windows/autohotkey/Source/Keys-Neo.ahk b/windows/autohotkey/Source/Keys-Neo.ahk
index 1c31877..85d5876 100644
--- a/windows/autohotkey/Source/Keys-Neo.ahk
+++ b/windows/autohotkey/Source/Keys-Neo.ahk
@@ -283,8 +283,8 @@ neo_c:
     OutputChar12("c","C")
   else if (Ebene = 3)
     send {blind}]
-  else if (Ebene = 4) and (not(lernModus) or lernModus_neo_Entf)
-      Send {blind}{Del}
+  else if (Ebene = 4) and (!lernModus or lernModus_neo_Entf)
+    send {blind}{Del}
   else if (Ebene = 5)
     SendUnicodeChar(0x03C7) ; chi
   else if (Ebene = 6)
diff --git a/windows/autohotkey/Source/Keys-Qwert-to-Neo.ahk b/windows/autohotkey/Source/Keys-Qwert-to-Neo.ahk
index 904778b..1abd9dd 100644
--- a/windows/autohotkey/Source/Keys-Qwert-to-Neo.ahk
+++ b/windows/autohotkey/Source/Keys-Qwert-to-Neo.ahk
@@ -18,7 +18,7 @@
   else {
     keypressed := 1
     goto %gespiegelt_7%
-  } 
+  }
 *VK38SC009::
   if !einHandNeo or !spacepressed
     goto neo_8
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()
diff --git a/windows/autohotkey/Source/Methods-Other.ahk b/windows/autohotkey/Source/Methods-Other.ahk
index c3ed1b8..fbbcad5 100644
--- a/windows/autohotkey/Source/Methods-Other.ahk
+++ b/windows/autohotkey/Source/Methods-Other.ahk
@@ -196,17 +196,13 @@ CheckComp(d) {
     if (CompKey = "")
       return 1
     else CompKey =
-  }
-  else
-  if PriorCompKey {
+  } else if PriorCompKey {
     PriorCompKey := CompKey := PriorCompKey . "_" . d
     CheckCompose()
     if CompKey
       isFurtherCompKey = 1
     return 1
-  }
-  else
-  if (PriorDeadKey = "comp") {
+  } else if (PriorDeadKey = "comp") {
     CompKey := d
     return 1
   }
-- 
cgit v1.2.3