Module Name: src
Committed By: tsutsui
Date: Tue Feb 25 13:07:29 UTC 2014
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst
Log Message:
Update generated files which were missed on xkeyboard-config 2.9 import.
http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044255.html
http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044256.html
http://mail-index.NetBSD.org/source-changes/2013/05/31/msg044258.html
XXX: should be regenerated during build but no perl and intltools in tools
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.5 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.5 Mon Sep 26 15:19:45 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Feb 25 13:07:29 2014
@@ -106,10 +106,22 @@
! $thinkpads = thinkpad thinkpad60 thinkpadz60
-! $sun_t6_custom = ara be br ca ch cz de dk \
- ee es fi fr gb gr it kr \
- lt lv nl no pl pt ro ru \
- se sk tr tw ua
+! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
+ sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \
+ sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+
+! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type_6_7 keyboards with custom layouts
+! $sun_custom = ara be br ca ch cz de dk \
+ ee es fi fr gb gr it jp \
+ kr lt lv nl no pl pt ro \
+ ru se sk tr tw ua us
+
+! $sun_var = sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \
+ sun_type7 sun_type7_suncompat suncompat
+
+! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
! $htcdreamlayouts = us it de
@@ -119,10 +131,8 @@
amiga = amiga(de)
ataritt = ataritt(de)
empty = empty
- sun4 = sun(type4_euro)
- sun5 = sun(type5_euro)
- sun6 = sun(type6_usb)
- sun6euro = sun(type6tuv_usb)
+ $sun_jp = sun(type6_jp_usb)
+ $sun = sun(type6_usb)
pc98 = xfree98(pc98)
$applealu = macintosh(alukbd)
macintosh_hhk = macintosh(hhk)
@@ -173,6 +183,15 @@
hhk = hhk(basic)
kinesis = kinesis(model100)
$nokiamodels = nokia(%m)
+ sun_type6_jp = sun(type6jp)
+ sun_type6_usb = sun(type6)
+ sun_type6_euro_usb = sun(type6tuv)
+ sun_type6_jp_usb = sun(type6jp)
+ sun_type6_unix_usb = sun(type6unix)
+ sun_type7_jp_usb = sun(type6jp)
+ sun_type7_usb = sun(type7)
+ sun_type7_euro_usb = sun(type7tuv)
+ sun_type7_unix_usb = sun(type7unix)
* = pc(pc104)
! model layout variant = symbols
@@ -229,6 +248,7 @@
classmate us alt-intl = pc+us(classmate-alt-intl)
classmate us altgr-intl = pc+us(classmate-altgr-intl)
nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
+ * $sun_custom $sun_var = pc+sun_vndr/%l%(v)
! model layout = symbols
* ar = pc+ara
@@ -247,7 +267,6 @@
* lo = pc+la
* kan = pc+in(kan)
* mi = pc+mao
- * ml = pc+in(mal)
* ogham = pc+ie(ogam)
* ori = pc+ie(ori)
* sapmi = pc+no(smi)
@@ -314,18 +333,7 @@
classmate us = pc+%l(classmate)
empty * = empty(basic)
* empty = empty(basic)
- sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2
- sun4 * = latin+sun_vndr/us(type4)+%l%(v)
- sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2
- sun5 * = latin+sun_vndr/us(type5)+%l%(v)
- sun6 us = pc+sun_vndr/us(type6)
- sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic)
- sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
- sun6 * = pc+sun_vndr/us(type6)+%l%(v)
- sun6euro us = pc+sun_vndr/us(type6)
- sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic)
- sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
- sun6euro * = pc+sun_vndr/us(type6)+%l%(v)
+ $sun $sun_custom = pc+sun_vndr/%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old en_US = macintosh_vndr/us(oldmac)
@@ -344,6 +352,8 @@
nokiasu8w * = nokia_vndr/su-8w(%l)
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
+ olpcm $olpclayouts = olpc+%l%(m)
+ olpcm * = olpc+%l%(v)
$thinkpads br = pc+br(thinkpad)
sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic)
ws003sh * = pc+sharp_vndr/ws003sh(basic)
@@ -371,7 +381,6 @@
* lo = pc+la%(v[1])
* kan = pc+in(kan)
* mi = pc+mao%(v[1])
- * ml = pc+in(mal)
* ogham = pc+ie(ogam)
* ori = pc+ie(ori)
* sapmi = pc+no(smi)
@@ -433,8 +442,7 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
- sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1])
- sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1])
+ $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1])
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
@@ -515,7 +523,6 @@
* lo = +la%(v[2]):2
* kan = +in(kan):2
* mi = +mao%(v[2]):2
- * ml = +in(mal):2
* ogham = +ie(ogam):2
* ori = +ie(ori):2
* sapmi = +no(smi):2
@@ -577,6 +584,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):2
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2
nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2
+ $sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2
* * = +%l[2]%(v[2]):2
! model layout[3] = symbols
@@ -596,7 +604,6 @@
* lo = +la%(v[3]):3
* kan = +in(kan):3
* mi = +mao%(v[3]):3
- * ml = +in(mal):3
* ogham = +ie(ogam):3
* ori = +ie(ori):3
* sapmi = +no(smi):3
@@ -658,6 +665,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):3
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3
nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3
+ $sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3
* * = +%l[3]%(v[3]):3
! model layout[4] = symbols
@@ -677,7 +685,6 @@
* lo = +la%(v[4]):4
* kan = +in(kan):4
* mi = +mao%(v[4]):4
- * ml = +in(mal):4
* ogham = +ie(ogam):4
* ori = +ie(ori):4
* sapmi = +no(smi):4
@@ -739,6 +746,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):4
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4
nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4
+ $sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4
* * = +%l[4]%(v[4]):4
! model layout[2] variant[2] = symbols
@@ -946,26 +954,34 @@
$maclaptop = +inet(apple)+level3(enter_switch)
$applealu = +inet(apple)
$macs = +inet(apple)
+ sun_type7_jp_usb = +sun_vndr/solaris(defaults_type7jp)
+ $sun = +sun_vndr/solaris(defaults)
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[1] variant[1] = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[2] variant[2] = compat
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ jp $sun_compat = +complete+japan(kana_lock):2
! layout[3] variant[3] = compat
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ jp $sun_compat = +complete+japan(kana_lock):3
! layout[4] variant[4] = compat
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ jp $sun_compat = +complete+japan(kana_lock):4
! model layout = compat
pc98 nec_vndr/jp = pc98(basic)
* jp = complete+japan
- olpc * = olpc
+ olpc * = olpc
+ olpcm * = olpc
* * = complete
! model layout[1] = compat
@@ -1001,13 +1017,14 @@
grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
altwin:meta_alt = +altwin(meta_alt)
+ altwin:alt_win = +altwin(alt_win)
altwin:ctrl_win = +altwin(ctrl_win)
altwin:ctrl_alt_win = +altwin(ctrl_alt_win)
altwin:meta_win = +altwin(meta_win)
altwin:left_meta_win = +altwin(left_meta_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
- altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
+ altwin:swap_alt_win = +altwin(swap_alt_win)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)
@@ -1017,17 +1034,12 @@
grp:shifts_toggle = +group(shifts_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
grp:alts_toggle = +group(alts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
- grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
grp:caps_toggle = +capslock(grouplock)
grp:caps_switch = +capslock(groupshift)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:shift_caps_switch = +group(shift_caps_switch)
grp:win_menu_switch = +group(win_menu_switch)
grp:alt_caps_toggle = +group(alt_caps_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:alt_space_toggle = +group(alt_space_toggle)
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
@@ -1041,6 +1053,18 @@
grp:sclk_toggle = +group(sclk_toggle)
grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch)
grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu)
+ grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle)
+ grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
+ grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
+ grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
+ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
+ grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -1065,18 +1089,26 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
- ctrl:ctrl_ra = +ctrl(ctrl_ra)
- ctrl:ctrl_menu = +ctrl(ctrl_menu)
+ ctrl:ac_ctrl = +ctrl(ac_ctrl)
+ ctrl:aa_ctrl = +ctrl(aa_ctrl)
+ ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
+ ctrl:menu_rctrl = +ctrl(menu_rctrl)
+ ctrl:ralt_rctrl = +ctrl(ralt_rctrl)
compose:ralt = +compose(ralt)
compose:lwin = +compose(lwin)
+ compose:lwin-altgr = +compose(lwin-altgr)
compose:rwin = +compose(rwin)
+ compose:rwin-altgr = +compose(rwin-altgr)
compose:menu = +compose(menu)
+ compose:menu-altgr = +compose(menu-altgr)
compose:lctrl = +compose(lctrl)
+ compose:lctrl-altgr = +compose(lctrl-altgr)
compose:rctrl = +compose(rctrl)
+ compose:rctrl-altgr = +compose(rctrl-altgr)
compose:caps = +compose(caps)
+ compose:caps-altgr = +compose(caps-altgr)
compose:102 = +compose(102)
+ compose:102-altgr = +compose(102-altgr)
compose:paus = +compose(paus)
compose:prsc = +compose(prsc)
compose:sclk = +compose(sclk)
@@ -1103,6 +1135,7 @@
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
+ japan:hztg_escape = +jp(hztg_escape)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
@@ -1126,6 +1159,7 @@
shift:both_shiftlock = +shift(both_shiftlock)
shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock)
shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock)
+ solaris:sun_compat = +sun_vndr/solaris(sun_compat)
lv3:caps_switch = +level3(caps_switch)
lv3:bksl_switch = +level3(bksl_switch)
lv3:lsgt_switch = +level3(lsgt_switch)
@@ -1149,6 +1183,7 @@
grp_led:scroll = +ledscroll(group_lock)
japan:kana_lock = +japan(kana_lock)
caps:shiftlock = +ledcaps(shift_lock)
+ grab:break_actions = +xfree86(grab_break)
! option = types
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.5 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.5 Mon Sep 26 15:19:45 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Tue Feb 25 13:07:29 2014
@@ -170,7 +170,15 @@
hhk Happy Hacking Keyboard
classmate Classmate PC
olpc OLPC
- sun6 Sun Type 5/6
+ sun_type7_usb Sun Type 7 USB
+ sun_type7_euro_usb Sun Type 7 USB (European layout)
+ sun_type7_unix_usb Sun Type 7 USB (Unix layout)
+ sun_type7_jp_usb Sun Type 7 USB (Japanese layout) / Japanese 106-key
+ sun_type6_usb Sun Type 6/7 USB
+ sun_type6_euro_usb Sun Type 6/7 USB (European layout)
+ sun_type6_unix_usb Sun Type 6 USB (Unix layout)
+ sun_type6_jp_usb Sun Type 6 USB (Japanese layout)
+ sun_type6_jp Sun Type 6 (Japanese layout)
targa_v811 Targa Visionary 811
unitekkb1925 Unitek KB-1925
compalfl90 FL90
@@ -179,7 +187,6 @@
! layout
us English (US)
- ad Catalan
af Afghani
ara Arabic
al Albanian
@@ -245,7 +252,7 @@
ch German (Switzerland)
sy Arabic (Syria)
tj Tajik
- lk Sinhala
+ lk Sinhala (phonetic)
th Thai
tr Turkish
tw Taiwanese
@@ -271,6 +278,7 @@
ke Swahili (Kenya)
bw Tswana
ph Filipino
+ md Moldavian
! variant
chr us: Cherokee
@@ -279,7 +287,7 @@
alt-intl us: English (US, alternative international)
colemak us: English (Colemak)
dvorak us: English (Dvorak)
- dvorak-intl us: English (Dvorak international with dead keys)
+ dvorak-intl us: English (Dvorak, international with dead keys)
dvorak-alt-intl us: English (Dvorak alternative international no dead keys)
dvorak-l us: English (left handed Dvorak)
dvorak-r us: English (right handed Dvorak)
@@ -290,6 +298,8 @@
altgr-intl us: English (international AltGr dead keys)
olpc2 us: English (layout toggle on multiply/divide key)
hbs us: Serbo-Croatian (US)
+ workman us: English (Workman)
+ workman-intl us: English (Workman, international with dead keys)
ps af: Pashto
uz af: Uzbek (Afghanistan)
olpc-ps af: Pashto (Afghanistan, OLPC)
@@ -320,8 +330,12 @@
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
probhat bd: Bengali (Probhat)
- ben in: Bengali
- ben_probhat in: Bengali (Probhat)
+ ben in: Bengali (India)
+ ben_probhat in: Bengali (India, Probhat)
+ ben_baishakhi in: Bengali (India, Baishakhi)
+ ben_bornona in: Bengali (India, Bornona)
+ ben_gitanjali in: Bengali (India, Uni Gitanjali)
+ ben_inscript in: Bengali (India, Baishakhi Inscript)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
@@ -361,9 +375,9 @@
tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
french cm: French (Cameroon)
- qwerty cm: English (Cameroon qwerty)
- azerty cm: French (Cameroon azerty)
- dvorak cm: English (Cameroon Dvorak)
+ qwerty cm: Cameroon Multilingual (qwerty)
+ azerty cm: Cameroon Multilingual (azerty)
+ dvorak cm: Cameroon Multilingual (Dvorak)
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -438,6 +452,7 @@
deadacute de: German (dead acute)
deadgraveacute de: German (dead grave acute)
nodeadkeys de: German (eliminate dead keys)
+ T3 de: German (T3)
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, eliminate dead keys)
dvorak de: German (Dvorak)
@@ -449,6 +464,7 @@
dsb_qwertz de: Lower Sorbian (qwertz)
qwerty de: German (qwerty)
ru de: Russian (Germany, phonetic)
+ legacy de: German (legacy)
simple gr: Greek (simple)
extended gr: Greek (extended)
nodeadkeys gr: Greek (eliminate dead keys)
@@ -483,10 +499,12 @@
mac it: Italian (Macintosh)
us it: Italian (US keyboard with Italian letters)
geo it: Georgian (Italy)
+ ibm it: Italian (IBM 142)
kana jp: Japanese (Kana)
kana86 jp: Japanese (Kana 86)
OADG109A jp: Japanese (OADG 109A)
mac jp: Japanese (Macintosh)
+ dvorak jp: Japanese (Dvorak)
phonetic kg: Kyrgyz (phonetic)
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
@@ -520,11 +538,14 @@
smi_nodeadkeys no: Northern Saami (Norway, eliminate dead keys)
mac no: Norwegian (Macintosh)
mac_nodeadkeys no: Norwegian (Macintosh, eliminate dead keys)
+ colemak no: Norwegian (Colemak)
+ legacy pl: Polish (legacy)
qwertz pl: Polish (qwertz)
dvorak pl: Polish (Dvorak)
dvorak_quotes pl: Polish (Dvorak, Polish quotes on quotemark key)
dvorak_altquotes pl: Polish (Dvorak, Polish quotes on key 1)
csb pl: Kashubian
+ szl pl: Silesian
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (eliminate dead keys)
@@ -554,15 +575,16 @@
sah ru: Yakut
xal ru: Kalmyk
dos ru: Russian (DOS)
+ mac ru: Russian (Macintosh)
srp ru: Serbian (Russia)
bak ru: Bashkirian
chm ru: Mari
- yz rs: Serbian (Z and ZHE swapped)
+ yz rs: Serbian (Cyrillic, Z and ZHE swapped)
latin rs: Serbian (Latin)
latinunicode rs: Serbian (Latin Unicode)
latinyz rs: Serbian (Latin qwerty)
latinunicodeyz rs: Serbian (Latin Unicode qwerty)
- alternatequotes rs: Serbian (with guillemets)
+ alternatequotes rs: Serbian (Cyrillic with guillemets)
latinalternatequotes rs: Serbian (Latin with guillemets)
rue rs: Pannonian Rusyn (homophonic)
alternatequotes si: Slovenian (use guillemets for quotes)
@@ -659,6 +681,7 @@
colemak-bay ph: Filipino (Colemak Baybayin)
dvorak ph: Filipino (Dvorak Latin)
dvorak-bay ph: Filipino (Dvorak Baybayin)
+ gag md: Moldavian (Gagauz)
! option
grp Key(s) to change layout
@@ -685,6 +708,7 @@
grp:rctrl_rshift_toggle Right Ctrl+Right Shift
grp:ctrl_alt_toggle Alt+Ctrl
grp:alt_shift_toggle Alt+Shift
+ grp:lalt_lshift_toggle Left Alt+Left Shift
grp:alt_space_toggle Alt+Space
grp:menu_toggle Menu
grp:lwin_toggle Left Win
@@ -710,17 +734,18 @@
lv3:caps_switch Caps Lock
lv3:bksl_switch Backslash
lv3:lsgt_switch <Less/Greater>
- lv3:caps_switch_latch Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
- lv3:bksl_switch_latch Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
- lv3:lsgt_switch_latch <Less/Greater> (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
+ lv3:caps_switch_latch Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+ lv3:bksl_switch_latch Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+ lv3:lsgt_switch_latch <Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
ctrl Ctrl key position
- ctrl:nocaps Make Caps Lock an additional Ctrl
- ctrl:lctrl_meta Meta on Left Ctrl
+ ctrl:nocaps Caps Lock as Ctrl
+ ctrl:lctrl_meta Left Ctrl as Meta
ctrl:swapcaps Swap Ctrl and Caps Lock
- ctrl:ctrl_ac At left of 'A'
- ctrl:ctrl_aa At bottom left
- ctrl:ctrl_ra Right Ctrl as Right Alt
- ctrl:ctrl_menu Right Ctrl is mapped to Menu
+ ctrl:ac_ctrl At left of 'A'
+ ctrl:aa_ctrl At bottom left
+ ctrl:rctrl_ralt Right Ctrl as Right Alt
+ ctrl:menu_rctrl Menu as Right Ctrl
+ ctrl:ctrl_ralt Right Alt as Right Ctrl
grp_led Use keyboard LED to show alternative layout
grp_led:num Num Lock
grp_led:caps Caps Lock
@@ -761,28 +786,36 @@
altwin Alt/Win key behavior
altwin:menu Add the standard behavior to Menu key
altwin:meta_alt Alt and Meta are on Alt keys
+ altwin:alt_win Alt is mapped to Win keys (and the usual Alt keys)
altwin:ctrl_win Control is mapped to Win keys (and the usual Ctrl keys)
altwin:ctrl_alt_win Control is mapped to Alt keys, Alt is mapped to Win keys
altwin:meta_win Meta is mapped to Win keys
altwin:left_meta_win Meta is mapped to Left Win
altwin:hyper_win Hyper is mapped to Win-keys
altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
- altwin:swap_lalt_lwin Left Alt is swapped with Left Win
+ altwin:swap_alt_win Alt is swapped with Win
Compose key Compose key position
compose:ralt Right Alt
compose:lwin Left Win
+ compose:lwin-altgr 3rd level of Left Win
compose:rwin Right Win
+ compose:rwin-altgr 3rd level of Right Win
compose:menu Menu
+ compose:menu-altgr 3rd level of Menu
compose:lctrl Left Ctrl
+ compose:lctrl-altgr 3rd level of Left Ctrl
compose:rctrl Right Ctrl
+ compose:rctrl-altgr 3rd level of Right Ctrl
compose:caps Caps Lock
+ compose:caps-altgr 3rd level of Caps Lock
compose:102 <Less/Greater>
+ compose:102-altgr 3rd level of <Less/Greater>
compose:paus Pause
compose:prsc PrtSc
compose:sclk Scroll Lock
compat Miscellaneous compatibility options
numpad:pc Default numeric keypad keys
- numpad:mac Numeric keypad keys work as with Macintosh
+ numpad:mac Numeric keypad keys always enter digits (as in Mac OS)
numpad:microsoft Shift with numeric keypad keys works as in MS Windows
numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server
@@ -793,7 +826,8 @@
shift:both_capslock_cancel Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates
shift:both_shiftlock Both Shift-Keys together toggle ShiftLock
keypad:pointerkeys Toggle PointerKeys with Shift + NumLock.
- eurosign Adding currency signs to certain keys
+ grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
+ currencysign Adding currency signs to certain keys
eurosign:e Euro on E
eurosign:2 Euro on 2
eurosign:4 Euro on 4
@@ -804,12 +838,6 @@
lv5:ralt_switch_lock Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser
lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser
lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser
- lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:ralt_switch_lock_cancel Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:lwin_switch_lock_cancel Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:rwin_switch_lock_cancel Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:ralt_switch_lock_cancel Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
nbsp Using space key to input non-breakable space character
nbsp:none Usual space at any level
nbsp:level2 Non-breakable space character at second level
@@ -830,8 +858,11 @@
japan Japanese keyboard options
japan:kana_lock Kana Lock key is locking
japan:nicola_f_bs NICOLA-F style Backspace
+ japan:hztg_escape Make Zenkaku Hankaku an additional ESC
esperanto Adding Esperanto circumflexes (supersigno)
esperanto:qwerty To the corresponding key in a Qwerty keyboard.
esperanto:dvorak To the corresponding key in a Dvorak keyboard.
+ solaris Maintain key compatibility with old Solaris keycodes
+ solaris:sun_compat Sun Key compatibility
terminate Key sequence to kill the X server
terminate:ctrl_alt_bksp Control + Alt + Backspace
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.5 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.5 Mon Sep 26 15:19:45 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Tue Feb 25 13:07:29 2014
@@ -106,10 +106,22 @@
! $thinkpads = thinkpad thinkpad60 thinkpadz60
-! $sun_t6_custom = ara be br ca ch cz de dk \
- ee es fi fr gb gr it kr \
- lt lv nl no pl pt ro ru \
- se sk tr tw ua
+! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
+ sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \
+ sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb
+
+! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
+
+// Sun Type_6_7 keyboards with custom layouts
+! $sun_custom = ara be br ca ch cz de dk \
+ ee es fi fr gb gr it jp \
+ kr lt lv nl no pl pt ro \
+ ru se sk tr tw ua us
+
+! $sun_var = sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \
+ sun_type7 sun_type7_suncompat suncompat
+
+! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
! $htcdreamlayouts = us it de
@@ -118,6 +130,8 @@
! model = keycodes
pc98 = evdev(pc98)
applealu_jis = evdev+macintosh(jisevdev)
+ olpc = evdev+olpc(olpc)
+ olpcm = evdev+olpc(olpcm)
* = evdev
! layout[1] = keycodes
@@ -162,6 +176,15 @@
hhk = hhk(basic)
kinesis = kinesis(model100)
$nokiamodels = nokia(%m)
+ sun_type6_jp = sun(type6jp)
+ sun_type6_usb = sun(type6)
+ sun_type6_euro_usb = sun(type6tuv)
+ sun_type6_jp_usb = sun(type6jp)
+ sun_type6_unix_usb = sun(type6unix)
+ sun_type7_jp_usb = sun(type6jp)
+ sun_type7_usb = sun(type7)
+ sun_type7_euro_usb = sun(type7tuv)
+ sun_type7_unix_usb = sun(type7unix)
* = pc(pc104)
! model layout variant = symbols
@@ -218,6 +241,7 @@
classmate us alt-intl = pc+us(classmate-alt-intl)
classmate us altgr-intl = pc+us(classmate-altgr-intl)
nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty)
+ * $sun_custom $sun_var = pc+sun_vndr/%l%(v)
! model layout = symbols
* ar = pc+ara
@@ -236,7 +260,6 @@
* lo = pc+la
* kan = pc+in(kan)
* mi = pc+mao
- * ml = pc+in(mal)
* ogham = pc+ie(ogam)
* ori = pc+ie(ori)
* sapmi = pc+no(smi)
@@ -303,18 +326,7 @@
classmate us = pc+%l(classmate)
empty * = empty(basic)
* empty = empty(basic)
- sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2
- sun4 * = latin+sun_vndr/us(type4)+%l%(v)
- sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2
- sun5 * = latin+sun_vndr/us(type5)+%l%(v)
- sun6 us = pc+sun_vndr/us(type6)
- sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic)
- sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
- sun6 * = pc+sun_vndr/us(type6)+%l%(v)
- sun6euro us = pc+sun_vndr/us(type6)
- sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic)
- sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
- sun6euro * = pc+sun_vndr/us(type6)+%l%(v)
+ $sun $sun_custom = pc+sun_vndr/%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old en_US = macintosh_vndr/us(oldmac)
@@ -333,6 +345,8 @@
nokiasu8w * = nokia_vndr/su-8w(%l)
olpc $olpclayouts = olpc+%l%(m)
olpc * = olpc+%l%(v)
+ olpcm $olpclayouts = olpc+%l%(m)
+ olpcm * = olpc+%l%(v)
$thinkpads br = pc+br(thinkpad)
sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic)
ws003sh * = pc+sharp_vndr/ws003sh(basic)
@@ -360,7 +374,6 @@
* lo = pc+la%(v[1])
* kan = pc+in(kan)
* mi = pc+mao%(v[1])
- * ml = pc+in(mal)
* ogham = pc+ie(ogam)
* ori = pc+ie(ori)
* sapmi = pc+no(smi)
@@ -422,8 +435,7 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
- sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1])
- sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1])
+ $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1])
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
@@ -504,7 +516,6 @@
* lo = +la%(v[2]):2
* kan = +in(kan):2
* mi = +mao%(v[2]):2
- * ml = +in(mal):2
* ogham = +ie(ogam):2
* ori = +ie(ori):2
* sapmi = +no(smi):2
@@ -566,6 +577,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):2
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2
nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2
+ $sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2
* * = +%l[2]%(v[2]):2
! model layout[3] = symbols
@@ -585,7 +597,6 @@
* lo = +la%(v[3]):3
* kan = +in(kan):3
* mi = +mao%(v[3]):3
- * ml = +in(mal):3
* ogham = +ie(ogam):3
* ori = +ie(ori):3
* sapmi = +no(smi):3
@@ -647,6 +658,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):3
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3
nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3
+ $sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3
* * = +%l[3]%(v[3]):3
! model layout[4] = symbols
@@ -666,7 +678,6 @@
* lo = +la%(v[4]):4
* kan = +in(kan):4
* mi = +mao%(v[4]):4
- * ml = +in(mal):4
* ogham = +ie(ogam):4
* ori = +ie(ori):4
* sapmi = +no(smi):4
@@ -728,6 +739,7 @@
* yu(unicodeyz) = +srp(latinunicodeyz):4
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4
nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4
+ $sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4
* * = +%l[4]%(v[4]):4
! model layout[2] variant[2] = symbols
@@ -890,23 +902,29 @@
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[1] variant[1] = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ jp $sun_compat = complete+japan(kana_lock)
! layout[2] variant[2] = compat
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ jp $sun_compat = +complete+japan(kana_lock):2
! layout[3] variant[3] = compat
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ jp $sun_compat = +complete+japan(kana_lock):3
! layout[4] variant[4] = compat
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ jp $sun_compat = +complete+japan(kana_lock):4
! model layout = compat
pc98 nec_vndr/jp = pc98(basic)
* jp = complete+japan
- olpc * = olpc
+ olpc * = olpc
+ olpcm * = olpc
* * = complete
! model layout[1] = compat
@@ -942,13 +960,14 @@
grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
altwin:meta_alt = +altwin(meta_alt)
+ altwin:alt_win = +altwin(alt_win)
altwin:ctrl_win = +altwin(ctrl_win)
altwin:ctrl_alt_win = +altwin(ctrl_alt_win)
altwin:meta_win = +altwin(meta_win)
altwin:left_meta_win = +altwin(left_meta_win)
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
- altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
+ altwin:swap_alt_win = +altwin(swap_alt_win)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)
@@ -958,17 +977,12 @@
grp:shifts_toggle = +group(shifts_toggle)
grp:ctrls_toggle = +group(ctrls_toggle)
grp:alts_toggle = +group(alts_toggle)
- grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
- grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
- grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
grp:caps_toggle = +capslock(grouplock)
grp:caps_switch = +capslock(groupshift)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:shift_caps_switch = +group(shift_caps_switch)
grp:win_menu_switch = +group(win_menu_switch)
grp:alt_caps_toggle = +group(alt_caps_toggle)
- grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
- grp:alt_shift_toggle = +group(alt_shift_toggle)
grp:alt_space_toggle = +group(alt_space_toggle)
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
@@ -982,6 +996,18 @@
grp:sclk_toggle = +group(sclk_toggle)
grp:lctrl_rctrl_switch = +group(lctrl_rctrl_switch)
grp:lctrl_lwin_rctrl_menu = +group(lctrl_lwin_rctrl_menu)
+ grp:lctrl_lalt_toggle = +group(lctrl_lalt_toggle)
+ grp:rctrl_ralt_toggle = +group(rctrl_ralt_toggle)
+ grp:ctrl_alt_toggle = +group(ctrl_alt_toggle)
+ grp:ctrl_alt_toggle_bidir = +group(ctrl_alt_toggle_bidir)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
+ grp:rctrl_rshift_toggle = +group(rctrl_rshift_toggle)
+ grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:ctrl_shift_toggle_bidir = +group(ctrl_shift_toggle_bidir)
+ grp:lalt_lshift_toggle = +group(lalt_lshift_toggle)
+ grp:ralt_rshift_toggle = +group(ralt_rshift_toggle)
+ grp:alt_shift_toggle = +group(alt_shift_toggle)
+ grp:alt_shift_toggle_bidir = +group(alt_shift_toggle_bidir)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -1006,18 +1032,26 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
- ctrl:ctrl_ac = +ctrl(ctrl_ac)
- ctrl:ctrl_aa = +ctrl(ctrl_aa)
- ctrl:ctrl_ra = +ctrl(ctrl_ra)
- ctrl:ctrl_menu = +ctrl(ctrl_menu)
+ ctrl:ac_ctrl = +ctrl(ac_ctrl)
+ ctrl:aa_ctrl = +ctrl(aa_ctrl)
+ ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
+ ctrl:menu_rctrl = +ctrl(menu_rctrl)
+ ctrl:ralt_rctrl = +ctrl(ralt_rctrl)
compose:ralt = +compose(ralt)
compose:lwin = +compose(lwin)
+ compose:lwin-altgr = +compose(lwin-altgr)
compose:rwin = +compose(rwin)
+ compose:rwin-altgr = +compose(rwin-altgr)
compose:menu = +compose(menu)
+ compose:menu-altgr = +compose(menu-altgr)
compose:lctrl = +compose(lctrl)
+ compose:lctrl-altgr = +compose(lctrl-altgr)
compose:rctrl = +compose(rctrl)
+ compose:rctrl-altgr = +compose(rctrl-altgr)
compose:caps = +compose(caps)
+ compose:caps-altgr = +compose(caps-altgr)
compose:102 = +compose(102)
+ compose:102-altgr = +compose(102-altgr)
compose:paus = +compose(paus)
compose:prsc = +compose(prsc)
compose:sclk = +compose(sclk)
@@ -1044,6 +1078,7 @@
nbsp:level4n = +nbsp(level4n)
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
+ japan:hztg_escape = +jp(hztg_escape)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
@@ -1067,6 +1102,7 @@
shift:both_shiftlock = +shift(both_shiftlock)
shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock)
shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock)
+ solaris:sun_compat = +sun_vndr/solaris(sun_compat)
lv3:caps_switch = +level3(caps_switch)
lv3:bksl_switch = +level3(bksl_switch)
lv3:lsgt_switch = +level3(lsgt_switch)
@@ -1090,6 +1126,7 @@
grp_led:scroll = +ledscroll(group_lock)
japan:kana_lock = +japan(kana_lock)
caps:shiftlock = +ledcaps(shift_lock)
+ grab:break_actions = +xfree86(grab_break)
! option = types
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.5 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.5 Mon Sep 26 15:19:45 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Tue Feb 25 13:07:29 2014
@@ -170,7 +170,15 @@
hhk Happy Hacking Keyboard
classmate Classmate PC
olpc OLPC
- sun6 Sun Type 5/6
+ sun_type7_usb Sun Type 7 USB
+ sun_type7_euro_usb Sun Type 7 USB (European layout)
+ sun_type7_unix_usb Sun Type 7 USB (Unix layout)
+ sun_type7_jp_usb Sun Type 7 USB (Japanese layout) / Japanese 106-key
+ sun_type6_usb Sun Type 6/7 USB
+ sun_type6_euro_usb Sun Type 6/7 USB (European layout)
+ sun_type6_unix_usb Sun Type 6 USB (Unix layout)
+ sun_type6_jp_usb Sun Type 6 USB (Japanese layout)
+ sun_type6_jp Sun Type 6 (Japanese layout)
targa_v811 Targa Visionary 811
unitekkb1925 Unitek KB-1925
compalfl90 FL90
@@ -179,7 +187,6 @@
! layout
us English (US)
- ad Catalan
af Afghani
ara Arabic
al Albanian
@@ -245,7 +252,7 @@
ch German (Switzerland)
sy Arabic (Syria)
tj Tajik
- lk Sinhala
+ lk Sinhala (phonetic)
th Thai
tr Turkish
tw Taiwanese
@@ -271,6 +278,7 @@
ke Swahili (Kenya)
bw Tswana
ph Filipino
+ md Moldavian
! variant
chr us: Cherokee
@@ -279,7 +287,7 @@
alt-intl us: English (US, alternative international)
colemak us: English (Colemak)
dvorak us: English (Dvorak)
- dvorak-intl us: English (Dvorak international with dead keys)
+ dvorak-intl us: English (Dvorak, international with dead keys)
dvorak-alt-intl us: English (Dvorak alternative international no dead keys)
dvorak-l us: English (left handed Dvorak)
dvorak-r us: English (right handed Dvorak)
@@ -290,6 +298,8 @@
altgr-intl us: English (international AltGr dead keys)
olpc2 us: English (layout toggle on multiply/divide key)
hbs us: Serbo-Croatian (US)
+ workman us: English (Workman)
+ workman-intl us: English (Workman, international with dead keys)
ps af: Pashto
uz af: Uzbek (Afghanistan)
olpc-ps af: Pashto (Afghanistan, OLPC)
@@ -320,8 +330,12 @@
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
probhat bd: Bengali (Probhat)
- ben in: Bengali
- ben_probhat in: Bengali (Probhat)
+ ben in: Bengali (India)
+ ben_probhat in: Bengali (India, Probhat)
+ ben_baishakhi in: Bengali (India, Baishakhi)
+ ben_bornona in: Bengali (India, Bornona)
+ ben_gitanjali in: Bengali (India, Uni Gitanjali)
+ ben_inscript in: Bengali (India, Baishakhi Inscript)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
@@ -361,9 +375,9 @@
tifinagh-phonetic ma: Berber (Morocco, Tifinagh phonetic)
tifinagh-extended-phonetic ma: Berber (Morocco, Tifinagh extended phonetic)
french cm: French (Cameroon)
- qwerty cm: English (Cameroon qwerty)
- azerty cm: French (Cameroon azerty)
- dvorak cm: English (Cameroon Dvorak)
+ qwerty cm: Cameroon Multilingual (qwerty)
+ azerty cm: Cameroon Multilingual (azerty)
+ dvorak cm: Cameroon Multilingual (Dvorak)
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -438,6 +452,7 @@
deadacute de: German (dead acute)
deadgraveacute de: German (dead grave acute)
nodeadkeys de: German (eliminate dead keys)
+ T3 de: German (T3)
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, eliminate dead keys)
dvorak de: German (Dvorak)
@@ -449,6 +464,7 @@
dsb_qwertz de: Lower Sorbian (qwertz)
qwerty de: German (qwerty)
ru de: Russian (Germany, phonetic)
+ legacy de: German (legacy)
simple gr: Greek (simple)
extended gr: Greek (extended)
nodeadkeys gr: Greek (eliminate dead keys)
@@ -483,10 +499,12 @@
mac it: Italian (Macintosh)
us it: Italian (US keyboard with Italian letters)
geo it: Georgian (Italy)
+ ibm it: Italian (IBM 142)
kana jp: Japanese (Kana)
kana86 jp: Japanese (Kana 86)
OADG109A jp: Japanese (OADG 109A)
mac jp: Japanese (Macintosh)
+ dvorak jp: Japanese (Dvorak)
phonetic kg: Kyrgyz (phonetic)
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
@@ -520,11 +538,14 @@
smi_nodeadkeys no: Northern Saami (Norway, eliminate dead keys)
mac no: Norwegian (Macintosh)
mac_nodeadkeys no: Norwegian (Macintosh, eliminate dead keys)
+ colemak no: Norwegian (Colemak)
+ legacy pl: Polish (legacy)
qwertz pl: Polish (qwertz)
dvorak pl: Polish (Dvorak)
dvorak_quotes pl: Polish (Dvorak, Polish quotes on quotemark key)
dvorak_altquotes pl: Polish (Dvorak, Polish quotes on key 1)
csb pl: Kashubian
+ szl pl: Silesian
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (eliminate dead keys)
@@ -554,15 +575,16 @@
sah ru: Yakut
xal ru: Kalmyk
dos ru: Russian (DOS)
+ mac ru: Russian (Macintosh)
srp ru: Serbian (Russia)
bak ru: Bashkirian
chm ru: Mari
- yz rs: Serbian (Z and ZHE swapped)
+ yz rs: Serbian (Cyrillic, Z and ZHE swapped)
latin rs: Serbian (Latin)
latinunicode rs: Serbian (Latin Unicode)
latinyz rs: Serbian (Latin qwerty)
latinunicodeyz rs: Serbian (Latin Unicode qwerty)
- alternatequotes rs: Serbian (with guillemets)
+ alternatequotes rs: Serbian (Cyrillic with guillemets)
latinalternatequotes rs: Serbian (Latin with guillemets)
rue rs: Pannonian Rusyn (homophonic)
alternatequotes si: Slovenian (use guillemets for quotes)
@@ -659,6 +681,7 @@
colemak-bay ph: Filipino (Colemak Baybayin)
dvorak ph: Filipino (Dvorak Latin)
dvorak-bay ph: Filipino (Dvorak Baybayin)
+ gag md: Moldavian (Gagauz)
! option
grp Key(s) to change layout
@@ -685,6 +708,7 @@
grp:rctrl_rshift_toggle Right Ctrl+Right Shift
grp:ctrl_alt_toggle Alt+Ctrl
grp:alt_shift_toggle Alt+Shift
+ grp:lalt_lshift_toggle Left Alt+Left Shift
grp:alt_space_toggle Alt+Space
grp:menu_toggle Menu
grp:lwin_toggle Left Win
@@ -710,17 +734,18 @@
lv3:caps_switch Caps Lock
lv3:bksl_switch Backslash
lv3:lsgt_switch <Less/Greater>
- lv3:caps_switch_latch Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
- lv3:bksl_switch_latch Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
- lv3:lsgt_switch_latch <Less/Greater> (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
+ lv3:caps_switch_latch Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+ lv3:bksl_switch_latch Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+ lv3:lsgt_switch_latch <Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
ctrl Ctrl key position
- ctrl:nocaps Make Caps Lock an additional Ctrl
- ctrl:lctrl_meta Meta on Left Ctrl
+ ctrl:nocaps Caps Lock as Ctrl
+ ctrl:lctrl_meta Left Ctrl as Meta
ctrl:swapcaps Swap Ctrl and Caps Lock
- ctrl:ctrl_ac At left of 'A'
- ctrl:ctrl_aa At bottom left
- ctrl:ctrl_ra Right Ctrl as Right Alt
- ctrl:ctrl_menu Right Ctrl is mapped to Menu
+ ctrl:ac_ctrl At left of 'A'
+ ctrl:aa_ctrl At bottom left
+ ctrl:rctrl_ralt Right Ctrl as Right Alt
+ ctrl:menu_rctrl Menu as Right Ctrl
+ ctrl:ctrl_ralt Right Alt as Right Ctrl
grp_led Use keyboard LED to show alternative layout
grp_led:num Num Lock
grp_led:caps Caps Lock
@@ -761,28 +786,36 @@
altwin Alt/Win key behavior
altwin:menu Add the standard behavior to Menu key
altwin:meta_alt Alt and Meta are on Alt keys
+ altwin:alt_win Alt is mapped to Win keys (and the usual Alt keys)
altwin:ctrl_win Control is mapped to Win keys (and the usual Ctrl keys)
altwin:ctrl_alt_win Control is mapped to Alt keys, Alt is mapped to Win keys
altwin:meta_win Meta is mapped to Win keys
altwin:left_meta_win Meta is mapped to Left Win
altwin:hyper_win Hyper is mapped to Win-keys
altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
- altwin:swap_lalt_lwin Left Alt is swapped with Left Win
+ altwin:swap_alt_win Alt is swapped with Win
Compose key Compose key position
compose:ralt Right Alt
compose:lwin Left Win
+ compose:lwin-altgr 3rd level of Left Win
compose:rwin Right Win
+ compose:rwin-altgr 3rd level of Right Win
compose:menu Menu
+ compose:menu-altgr 3rd level of Menu
compose:lctrl Left Ctrl
+ compose:lctrl-altgr 3rd level of Left Ctrl
compose:rctrl Right Ctrl
+ compose:rctrl-altgr 3rd level of Right Ctrl
compose:caps Caps Lock
+ compose:caps-altgr 3rd level of Caps Lock
compose:102 <Less/Greater>
+ compose:102-altgr 3rd level of <Less/Greater>
compose:paus Pause
compose:prsc PrtSc
compose:sclk Scroll Lock
compat Miscellaneous compatibility options
numpad:pc Default numeric keypad keys
- numpad:mac Numeric keypad keys work as with Macintosh
+ numpad:mac Numeric keypad keys always enter digits (as in Mac OS)
numpad:microsoft Shift with numeric keypad keys works as in MS Windows
numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server
@@ -793,7 +826,8 @@
shift:both_capslock_cancel Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates
shift:both_shiftlock Both Shift-Keys together toggle ShiftLock
keypad:pointerkeys Toggle PointerKeys with Shift + NumLock.
- eurosign Adding currency signs to certain keys
+ grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
+ currencysign Adding currency signs to certain keys
eurosign:e Euro on E
eurosign:2 Euro on 2
eurosign:4 Euro on 4
@@ -804,12 +838,6 @@
lv5:ralt_switch_lock Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser
lv5:lwin_switch_lock Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser
lv5:rwin_switch_lock Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser
- lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:ralt_switch_lock_cancel Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:lwin_switch_lock_cancel Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:rwin_switch_lock_cancel Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
- lv5:ralt_switch_lock_cancel Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
nbsp Using space key to input non-breakable space character
nbsp:none Usual space at any level
nbsp:level2 Non-breakable space character at second level
@@ -830,8 +858,11 @@
japan Japanese keyboard options
japan:kana_lock Kana Lock key is locking
japan:nicola_f_bs NICOLA-F style Backspace
+ japan:hztg_escape Make Zenkaku Hankaku an additional ESC
esperanto Adding Esperanto circumflexes (supersigno)
esperanto:qwerty To the corresponding key in a Qwerty keyboard.
esperanto:dvorak To the corresponding key in a Dvorak keyboard.
+ solaris Maintain key compatibility with old Solaris keycodes
+ solaris:sun_compat Sun Key compatibility
terminate Key sequence to kill the X server
terminate:ctrl_alt_bksp Control + Alt + Backspace
