From 10462b21c85e43ad2129bc2005068fe1fa763b51 Mon Sep 17 00:00:00 2001
From: martin_r <martin_r@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Wed, 27 Aug 2008 01:23:34 +0000
Subject: =?UTF-8?q?DeadCompose=20implementiert,=20uncomp=E2=80=A6-Methoden?=
 =?UTF-8?q?=20gel=C3=B6scht,=20=C2=BBreturn=200=C2=AB-Zeilen=20entfernt=20?=
 =?UTF-8?q?(wird=20sowieso=20gemacht).=20checkComp=20ausgebessert:=20?=
 =?UTF-8?q?=C2=BBglobal=C2=AB=20hatte=20gefehlt.=20(Damit=20wurde=20?=
 =?UTF-8?q?=E2=80=BA=EF=AC=85=E2=80=B9(=C5=BFt-Ligatur)=20erm=C3=B6glicht?=
 =?UTF-8?q?=20(war=20defekt)).=20ahkTreiberKombi=20rausgeschmissen=20(war?=
 =?UTF-8?q?=20f=C3=BCr=20den=20gel=C3=B6schten=20msklc-Treiber=20gedacht).?=
 =?UTF-8?q?=20Massenweise=20Formatierungen=20normalisiert.=20Zus=C3=A4tzli?=
 =?UTF-8?q?che=20Compose-Aktivierung=20=C3=BCber=20Mod3+Mod3.=20Einhand-?=
 =?UTF-8?q?=20und=20Lernmodus=20wiederhergestellt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@810 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/autohotkey/Source/Methods-Layers.ahk | 103 ++++++++++++---------------
 1 file changed, 45 insertions(+), 58 deletions(-)

(limited to 'windows/autohotkey/Source/Methods-Layers.ahk')

diff --git a/windows/autohotkey/Source/Methods-Layers.ahk b/windows/autohotkey/Source/Methods-Layers.ahk
index ef12e58..fe93848 100644
--- a/windows/autohotkey/Source/Methods-Layers.ahk
+++ b/windows/autohotkey/Source/Methods-Layers.ahk
@@ -11,15 +11,11 @@
 isMod2Locked = 0
 VKA1SC136 & VKA0SC02A:: ; RShift, dann LShift
 VKA0SC02A & VKA1SC136:: ; LShift, dann RShift
