BST: Aufteilung in physische Taste (GuiPhysKey) und emulierte Taste für Einhand-Neo

git-svn-id: https://svn.neo-layout.org@2183 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 26 insertions, 4 deletions

diff --git a/windows/neo-vars/src/source/einhandneo.ahk b/windows/neo-vars/src/source/einhandneo.ahk
index a8761d2..1434793 100644
--- a/windows/neo-vars/src/source/einhandneo.ahk
+++ b/windows/neo-vars/src/source/einhandneo.ahk
@@ -61,8 +61,11 @@ CharProc___EH1() {
   TKEH_VKBDSC035 := "VK59SC02C" ; j -> ü

   ; Modify Space

   ED1("space","P__EHSd")

+  GUISYM("P__EHSd","EH")

   ED("EHSpace",0,"U000020","U000020","U000020","S__N__0","U0000A0","U00202F")

-  TransformProc := "Einhand"

+

+  TransformProc     := "Einhand"

+  TransformBSTNProc := "Einhand"

 }

 

 CharProc___EH0() {

@@ -103,7 +106,10 @@ CharProc___EH0() {
   TKEH_VKBESC034 := "" ; .

   TKEH_VKBDSC035 := "" ; j

   ED("space",0,"U000020","U000020","U000020","S__N__0","U0000A0","U00202F")

-  TransformProc := ""

+  GUISYM("P__EHSd","")

+

+  TransformProc     := ""

+  TransformBSTNProc := ""

 }

 

 CharProc__EHSd() {

@@ -111,6 +117,8 @@ CharProc__EHSd() {
   ; Space im Einhandmodus gedrückt

   EHSpacePressed := 1

   PRspace := "P__EHSu"

+  if (useBSTN)

+    BSTNUpdate()

 }

 

 CharProc__EHSu() {

@@ -122,6 +130,8 @@ CharProc__EHSu() {
   }

   EHKeyPressed := 0

   EHSpacePressed := 0

+  if (useBSTN)

+    BSTNUpdate()

 }

 

 CharProc__M2LT() {

@@ -139,3 +149,11 @@ TransformEinhand(PhysKey) {
   }

   return PhysKey

 }

+

+TransformBSTNEinhand(PhysKey) {

+  global

+  if (EHSpacePressed and (TKEH_%PhysKey% != "")) {

+    return TKEH_%PhysKey%

+  }

+  return PhysKey

+}

diff --git a/windows/neo-vars/src/source/screenkeyboard_new.ahk b/windows/neo-vars/src/source/screenkeyboard_new.ahk
index bf10573..a386c02 100644
--- a/windows/neo-vars/src/source/screenkeyboard_new.ahk
+++ b/windows/neo-vars/src/source/screenkeyboard_new.ahk
@@ -35,10 +35,14 @@ BSTNUpdate() {
           }

         } else

           GuiEb := EbeneC

+        if (TransformBSTNProc != "")

+          GuiVirtKey := TransformBSTN%TransformBSTNProc%(GuiPhysKey)

+        else

+          GuiVirtKey := GuiPhysKey

 	CurrentComp := Comp

         GuiComp := ""

 rerun_bstnupdate:

-        GuiComp1 := CurrentComp . CP%GuiEb%%GuiPhysKey%

+        GuiComp1 := CurrentComp . CP%GuiEb%%GuiVirtKey%

         if (GSYM%GuiComp1% != "") {

           GuiComp .= GSYM%GuiComp1%

         } else if (CD%GuiComp1% != "") {

@@ -46,7 +50,7 @@ rerun_bstnupdate:
         } else if (CM%GuiComp1% == 1) {

           GuiComp .= "U00002AU00002A"

         } else if (CF%CurrentComp% != "") {

-	  if (IM%GuiPhysKey% != 1)

+	  if (IM%GuiVirtKey% != 1)

             GuiComp .= CF%CurrentComp%

 	  CurrentComp := ""

           goto rerun_bstnupdate