Bug#271259: xlibs: wrong altwin options listed in /etc/X11/xkb/rules/xfree86.lst
tags 259740 + patch
thanks
On Sun, Sep 12, 2004 at 09:46:05PM +0200, Denis Barbier wrote:
> clone 259740 -1
> reassign -1 capplets
> retitle -1 gnome-keyboard-properties: altwin:meta_super must be renamed into altwin:super_win
> thanks
>
> This option surely comes from /etc/X11/xkb/rules/xfree86.lst, so I am
> reassigning this bug back to xlibs.
Here is a patch so that GNOME (and maybe other?) keyboard switchers do
not call erroneous altwin:meta_super and altwin:meta_hyper options.
Can I commit it?
Denis
$Id$
Fix xfree86.xml and xfree86.lst to reflect the current XKB state.
The most important change is that non-existing altwin:meta_super and
altwin:meta_hyper options are fixed, which closes #271259.
Few options have not been listed because they seem to be useless:
sapmi layout
lv3:ralt_switch_multikey
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst
--- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-09-16 21:50:36.000000000 +0000
+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-09-16 22:30:40.000000000 +0000
@@ -144,7 +144,9 @@
is Icelandic
iu Inuktitut
ir Iranian
+ ie Irish
il Israeli
+ il_phonetic Israeli (phonetic)
it Italian
jp Japanese
kan Kannada
@@ -198,7 +200,8 @@
! option
grp Group Shift/Lock behavior
- grp:switch R-Alt switches group while pressed
+ grp:lswitch Left Alt key switches group while pressed
+ grp:switch Right Alt key switches group while pressed
grp:lwin_switch Left Win-key switches group while pressed
grp:rwin_switch Right Win-key switches group while pressed
grp:win_switch Both Win-keys switch group while pressed
@@ -225,6 +228,7 @@
lv3:win_switch Press any of Win-keys to choose 3rd level
lv3:lwin_switch Press Left Win-key to choose 3rd level
lv3:rwin_switch Press Right Win-key to choose 3rd level
+ lv3:ralt_switch Press Right Alt-key to choose 3rd level
ctrl Control Key Position
ctrl:nocaps Make CapsLock an additional Control
ctrl:swapcaps Swap Control and Caps Lock
@@ -245,8 +249,8 @@
altwin:meta_alt Alt and Meta on the Alt keys (default).
altwin:meta_win Meta is mapped to the Win-keys.
altwin:left_meta_win Meta is mapped to the left Win-key.
- altwin:meta_super Super is mapped to the Win-keys (default).
- altwin:meta_hyper Hyper is mapped to the Win-keys.
+ altwin:super_win Super is mapped to the Win-keys (default).
+ altwin:hyper_win Hyper is mapped to the Win-keys.
compose:ralt Right Alt is Compose
compose:rwin Right Win-key is Compose
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.xml xc/programs/xkbcomp/rules/xfree86.xml
--- xc-old/programs/xkbcomp/rules/xfree86.xml 2004-09-16 21:50:36.000000000 +0000
+++ xc/programs/xkbcomp/rules/xfree86.xml 2004-09-16 22:37:31.000000000 +0000
@@ -276,8 +276,14 @@
</model>
<model>
<configItem>
+ <name>hp5181</name>
+ <description>Hewlett-Packard 5181 Internet Keyboard</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>hpxe3gc</name>
- <description>Hewlett-Packard Omnibook XE3 GC</description>
+ <description>Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx</description>
</configItem>
</model>
<model>
@@ -288,6 +294,12 @@
</model>
<model>
<configItem>
+ <name>hpxe4xxx</name>
+ <description>Hewlett-Packard Omnibook XE4xxx and ZE4xxx</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>hpxt1000</name>
<description>Hewlett-Packard Omnibook XT1000</description>
</configItem>
@@ -306,6 +318,12 @@
</model>
<model>
<configItem>
+ <name>hp5xx</name>
+ <description>Hewlett-Packard Omnibook 5xx</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>honeywell_euroboard</name>
<description>Honeywell Euroboard</description>
</configItem>
@@ -905,6 +923,13 @@
</layout>
<layout>
<configItem>
+ <name>hr_US</name>
+ <description>Croatian (US)</description>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
<name>cz</name>
<description>Czech</description>
<description xml:lang="bg">Ñ?еÑ?Ñ?ка</description>
@@ -1033,14 +1058,6 @@
</layout>
<layout>
<configItem>
- <name>ir</name>
- <description>Iranian</description>
- <description xml:lang="ru">ЀаÑ?Ñ?О</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
<name>fi</name>
<description>Finnish</description>
<description xml:lang="bg">Ñ?ОМлаМЎÑ?ка</description>
@@ -1431,6 +1448,50 @@
</layout>
<layout>
<configItem>
+ <name>ir</name>
+ <description>Iranian</description>
+ <description xml:lang="ru">ЀаÑ?Ñ?О</description>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>ie</name>
+ <description>Irish</description>
+ </configItem>
+ <variantList>
+ <variant>
+ <configItem>
+ <name>CloGaelach</name>
+ <description>ie(CloGaelach) - No decription</description>
+ <description xml:lang="ru">CloGaelach</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>CloGaelachLaptop</name>
+ <description>ie(CloGaelachLaptop) - No decription</description>
+ <description xml:lang="ru">CloGaelach ЎлÑ? МаÑ?Ñ?ПлÑ?ÐœÑ?Ñ? Ð?Ð?</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>UnicodeExpert</name>
+ <description>ie(UnicodeExpert) - No decription</description>
+ <description xml:lang="ru">Ñ?МОкПЎ</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>laptop</name>
+ <description>ie(laptop) - No decription</description>
+ <description xml:lang="ru">ЎлÑ? МаÑ?Ñ?ПлÑ?ÐœÑ?Ñ? Ð?Ð?</description>
+ </configItem>
+ </variant>
+ </variantList>
+ </layout>
+ <layout>
+ <configItem>
<name>il</name>
<description>Israeli</description>
<description xml:lang="bg">ОзÑ?аелÑ?ка</description>
@@ -1455,6 +1516,13 @@
</layout>
<layout>
<configItem>
+ <name>il_phonetic</name>
+ <description>Israeli (phonetic)</description>
+ </configItem>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
<name>it</name>
<description>Italian</description>
<description xml:lang="bg">ОÑ?алОаМÑ?ка</description>
@@ -2085,16 +2153,17 @@
<description xml:lang="bg">Ñ?Ñ?Ñ?Ñ?ка</description>
<description xml:lang="ru">ТÑ?Ñ?еÑ?каÑ?</description>
</configItem>
- <variantList>
- <variant>
- <configItem>
- <name>tr_f</name>
- <description>Turkish (F)</description>
- <description xml:lang="bg">Ñ?Ñ?Ñ?Ñ?ка (F)</description>
- <description xml:lang="ru">ТÑ?Ñ?еÑ?каÑ? (F)</description>
- </configItem>
- </variant>
- </variantList>
+ <variantList/>
+ </layout>
+ <layout>
+ <configItem>
+ <name>tr_f</name>
+ <name>tr_f</name>
+ <description>Turkish (F)</description>
+ <description xml:lang="bg">Ñ?Ñ?Ñ?Ñ?ка (F)</description>
+ <description xml:lang="ru">ТÑ?Ñ?еÑ?каÑ? (F)</description>
+ </configItem>
+ <variantList/>
</layout>
<layout>
<configItem>
@@ -2168,52 +2237,6 @@
</layout>
<layout>
<configItem>
- <name>ie</name>
- <description>ie - No decription</description>
- <description xml:lang="ru">Ð?Ñ?лаМЎÑ?каÑ?</description>
- </configItem>
- <variantList>
- <variant>
- <configItem>
- <name>CloGaelach</name>
- <description>ie(CloGaelach) - No decription</description>
- <description xml:lang="ru">CloGaelach</description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>CloGaelachLaptop</name>
- <description>ie(CloGaelachLaptop) - No decription</description>
- <description xml:lang="ru">CloGaelach ЎлÑ? МаÑ?Ñ?ПлÑ?ÐœÑ?Ñ? Ð?Ð?</description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>UnicodeExpert</name>
- <description>ie(UnicodeExpert) - No decription</description>
- <description xml:lang="ru">Ñ?МОкПЎ</description>
- </configItem>
- </variant>
- <variant>
- <configItem>
- <name>laptop</name>
- <description>ie(laptop) - No decription</description>
- <description xml:lang="ru">ЎлÑ? МаÑ?Ñ?ПлÑ?ÐœÑ?Ñ? Ð?Ð?</description>
- </configItem>
- </variant>
- </variantList>
- </layout>
- <layout>
- <configItem>
- <name>il_phonetic</name>
- <description>il_phonetic - No decription</description>
- <description xml:lang="bg">il_phonetic - без ПпОÑ?аМОе</description>
- <description xml:lang="ru">Ð?вÑ?ОÑ?, Ñ?ПМеÑ?ОÑ?еÑ?каÑ?</description>
- </configItem>
- <variantList/>
- </layout>
- <layout>
- <configItem>
<name>sapmi</name>
<description>sapmi - No decription</description>
<description xml:lang="bg">sapmi - без ПпОÑ?аМОе</description>
@@ -2257,8 +2280,14 @@
</configItem>
<option>
<configItem>
+ <name>grp:lswitch</name>
+ <description>Left Alt key switches group while pressed</description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
<name>grp:switch</name>
- <description>R-Alt switches group while pressed</description>
+ <description>Right Alt key switches group while pressed</description>
<description xml:lang="bg">Ð?еÑ?МОÑ?Ñ? Alt Ñ?ЌеМÑ? гÑ?Ñ?паÑ?а ЎПкаÑ?П е МаÑ?ОÑ?МаÑ?</description>
<description xml:lang="ru">Ð?Ñ?аваÑ? клавОÑ?а Alt пеÑ?еклÑ?Ñ?аеÑ? гÑ?Ñ?ппÑ? Ма вÑ?еЌÑ? МажаÑ?ОÑ?</description>
</configItem>
@@ -2464,6 +2493,12 @@
<description xml:lang="ru">Ð?Ñ?бПÑ? 3-гП Ñ?Ñ?ПвМÑ? МажаÑ?ОеЌ пÑ?авПй клавОÑ?О Win</description>
</configItem>
</option>
+ <option>
+ <configItem>
+ <name>lv3:ralt_switch</name>
+ <description>Press Right Alt-key to choose 3rd level</description>
+ </configItem>
+ </option>
</group>
<group allowMultipleSelection="false">
<configItem>
@@ -2617,7 +2652,7 @@
</option>
<option>
<configItem>
- <name>altwin:meta_super</name>
+ <name>altwin:super_win</name>
<description>Super is mapped to the Win-keys (default).</description>
<description xml:lang="bg">Win клавОÑ?ОÑ?е Ñ?Ñ?МкÑ?ОПМОÑ?аÑ? каÑ?П Super</description>
<description xml:lang="ru">Super Ñ?ППÑ?веÑ?Ñ?Ñ?вÑ?еÑ? клавОÑ?аЌ Win (пП Ñ?ЌПлÑ?аМОÑ?)</description>
@@ -2625,7 +2660,7 @@
</option>
<option>
<configItem>
- <name>altwin:meta_hyper</name>
+ <name>altwin:hyper_win</name>
<description>Hyper is mapped to the Win-keys.</description>
<description xml:lang="bg">Hyper Ñ?Ñ?ПÑ?веÑ?Ñ?Ñ?ва Ма клавОÑ?ОÑ?е Win</description>
<description xml:lang="ru">Hyper Ñ?ППÑ?веÑ?Ñ?Ñ?вÑ?еÑ? клавОÑ?аЌ Win</description>
Reply to: