Module Name: src
Committed By: mrg
Date: Mon Mar 17 09:02:02 UTC 2014
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst
Log Message:
regenerate for xkeyboard-config 2.11.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.6 Tue Feb 25 13:07:29 2014
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Mar 17 09:02:02 2014
@@ -40,45 +40,6 @@
! $azerty = be fr
! $qwertz = al cz de hr hu ro si sk
-! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
- airkey \
- apple armada azonaRF2300 \
- benqx brother \
- btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
- cherryblue cherrybluea cherryblueb \
- cherrycyboard cherrycmexpert \
- chicony chicony0108 chicony0420 chicony9885 \
- compalfl90 \
- compaqeak8 compaqik7 compaqik13 compaqik18 \
- creativedw7000 \
- cymotionlinux \
- dell dellm65 inspiron dellusbmm \
- emachines ennyah_dkb1008 evdev \
- genius geniuscomfy2 \
- gyration honeywell_euroboard \
- hp250x hp5xx hp500fa hpdv5 \
- hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
- ibm_spacesaver ipaq inspiron intel \
- logiaccess logicda logicink \
- logiex110 logiclx300 \
- logiinkse logiinkseusb logiitc logiik \
- logitech_base itouch logiultrax \
- logitech_g15 \
- logidinovo logidinovoedge \
- microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
- microsoftoffice microsoftmult \
- mx1998 mx2500 mx2750 \
- oretec \
- pc105 \
- presario propeller \
- qtronix \
- rapidaccess rapidaccess2 thinkpad60 \
- samsung4500 samsung4510 \
- silvercrest \
- sk1300 sk2500 sk6200 sk7100 \
- sven sven303 symplon \
- toshiba_s3000 trust trustda \
- unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
@@ -102,8 +63,6 @@
vn \
za
-! $evdevkbds = ibm_spacesaver
-
! $thinkpads = thinkpad thinkpad60 thinkpadz60
! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
@@ -125,6 +84,61 @@
! $htcdreamlayouts = us it de
+! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
+ airkey \
+ apple armada azonaRF2300 \
+ benqx brother \
+ btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
+ cherryblue cherrybluea cherryblueb \
+ cherrycyboard cherrycmexpert \
+ chicony chicony0108 chicony0420 chicony9885 \
+ compalfl90 \
+ compaqeak8 compaqik7 compaqik13 compaqik18 \
+ creativedw7000 \
+ cymotionlinux \
+ dell dellm65 inspiron dellusbmm \
+ emachines ennyah_dkb1008 evdev \
+ genius geniuscomfy2 \
+ gyration honeywell_euroboard \
+ hp250x hp5xx hp500fa hpdv5 \
+ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+ ibm_spacesaver ipaq inspiron intel \
+ logiaccess logicda logicink \
+ logiex110 logiclx300 \
+ logiinkse logiinkseusb logiitc logiik \
+ logitech_base itouch logiultrax \
+ logitech_g15 \
+ logidinovo logidinovoedge \
+ microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+ microsoftoffice microsoftmult \
+ mx1998 mx2500 mx2750 \
+ oretec \
+ pc105 \
+ presario propeller \
+ qtronix \
+ rapidaccess rapidaccess2 thinkpad60 \
+ samsung4500 samsung4510 \
+ silvercrest \
+ sk1300 sk2500 sk6200 sk7100 \
+ sven sven303 symplon \
+ toshiba_s3000 trust trustda \
+ unitekkb1925 yahoo
+
+! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
+ cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
+ armada presario dellm65 inspiron dellusbmm diamond \
+ ennyah_dkb1008 genius geniuscomfy2 hpi6 hpxe3gc hpxe3gf \
+ hpxt1000 hpzt11xx hpdv5 hpxe4xxx hp5xx thinkpad60 ogitech_base \
+ logidinovo logidinovoedge logitech_g15 mx1998 mx2500 mx2750 \
+ microsoft4000 microsoft7000 microsoftprooem microsoftmult \
+ propeller samsung4500 samsung4510 sk1300 sk2500 sk7100 \
+ toshiba_s3000 trust trustda cymotionlinux silvercrest \
+ emachines benqx unitekkb1925 creativedw7000 compalfl90 \
+ pc105 a4techKB21 a4techKBS8 a4_rfkb23 asus_laptop btc6301urf \
+ dexxa dtk2000 fscaa1667g geniuskb19e geniuscomfy latitude \
+ microsoftpro precision_m scorpius sp_inet targa_v811 thinkpad \
+ tm2030USB-102 tm2030USB-106 trust_slimline
+
! $dvoraklayouts = br ca de ee es fr gb no pl se us
! model = keycodes
@@ -957,6 +971,9 @@
sun_type7_jp_usb = +sun_vndr/solaris(defaults_type7jp)
$sun = +sun_vndr/solaris(defaults)
+! model layout = symbols
+ $inetmediakbds jp = +jp(henkan)
+
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
@@ -1025,6 +1042,7 @@
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
altwin:swap_alt_win = +altwin(swap_alt_win)
+ grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)
@@ -1147,6 +1165,7 @@
shift:breaks_caps = +shift(breaks_caps)
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
+ esperanto:colemak = +epo(colemak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
keypad:pointerkeys = +keypad(pointerkeys)
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.6 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.7
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.6 Tue Feb 25 13:07:29 2014
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Mon Mar 17 09:02:02 2014
@@ -195,7 +195,7 @@
az Azerbaijani
by Belarusian
be Belgian
- bd Bengali
+ bd Bangla
in Indian
ba Bosnian
br Portuguese (Brazil)
@@ -296,7 +296,7 @@
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (international AltGr dead keys)
- olpc2 us: English (layout toggle on multiply/divide key)
+ olpc2 us: English (the divide/multiply keys toggle the layout)
hbs us: Serbo-Croatian (US)
workman us: English (Workman)
workman-intl us: English (Workman, international with dead keys)
@@ -323,23 +323,25 @@
legacy by: Belarusian (legacy)
latin by: Belarusian (Latin)
oss be: Belgian (alternative)
- oss_latin9 be: Belgian (alternative, latin-9 only)
+ oss_latin9 be: Belgian (alternative, Latin-9 only)
oss_sundeadkeys be: Belgian (alternative, Sun dead keys)
iso-alternate be: Belgian (ISO alternate)
nodeadkeys be: Belgian (eliminate dead keys)
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
- probhat bd: 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)
+ probhat bd: Bangla (Probhat)
+ ben in: Bangla (India)
+ ben_probhat in: Bangla (India, Probhat)
+ ben_baishakhi in: Bangla (India, Baishakhi)
+ ben_bornona in: Bangla (India, Bornona)
+ ben_gitanjali in: Bangla (India, Uni Gitanjali)
+ ben_inscript in: Bangla (India, Baishakhi Inscript)
+ eeyek in: Manipuri (Eeyek)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
+ kan-kagapa in: Kannada (KaGaPa phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript with Rupee Sign)
@@ -350,11 +352,15 @@
tam_TSCII in: Tamil (TSCII typewriter)
tam in: Tamil
tel in: Telugu
+ tel-kagapa in: Telugu (KaGaPa phonetic)
urd-phonetic in: Urdu (phonetic)
urd-phonetic3 in: Urdu (alternative phonetic)
urd-winkeys in: Urdu (WinKeys)
bolnagri in: Hindi (Bolnagri)
hin-wx in: Hindi (Wx)
+ hin-kagapa in: Hindi (KaGaPa phonetic)
+ san-kagapa in: Sanskrit (KaGaPa phonetic)
+ mar-kagapa in: Marathi (KaGaPa phonetic)
eng in: English (India, with RupeeSign)
alternatequotes ba: Bosnian (use guillemets for quotes)
unicode ba: Bosnian (use Bosnian digraphs)
@@ -362,9 +368,9 @@
us ba: Bosnian (US keyboard with Bosnian letters)
nodeadkeys br: Portuguese (Brazil, eliminate dead keys)
dvorak br: Portuguese (Brazil, Dvorak)
- nativo br: Portuguese (Brazil, nativo)
- nativo-us br: Portuguese (Brazil, nativo for USA keyboards)
- nativo-epo br: Portuguese (Brazil, nativo for Esperanto)
+ nativo br: Portuguese (Brazil, Nativo)
+ nativo-us br: Portuguese (Brazil, Nativo for US keyboards)
+ nativo-epo br: Esperanto (Brazil, Nativo)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
french ma: French (Morocco)
@@ -387,7 +393,7 @@
eng ca: English (Canada)
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
- uig cn: Uyghur
+ ug cn: Uyghur
alternatequotes hr: Croatian (use guillemets for quotes)
unicode hr: Croatian (use Croatian digraphs)
unicodeus hr: Croatian (US keyboard with Croatian digraphs)
@@ -424,14 +430,14 @@
nodeadkeys fr: French (eliminate dead keys)
sundeadkeys fr: French (Sun dead keys)
oss fr: French (alternative)
- oss_latin9 fr: French (alternative, latin-9 only)
+ oss_latin9 fr: French (alternative, Latin-9 only)
oss_nodeadkeys fr: French (alternative, eliminate dead keys)
oss_sundeadkeys fr: French (alternative, Sun dead keys)
latin9 fr: French (legacy, alternative)
latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys)
latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys)
bepo fr: French (Bepo, ergonomic, Dvorak way)
- bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, latin-9 only)
+ bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
bre fr: French (Breton)
@@ -554,7 +560,7 @@
mac_nodeadkeys pt: Portuguese (Macintosh, eliminate dead keys)
mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
- nativo-us pt: Portuguese (Nativo for USA keyboards)
+ nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
@@ -586,7 +592,7 @@
latinunicodeyz rs: Serbian (Latin Unicode qwerty)
alternatequotes rs: Serbian (Cyrillic with guillemets)
latinalternatequotes rs: Serbian (Latin with guillemets)
- rue rs: Pannonian Rusyn (homophonic)
+ rue rs: Pannonian Rusyn
alternatequotes si: Slovenian (use guillemets for quotes)
us si: Slovenian (US keyboard with Slovenian letters)
bksl sk: Slovak (extended Backslash)
@@ -684,7 +690,7 @@
gag md: Moldavian (Gagauz)
! option
- grp Key(s) to change layout
+ grp Switching to another layout
grp:switch Right Alt (while pressed)
grp:lswitch Left Alt (while pressed)
grp:lwin_switch Left Win (while pressed)
@@ -728,7 +734,7 @@
lv3:alt_switch Any Alt key
lv3:lalt_switch Left Alt
lv3:ralt_switch Right Alt
- lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Multi_Key
+ lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose
lv3:ralt_alt Right Alt key never chooses 3rd level
lv3:enter_switch Enter on keypad
lv3:caps_switch Caps Lock
@@ -746,33 +752,36 @@
ctrl:rctrl_ralt Right Ctrl as Right Alt
ctrl:menu_rctrl Menu as Right Ctrl
ctrl:ctrl_ralt Right Alt as Right Ctrl
+ ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key
+ ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key
+ ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
grp_led Use keyboard LED to show alternative layout
grp_led:num Num Lock
grp_led:caps Caps Lock
grp_led:scroll Scroll Lock
- keypad Numeric keypad layout selection
+ keypad Layout of numeric keypad
keypad:legacy Legacy
keypad:oss Unicode additions (arrows and math operators)
- keypad:future Unicode additions (arrows and math operators). Math operators on default level
+ keypad:future Unicode additions (arrows and math operators; math operators on default level)
keypad:legacy_wang Legacy Wang 724
keypad:oss_wang Wang 724 keypad with Unicode additions (arrows and math operators)
- keypad:future_wang Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level
+ keypad:future_wang Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)
keypad:hex Hexadecimal
keypad:atm ATM/phone-style
kpdl Numeric keypad delete key behaviour
kpdl:dot Legacy key with dot
kpdl:comma Legacy key with comma
kpdl:dotoss Four-level key with dot
- kpdl:dotoss_latin9 Four-level key with dot, latin-9 restriction
+ kpdl:dotoss_latin9 Four-level key with dot, Latin-9 only
kpdl:commaoss Four-level key with comma
kpdl:momayyezoss Four-level key with momayyez
kpdl:kposs Four-level key with abstract separators
- kpdl:semi Semi-colon on third level
+ kpdl:semi Semicolon on third level
caps Caps Lock key behavior
- caps:internal Caps Lock uses internal capitalization. Shift "pauses" Caps Lock
- caps:internal_nocancel Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock
- caps:shift Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock
- caps:shift_nocancel Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock
+ caps:internal Caps Lock uses internal capitalization; Shift "pauses" Caps Lock
+ caps:internal_nocancel Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock
+ caps:shift Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock
+ caps:shift_nocancel Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock
caps:capslock Caps Lock toggles normal capitalization of alphabetic characters
caps:numlock Make Caps Lock an additional Num Lock
caps:swapescape Swap ESC and Caps Lock
@@ -780,21 +789,21 @@
caps:backspace Make Caps Lock an additional Backspace
caps:super Make Caps Lock an additional Super
caps:hyper Make Caps Lock an additional Hyper
- caps:shiftlock Caps Lock toggles Shift so all keys are affected
+ caps:shiftlock Caps Lock toggles ShiftLock (affects all keys)
caps:none Caps Lock is disabled
- caps:ctrl_modifier Make Caps Lock an additional Control but keep the Caps_Lock keysym
+ caps:ctrl_modifier Make Caps Lock an additional Ctrl
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:ctrl_win Ctrl is mapped to Win keys (and the usual Ctrl keys)
+ altwin:ctrl_alt_win Ctrl 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_alt_win Alt is swapped with Win
- Compose key Compose key position
+ Compose key Position of Compose key
compose:ralt Right Alt
compose:lwin Left Win
compose:lwin-altgr 3rd level of Left Win
@@ -822,11 +831,12 @@
apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)
shift:breaks_caps Shift cancels Caps Lock
misc:typo Enable extra typographic characters
- shift:both_capslock Both Shift-Keys together toggle Caps Lock
- 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.
+ shift:both_capslock Both Shift keys together toggle Caps Lock
+ 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 Shift + NumLock toggles PointerKeys
grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
+ grab:debug_actions Allow grab and window tree logging
currencysign Adding currency signs to certain keys
eurosign:e Euro on E
eurosign:2 Euro on 2
@@ -859,10 +869,11 @@
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.
+ esperanto Adding Esperanto supersigned letters
+ esperanto:qwerty To the corresponding key in a Qwerty layout
+ esperanto:dvorak To the corresponding key in a Dvorak layout
+ esperanto:colemak To the corresponding key in a Colemak layout
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
+ terminate:ctrl_alt_bksp Ctrl + Alt + Backspace
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.6 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.7
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.6 Tue Feb 25 13:07:29 2014
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Mon Mar 17 09:02:02 2014
@@ -40,45 +40,6 @@
! $azerty = be fr
! $qwertz = al cz de hr hu ro si sk
-! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
- airkey \
- apple armada azonaRF2300 \
- benqx brother \
- btc5113rf btc9000 btc9000a btc9001ah btc5090 btc9019u \
- cherryblue cherrybluea cherryblueb \
- cherrycyboard cherrycmexpert \
- chicony chicony0108 chicony0420 chicony9885 \
- compalfl90 \
- compaqeak8 compaqik7 compaqik13 compaqik18 \
- creativedw7000 \
- cymotionlinux \
- dell dellm65 inspiron dellusbmm \
- emachines ennyah_dkb1008 evdev \
- genius geniuscomfy2 \
- gyration honeywell_euroboard \
- hp250x hp5xx hp500fa hpdv5 \
- hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
- ibm_spacesaver ipaq inspiron intel \
- logiaccess logicda logicink \
- logiex110 logiclx300 \
- logiinkse logiinkseusb logiitc logiik \
- logitech_base itouch logiultrax \
- logitech_g15 \
- logidinovo logidinovoedge \
- microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
- microsoftoffice microsoftmult \
- mx1998 mx2500 mx2750 \
- oretec \
- pc105 \
- presario propeller \
- qtronix \
- rapidaccess rapidaccess2 thinkpad60 \
- samsung4500 samsung4510 \
- silvercrest \
- sk1300 sk2500 sk6200 sk7100 \
- sven sven303 symplon \
- toshiba_s3000 trust trustda \
- unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
@@ -102,8 +63,6 @@
vn \
za
-! $evdevkbds = ibm_spacesaver
-
! $thinkpads = thinkpad thinkpad60 thinkpadz60
! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \
@@ -125,6 +84,8 @@
! $htcdreamlayouts = us it de
+! $evdevkbds = ibm_spacesaver
+
! $dvoraklayouts = br ca de ee es fr gb no pl se us
! model = keycodes
@@ -900,6 +861,8 @@
applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
* = +inet(evdev)
+! model layout = symbols
+
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
jp $sun_compat = complete+japan(kana_lock)
@@ -968,6 +931,7 @@
altwin:hyper_win = +altwin(hyper_win)
altwin:alt_super_win = +altwin(alt_super_win)
altwin:swap_alt_win = +altwin(swap_alt_win)
+ grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
grp:win_switch = +group(win_switch)
@@ -1090,6 +1054,7 @@
shift:breaks_caps = +shift(breaks_caps)
esperanto:qwerty = +epo(qwerty)
esperanto:dvorak = +epo(dvorak)
+ esperanto:colemak = +epo(colemak)
terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp)
keypad:pointerkeys = +keypad(pointerkeys)
apple:alupckeys = +macintosh_vndr/apple(alupckeys)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.6 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.7
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.6 Tue Feb 25 13:07:29 2014
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Mon Mar 17 09:02:02 2014
@@ -195,7 +195,7 @@
az Azerbaijani
by Belarusian
be Belgian
- bd Bengali
+ bd Bangla
in Indian
ba Bosnian
br Portuguese (Brazil)
@@ -296,7 +296,7 @@
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (international AltGr dead keys)
- olpc2 us: English (layout toggle on multiply/divide key)
+ olpc2 us: English (the divide/multiply keys toggle the layout)
hbs us: Serbo-Croatian (US)
workman us: English (Workman)
workman-intl us: English (Workman, international with dead keys)
@@ -323,23 +323,25 @@
legacy by: Belarusian (legacy)
latin by: Belarusian (Latin)
oss be: Belgian (alternative)
- oss_latin9 be: Belgian (alternative, latin-9 only)
+ oss_latin9 be: Belgian (alternative, Latin-9 only)
oss_sundeadkeys be: Belgian (alternative, Sun dead keys)
iso-alternate be: Belgian (ISO alternate)
nodeadkeys be: Belgian (eliminate dead keys)
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
- probhat bd: 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)
+ probhat bd: Bangla (Probhat)
+ ben in: Bangla (India)
+ ben_probhat in: Bangla (India, Probhat)
+ ben_baishakhi in: Bangla (India, Baishakhi)
+ ben_bornona in: Bangla (India, Bornona)
+ ben_gitanjali in: Bangla (India, Uni Gitanjali)
+ ben_inscript in: Bangla (India, Baishakhi Inscript)
+ eeyek in: Manipuri (Eeyek)
guj in: Gujarati
guru in: Punjabi (Gurmukhi)
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
+ kan-kagapa in: Kannada (KaGaPa phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript with Rupee Sign)
@@ -350,11 +352,15 @@
tam_TSCII in: Tamil (TSCII typewriter)
tam in: Tamil
tel in: Telugu
+ tel-kagapa in: Telugu (KaGaPa phonetic)
urd-phonetic in: Urdu (phonetic)
urd-phonetic3 in: Urdu (alternative phonetic)
urd-winkeys in: Urdu (WinKeys)
bolnagri in: Hindi (Bolnagri)
hin-wx in: Hindi (Wx)
+ hin-kagapa in: Hindi (KaGaPa phonetic)
+ san-kagapa in: Sanskrit (KaGaPa phonetic)
+ mar-kagapa in: Marathi (KaGaPa phonetic)
eng in: English (India, with RupeeSign)
alternatequotes ba: Bosnian (use guillemets for quotes)
unicode ba: Bosnian (use Bosnian digraphs)
@@ -362,9 +368,9 @@
us ba: Bosnian (US keyboard with Bosnian letters)
nodeadkeys br: Portuguese (Brazil, eliminate dead keys)
dvorak br: Portuguese (Brazil, Dvorak)
- nativo br: Portuguese (Brazil, nativo)
- nativo-us br: Portuguese (Brazil, nativo for USA keyboards)
- nativo-epo br: Portuguese (Brazil, nativo for Esperanto)
+ nativo br: Portuguese (Brazil, Nativo)
+ nativo-us br: Portuguese (Brazil, Nativo for US keyboards)
+ nativo-epo br: Esperanto (Brazil, Nativo)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
french ma: French (Morocco)
@@ -387,7 +393,7 @@
eng ca: English (Canada)
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
- uig cn: Uyghur
+ ug cn: Uyghur
alternatequotes hr: Croatian (use guillemets for quotes)
unicode hr: Croatian (use Croatian digraphs)
unicodeus hr: Croatian (US keyboard with Croatian digraphs)
@@ -424,14 +430,14 @@
nodeadkeys fr: French (eliminate dead keys)
sundeadkeys fr: French (Sun dead keys)
oss fr: French (alternative)
- oss_latin9 fr: French (alternative, latin-9 only)
+ oss_latin9 fr: French (alternative, Latin-9 only)
oss_nodeadkeys fr: French (alternative, eliminate dead keys)
oss_sundeadkeys fr: French (alternative, Sun dead keys)
latin9 fr: French (legacy, alternative)
latin9_nodeadkeys fr: French (legacy, alternative, eliminate dead keys)
latin9_sundeadkeys fr: French (legacy, alternative, Sun dead keys)
bepo fr: French (Bepo, ergonomic, Dvorak way)
- bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, latin-9 only)
+ bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
bre fr: French (Breton)
@@ -554,7 +560,7 @@
mac_nodeadkeys pt: Portuguese (Macintosh, eliminate dead keys)
mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
- nativo-us pt: Portuguese (Nativo for USA keyboards)
+ nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
@@ -586,7 +592,7 @@
latinunicodeyz rs: Serbian (Latin Unicode qwerty)
alternatequotes rs: Serbian (Cyrillic with guillemets)
latinalternatequotes rs: Serbian (Latin with guillemets)
- rue rs: Pannonian Rusyn (homophonic)
+ rue rs: Pannonian Rusyn
alternatequotes si: Slovenian (use guillemets for quotes)
us si: Slovenian (US keyboard with Slovenian letters)
bksl sk: Slovak (extended Backslash)
@@ -684,7 +690,7 @@
gag md: Moldavian (Gagauz)
! option
- grp Key(s) to change layout
+ grp Switching to another layout
grp:switch Right Alt (while pressed)
grp:lswitch Left Alt (while pressed)
grp:lwin_switch Left Win (while pressed)
@@ -728,7 +734,7 @@
lv3:alt_switch Any Alt key
lv3:lalt_switch Left Alt
lv3:ralt_switch Right Alt
- lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Multi_Key
+ lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Compose
lv3:ralt_alt Right Alt key never chooses 3rd level
lv3:enter_switch Enter on keypad
lv3:caps_switch Caps Lock
@@ -746,33 +752,36 @@
ctrl:rctrl_ralt Right Ctrl as Right Alt
ctrl:menu_rctrl Menu as Right Ctrl
ctrl:ctrl_ralt Right Alt as Right Ctrl
+ ctrl:swap_lalt_lctl Swap Left Alt key with Left Ctrl key
+ ctrl:swap_lwin_lctl Swap Left Win key with Left Ctrl key
+ ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
grp_led Use keyboard LED to show alternative layout
grp_led:num Num Lock
grp_led:caps Caps Lock
grp_led:scroll Scroll Lock
- keypad Numeric keypad layout selection
+ keypad Layout of numeric keypad
keypad:legacy Legacy
keypad:oss Unicode additions (arrows and math operators)
- keypad:future Unicode additions (arrows and math operators). Math operators on default level
+ keypad:future Unicode additions (arrows and math operators; math operators on default level)
keypad:legacy_wang Legacy Wang 724
keypad:oss_wang Wang 724 keypad with Unicode additions (arrows and math operators)
- keypad:future_wang Wang 724 keypad with Unicode additions (arrows and math operators). Math operators on default level
+ keypad:future_wang Wang 724 keypad with Unicode additions (arrows and math operators; math operators on default level)
keypad:hex Hexadecimal
keypad:atm ATM/phone-style
kpdl Numeric keypad delete key behaviour
kpdl:dot Legacy key with dot
kpdl:comma Legacy key with comma
kpdl:dotoss Four-level key with dot
- kpdl:dotoss_latin9 Four-level key with dot, latin-9 restriction
+ kpdl:dotoss_latin9 Four-level key with dot, Latin-9 only
kpdl:commaoss Four-level key with comma
kpdl:momayyezoss Four-level key with momayyez
kpdl:kposs Four-level key with abstract separators
- kpdl:semi Semi-colon on third level
+ kpdl:semi Semicolon on third level
caps Caps Lock key behavior
- caps:internal Caps Lock uses internal capitalization. Shift "pauses" Caps Lock
- caps:internal_nocancel Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock
- caps:shift Caps Lock acts as Shift with locking. Shift "pauses" Caps Lock
- caps:shift_nocancel Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock
+ caps:internal Caps Lock uses internal capitalization; Shift "pauses" Caps Lock
+ caps:internal_nocancel Caps Lock uses internal capitalization; Shift doesn't affect Caps Lock
+ caps:shift Caps Lock acts as Shift with locking; Shift "pauses" Caps Lock
+ caps:shift_nocancel Caps Lock acts as Shift with locking; Shift doesn't affect Caps Lock
caps:capslock Caps Lock toggles normal capitalization of alphabetic characters
caps:numlock Make Caps Lock an additional Num Lock
caps:swapescape Swap ESC and Caps Lock
@@ -780,21 +789,21 @@
caps:backspace Make Caps Lock an additional Backspace
caps:super Make Caps Lock an additional Super
caps:hyper Make Caps Lock an additional Hyper
- caps:shiftlock Caps Lock toggles Shift so all keys are affected
+ caps:shiftlock Caps Lock toggles ShiftLock (affects all keys)
caps:none Caps Lock is disabled
- caps:ctrl_modifier Make Caps Lock an additional Control but keep the Caps_Lock keysym
+ caps:ctrl_modifier Make Caps Lock an additional Ctrl
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:ctrl_win Ctrl is mapped to Win keys (and the usual Ctrl keys)
+ altwin:ctrl_alt_win Ctrl 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_alt_win Alt is swapped with Win
- Compose key Compose key position
+ Compose key Position of Compose key
compose:ralt Right Alt
compose:lwin Left Win
compose:lwin-altgr 3rd level of Left Win
@@ -822,11 +831,12 @@
apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)
shift:breaks_caps Shift cancels Caps Lock
misc:typo Enable extra typographic characters
- shift:both_capslock Both Shift-Keys together toggle Caps Lock
- 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.
+ shift:both_capslock Both Shift keys together toggle Caps Lock
+ 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 Shift + NumLock toggles PointerKeys
grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
+ grab:debug_actions Allow grab and window tree logging
currencysign Adding currency signs to certain keys
eurosign:e Euro on E
eurosign:2 Euro on 2
@@ -859,10 +869,11 @@
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.
+ esperanto Adding Esperanto supersigned letters
+ esperanto:qwerty To the corresponding key in a Qwerty layout
+ esperanto:dvorak To the corresponding key in a Dvorak layout
+ esperanto:colemak To the corresponding key in a Colemak layout
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
+ terminate:ctrl_alt_bksp Ctrl + Alt + Backspace
