Changeset 1067

Timestamp:

10/30/08 06:58:34 (5 years ago)

Author:

martin_r

Message:

Aufräumarbeiten; Mod3+Mod3 als Compose; svg-Exportbeschreibung

Files:

• grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg (modified) (6 diffs)
• windows/neo-vars/keydefinitions.ahk (modified) (2 diffs)
• windows/neo-vars/neo20-vars.ahk (modified) (2 diffs)
• windows/neo-vars/neo20-vars.exe (modified) (previous)
• windows/neo-vars/recycle.ahk (modified) (4 diffs)

grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg

@@ -16 +16 @@
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   sodipodi:docname="ebenen.svg"
+   sodipodi:docname="tastatur_neo_alle_Ebenen.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    sodipodi:docbase="G:\NEO"
@@ -28 +28 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:description>png-Export: x₀,x₁,y₀,y₁,b=(4,9;1361;687;1167;564)px,8-Bit-Indizierung.</dc:description>
       </cc:Work>
     </rdf:RDF>
@@ -44 +45 @@
      id="base"
      inkscape:zoom="0.5"
-     inkscape:cx="905.52692"
+     inkscape:cx="157.37115"
      inkscape:cy="1153.4922"
      inkscape:window-x="182"
@@ -62 +63 @@
   <defs
      id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 713.82953 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="2093.5378 : 713.82953 : 1"
+       inkscape:persp3d-origin="1046.7689 : 475.88635 : 1"
+       id="perspective2053" />
     <linearGradient
        id="linearGradient6536">
@@ -10042 +10050 @@
      id="layer6"
      inkscape:label="ebene1"
-     style="display:none">
+     style="display:inline">
     <text
        x="168.44073"
@@ -13395 +13403 @@
      id="layer12"
      inkscape:label="ebene6"
-     style="display:inline">
+     style="display:none">
     <text
        x="45.444523"

windows/neo-vars/keydefinitions.ahk

@@ -32 +32 @@
 ED("VK46SC021","U0065","U0045","U007D","SRght","U03B5","U2203") ; e
 ED("VK47SC022","U006F","U004F","U002A","S_End","U03BF","U2208") ; o
-ED("VK48SC023","U0073","U0053","U003F","U00BF","U03C3","U03A3","U017F") ; s
+ED("VK48SC023","U0073","U0053","U003F","U00BF","U03C3","U03A3") ; s
 ED("VK4ASC024","U006E","U004E","U0028","SN__4","U03BD","U2115") ; n
 ED("VK4BSC025","U0072","U0052","U0029","SN__5","U03F1","U211D") ; r
@@ -49 +49 @@
 ED("VKBESC034","U002E","U2023","U0027","SN__3","U03D1","U0398") ; .
 ED("VKBDSC035","U006A","U004A","U003B","U003B","U03B8","U221D") ; j
+
 ; Numpad
 ED("VK90SC145","U0009","U0009","U003D","U2260","U2248","U2261") ; NumLock

windows/neo-vars/neo20-vars.ahk

@@ -31 +31 @@
   } else
     IsDown := 1
-  ActKey := Transform(PhysKey)
-  if (Ebene7 and (CP7%ActKey% != ""))
+;  ActKey := Transform(PhysKey)
+  ActKey := PhysKey
+  if Ebene7 and (CP7%ActKey% != "")
     Char := CP7%ActKey%
-  else if (Ebene8 and (CP8%ActKey% != ""))
+  else if Ebene8 and (CP8%ActKey% != "")
     Char := CP8%ActKey%
   else
@@ -393 +394 @@
 }
 
-Transform(key) {
-  global
-  return key
-}

windows/neo-vars/recycle.ahk

@@ -45 +45 @@
 
 ; Syntaxhinweis: IniRead, Variable, InputFilename, Section, Key [, DefaultValue]
-
-; Sollen Ebenen 1-4 ignoriert werden (kann z.B. vom dll Treiber �bernommen werden)?
-IniRead,ahkTreiberKombi,%ini%,Global,ahkTreiberKombi,0
 
 ; Soll der Treiber im Einhandmodus betrieben werden?
@@ -302 +299 @@
 *VKBFSC02B:: ; #
 *VK14SC03A:: ; CapsLock
+  if GetKeyState("VKBFSC02B", "P") and GetKeyState("VK14SC03A", "P")
+    CharStarDown("", "", "SComp")
 return
 
@@ -336 +335 @@
 {
   global
-  PriorDeadKey := DeadKey
-  PriorCompKey := CompKey
-  DeadKey := ""
-  CompKey := ""
   Modstate := IsMod4Pressed() . IsMod3Pressed() . IsShiftPressed()
   Ebene7 := 0
   Ebene8 := 0
-  if ahkTreiberKombi
-    if ( Modstate = "001")
-      Ebene = 6
-    else
-      Ebene = -1
-  else
-    if      (Modstate = "000") ; Ebene 1: Ohne Mod
-      Ebene = 1
-    else if (Modstate = "001") ; Ebene 2: Shift
-      Ebene = 2
-    else if (Modstate = "010") ; Ebene 3: Mod3
-      Ebene = 3
-    else if (Modstate = "100") ; Ebene 4: Mod4
-      Ebene = 4
-    else if (Modstate = "011") ; Ebene 5: Shift+Mod3
-      Ebene = 5
-    else if (Modstate = "110") ; Ebene 6: Mod3+Mod4
-      Ebene = 6
-    else if (Modstate = "101") ; Ebene 7: Shift+Mod4 impliziert Ebene 4
-    {
-      Ebene = 4
-      Ebene7 = 1
-    }
-    else if (Modstate = "111") ; Ebene 8: Shift+Mod3+Mod4 impliziert Ebene 6
-    {
-      Ebene = 6
-      Ebene8 = 1
-    }
-  Ebene12 := ((Ebene = 1) or (Ebene = 2))
-  Ebene14 := ((Ebene = 1) or (Ebene = 4))
-  ;NumLock := GetKeyState("NumLock","T")
-  numlock = 1
+  if      (Modstate = "000") ; Ebene 1: Ohne Mod
+    Ebene = 1
+  else if (Modstate = "001") ; Ebene 2: Shift
+    Ebene = 2
+  else if (Modstate = "010") ; Ebene 3: Mod3
+    Ebene = 3
+  else if (Modstate = "100") ; Ebene 4: Mod4
+    Ebene = 4
+  else if (Modstate = "011") ; Ebene 5: Shift+Mod3
+    Ebene = 5
+  else if (Modstate = "110") ; Ebene 6: Mod3+Mod4
+    Ebene = 6
+  else if (Modstate = "101") ; Ebene 7: Shift+Mod4 impliziert Ebene 4
+  {
+    Ebene = 4
+    Ebene7 = 1
+  }
+  else if (Modstate = "111") ; Ebene 8: Shift+Mod3+Mod4 impliziert Ebene 6
+  {
+    Ebene = 6
+    Ebene8 = 1
+  }
 }
 
@@ -977 +962 @@
      spacepressed := 0
     } else {
-      AllStar("space")
+      AllStar("space")    ;???
       AllStar("space up")
     }