From e56572d0ba2eccd2e99d1d0c8058a24c322780d3 Mon Sep 17 00:00:00 2001
From: mösi <mösi@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Fri, 7 Nov 2008 10:47:34 +0000
Subject: ticket#7: fixed. Jeder Nicht-Modifier-Tastendruck wird registriert
 und verhindert darauffolgendes Aktivieren des CapsLock mit dem überlappenden
 Drücken des anderen Shift.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'windows/neo-vars')

diff --git a/windows/neo-vars/src/Source/recycle.ahk b/windows/neo-vars/src/Source/recycle.ahk
index 14a0655..15034b6 100644
--- a/windows/neo-vars/src/Source/recycle.ahk
+++ b/windows/neo-vars/src/Source/recycle.ahk
@@ -157,6 +157,7 @@ Sonstige Variablen
 */
 guiErstellt := 0
 alwaysOnTop := 1
+wasNonShiftKeyPressed := 0
 isShiftRPressed := 0
 isShiftLPressed := 0
 isShiftPressed := 0
@@ -528,10 +529,11 @@ return
 ; das schaltet, oh Wunder, die LED nicht wieder aus.
 
 ~*VKA1SC136::
-  if (isShiftLPressed and !isShiftRPressed)
+  if (isShiftLPressed and !isShiftRPressed and !wasNonShiftKeyPressed)
     ToggleMod2Lock()
   isShiftRPressed := 1
   isShiftPressed := 1
+  wasNonShiftKeyPressed := 0
   EbeneAktualisieren()
 return
 
@@ -542,10 +544,11 @@ return
 return
 
 ~*VKA0SC02A::
-  if (isShiftRPressed and !isShiftLPressed)
+  if (isShiftRPressed and !isShiftLPressed and !wasNonShiftKeyPressed)
     ToggleMod2Lock()
   isShiftLPressed := 1
   isShiftPressed := 1
+  wasNonShiftKeyPressed := 0
   EbeneAktualisieren()
 return
 
diff --git a/windows/neo-vars/src/Source/varsfunctions.ahk b/windows/neo-vars/src/Source/varsfunctions.ahk
index 58d1f38..079a333 100644
--- a/windows/neo-vars/src/Source/varsfunctions.ahk
+++ b/windows/neo-vars/src/Source/varsfunctions.ahk
@@ -30,6 +30,7 @@ AllStar(This_HotKey) {
 
 CharStarDown(PhysKey, ActKey, char) {
   global
+  wasNonShiftKeyPressed := 1
   if (PP%PhysKey% != "")
     CompNew := PP%PhysKey%           ; Von Tastaturwiederholung
   else
-- 
cgit v1.2.3