aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkeyboard-config/rules')
-rw-r--r--xorg-server/xkeyboard-config/rules/base.extras.xml.in10
-rw-r--r--xorg-server/xkeyboard-config/rules/base.o_s.part2
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in34
3 files changed, 44 insertions, 2 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 2e1e89d6b..749fc7225 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -120,6 +120,16 @@
</variant>
<variant>
<configItem>
+ <name>pl</name>
+ <_description>Polish (Germany, eliminate dead keys)</_description>
+ <languageList>
+ <iso639Id>ger</iso639Id>
+ <iso639Id>pol</iso639Id>
+ </languageList>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>sun_type6</name>
<_description>German (Sun Type 6/7)</_description>
</configItem>
diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index cda36e459..5e6f6648c 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -125,6 +125,8 @@
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
+ korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja)
+ korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 682f8c9f9..803de50ac 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1576,6 +1576,12 @@
<_description>Arabic (Buckwalter)</_description>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>mac</name>
+ <_description>Arabic (Macintosh)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
@@ -2568,7 +2574,7 @@
<_shortDescription>ug</_shortDescription>
<_description>Uyghur</_description>
<languageList>
- <iso639Id>ug</iso639Id>
+ <iso639Id>uig</iso639Id>
</languageList>
</configItem>
</variant>
@@ -6628,7 +6634,7 @@
<option>
<configItem>
<name>numpad:microsoft</name>
- <_description>Shift with numeric keypad keys works as in MS Windows</_description>
+ <_description>NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (as in MS Windows)</_description>
</configItem>
</option>
<option>
@@ -6930,6 +6936,30 @@
</configItem>
</option>
</group>
+ <group allowMultipleSelection="true">
+ <configItem>
+ <name>korean</name>
+ <_description>Korean Hangul/Hanja keys</_description>
+ </configItem>
+ <option>
+ <configItem>
+ <name>korean:hw_keys</name>
+ <_description>Hardware Hangul/Hanja keys</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>korean:ralt_rctrl</name>
+ <_description>Right Alt as Hangul, right Ctrl as Hanja</_description>
+ </configItem>
+ </option>
+ <option>
+ <configItem>
+ <name>korean:rctrl_ralt</name>
+ <_description>Right Ctrl as Hangul, right Alt as Hanja</_description>
+ </configItem>
+ </option>
+ </group>
<group allowMultipleSelection="false">
<configItem>
<name>esperanto</name>