Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates for xkeyboard-config 2.0.

Browse Source
This commit is contained in:
mrg 2010-11-22 00:27:55 +00:00
parent aae9764e40
commit 5ebe1a1bf6
6 changed files with 144 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
external/mit/xorg/lib/xkeyboard-config/rules/base vendored
View File

@ -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)

21
external/mit/xorg/lib/xkeyboard-config/rules/base.lst vendored
View File

@ -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
@ -690,6 +698,7 @@
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 Num Lock
grp_led:caps Caps Lock
@ -754,7 +763,7 @@
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
apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)
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

28
external/mit/xorg/lib/xkeyboard-config/rules/evdev vendored
View File

@ -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)

21
external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst vendored
View File

@ -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
@ -690,6 +698,7 @@
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 Num Lock
grp_led:caps Caps Lock
@ -754,7 +763,7 @@
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
apple:alupckeys Apple Aluminium Keyboard: emulate PC keys (Print, Scroll_Lock, Pause, NumLock)
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

4
external/mit/xorg/lib/xkeyboard-config/symbols/Makefile vendored
View File

@ -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 \

4
external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile vendored
View File

@ -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