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

7 files changed, 38 insertions, 46 deletions

diff --git a/windows/autohotkey/Changelog-and-Todo.txt b/windows/autohotkey/Changelog-and-Todo.txt
index 282523e..15d83a2 100644
--- a/windows/autohotkey/Changelog-and-Todo.txt
+++ b/windows/autohotkey/Changelog-and-Todo.txt
@@ -23,12 +23,14 @@ Matthias Wächter <matthias (at) waechter.wiz. a t>
 

 === Änderungshistorie ===

 

+Revision 849 (von Martin Roppelt)

+‐ Ticket 31: Shift+(Strg und/oder Alt)+Ziffer sendet nicht mehr (Strg und/oder Alt)+(Ebene 2 der Ziffer).

 Revision 846 (von Martin Roppelt)

-- 233/1802 Cokos.

+‐ 233/1802 Cokos.

 Revision 845 (von Martin Roppelt)

 ‐ Alle Cokos in die Compose.ahk migriert (Stand: 200/1805 Cokos).

 Revision 842 (von Martin Roppelt)

-‐ Ebenen 5 + 6 der Taste ›I‹ wiederhergestellt (Klammern vergessen).

+‐ Ebenen 5+6 der Taste ›I‹ wiederhergestellt (Klammern vergessen).

 Revision 841 (von Martin Roppelt)

 ‐ Ebenen 2‐6 der 1er-Taste wiederhergestellt (Klammern vergessen).

 Revision 840 (von Martin Roppelt)

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

   }

diff --git a/windows/autohotkey/neo20.ahk b/windows/autohotkey/neo20.ahk
index c085c12..b6c83e6 100644
--- a/windows/autohotkey/neo20.ahk
+++ b/windows/autohotkey/neo20.ahk
@@ -445,7 +445,6 @@ EbeneAktualisieren() {
   DeadKey := ""

   CompKey := ""

   Modstate := IsMod4Pressed() . IsMod3Pressed() . IsShiftPressed()

-  noCaps := 0

   Ebene7 := 0

   Ebene8 := 0

   if      (Modstate = "000") ; Ebene 1: Ohne Mod

@@ -468,24 +467,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()

@@ -528,7 +527,7 @@ IsMod4Pressed()
   else {

     keypressed := 1

     goto %gespiegelt_7%

-  } 

+  }

 *VK38SC009::

   if !einHandNeo or !spacepressed

     goto neo_8

@@ -1032,8 +1031,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)

@@ -2219,17 +2218,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

   }

diff --git a/windows/autohotkey/neo20.exe b/windows/autohotkey/neo20.exe
index b8be0f5..7ace056 100644
--- a/windows/autohotkey/neo20.exe
+++ b/windows/autohotkey/neo20.exe