Alles auf xkeyboard-config Version 1.6 angeglichen.

Modifier mit Hilfe von compat-Regeln definiert.
Damit sollten alle Multi-Layout-Bugs behoben sein.
Allerdings tritt wahrscheinlich #135 wieder auf.

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

1 files changed, 96 insertions, 34 deletions

diff --git a/linux/X/rules/base.xml b/linux/X/rules/base.xml
index d5868e7..f6fc72d 100644
--- a/linux/X/rules/base.xml
+++ b/linux/X/rules/base.xml
@@ -88,13 +88,6 @@
     </model>
     <model>
       <configItem>
-        <name>jp106</name>
-        <description>Japanese 106-key</description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>pc98</name>
         <description>PC-98xx Series</description>
         <vendor>Generic</vendor>
@@ -123,13 +116,6 @@
     </model>
     <model>
       <configItem>
-        <name>abnt2</name>
-        <description>Brazilian ABNT2</description>
-        <vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>airkey</name>
         <description>Acer AirKey V</description>
         <vendor>Acer</vendor>
@@ -261,6 +247,13 @@
     </model>
     <model>
       <configItem>
+        <name>cherrybunlim</name>
+        <description>Cherry B.UNLIMITED</description>
+        <vendor>Cherry</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>chicony</name>
         <description>Chicony Internet Keyboard</description>
         <vendor>Chicony</vendor>
@@ -449,6 +442,13 @@
     </model>
     <model>
       <configItem>
+        <name>geniuskkb2050hs</name>
+        <description>Genius KKB-2050HS</description>
+        <vendor>Genius</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>gyration</name>
         <description>Gyration</description>
         <vendor>Gyration</vendor>
@@ -667,7 +667,7 @@
     <model>
       <configItem>
         <name>logicdpa2</name>
-        <description>Logitech Cordless Desktop Pro (alternate option2)</description>
+        <description>Logitech Cordless Desktop Pro (alternate option 2)</description>
         <vendor>Logitech</vendor>
       </configItem>
     </model>
@@ -974,6 +974,13 @@
     </model>
     <model>
       <configItem>
+        <name>trust_slimline</name>
+        <description>Trust Slimline</description>
+	<vendor>Trust</vendor>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>yahoo</name>
         <description>Yahoo! Internet Keyboard</description>
 	<vendor>Yahoo!</vendor>
@@ -1072,13 +1079,6 @@
     </model>
     <model>
       <configItem>
-	<name>kr106</name>
-	<description>Korean 106-key</description>
-	<vendor>Generic</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
 	<name>evdev</name>
 	<description>Evdev-managed keyboard</description>
 	<vendor>Generic</vendor>
@@ -2350,6 +2350,13 @@
         </variant>
         <variant>
           <configItem>
+            <name>oci</name>
+            <description>Occitan</description>
+            <languageList><iso639Id>oci</iso639Id></languageList>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>geo</name>
             <description>Georgian AZERTY Tskapo</description>
             <languageList><iso639Id>geo</iso639Id></languageList>
@@ -2822,7 +2829,7 @@
     <layout>
       <configItem>
         <name>kg</name>
-        <shortDescription>Kir</shortDescription>
+        <shortDescription>Kgz</shortDescription>
         <description>Kyrgyzstan</description>
         <languageList><iso639Id>kir</iso639Id></languageList>
       </configItem>
@@ -2968,6 +2975,12 @@
             <description>LEKPa</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>balticplus</name>
+            <description>Baltic+</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3177,7 +3190,7 @@
         <variant>
           <configItem>
             <name>dvorak_altquotes</name>
-            <description>Dvorak, Polish quotes on key "1/!"</description>
+            <description>Dvorak, Polish quotes on key 1</description>
           </configItem>
         </variant>
         <variant>
@@ -3333,6 +3346,12 @@
         </variant>
         <variant>
           <configItem>
+            <name>phonetic_winkeys</name>
+            <description>Phonetic Winkeys</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>typewriter</name>
             <description>Typewriter</description>
           </configItem>
@@ -3406,6 +3425,12 @@
             <languageList><iso639Id>xal</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>dos</name>
+            <description>DOS</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3885,8 +3910,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>unicode</name>
-            <description>Unicode</description>
+            <name>legacy</name>
+            <description>Legacy</description>
           </configItem>
         </variant>
         <variant>
@@ -3942,6 +3967,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>extd</name>
+            <description>Extended - Winkeys</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>intl</name>
             <description>International (with dead keys)</description>
           </configItem>
@@ -4195,7 +4226,16 @@
     </layout>
     <layout>
       <configItem>
-        <name>braille</name>
+        <name>sn</name>
+        <shortDescription>Sen</shortDescription>
+        <description>Senegal</description>
+        <languageList><iso639Id>wol</iso639Id></languageList>
+      </configItem>
+      <variantList/>
+    </layout>
+    <layout>
+      <configItem>
+        <name>brai</name>
         <shortDescription>Brl</shortDescription>
         <description>Braille</description>
       </configItem>
@@ -4214,6 +4254,22 @@
         </variant>
       </variantList>
     </layout>
+    <layout>
+      <configItem>
+        <name>tm</name>
+        <shortDescription>Tkm</shortDescription>
+        <description>Turkmenistan</description>
+        <languageList><iso639Id>tuk</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>alt</name>
+            <description>Alt-Q</description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
   </layoutList>
   <optionList>
     <group allowMultipleSelection="true">
@@ -4472,7 +4528,7 @@
       <option>
         <configItem>
           <name>lv3:enter_switch</name>
-          <description>Press Enter key on keypad to choose 3rd level.</description>
+          <description>Enter on keypad</description>
         </configItem>
       </option>
       <option>
@@ -4775,12 +4831,6 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:super_win</name>
-          <description>Super is mapped to Win keys</description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
           <name>altwin:hyper_win</name>
           <description>Hyper is mapped to Win-keys</description>
         </configItem>
@@ -5108,5 +5158,17 @@
        </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>terminate</name>
+        <description>Key sequence to kill the X server</description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>terminate:ctrl_alt_bksp</name>
+          <description>Control + Alt + Backspace</description>
+        </configItem>
+      </option>
+    </group>
   </optionList>
 </xkbConfigRegistry>