Changeset 1677

Timestamp:

02/20/09 16:23:51 (4 years ago)

Author:

mösi

Message:

Dynamisches Compose implementiert – allerdings noch recht starr und nicht EXE-tauglich.

Location:

windows/neo-vars/src

Files:

• neo20-all.ahk (modified) (1 diff)
• source/compose-gen.ahk (copied) (copied from windows/neo-vars/src/source/makecompose.ahk) (7 diffs)
• source/initialize.ahk (modified) (2 diffs)

windows/neo-vars/src/neo20-all.ahk

@@ -10 +10 @@
 #include *i source\compose-tainted.generated.ahk
 #include    source\neovarscompose.ahk
+#include    source\compose-gen.ahk
 
 ; Hier liegt die Tastaturbelegung

windows/neo-vars/src/source/compose-gen.ahk

@@ -1 @@
-; -*- encoding:utf-8 -*-
-; AHK versteht zwar kein utf-8, aber so lässt sich’s doch leichter eingeben.
-
+; äöü
 
 DefineXKBSym(name,val) {
@@ -1776 +1774 @@
   SS := X . " "
   pos := InStr(KSYM%nlen%,SS,true)
-;  MsgBox,% X . ": " . nlen . ": " . pos
   if (pos>0) {
     poscd := 5*(pos-1)/(nlen+1)+1
     X := SubStr(KSCD%nlen%,poscd,5)
-;    MsgBox,% X
     return X
   } else if (SubStr(X,1,1) == "U")
@@ -1792 +1788 @@
 }
 
