Module Name: src
Committed By: snj
Date: Tue Nov 22 19:51:37 UTC 2016
Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/lib/xkeyboard-config: Makefile
src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile
src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile
Added Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.7
src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr: Makefile
Log Message:
update for xkeyboard-config 2.19
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.19 -r1.20 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
cvs rdiff -u -r1.9 -r1.10 \
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.10 -r1.11 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.135 src/distrib/sets/lists/xbase/mi:1.136
--- src/distrib/sets/lists/xbase/mi:1.135 Tue Oct 4 23:52:02 2016
+++ src/distrib/sets/lists/xbase/mi Tue Nov 22 19:51:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.135 2016/10/04 23:52:02 mrg Exp $
+# $NetBSD: mi,v 1.136 2016/11/22 19:51:37 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -675,6 +675,7 @@
./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg
+./usr/X11R7/lib/X11/xkb/geometry/teck -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg
./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg
@@ -695,6 +696,7 @@
./usr/X11R7/lib/X11/xkb/keycodes/fujitsu -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/hp -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/ibm -unknown- xorg
+./usr/X11R7/lib/X11/xkb/keycodes/jolla -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/macintosh -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/olpc -unknown- xorg
./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2 -unknown- obsolete
@@ -839,12 +841,14 @@
./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/au -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/be -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/bn -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete
@@ -880,6 +884,7 @@
./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/vt -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/dk -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/dvorak -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/dz -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ee -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/el -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/empty -unknown- xorg
@@ -924,6 +929,7 @@
./usr/X11R7/lib/X11/xkb/symbols/hu -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/hu_US -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/hu_qwerty -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/id -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ie -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/il -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/il_phonetic -unknown- obsolete
@@ -935,6 +941,8 @@
./usr/X11R7/lib/X11/xkb/symbols/iso9995-3 -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/it -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/iu -unknown- obsolete
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr base-x11-root xorg
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr/sbj -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/jp -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/kan -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/ke -unknown- xorg
@@ -999,6 +1007,7 @@
./usr/X11R7/lib/X11/xkb/symbols/mt -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/mt_us -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/mv -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/my -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/nbsp -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/nec -obsolete- obsolete
./usr/X11R7/lib/X11/xkb/symbols/nec/jp -unknown- obsolete
@@ -1014,6 +1023,7 @@
./usr/X11R7/lib/X11/xkb/symbols/np -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ogham -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/olpc -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/parens -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/ori -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/pc -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/pc/al -unknown- obsolete
@@ -1168,6 +1178,7 @@
./usr/X11R7/lib/X11/xkb/symbols/syr_phonetic -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/tel -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/terminate -unknown- xorg
+./usr/X11R7/lib/X11/xkb/symbols/tg -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/th -unknown- xorg
./usr/X11R7/lib/X11/xkb/symbols/th_pat -unknown- obsolete
./usr/X11R7/lib/X11/xkb/symbols/th_tis -unknown- obsolete
@@ -1525,6 +1536,7 @@
./usr/X11R7/man/html7/XOrgFoundation.html -unknown- html,xorg
./usr/X11R7/man/html7/XProjectTeam.html -unknown- html,xorg
./usr/X11R7/man/html7/Xsecurity.html -unknown- html,xorg
+./usr/X11R7/man/html7/xkeyboard-config.html -unknown- html,xorg
./usr/X11R7/man/man1 base-x11-root xorg
./usr/X11R7/man/man1/appres.1 -unknown- .man,xorg
./usr/X11R7/man/man1/atobm.1 -unknown- .man,xorg
@@ -1669,6 +1681,7 @@
./usr/X11R7/man/man7/XOrgFoundation.7 -unknown- .man,xorg
./usr/X11R7/man/man7/XProjectTeam.7 -unknown- .man,xorg
./usr/X11R7/man/man7/Xsecurity.7 -unknown- .man,xorg
+./usr/X11R7/man/man7/xkeyboard-config.7 -unknown- .man,xorg
./usr/X11R7/man/whatis.db -unknown- man,xorg,!makemandb
./usr/X11R7/share base-x11-root xorg
./usr/X11R7/share/aclocal base-x11-root xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.19 src/etc/mtree/NetBSD.dist.Xorg:1.20
--- src/etc/mtree/NetBSD.dist.Xorg:1.19 Tue Oct 4 23:52:02 2016
+++ src/etc/mtree/NetBSD.dist.Xorg Tue Nov 22 19:51:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.19 2016/10/04 23:52:02 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.20 2016/11/22 19:51:37 snj Exp $
./usr/X11R7
./usr/X11R7/bin
./usr/X11R7/include
@@ -130,6 +130,7 @@
./usr/X11R7/lib/X11/xkb/symbols/digital_vndr
./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
./usr/X11R7/lib/X11/xkb/symbols/hp_vndr
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr
./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr
./usr/X11R7/lib/X11/xkb/symbols/nec_vndr
./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr
Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.9 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.9 Fri May 31 23:50:51 2013
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile Tue Nov 22 19:51:37 2016
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2013/05/31 23:50:51 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
+# XXX when updating to a new xkeyboard-config, regenerate with xsltproc
+MAN= xkeyboard-config.7
+
SUBDIR= compat geometry keycodes rules symbols types
NOOBJ= # defined
Index: src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.4
--- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.3 Mon Feb 21 05:10:27 2011
+++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile Tue Nov 22 19:51:37 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/02/21 05:10:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
XKBNAME= geometry
FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \
keytronic kinesis macintosh microsoft nec nokia northgate \
- pc sanwa sony sun thinkpad typematrix winbook
+ pc sanwa sony sun teck thinkpad typematrix winbook
SUBDIR= digital_vndr sgi_vndr
Index: src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.4
--- src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile:1.3 Fri May 31 23:28:25 2013
+++ src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile Tue Nov 22 19:51:37 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 23:28:25 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
XKBNAME= keycodes
FILES= README aliases amiga ataritt empty evdev fujitsu hp ibm \
- macintosh olpc sony sun xfree86 xfree98
+ jolla macintosh olpc sony sun xfree86 xfree98
SUBDIR= digital_vndr sgi_vndr
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.9 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.9 Mon Jul 20 22:45:10 2015
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Nov 22 19:51:37 2016
@@ -9,12 +9,15 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
-// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
-// ru scc sy syr tel th tj tam ua uz
+// in ir iku jp kan kh kr la lao lk mk mm mn mv mal olck \
+// ori pk ru scc sy syr tel th tj tam ua uz
// PC models
! $pcmodels = pc101 pc102 pc104 pc105
+// Jolla devices and keyboards
+! $jollamodels = jollasbj
+
// Microsoft models (using MS geometry)
! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
@@ -122,7 +125,8 @@
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
- unitekkb1925 yahoo
+ unitekkb1925 yahoo \
+ teck227 teck229
! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
@@ -347,6 +351,8 @@
classmate us = pc+%l(classmate)
empty * = empty(basic)
* empty = empty(basic)
+ jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2
+ jollasbj * = jolla_vndr/sbj(common)+%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)
@@ -456,6 +462,7 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+ jollasbj * = jolla_vndr/sbj(common)+%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])
@@ -927,6 +934,7 @@
btc5126t = +inet(nav_acpi_common)
btc9116u = +inet(btc9019u)
btc6301urf = +inet(media_nav_acpi_common)
+ chromebook = +inet(chromebook)
dellsk8125 = +inet(dell)
dellsk8135 = +inet(dell)
cherrybunlim = +inet(nav_common)
@@ -977,26 +985,51 @@
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +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)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone_eszett_home = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone_eszett_home = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone_eszett_home = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwerty = +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
@@ -1046,7 +1079,9 @@
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)
+ altwin:prtsc_rwin = +altwin(prtsc_rwin)
grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
@@ -1089,6 +1124,7 @@
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)
+ grp:lctrl_lwin_toggle = +group(lctrl_lwin_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -1108,6 +1144,7 @@
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
+ caps:menu = +capslock(menu)
caps:none = +capslock(none)
caps:ctrl_modifier = +capslock(ctrl_modifier)
ctrl:nocaps = +ctrl(nocaps)
@@ -1205,7 +1242,7 @@
lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel)
lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel)
lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel)
-
+ parens:swap_brackets = +parens(swap_brackets)
! option = compat
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.9 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.9 Mon Jul 20 22:45:10 2015
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Tue Nov 22 19:51:37 2016
@@ -184,6 +184,8 @@
compalfl90 FL90
creativedw7000 Creative Desktop Wireless 7000
htcdream Htc Dream phone
+ teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+ teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
! layout
us English (US)
@@ -192,14 +194,15 @@
al Albanian
am Armenian
at German (Austria)
+ au English (Australian)
az Azerbaijani
by Belarusian
be Belgian
- bd Bangla
in Indian
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
+ dz Berber (Algeria, Latin characters)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -275,10 +278,14 @@
tm Turkmen
ml Bambara
tz Swahili (Tanzania)
+ tg French (Togo)
ke Swahili (Kenya)
bw Tswana
ph Filipino
md Moldavian
+ id Indonesian (Jawi)
+ my Malay (Jawi)
+ bn Malay (Jawi)
! variant
chr us: Cherokee
@@ -292,7 +299,7 @@
dvorak-l us: English (left handed Dvorak)
dvorak-r us: English (right handed Dvorak)
dvorak-classic us: English (classic Dvorak)
- dvp us: English (programmer Dvorak)
+ dvp us: English (Programmer Dvorak)
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (international AltGr dead keys)
@@ -331,38 +338,9 @@
nodeadkeys be: Belgian (eliminate dead keys)
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
- 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)
- ori in: Oriya
- tam_unicode in: Tamil (Unicode)
- tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
- tam_TAB in: Tamil (TAB typewriter)
- 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 rupee sign)
alternatequotes ba: Bosnian (with guillemets for quotes)
unicode ba: Bosnian (with Bosnian digraphs)
@@ -373,8 +351,11 @@
nativo br: Portuguese (Brazil, Nativo)
nativo-us br: Portuguese (Brazil, Nativo for US keyboards)
nativo-epo br: Esperanto (Brazil, Nativo)
+ thinkpad br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
+ ber dz: Berber (Algeria, Tifinagh characters)
+ ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
tifinagh-alt ma: Berber (Morocco, Tifinagh alternative)
@@ -386,6 +367,7 @@
qwerty cm: Cameroon Multilingual (qwerty)
azerty cm: Cameroon Multilingual (azerty)
dvorak cm: Cameroon Multilingual (Dvorak)
+ mmuock cm: Mmuock
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -405,6 +387,7 @@
qwerty_bksl cz: Czech (qwerty, extended Backslash)
ucw cz: Czech (UCW layout, accented letters only)
dvorak-ucw cz: Czech (US Dvorak with CZ UCW support)
+ rus cz: Russian (Czech, phonetic)
nodeadkeys dk: Danish (eliminate dead keys)
winkeys dk: Danish (Winkeys)
mac dk: Danish (Macintosh)
@@ -444,6 +427,7 @@
bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
+ azerty fr: French (Azerty)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
@@ -475,7 +459,7 @@
qwerty de: German (qwerty)
tr de: Turkish (Germany)
ru de: Russian (Germany, phonetic)
- legacy de: German (legacy)
+ deadtilde de: German (dead tilde)
simple gr: Greek (simple)
extended gr: Greek (extended)
nodeadkeys gr: Greek (eliminate dead keys)
@@ -521,6 +505,7 @@
phonetic kg: Kyrgyz (phonetic)
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
+ ext kz: Kazakh (extended)
stea la: Lao (STEA proposed standard layout)
nodeadkeys latam: Spanish (Latin American, eliminate dead keys)
deadtilde latam: Spanish (Latin American, include dead tilde)
@@ -595,6 +580,7 @@
bak ru: Bashkirian
chm ru: Mari
phonetic_azerty ru: Russian (phonetic azerty)
+ phonetic_dvorak ru: Russian (phonetic dvorak)
phonetic_fr ru: Russian (phonetic French)
yz rs: Serbian (Cyrillic, ZE and ZHE swapped)
latin rs: Serbian (Latin)
@@ -739,6 +725,7 @@
grp:rctrl_toggle Right Ctrl
grp:sclk_toggle Scroll Lock
grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)
+ grp:lctrl_lwin_toggle LeftCtrl+LeftWin
lv3 Key to choose 3rd level
lv3:switch Right Ctrl
lv3:menu_switch Menu
@@ -765,7 +752,6 @@
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
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_rwin_rctl Swap Right Win key with Right Ctrl key
@@ -798,15 +784,16 @@
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:shiftlock Caps Lock toggles ShiftLock (affects all keys)
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 ShiftLock (affects all keys)
+ caps:menu Make Caps Lock an additional Menu key
+ caps:numlock Make Caps Lock an additional Num Lock
+ caps:ctrl_modifier Caps Lock is also a Ctrl
caps:none Caps Lock is disabled
- 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
@@ -817,7 +804,9 @@
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
+ altwin:prtsc_rwin Win is mapped to PrtSc (and the usual Win key)
Compose key Position of Compose key
compose:ralt Right Alt
compose:lwin Left Win
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.9 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.9 Mon Jul 20 22:45:10 2015
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Tue Nov 22 19:51:37 2016
@@ -9,12 +9,15 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
//! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \
-// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
-// ru scc sy syr tel th tj tam ua uz
+// in ir iku jp kan kh kr la lao lk mk mm mn mv mal olck \
+// ori pk ru scc sy syr tel th tj tam ua uz
// PC models
! $pcmodels = pc101 pc102 pc104 pc105
+// Jolla devices and keyboards
+! $jollamodels = jollasbj
+
// Microsoft models (using MS geometry)
! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
@@ -91,6 +94,7 @@
! model = keycodes
pc98 = evdev(pc98)
applealu_jis = evdev+macintosh(jisevdev)
+ $jollamodels = evdev+jolla(jolla)
olpc = evdev+olpc(olpc)
olpcm = evdev+olpc(olpcm)
* = evdev
@@ -287,6 +291,8 @@
classmate us = pc+%l(classmate)
empty * = empty(basic)
* empty = empty(basic)
+ jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2
+ jollasbj * = jolla_vndr/sbj(common)+%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)
@@ -396,6 +402,7 @@
* yu(unicodeyz) = pc+srp(latinunicodeyz)
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
+ jollasbj * = jolla_vndr/sbj(common)+%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])
@@ -858,6 +865,7 @@
! model = symbols
$evdevkbds = +inet(evdev)+inet(%m)
+ chromebook = +inet(evdev)+inet(chromebook)
applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)
* = +inet(evdev)
@@ -866,26 +874,51 @@
! layout variant = compat
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +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)
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de bone_eszett_home = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwertz = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de bone_eszett_home = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwertz = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de bone_eszett_home = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwertz = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
+ de neo_qwerty = +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
de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de bone_eszett_home = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwertz = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
+ de neo_qwerty = +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
@@ -935,7 +968,9 @@
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)
+ altwin:prtsc_rwin = +altwin(prtsc_rwin)
grab:debug = +srvr_ctrl(grab_debug)
grp:switch = +group(switch)
grp:lswitch = +group(lswitch)
@@ -978,6 +1013,7 @@
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)
+ grp:lctrl_lwin_toggle = +group(lctrl_lwin_toggle)
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
@@ -997,6 +1033,7 @@
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
+ caps:menu = +capslock(menu)
caps:none = +capslock(none)
caps:ctrl_modifier = +capslock(ctrl_modifier)
ctrl:nocaps = +ctrl(nocaps)
@@ -1094,7 +1131,7 @@
lv5:ralt_switch_lock_cancel = +level5(ralt_switch_lock_cancel)
lv5:lwin_switch_lock_cancel = +level5(lwin_switch_lock_cancel)
lv5:rwin_switch_lock_cancel = +level5(rwin_switch_lock_cancel)
-
+ parens:swap_brackets = +parens(swap_brackets)
! option = compat
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.9 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.10
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.9 Mon Jul 20 22:45:10 2015
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Tue Nov 22 19:51:37 2016
@@ -184,6 +184,8 @@
compalfl90 FL90
creativedw7000 Creative Desktop Wireless 7000
htcdream Htc Dream phone
+ teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+ teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
! layout
us English (US)
@@ -192,14 +194,15 @@
al Albanian
am Armenian
at German (Austria)
+ au English (Australian)
az Azerbaijani
by Belarusian
be Belgian
- bd Bangla
in Indian
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
+ dz Berber (Algeria, Latin characters)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -275,10 +278,14 @@
tm Turkmen
ml Bambara
tz Swahili (Tanzania)
+ tg French (Togo)
ke Swahili (Kenya)
bw Tswana
ph Filipino
md Moldavian
+ id Indonesian (Jawi)
+ my Malay (Jawi)
+ bn Malay (Jawi)
! variant
chr us: Cherokee
@@ -292,7 +299,7 @@
dvorak-l us: English (left handed Dvorak)
dvorak-r us: English (right handed Dvorak)
dvorak-classic us: English (classic Dvorak)
- dvp us: English (programmer Dvorak)
+ dvp us: English (Programmer Dvorak)
rus us: Russian (US, phonetic)
mac us: English (Macintosh)
altgr-intl us: English (international AltGr dead keys)
@@ -331,38 +338,9 @@
nodeadkeys be: Belgian (eliminate dead keys)
sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang model 724 azerty)
- 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)
- ori in: Oriya
- tam_unicode in: Tamil (Unicode)
- tam_keyboard_with_numerals in: Tamil (keyboard with numerals)
- tam_TAB in: Tamil (TAB typewriter)
- 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 rupee sign)
alternatequotes ba: Bosnian (with guillemets for quotes)
unicode ba: Bosnian (with Bosnian digraphs)
@@ -373,8 +351,11 @@
nativo br: Portuguese (Brazil, Nativo)
nativo-us br: Portuguese (Brazil, Nativo for US keyboards)
nativo-epo br: Esperanto (Brazil, Nativo)
+ thinkpad br: Portuguese (Brazil, IBM/Lenovo ThinkPad)
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
+ ber dz: Berber (Algeria, Tifinagh characters)
+ ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
tifinagh-alt ma: Berber (Morocco, Tifinagh alternative)
@@ -386,6 +367,7 @@
qwerty cm: Cameroon Multilingual (qwerty)
azerty cm: Cameroon Multilingual (azerty)
dvorak cm: Cameroon Multilingual (Dvorak)
+ mmuock cm: Mmuock
fr-dvorak ca: French (Canada, Dvorak)
fr-legacy ca: French (Canada, legacy)
multix ca: Canadian Multilingual
@@ -405,6 +387,7 @@
qwerty_bksl cz: Czech (qwerty, extended Backslash)
ucw cz: Czech (UCW layout, accented letters only)
dvorak-ucw cz: Czech (US Dvorak with CZ UCW support)
+ rus cz: Russian (Czech, phonetic)
nodeadkeys dk: Danish (eliminate dead keys)
winkeys dk: Danish (Winkeys)
mac dk: Danish (Macintosh)
@@ -444,6 +427,7 @@
bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
+ azerty fr: French (Azerty)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
@@ -475,7 +459,7 @@
qwerty de: German (qwerty)
tr de: Turkish (Germany)
ru de: Russian (Germany, phonetic)
- legacy de: German (legacy)
+ deadtilde de: German (dead tilde)
simple gr: Greek (simple)
extended gr: Greek (extended)
nodeadkeys gr: Greek (eliminate dead keys)
@@ -521,6 +505,7 @@
phonetic kg: Kyrgyz (phonetic)
ruskaz kz: Russian (Kazakhstan, with Kazakh)
kazrus kz: Kazakh (with Russian)
+ ext kz: Kazakh (extended)
stea la: Lao (STEA proposed standard layout)
nodeadkeys latam: Spanish (Latin American, eliminate dead keys)
deadtilde latam: Spanish (Latin American, include dead tilde)
@@ -595,6 +580,7 @@
bak ru: Bashkirian
chm ru: Mari
phonetic_azerty ru: Russian (phonetic azerty)
+ phonetic_dvorak ru: Russian (phonetic dvorak)
phonetic_fr ru: Russian (phonetic French)
yz rs: Serbian (Cyrillic, ZE and ZHE swapped)
latin rs: Serbian (Latin)
@@ -739,6 +725,7 @@
grp:rctrl_toggle Right Ctrl
grp:sclk_toggle Scroll Lock
grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)
+ grp:lctrl_lwin_toggle LeftCtrl+LeftWin
lv3 Key to choose 3rd level
lv3:switch Right Ctrl
lv3:menu_switch Menu
@@ -765,7 +752,6 @@
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
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_rwin_rctl Swap Right Win key with Right Ctrl key
@@ -798,15 +784,16 @@
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:shiftlock Caps Lock toggles ShiftLock (affects all keys)
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 ShiftLock (affects all keys)
+ caps:menu Make Caps Lock an additional Menu key
+ caps:numlock Make Caps Lock an additional Num Lock
+ caps:ctrl_modifier Caps Lock is also a Ctrl
caps:none Caps Lock is disabled
- 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
@@ -817,7 +804,9 @@
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
+ altwin:prtsc_rwin Win is mapped to PrtSc (and the usual Win key)
Compose key Position of Compose key
compose:ralt Right Alt
compose:lwin Left Win
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.10 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.11
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.10 Fri Jul 11 19:19:16 2014
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Tue Nov 22 19:51:37 2016
@@ -1,33 +1,33 @@
-# $NetBSD: Makefile,v 1.10 2014/07/11 19:19:16 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2016/11/22 19:51:37 snj Exp $
.include <bsd.own.mk>
XKBNAME= symbols
-FILES= af al altwin am apl ara at az \
- ba bd be bg br brai bt bw by \
+FILES= af al altwin am apl ara at au az \
+ ba bd be bg bn br brai bt bw by \
ca capslock cd ch cm cn compose ctrl cz \
- de dk \
+ de dk dz \
ee empty epo es et eu eurosign \
fi fo fr \
gb ge gh gn gr group \
hr hu \
- ie il in inet iq ir is it \
+ id ie il in inet iq ir is it \
jp \
ke keypad kg kh kpdl kr kz \
la latam latin level3 level5 lk lt lv \
- ma mao md me mk ml mm mn mt mv \
+ ma mao md me mk ml mm mn mt mv my \
nbsp ng nl no np \
olpc \
- pc ph pk pl pt \
+ parens pc ph pk pl pt \
ro rs ru rupeesign \
se shift si sk sn srvr_ctrl sy \
- terminate th tj tm tr tw typo tz \
+ terminate tg th tj tm tr tw typo tz \
ua us uz \
vn \
za
-SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr \
+SUBDIR= digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr \
nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \
xfree68_vndr
Added files:
Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7
diff -u /dev/null src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7:1.1
--- /dev/null Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.7 Tue Nov 22 19:51:37 2016
@@ -0,0 +1,1341 @@
+.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.19" "X Version 11"
+.SH NAME
+xkeyboard-config \- XKB data description files
+.SH DESCRIPTION
+xkeyboard-config provides the description files for the X Keyboard
+Extension (XKB). The configuration options below are usually applied with
+setxkbmap(1).
+.SH MODELS
+.TS
+left,box;
+lB lB
+___
+lB l.
+Model Description
+pc101 Generic 101-key PC
+pc102 Generic 102-key (Intl) PC
+pc104 Generic 104-key PC
+pc105 Generic 105-key (Intl) PC
+dell101 Dell 101-key PC
+latitude Dell Latitude series laptop
+dellm65 Dell Precision M65
+everex Everex STEPnote
+flexpro Keytronic FlexPro
+microsoft Microsoft Natural
+omnikey101 Northgate OmniKey 101
+winbook Winbook Model XP5
+pc98 PC-98xx Series
+a4techKB21 A4Tech KB-21
+a4techKBS8 A4Tech KBS-8
+a4_rfkb23 A4Tech Wireless Desktop RFKB-23
+airkey Acer AirKey V
+azonaRF2300 Azona RF2300 wireless Internet Keyboard
+scorpius Advance Scorpius KI
+brother Brother Internet Keyboard
+btc5113rf BTC 5113RF Multimedia
+btc5126t BTC 5126T
+btc6301urf BTC 6301URF
+btc9000 BTC 9000
+btc9000a BTC 9000A
+btc9001ah BTC 9001AH
+btc5090 BTC 5090
+btc9019u BTC 9019U
+btc9116u BTC 9116U Mini Wireless Internet and Gaming
+cherryblue Cherry Blue Line CyBo@rd
+cherryblueb Cherry CyMotion Master XPress
+cherrybluea Cherry Blue Line CyBo@rd (alternate option)
+cherrycyboard Cherry CyBo@rd USB-Hub
+cherrycmexpert Cherry CyMotion Expert
+cherrybunlim Cherry B.UNLIMITED
+chicony Chicony Internet Keyboard
+chicony0108 Chicony KU-0108
+chicony0420 Chicony KU-0420
+chicony9885 Chicony KB-9885
+compaqeak8 Compaq Easy Access Keyboard
+compaqik7 Compaq Internet Keyboard (7 keys)
+compaqik13 Compaq Internet Keyboard (13 keys)
+compaqik18 Compaq Internet Keyboard (18 keys)
+cymotionlinux Cherry CyMotion Master Linux
+armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard
+presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard
+ipaq Compaq iPaq Keyboard
+dell Dell
+dellsk8125 Dell SK-8125
+dellsk8135 Dell SK-8135
+dellusbmm Dell USB Multimedia Keyboard
+inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx
+precision_m Dell Laptop/notebook Precision M series
+dexxa Dexxa Wireless Desktop Keyboard
+diamond Diamond 9801 / 9802 series
+dtk2000 DTK2000
+ennyah_dkb1008 Ennyah DKB-1008
+fscaa1667g Fujitsu-Siemens Computers AMILO laptop
+genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+geniuscomfy Genius Comfy KB-12e
+geniuscomfy2 Genius Comfy KB-21e-Scroll
+geniuskb19e Genius KB-19e NB
+geniuskkb2050hs Genius KKB-2050HS
+gyration Gyration
+htcdream HTC Dream
+kinesis Kinesis
+logitech_base Logitech Generic Keyboard
+logitech_g15 Logitech G15 extra keys via G15daemon
+hpi6 Hewlett-Packard Internet Keyboard
+hp250x Hewlett-Packard SK-250x Multimedia Keyboard
+hpxe3gc Hewlett-Packard Omnibook XE3 GC
+hpxe3gf Hewlett-Packard Omnibook XE3 GF
+hpxt1000 Hewlett-Packard Omnibook XT1000
+hpdv5 Hewlett-Packard Pavilion dv5
+hpzt11xx Hewlett-Packard Pavilion ZT11xx
+hp500fa Hewlett-Packard Omnibook 500 FA
+hp5xx Hewlett-Packard Omnibook 5xx
+hpnx9020 Hewlett-Packard nx9020
+hp6000 Hewlett-Packard Omnibook 6000/6100
+honeywell_euroboard Honeywell Euroboard
+hpmini110 Hewlett-Packard Mini 110 Notebook
+rapidaccess IBM Rapid Access
+rapidaccess2 IBM Rapid Access II
+thinkpad IBM ThinkPad 560Z/600/600E/A22E
+thinkpad60 IBM ThinkPad R60/T60/R61/T61
+thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t
+ibm_spacesaver IBM Space Saver
+logiaccess Logitech Access Keyboard
+logiclx300 Logitech Cordless Desktop LX-300
+logii350 Logitech Internet 350 Keyboard
+logimel Logitech Media Elite Keyboard
+logicd Logitech Cordless Desktop
+logicd_it Logitech Cordless Desktop iTouch
+logicd_nav Logitech Cordless Desktop Navigator
+logicd_opt Logitech Cordless Desktop Optical
+logicda Logitech Cordless Desktop (alternate option)
+logicdpa2 Logitech Cordless Desktop Pro (alternate option 2)
+logicfn Logitech Cordless Freedom/Desktop Navigator
+logicdn Logitech Cordless Desktop Navigator
+logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
+logiik Logitech Internet Keyboard
+itouch Logitech iTouch
+logicink Logitech Internet Navigator Keyboard
+logiex110 Logitech Cordless Desktop EX110
+logiinkse Logitech iTouch Internet Navigator Keyboard SE
+logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB)
+logiultrax Logitech Ultra-X Keyboard
+logiultraxc Logitech Ultra-X Cordless Media Desktop Keyboard
+logidinovo Logitech diNovo Keyboard
+logidinovoedge Logitech diNovo Edge Keyboard
+mx1998 Memorex MX1998
+mx2500 Memorex MX2500 EZ-Access Keyboard
+mx2750 Memorex MX2750
+microsoft4000 Microsoft Natural Ergonomic Keyboard 4000
+microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000
+microsoftinet Microsoft Internet Keyboard
+microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
+microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro
+microsoftprooem Microsoft Natural Keyboard Pro OEM
+vsonku306 ViewSonic KU-306 Internet Keyboard
+microsoftprose Microsoft Internet Keyboard Pro, Swedish
+microsoftoffice Microsoft Office Keyboard
+microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A
+microsoftelite Microsoft Natural Keyboard Elite
+microsoftccurve2k Microsoft Comfort Curve Keyboard 2000
+oretec Ortek MCK-800 MM/Internet keyboard
+propeller Propeller Voyager (KTEZ-1000)
+qtronix QTronix Scorpius 98N+
+samsung4500 Samsung SDM 4500P
+samsung4510 Samsung SDM 4510P
+sanwaskbkg3 Sanwa Supply SKB-KG3
+sk1300 SK-1300
+sk2500 SK-2500
+sk6200 SK-6200
+sk7100 SK-7100
+sp_inet Super Power Multimedia Keyboard
+sven SVEN Ergonomic 2500
+sven303 SVEN Slim 303
+symplon Symplon PaceBook (tablet PC)
+toshiba_s3000 Toshiba Satellite S3000
+trust Trust Wireless Keyboard Classic
+trustda Trust Direct Access Keyboard
+trust_slimline Trust Slimline
+tm2020 TypeMatrix EZ-Reach 2020
+tm2030PS2 TypeMatrix EZ-Reach 2030 PS2
+tm2030USB TypeMatrix EZ-Reach 2030 USB
+tm2030USB-102 TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)
+tm2030USB-106 TypeMatrix EZ-Reach 2030 USB (106:JP mode)
+yahoo Yahoo! Internet Keyboard
+macbook78 MacBook/MacBook Pro
+macbook79 MacBook/MacBook Pro (Intl)
+macintosh Macintosh
+macintosh_old Macintosh Old
+macintosh_hhk Happy Hacking Keyboard for Mac
+acer_c300 Acer C300
+acer_ferrari4k Acer Ferrari 4000
+acer_laptop Acer Laptop
+asus_laptop Asus Laptop
+apple Apple
+apple_laptop Apple Laptop
+applealu_ansi Apple Aluminium Keyboard (ANSI)
+applealu_iso Apple Aluminium Keyboard (ISO)
+applealu_jis Apple Aluminium Keyboard (JIS)
+silvercrest SILVERCREST Multimedia Wireless Keyboard
+emachines Laptop/notebook eMachines m68xx
+benqx BenQ X-Touch
+benqx730 BenQ X-Touch 730
+benqx800 BenQ X-Touch 800
+hhk Happy Hacking Keyboard
+classmate Classmate PC
+olpc OLPC
+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
+creativedw7000 Creative Desktop Wireless 7000
+htcdream Htc Dream phone
+teck227 Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+teck229 Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
+
+.TE
+.SH LAYOUTS
+.TS
+left,box;
+lB lB
+____
+lB l.
+Layout(Variant) Description
+us English (US)
+us(chr) Cherokee
+us(euro) English (US, with euro on 5)
+us(intl) English (US, international with dead keys)
+us(alt-intl) English (US, alternative international)
+us(colemak) English (Colemak)
+us(dvorak) English (Dvorak)
+us(dvorak-intl) English (Dvorak, international with dead keys)
+us(dvorak-alt-intl) English (Dvorak alternative international no dead keys)
+us(dvorak-l) English (left handed Dvorak)
+us(dvorak-r) English (right handed Dvorak)
+us(dvorak-classic) English (classic Dvorak)
+us(dvp) English (Programmer Dvorak)
+us(rus) Russian (US, phonetic)
+us(mac) English (Macintosh)
+us(altgr-intl) English (international AltGr dead keys)
+us(olpc2) English (the divide/multiply keys toggle the layout)
+us(hbs) Serbo-Croatian (US)
+us(workman) English (Workman)
+us(workman-intl) English (Workman, international with dead keys)
+
+_
+af Afghani
+af(ps) Pashto
+af(uz) Uzbek (Afghanistan)
+af(olpc-ps) Pashto (Afghanistan, OLPC)
+af(fa-olpc) Persian (Afghanistan, Dari OLPC)
+af(uz-olpc) Uzbek (Afghanistan, OLPC)
+
+_
+ara Arabic
+ara(azerty) Arabic (azerty)
+ara(azerty_digits) Arabic (azerty/digits)
+ara(digits) Arabic (digits)
+ara(qwerty) Arabic (qwerty)
+ara(qwerty_digits) Arabic (qwerty/digits)
+ara(buckwalter) Arabic (Buckwalter)
+ara(mac) Arabic (Macintosh)
+
+_
+al Albanian
+al(plisi-d1) Albanian (Plisi D1)
+
+_
+am Armenian
+am(phonetic) Armenian (phonetic)
+am(phonetic-alt) Armenian (alternative phonetic)
+am(eastern) Armenian (eastern)
+am(western) Armenian (western)
+am(eastern-alt) Armenian (alternative eastern)
+
+_
+at German (Austria)
+at(nodeadkeys) German (Austria, eliminate dead keys)
+at(sundeadkeys) German (Austria, Sun dead keys)
+at(mac) German (Austria, Macintosh)
+
+_
+au English (Australian)
+
+_
+az Azerbaijani
+az(cyrillic) Azerbaijani (Cyrillic)
+
+_
+by Belarusian
+by(legacy) Belarusian (legacy)
+by(latin) Belarusian (Latin)
+
+_
+be Belgian
+be(oss) Belgian (alternative)
+be(oss_latin9) Belgian (alternative, Latin-9 only)
+be(oss_sundeadkeys) Belgian (alternative, Sun dead keys)
+be(iso-alternate) Belgian (ISO alternate)
+be(nodeadkeys) Belgian (eliminate dead keys)
+be(sundeadkeys) Belgian (Sun dead keys)
+be(wang) Belgian (Wang model 724 azerty)
+
+_
+in Indian
+in(urd-phonetic) Urdu (phonetic)
+in(urd-phonetic3) Urdu (alternative phonetic)
+in(urd-winkeys) Urdu (WinKeys)
+in(eng) English (India, with rupee sign)
+
+_
+ba Bosnian
+ba(alternatequotes) Bosnian (with guillemets for quotes)
+ba(unicode) Bosnian (with Bosnian digraphs)
+ba(unicodeus) Bosnian (US keyboard with Bosnian digraphs)
+ba(us) Bosnian (US keyboard with Bosnian letters)
+
+_
+br Portuguese (Brazil)
+br(nodeadkeys) Portuguese (Brazil, eliminate dead keys)
+br(dvorak) Portuguese (Brazil, Dvorak)
+br(nativo) Portuguese (Brazil, Nativo)
+br(nativo-us) Portuguese (Brazil, Nativo for US keyboards)
+br(nativo-epo) Esperanto (Brazil, Nativo)
+br(thinkpad) Portuguese (Brazil, IBM/Lenovo ThinkPad)
+
+_
+bg Bulgarian
+bg(phonetic) Bulgarian (traditional phonetic)
+bg(bas_phonetic) Bulgarian (new phonetic)
+
+_
+dz Berber (Algeria, Latin characters)
+dz(ber) Berber (Algeria, Tifinagh characters)
+dz(ar) Arabic (Algeria)
+
+_
+ma Arabic (Morocco)
+ma(french) French (Morocco)
+ma(tifinagh) Berber (Morocco, Tifinagh)
+ma(tifinagh-alt) Berber (Morocco, Tifinagh alternative)
+ma(tifinagh-alt-phonetic) Berber (Morocco, Tifinagh alternative phonetic)
+ma(tifinagh-extended) Berber (Morocco, Tifinagh extended)
+ma(tifinagh-phonetic) Berber (Morocco, Tifinagh phonetic)
+ma(tifinagh-extended-phonetic) Berber (Morocco, Tifinagh extended phonetic)
+
+_
+cm English (Cameroon)
+cm(french) French (Cameroon)
+cm(qwerty) Cameroon Multilingual (qwerty)
+cm(azerty) Cameroon Multilingual (azerty)
+cm(dvorak) Cameroon Multilingual (Dvorak)
+cm(mmuock) Mmuock
+
+_
+mm Burmese
+
+_
+ca French (Canada)
+ca(fr-dvorak) French (Canada, Dvorak)
+ca(fr-legacy) French (Canada, legacy)
+ca(multix) Canadian Multilingual
+ca(multi) Canadian Multilingual (first part)
+ca(multi-2gr) Canadian Multilingual (second part)
+ca(ike) Inuktitut
+ca(eng) English (Canada)
+
+_
+cd French (Democratic Republic of the Congo)
+
+_
+cn Chinese
+cn(tib) Tibetan
+cn(tib_asciinum) Tibetan (with ASCII numerals)
+cn(ug) Uyghur
+
+_
+hr Croatian
+hr(alternatequotes) Croatian (with guillemets for quotes)
+hr(unicode) Croatian (with Croatian digraphs)
+hr(unicodeus) Croatian (US keyboard with Croatian digraphs)
+hr(us) Croatian (US keyboard with Croatian letters)
+
+_
+cz Czech
+cz(bksl) Czech (with <\|> key)
+cz(qwerty) Czech (qwerty)
+cz(qwerty_bksl) Czech (qwerty, extended Backslash)
+cz(ucw) Czech (UCW layout, accented letters only)
+cz(dvorak-ucw) Czech (US Dvorak with CZ UCW support)
+cz(rus) Russian (Czech, phonetic)
+
+_
+dk Danish
+dk(nodeadkeys) Danish (eliminate dead keys)
+dk(winkeys) Danish (Winkeys)
+dk(mac) Danish (Macintosh)
+dk(mac_nodeadkeys) Danish (Macintosh, eliminate dead keys)
+dk(dvorak) Danish (Dvorak)
+
+_
+nl Dutch
+nl(sundeadkeys) Dutch (Sun dead keys)
+nl(mac) Dutch (Macintosh)
+nl(std) Dutch (standard)
+
+_
+bt Dzongkha
+
+_
+ee Estonian
+ee(nodeadkeys) Estonian (eliminate dead keys)
+ee(dvorak) Estonian (Dvorak)
+ee(us) Estonian (US keyboard with Estonian letters)
+
+_
+ir Persian
+ir(pes_keypad) Persian (with Persian keypad)
+ir(ku) Kurdish (Iran, Latin Q)
+ir(ku_f) Kurdish (Iran, F)
+ir(ku_alt) Kurdish (Iran, Latin Alt-Q)
+ir(ku_ara) Kurdish (Iran, Arabic-Latin)
+
+_
+iq Iraqi
+iq(ku) Kurdish (Iraq, Latin Q)
+iq(ku_f) Kurdish (Iraq, F)
+iq(ku_alt) Kurdish (Iraq, Latin Alt-Q)
+iq(ku_ara) Kurdish (Iraq, Arabic-Latin)
+
+_
+fo Faroese
+fo(nodeadkeys) Faroese (eliminate dead keys)
+
+_
+fi Finnish
+fi(classic) Finnish (classic)
+fi(nodeadkeys) Finnish (classic, eliminate dead keys)
+fi(winkeys) Finnish (Winkeys)
+fi(smi) Northern Saami (Finland)
+fi(mac) Finnish (Macintosh)
+
+_
+fr French
+fr(nodeadkeys) French (eliminate dead keys)
+fr(sundeadkeys) French (Sun dead keys)
+fr(oss) French (alternative)
+fr(oss_latin9) French (alternative, Latin-9 only)
+fr(oss_nodeadkeys) French (alternative, eliminate dead keys)
+fr(oss_sundeadkeys) French (alternative, Sun dead keys)
+fr(latin9) French (legacy, alternative)
+fr(latin9_nodeadkeys) French (legacy, alternative, eliminate dead keys)
+fr(latin9_sundeadkeys) French (legacy, alternative, Sun dead keys)
+fr(bepo) French (Bepo, ergonomic, Dvorak way)
+fr(bepo_latin9) French (Bepo, ergonomic, Dvorak way, Latin-9 only)
+fr(dvorak) French (Dvorak)
+fr(mac) French (Macintosh)
+fr(azerty) French (Azerty)
+fr(bre) French (Breton)
+fr(oci) Occitan
+fr(geo) Georgian (France, AZERTY Tskapo)
+
+_
+gh English (Ghana)
+gh(generic) English (Ghana, multilingual)
+gh(akan) Akan
+gh(ewe) Ewe
+gh(fula) Fula
+gh(ga) Ga
+gh(hausa) Hausa
+gh(avn) Avatime
+gh(gillbt) English (Ghana, GILLBT)
+
+_
+gn French (Guinea)
+
+_
+ge Georgian
+ge(ergonomic) Georgian (ergonomic)
+ge(mess) Georgian (MESS)
+ge(ru) Russian (Georgia)
+ge(os) Ossetian (Georgia)
+
+_
+de German
+de(deadacute) German (dead acute)
+de(deadgraveacute) German (dead grave acute)
+de(nodeadkeys) German (eliminate dead keys)
+de(T3) German (T3)
+de(ro) Romanian (Germany)
+de(ro_nodeadkeys) Romanian (Germany, eliminate dead keys)
+de(dvorak) German (Dvorak)
+de(sundeadkeys) German (Sun dead keys)
+de(neo) German (Neo 2)
+de(mac) German (Macintosh)
+de(mac_nodeadkeys) German (Macintosh, eliminate dead keys)
+de(dsb) Lower Sorbian
+de(dsb_qwertz) Lower Sorbian (qwertz)
+de(qwerty) German (qwerty)
+de(tr) Turkish (Germany)
+de(ru) Russian (Germany, phonetic)
+de(deadtilde) German (dead tilde)
+
+_
+gr Greek
+gr(simple) Greek (simple)
+gr(extended) Greek (extended)
+gr(nodeadkeys) Greek (eliminate dead keys)
+gr(polytonic) Greek (polytonic)
+
+_
+hu Hungarian
+hu(standard) Hungarian (standard)
+hu(nodeadkeys) Hungarian (eliminate dead keys)
+hu(qwerty) Hungarian (qwerty)
+hu(101_qwertz_comma_dead) Hungarian (101/qwertz/comma/dead keys)
+hu(101_qwertz_comma_nodead) Hungarian (101/qwertz/comma/eliminate dead keys)
+hu(101_qwertz_dot_dead) Hungarian (101/qwertz/dot/dead keys)
+hu(101_qwertz_dot_nodead) Hungarian (101/qwertz/dot/eliminate dead keys)
+hu(101_qwerty_comma_dead) Hungarian (101/qwerty/comma/dead keys)
+hu(101_qwerty_comma_nodead) Hungarian (101/qwerty/comma/eliminate dead keys)
+hu(101_qwerty_dot_dead) Hungarian (101/qwerty/dot/dead keys)
+hu(101_qwerty_dot_nodead) Hungarian (101/qwerty/dot/eliminate dead keys)
+hu(102_qwertz_comma_dead) Hungarian (102/qwertz/comma/dead keys)
+hu(102_qwertz_comma_nodead) Hungarian (102/qwertz/comma/eliminate dead keys)
+hu(102_qwertz_dot_dead) Hungarian (102/qwertz/dot/dead keys)
+hu(102_qwertz_dot_nodead) Hungarian (102/qwertz/dot/eliminate dead keys)
+hu(102_qwerty_comma_dead) Hungarian (102/qwerty/comma/dead keys)
+hu(102_qwerty_comma_nodead) Hungarian (102/qwerty/comma/eliminate dead keys)
+hu(102_qwerty_dot_dead) Hungarian (102/qwerty/dot/dead keys)
+hu(102_qwerty_dot_nodead) Hungarian (102/qwerty/dot/eliminate dead keys)
+
+_
+is Icelandic
+is(Sundeadkeys) Icelandic (Sun dead keys)
+is(nodeadkeys) Icelandic (eliminate dead keys)
+is(mac_legacy) Icelandic (Macintosh, legacy)
+is(mac) Icelandic (Macintosh)
+is(dvorak) Icelandic (Dvorak)
+
+_
+il Hebrew
+il(lyx) Hebrew (lyx)
+il(phonetic) Hebrew (phonetic)
+il(biblical) Hebrew (Biblical, Tiro)
+
+_
+it Italian
+it(nodeadkeys) Italian (eliminate dead keys)
+it(winkeys) Italian (Winkeys)
+it(mac) Italian (Macintosh)
+it(us) Italian (US keyboard with Italian letters)
+it(geo) Georgian (Italy)
+it(ibm) Italian (IBM 142)
+
+_
+jp Japanese
+jp(kana) Japanese (Kana)
+jp(kana86) Japanese (Kana 86)
+jp(OADG109A) Japanese (OADG 109A)
+jp(mac) Japanese (Macintosh)
+jp(dvorak) Japanese (Dvorak)
+
+_
+kg Kyrgyz
+kg(phonetic) Kyrgyz (phonetic)
+
+_
+kh Khmer (Cambodia)
+
+_
+kz Kazakh
+kz(ruskaz) Russian (Kazakhstan, with Kazakh)
+kz(kazrus) Kazakh (with Russian)
+kz(ext) Kazakh (extended)
+
+_
+la Lao
+la(stea) Lao (STEA proposed standard layout)
+
+_
+latam Spanish (Latin American)
+latam(nodeadkeys) Spanish (Latin American, eliminate dead keys)
+latam(deadtilde) Spanish (Latin American, include dead tilde)
+latam(sundeadkeys) Spanish (Latin American, Sun dead keys)
+latam(dvorak) Spanish (Latin American, Dvorak)
+
+_
+lt Lithuanian
+lt(std) Lithuanian (standard)
+lt(us) Lithuanian (US keyboard with Lithuanian letters)
+lt(ibm) Lithuanian (IBM LST 1205-92)
+lt(lekp) Lithuanian (LEKP)
+lt(lekpa) Lithuanian (LEKPa)
+
+_
+lv Latvian
+lv(apostrophe) Latvian (apostrophe variant)
+lv(tilde) Latvian (tilde variant)
+lv(fkey) Latvian (F variant)
+lv(modern) Latvian (modern)
+lv(ergonomic) Latvian (ergonomic, ŪGJRMV)
+lv(adapted) Latvian (adapted)
+
+_
+mao Maori
+
+_
+me Montenegrin
+me(cyrillic) Montenegrin (Cyrillic)
+me(cyrillicyz) Montenegrin (Cyrillic, ZE and ZHE swapped)
+me(latinunicode) Montenegrin (Latin Unicode)
+me(latinyz) Montenegrin (Latin qwerty)
+me(latinunicodeyz) Montenegrin (Latin Unicode qwerty)
+me(cyrillicalternatequotes) Montenegrin (Cyrillic with guillemets)
+me(latinalternatequotes) Montenegrin (Latin with guillemets)
+
+_
+mk Macedonian
+mk(nodeadkeys) Macedonian (eliminate dead keys)
+
+_
+mt Maltese
+mt(us) Maltese (with US layout)
+
+_
+mn Mongolian
+
+_
+no Norwegian
+no(nodeadkeys) Norwegian (eliminate dead keys)
+no(winkeys) Norwegian (Winkeys)
+no(dvorak) Norwegian (Dvorak)
+no(smi) Northern Saami (Norway)
+no(smi_nodeadkeys) Northern Saami (Norway, eliminate dead keys)
+no(mac) Norwegian (Macintosh)
+no(mac_nodeadkeys) Norwegian (Macintosh, eliminate dead keys)
+no(colemak) Norwegian (Colemak)
+
+_
+pl Polish
+pl(legacy) Polish (legacy)
+pl(qwertz) Polish (qwertz)
+pl(dvorak) Polish (Dvorak)
+pl(dvorak_quotes) Polish (Dvorak, Polish quotes on quotemark key)
+pl(dvorak_altquotes) Polish (Dvorak, Polish quotes on key 1)
+pl(csb) Kashubian
+pl(szl) Silesian
+pl(ru_phonetic_dvorak) Russian (Poland, phonetic Dvorak)
+pl(dvp) Polish (programmer Dvorak)
+
+_
+pt Portuguese
+pt(nodeadkeys) Portuguese (eliminate dead keys)
+pt(sundeadkeys) Portuguese (Sun dead keys)
+pt(mac) Portuguese (Macintosh)
+pt(mac_nodeadkeys) Portuguese (Macintosh, eliminate dead keys)
+pt(mac_sundeadkeys) Portuguese (Macintosh, Sun dead keys)
+pt(nativo) Portuguese (Nativo)
+pt(nativo-us) Portuguese (Nativo for US keyboards)
+pt(nativo-epo) Esperanto (Portugal, Nativo)
+
+_
+ro Romanian
+ro(cedilla) Romanian (cedilla)
+ro(std) Romanian (standard)
+ro(std_cedilla) Romanian (standard cedilla)
+ro(winkeys) Romanian (WinKeys)
+
+_
+ru Russian
+ru(phonetic) Russian (phonetic)
+ru(phonetic_winkeys) Russian (phonetic WinKeys)
+ru(typewriter) Russian (typewriter)
+ru(legacy) Russian (legacy)
+ru(typewriter-legacy) Russian (typewriter, legacy)
+ru(tt) Tatar
+ru(os_legacy) Ossetian (legacy)
+ru(os_winkeys) Ossetian (WinKeys)
+ru(cv) Chuvash
+ru(cv_latin) Chuvash (Latin)
+ru(udm) Udmurt
+ru(kom) Komi
+ru(sah) Yakut
+ru(xal) Kalmyk
+ru(dos) Russian (DOS)
+ru(mac) Russian (Macintosh)
+ru(srp) Serbian (Russia)
+ru(bak) Bashkirian
+ru(chm) Mari
+ru(phonetic_azerty) Russian (phonetic azerty)
+ru(phonetic_dvorak) Russian (phonetic dvorak)
+ru(phonetic_fr) Russian (phonetic French)
+
+_
+rs Serbian
+rs(yz) Serbian (Cyrillic, ZE and ZHE swapped)
+rs(latin) Serbian (Latin)
+rs(latinunicode) Serbian (Latin Unicode)
+rs(latinyz) Serbian (Latin qwerty)
+rs(latinunicodeyz) Serbian (Latin Unicode qwerty)
+rs(alternatequotes) Serbian (Cyrillic with guillemets)
+rs(latinalternatequotes) Serbian (Latin with guillemets)
+rs(rue) Pannonian Rusyn
+
+_
+si Slovenian
+si(alternatequotes) Slovenian (with guillemets for quotes)
+si(us) Slovenian (US keyboard with Slovenian letters)
+
+_
+sk Slovak
+sk(bksl) Slovak (extended Backslash)
+sk(qwerty) Slovak (qwerty)
+sk(qwerty_bksl) Slovak (qwerty, extended Backslash)
+
+_
+es Spanish
+es(nodeadkeys) Spanish (eliminate dead keys)
+es(winkeys) Spanish (Winkeys)
+es(deadtilde) Spanish (include dead tilde)
+es(sundeadkeys) Spanish (Sun dead keys)
+es(dvorak) Spanish (Dvorak)
+es(ast) Asturian (Spain, with bottom-dot H and bottom-dot L)
+es(cat) Catalan (Spain, with middle-dot L)
+es(mac) Spanish (Macintosh)
+
+_
+se Swedish
+se(nodeadkeys) Swedish (eliminate dead keys)
+se(dvorak) Swedish (Dvorak)
+se(rus) Russian (Sweden, phonetic)
+se(rus_nodeadkeys) Russian (Sweden, phonetic, eliminate dead keys)
+se(smi) Northern Saami (Sweden)
+se(mac) Swedish (Macintosh)
+se(svdvorak) Swedish (Svdvorak)
+se(swl) Swedish Sign Language
+
+_
+ch German (Switzerland)
+ch(legacy) German (Switzerland, legacy)
+ch(de_nodeadkeys) German (Switzerland, eliminate dead keys)
+ch(de_sundeadkeys) German (Switzerland, Sun dead keys)
+ch(fr) French (Switzerland)
+ch(fr_nodeadkeys) French (Switzerland, eliminate dead keys)
+ch(fr_sundeadkeys) French (Switzerland, Sun dead keys)
+ch(fr_mac) French (Switzerland, Macintosh)
+ch(de_mac) German (Switzerland, Macintosh)
+
+_
+sy Arabic (Syria)
+sy(syc) Syriac
+sy(syc_phonetic) Syriac (phonetic)
+sy(ku) Kurdish (Syria, Latin Q)
+sy(ku_f) Kurdish (Syria, F)
+sy(ku_alt) Kurdish (Syria, Latin Alt-Q)
+
+_
+tj Tajik
+tj(legacy) Tajik (legacy)
+
+_
+lk Sinhala (phonetic)
+lk(tam_unicode) Tamil (Sri Lanka, Unicode)
+lk(tam_TAB) Tamil (Sri Lanka, TAB Typewriter)
+lk(us) Sinhala (US keyboard with Sinhala letters)
+
+_
+th Thai
+th(tis) Thai (TIS-820.2538)
+th(pat) Thai (Pattachote)
+
+_
+tr Turkish
+tr(f) Turkish (F)
+tr(alt) Turkish (Alt-Q)
+tr(sundeadkeys) Turkish (Sun dead keys)
+tr(ku) Kurdish (Turkey, Latin Q)
+tr(ku_f) Kurdish (Turkey, F)
+tr(ku_alt) Kurdish (Turkey, Latin Alt-Q)
+tr(intl) Turkish (international with dead keys)
+tr(crh) Crimean Tatar (Turkish Q)
+tr(crh_f) Crimean Tatar (Turkish F)
+tr(crh_alt) Crimean Tatar (Turkish Alt-Q)
+
+_
+tw Taiwanese
+tw(indigenous) Taiwanese (indigenous)
+tw(saisiyat) Saisiyat (Taiwan)
+
+_
+ua Ukrainian
+ua(phonetic) Ukrainian (phonetic)
+ua(typewriter) Ukrainian (typewriter)
+ua(winkeys) Ukrainian (WinKeys)
+ua(legacy) Ukrainian (legacy)
+ua(rstu) Ukrainian (standard RSTU)
+ua(rstu_ru) Russian (Ukraine, standard RSTU)
+ua(homophonic) Ukrainian (homophonic)
+
+_
+gb English (UK)
+gb(extd) English (UK, extended WinKeys)
+gb(intl) English (UK, international with dead keys)
+gb(dvorak) English (UK, Dvorak)
+gb(dvorakukp) English (UK, Dvorak with UK punctuation)
+gb(mac) English (UK, Macintosh)
+gb(mac_intl) English (UK, Macintosh international)
+gb(colemak) English (UK, Colemak)
+
+_
+uz Uzbek
+uz(latin) Uzbek (Latin)
+
+_
+vn Vietnamese
+
+_
+kr Korean
+kr(kr104) Korean (101/104 key compatible)
+
+_
+nec_vndr/jp Japanese (PC-98xx Series)
+
+_
+ie Irish
+ie(CloGaelach) CloGaelach
+ie(UnicodeExpert) Irish (UnicodeExpert)
+ie(ogam) Ogham
+ie(ogam_is434) Ogham (IS434)
+
+_
+pk Urdu (Pakistan)
+pk(urd-crulp) Urdu (Pakistan, CRULP)
+pk(urd-nla) Urdu (Pakistan, NLA)
+pk(ara) Arabic (Pakistan)
+pk(snd) Sindhi
+
+_
+mv Dhivehi
+
+_
+za English (South Africa)
+
+_
+epo Esperanto
+epo(legacy) Esperanto (displaced semicolon and quote, obsolete)
+
+_
+np Nepali
+
+_
+ng English (Nigeria)
+ng(igbo) Igbo
+ng(yoruba) Yoruba
+ng(hausa) Hausa
+
+_
+et Amharic
+
+_
+sn Wolof
+
+_
+brai Braille
+brai(left_hand) Braille (left hand)
+brai(right_hand) Braille (right hand)
+
+_
+tm Turkmen
+tm(alt) Turkmen (Alt-Q)
+
+_
+ml Bambara
+ml(fr-oss) French (Mali, alternative)
+ml(us-mac) English (Mali, US Macintosh)
+ml(us-intl) English (Mali, US international)
+
+_
+tz Swahili (Tanzania)
+
+_
+tg French (Togo)
+
+_
+ke Swahili (Kenya)
+ke(kik) Kikuyu
+
+_
+bw Tswana
+
+_
+ph Filipino
+ph(qwerty-bay) Filipino (QWERTY Baybayin)
+ph(capewell-dvorak) Filipino (Capewell-Dvorak Latin)
+ph(capewell-dvorak-bay) Filipino (Capewell-Dvorak Baybayin)
+ph(capewell-qwerf2k6) Filipino (Capewell-QWERF 2006 Latin)
+ph(capewell-qwerf2k6-bay) Filipino (Capewell-QWERF 2006 Baybayin)
+ph(colemak) Filipino (Colemak Latin)
+ph(colemak-bay) Filipino (Colemak Baybayin)
+ph(dvorak) Filipino (Dvorak Latin)
+ph(dvorak-bay) Filipino (Dvorak Baybayin)
+
+_
+md Moldavian
+md(gag) Moldavian (Gagauz)
+
+_
+id Indonesian (Jawi)
+
+_
+my Malay (Jawi)
+
+_
+bn Malay (Jawi)
+
+_
+
+.TE
+.SH OPTIONS
+
+.SS
+Switching to another layout
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+grp:switch Right Alt (while pressed)
+grp:lswitch Left Alt (while pressed)
+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 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 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+Caps Lock
+grp:shifts_toggle Both Shift keys together
+grp:alts_toggle Both Alt keys together
+grp:ctrls_toggle Both Ctrl keys together
+grp:ctrl_shift_toggle Ctrl+Shift
+grp:lctrl_lshift_toggle Left Ctrl+Left Shift
+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
+grp:win_space_toggle Win Key+Space
+grp:rwin_toggle Right Win
+grp:lshift_toggle Left Shift
+grp:rshift_toggle Right Shift
+grp:lctrl_toggle Left Ctrl
+grp:rctrl_toggle Right Ctrl
+grp:sclk_toggle Scroll Lock
+grp:lctrl_lwin_rctrl_menu LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)
+grp:lctrl_lwin_toggle LeftCtrl+LeftWin
+
+.TE
+
+
+.SS
+Key to choose 3rd level
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+lv3:switch Right Ctrl
+lv3:menu_switch Menu
+lv3:win_switch Any Win key
+lv3:lwin_switch Left Win
+lv3:rwin_switch Right Win
+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 Compose
+lv3:ralt_alt Right Alt key never chooses 3rd level
+lv3:enter_switch Enter on keypad
+lv3:caps_switch Caps Lock
+lv3:bksl_switch Backslash
+lv3:lsgt_switch <Less/Greater>
+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
+
+.TE
+
+
+.SS
+Ctrl key position
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+ctrl:nocaps Caps Lock as Ctrl
+ctrl:lctrl_meta Left Ctrl as Meta
+ctrl:swapcaps Swap Ctrl and Caps Lock
+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: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_rwin_rctl Swap Right Win key with Right Ctrl key
+ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Alt
+
+.TE
+
+
+.SS
+Use keyboard LED to show alternative layout
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+grp_led:num Num Lock
+grp_led:caps Caps Lock
+grp_led:scroll Scroll Lock
+
+.TE
+
+
+.SS
+Layout of numeric keypad
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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: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:hex Hexadecimal
+keypad:atm ATM/phone-style
+
+.TE
+
+
+.SS
+Numeric keypad delete key behaviour
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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 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 Semicolon on third level
+
+.TE
+
+
+.SS
+Caps Lock key behavior
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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:shiftlock Caps Lock toggles ShiftLock (affects all keys)
+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:menu Make Caps Lock an additional Menu key
+caps:numlock Make Caps Lock an additional Num Lock
+caps:ctrl_modifier Caps Lock is also a Ctrl
+caps:none Caps Lock is disabled
+
+.TE
+
+
+.SS
+Alt/Win key behavior
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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 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_lalt_lwin Left Alt is swapped with Left Win
+altwin:swap_alt_win Alt is swapped with Win
+altwin:prtsc_rwin Win is mapped to PrtSc (and the usual Win key)
+
+.TE
+
+
+.SS
+Position of Compose key
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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
+
+.TE
+
+
+.SS
+Miscellaneous compatibility options
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+numpad:pc Default numeric keypad keys
+numpad:mac Numeric keypad keys always enter digits (as in Mac OS)
+numpad:microsoft NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (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, 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 Shift + NumLock toggles PointerKeys
+grab:break_actions Allow breaking grabs with keyboard actions (warning: security risk)
+grab:debug Allow grab and window tree logging
+
+.TE
+
+
+.SS
+Adding currency signs to certain keys
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+eurosign:e Euro on E
+eurosign:2 Euro on 2
+eurosign:4 Euro on 4
+eurosign:5 Euro on 5
+rupeesign:4 Rupee on 4
+
+.TE
+
+
+.SS
+Key to choose 5th level
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+lv5:lsgt_switch_lock <Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser
+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
+
+.TE
+
+
+.SS
+Using space key to input non-breakable space character
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+nbsp:none Usual space at any level
+nbsp:level2 Non-breakable space character at second level
+nbsp:level3 Non-breakable space character at third level
+nbsp:level3s Non-breakable space character at third level, nothing at fourth level
+nbsp:level3n Non-breakable space character at third level, thin non-breakable space character at fourth level
+nbsp:level4 Non-breakable space character at fourth level
+nbsp:level4n Non-breakable space character at fourth level, thin non-breakable space character at sixth level
+nbsp:level4nl Non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift)
+nbsp:zwnj2 Zero-width non-joiner character at second level
+nbsp:zwnj2zwj3 Zero-width non-joiner character at second level, zero-width joiner character at third level
+nbsp:zwnj2zwj3nb4 Zero-width non-joiner character at second level, zero-width joiner character at third level, non-breakable space character at fourth level
+nbsp:zwnj2nb3 Zero-width non-joiner character at second level, non-breakable space character at third level
+nbsp:zwnj2nb3s Zero-width non-joiner character at second level, non-breakable space character at third level, nothing at fourth level
+nbsp:zwnj2nb3zwj4 Zero-width non-joiner character at second level, non-breakable space character at third level, zero-width joiner at fourth level
+nbsp:zwnj2nb3nnb4 Zero-width non-joiner character at second level, non-breakable space character at third level, thin non-breakable space at fourth level
+nbsp:zwnj3zwj4 Zero-width non-joiner character at third level, zero-width joiner at fourth level
+
+.TE
+
+
+.SS
+Japanese keyboard options
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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
+
+.TE
+
+
+.SS
+Korean Hangul/Hanja keys
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+korean:hw_keys Hardware Hangul/Hanja keys
+korean:ralt_rctrl Right Alt as Hangul, right Ctrl as Hanja
+korean:rctrl_ralt Right Ctrl as Hangul, right Alt as Hanja
+
+.TE
+
+
+.SS
+Adding Esperanto supersigned letters
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+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
+
+.TE
+
+
+.SS
+Maintain key compatibility with old Solaris keycodes
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+solaris:sun_compat Sun Key compatibility
+
+.TE
+
+
+.SS
+Key sequence to kill the X server
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option Description
+terminate:ctrl_alt_bksp Ctrl + Alt + Backspace
+
+.TE
+
+
+.SH FILES
+/usr/X11R7/lib/X11/xkb/compat
+
+/usr/X11R7/lib/X11/xkb/compiled
+
+/usr/X11R7/lib/X11/xkb/geometry
+
+/usr/X11R7/lib/X11/xkb/keycodes
+
+/usr/X11R7/lib/X11/xkb/keymap
+
+/usr/X11R7/lib/X11/xkb/rules
+
+/usr/X11R7/lib/X11/xkb/semantics
+
+/usr/X11R7/lib/X11/xkb/symbols
+
+/usr/X11R7/lib/X11/xkb/types
+
+.SH SEE ALSO
+setxkbmap(1)
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile
diff -u /dev/null src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile:1.1
--- /dev/null Tue Nov 22 19:51:37 2016
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/jolla_vndr/Makefile Tue Nov 22 19:51:37 2016
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2016/11/22 19:51:37 snj Exp $
+
+.include <bsd.own.mk>
+
+FILESDIR= ${X11LIBDIR}/xkb/symbols/jolla_vndr
+FILES= sbj
+
+.PATH: ${X11SRCDIR.xkeyboard-config}/symbols/jolla_vndr
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
