From 1e69d2dffc2103a08674cf2ec3469b01e7ee4231 Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Tue, 11 Nov 2008 14:25:16 +0000
Subject: • EbeneAktualisieren() wurde verschoben, dabei aber den
 CapsLock-Ebenen-Wechsel zwischen unterschiedlichen Tasten verhaut. Gefixt. •
 CapsLock-Funktion für Einhand-Modus als Ebene5+Tab, d.h. Mod2+Mod3+Space+ß
 implementiert.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1164 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 windows/neo-vars/src/Source/keydefinitions.ahk |  2 +-
 windows/neo-vars/src/Source/recycle.ahk        | 21 ++++++++++-----------
 windows/neo-vars/src/Source/varsfunctions.ahk  |  6 ++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/windows/neo-vars/src/Source/keydefinitions.ahk b/windows/neo-vars/src/Source/keydefinitions.ahk
index d5f008b..37c9c44 100644
--- a/windows/neo-vars/src/Source/keydefinitions.ahk
+++ b/windows/neo-vars/src/Source/keydefinitions.ahk
@@ -75,7 +75,7 @@ EDN("VK6ESC053","VK2ESC053",0,"SNDot","U002E","U002C","SNDel","U2032","U2033") ;
 ; other chars
 ED("space",0,"U0020","U0020","U0020","SN__0","U00A0","U202F")
 ED("esc"  ,0,"U001B","U001B","U001B","PRlod","U001B","U001B")
-ED("tab"  ,0,"U0009","U0009","SComp","U0009","U0009","U0009")
+ED("tab"  ,0,"U0009","U0009","SComp","U0009","PM2LT","U0009")
 ED("F9"   ,0,"S__F9","S__F9",""     ,"P_LMt",""     ,"")
 ED("F10"  ,0,"S_F10","S_F10",""     ,"P_EHt",""     ,"")
 ED("F11"  ,0,"S_F11","S_F11",""     ,"PLnSt",""     ,"")
diff --git a/windows/neo-vars/src/Source/recycle.ahk b/windows/neo-vars/src/Source/recycle.ahk
index ea9c894..3f41385 100644
--- a/windows/neo-vars/src/Source/recycle.ahk
+++ b/windows/neo-vars/src/Source/recycle.ahk
@@ -195,37 +195,36 @@ lernModus_neo_Entf := 1
 
 
 
-EbeneAktualisieren()
-{
+EbeneAktualisieren() {
   global
   Modstate := IsMod4Active() . IsMod3Active()
   Ebene7 := 0
   Ebene8 := 0
   if        (Modstate == "00") { ; Ebene 1 oder 2
     if (IsShiftActive())         ; Ebene 2: Shift oder CapsLock
-      Ebene := 2
+      EbeneC := 2
     else                         ; Ebene 1: Ohne Mod oder CapsLock mit Shift
-      Ebene := 1
+      EbeneC := 1
     if (IsShiftPressed)          ; NC: Ebene 2: Shift (ignoriert CapsLock)
       EbeneNC := 2
     else                         ; NC: Ebene 1: Ohne Mod (ignoriert CapsLock)
       EbeneNC := 1
   } else if (Modstate == "01") { ; Ebene 3 oder 5 (ignoriert CapsLock)
     if (IsShiftPressed)          ; Ebene 5: Shift+Mod3
-      Ebene := 5
+      EbeneC := 5
     else                         ; Ebene 3: Mod3
-      Ebene := 3
-    EbeneNC := Ebene             ; NC: gleich
+      EbeneC := 3
+    EbeneNC := EbeneC            ; NC: gleich
   } else if (Modstate == "10") { ; Ebene 4 (Mit Shift: Auch Ebene 7) (ignoriert CapsLock)
-    Ebene := 4
+    EbeneC := 4
     if (IsShiftPressed)          ; Ebene 7: Shift+Mod4
       Ebene7 := 1
-    EbeneNC := Ebene             ; NC: gleich
+    EbeneNC := EbeneC            ; NC: gleich
   } else if (ModState == "11") { ; Ebene 6 (Mit Shift Xoder CapsLock: Auch Ebene 8)
-    Ebene := 6
+    EbeneC := 6
     if (IsShiftPressed)          ; Ebene 8: Shift (ignoriert CapsLock)
       Ebene8 := 1
-    EbeneNC := Ebene             ; NC: gleich
+    EbeneNC := EbeneC            ; NC: gleich
   }
 }
 
diff --git a/windows/neo-vars/src/Source/varsfunctions.ahk b/windows/neo-vars/src/Source/varsfunctions.ahk
index 0a11968..743b71e 100644
--- a/windows/neo-vars/src/Source/varsfunctions.ahk
+++ b/windows/neo-vars/src/Source/varsfunctions.ahk
@@ -13,6 +13,8 @@ AllStar(This_HotKey) {
   ActKey := TransformKey(PhysKey)
   if ((striktesMod2Lock == 0) && (NOC%ActKey% == 1))
     Ebene := EbeneNC
+  else
+    Ebene := EbeneC
   if (Ebene7 and (CP7%ActKey% != ""))
     Char := CP7%ActKey%
   else if (Ebene8 and (CP8%ActKey% != ""))
@@ -383,6 +385,10 @@ CharProc(subroutine) {
     ED1("right"    ,"SRght")
     CP4VK57SC011 := "U0008"
     CP4VK52SC013 := "S_Del"
+  } else if (subroutine == "M2LT") {
+    ; Mod2Lock Toggle
+    ToggleMod2Lock()
+    EbeneAktualisieren()
   }
 }
 
-- 
cgit v1.2.3