Changeset 1658

Timestamp:

02/13/09 18:40:01 (4 years ago)

Author:

mösi

Message:

WieMitNeo wird jetzt in einer modalen MessageBox ausgegeben, die mehr Platz erzaubt als ein TrayTip (laut AHK-Dokumentation max. 255 Zeichen). Sollte aber auf GUI geändert werden.
Jede Compose-Sequenz wird zwei mal ausgegeben: Einmal als Zeichensequenz, das andere Mal als Tastensequenz.

Location:

windows/neo-vars/src/source

Files:

• keydefinitions.ahk (modified) (2 diffs)
• shortcuts.ahk (modified) (1 diff)
• tools.ahk (modified) (3 diffs)

windows/neo-vars/src/source/keydefinitions.ahk

@@ -111 +111 @@
 ED1("VKA5SC138","PM4RD") ; Mod4R (AltGr)
 
+SetKeyPos(pos,char) {
+  global
+  current := %pos%
+  if (current != "")
+    StringReplace,CRK%current%,CRK%current%,% " " . pos . " ",% " "
+  if (SubStr(CRK%char%,0) != " ")
+    CRK%char% .= " "
+  CRK%char% .= pos . " "
+  %pos% := char
+}
+
 ED(pos,caps,e1,e2,e3,e4,e5,e6,e7="",e8="") {
   global
@@ -119 +130 @@
       UNSH%e1% := 1 ; unshift wenn caps lock + Shift?
   }
-  CP1%pos% := e1
-  CP2%pos% := e2
-  CP3%pos% := e3
-  CP4%pos% := e4
-  CP5%pos% := e5
-  CP6%pos% := e6
-  CP7%pos% := e7
-  CP8%pos% := e8
-  if (e1 != "")
-    CRK%e1% .= " " . e1
-  if (e2 != "")
-    CRK%e2% .= " S__M2" . e1
-  if (e3 != "")
-    CRK%e3% .= " S__M3" . e1
-  if (e4 != "")
-    CRK%e4% .= " S__M4" . e1
-  if (e5 != "")
-    CRK%e5% .= " S__M5" . e1
-  if (e6 != "")
-    CRK%e6% .= " S__M6" . e1
-  if (e7 != "")
-    CRK%e7% .= " S__M7" . e1
-  if (e8 != "")
-    CRK%e8% .= " S__M8" . e1
+  SetKeyPos("CP1" . pos,e1)
+  SetKeyPos("CP2" . pos,e2)
+  SetKeyPos("CP3" . pos,e3)
+  SetKeyPos("CP4" . pos,e4)
+  SetKeyPos("CP5" . pos,e5)
+  SetKeyPos("CP6" . pos,e6)
+  SetKeyPos("CP7" . pos,e7)
+  SetKeyPos("CP8" . pos,e8)
 }
 

windows/neo-vars/src/source/shortcuts.ahk

@@ -227 +227 @@
   Jetzt noch ein paar Versch�nerungsabk�rzungen
 */
-CBS__M2 := "(Shift)+"
-CBS__M3 := "(Mod3)+"
-CBS__M4 := "(Mod4)+"
-CBS__M5 := "(Mod5=Shift+Mod3)+"
-CBS__M6 := "(Mod6=Mod3+Mod4)+"
-CBS__M7 := "(Mod7=Shift+Mod4)+"
-CBS__M8 := "(Mod8=Shift+Mod3+Mod4)+"
+CBS__M2 := "Shift+"
+CBS__M3 := "Mod3+"
+CBS__M4 := "Mod4+"
+CBS__M5 := "Mod5=Shift+Mod3+"
+CBS__M6 := "Mod6=Mod3+Mod4+"
+CBS__M7 := "Mod7=Shift+Mod4+"
+CBS__M8 := "Mod8=Shift+Mod3+Mod4+"
 
 CBSComp := "Compose"

windows/neo-vars/src/source/tools.ahk

@@ -514 +514 @@
 SetFormat,Integer,d
   a := "U" . substr("0000" . substr(a,3),-3)
-  wtt := CRC%a% . " " . CRK%a% . " "
-  if (wtt=="") {
-    TrayTip,Wie mit NEO,Keine Information`, wie %a% eingegeben werden kann!,10,1
-    return
-  }
-;  MsgBox,% wtt
-
-  wmn := ""
-  loop,parse,wtt,%A_Space%
+
+  wmn := "Das Zeichen " . a . " kann wie folgt eingegeben werden:`r`n"
+  loop,parse,CRC%a%,%A_Space%
   {
     this_wmn := ""
+    this_wmnk := ""
+    nthis := 0
     this_wtt := A_LoopField
     if (this_wtt == "")
@@ -531 +527 @@
       if (this_wtt == "")
         break
-      this_char := substr(this_wtt,1,5)
+      this_char5 := substr(this_wtt,1,5)
+      this_char  := this_char5
       this_wtt := substr(this_wtt,6)
       if (CB%this_char% != "")
@@ -538 +535 @@
         this_char := CS%this_char%
       ; this_char will contain Uxxxx if no shortcut is present. Fix this here.
-      if (substr(this_char,-1) == ")+")
-        this_wmn .= this_char
-      else if (substr(this_wmn,-1) == ")+")
-        this_wmn .= "<" . this_char . ">"
-      else
-        this_wmn .= " <" . this_char . ">"
+      this_wmn .= " <" . this_char . ">"
+      if (CRK%this_char5% == "") {
+        nthis := 1
+        this_wmnk .= " <" . this_char5 . ">"
+      } else
+        this_wmnk .= " " . KeyLong(CRK%this_char5%)
     }
-    wmn .= this_wmn . "`r`n"
-  }
-  TrayTip,Wie mit NEO,% wmn,10,1
-}
+    if (this_wmn != "")
+      this_wmn := SubStr(this_wmn,2)
+    if (this_wmnk != "")
+      this_wmnk := SubStr(this_wmnk,2)
+    if (nthis == 1)
+      wmn .= "Wegen fehlender Tastenbelegung: Nicht als Compose:`r`n"
+    else
+      wmn .= "Als Compose:`r`n"
+    wmn .= this_wmn . "`r`noder`r`n" . this_wmnk . "`r`n`r`n"
+  }
+
+  wmnk := KeyLong(CRK%a%)
+  if (wmnk != "")
+    wmn .= "Als Tastendruck:`r`n" . wmnk
+  else
+    wmn .= "Als Tastendruck nicht verf�gbar!"
+
+  if (wmn != "")
+    MsgBox,0,Wie mit NEO,% wmn
+  else
+    TrayTip,Wie mit NEO,Keine Information �ber %a% gefunden,10,1
+}
+
+KeyLong(key) {
+  global
+  num := 0
+  twmnk := ""
+  loop,parse,key,%A_Space%
+  {
+    tis_wmn := ""
+    tis_wtt := A_LoopField
+    if (tis_wtt == "")
+      continue ; probably at first or last entry
+    tis_layer := substr(tis_wtt,3,1)
+    base_key_pos := "CP1" . substr(tis_wtt,4)
+
+    base_key := %base_key_pos%
+    if (CB%base_key% != "")
+      base_key := CB%base_key%
+    else if (CS%base_key% != "")
+      base_key := CS%base_key%
+
+    twmnk .= "/<" . CBS__M%tis_layer% . base_key . ">"
+    num := num + 1
+  }
+  if (num == 0)
+    return ""
+  else if (num == 1)
+    return SubStr(twmnk,2)
+  else
+    return "(" . SubStr(twmnk,2) . ")"
+}