Module Name: src
Committed By: mrg
Date: Sun Feb 23 11:17:03 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile
Log Message:
updates for xkeyboard-config 2.29.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
cvs rdiff -u -r1.13 -r1.14 \
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.lst
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/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.155 src/distrib/sets/lists/xbase/mi:1.156
--- src/distrib/sets/lists/xbase/mi:1.155 Sun Jan 19 00:58:13 2020
+++ src/distrib/sets/lists/xbase/mi Sun Feb 23 11:17:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.155 2020/01/19 00:58:13 jmcneill Exp $
+# $NetBSD: mi,v 1.156 2020/02/23 11:17:03 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -630,6 +630,7 @@
./usr/X11R7/lib/X11/xkb/compat/japan xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/compat/keypad xbase-obsolete obsolete
./usr/X11R7/lib/X11/xkb/compat/ledcaps xbase-xkeyboard-config-lib xorg
+./usr/X11R7/lib/X11/xkb/compat/ledcompose xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/compat/lednum xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/compat/ledscroll xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/compat/level5 xbase-xkeyboard-config-lib xorg
@@ -952,6 +953,7 @@
./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr base-x11-root xorg
./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr/sbj xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/jp xbase-xkeyboard-config-lib xorg
+./usr/X11R7/lib/X11/xkb/symbols/jv xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/kan xbase-obsolete obsolete
./usr/X11R7/lib/X11/xkb/symbols/ke xbase-xkeyboard-config-lib xorg
./usr/X11R7/lib/X11/xkb/symbols/keypad xbase-xkeyboard-config-lib xorg
Index: src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.4 src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.5
--- src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile:1.4 Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile Sun Feb 23 11:17:03 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2017/02/13 06:11:01 snj Exp $
+# $NetBSD: Makefile,v 1.5 2020/02/23 11:17:03 mrg Exp $
.include <bsd.own.mk>
XKBNAME= compat
FILES= README accessx basic caps complete iso9995 japan \
- ledcaps lednum ledscroll level5 misc mousekeys \
+ ledcaps ledcompose lednum ledscroll level5 misc mousekeys \
olpc pc pc98 xfree86 xtest
.include "../Makefile.xkbdata"
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.13 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.14
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.13 Wed Mar 6 11:05:18 2019
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Sun Feb 23 11:17:03 2020
@@ -1,4 +1,5 @@
-// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.py FROM rules/*.part
+//
//
// Rules for resolving XKB components for use with XFree86
// Copyright 1996 by Joseph Moss
@@ -19,7 +20,7 @@
! $jollamodels = jollasbj
// Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
@@ -85,7 +86,6 @@
! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
-! $htcdreamlayouts = us it de
! $inetkbds = acer_c300 acer_ferrari4k acer_laptop \
airkey \
@@ -104,7 +104,7 @@
genius geniuscomfy2 \
gyration honeywell_euroboard \
hp250x hp5xx hp500fa hpdv5 \
- hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx htcdream \
+ hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
ibm_spacesaver ipaq inspiron intel \
logiaccess logicda logicink \
logiex110 logiclx300 \
@@ -382,86 +382,85 @@
ws007sh * = pc+sharp_vndr/ws007sh(basic)
ws011sh * = pc+sharp_vndr/ws011sh(basic)
ws020sh * = pc+sharp_vndr/ws020sh(basic)
- htcdream $htcdreamlayouts = %l(htcdream)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
-! model layout[1] = symbols
- * ar = pc+ara%(v[1])
- * ben = pc+in(ben)
- * bs = pc+ba%(v[1])
- * cs = pc+rs%(v[1])
- * cz_qwerty = pc+cz(qwerty)
- * dev = pc+in(deva)
- * dvorak = pc+us(dvorak)
- * dzdwi = pc+bt%(v[1])
- * el = pc+gr%(v[1])
- * en_US = pc+latin%(v[1])
- * guj = pc+in(guj)
- * gur = pc+in(guru)
- * iu = pc+ca(ike)
- * lo = pc+la%(v[1])
- * kan = pc+in(kan)
- * mi = pc+mao%(v[1])
- * ogham = pc+ie(ogam)
- * ori = pc+ie(ori)
- * sapmi = pc+no(smi)
- * sr = pc+srp%(v[1])
- * syr = pc+sy(syc)
- * tel = pc+in(tel)
- * tml = pc+in(tam)
- * yu = pc+srp%(v[1])
- * fr-latin9 = pc+fr(latin9)
- * us_intl = pc+us(alt-intl)
- * ben(basic) = pc+in(ben)
- * ben(probhat) = pc+in(ben_probhat)
- * dev(basic) = pc+in(deva)
- * dvorak($dvoraklayouts) = pc+%v(dvorak)
- * dvorak(basic) = pc+us(dvorak)
- * dvorak(pl_basic) = pc+pl(dvorak)
- * dvorak(pl) = pc+pl(dvorak_quotes)
- * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes)
- * dzdwi(basic) = pc+bt(basic)
- * fi(basic) = pc+fi(classic)
- * ge(azerty_tskapo) = pc+fr(geo)
- * guj(basic) = pc+in(guj)
- * gur(basic) = pc+in(guru)
- * ie(laptop) = pc+ie(basic)
- * ie(CloGaelachLaptop) = pc+ie(CloGaelach)
- * in(urd) = pc+in(urd-phonetic)
- * iu(basic) = pc+ca(ike)
- * lo(basic) = pc+la(basic)
- * kan(basic) = pc+in(kan)
- * mal(basic) = pc+in(mal)
- * mal(mlplusnum) = pc+in(mal)
- * ogham(basic) = pc+ie(ogam)
- * ogham(laptop) = pc+ie(ogam)
- * ogham(is434) = pc+ie(ogam_is434)
- * ogham(is434laptop) = pc+ie(ogam_is434)
- * ori(basic) = pc+in(ori)
- * ro(de) = pc+ro(winkeys)
- * ro(us) = pc+ro(std)
- * ro(academic) = pc+ro(std)
- * ro(std_comma) = pc+ro(std)
- * ro(comma) = pc+ro(basic)
- * ru(os) = pc+ru(os_legacy)
- * pk(urd) = pc+pk(urd-phonetic)
- * sapmi(basic) = pc+no(smi)
- * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys)
- * sapmi(sefi) = pc+fi(smi)
- * sin(phonetic-static) = pc+in(sin_phonetic)
- * syr(basic) = pc+sy(syc)
- * syr(phonetic) = pc+sy(syc_phonetic)
- * tam(INSCRIPT) = pc+in(tam)
- * tam(UNI) = pc+in(tam_unicode)
- * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals)
- * tam(TAB) = pc+in(tam_TAB)
- * tam(TSCII) = pc+in(tam_TSCII)
- * tel(basic) = pc+in(tel)
- * yu(basic) = pc+srp(latin)
- * yu(unicode) = pc+srp(latinunicode)
- * yu(yz) = pc+srp(latinyz)
- * yu(unicodeyz) = pc+srp(latinunicodeyz)
+! model layout[1] = symbols
+ * ar = pc+ara%(v[1])
+ * ben = pc+in(ben)
+ * bs = pc+ba%(v[1])
+ * cs = pc+rs%(v[1])
+ * cz_qwerty = pc+cz(qwerty)
+ * dev = pc+in(deva)
+ * dvorak = pc+us(dvorak)
+ * dzdwi = pc+bt%(v[1])
+ * el = pc+gr%(v[1])
+ * en_US = pc+latin%(v[1])
+ * guj = pc+in(guj)
+ * gur = pc+in(guru)
+ * iu = pc+ca(ike)
+ * lo = pc+la%(v[1])
+ * kan = pc+in(kan)
+ * mi = pc+mao%(v[1])
+ * ogham = pc+ie(ogam)
+ * ori = pc+ie(ori)
+ * sapmi = pc+no(smi)
+ * sr = pc+srp%(v[1])
+ * syr = pc+sy(syc)
+ * tel = pc+in(tel)
+ * tml = pc+in(tam)
+ * yu = pc+srp%(v[1])
+ * fr-latin9 = pc+fr(latin9)
+ * us_intl = pc+us(alt-intl)
+ * ben(basic) = pc+in(ben)
+ * ben(probhat) = pc+in(ben_probhat)
+ * dev(basic) = pc+in(deva)
+ * dvorak($dvoraklayouts) = pc+%v(dvorak)
+ * dvorak(basic) = pc+us(dvorak)
+ * dvorak(pl_basic) = pc+pl(dvorak)
+ * dvorak(pl) = pc+pl(dvorak_quotes)
+ * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes)
+ * dzdwi(basic) = pc+bt(basic)
+ * fi(basic) = pc+fi(classic)
+ * ge(azerty_tskapo) = pc+fr(geo)
+ * guj(basic) = pc+in(guj)
+ * gur(basic) = pc+in(guru)
+ * ie(laptop) = pc+ie(basic)
+ * ie(CloGaelachLaptop) = pc+ie(CloGaelach)
+ * in(urd) = pc+in(urd-phonetic)
+ * iu(basic) = pc+ca(ike)
+ * lo(basic) = pc+la(basic)
+ * kan(basic) = pc+in(kan)
+ * mal(basic) = pc+in(mal)
+ * mal(mlplusnum) = pc+in(mal)
+ * ogham(basic) = pc+ie(ogam)
+ * ogham(laptop) = pc+ie(ogam)
+ * ogham(is434) = pc+ie(ogam_is434)
+ * ogham(is434laptop) = pc+ie(ogam_is434)
+ * ori(basic) = pc+in(ori)
+ * ro(de) = pc+ro(winkeys)
+ * ro(us) = pc+ro(std)
+ * ro(academic) = pc+ro(std)
+ * ro(std_comma) = pc+ro(std)
+ * ro(comma) = pc+ro(basic)
+ * ru(os) = pc+ru(os_legacy)
+ * pk(urd) = pc+pk(urd-phonetic)
+ * sapmi(basic) = pc+no(smi)
+ * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys)
+ * sapmi(sefi) = pc+fi(smi)
+ * sin(phonetic-static) = pc+in(sin_phonetic)
+ * syr(basic) = pc+sy(syc)
+ * syr(phonetic) = pc+sy(syc_phonetic)
+ * tam(INSCRIPT) = pc+in(tam)
+ * tam(UNI) = pc+in(tam_unicode)
+ * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals)
+ * tam(TAB) = pc+in(tam_TAB)
+ * tam(TSCII) = pc+in(tam_TSCII)
+ * tel(basic) = pc+in(tel)
+ * yu(basic) = pc+srp(latin)
+ * yu(unicode) = pc+srp(latinunicode)
+ * yu(yz) = pc+srp(latinyz)
+ * 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])
@@ -479,55 +478,55 @@
* * = pc+%l[1]%(v[1])
! model layout[1] variant[1] = symbols
- * ben basic = pc+in(ben)
- * ben probhat = pc+in(ben_probhat)
- * dev basic = pc+in(deva)
- * dvorak $dvoraklayouts = pc+%v(dvorak)
- * dvorak basic = pc+us(dvorak)
- * dvorak pl_basic = pc+pl(dvorak)
- * dvorak pl = pc+pl(dvorak_quotes)
- * dvorak pl_altquotes = pc+pl(dvorak_altquotes)
- * dzdwi basic = pc+bt(basic)
- * fi basic = pc+fi(classic)
- * ge azerty_tskapo = pc+fr(geo)
- * guj basic = pc+in(guj)
- * gur basic = pc+in(guru)
- * ie laptop = pc+ie(basic)
- * ie CloGaelachLaptop = pc+ie(CloGaelach)
- * in urd = pc+in(urd-phonetic)
- * iu basic = pc+ca(ike)
- * lo basic = pc+la(basic)
- * kan basic = pc+in(kan)
- * mal basic = pc+in(mal)
- * mal mlplusnum = pc+in(mal)
- * ogham basic = pc+ie(ogam)
- * ogham laptop = pc+ie(ogam)
- * ogham is434 = pc+ie(ogam_is434)
- * ogham is434laptop = pc+ie(ogam_is434)
- * ori basic = pc+in(ori)
- * ro de = pc+ro(winkeys)
- * ro us = pc+ro(std)
- * ro academic = pc+ro(std)
- * ro std_comma = pc+ro(std)
- * ro comma = pc+ro(basic)
- * ru os = pc+ru(os_legacy)
- * pk urd = pc+pk(urd-phonetic)
- * sapmi basic = pc+no(smi)
- * sapmi nodeadkeys = pc+no(smi_nodeadkeys)
- * sapmi sefi = pc+fi(smi)
- * sin phonetic-static = pc+in(sin_phonetic)
- * syr basic = pc+sy(syc)
- * syr phonetic = pc+sy(syc_phonetic)
- * tam INSCRIPT = pc+in(tam)
- * tam UNI = pc+in(tam_unicode)
- * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals)
- * tam TAB = pc+in(tam_TAB)
- * tam TSCII = pc+in(tam_TSCII)
- * tel basic = pc+in(tel)
- * yu basic = pc+srp(latin)
- * yu unicode = pc+srp(latinunicode)
- * yu yz = pc+srp(latinyz)
- * yu unicodeyz = pc+srp(latinunicodeyz)
+ * ben basic = pc+in(ben)
+ * ben probhat = pc+in(ben_probhat)
+ * dev basic = pc+in(deva)
+ * dvorak $dvoraklayouts = pc+%v(dvorak)
+ * dvorak basic = pc+us(dvorak)
+ * dvorak pl_basic = pc+pl(dvorak)
+ * dvorak pl = pc+pl(dvorak_quotes)
+ * dvorak pl_altquotes = pc+pl(dvorak_altquotes)
+ * dzdwi basic = pc+bt(basic)
+ * fi basic = pc+fi(classic)
+ * ge azerty_tskapo = pc+fr(geo)
+ * guj basic = pc+in(guj)
+ * gur basic = pc+in(guru)
+ * ie laptop = pc+ie(basic)
+ * ie CloGaelachLaptop = pc+ie(CloGaelach)
+ * in urd = pc+in(urd-phonetic)
+ * iu basic = pc+ca(ike)
+ * lo basic = pc+la(basic)
+ * kan basic = pc+in(kan)
+ * mal basic = pc+in(mal)
+ * mal mlplusnum = pc+in(mal)
+ * ogham basic = pc+ie(ogam)
+ * ogham laptop = pc+ie(ogam)
+ * ogham is434 = pc+ie(ogam_is434)
+ * ogham is434laptop = pc+ie(ogam_is434)
+ * ori basic = pc+in(ori)
+ * ro de = pc+ro(winkeys)
+ * ro us = pc+ro(std)
+ * ro academic = pc+ro(std)
+ * ro std_comma = pc+ro(std)
+ * ro comma = pc+ro(basic)
+ * ru os = pc+ru(os_legacy)
+ * pk urd = pc+pk(urd-phonetic)
+ * sapmi basic = pc+no(smi)
+ * sapmi nodeadkeys = pc+no(smi_nodeadkeys)
+ * sapmi sefi = pc+fi(smi)
+ * sin phonetic-static = pc+in(sin_phonetic)
+ * syr basic = pc+sy(syc)
+ * syr phonetic = pc+sy(syc_phonetic)
+ * tam INSCRIPT = pc+in(tam)
+ * tam UNI = pc+in(tam_unicode)
+ * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals)
+ * tam TAB = pc+in(tam_TAB)
+ * tam TSCII = pc+in(tam_TSCII)
+ * tel basic = pc+in(tel)
+ * yu basic = pc+srp(latin)
+ * yu unicode = pc+srp(latinunicode)
+ * yu yz = pc+srp(latinyz)
+ * yu unicodeyz = pc+srp(latinunicodeyz)
! model layout[2] = symbols
* ar = +ara%(v[2]):2
@@ -556,55 +555,55 @@
* yu = +srp%(v[2]):2
* fr-latin9 = +fr(latin9):2
* us_intl = +us(alt-intl):2
- * ben(basic) = +in(ben):2
- * ben(probhat) = +in(ben_probhat):2
- * dev(basic) = +in(deva):2
- * dvorak($dvoraklayouts) = +%v(dvorak):2
- * dvorak(basic) = +us(dvorak):2
- * dvorak(pl_basic) = +pl(dvorak):2
- * dvorak(pl) = +pl(dvorak_quotes):2
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2
- * dzdwi(basic) = +bt(basic):2
- * fi(basic) = +fi(classic):2
- * ge(azerty_tskapo) = +fr(geo):2
- * guj(basic) = +in(guj):2
- * gur(basic) = +in(guru):2
- * ie(laptop) = +ie(basic):2
- * ie(CloGaelachLaptop) = +ie(CloGaelach):2
- * in(urd) = +in(urd-phonetic):2
- * iu(basic) = +ca(ike):2
- * lo(basic) = +la(basic):2
- * kan(basic) = +in(kan):2
- * mal(basic) = +in(mal):2
- * mal(mlplusnum) = +in(mal):2
- * ogham(basic) = +ie(ogam):2
- * ogham(laptop) = +ie(ogam):2
- * ogham(is434) = +ie(ogam_is434):2
- * ogham(is434laptop) = +ie(ogam_is434):2
- * ori(basic) = +in(ori):2
- * ro(de) = +ro(winkeys):2
- * ro(us) = +ro(std):2
- * ro(academic) = +ro(std):2
- * ro(std_comma) = +ro(std):2
- * ro(comma) = +ro(basic):2
- * ru(os) = +ru(os_legacy):2
- * pk(urd) = +pk(urd-phonetic):2
- * sapmi(basic) = +no(smi):2
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2
- * sapmi(sefi) = +fi(smi):2
- * sin(phonetic-static) = +in(sin_phonetic):2
- * syr(basic) = +sy(syc):2
- * syr(phonetic) = +sy(syc_phonetic):2
- * tam(INSCRIPT) = +in(tam):2
- * tam(UNI) = +in(tam_unicode):2
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2
- * tam(TAB) = +in(tam_TAB):2
- * tam(TSCII) = +in(tam_TSCII):2
- * tel(basic) = +in(tel):2
- * yu(basic) = +srp(latin):2
- * yu(unicode) = +srp(latinunicode):2
- * yu(yz) = +srp(latinyz):2
- * yu(unicodeyz) = +srp(latinunicodeyz):2
+ * ben(basic) = +in(ben):2
+ * ben(probhat) = +in(ben_probhat):2
+ * dev(basic) = +in(deva):2
+ * dvorak($dvoraklayouts) = +%v(dvorak):2
+ * dvorak(basic) = +us(dvorak):2
+ * dvorak(pl_basic) = +pl(dvorak):2
+ * dvorak(pl) = +pl(dvorak_quotes):2
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2
+ * dzdwi(basic) = +bt(basic):2
+ * fi(basic) = +fi(classic):2
+ * ge(azerty_tskapo) = +fr(geo):2
+ * guj(basic) = +in(guj):2
+ * gur(basic) = +in(guru):2
+ * ie(laptop) = +ie(basic):2
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):2
+ * in(urd) = +in(urd-phonetic):2
+ * iu(basic) = +ca(ike):2
+ * lo(basic) = +la(basic):2
+ * kan(basic) = +in(kan):2
+ * mal(basic) = +in(mal):2
+ * mal(mlplusnum) = +in(mal):2
+ * ogham(basic) = +ie(ogam):2
+ * ogham(laptop) = +ie(ogam):2
+ * ogham(is434) = +ie(ogam_is434):2
+ * ogham(is434laptop) = +ie(ogam_is434):2
+ * ori(basic) = +in(ori):2
+ * ro(de) = +ro(winkeys):2
+ * ro(us) = +ro(std):2
+ * ro(academic) = +ro(std):2
+ * ro(std_comma) = +ro(std):2
+ * ro(comma) = +ro(basic):2
+ * ru(os) = +ru(os_legacy):2
+ * pk(urd) = +pk(urd-phonetic):2
+ * sapmi(basic) = +no(smi):2
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2
+ * sapmi(sefi) = +fi(smi):2
+ * sin(phonetic-static) = +in(sin_phonetic):2
+ * syr(basic) = +sy(syc):2
+ * syr(phonetic) = +sy(syc_phonetic):2
+ * tam(INSCRIPT) = +in(tam):2
+ * tam(UNI) = +in(tam_unicode):2
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2
+ * tam(TAB) = +in(tam_TAB):2
+ * tam(TSCII) = +in(tam_TSCII):2
+ * tel(basic) = +in(tel):2
+ * yu(basic) = +srp(latin):2
+ * yu(unicode) = +srp(latinunicode):2
+ * yu(yz) = +srp(latinyz):2
+ * yu(unicodeyz) = +srp(latinunicodeyz):2
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2
nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2
$sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2
@@ -637,55 +636,55 @@
* yu = +srp%(v[3]):3
* fr-latin9 = +fr(latin9):3
* us_intl = +us(alt-intl):3
- * ben(basic) = +in(ben):3
- * ben(probhat) = +in(ben_probhat):3
- * dev(basic) = +in(deva):3
- * dvorak($dvoraklayouts) = +%v(dvorak):3
- * dvorak(basic) = +us(dvorak):3
- * dvorak(pl_basic) = +pl(dvorak):3
- * dvorak(pl) = +pl(dvorak_quotes):3
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3
- * dzdwi(basic) = +bt(basic):3
- * fi(basic) = +fi(classic):3
- * ge(azerty_tskapo) = +fr(geo):3
- * guj(basic) = +in(guj):3
- * gur(basic) = +in(guru):3
- * ie(laptop) = +ie(basic):3
- * ie(CloGaelachLaptop) = +ie(CloGaelach):3
- * in(urd) = +in(urd-phonetic):3
- * iu(basic) = +ca(ike):3
- * lo(basic) = +la(basic):3
- * kan(basic) = +in(kan):3
- * mal(basic) = +in(mal):3
- * mal(mlplusnum) = +in(mal):3
- * ogham(basic) = +ie(ogam):3
- * ogham(laptop) = +ie(ogam):3
- * ogham(is434) = +ie(ogam_is434):3
- * ogham(is434laptop) = +ie(ogam_is434):3
- * ori(basic) = +in(ori):3
- * ro(de) = +ro(winkeys):3
- * ro(us) = +ro(std):3
- * ro(academic) = +ro(std):3
- * ro(std_comma) = +ro(std):3
- * ro(comma) = +ro(basic):3
- * ru(os) = +ru(os_legacy):3
- * pk(urd) = +pk(urd-phonetic):3
- * sapmi(basic) = +no(smi):3
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3
- * sapmi(sefi) = +fi(smi):3
- * sin(phonetic-static) = +in(sin_phonetic):3
- * syr(basic) = +sy(syc):3
- * syr(phonetic) = +sy(syc_phonetic):3
- * tam(INSCRIPT) = +in(tam):3
- * tam(UNI) = +in(tam_unicode):3
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3
- * tam(TAB) = +in(tam_TAB):3
- * tam(TSCII) = +in(tam_TSCII):3
- * tel(basic) = +in(tel):3
- * yu(basic) = +srp(latin):3
- * yu(unicode) = +srp(latinunicode):3
- * yu(yz) = +srp(latinyz):3
- * yu(unicodeyz) = +srp(latinunicodeyz):3
+ * ben(basic) = +in(ben):3
+ * ben(probhat) = +in(ben_probhat):3
+ * dev(basic) = +in(deva):3
+ * dvorak($dvoraklayouts) = +%v(dvorak):3
+ * dvorak(basic) = +us(dvorak):3
+ * dvorak(pl_basic) = +pl(dvorak):3
+ * dvorak(pl) = +pl(dvorak_quotes):3
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3
+ * dzdwi(basic) = +bt(basic):3
+ * fi(basic) = +fi(classic):3
+ * ge(azerty_tskapo) = +fr(geo):3
+ * guj(basic) = +in(guj):3
+ * gur(basic) = +in(guru):3
+ * ie(laptop) = +ie(basic):3
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):3
+ * in(urd) = +in(urd-phonetic):3
+ * iu(basic) = +ca(ike):3
+ * lo(basic) = +la(basic):3
+ * kan(basic) = +in(kan):3
+ * mal(basic) = +in(mal):3
+ * mal(mlplusnum) = +in(mal):3
+ * ogham(basic) = +ie(ogam):3
+ * ogham(laptop) = +ie(ogam):3
+ * ogham(is434) = +ie(ogam_is434):3
+ * ogham(is434laptop) = +ie(ogam_is434):3
+ * ori(basic) = +in(ori):3
+ * ro(de) = +ro(winkeys):3
+ * ro(us) = +ro(std):3
+ * ro(academic) = +ro(std):3
+ * ro(std_comma) = +ro(std):3
+ * ro(comma) = +ro(basic):3
+ * ru(os) = +ru(os_legacy):3
+ * pk(urd) = +pk(urd-phonetic):3
+ * sapmi(basic) = +no(smi):3
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3
+ * sapmi(sefi) = +fi(smi):3
+ * sin(phonetic-static) = +in(sin_phonetic):3
+ * syr(basic) = +sy(syc):3
+ * syr(phonetic) = +sy(syc_phonetic):3
+ * tam(INSCRIPT) = +in(tam):3
+ * tam(UNI) = +in(tam_unicode):3
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3
+ * tam(TAB) = +in(tam_TAB):3
+ * tam(TSCII) = +in(tam_TSCII):3
+ * tel(basic) = +in(tel):3
+ * yu(basic) = +srp(latin):3
+ * yu(unicode) = +srp(latinunicode):3
+ * yu(yz) = +srp(latinyz):3
+ * yu(unicodeyz) = +srp(latinunicodeyz):3
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3
nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3
$sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3
@@ -718,55 +717,55 @@
* yu = +srp%(v[4]):4
* fr-latin9 = +fr(latin9):4
* us_intl = +us(alt-intl):4
- * ben(basic) = +in(ben):4
- * ben(probhat) = +in(ben_probhat):4
- * dev(basic) = +in(deva):4
- * dvorak($dvoraklayouts) = +%v(dvorak):4
- * dvorak(basic) = +us(dvorak):4
- * dvorak(pl_basic) = +pl(dvorak):4
- * dvorak(pl) = +pl(dvorak_quotes):4
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4
- * dzdwi(basic) = +bt(basic):4
- * fi(basic) = +fi(classic):4
- * ge(azerty_tskapo) = +fr(geo):4
- * guj(basic) = +in(guj):4
- * gur(basic) = +in(guru):4
- * ie(laptop) = +ie(basic):4
- * ie(CloGaelachLaptop) = +ie(CloGaelach):4
- * in(urd) = +in(urd-phonetic):4
- * iu(basic) = +ca(ike):4
- * lo(basic) = +la(basic):4
- * kan(basic) = +in(kan):4
- * mal(basic) = +in(mal):4
- * mal(mlplusnum) = +in(mal):4
- * ogham(basic) = +ie(ogam):4
- * ogham(laptop) = +ie(ogam):4
- * ogham(is434) = +ie(ogam_is434):4
- * ogham(is434laptop) = +ie(ogam_is434):4
- * ori(basic) = +in(ori):4
- * ro(de) = +ro(winkeys):4
- * ro(us) = +ro(std):4
- * ro(academic) = +ro(std):4
- * ro(std_comma) = +ro(std):4
- * ro(comma) = +ro(basic):4
- * ru(os) = +ru(os_legacy):4
- * pk(urd) = +pk(urd-phonetic):4
- * sapmi(basic) = +no(smi):4
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4
- * sapmi(sefi) = +fi(smi):4
- * sin(phonetic-static) = +in(sin_phonetic):4
- * syr(basic) = +sy(syc):4
- * syr(phonetic) = +sy(syc_phonetic):4
- * tam(INSCRIPT) = +in(tam):4
- * tam(UNI) = +in(tam_unicode):4
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4
- * tam(TAB) = +in(tam_TAB):4
- * tam(TSCII) = +in(tam_TSCII):4
- * tel(basic) = +in(tel):4
- * yu(basic) = +srp(latin):4
- * yu(unicode) = +srp(latinunicode):4
- * yu(yz) = +srp(latinyz):4
- * yu(unicodeyz) = +srp(latinunicodeyz):4
+ * ben(basic) = +in(ben):4
+ * ben(probhat) = +in(ben_probhat):4
+ * dev(basic) = +in(deva):4
+ * dvorak($dvoraklayouts) = +%v(dvorak):4
+ * dvorak(basic) = +us(dvorak):4
+ * dvorak(pl_basic) = +pl(dvorak):4
+ * dvorak(pl) = +pl(dvorak_quotes):4
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4
+ * dzdwi(basic) = +bt(basic):4
+ * fi(basic) = +fi(classic):4
+ * ge(azerty_tskapo) = +fr(geo):4
+ * guj(basic) = +in(guj):4
+ * gur(basic) = +in(guru):4
+ * ie(laptop) = +ie(basic):4
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):4
+ * in(urd) = +in(urd-phonetic):4
+ * iu(basic) = +ca(ike):4
+ * lo(basic) = +la(basic):4
+ * kan(basic) = +in(kan):4
+ * mal(basic) = +in(mal):4
+ * mal(mlplusnum) = +in(mal):4
+ * ogham(basic) = +ie(ogam):4
+ * ogham(laptop) = +ie(ogam):4
+ * ogham(is434) = +ie(ogam_is434):4
+ * ogham(is434laptop) = +ie(ogam_is434):4
+ * ori(basic) = +in(ori):4
+ * ro(de) = +ro(winkeys):4
+ * ro(us) = +ro(std):4
+ * ro(academic) = +ro(std):4
+ * ro(std_comma) = +ro(std):4
+ * ro(comma) = +ro(basic):4
+ * ru(os) = +ru(os_legacy):4
+ * pk(urd) = +pk(urd-phonetic):4
+ * sapmi(basic) = +no(smi):4
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4
+ * sapmi(sefi) = +fi(smi):4
+ * sin(phonetic-static) = +in(sin_phonetic):4
+ * syr(basic) = +sy(syc):4
+ * syr(phonetic) = +sy(syc_phonetic):4
+ * tam(INSCRIPT) = +in(tam):4
+ * tam(UNI) = +in(tam_unicode):4
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4
+ * tam(TAB) = +in(tam_TAB):4
+ * tam(TSCII) = +in(tam_TSCII):4
+ * tel(basic) = +in(tel):4
+ * yu(basic) = +srp(latin):4
+ * yu(unicode) = +srp(latinunicode):4
+ * yu(yz) = +srp(latinyz):4
+ * yu(unicodeyz) = +srp(latinunicodeyz):4
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4
nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4
$sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4
@@ -1073,6 +1072,7 @@
! option = symbols
grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
+ altwin:menu_win = +altwin(menu_win)
altwin:meta_alt = +altwin(meta_alt)
altwin:alt_win = +altwin(alt_win)
altwin:ctrl_win = +altwin(ctrl_win)
@@ -1139,11 +1139,14 @@
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
lv3:enter_switch = +level3(enter_switch)
+ lv3:4_switch_isolated = +level3(4_switch_isolated)
+ lv3:9_switch_isolated = +level3(9_switch_isolated)
caps:capslock = +capslock(capslock)
caps:numlock = +capslock(numlock)
caps:shiftlock = +capslock(shiftlock)
caps:swapescape = +capslock(swapescape)
caps:escape = +capslock(escape)
+ caps:escape_shifted_capslock = +capslock(escape_shifted_capslock)
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
@@ -1153,6 +1156,8 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
+ ctrl:swapcaps_hyper = +ctrl(swapcaps_hyper)
+ ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout)
ctrl:ac_ctrl = +ctrl(ac_ctrl)
ctrl:aa_ctrl = +ctrl(aa_ctrl)
ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
@@ -1204,8 +1209,10 @@
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
- korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja)
- korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja)
+ korean:ralt_hangul = +kr(ralt_hangul)
+ korean:rctrl_hangul = +kr(rctrl_hangul)
+ korean:ralt_hanja = +kr(ralt_hanja)
+ korean:rctrl_hanja = +kr(rctrl_hanja)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
@@ -1237,6 +1244,8 @@
lv3:caps_switch_latch = +level3(caps_switch_latch)
lv3:bksl_switch_latch = +level3(bksl_switch_latch)
lv3:lsgt_switch_latch = +level3(lsgt_switch_latch)
+ lv5:lsgt_switch = +level5(lsgt_switch)
+ lv5:ralt_switch = +level5(ralt_switch)
lv5:lsgt_switch_lock = +level5(lsgt_switch_lock)
lv5:ralt_switch_lock = +level5(ralt_switch_lock)
lv5:lwin_switch_lock = +level5(lwin_switch_lock)
@@ -1252,6 +1261,7 @@
grp_led:num = +lednum(group_lock)
grp_led:caps = +ledcaps(group_lock)
grp_led:scroll = +ledscroll(group_lock)
+ mod_led:compose = +ledcompose(compose)
japan:kana_lock = +japan(kana_lock)
caps:shiftlock = +ledcaps(shift_lock)
grab:break_actions = +xfree86(grab_break)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.13 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.14
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.13 Wed Mar 6 11:05:18 2019
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Sun Feb 23 11:17:03 2020
@@ -63,7 +63,6 @@
geniuskb19e Genius KB-19e NB
geniuskkb2050hs Genius KKB-2050HS
gyration Gyration
- htcdream HTC Dream
kinesis Kinesis
logitech_base Logitech
logitech_g15 Logitech G15 extra keys via G15daemon
@@ -122,6 +121,7 @@
microsoftprose Microsoft Internet Pro (Swedish)
microsoftoffice Microsoft Office Keyboard
microsoftmult Microsoft Wireless Multimedia 1.0A
+ microsoftsurface Microsoft Surface
microsoftelite Microsoft Natural Elite
microsoftccurve2k Microsoft Comfort Curve 2000
oretec Ortek Multimedia/Internet MCK-800
@@ -183,7 +183,6 @@
unitekkb1925 Unitek KB-1925
compalfl90 FL90
creativedw7000 Creative Desktop Wireless 7000
- htcdream Htc Dream phone
teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
@@ -288,7 +287,8 @@
bw Tswana
ph Filipino
md Moldavian
- id Indonesian (Jawi)
+ id Indonesian (Arab Melayu, phonetic)
+ jv Indonesian (Javanese)
my Malay (Jawi, Arabic Keyboard)
! variant
@@ -309,6 +309,7 @@
altgr-intl us: English (intl., with AltGr dead keys)
olpc2 us: English (the divide/multiply keys toggle the layout)
hbs us: Serbo-Croatian (US)
+ norman us: English (Norman)
workman us: English (Workman)
workman-intl us: English (Workman, intl., with dead keys)
ps af: Pashto
@@ -325,6 +326,7 @@
olpc ara: Arabic (OLPC)
mac ara: Arabic (Macintosh)
plisi al: Albanian (Plisi)
+ veqilharxhi al: Albanian (Veqilharxhi)
phonetic am: Armenian (phonetic)
phonetic-alt am: Armenian (alt. phonetic)
eastern am: Armenian (eastern)
@@ -356,7 +358,6 @@
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
kan-kagapa in: Kannada (KaGaPa phonetic)
- kan-kagapa in: Kannada (KaGaPa phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript, with rupee)
@@ -414,6 +415,13 @@
multi-2gr ca: Canadian Multilingual (2nd part)
ike ca: Inuktitut
eng ca: English (Canada)
+ mon_trad cn: Mongolian (Bichig)
+ mon_trad_todo cn: Mongolian Todo
+ mon_trad_xibe cn: Mongolian Xibe
+ mon_trad_manchu cn: Mongolian Manchu
+ mon_trad_galik cn: Mongolian Galik
+ mon_todo_galik cn: Mongolian Todo Galik
+ mon_manchu_galik cn: Mongolian Manchu Galik
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
@@ -425,6 +433,7 @@
bksl cz: Czech (with <\|> key)
qwerty cz: Czech (QWERTY)
qwerty_bksl cz: Czech (QWERTY, extended backslash)
+ qwerty-mac cz: Czech (QWERTY, Macintosh)
ucw cz: Czech (UCW, only accented letters)
dvorak-ucw cz: Czech (US, Dvorak, UCW support)
rus cz: Russian (Czech, phonetic)
@@ -449,9 +458,9 @@
ku_alt iq: Kurdish (Iraq, Latin Alt-Q)
ku_ara iq: Kurdish (Iraq, Arabic-Latin)
nodeadkeys fo: Faroese (no dead keys)
+ winkeys fi: Finnish (Winkeys)
classic fi: Finnish (classic)
nodeadkeys fi: Finnish (classic, no dead keys)
- winkeys fi: Finnish (Winkeys)
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
@@ -465,9 +474,11 @@
latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
bepo fr: French (Bepo, ergonomic, Dvorak way)
bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
+ bepo_afnor fr: French (Bepo, ergonomic, Dvorak way, AFNOR)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
azerty fr: French (AZERTY)
+ afnor fr: French (AFNOR standardized AZERTY)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
@@ -540,6 +551,7 @@
ibm it: Italian (IBM 142)
intl it: Italian (intl., with dead keys)
scn it: Sicilian
+ fur it: Friulian (Italy)
kana jp: Japanese (Kana)
kana86 jp: Japanese (Kana 86)
OADG109A jp: Japanese (OADG 109A)
@@ -562,6 +574,7 @@
ibm lt: Lithuanian (IBM LST 1205-92)
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
+ sgs lt: Samogitian
apostrophe lv: Latvian (apostrophe)
tilde lv: Latvian (tilde)
fkey lv: Latvian (F)
@@ -577,6 +590,8 @@
latinalternatequotes me: Montenegrin (Latin with guillemets)
nodeadkeys mk: Macedonian (no dead keys)
us mt: Maltese (with US layout)
+ alt-us mt: Maltese (US layout with AltGr overrides)
+ alt-gb mt: Maltese (UK layout with AltGr overrides)
nodeadkeys no: Norwegian (no dead keys)
winkeys no: Norwegian (Win keys)
dvorak no: Norwegian (Dvorak)
@@ -741,6 +756,7 @@
dvorak ph: Filipino (Dvorak, Latin)
dvorak-bay ph: Filipino (Dvorak, Baybayin)
gag md: Moldavian (Gagauz)
+ phoneticx id: Indonesian (Arab Melayu, ext. phonetic)
phonetic my: Malay (Jawi, phonetic)
! option
@@ -748,7 +764,7 @@
grp:switch Right Alt (while pressed)
grp:lswitch Left Alt (while pressed)
grp:lwin_switch Left Win (while pressed)
- grp:rwin_switch Left Win (while pressed)
+ grp:rwin_switch Right Win (while pressed)
grp:win_switch Any Win (while pressed)
grp:menu_switch Menu (while pressed), Shift+Menu for Menu
grp:caps_switch Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action
@@ -804,6 +820,7 @@
ctrl:nocaps Caps Lock as Ctrl
ctrl:lctrl_meta Left Ctrl as Meta
ctrl:swapcaps Swap Ctrl and Caps Lock
+ ctrl:swapcaps_hyper Caps Lock as Control, Control as Hyper
ctrl:ac_ctrl At left of 'A'
ctrl:aa_ctrl At bottom left
ctrl:rctrl_ralt Right Ctrl as Right Alt
@@ -816,6 +833,8 @@
grp_led:num Num Lock
grp_led:caps Caps Lock
grp_led:scroll Scroll Lock
+ mod_led Use keyboard LED to indicate modifiers
+ mod_led:compose Compose
keypad Layout of numeric keypad
keypad:legacy Legacy
keypad:oss Unicode additions (arrows and math operators)
@@ -843,6 +862,7 @@
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:escape_shifted_capslock Make unmodified Caps Lock an additional Esc, but Shift + Caps Lock behaves like regular Caps Lock
caps:backspace Make Caps Lock an additional Backspace
caps:super Make Caps Lock an additional Super
caps:hyper Make Caps Lock an additional Hyper
@@ -852,6 +872,7 @@
caps:none Caps Lock is disabled
altwin Alt/Win key behavior
altwin:menu Add the standard behavior to Menu key
+ altwin:menu_win Menu is mapped to Win
altwin:meta_alt Alt and Meta are on Alt
altwin:alt_win Alt is mapped to Win and the usual Alt
altwin:ctrl_win Ctrl is mapped to Win and the usual Ctrl keys
@@ -904,6 +925,15 @@
eurosign:5 Euro on 5
rupeesign:4 Rupee on 4
lv5 Key to choose 5th level
+ lv5:lsgt_switch <Less/Greater> chooses 5th level
+ lv5:ralt_switch Right Alt chooses 5th level
+ lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:rwin_switch_lock Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lsgt_switch <Less/Greater> chooses 5th level
+ lv5:ralt_switch Right Alt chooses 5th level
lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
@@ -930,8 +960,10 @@
japan:nicola_f_bs NICOLA-F style Backspace
japan:hztg_escape Make Zenkaku Hankaku an additional Esc
korean Korean 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
+ korean:ralt_hangul Make right Alt a Hangul key
+ korean:rctrl_hangul Make right Ctrl a Hangul key
+ korean:ralt_hanja Make right Alt a Hanja key
+ korean:rctrl_hanja Make right Ctrl a Hanja key
esperanto Adding Esperanto supersigned letters
esperanto:qwerty To the corresponding key in a QWERTY layout
esperanto:dvorak To the corresponding key in a Dvorak layout
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.13 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.14
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.13 Wed Mar 6 11:05:18 2019
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Sun Feb 23 11:17:03 2020
@@ -63,7 +63,6 @@
geniuskb19e Genius KB-19e NB
geniuskkb2050hs Genius KKB-2050HS
gyration Gyration
- htcdream HTC Dream
kinesis Kinesis
logitech_base Logitech
logitech_g15 Logitech G15 extra keys via G15daemon
@@ -122,6 +121,7 @@
microsoftprose Microsoft Internet Pro (Swedish)
microsoftoffice Microsoft Office Keyboard
microsoftmult Microsoft Wireless Multimedia 1.0A
+ microsoftsurface Microsoft Surface
microsoftelite Microsoft Natural Elite
microsoftccurve2k Microsoft Comfort Curve 2000
oretec Ortek Multimedia/Internet MCK-800
@@ -183,7 +183,6 @@
unitekkb1925 Unitek KB-1925
compalfl90 FL90
creativedw7000 Creative Desktop Wireless 7000
- htcdream Htc Dream phone
teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
@@ -288,7 +287,8 @@
bw Tswana
ph Filipino
md Moldavian
- id Indonesian (Jawi)
+ id Indonesian (Arab Melayu, phonetic)
+ jv Indonesian (Javanese)
my Malay (Jawi, Arabic Keyboard)
! variant
@@ -309,6 +309,7 @@
altgr-intl us: English (intl., with AltGr dead keys)
olpc2 us: English (the divide/multiply keys toggle the layout)
hbs us: Serbo-Croatian (US)
+ norman us: English (Norman)
workman us: English (Workman)
workman-intl us: English (Workman, intl., with dead keys)
ps af: Pashto
@@ -325,6 +326,7 @@
olpc ara: Arabic (OLPC)
mac ara: Arabic (Macintosh)
plisi al: Albanian (Plisi)
+ veqilharxhi al: Albanian (Veqilharxhi)
phonetic am: Armenian (phonetic)
phonetic-alt am: Armenian (alt. phonetic)
eastern am: Armenian (eastern)
@@ -356,7 +358,6 @@
jhelum in: Punjabi (Gurmukhi Jhelum)
kan in: Kannada
kan-kagapa in: Kannada (KaGaPa phonetic)
- kan-kagapa in: Kannada (KaGaPa phonetic)
mal in: Malayalam
mal_lalitha in: Malayalam (Lalitha)
mal_enhanced in: Malayalam (enhanced Inscript, with rupee)
@@ -414,6 +415,13 @@
multi-2gr ca: Canadian Multilingual (2nd part)
ike ca: Inuktitut
eng ca: English (Canada)
+ mon_trad cn: Mongolian (Bichig)
+ mon_trad_todo cn: Mongolian Todo
+ mon_trad_xibe cn: Mongolian Xibe
+ mon_trad_manchu cn: Mongolian Manchu
+ mon_trad_galik cn: Mongolian Galik
+ mon_todo_galik cn: Mongolian Todo Galik
+ mon_manchu_galik cn: Mongolian Manchu Galik
tib cn: Tibetan
tib_asciinum cn: Tibetan (with ASCII numerals)
ug cn: Uyghur
@@ -425,6 +433,7 @@
bksl cz: Czech (with <\|> key)
qwerty cz: Czech (QWERTY)
qwerty_bksl cz: Czech (QWERTY, extended backslash)
+ qwerty-mac cz: Czech (QWERTY, Macintosh)
ucw cz: Czech (UCW, only accented letters)
dvorak-ucw cz: Czech (US, Dvorak, UCW support)
rus cz: Russian (Czech, phonetic)
@@ -449,9 +458,9 @@
ku_alt iq: Kurdish (Iraq, Latin Alt-Q)
ku_ara iq: Kurdish (Iraq, Arabic-Latin)
nodeadkeys fo: Faroese (no dead keys)
+ winkeys fi: Finnish (Winkeys)
classic fi: Finnish (classic)
nodeadkeys fi: Finnish (classic, no dead keys)
- winkeys fi: Finnish (Winkeys)
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
@@ -465,9 +474,11 @@
latin9_sundeadkeys fr: French (legacy, alt., with Sun dead keys)
bepo fr: French (Bepo, ergonomic, Dvorak way)
bepo_latin9 fr: French (Bepo, ergonomic, Dvorak way, Latin-9 only)
+ bepo_afnor fr: French (Bepo, ergonomic, Dvorak way, AFNOR)
dvorak fr: French (Dvorak)
mac fr: French (Macintosh)
azerty fr: French (AZERTY)
+ afnor fr: French (AFNOR standardized AZERTY)
bre fr: French (Breton)
oci fr: Occitan
geo fr: Georgian (France, AZERTY Tskapo)
@@ -540,6 +551,7 @@
ibm it: Italian (IBM 142)
intl it: Italian (intl., with dead keys)
scn it: Sicilian
+ fur it: Friulian (Italy)
kana jp: Japanese (Kana)
kana86 jp: Japanese (Kana 86)
OADG109A jp: Japanese (OADG 109A)
@@ -562,6 +574,7 @@
ibm lt: Lithuanian (IBM LST 1205-92)
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
+ sgs lt: Samogitian
apostrophe lv: Latvian (apostrophe)
tilde lv: Latvian (tilde)
fkey lv: Latvian (F)
@@ -577,6 +590,8 @@
latinalternatequotes me: Montenegrin (Latin with guillemets)
nodeadkeys mk: Macedonian (no dead keys)
us mt: Maltese (with US layout)
+ alt-us mt: Maltese (US layout with AltGr overrides)
+ alt-gb mt: Maltese (UK layout with AltGr overrides)
nodeadkeys no: Norwegian (no dead keys)
winkeys no: Norwegian (Win keys)
dvorak no: Norwegian (Dvorak)
@@ -741,6 +756,7 @@
dvorak ph: Filipino (Dvorak, Latin)
dvorak-bay ph: Filipino (Dvorak, Baybayin)
gag md: Moldavian (Gagauz)
+ phoneticx id: Indonesian (Arab Melayu, ext. phonetic)
phonetic my: Malay (Jawi, phonetic)
! option
@@ -748,7 +764,7 @@
grp:switch Right Alt (while pressed)
grp:lswitch Left Alt (while pressed)
grp:lwin_switch Left Win (while pressed)
- grp:rwin_switch Left Win (while pressed)
+ grp:rwin_switch Right Win (while pressed)
grp:win_switch Any Win (while pressed)
grp:menu_switch Menu (while pressed), Shift+Menu for Menu
grp:caps_switch Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action
@@ -804,6 +820,7 @@
ctrl:nocaps Caps Lock as Ctrl
ctrl:lctrl_meta Left Ctrl as Meta
ctrl:swapcaps Swap Ctrl and Caps Lock
+ ctrl:swapcaps_hyper Caps Lock as Control, Control as Hyper
ctrl:ac_ctrl At left of 'A'
ctrl:aa_ctrl At bottom left
ctrl:rctrl_ralt Right Ctrl as Right Alt
@@ -816,6 +833,8 @@
grp_led:num Num Lock
grp_led:caps Caps Lock
grp_led:scroll Scroll Lock
+ mod_led Use keyboard LED to indicate modifiers
+ mod_led:compose Compose
keypad Layout of numeric keypad
keypad:legacy Legacy
keypad:oss Unicode additions (arrows and math operators)
@@ -843,6 +862,7 @@
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:escape_shifted_capslock Make unmodified Caps Lock an additional Esc, but Shift + Caps Lock behaves like regular Caps Lock
caps:backspace Make Caps Lock an additional Backspace
caps:super Make Caps Lock an additional Super
caps:hyper Make Caps Lock an additional Hyper
@@ -852,6 +872,7 @@
caps:none Caps Lock is disabled
altwin Alt/Win key behavior
altwin:menu Add the standard behavior to Menu key
+ altwin:menu_win Menu is mapped to Win
altwin:meta_alt Alt and Meta are on Alt
altwin:alt_win Alt is mapped to Win and the usual Alt
altwin:ctrl_win Ctrl is mapped to Win and the usual Ctrl keys
@@ -904,6 +925,15 @@
eurosign:5 Euro on 5
rupeesign:4 Rupee on 4
lv5 Key to choose 5th level
+ lv5:lsgt_switch <Less/Greater> chooses 5th level
+ lv5:ralt_switch Right Alt chooses 5th level
+ lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:rwin_switch_lock Right Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lsgt_switch_lock_cancel <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
+ lv5:lsgt_switch <Less/Greater> chooses 5th level
+ lv5:ralt_switch Right Alt chooses 5th level
lv5:lsgt_switch_lock <Less/Greater> chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level; acts as onetime lock when pressed together with another 5th level chooser
@@ -930,8 +960,10 @@
japan:nicola_f_bs NICOLA-F style Backspace
japan:hztg_escape Make Zenkaku Hankaku an additional Esc
korean Korean 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
+ korean:ralt_hangul Make right Alt a Hangul key
+ korean:rctrl_hangul Make right Ctrl a Hangul key
+ korean:ralt_hanja Make right Alt a Hanja key
+ korean:rctrl_hanja Make right Ctrl a Hanja key
esperanto Adding Esperanto supersigned letters
esperanto:qwerty To the corresponding key in a QWERTY layout
esperanto:dvorak To the corresponding key in a Dvorak layout
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.12 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.12 Sun Mar 11 20:17:19 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Sun Feb 23 11:17:03 2020
@@ -1,4 +1,5 @@
-// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.sh FROM rules/*.part
+// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY merge.py FROM rules/*.part
+//
//
// Rules for resolving XKB components for use with XFree86
// Copyright 1996 by Joseph Moss
@@ -19,7 +20,7 @@
! $jollamodels = jollasbj
// Microsoft models (using MS geometry)
-! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
+! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose microsoftsurface
// Nokia devices and keyboards
! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
@@ -85,14 +86,12 @@
! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat
-! $htcdreamlayouts = us it de
! $evdevkbds = ibm_spacesaver
! $dvoraklayouts = br ca de ee es fr gb no pl se us
! model = keycodes
- pc98 = evdev(pc98)
applealu_jis = evdev+macintosh(jisevdev)
$jollamodels = evdev+jolla(jolla)
olpc = evdev+olpc(olpc)
@@ -321,86 +320,85 @@
ws007sh * = pc+sharp_vndr/ws007sh(basic)
ws011sh * = pc+sharp_vndr/ws011sh(basic)
ws020sh * = pc+sharp_vndr/ws020sh(basic)
- htcdream $htcdreamlayouts = %l(htcdream)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
-! model layout[1] = symbols
- * ar = pc+ara%(v[1])
- * ben = pc+in(ben)
- * bs = pc+ba%(v[1])
- * cs = pc+rs%(v[1])
- * cz_qwerty = pc+cz(qwerty)
- * dev = pc+in(deva)
- * dvorak = pc+us(dvorak)
- * dzdwi = pc+bt%(v[1])
- * el = pc+gr%(v[1])
- * en_US = pc+latin%(v[1])
- * guj = pc+in(guj)
- * gur = pc+in(guru)
- * iu = pc+ca(ike)
- * lo = pc+la%(v[1])
- * kan = pc+in(kan)
- * mi = pc+mao%(v[1])
- * ogham = pc+ie(ogam)
- * ori = pc+ie(ori)
- * sapmi = pc+no(smi)
- * sr = pc+srp%(v[1])
- * syr = pc+sy(syc)
- * tel = pc+in(tel)
- * tml = pc+in(tam)
- * yu = pc+srp%(v[1])
- * fr-latin9 = pc+fr(latin9)
- * us_intl = pc+us(alt-intl)
- * ben(basic) = pc+in(ben)
- * ben(probhat) = pc+in(ben_probhat)
- * dev(basic) = pc+in(deva)
- * dvorak($dvoraklayouts) = pc+%v(dvorak)
- * dvorak(basic) = pc+us(dvorak)
- * dvorak(pl_basic) = pc+pl(dvorak)
- * dvorak(pl) = pc+pl(dvorak_quotes)
- * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes)
- * dzdwi(basic) = pc+bt(basic)
- * fi(basic) = pc+fi(classic)
- * ge(azerty_tskapo) = pc+fr(geo)
- * guj(basic) = pc+in(guj)
- * gur(basic) = pc+in(guru)
- * ie(laptop) = pc+ie(basic)
- * ie(CloGaelachLaptop) = pc+ie(CloGaelach)
- * in(urd) = pc+in(urd-phonetic)
- * iu(basic) = pc+ca(ike)
- * lo(basic) = pc+la(basic)
- * kan(basic) = pc+in(kan)
- * mal(basic) = pc+in(mal)
- * mal(mlplusnum) = pc+in(mal)
- * ogham(basic) = pc+ie(ogam)
- * ogham(laptop) = pc+ie(ogam)
- * ogham(is434) = pc+ie(ogam_is434)
- * ogham(is434laptop) = pc+ie(ogam_is434)
- * ori(basic) = pc+in(ori)
- * ro(de) = pc+ro(winkeys)
- * ro(us) = pc+ro(std)
- * ro(academic) = pc+ro(std)
- * ro(std_comma) = pc+ro(std)
- * ro(comma) = pc+ro(basic)
- * ru(os) = pc+ru(os_legacy)
- * pk(urd) = pc+pk(urd-phonetic)
- * sapmi(basic) = pc+no(smi)
- * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys)
- * sapmi(sefi) = pc+fi(smi)
- * sin(phonetic-static) = pc+in(sin_phonetic)
- * syr(basic) = pc+sy(syc)
- * syr(phonetic) = pc+sy(syc_phonetic)
- * tam(INSCRIPT) = pc+in(tam)
- * tam(UNI) = pc+in(tam_unicode)
- * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals)
- * tam(TAB) = pc+in(tam_TAB)
- * tam(TSCII) = pc+in(tam_TSCII)
- * tel(basic) = pc+in(tel)
- * yu(basic) = pc+srp(latin)
- * yu(unicode) = pc+srp(latinunicode)
- * yu(yz) = pc+srp(latinyz)
- * yu(unicodeyz) = pc+srp(latinunicodeyz)
+! model layout[1] = symbols
+ * ar = pc+ara%(v[1])
+ * ben = pc+in(ben)
+ * bs = pc+ba%(v[1])
+ * cs = pc+rs%(v[1])
+ * cz_qwerty = pc+cz(qwerty)
+ * dev = pc+in(deva)
+ * dvorak = pc+us(dvorak)
+ * dzdwi = pc+bt%(v[1])
+ * el = pc+gr%(v[1])
+ * en_US = pc+latin%(v[1])
+ * guj = pc+in(guj)
+ * gur = pc+in(guru)
+ * iu = pc+ca(ike)
+ * lo = pc+la%(v[1])
+ * kan = pc+in(kan)
+ * mi = pc+mao%(v[1])
+ * ogham = pc+ie(ogam)
+ * ori = pc+ie(ori)
+ * sapmi = pc+no(smi)
+ * sr = pc+srp%(v[1])
+ * syr = pc+sy(syc)
+ * tel = pc+in(tel)
+ * tml = pc+in(tam)
+ * yu = pc+srp%(v[1])
+ * fr-latin9 = pc+fr(latin9)
+ * us_intl = pc+us(alt-intl)
+ * ben(basic) = pc+in(ben)
+ * ben(probhat) = pc+in(ben_probhat)
+ * dev(basic) = pc+in(deva)
+ * dvorak($dvoraklayouts) = pc+%v(dvorak)
+ * dvorak(basic) = pc+us(dvorak)
+ * dvorak(pl_basic) = pc+pl(dvorak)
+ * dvorak(pl) = pc+pl(dvorak_quotes)
+ * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes)
+ * dzdwi(basic) = pc+bt(basic)
+ * fi(basic) = pc+fi(classic)
+ * ge(azerty_tskapo) = pc+fr(geo)
+ * guj(basic) = pc+in(guj)
+ * gur(basic) = pc+in(guru)
+ * ie(laptop) = pc+ie(basic)
+ * ie(CloGaelachLaptop) = pc+ie(CloGaelach)
+ * in(urd) = pc+in(urd-phonetic)
+ * iu(basic) = pc+ca(ike)
+ * lo(basic) = pc+la(basic)
+ * kan(basic) = pc+in(kan)
+ * mal(basic) = pc+in(mal)
+ * mal(mlplusnum) = pc+in(mal)
+ * ogham(basic) = pc+ie(ogam)
+ * ogham(laptop) = pc+ie(ogam)
+ * ogham(is434) = pc+ie(ogam_is434)
+ * ogham(is434laptop) = pc+ie(ogam_is434)
+ * ori(basic) = pc+in(ori)
+ * ro(de) = pc+ro(winkeys)
+ * ro(us) = pc+ro(std)
+ * ro(academic) = pc+ro(std)
+ * ro(std_comma) = pc+ro(std)
+ * ro(comma) = pc+ro(basic)
+ * ru(os) = pc+ru(os_legacy)
+ * pk(urd) = pc+pk(urd-phonetic)
+ * sapmi(basic) = pc+no(smi)
+ * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys)
+ * sapmi(sefi) = pc+fi(smi)
+ * sin(phonetic-static) = pc+in(sin_phonetic)
+ * syr(basic) = pc+sy(syc)
+ * syr(phonetic) = pc+sy(syc_phonetic)
+ * tam(INSCRIPT) = pc+in(tam)
+ * tam(UNI) = pc+in(tam_unicode)
+ * tam(NUMERAL-KEYBOARD) = pc+in(tam_keyboard_with_numerals)
+ * tam(TAB) = pc+in(tam_TAB)
+ * tam(TSCII) = pc+in(tam_TSCII)
+ * tel(basic) = pc+in(tel)
+ * yu(basic) = pc+srp(latin)
+ * yu(unicode) = pc+srp(latinunicode)
+ * yu(yz) = pc+srp(latinyz)
+ * 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])
@@ -418,55 +416,55 @@
* * = pc+%l[1]%(v[1])
! model layout[1] variant[1] = symbols
- * ben basic = pc+in(ben)
- * ben probhat = pc+in(ben_probhat)
- * dev basic = pc+in(deva)
- * dvorak $dvoraklayouts = pc+%v(dvorak)
- * dvorak basic = pc+us(dvorak)
- * dvorak pl_basic = pc+pl(dvorak)
- * dvorak pl = pc+pl(dvorak_quotes)
- * dvorak pl_altquotes = pc+pl(dvorak_altquotes)
- * dzdwi basic = pc+bt(basic)
- * fi basic = pc+fi(classic)
- * ge azerty_tskapo = pc+fr(geo)
- * guj basic = pc+in(guj)
- * gur basic = pc+in(guru)
- * ie laptop = pc+ie(basic)
- * ie CloGaelachLaptop = pc+ie(CloGaelach)
- * in urd = pc+in(urd-phonetic)
- * iu basic = pc+ca(ike)
- * lo basic = pc+la(basic)
- * kan basic = pc+in(kan)
- * mal basic = pc+in(mal)
- * mal mlplusnum = pc+in(mal)
- * ogham basic = pc+ie(ogam)
- * ogham laptop = pc+ie(ogam)
- * ogham is434 = pc+ie(ogam_is434)
- * ogham is434laptop = pc+ie(ogam_is434)
- * ori basic = pc+in(ori)
- * ro de = pc+ro(winkeys)
- * ro us = pc+ro(std)
- * ro academic = pc+ro(std)
- * ro std_comma = pc+ro(std)
- * ro comma = pc+ro(basic)
- * ru os = pc+ru(os_legacy)
- * pk urd = pc+pk(urd-phonetic)
- * sapmi basic = pc+no(smi)
- * sapmi nodeadkeys = pc+no(smi_nodeadkeys)
- * sapmi sefi = pc+fi(smi)
- * sin phonetic-static = pc+in(sin_phonetic)
- * syr basic = pc+sy(syc)
- * syr phonetic = pc+sy(syc_phonetic)
- * tam INSCRIPT = pc+in(tam)
- * tam UNI = pc+in(tam_unicode)
- * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals)
- * tam TAB = pc+in(tam_TAB)
- * tam TSCII = pc+in(tam_TSCII)
- * tel basic = pc+in(tel)
- * yu basic = pc+srp(latin)
- * yu unicode = pc+srp(latinunicode)
- * yu yz = pc+srp(latinyz)
- * yu unicodeyz = pc+srp(latinunicodeyz)
+ * ben basic = pc+in(ben)
+ * ben probhat = pc+in(ben_probhat)
+ * dev basic = pc+in(deva)
+ * dvorak $dvoraklayouts = pc+%v(dvorak)
+ * dvorak basic = pc+us(dvorak)
+ * dvorak pl_basic = pc+pl(dvorak)
+ * dvorak pl = pc+pl(dvorak_quotes)
+ * dvorak pl_altquotes = pc+pl(dvorak_altquotes)
+ * dzdwi basic = pc+bt(basic)
+ * fi basic = pc+fi(classic)
+ * ge azerty_tskapo = pc+fr(geo)
+ * guj basic = pc+in(guj)
+ * gur basic = pc+in(guru)
+ * ie laptop = pc+ie(basic)
+ * ie CloGaelachLaptop = pc+ie(CloGaelach)
+ * in urd = pc+in(urd-phonetic)
+ * iu basic = pc+ca(ike)
+ * lo basic = pc+la(basic)
+ * kan basic = pc+in(kan)
+ * mal basic = pc+in(mal)
+ * mal mlplusnum = pc+in(mal)
+ * ogham basic = pc+ie(ogam)
+ * ogham laptop = pc+ie(ogam)
+ * ogham is434 = pc+ie(ogam_is434)
+ * ogham is434laptop = pc+ie(ogam_is434)
+ * ori basic = pc+in(ori)
+ * ro de = pc+ro(winkeys)
+ * ro us = pc+ro(std)
+ * ro academic = pc+ro(std)
+ * ro std_comma = pc+ro(std)
+ * ro comma = pc+ro(basic)
+ * ru os = pc+ru(os_legacy)
+ * pk urd = pc+pk(urd-phonetic)
+ * sapmi basic = pc+no(smi)
+ * sapmi nodeadkeys = pc+no(smi_nodeadkeys)
+ * sapmi sefi = pc+fi(smi)
+ * sin phonetic-static = pc+in(sin_phonetic)
+ * syr basic = pc+sy(syc)
+ * syr phonetic = pc+sy(syc_phonetic)
+ * tam INSCRIPT = pc+in(tam)
+ * tam UNI = pc+in(tam_unicode)
+ * tam NUMERAL-KEYBOARD = pc+in(tam_keyboard_with_numerals)
+ * tam TAB = pc+in(tam_TAB)
+ * tam TSCII = pc+in(tam_TSCII)
+ * tel basic = pc+in(tel)
+ * yu basic = pc+srp(latin)
+ * yu unicode = pc+srp(latinunicode)
+ * yu yz = pc+srp(latinyz)
+ * yu unicodeyz = pc+srp(latinunicodeyz)
! model layout[2] = symbols
* ar = +ara%(v[2]):2
@@ -495,55 +493,55 @@
* yu = +srp%(v[2]):2
* fr-latin9 = +fr(latin9):2
* us_intl = +us(alt-intl):2
- * ben(basic) = +in(ben):2
- * ben(probhat) = +in(ben_probhat):2
- * dev(basic) = +in(deva):2
- * dvorak($dvoraklayouts) = +%v(dvorak):2
- * dvorak(basic) = +us(dvorak):2
- * dvorak(pl_basic) = +pl(dvorak):2
- * dvorak(pl) = +pl(dvorak_quotes):2
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2
- * dzdwi(basic) = +bt(basic):2
- * fi(basic) = +fi(classic):2
- * ge(azerty_tskapo) = +fr(geo):2
- * guj(basic) = +in(guj):2
- * gur(basic) = +in(guru):2
- * ie(laptop) = +ie(basic):2
- * ie(CloGaelachLaptop) = +ie(CloGaelach):2
- * in(urd) = +in(urd-phonetic):2
- * iu(basic) = +ca(ike):2
- * lo(basic) = +la(basic):2
- * kan(basic) = +in(kan):2
- * mal(basic) = +in(mal):2
- * mal(mlplusnum) = +in(mal):2
- * ogham(basic) = +ie(ogam):2
- * ogham(laptop) = +ie(ogam):2
- * ogham(is434) = +ie(ogam_is434):2
- * ogham(is434laptop) = +ie(ogam_is434):2
- * ori(basic) = +in(ori):2
- * ro(de) = +ro(winkeys):2
- * ro(us) = +ro(std):2
- * ro(academic) = +ro(std):2
- * ro(std_comma) = +ro(std):2
- * ro(comma) = +ro(basic):2
- * ru(os) = +ru(os_legacy):2
- * pk(urd) = +pk(urd-phonetic):2
- * sapmi(basic) = +no(smi):2
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2
- * sapmi(sefi) = +fi(smi):2
- * sin(phonetic-static) = +in(sin_phonetic):2
- * syr(basic) = +sy(syc):2
- * syr(phonetic) = +sy(syc_phonetic):2
- * tam(INSCRIPT) = +in(tam):2
- * tam(UNI) = +in(tam_unicode):2
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2
- * tam(TAB) = +in(tam_TAB):2
- * tam(TSCII) = +in(tam_TSCII):2
- * tel(basic) = +in(tel):2
- * yu(basic) = +srp(latin):2
- * yu(unicode) = +srp(latinunicode):2
- * yu(yz) = +srp(latinyz):2
- * yu(unicodeyz) = +srp(latinunicodeyz):2
+ * ben(basic) = +in(ben):2
+ * ben(probhat) = +in(ben_probhat):2
+ * dev(basic) = +in(deva):2
+ * dvorak($dvoraklayouts) = +%v(dvorak):2
+ * dvorak(basic) = +us(dvorak):2
+ * dvorak(pl_basic) = +pl(dvorak):2
+ * dvorak(pl) = +pl(dvorak_quotes):2
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):2
+ * dzdwi(basic) = +bt(basic):2
+ * fi(basic) = +fi(classic):2
+ * ge(azerty_tskapo) = +fr(geo):2
+ * guj(basic) = +in(guj):2
+ * gur(basic) = +in(guru):2
+ * ie(laptop) = +ie(basic):2
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):2
+ * in(urd) = +in(urd-phonetic):2
+ * iu(basic) = +ca(ike):2
+ * lo(basic) = +la(basic):2
+ * kan(basic) = +in(kan):2
+ * mal(basic) = +in(mal):2
+ * mal(mlplusnum) = +in(mal):2
+ * ogham(basic) = +ie(ogam):2
+ * ogham(laptop) = +ie(ogam):2
+ * ogham(is434) = +ie(ogam_is434):2
+ * ogham(is434laptop) = +ie(ogam_is434):2
+ * ori(basic) = +in(ori):2
+ * ro(de) = +ro(winkeys):2
+ * ro(us) = +ro(std):2
+ * ro(academic) = +ro(std):2
+ * ro(std_comma) = +ro(std):2
+ * ro(comma) = +ro(basic):2
+ * ru(os) = +ru(os_legacy):2
+ * pk(urd) = +pk(urd-phonetic):2
+ * sapmi(basic) = +no(smi):2
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):2
+ * sapmi(sefi) = +fi(smi):2
+ * sin(phonetic-static) = +in(sin_phonetic):2
+ * syr(basic) = +sy(syc):2
+ * syr(phonetic) = +sy(syc_phonetic):2
+ * tam(INSCRIPT) = +in(tam):2
+ * tam(UNI) = +in(tam_unicode):2
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):2
+ * tam(TAB) = +in(tam_TAB):2
+ * tam(TSCII) = +in(tam_TSCII):2
+ * tel(basic) = +in(tel):2
+ * yu(basic) = +srp(latin):2
+ * yu(unicode) = +srp(latinunicode):2
+ * yu(yz) = +srp(latinyz):2
+ * yu(unicodeyz) = +srp(latinunicodeyz):2
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2
nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2
$sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2
@@ -576,55 +574,55 @@
* yu = +srp%(v[3]):3
* fr-latin9 = +fr(latin9):3
* us_intl = +us(alt-intl):3
- * ben(basic) = +in(ben):3
- * ben(probhat) = +in(ben_probhat):3
- * dev(basic) = +in(deva):3
- * dvorak($dvoraklayouts) = +%v(dvorak):3
- * dvorak(basic) = +us(dvorak):3
- * dvorak(pl_basic) = +pl(dvorak):3
- * dvorak(pl) = +pl(dvorak_quotes):3
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3
- * dzdwi(basic) = +bt(basic):3
- * fi(basic) = +fi(classic):3
- * ge(azerty_tskapo) = +fr(geo):3
- * guj(basic) = +in(guj):3
- * gur(basic) = +in(guru):3
- * ie(laptop) = +ie(basic):3
- * ie(CloGaelachLaptop) = +ie(CloGaelach):3
- * in(urd) = +in(urd-phonetic):3
- * iu(basic) = +ca(ike):3
- * lo(basic) = +la(basic):3
- * kan(basic) = +in(kan):3
- * mal(basic) = +in(mal):3
- * mal(mlplusnum) = +in(mal):3
- * ogham(basic) = +ie(ogam):3
- * ogham(laptop) = +ie(ogam):3
- * ogham(is434) = +ie(ogam_is434):3
- * ogham(is434laptop) = +ie(ogam_is434):3
- * ori(basic) = +in(ori):3
- * ro(de) = +ro(winkeys):3
- * ro(us) = +ro(std):3
- * ro(academic) = +ro(std):3
- * ro(std_comma) = +ro(std):3
- * ro(comma) = +ro(basic):3
- * ru(os) = +ru(os_legacy):3
- * pk(urd) = +pk(urd-phonetic):3
- * sapmi(basic) = +no(smi):3
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3
- * sapmi(sefi) = +fi(smi):3
- * sin(phonetic-static) = +in(sin_phonetic):3
- * syr(basic) = +sy(syc):3
- * syr(phonetic) = +sy(syc_phonetic):3
- * tam(INSCRIPT) = +in(tam):3
- * tam(UNI) = +in(tam_unicode):3
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3
- * tam(TAB) = +in(tam_TAB):3
- * tam(TSCII) = +in(tam_TSCII):3
- * tel(basic) = +in(tel):3
- * yu(basic) = +srp(latin):3
- * yu(unicode) = +srp(latinunicode):3
- * yu(yz) = +srp(latinyz):3
- * yu(unicodeyz) = +srp(latinunicodeyz):3
+ * ben(basic) = +in(ben):3
+ * ben(probhat) = +in(ben_probhat):3
+ * dev(basic) = +in(deva):3
+ * dvorak($dvoraklayouts) = +%v(dvorak):3
+ * dvorak(basic) = +us(dvorak):3
+ * dvorak(pl_basic) = +pl(dvorak):3
+ * dvorak(pl) = +pl(dvorak_quotes):3
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):3
+ * dzdwi(basic) = +bt(basic):3
+ * fi(basic) = +fi(classic):3
+ * ge(azerty_tskapo) = +fr(geo):3
+ * guj(basic) = +in(guj):3
+ * gur(basic) = +in(guru):3
+ * ie(laptop) = +ie(basic):3
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):3
+ * in(urd) = +in(urd-phonetic):3
+ * iu(basic) = +ca(ike):3
+ * lo(basic) = +la(basic):3
+ * kan(basic) = +in(kan):3
+ * mal(basic) = +in(mal):3
+ * mal(mlplusnum) = +in(mal):3
+ * ogham(basic) = +ie(ogam):3
+ * ogham(laptop) = +ie(ogam):3
+ * ogham(is434) = +ie(ogam_is434):3
+ * ogham(is434laptop) = +ie(ogam_is434):3
+ * ori(basic) = +in(ori):3
+ * ro(de) = +ro(winkeys):3
+ * ro(us) = +ro(std):3
+ * ro(academic) = +ro(std):3
+ * ro(std_comma) = +ro(std):3
+ * ro(comma) = +ro(basic):3
+ * ru(os) = +ru(os_legacy):3
+ * pk(urd) = +pk(urd-phonetic):3
+ * sapmi(basic) = +no(smi):3
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):3
+ * sapmi(sefi) = +fi(smi):3
+ * sin(phonetic-static) = +in(sin_phonetic):3
+ * syr(basic) = +sy(syc):3
+ * syr(phonetic) = +sy(syc_phonetic):3
+ * tam(INSCRIPT) = +in(tam):3
+ * tam(UNI) = +in(tam_unicode):3
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):3
+ * tam(TAB) = +in(tam_TAB):3
+ * tam(TSCII) = +in(tam_TSCII):3
+ * tel(basic) = +in(tel):3
+ * yu(basic) = +srp(latin):3
+ * yu(unicode) = +srp(latinunicode):3
+ * yu(yz) = +srp(latinyz):3
+ * yu(unicodeyz) = +srp(latinunicodeyz):3
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3
nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3
$sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3
@@ -657,55 +655,55 @@
* yu = +srp%(v[4]):4
* fr-latin9 = +fr(latin9):4
* us_intl = +us(alt-intl):4
- * ben(basic) = +in(ben):4
- * ben(probhat) = +in(ben_probhat):4
- * dev(basic) = +in(deva):4
- * dvorak($dvoraklayouts) = +%v(dvorak):4
- * dvorak(basic) = +us(dvorak):4
- * dvorak(pl_basic) = +pl(dvorak):4
- * dvorak(pl) = +pl(dvorak_quotes):4
- * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4
- * dzdwi(basic) = +bt(basic):4
- * fi(basic) = +fi(classic):4
- * ge(azerty_tskapo) = +fr(geo):4
- * guj(basic) = +in(guj):4
- * gur(basic) = +in(guru):4
- * ie(laptop) = +ie(basic):4
- * ie(CloGaelachLaptop) = +ie(CloGaelach):4
- * in(urd) = +in(urd-phonetic):4
- * iu(basic) = +ca(ike):4
- * lo(basic) = +la(basic):4
- * kan(basic) = +in(kan):4
- * mal(basic) = +in(mal):4
- * mal(mlplusnum) = +in(mal):4
- * ogham(basic) = +ie(ogam):4
- * ogham(laptop) = +ie(ogam):4
- * ogham(is434) = +ie(ogam_is434):4
- * ogham(is434laptop) = +ie(ogam_is434):4
- * ori(basic) = +in(ori):4
- * ro(de) = +ro(winkeys):4
- * ro(us) = +ro(std):4
- * ro(academic) = +ro(std):4
- * ro(std_comma) = +ro(std):4
- * ro(comma) = +ro(basic):4
- * ru(os) = +ru(os_legacy):4
- * pk(urd) = +pk(urd-phonetic):4
- * sapmi(basic) = +no(smi):4
- * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4
- * sapmi(sefi) = +fi(smi):4
- * sin(phonetic-static) = +in(sin_phonetic):4
- * syr(basic) = +sy(syc):4
- * syr(phonetic) = +sy(syc_phonetic):4
- * tam(INSCRIPT) = +in(tam):4
- * tam(UNI) = +in(tam_unicode):4
- * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4
- * tam(TAB) = +in(tam_TAB):4
- * tam(TSCII) = +in(tam_TSCII):4
- * tel(basic) = +in(tel):4
- * yu(basic) = +srp(latin):4
- * yu(unicode) = +srp(latinunicode):4
- * yu(yz) = +srp(latinyz):4
- * yu(unicodeyz) = +srp(latinunicodeyz):4
+ * ben(basic) = +in(ben):4
+ * ben(probhat) = +in(ben_probhat):4
+ * dev(basic) = +in(deva):4
+ * dvorak($dvoraklayouts) = +%v(dvorak):4
+ * dvorak(basic) = +us(dvorak):4
+ * dvorak(pl_basic) = +pl(dvorak):4
+ * dvorak(pl) = +pl(dvorak_quotes):4
+ * dvorak(pl_altquotes) = +pl(dvorak_altquotes):4
+ * dzdwi(basic) = +bt(basic):4
+ * fi(basic) = +fi(classic):4
+ * ge(azerty_tskapo) = +fr(geo):4
+ * guj(basic) = +in(guj):4
+ * gur(basic) = +in(guru):4
+ * ie(laptop) = +ie(basic):4
+ * ie(CloGaelachLaptop) = +ie(CloGaelach):4
+ * in(urd) = +in(urd-phonetic):4
+ * iu(basic) = +ca(ike):4
+ * lo(basic) = +la(basic):4
+ * kan(basic) = +in(kan):4
+ * mal(basic) = +in(mal):4
+ * mal(mlplusnum) = +in(mal):4
+ * ogham(basic) = +ie(ogam):4
+ * ogham(laptop) = +ie(ogam):4
+ * ogham(is434) = +ie(ogam_is434):4
+ * ogham(is434laptop) = +ie(ogam_is434):4
+ * ori(basic) = +in(ori):4
+ * ro(de) = +ro(winkeys):4
+ * ro(us) = +ro(std):4
+ * ro(academic) = +ro(std):4
+ * ro(std_comma) = +ro(std):4
+ * ro(comma) = +ro(basic):4
+ * ru(os) = +ru(os_legacy):4
+ * pk(urd) = +pk(urd-phonetic):4
+ * sapmi(basic) = +no(smi):4
+ * sapmi(nodeadkeys) = +no(smi_nodeadkeys):4
+ * sapmi(sefi) = +fi(smi):4
+ * sin(phonetic-static) = +in(sin_phonetic):4
+ * syr(basic) = +sy(syc):4
+ * syr(phonetic) = +sy(syc_phonetic):4
+ * tam(INSCRIPT) = +in(tam):4
+ * tam(UNI) = +in(tam_unicode):4
+ * tam(NUMERAL-KEYBOARD) = +in(tam_keyboard_with_numerals):4
+ * tam(TAB) = +in(tam_TAB):4
+ * tam(TSCII) = +in(tam_TSCII):4
+ * tel(basic) = +in(tel):4
+ * yu(basic) = +srp(latin):4
+ * yu(unicode) = +srp(latinunicode):4
+ * yu(yz) = +srp(latinyz):4
+ * yu(unicodeyz) = +srp(latinunicodeyz):4
nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4
nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4
$sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4
@@ -961,6 +959,7 @@
! option = symbols
grp:shift_toggle = +group(shifts_toggle)
altwin:menu = +altwin(menu)
+ altwin:menu_win = +altwin(menu_win)
altwin:meta_alt = +altwin(meta_alt)
altwin:alt_win = +altwin(alt_win)
altwin:ctrl_win = +altwin(ctrl_win)
@@ -1027,11 +1026,14 @@
lv3:lwin_switch = +level3(lwin_switch)
lv3:rwin_switch = +level3(rwin_switch)
lv3:enter_switch = +level3(enter_switch)
+ lv3:4_switch_isolated = +level3(4_switch_isolated)
+ lv3:9_switch_isolated = +level3(9_switch_isolated)
caps:capslock = +capslock(capslock)
caps:numlock = +capslock(numlock)
caps:shiftlock = +capslock(shiftlock)
caps:swapescape = +capslock(swapescape)
caps:escape = +capslock(escape)
+ caps:escape_shifted_capslock = +capslock(escape_shifted_capslock)
caps:backspace = +capslock(backspace)
caps:super = +capslock(super)
caps:hyper = +capslock(hyper)
@@ -1041,6 +1043,8 @@
ctrl:nocaps = +ctrl(nocaps)
ctrl:lctrl_meta = +ctrl(lctrl_meta)
ctrl:swapcaps = +ctrl(swapcaps)
+ ctrl:swapcaps_hyper = +ctrl(swapcaps_hyper)
+ ctrl:swapcaps_and_switch_layout = +ctrl(swapcaps_and_switch_layout)
ctrl:ac_ctrl = +ctrl(ac_ctrl)
ctrl:aa_ctrl = +ctrl(aa_ctrl)
ctrl:rctrl_ralt = +ctrl(rctrl_ralt)
@@ -1092,8 +1096,10 @@
nbsp:level4nl = +nbsp(level4nl)
japan:nicola_f_bs = +jp(nicola_f_bs)
japan:hztg_escape = +jp(hztg_escape)
- korean:ralt_rctrl = +kr(ralt_hangul)+kr(rctrl_hanja)
- korean:rctrl_ralt = +kr(rctrl_hangul)+kr(ralt_hanja)
+ korean:ralt_hangul = +kr(ralt_hangul)
+ korean:rctrl_hangul = +kr(rctrl_hangul)
+ korean:ralt_hanja = +kr(ralt_hanja)
+ korean:rctrl_hanja = +kr(rctrl_hanja)
kpdl:dot = +kpdl(dot)
kpdl:comma = +kpdl(comma)
kpdl:dotoss = +kpdl(dotoss)
@@ -1125,6 +1131,8 @@
lv3:caps_switch_latch = +level3(caps_switch_latch)
lv3:bksl_switch_latch = +level3(bksl_switch_latch)
lv3:lsgt_switch_latch = +level3(lsgt_switch_latch)
+ lv5:lsgt_switch = +level5(lsgt_switch)
+ lv5:ralt_switch = +level5(ralt_switch)
lv5:lsgt_switch_lock = +level5(lsgt_switch_lock)
lv5:ralt_switch_lock = +level5(ralt_switch_lock)
lv5:lwin_switch_lock = +level5(lwin_switch_lock)
@@ -1140,6 +1148,7 @@
grp_led:num = +lednum(group_lock)
grp_led:caps = +ledcaps(group_lock)
grp_led:scroll = +ledscroll(group_lock)
+ mod_led:compose = +ledcompose(compose)
japan:kana_lock = +japan(kana_lock)
caps:shiftlock = +ledcaps(shift_lock)
grab:break_actions = +xfree86(grab_break)
Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.14 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.15
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.14 Sun Dec 30 09:19:04 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Sun Feb 23 11:17:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/12/30 09:19:04 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2020/02/23 11:17:03 mrg Exp $
.include <bsd.own.mk>
@@ -13,7 +13,7 @@ FILES= af al altwin am apl ara at au az
gb ge gh gn gr group \
hr hu \
id ie il in inet iq ir is it \
- jp \
+ jp jv \
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 my \