-DecodeUni(Uni) {
+EncodeUniCompose(str) {
+SetFormat, Integer, hex
   result := ""
   loop {
-    code := "0x" . SubStr(Uni,2,4)
-    Uni := SubStr(Uni,6)
-    if (code < 0x0080)
-      result := result . chr(code)
-    else if (code < 0x0800)
-      result := result . chr(0xC0 + (code >> 6)) . chr(0x80 + (code & 0x3F))
-    else
-      result := result . chr(0xE0 + (code >> 12)) . chr(0x80 + ((code >> 6) & 0x3F)) . chr(0x80 + (code & 0x3F)) 
-    if (Uni == "")
-      break
-  }
-  return result
-}
-
-EncodeUni(str) {
-SetFormat, Integer, hex
-;  MsgBox % Asc(SubStr(str,1,1)) . Asc(SubStr(str,2,1))
-  result := ""
-  loop {
-    char := SubStr(str,1,1)
+    char := asc(SubStr(str,1,1))
     str  := SubStr(str,2)
-    if (asc(char) < 0x80)
-      result := result . "U" . SubStr("0000" . SubStr(asc(char),3),-3)
-    else if (asc(char) < 0xC0) {
+    if (char < 0x80)
+      result .= "U" . SubStr("0000" . SubStr(char,3),-3)
+    else if (char < 0xC0) {
       ; error
-    } else if (asc(char) < 0xE0) {
-       char2 := Substr(str,1,1)
+    } else if (char < 0xE0) {
+       char2 := asc(Substr(str,1,1))
        str   := SubStr(str,2)
-       if ((asc(char2) < 0x80) or (asc(char2) > 0xBF)) {
+       if ((char2 < 0x80) or (char2 > 0xBF)) {
          ; error
        } else {
-         result := result . "U" . SubStr("0000" . SubStr((((asc(char) & 0x1F) << 6) + (asc(char2) & 0x3F)),3),-3)
+         result .= "U" . SubStr("0000" . SubStr((((char & 0x1F) << 6) + (char2 & 0x3F)),3),-3)
        }
-    } else if (asc(char) < 0xF8) {
-       char2 := SubStr(str,1,1)
-       char3 := SubStr(str,2,1)
+    } else if (char < 0xF8) {
+       char2 := asc(SubStr(str,1,1))
+       char3 := asc(SubStr(str,2,1))
        str   := SubStr(str,3)
-;       MsgBox % "chars: " . char . ", " . char2 . ", " . char3 . ", str: " . str
-       if ((asc(char2) < 0x80) or (asc(char2) > 0xBF)
-           or (asc(char3) < 0x80) or (asc(char3) > 0xBF)) {
+       if ((char2 < 0x80) or (char2 > 0xBF)
+           or (char3 < 0x80) or (char3 > 0xBF)) {
          ; error
        } else {
-;         MsgBox % asc(char) . asc(char2) . asc(char3)
-;         MsgBox % (((asc(char) & 0x0F) << 12) + ((asc(char2) & 0x3F) << 6) + (asc(char3) & 0x3F))
-         result := result . "U" . SubStr("0000" . SubStr((((asc(char) & 0x0F) << 12) + ((asc(char2) & 0x3F) << 6) + (asc(char3) & 0x3F)),3),-3)
+         result .= "U" . SubStr("0000" . SubStr((((char & 0x0F) << 12) + ((char2 & 0x3F) << 6) + (char3 & 0x3F)),3),-3)
        }
     }
@@ -1852 +1827 @@
 VarSetCapacity(Composita,10240000) ; 10 MB
 
-EncodeUnicodeFile(FFrom,FTo) {
-  Composita := ""
-  Miss := 0
+ProcessComposeFile(FFrom) {
+  global
+
   FileRead, FileContents, %FFrom%
-  ProgressTop := "Converting " . FFrom . "..."
 
   Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
@@ -1863 +1837 @@
   }
 
-  Count := 0
   Loop, parse, FileContents, `n, `r  ; Specifying `n prior to `r allows both Windows and Unix files to be parsed.
   {
-    Count := Count + 1
-    ProgressVal := Count/NumLines*100
-    ProgressInd := "Lines: " . Count . ", Errors: " . Miss
-    Progress,%ProgressVal%,%ProgressInd%,%ProgressTop%
     Line := A_LoopField
     if ((Line == "") or (SubStr(Line,1,5) == "XCOMM") or (SubStr(Line,1,1) == "#"))
@@ -1905 +1874 @@
         }
         modkeys := modkeys . modkey 
-        if (ReplaceLeft != "") {
-          if (CM%modkeys% != 1) {
-            CM%modkeys% := 1
-            Composita := Composita . "  CM" modkeys . ":=1`r`n"
-          }
-        }
-        else
+        if (ReplaceLeft == "")
           break
+        if (CM%modkeys% != 1)
+          CM%modkeys% := 1
       }
       else {
-        Xkbsym := "*entry*" ; make a non-fancy name from parsing error
         modkeys := "" ; invalidate whole line
         break
@@ -1921 +1885 @@
     }
     if (modkeys != "") {
-      ressymb := EncodeUni(ReplaceRight)
-      Composita .= "  CD" . modkeys . ":="""  . ressymb . """`r`n"
+      ressymb := EncodeUniCompose(ReplaceRight)
+      CD%modkeys% := ressymb
       if (StrLen(ressymb)==5)
-        Composita .= "  CRC" . ressymb . ".="" " . modkeys . """`r`n" 
-    } else {
-      Composita .= "  `; illegal " . Xkbsym . " in " . A_LoopField . "`r`n"
-      Miss := Miss + 1
+        CRC%ressymb% .= modkeys
     }
   }
-  Progress,off
-  FileAppend,%Composita%,%FTo%
+
 }
 
-DefineXKBSyms()
-
-NumPars = %0%
-if (NumPars < 2) {
-  MsgBox,Zu wenige Parameter`, Minimum=2
-  exit
+LoadCurrentComposeFile(FIn) {
+  global
+  if (!CurrentComposeLoaded) {
+    DefineXKBSyms()
+    CurrentComposeLoaded := 1
+  }
+  ProcessComposeFile(Fin)
 }
 
-CompRevision = %1%
-OutputFile = %2%
+LoadCurrentCompose() {
+  global
+  ; setup a new thread to start immediately in the background
+  SetTimer,ConvertCompose,-1
+  return
 
-FileDelete,%OutputFile%
-FileAppend,CompRevision := "%CompRevision%"`r`n`r`nLoadDefaultCompose() {`r`n  global`r`n`r`n, %OutputFile%    ; }
-
-loop %Numpars% {
-  if (A_Index < 3)
-    continue
-  EncodeUnicodeFile(%A_Index%, OutputFile)
+  ConvertCompose:
+    ComposePath := "..\..\..\Compose"
+    LoadCurrentComposeFile(ComposePath . "\en_US.UTF-8")
+    LoadCurrentComposeFile(ComposePath . "\Compose.neo")
+    TrayTip,Compose-Konvertierung,Konvertierung abgeschlossen!,10,1
+  return
 }
-
-; {
-FileAppend,},%OutputFile%
-
-; MsgBox % EncodeUni(DecodeUni("U20ACU0041U0070"))
-
-; MsgBox % ConvertXkbsym("KP_5") . ConvertXkbsym("a")

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

@@ -50 +50 @@
 IniRead,UseMod4Light,%ini%,Global,UseMod4Light,1
 IniRead,striktesMod2Lock,%ini%,Global,striktesMod2Lock,0
+IniRead,dynamischesCompose,%ini%,Global,dynamischesCompose,0
 
 regread,inputlocale,HKEY_CURRENT_USER,Keyboard Layout\Preload,1
@@ -84 +85 @@
 IsMod4Locked := 0
 EbeneAktualisieren()
-LoadDefaultCompose()
+
+
+if (dynamischesCompose)
+  LoadCurrentCompose()
+else
+  LoadDefaultCompose()