Module Name: src Committed By: mrg Date: Mon Nov 22 00:27:56 UTC 2010
Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile Log Message: updates for xkeyboard-config 2.0. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ 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 cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile 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.1 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.1 Sat May 29 07:58:24 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Mon Nov 22 00:27:55 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -228,6 +228,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -316,6 +318,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -357,11 +361,6 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) - ws007sh * = pc+sharp_vndr/ws007sh(basic) - ws011sh * = pc+sharp_vndr/ws011sh(basic) - ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -445,6 +444,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -516,6 +517,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -600,6 +603,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * ru(chu) = +extras/ru(chu):2 + * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -687,6 +692,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * ru(chu) = +extras/ru(chu):3 + * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -774,6 +781,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * ru(chu) = +extras/ru(chu):4 + * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -833,6 +842,8 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 + * ru chu = +extras/ru(chu):2 + * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us crd = +extras/us(crd):2 * us intl-unicode = +extras/us(intl-unicode):2 @@ -889,6 +900,8 @@ * yu yz = +srp(latinyz):3 * yu unicodeyz = +srp(latinunicodeyz):3 * rs combiningkeys = +extras/rs(combiningkeys):3 + * ru chu = +extras/ru(chu):3 + * ir ave = +extras/ir(ave):3 * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 * us crd = +extras/us(crd):3 * us intl-unicode = +extras/us(intl-unicode):3 @@ -945,6 +958,8 @@ * yu yz = +srp(latinyz):4 * yu unicodeyz = +srp(latinunicodeyz):4 * rs combiningkeys = +extras/rs(combiningkeys):4 + * ru chu = +extras/ru(chu):4 + * ir ave = +extras/ir(ave):4 * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 * us crd = +extras/us(crd):4 * us intl-unicode = +extras/us(intl-unicode):4 @@ -1120,6 +1135,7 @@ ctrl:ctrl_ac = +ctrl(ctrl_ac) ctrl:ctrl_aa = +ctrl(ctrl_aa) ctrl:ctrl_ra = +ctrl(ctrl_ra) + ctrl:ctrl_menu = +ctrl(ctrl_menu) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.1 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.1 Sat May 29 07:58:24 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Mon Nov 22 00:27:55 2010 @@ -63,6 +63,7 @@ geniuskb19e Genius KB-19e NB geniuskkb2050hs Genius KKB-2050HS gyration Gyration + kinesis Kinesis logitech_base Logitech Generic Keyboard logitech_g15 Logitech G15 extra keys via G15daemon hpi6 Hewlett-Packard Internet Keyboard @@ -179,6 +180,7 @@ ara Arabic al Albania am Armenia + at Austria az Azerbaijan by Belarus be Belgium @@ -297,6 +299,9 @@ eastern am: Eastern western am: Western eastern-alt am: Alternative Eastern + nodeadkeys at: Eliminate dead keys + sundeadkeys at: Sun dead keys + mac at: Macintosh cyrillic az: Cyrillic legacy by: Legacy latin by: Latin @@ -341,11 +346,11 @@ bas_phonetic bg: New phonetic french ma: French tifinagh ma: Tifinagh - tifinagh-alt ma: Tifinagh Alternative - tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic - tifinagh-extended ma: Tifinagh Extended - tifinagh-phonetic ma: Tifinagh Phonetic - tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic + tifinagh-alt ma: Tifinagh alternative + tifinagh-alt-phonetic ma: Tifinagh alternative phonetic + tifinagh-extended ma: Tifinagh extended + tifinagh-phonetic ma: Tifinagh phonetic + tifinagh-extended-phonetic ma: Tifinagh extended phonetic fr-dvorak ca: French Dvorak fr-legacy ca: French (legacy) multix ca: Multilingual @@ -431,6 +436,7 @@ dsb de: Lower Sorbian dsb_qwertz de: Lower Sorbian (qwertz) qwerty de: qwerty + ru de: Russian phonetic simple gr: Simple extended gr: Extended nodeadkeys gr: Eliminate dead keys @@ -607,6 +613,7 @@ dvorak gb: Dvorak dvorakukp gb: Dvorak (UK Punctuation) mac gb: Macintosh + mac_intl gb: Macintosh (International) colemak gb: Colemak latin uz: Latin crh uz: Crimean Tatar (Turkish Q) @@ -620,6 +627,7 @@ urd-crulp pk: CRULP urd-nla pk: NLA ara pk: Arabic + snd pk: Sindhi legacy epo: displaced semicolon and quote (obsolete) igbo ng: Igbo yoruba ng: Yoruba @@ -639,16 +647,16 @@ grp:lwin_switch Left Win (while pressed) grp:rwin_switch Right Win (while pressed) grp:win_switch Any Win key (while pressed) - grp:caps_switch CapsLock (while pressed), Alt+CapsLock does the original capslock action + grp:caps_switch Caps Lock (while pressed), Alt+Caps Lock does the original capslock action grp:rctrl_switch Right Ctrl (while pressed) grp:toggle Right Alt grp:lalt_toggle Left Alt - grp:caps_toggle CapsLock - grp:shift_caps_toggle Shift+CapsLock - grp:shift_caps_switch CapsLock (to first layout), Shift+CapsLock (to last layout) + grp:caps_toggle Caps Lock + grp:shift_caps_toggle Shift+Caps Lock + grp:shift_caps_switch Caps Lock (to first layout), Shift+Caps Lock (to last layout) grp:win_menu_switch Left Win (to first layout), Right Win/Menu (to last layout) grp:lctrl_rctrl_switch Left Ctrl (to first layout), Right Ctrl (to last layout) - grp:alt_caps_toggle Alt+CapsLock + grp:alt_caps_toggle Alt+Caps Lock grp:shifts_toggle Both Shift keys together grp:alts_toggle Both Alt keys together grp:ctrls_toggle Both Ctrl keys together @@ -665,7 +673,7 @@ grp:rshift_toggle Right Shift grp:lctrl_toggle Left Ctrl grp:rctrl_toggle Right Ctrl - grp:sclk_toggle ScrollLock + grp:sclk_toggle Scroll Lock lv3 Key to choose 3rd level lv3:switch Right Ctrl lv3:menu_switch Menu @@ -678,22 +686,23 @@ lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Multi_Key lv3:ralt_alt Right Alt key never chooses 3rd level lv3:enter_switch Enter on keypad - lv3:caps_switch CapsLock + lv3:caps_switch Caps Lock lv3:bksl_switch Backslash lv3:lsgt_switch <Less/Greater> - lv3:caps_switch_latch CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser) + 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) ctrl Ctrl key position - ctrl:nocaps Make CapsLock an additional Ctrl - ctrl:swapcaps Swap Ctrl and CapsLock + ctrl:nocaps Make Caps Lock an additional Ctrl + 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 grp_led Use keyboard LED to show alternative layout - grp_led:num NumLock - grp_led:caps CapsLock - grp_led:scroll ScrollLock + grp_led:num Num Lock + grp_led:caps Caps Lock + grp_led:scroll Scroll Lock keypad Numeric keypad layout selection keypad:legacy Legacy keypad:oss Unicode additions (arrows and math operators) @@ -712,20 +721,20 @@ kpdl:momayyezoss Four-level key with momayyez kpdl:kposs Four-level key with abstract separators kpdl:semi Semi-colon on third level - caps CapsLock key behavior - caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock - caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock - caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock - caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock - caps:capslock CapsLock toggles normal capitalization of alphabetic characters - caps:numlock Make CapsLock an additional NumLock - caps:swapescape Swap ESC and CapsLock - caps:escape Make CapsLock an additional ESC - caps:backspace Make CapsLock an additional Backspace - caps:super Make CapsLock an additional Super - caps:hyper Make CapsLock an additional Hyper - caps:shiftlock CapsLock toggles Shift so all keys are affected - caps:none CapsLock is disabled + 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: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 + caps:escape Make Caps Lock an additional ESC + 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:none Caps Lock is disabled altwin Alt/Win key behavior altwin:menu Add the standard behavior to Menu key altwin:meta_alt Alt and Meta are on Alt keys @@ -743,22 +752,22 @@ compose:menu Menu compose:lctrl Left Ctrl compose:rctrl Right Ctrl - compose:caps CapsLock + compose:caps Caps Lock compose:102 <Less/Greater> compose:paus Pause compose:prsc PrtSc - compose:sclk ScrollLock + compose:sclk Scroll Lock compat Miscellaneous compatibility options numpad:pc Default numeric keypad keys numpad:mac Numeric keypad keys work as with Mac numpad:microsoft Shift with numeric keypad keys works as in MS Windows - numpad:shift3 Shift does not cancel NumLock, chooses 3rd level instead + numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server - apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock) - shift:breaks_caps Shift cancels CapsLock + 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 CapsLock - shift:both_capslock_cancel Both Shift-Keys together activate CapsLock, one Shift-Key deactivates + 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 eurosign Adding EuroSign to certain keys eurosign:e E Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.1 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.1 Sat May 29 07:58:24 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Mon Nov 22 00:27:55 2010 @@ -80,7 +80,7 @@ silvercrest \ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo // all layouts with 3rd and 4th groups @@ -217,6 +217,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -305,6 +307,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -346,11 +350,6 @@ olpc $olpclayouts = olpc+%l%(m) olpc * = olpc+%l%(v) $thinkpads br = pc+br(thinkpad) - sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic) - ws003sh * = pc+sharp_vndr/ws003sh(basic) - ws007sh * = pc+sharp_vndr/ws007sh(basic) - ws011sh * = pc+sharp_vndr/ws011sh(basic) - ws020sh * = pc+sharp_vndr/ws020sh(basic) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) @@ -434,6 +433,8 @@ * yu(unicodeyz) = pc+srp(latinunicodeyz) * apl = pc+extras/apl%(v[1]) * rs(combiningkeys) = pc+extras/rs(combiningkeys) + * ru(chu) = pc+extras/ru(chu) + * ir(ave) = pc+extras/ir(ave) * us(alt-intl-unicode) = pc+extras/us(alt-intl-unicode) * us(crd) = pc+extras/us(crd) * us(intl-unicode) = pc+extras/us(intl-unicode) @@ -505,6 +506,8 @@ * yu yz = pc+srp(latinyz) * yu unicodeyz = pc+srp(latinunicodeyz) * rs combiningkeys = pc+extras/rs(combiningkeys) + * ru chu = pc+extras/ru(chu) + * ir ave = pc+extras/ir(ave) * us alt-intl-unicode = pc+extras/us(alt-intl-unicode) * us crd = pc+extras/us(crd) * us intl-unicode = pc+extras/us(intl-unicode) @@ -589,6 +592,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):2 * apl = +extras/apl%(v[2]):2 * rs(combiningkeys) = +extras/rs(combiningkeys):2 + * ru(chu) = +extras/ru(chu):2 + * ir(ave) = +extras/ir(ave):2 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):2 * us(crd) = +extras/us(crd):2 * us(intl-unicode) = +extras/us(intl-unicode):2 @@ -676,6 +681,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):3 * apl = +extras/apl%(v[3]):3 * rs(combiningkeys) = +extras/rs(combiningkeys):3 + * ru(chu) = +extras/ru(chu):3 + * ir(ave) = +extras/ir(ave):3 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):3 * us(crd) = +extras/us(crd):3 * us(intl-unicode) = +extras/us(intl-unicode):3 @@ -763,6 +770,8 @@ * yu(unicodeyz) = +srp(latinunicodeyz):4 * apl = +extras/apl%(v[4]):4 * rs(combiningkeys) = +extras/rs(combiningkeys):4 + * ru(chu) = +extras/ru(chu):4 + * ir(ave) = +extras/ir(ave):4 * us(alt-intl-unicode) = +extras/us(alt-intl-unicode):4 * us(crd) = +extras/us(crd):4 * us(intl-unicode) = +extras/us(intl-unicode):4 @@ -822,6 +831,8 @@ * yu yz = +srp(latinyz):2 * yu unicodeyz = +srp(latinunicodeyz):2 * rs combiningkeys = +extras/rs(combiningkeys):2 + * ru chu = +extras/ru(chu):2 + * ir ave = +extras/ir(ave):2 * us alt-intl-unicode = +extras/us(alt-intl-unicode):2 * us crd = +extras/us(crd):2 * us intl-unicode = +extras/us(intl-unicode):2 @@ -878,6 +889,8 @@ * yu yz = +srp(latinyz):3 * yu unicodeyz = +srp(latinunicodeyz):3 * rs combiningkeys = +extras/rs(combiningkeys):3 + * ru chu = +extras/ru(chu):3 + * ir ave = +extras/ir(ave):3 * us alt-intl-unicode = +extras/us(alt-intl-unicode):3 * us crd = +extras/us(crd):3 * us intl-unicode = +extras/us(intl-unicode):3 @@ -934,6 +947,8 @@ * yu yz = +srp(latinyz):4 * yu unicodeyz = +srp(latinunicodeyz):4 * rs combiningkeys = +extras/rs(combiningkeys):4 + * ru chu = +extras/ru(chu):4 + * ir ave = +extras/ir(ave):4 * us alt-intl-unicode = +extras/us(alt-intl-unicode):4 * us crd = +extras/us(crd):4 * us intl-unicode = +extras/us(intl-unicode):4 @@ -1061,6 +1076,7 @@ ctrl:ctrl_ac = +ctrl(ctrl_ac) ctrl:ctrl_aa = +ctrl(ctrl_aa) ctrl:ctrl_ra = +ctrl(ctrl_ra) + ctrl:ctrl_menu = +ctrl(ctrl_menu) compose:ralt = +compose(ralt) compose:lwin = +compose(lwin) compose:rwin = +compose(rwin) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.1 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.1 Sat May 29 07:58:24 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Mon Nov 22 00:27:55 2010 @@ -63,6 +63,7 @@ geniuskb19e Genius KB-19e NB geniuskkb2050hs Genius KKB-2050HS gyration Gyration + kinesis Kinesis logitech_base Logitech Generic Keyboard logitech_g15 Logitech G15 extra keys via G15daemon hpi6 Hewlett-Packard Internet Keyboard @@ -179,6 +180,7 @@ ara Arabic al Albania am Armenia + at Austria az Azerbaijan by Belarus be Belgium @@ -297,6 +299,9 @@ eastern am: Eastern western am: Western eastern-alt am: Alternative Eastern + nodeadkeys at: Eliminate dead keys + sundeadkeys at: Sun dead keys + mac at: Macintosh cyrillic az: Cyrillic legacy by: Legacy latin by: Latin @@ -341,11 +346,11 @@ bas_phonetic bg: New phonetic french ma: French tifinagh ma: Tifinagh - tifinagh-alt ma: Tifinagh Alternative - tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic - tifinagh-extended ma: Tifinagh Extended - tifinagh-phonetic ma: Tifinagh Phonetic - tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic + tifinagh-alt ma: Tifinagh alternative + tifinagh-alt-phonetic ma: Tifinagh alternative phonetic + tifinagh-extended ma: Tifinagh extended + tifinagh-phonetic ma: Tifinagh phonetic + tifinagh-extended-phonetic ma: Tifinagh extended phonetic fr-dvorak ca: French Dvorak fr-legacy ca: French (legacy) multix ca: Multilingual @@ -431,6 +436,7 @@ dsb de: Lower Sorbian dsb_qwertz de: Lower Sorbian (qwertz) qwerty de: qwerty + ru de: Russian phonetic simple gr: Simple extended gr: Extended nodeadkeys gr: Eliminate dead keys @@ -607,6 +613,7 @@ dvorak gb: Dvorak dvorakukp gb: Dvorak (UK Punctuation) mac gb: Macintosh + mac_intl gb: Macintosh (International) colemak gb: Colemak latin uz: Latin crh uz: Crimean Tatar (Turkish Q) @@ -620,6 +627,7 @@ urd-crulp pk: CRULP urd-nla pk: NLA ara pk: Arabic + snd pk: Sindhi legacy epo: displaced semicolon and quote (obsolete) igbo ng: Igbo yoruba ng: Yoruba @@ -639,16 +647,16 @@ grp:lwin_switch Left Win (while pressed) grp:rwin_switch Right Win (while pressed) grp:win_switch Any Win key (while pressed) - grp:caps_switch CapsLock (while pressed), Alt+CapsLock does the original capslock action + grp:caps_switch Caps Lock (while pressed), Alt+Caps Lock does the original capslock action grp:rctrl_switch Right Ctrl (while pressed) grp:toggle Right Alt grp:lalt_toggle Left Alt - grp:caps_toggle CapsLock - grp:shift_caps_toggle Shift+CapsLock - grp:shift_caps_switch CapsLock (to first layout), Shift+CapsLock (to last layout) + grp:caps_toggle Caps Lock + grp:shift_caps_toggle Shift+Caps Lock + grp:shift_caps_switch Caps Lock (to first layout), Shift+Caps Lock (to last layout) grp:win_menu_switch Left Win (to first layout), Right Win/Menu (to last layout) grp:lctrl_rctrl_switch Left Ctrl (to first layout), Right Ctrl (to last layout) - grp:alt_caps_toggle Alt+CapsLock + grp:alt_caps_toggle Alt+Caps Lock grp:shifts_toggle Both Shift keys together grp:alts_toggle Both Alt keys together grp:ctrls_toggle Both Ctrl keys together @@ -665,7 +673,7 @@ grp:rshift_toggle Right Shift grp:lctrl_toggle Left Ctrl grp:rctrl_toggle Right Ctrl - grp:sclk_toggle ScrollLock + grp:sclk_toggle Scroll Lock lv3 Key to choose 3rd level lv3:switch Right Ctrl lv3:menu_switch Menu @@ -678,22 +686,23 @@ lv3:ralt_switch_multikey Right Alt, Shift+Right Alt key is Multi_Key lv3:ralt_alt Right Alt key never chooses 3rd level lv3:enter_switch Enter on keypad - lv3:caps_switch CapsLock + lv3:caps_switch Caps Lock lv3:bksl_switch Backslash lv3:lsgt_switch <Less/Greater> - lv3:caps_switch_latch CapsLock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser) + 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) ctrl Ctrl key position - ctrl:nocaps Make CapsLock an additional Ctrl - ctrl:swapcaps Swap Ctrl and CapsLock + ctrl:nocaps Make Caps Lock an additional Ctrl + 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 grp_led Use keyboard LED to show alternative layout - grp_led:num NumLock - grp_led:caps CapsLock - grp_led:scroll ScrollLock + grp_led:num Num Lock + grp_led:caps Caps Lock + grp_led:scroll Scroll Lock keypad Numeric keypad layout selection keypad:legacy Legacy keypad:oss Unicode additions (arrows and math operators) @@ -712,20 +721,20 @@ kpdl:momayyezoss Four-level key with momayyez kpdl:kposs Four-level key with abstract separators kpdl:semi Semi-colon on third level - caps CapsLock key behavior - caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock - caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock - caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock - caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock - caps:capslock CapsLock toggles normal capitalization of alphabetic characters - caps:numlock Make CapsLock an additional NumLock - caps:swapescape Swap ESC and CapsLock - caps:escape Make CapsLock an additional ESC - caps:backspace Make CapsLock an additional Backspace - caps:super Make CapsLock an additional Super - caps:hyper Make CapsLock an additional Hyper - caps:shiftlock CapsLock toggles Shift so all keys are affected - caps:none CapsLock is disabled + 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: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 + caps:escape Make Caps Lock an additional ESC + 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:none Caps Lock is disabled altwin Alt/Win key behavior altwin:menu Add the standard behavior to Menu key altwin:meta_alt Alt and Meta are on Alt keys @@ -743,22 +752,22 @@ compose:menu Menu compose:lctrl Left Ctrl compose:rctrl Right Ctrl - compose:caps CapsLock + compose:caps Caps Lock compose:102 <Less/Greater> compose:paus Pause compose:prsc PrtSc - compose:sclk ScrollLock + compose:sclk Scroll Lock compat Miscellaneous compatibility options numpad:pc Default numeric keypad keys numpad:mac Numeric keypad keys work as with Mac numpad:microsoft Shift with numeric keypad keys works as in MS Windows - numpad:shift3 Shift does not cancel NumLock, chooses 3rd level instead + numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server - apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock) - shift:breaks_caps Shift cancels CapsLock + 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 CapsLock - shift:both_capslock_cancel Both Shift-Keys together activate CapsLock, one Shift-Key deactivates + 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 eurosign Adding EuroSign to certain keys eurosign:e E Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.4 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.3 Fri May 28 12:38:35 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Mon Nov 22 00:27:56 2010 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2010/05/28 12:38:35 ghen Exp $ +# $NetBSD: Makefile,v 1.4 2010/11/22 00:27:56 mrg Exp $ .include <bsd.own.mk> XKBNAME= symbols -FILES= ad af al altwin am ara az \ +FILES= ad af al altwin am ara at az \ ba bd be bg br brai bt bw by \ ca capslock cd ch cn compose ctrl cz \ de dk \ Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile:1.1 src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile:1.2 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile:1.1 Fri May 28 12:38:35 2010 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile Mon Nov 22 00:27:56 2010 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2010/05/28 12:38:35 ghen Exp $ +# $NetBSD: Makefile,v 1.2 2010/11/22 00:27:56 mrg Exp $ .include <bsd.own.mk> FILESDIR= ${X11LIBDIR}/xkb/symbols/extras -FILES= apl rs us +FILES= apl ir rs ru us .PATH: ${X11SRCDIR.xkeyboard-config}/symbols/extras