-  if (GetKeyState("VKA1SC136", "P") and GetKeyState("VKA0SC02A", "P"))
-  {
-    if isMod2Locked
-    {
+  if (GetKeyState("VKA1SC136", "P") and GetKeyState("VKA0SC02A", "P")) {
+    if isMod2Locked {
       isMod2Locked = 0
       KeyboardLED(4,"off")
-    }
-    else
-    {
+    } else {
       isMod2Locked = 1
       KeyBoardLED(4,"on")
     }
@@ -29,6 +25,10 @@ return
 ;Mod3-Tasten (Wichtig, sie werden sonst nicht verarbeitet!)
 *VKBFSC02B:: ; #
 *VK14SC03A:: ; CapsLock
+  if (GetKeyState("VKBFSC02B", "P") and GetKeyState("VK14SC03A", "P")) {
+    DeadKey := "comp"
+    CompKey := ""
+  }
 return
 
 ;Mod4+Mod4 == Mod4-Lock
@@ -40,18 +40,14 @@ return
 IsMod4Locked := 0
 *VKA5SC138::
 *VKE2SC056::
-  if (GetKeyState("VKA5SC138", "P") and GetKeyState("VKE2SC056", "P"))
-  {
-    if IsMod4Locked
-    {
+  if (GetKeyState("VKA5SC138", "P") and GetKeyState("VKE2SC056", "P")) {
+    if IsMod4Locked {
       if zeigeLockBox
         MsgBox Mod4-Feststellung aufgebehoben!
        IsMod4Locked = 0
       if UseMod4Light
         KeyboardLED(1,"off")
-    }
-    else
-    {
+    } else {
       if zeigeLockBox
         MsgBox Mod4 festgestellt: Um Mod4 wieder zu lösen, drücke beide Mod4-Tasten gleichzeitig!
       IsMod4Locked = 1
@@ -61,8 +57,7 @@ IsMod4Locked := 0
   }
 return
 
-EbeneAktualisieren()
-{
+EbeneAktualisieren() {
   global
   PriorDeadKey := DeadKey
   PriorCompKey := CompKey
@@ -71,35 +66,25 @@ EbeneAktualisieren()
   Modstate := IsMod4Pressed() . IsMod3Pressed() . IsShiftPressed()
   Ebene7 := 0
   Ebene8 := 0
-  if ahkTreiberKombi
-    if ( Modstate = "001")
-      Ebene = 6
-    else
-      Ebene = -1
-  else
-    if      (Modstate = "000") ; Ebene 1: Ohne Mod
-      Ebene = 1
-    else if (Modstate = "001") ; Ebene 2: Shift
-      Ebene = 2
-    else if (Modstate = "010") ; Ebene 3: Mod3
-      Ebene = 3
-    else if (Modstate = "100") ; Ebene 4: Mod4
-      Ebene = 4
-    else if (Modstate = "011") ; Ebene 5: Shift+Mod3
-      Ebene = 5
-    else if (Modstate = "110") ; Ebene 6: Mod3+Mod4
-      Ebene = 6
-    else if (Modstate = "101") ; Ebene 7: Shift+Mod4 impliziert Ebene 4
-    {
-      Ebene = 4
-      Ebene7 = 1
-    }
-    else if (Modstate = "111") ; Ebene 8: Shift+Mod3+Mod4 impliziert Ebene 6
-    {
-      Ebene = 6
-      Ebene8 = 1
-    }
-  Ebene12 := ((Ebene = 1) or (Ebene = 2))
+  if      (Modstate = "000") ; Ebene 1: Ohne Mod
+    Ebene = 1
+  else if (Modstate = "001") ; Ebene 2: Shift
+    Ebene = 2
+  else if (Modstate = "010") ; Ebene 3: Mod3
+    Ebene = 3
+  else if (Modstate = "100") ; Ebene 4: Mod4
+    Ebene = 4
+  else if (Modstate = "011") ; Ebene 5: Shift+Mod3
+    Ebene = 5
+  else if (Modstate = "110") ; Ebene 6: Mod3+Mod4
+    Ebene = 6
+  else if (Modstate = "101") { ; Ebene 7: Shift+Mod4 impliziert Ebene 4
+    Ebene = 4
+    Ebene7 = 1
+  } else if (Modstate = "111") { ; Ebene 8: Shift+Mod3+Mod4 impliziert Ebene 6
+    Ebene = 6
+    Ebene8 = 1
+  } Ebene12 := ((Ebene = 1) or (Ebene = 2))
   Ebene14 := ((Ebene = 1) or (Ebene = 4))
   NumLock := GetKeyState("NumLock","T")
 }
@@ -107,6 +92,8 @@ EbeneAktualisieren()
 IsShiftPressed()
 {
   global
+  if striktesMod2Lock
+    noCaps = 0
   if GetKeyState("Shift","P")
     if isMod2Locked and !noCaps
       return 0
@@ -122,21 +109,21 @@ IsShiftPressed()
 
 IsMod3Pressed()
 {
-   global
-   return ((GetKeyState("CapsLock","P")) or (GetKeyState("#","P")))
+  global
+  return (GetKeyState("VKBFSC02B","P") or GetKeyState("VK14SC03A","P"))
 }
 
 IsMod4Pressed()
 {
-   global
-   if( not(einHandNeo) or not(spacepressed))
-     if IsMod4Locked
-         return (not ( GetKeyState("<","P") or GetKeyState("SC138","P")))
-     else
-         return ( GetKeyState("<","P") or GetKeyState("SC138","P"))
-   else
-     if IsMod4Lock
-       return (not ( GetKeyState("<","P") or GetKeyState("SC138","P") or GetKeyState("ä","P")))
-     else
-       return ( GetKeyState("<","P") or GetKeyState("SC138","P") or GetKeyState("ä","P"))
+  global
+  if !(einHandNeo) or !(spacepressed)
+    if IsMod4Locked
+      return !(GetKeyState("<","P") or GetKeyState("SC138","P"))
+    else
+      return (GetKeyState("<","P") or GetKeyState("SC138","P"))
+  else
+    if IsMod4Locked
+      return !(GetKeyState("<","P") or GetKeyState("SC138","P") or GetKeyState("ä","P"))
+    else
+      return (GetKeyState("<","P") or GetKeyState("SC138","P") or GetKeyState("ä","P"))
 }
-- 
cgit v1.2.3