Update des xkb-Treibers

 • Dateien auf xkeyboard-config angeglichen (darunter viel refactoring des Neo-Treibers)
 • 2 für Neo unwichtige Types auskommentiert (sollte das Problem mit dem X-Server fixen)

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

1 files changed, 99 insertions, 49 deletions

diff --git a/linux/X/rules/base.xml b/linux/X/rules/base.xml
index e48c705..952a457 100644
--- a/linux/X/rules/base.xml
+++ b/linux/X/rules/base.xml
@@ -123,13 +123,6 @@
     </model>
     <model>
       <configItem>
-        <name>acpi</name>
-        <description>ACPI Standard</description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>azonaRF2300</name>
         <description>Azona RF2300 wireless Internet Keyboard</description>
         <vendor>Azona</vendor>
@@ -1135,13 +1128,6 @@
     </model>
     <model>
       <configItem>
-	<name>evdev</name>
-	<description>Evdev-managed keyboard</description>
-	<vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
 	<name>benqx</name>
 	<description>BenQ X-Touch</description>
 	<vendor>BenQ</vendor>
@@ -2492,6 +2478,19 @@
             <languageList><iso639Id>hau</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>avn</name>
+            <description>Avatime</description>
+            <languageList><iso639Id>avn</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>gillbt</name>
+            <description>GILLBT</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4416,6 +4415,22 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>tz</name>
+        <shortDescription>Tza</shortDescription>
+	<description>Tanzania</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
+    <layout>
+      <configItem>
+        <name>ke</name>
+        <shortDescription>Ken</shortDescription>
+	<description>Kenya</description>
+        <languageList><iso639Id>swa</iso639Id></languageList>
+      </configItem>
+    </layout>
   </layoutList>
   <optionList>
     <group allowMultipleSelection="true">
@@ -4698,13 +4713,31 @@
       <option>
         <configItem>
           <name>lv3:bksl_switch</name>
-          <description>&lt;BKSL&gt;-Key</description>
+          <description>Backslash</description>
         </configItem>
       </option>
       <option>
         <configItem>
           <name>lv3:lsgt_switch</name>
-          <description>&lt;LSGT&gt;-Key</description>
+	  <description>&lt;Less/Greater&gt;</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:caps_switch_latch</name>
+          <description>CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:bksl_switch_latch</name>
+          <description>Backslash chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv3:lsgt_switch_latch</name>
+	  <description>&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)</description>
         </configItem>
       </option>
     </group>
@@ -5081,7 +5114,7 @@
       <option>
         <configItem>
           <name>compose:102</name>
-          <description>Less-than/Greater-than</description>
+          <description>&lt;Less/Greater&gt;</description>
         </configItem>
       </option>
       <option>
@@ -5174,24 +5207,6 @@
           <description>Both Shift-Keys together toggle ShiftLock</description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>lv3:caps_switch_latch</name>
-          <description>CapsLock chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:bksl_switch_latch</name>
-          <description>&lt;BKSL&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
-          <name>lv3:lsgt_switch_latch</name>
-          <description>&lt;LSGT&gt;-Key chooses 3rd level and latches level three when pressed together with another 3rd-level-chooser</description>
-        </configItem>
-      </option>
     </group>
     <group allowMultipleSelection="true">
       
@@ -5225,56 +5240,91 @@
       </option>
     </group>
     <group allowMultipleSelection="true">
-      
       <configItem>
         <name>lv5</name>
-        <description>5th level options</description>
+        <description>Key to choose 5th level</description>
       </configItem>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:lsgt_switch_lock</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:rwin_switch_lock</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:ralt_switch_lock_cancel</name>
+          <description>Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
+          <name>lv5:lwin_switch_lock_cancel</name>
+          <description>Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock</name>
-          <description>Right Alt chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
+          <name>lv5:rwin_switch_lock_cancel</name>
+          <description>Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock</name>
+          <name>lv5:lwin_switch_lock</name>
           <description>Left Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock</name>
+          <name>lv5:rwin_switch_lock</name>
           <description>Right Win chooses 5th level and toggles level5-Lock when pressed together with another 5th-level-chooser</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lsgt_switch_numlock_cancel</name>
-          <description>&lt;LSGT&gt;-Key chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
+          <name>lv5:lsgt_switch_lock_cancel</name>
+	  <description>&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:ralt_switch_numlock_cancel</name>
+          <name>lv5:ralt_switch_lock_cancel</name>
           <description>Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:lwin_switch_numlock_cancel</name>
+          <name>lv5:lwin_switch_lock_cancel</name>
           <description>Left Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>lv5:rwin_switch_numlock_cancel</name>
+          <name>lv5:rwin_switch_lock_cancel</name>
           <description>Right Win chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock</description>
         </configItem>
       </option>
@@ -5431,4 +5481,4 @@
       </option>
     </group>
   </optionList>
-</xkbConfigRegistry>
+</xkbConfigRegistry>
\ No newline at end of file