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

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

5 files changed, 43 insertions, 52 deletions

diff --git a/grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg b/grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg
index 0533e8d..b5130cd 100644
--- a/grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg
+++ b/grafik/tastatur3d-svg/tastatur_neo_alle_Ebenen.svg
@@ -15,7 +15,7 @@
    id="svg2"
    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"
    style="display:inline">
@@ -27,6 +27,7 @@
         <dc:format>image/svg+xml</dc:format>
         <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>
   </metadata>
@@ -43,7 +44,7 @@
      pagecolor="#ffffff"
      id="base"
      inkscape:zoom="0.5"
-     inkscape:cx="905.52692"
+     inkscape:cx="157.37115"
      inkscape:cy="1153.4922"
      inkscape:window-x="182"
      inkscape:window-y="28"
@@ -61,6 +62,13 @@
   </sodipodi:namedview>
   <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">
       <stop
@@ -10041,7 +10049,7 @@
      inkscape:groupmode="layer"
      id="layer6"
      inkscape:label="ebene1"
-     style="display:none">
+     style="display:inline">
     <text
        x="168.44073"
        y="407.97638"
@@ -13394,7 +13402,7 @@
      inkscape:groupmode="layer"
      id="layer12"
      inkscape:label="ebene6"
-     style="display:inline">
+     style="display:none">
     <text
        x="45.444523"
        y="217.73325"
diff --git a/windows/neo-vars/keydefinitions.ahk b/windows/neo-vars/keydefinitions.ahk
index c5319ff..84c09a3 100644
--- a/windows/neo-vars/keydefinitions.ahk
+++ b/windows/neo-vars/keydefinitions.ahk
@@ -31,7 +31,7 @@ ED("VK53SC01F","U0069","U0049","U002F","SLeft","U03B9","U222B") ; i
 ED("VK44SC020","U0061","U0041","U007B","SDown","U03B1","U2200") ; a

 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

 ED("VK4CSC026","U0074","U0054","U002D","SN__6","U03C4","U2202") ; t

@@ -48,6 +48,7 @@ ED("VK4DSC032","U006D","U004D","U0025","SN__1","U03BC","U21D4") ; m
 ED("VKBCSC033","U002C","U2022","U0022","SN__2","U03C1","U21D2") ; ,

 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

 ED("VK6FSC135","SNDiv","SNDiv","U00F7","U2300","U2223","U2044") ; NumpadDiv

diff --git a/windows/neo-vars/neo20-vars.ahk b/windows/neo-vars/neo20-vars.ahk
index 03b9ef2..34d2dce 100644
--- a/windows/neo-vars/neo20-vars.ahk
+++ b/windows/neo-vars/neo20-vars.ahk
@@ -30,10 +30,11 @@ AllStar(This_HotKey) {
     IsDown := 0

   } 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

     Char := CP%Ebene%%ActKey%

@@ -392,7 +393,3 @@ SetFormat, Integer, hex
   return result

 }

 

-Transform(key) {

-  global

-  return key

-}

diff --git a/windows/neo-vars/neo20-vars.exe b/windows/neo-vars/neo20-vars.exe
index e947b9b..ee5dd16 100644
--- a/windows/neo-vars/neo20-vars.exe
+++ b/windows/neo-vars/neo20-vars.exe
diff --git a/windows/neo-vars/recycle.ahk b/windows/neo-vars/recycle.ahk
index 820fa9f..197f17c 100644
--- a/windows/neo-vars/recycle.ahk
+++ b/windows/neo-vars/recycle.ahk
@@ -45,9 +45,6 @@ bildschirmTastaturEinbinden := 1
 

 ; 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?

 IniRead,einHandNeo,%ini%,Global,einHandNeo,0

 

@@ -301,6 +298,8 @@ return
 ;Mod3-Tasten (Wichtig, sie werden sonst nicht verarbeitet!)

 *VKBFSC02B:: ; #

 *VK14SC03A:: ; CapsLock

+  if GetKeyState("VKBFSC02B", "P") and GetKeyState("VK14SC03A", "P")

+    CharStarDown("", "", "SComp")

 return

 

 ;Mod4+Mod4 == Mod4-Lock

@@ -335,45 +334,31 @@ return
 EbeneAktualisieren()

 {

   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

+  }

 }

 

 IsShiftPressed()

@@ -976,7 +961,7 @@ return
      keypressed := 0

      spacepressed := 0

     } else {

-      AllStar("space")

+      AllStar("space")    ;???

       AllStar("space up")

     }

   } else