Module Name: src
Committed By: mrg
Date: Tue Apr 27 03:58:55 UTC 2021
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile base
base.lst evdev evdev.lst
Log Message:
updates for xkeyboard-config 2.32.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
cvs rdiff -u -r1.15 -r1.16 \
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.14 -r1.15 \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man
diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9
--- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.8 Sun Nov 1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Tue Apr 27 03:58:55 2021
@@ -1,11 +1,11 @@
.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "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(@appmansuffix@).
+setxkbmap(1).
.SH MODELS
.TS
left,box;
@@ -203,8 +203,6 @@ teck227 Truly Ergonomic 227
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
chromebook Chromebook
-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
@@ -221,6 +219,7 @@ us(euro) English (US, euro on 5)
us(intl) English (US, intl., with dead keys)
us(alt-intl) English (US, alt. intl.)
us(colemak) English (Colemak)
+us(colemak_dh) English (Colemak-DH)
us(dvorak) English (Dvorak)
us(dvorak-intl) English (Dvorak, intl., with dead keys)
us(dvorak-alt-intl) English (Dvorak, alt. intl.)
@@ -273,7 +272,6 @@ am(eastern-alt) Armenian (alt. eastern)
_
at German (Austria)
at(nodeadkeys) German (Austria, no dead keys)
-at(sundeadkeys) German (Austria, Sun dead keys)
at(mac) German (Austria, Macintosh)
_
@@ -294,10 +292,8 @@ _
be Belgian
be(oss) Belgian (alt.)
be(oss_latin9) Belgian (Latin-9 only, alt.)
-be(oss_sundeadkeys) Belgian (Sun dead keys, alt.)
be(iso-alternate) Belgian (ISO, alt.)
be(nodeadkeys) Belgian (no dead keys)
-be(sundeadkeys) Belgian (Sun dead keys)
be(wang) Belgian (Wang 724 AZERTY)
_
@@ -340,7 +336,7 @@ in(hin-kagapa) Hindi (KaGaPa, phonetic)
in(san-kagapa) Sanskrit (KaGaPa, phonetic)
in(mar-kagapa) Marathi (KaGaPa, phonetic)
in(eng) English (India, with rupee)
-in(iipa) Indic (phonetic, IPA)
+in(iipa) Indic IPA
in(marathi) Marathi (enhanced Inscript)
_
@@ -366,11 +362,11 @@ bg(bas_phonetic) Bulgarian (new phonetic
bg(bekl) Bulgarian (enhanced)
_
-dz Kabylian (azerty layout, no dead keys)
-dz(azerty-deadkeys) Kabylian (azerty layout, with dead keys)
-dz(qwerty-gb-deadkeys) Kabylian (qwerty-gb layout, with dead keys)
-dz(qwerty-us-deadkeys) Kabylian (qwerty-us layout, with dead keys)
-dz(ber) Kabylian (Algeria, Tifinagh)
+dz Berber (Algeria, Latin)
+dz(azerty-deadkeys) Kabyle (azerty layout, dead keys)
+dz(qwerty-gb-deadkeys) Kabyle (qwerty-gb layout, dead keys)
+dz(qwerty-us-deadkeys) Kabyle (qwerty-us layout, dead keys)
+dz(ber) Berber (Algeria, Tifinagh)
dz(ar) Arabic (Algeria)
_
@@ -449,7 +445,6 @@ dk(dvorak) Danish (Dvorak)
_
nl Dutch
-nl(sundeadkeys) Dutch (Sun dead keys)
nl(mac) Dutch (Macintosh)
nl(std) Dutch (standard)
@@ -492,14 +487,11 @@ fi(mac) Finnish (Macintosh)
_
fr French
fr(nodeadkeys) French (no dead keys)
-fr(sundeadkeys) French (Sun dead keys)
fr(oss) French (alt.)
fr(oss_latin9) French (alt., Latin-9 only)
fr(oss_nodeadkeys) French (alt., no dead keys)
-fr(oss_sundeadkeys) French (alt., Sun dead keys)
fr(latin9) French (legacy, alt.)
fr(latin9_nodeadkeys) French (legacy, alt., no dead keys)
-fr(latin9_sundeadkeys) French (legacy, alt., Sun dead keys)
fr(bepo) French (BEPO)
fr(bepo_latin9) French (BEPO, Latin-9 only)
fr(bepo_afnor) French (BEPO, AFNOR)
@@ -524,7 +516,7 @@ gh(avn) Avatime
gh(gillbt) English (Ghana, GILLBT)
_
-gn French (Guinea)
+gn N'Ko (azerty)
_
ge Georgian
@@ -545,7 +537,6 @@ de(us) German (US)
de(ro) Romanian (Germany)
de(ro_nodeadkeys) Romanian (Germany, no 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, no dead keys)
@@ -587,8 +578,6 @@ hu(102_qwerty_dot_nodead) Hungarian (QWE
_
is Icelandic
-is(Sundeadkeys) Icelandic (Sun dead keys)
-is(nodeadkeys) Icelandic (no dead keys)
is(mac_legacy) Icelandic (Macintosh, legacy)
is(mac) Icelandic (Macintosh)
is(dvorak) Icelandic (Dvorak)
@@ -641,7 +630,6 @@ _
latam Spanish (Latin American)
latam(nodeadkeys) Spanish (Latin American, no dead keys)
latam(deadtilde) Spanish (Latin American, dead tilde)
-latam(sundeadkeys) Spanish (Latin American, Sun dead keys)
latam(dvorak) Spanish (Latin American, Dvorak)
latam(colemak) Spanish (Latin American, Colemak)
latam(colemak-gaming) Spanish (Latin American, Colemak for gaming)
@@ -654,6 +642,7 @@ lt(ibm) Lithuanian (IBM LST 1205-92)
lt(lekp) Lithuanian (LEKP)
lt(lekpa) Lithuanian (LEKPa)
lt(sgs) Samogitian
+lt(ratise) Lithuanian (Ratise)
_
lv Latvian
@@ -716,19 +705,15 @@ pl(dvp) Polish (programmer Dvorak)
_
pt Portuguese
pt(nodeadkeys) Portuguese (no dead keys)
-pt(sundeadkeys) Portuguese (Sun dead keys)
pt(mac) Portuguese (Macintosh)
pt(mac_nodeadkeys) Portuguese (Macintosh, no 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 (Windows)
_
@@ -784,7 +769,6 @@ es Spanish
es(nodeadkeys) Spanish (no dead keys)
es(winkeys) Spanish (Windows)
es(deadtilde) Spanish (dead tilde)
-es(sundeadkeys) Spanish (Sun dead keys)
es(dvorak) Spanish (Dvorak)
es(ast) Asturian (Spain, with bottom-dot H and L)
es(cat) Catalan (Spain, with middle-dot L)
@@ -807,10 +791,8 @@ _
ch German (Switzerland)
ch(legacy) German (Switzerland, legacy)
ch(de_nodeadkeys) German (Switzerland, no dead keys)
-ch(de_sundeadkeys) German (Switzerland, Sun dead keys)
ch(fr) French (Switzerland)
ch(fr_nodeadkeys) French (Switzerland, no dead keys)
-ch(fr_sundeadkeys) French (Switzerland, Sun dead keys)
ch(fr_mac) French (Switzerland, Macintosh)
ch(de_mac) German (Switzerland, Macintosh)
@@ -841,7 +823,6 @@ _
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)
@@ -874,6 +855,7 @@ gb(dvorakukp) English (UK, Dvorak, with
gb(mac) English (UK, Macintosh)
gb(mac_intl) English (UK, Macintosh, intl.)
gb(colemak) English (UK, Colemak)
+gb(colemak_dh) English (UK, Colemak-DH)
gb(pl) Polish (British keyboard)
_
@@ -1207,7 +1189,7 @@ caps:super Make Caps Lock an additional
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:ctrl_modifier Make Caps Lock an additional Ctrl
caps:none Caps Lock is disabled
.TE
@@ -1327,6 +1309,7 @@ lB l.
Option Description
lv5:lsgt_switch The "< >" key chooses 5th level
lv5:ralt_switch Right Alt chooses 5th level
+lv5:menu_switch Menu chooses 5th level
lv5:lsgt_switch_lock The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
@@ -1442,23 +1425,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspa
.SH FILES
-@xkb_base@/compat
+/usr/X11R7/share/X11/xkb/compat
-@xkb_base@/compiled
+/usr/X11R7/share/X11/xkb/compiled
-@xkb_base@/geometry
+/usr/X11R7/share/X11/xkb/geometry
-@xkb_base@/keycodes
+/usr/X11R7/share/X11/xkb/keycodes
-@xkb_base@/keymap
+/usr/X11R7/share/X11/xkb/keymap
-@xkb_base@/rules
+/usr/X11R7/share/X11/xkb/rules
-@xkb_base@/semantics
+/usr/X11R7/share/X11/xkb/semantics
-@xkb_base@/symbols
+/usr/X11R7/share/X11/xkb/symbols
-@xkb_base@/types
+/usr/X11R7/share/X11/xkb/types
.SH SEE ALSO
-setxkbmap(@appmansuffix@)
+setxkbmap(1)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.4 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.5
--- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.4 Fri Jun 1 01:21:02 2018
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Tue Apr 27 03:58:55 2021
@@ -1,8 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2018/06/01 01:21:02 christos Exp $
+# $NetBSD: Makefile,v 1.5 2021/04/27 03:58:55 mrg Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
# and copy the resulting files back here.
+#
+# % env PKG_CONFIG_PATH=/usr/X11R7/lib/pkgconfig ./configure --prefix=/usr/X11R7
+# % cd man
+# % gmake xkeyboard-config.7
+# % cd ../rules
+# % ln -s /usr/pkg/bin/python3.8 ./python3
+# % env PATH=${PATH}:. PYTHON=python3.8 gmake base base.lst evdev evdev.lst
.include <bsd.own.mk>
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.15 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.16
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.15 Sun Nov 1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Tue Apr 27 03:58:55 2021
@@ -7,11 +7,11 @@
// 2002 Modifier: Ivan Pascal The XFree86 Project
//
-// 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 olck \
-// ori pk ru scc sy syr tel th tj tam ua uz
+// If you want non-latin layouts to implicitly include the en_US layout,
+// then uncomment the following lines:
+//! $nonlatin = af am ara bd bg bt by eg et ge gn gr id il in ir \
+// jp jv kg kh kr kz la lk ma me mk mm mn mv my \
+// pk rs ru sy th tj tz ua uz
// PC models
! $pcmodels = pc86 pc101 pc102 pc104 pc104alt pc105
@@ -38,29 +38,31 @@
! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
+// The countries that predominantly have AZERTY or QWERTZ layouts:
! $azerty = be fr
-! $qwertz = al cz de hr hu ro si sk
+! $qwertz = al ch cz de hr hu ro si sk
-// all layouts with 3rd and 4th groups
-! $threelevellayouts = al az \
- be br bt \
- ca ch cs cz \
- de dk \
- ee es \
+// All layouts with 3rd and 4th levels:
+! $threelevellayouts = af al az \
+ bd be bg br bt \
+ ca ch cm cn cz \
+ de dk dz \
+ ee es eu \
fi fo fr \
- gb gr \
- hu \
- ie ir is it \
+ gb ge gh gr \
+ hr hu \
+ ie il in ir is it \
+ kh kz \
latam \
- lk lt \
- mn mt \
- nl no \
- pl pt \
- ro \
- se sk \
- tr \
- us \
+ lk lt lv \
+ ml mm mn mt \
+ ng nl no \
+ ph pk pl pt \
+ ro rs \
+ se si sk sn sy \
+ tg tm tr tw \
+ ua us \
vn \
za
@@ -1297,6 +1299,7 @@
lv3:lsgt_switch_latch = +level3(lsgt_switch_latch)
lv5:lsgt_switch = +level5(lsgt_switch)
lv5:ralt_switch = +level5(ralt_switch)
+ lv5:menu_switch = +level5(menu_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)
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.15 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.16
--- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.15 Sun Nov 1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Tue Apr 27 03:58:55 2021
@@ -189,8 +189,6 @@
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
chromebook Chromebook
- 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)
@@ -208,7 +206,7 @@
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
- dz Kabylian (azerty layout, no dead keys)
+ dz Berber (Algeria, Latin)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -227,7 +225,7 @@
fi Finnish
fr French
gh English (Ghana)
- gn French (Guinea)
+ gn N'Ko (azerty)
ge Georgian
de German
gr Greek
@@ -300,6 +298,7 @@
intl us: English (US, intl., with dead keys)
alt-intl us: English (US, alt. intl.)
colemak us: English (Colemak)
+ colemak_dh us: English (Colemak-DH)
dvorak us: English (Dvorak)
dvorak-intl us: English (Dvorak, intl., with dead keys)
dvorak-alt-intl us: English (Dvorak, alt. intl.)
@@ -337,7 +336,6 @@
western am: Armenian (western)
eastern-alt am: Armenian (alt. eastern)
nodeadkeys at: German (Austria, no dead keys)
- sundeadkeys at: German (Austria, Sun dead keys)
mac at: German (Austria, Macintosh)
cyrillic az: Azerbaijani (Cyrillic)
legacy by: Belarusian (legacy)
@@ -346,10 +344,8 @@
intl by: Belarusian (intl.)
oss be: Belgian (alt.)
oss_latin9 be: Belgian (Latin-9 only, alt.)
- oss_sundeadkeys be: Belgian (Sun dead keys, alt.)
iso-alternate be: Belgian (ISO, alt.)
nodeadkeys be: Belgian (no dead keys)
- sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang 724 AZERTY)
probhat bd: Bangla (Probhat)
ben in: Bangla (India)
@@ -386,7 +382,7 @@
san-kagapa in: Sanskrit (KaGaPa, phonetic)
mar-kagapa in: Marathi (KaGaPa, phonetic)
eng in: English (India, with rupee)
- iipa in: Indic (phonetic, IPA)
+ iipa in: Indic IPA
marathi in: Marathi (enhanced Inscript)
alternatequotes ba: Bosnian (with guillemets)
unicode ba: Bosnian (with Bosnian digraphs)
@@ -401,10 +397,10 @@
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
bekl bg: Bulgarian (enhanced)
- azerty-deadkeys dz: Kabylian (azerty layout, with dead keys)
- qwerty-gb-deadkeys dz: Kabylian (qwerty-gb layout, with dead keys)
- qwerty-us-deadkeys dz: Kabylian (qwerty-us layout, with dead keys)
- ber dz: Kabylian (Algeria, Tifinagh)
+ azerty-deadkeys dz: Kabyle (azerty layout, dead keys)
+ qwerty-gb-deadkeys dz: Kabyle (qwerty-gb layout, dead keys)
+ qwerty-us-deadkeys dz: Kabyle (qwerty-us layout, dead keys)
+ ber dz: Berber (Algeria, Tifinagh)
ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
@@ -453,7 +449,6 @@
mac dk: Danish (Macintosh)
mac_nodeadkeys dk: Danish (Macintosh, no dead keys)
dvorak dk: Danish (Dvorak)
- sundeadkeys nl: Dutch (Sun dead keys)
mac nl: Dutch (Macintosh)
std nl: Dutch (standard)
nodeadkeys ee: Estonian (no dead keys)
@@ -475,14 +470,11 @@
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
- sundeadkeys fr: French (Sun dead keys)
oss fr: French (alt.)
oss_latin9 fr: French (alt., Latin-9 only)
oss_nodeadkeys fr: French (alt., no dead keys)
- oss_sundeadkeys fr: French (alt., Sun dead keys)
latin9 fr: French (legacy, alt.)
latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
- latin9_sundeadkeys fr: French (legacy, alt., Sun dead keys)
bepo fr: French (BEPO)
bepo_latin9 fr: French (BEPO, Latin-9 only)
bepo_afnor fr: French (BEPO, AFNOR)
@@ -516,7 +508,6 @@
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, no dead keys)
dvorak de: German (Dvorak)
- sundeadkeys de: German (Sun dead keys)
neo de: German (Neo 2)
mac de: German (Macintosh)
mac_nodeadkeys de: German (Macintosh, no dead keys)
@@ -549,8 +540,6 @@
102_qwerty_comma_nodead hu: Hungarian (QWERTY, 102-key, comma, no dead keys)
102_qwerty_dot_dead hu: Hungarian (QWERTY, 102-key, dot, dead keys)
102_qwerty_dot_nodead hu: Hungarian (QWERTY, 102-key, dot, no dead keys)
- Sundeadkeys is: Icelandic (Sun dead keys)
- nodeadkeys is: Icelandic (no dead keys)
mac_legacy is: Icelandic (Macintosh, legacy)
mac is: Icelandic (Macintosh)
dvorak is: Icelandic (Dvorak)
@@ -579,7 +568,6 @@
stea la: Lao (STEA)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
- sundeadkeys latam: Spanish (Latin American, Sun dead keys)
dvorak latam: Spanish (Latin American, Dvorak)
colemak latam: Spanish (Latin American, Colemak)
colemak-gaming latam: Spanish (Latin American, Colemak for gaming)
@@ -589,6 +577,7 @@
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
sgs lt: Samogitian
+ ratise lt: Lithuanian (Ratise)
apostrophe lv: Latvian (apostrophe)
tilde lv: Latvian (tilde)
fkey lv: Latvian (F)
@@ -624,16 +613,12 @@
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (no dead keys)
- sundeadkeys pt: Portuguese (Sun dead keys)
mac pt: Portuguese (Macintosh)
mac_nodeadkeys pt: Portuguese (Macintosh, no dead keys)
- mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
- cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
- std_cedilla ro: Romanian (standard cedilla)
winkeys ro: Romanian (Windows)
phonetic ru: Russian (phonetic)
phonetic_winkeys ru: Russian (phonetic, Windows)
@@ -674,7 +659,6 @@
nodeadkeys es: Spanish (no dead keys)
winkeys es: Spanish (Windows)
deadtilde es: Spanish (dead tilde)
- sundeadkeys es: Spanish (Sun dead keys)
dvorak es: Spanish (Dvorak)
ast es: Asturian (Spain, with bottom-dot H and L)
cat es: Catalan (Spain, with middle-dot L)
@@ -691,10 +675,8 @@
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
- de_sundeadkeys ch: German (Switzerland, Sun dead keys)
fr ch: French (Switzerland)
fr_nodeadkeys ch: French (Switzerland, no dead keys)
- fr_sundeadkeys ch: French (Switzerland, Sun dead keys)
fr_mac ch: French (Switzerland, Macintosh)
de_mac ch: German (Switzerland, Macintosh)
syc sy: Syriac
@@ -710,7 +692,6 @@
pat th: Thai (Pattachote)
f tr: Turkish (F)
alt tr: Turkish (Alt-Q)
- sundeadkeys tr: Turkish (Sun dead keys)
ku tr: Kurdish (Turkey, Latin Q)
ku_f tr: Kurdish (Turkey, F)
ku_alt tr: Kurdish (Turkey, Latin Alt-Q)
@@ -734,6 +715,7 @@
mac gb: English (UK, Macintosh)
mac_intl gb: English (UK, Macintosh, intl.)
colemak gb: English (UK, Colemak)
+ colemak_dh gb: English (UK, Colemak-DH)
pl gb: Polish (British keyboard)
latin uz: Uzbek (Latin)
us vn: Vietnamese (US)
@@ -884,7 +866,7 @@
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:ctrl_modifier Make Caps Lock an additional Ctrl
caps:none Caps Lock is disabled
altwin Alt and Win behavior
altwin:menu Add the standard behavior to Menu key
@@ -944,6 +926,7 @@
lv5 Key to choose 5th level
lv5:lsgt_switch The "< >" key chooses 5th level
lv5:ralt_switch Right Alt chooses 5th level
+ lv5:menu_switch Menu chooses 5th level
lv5:lsgt_switch_lock The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
@@ -951,6 +934,7 @@
lv5:lsgt_switch_lock_cancel The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lsgt_switch The "< >" key chooses 5th level
lv5:ralt_switch Right Alt chooses 5th level
+ lv5:menu_switch Menu chooses 5th level
lv5:lsgt_switch_lock The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.15 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.16
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst:1.15 Sun Nov 1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Tue Apr 27 03:58:55 2021
@@ -189,8 +189,6 @@
teck229 Truly Ergonomic 229
apex300 SteelSeries Apex 300 (Apex RAW)
chromebook Chromebook
- 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)
@@ -208,7 +206,7 @@
ba Bosnian
br Portuguese (Brazil)
bg Bulgarian
- dz Kabylian (azerty layout, no dead keys)
+ dz Berber (Algeria, Latin)
ma Arabic (Morocco)
cm English (Cameroon)
mm Burmese
@@ -227,7 +225,7 @@
fi Finnish
fr French
gh English (Ghana)
- gn French (Guinea)
+ gn N'Ko (azerty)
ge Georgian
de German
gr Greek
@@ -300,6 +298,7 @@
intl us: English (US, intl., with dead keys)
alt-intl us: English (US, alt. intl.)
colemak us: English (Colemak)
+ colemak_dh us: English (Colemak-DH)
dvorak us: English (Dvorak)
dvorak-intl us: English (Dvorak, intl., with dead keys)
dvorak-alt-intl us: English (Dvorak, alt. intl.)
@@ -337,7 +336,6 @@
western am: Armenian (western)
eastern-alt am: Armenian (alt. eastern)
nodeadkeys at: German (Austria, no dead keys)
- sundeadkeys at: German (Austria, Sun dead keys)
mac at: German (Austria, Macintosh)
cyrillic az: Azerbaijani (Cyrillic)
legacy by: Belarusian (legacy)
@@ -346,10 +344,8 @@
intl by: Belarusian (intl.)
oss be: Belgian (alt.)
oss_latin9 be: Belgian (Latin-9 only, alt.)
- oss_sundeadkeys be: Belgian (Sun dead keys, alt.)
iso-alternate be: Belgian (ISO, alt.)
nodeadkeys be: Belgian (no dead keys)
- sundeadkeys be: Belgian (Sun dead keys)
wang be: Belgian (Wang 724 AZERTY)
probhat bd: Bangla (Probhat)
ben in: Bangla (India)
@@ -386,7 +382,7 @@
san-kagapa in: Sanskrit (KaGaPa, phonetic)
mar-kagapa in: Marathi (KaGaPa, phonetic)
eng in: English (India, with rupee)
- iipa in: Indic (phonetic, IPA)
+ iipa in: Indic IPA
marathi in: Marathi (enhanced Inscript)
alternatequotes ba: Bosnian (with guillemets)
unicode ba: Bosnian (with Bosnian digraphs)
@@ -401,10 +397,10 @@
phonetic bg: Bulgarian (traditional phonetic)
bas_phonetic bg: Bulgarian (new phonetic)
bekl bg: Bulgarian (enhanced)
- azerty-deadkeys dz: Kabylian (azerty layout, with dead keys)
- qwerty-gb-deadkeys dz: Kabylian (qwerty-gb layout, with dead keys)
- qwerty-us-deadkeys dz: Kabylian (qwerty-us layout, with dead keys)
- ber dz: Kabylian (Algeria, Tifinagh)
+ azerty-deadkeys dz: Kabyle (azerty layout, dead keys)
+ qwerty-gb-deadkeys dz: Kabyle (qwerty-gb layout, dead keys)
+ qwerty-us-deadkeys dz: Kabyle (qwerty-us layout, dead keys)
+ ber dz: Berber (Algeria, Tifinagh)
ar dz: Arabic (Algeria)
french ma: French (Morocco)
tifinagh ma: Berber (Morocco, Tifinagh)
@@ -453,7 +449,6 @@
mac dk: Danish (Macintosh)
mac_nodeadkeys dk: Danish (Macintosh, no dead keys)
dvorak dk: Danish (Dvorak)
- sundeadkeys nl: Dutch (Sun dead keys)
mac nl: Dutch (Macintosh)
std nl: Dutch (standard)
nodeadkeys ee: Estonian (no dead keys)
@@ -475,14 +470,11 @@
smi fi: Northern Saami (Finland)
mac fi: Finnish (Macintosh)
nodeadkeys fr: French (no dead keys)
- sundeadkeys fr: French (Sun dead keys)
oss fr: French (alt.)
oss_latin9 fr: French (alt., Latin-9 only)
oss_nodeadkeys fr: French (alt., no dead keys)
- oss_sundeadkeys fr: French (alt., Sun dead keys)
latin9 fr: French (legacy, alt.)
latin9_nodeadkeys fr: French (legacy, alt., no dead keys)
- latin9_sundeadkeys fr: French (legacy, alt., Sun dead keys)
bepo fr: French (BEPO)
bepo_latin9 fr: French (BEPO, Latin-9 only)
bepo_afnor fr: French (BEPO, AFNOR)
@@ -516,7 +508,6 @@
ro de: Romanian (Germany)
ro_nodeadkeys de: Romanian (Germany, no dead keys)
dvorak de: German (Dvorak)
- sundeadkeys de: German (Sun dead keys)
neo de: German (Neo 2)
mac de: German (Macintosh)
mac_nodeadkeys de: German (Macintosh, no dead keys)
@@ -549,8 +540,6 @@
102_qwerty_comma_nodead hu: Hungarian (QWERTY, 102-key, comma, no dead keys)
102_qwerty_dot_dead hu: Hungarian (QWERTY, 102-key, dot, dead keys)
102_qwerty_dot_nodead hu: Hungarian (QWERTY, 102-key, dot, no dead keys)
- Sundeadkeys is: Icelandic (Sun dead keys)
- nodeadkeys is: Icelandic (no dead keys)
mac_legacy is: Icelandic (Macintosh, legacy)
mac is: Icelandic (Macintosh)
dvorak is: Icelandic (Dvorak)
@@ -579,7 +568,6 @@
stea la: Lao (STEA)
nodeadkeys latam: Spanish (Latin American, no dead keys)
deadtilde latam: Spanish (Latin American, dead tilde)
- sundeadkeys latam: Spanish (Latin American, Sun dead keys)
dvorak latam: Spanish (Latin American, Dvorak)
colemak latam: Spanish (Latin American, Colemak)
colemak-gaming latam: Spanish (Latin American, Colemak for gaming)
@@ -589,6 +577,7 @@
lekp lt: Lithuanian (LEKP)
lekpa lt: Lithuanian (LEKPa)
sgs lt: Samogitian
+ ratise lt: Lithuanian (Ratise)
apostrophe lv: Latvian (apostrophe)
tilde lv: Latvian (tilde)
fkey lv: Latvian (F)
@@ -624,16 +613,12 @@
ru_phonetic_dvorak pl: Russian (Poland, phonetic Dvorak)
dvp pl: Polish (programmer Dvorak)
nodeadkeys pt: Portuguese (no dead keys)
- sundeadkeys pt: Portuguese (Sun dead keys)
mac pt: Portuguese (Macintosh)
mac_nodeadkeys pt: Portuguese (Macintosh, no dead keys)
- mac_sundeadkeys pt: Portuguese (Macintosh, Sun dead keys)
nativo pt: Portuguese (Nativo)
nativo-us pt: Portuguese (Nativo for US keyboards)
nativo-epo pt: Esperanto (Portugal, Nativo)
- cedilla ro: Romanian (cedilla)
std ro: Romanian (standard)
- std_cedilla ro: Romanian (standard cedilla)
winkeys ro: Romanian (Windows)
phonetic ru: Russian (phonetic)
phonetic_winkeys ru: Russian (phonetic, Windows)
@@ -674,7 +659,6 @@
nodeadkeys es: Spanish (no dead keys)
winkeys es: Spanish (Windows)
deadtilde es: Spanish (dead tilde)
- sundeadkeys es: Spanish (Sun dead keys)
dvorak es: Spanish (Dvorak)
ast es: Asturian (Spain, with bottom-dot H and L)
cat es: Catalan (Spain, with middle-dot L)
@@ -691,10 +675,8 @@
swl se: Swedish Sign Language
legacy ch: German (Switzerland, legacy)
de_nodeadkeys ch: German (Switzerland, no dead keys)
- de_sundeadkeys ch: German (Switzerland, Sun dead keys)
fr ch: French (Switzerland)
fr_nodeadkeys ch: French (Switzerland, no dead keys)
- fr_sundeadkeys ch: French (Switzerland, Sun dead keys)
fr_mac ch: French (Switzerland, Macintosh)
de_mac ch: German (Switzerland, Macintosh)
syc sy: Syriac
@@ -710,7 +692,6 @@
pat th: Thai (Pattachote)
f tr: Turkish (F)
alt tr: Turkish (Alt-Q)
- sundeadkeys tr: Turkish (Sun dead keys)
ku tr: Kurdish (Turkey, Latin Q)
ku_f tr: Kurdish (Turkey, F)
ku_alt tr: Kurdish (Turkey, Latin Alt-Q)
@@ -734,6 +715,7 @@
mac gb: English (UK, Macintosh)
mac_intl gb: English (UK, Macintosh, intl.)
colemak gb: English (UK, Colemak)
+ colemak_dh gb: English (UK, Colemak-DH)
pl gb: Polish (British keyboard)
latin uz: Uzbek (Latin)
us vn: Vietnamese (US)
@@ -884,7 +866,7 @@
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:ctrl_modifier Make Caps Lock an additional Ctrl
caps:none Caps Lock is disabled
altwin Alt and Win behavior
altwin:menu Add the standard behavior to Menu key
@@ -944,6 +926,7 @@
lv5 Key to choose 5th level
lv5:lsgt_switch The "< >" key chooses 5th level
lv5:ralt_switch Right Alt chooses 5th level
+ lv5:menu_switch Menu chooses 5th level
lv5:lsgt_switch_lock The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
@@ -951,6 +934,7 @@
lv5:lsgt_switch_lock_cancel The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lsgt_switch The "< >" key chooses 5th level
lv5:ralt_switch Right Alt chooses 5th level
+ lv5:menu_switch Menu chooses 5th level
lv5:lsgt_switch_lock The "< >" key chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:ralt_switch_lock Right Alt chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
lv5:lwin_switch_lock Left Win chooses 5th level and acts as a one-time lock if pressed with another 5th level chooser
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/evdev
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.14 src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.15
--- src/external/mit/xorg/lib/xkeyboard-config/rules/evdev:1.14 Sun Nov 1 12:07:09 2020
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Tue Apr 27 03:58:55 2021
@@ -7,11 +7,11 @@
// 2002 Modifier: Ivan Pascal The XFree86 Project
//
-// 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 olck \
-// ori pk ru scc sy syr tel th tj tam ua uz
+// If you want non-latin layouts to implicitly include the en_US layout,
+// then uncomment the following lines:
+//! $nonlatin = af am ara bd bg bt by eg et ge gn gr id il in ir \
+// jp jv kg kh kr kz la lk ma me mk mm mn mv my \
+// pk rs ru sy th tj tz ua uz
// PC models
! $pcmodels = pc86 pc101 pc102 pc104 pc104alt pc105
@@ -38,29 +38,31 @@
! $macvendorlayouts = ch de dk fi fr gb is it latam nl no pt se us
+// The countries that predominantly have AZERTY or QWERTZ layouts:
! $azerty = be fr
-! $qwertz = al cz de hr hu ro si sk
+! $qwertz = al ch cz de hr hu ro si sk
-// all layouts with 3rd and 4th groups
-! $threelevellayouts = al az \
- be br bt \
- ca ch cs cz \
- de dk \
- ee es \
+// All layouts with 3rd and 4th levels:
+! $threelevellayouts = af al az \
+ bd be bg br bt \
+ ca ch cm cn cz \
+ de dk dz \
+ ee es eu \
fi fo fr \
- gb gr \
- hu \
- ie ir is it \
+ gb ge gh gr \
+ hr hu \
+ ie il in ir is it \
+ kh kz \
latam \
- lk lt \
- mn mt \
- nl no \
- pl pt \
- ro \
- se sk \
- tr \
- us \
+ lk lt lv \
+ ml mm mn mt \
+ ng nl no \
+ ph pk pl pt \
+ ro rs \
+ se si sk sn sy \
+ tg tm tr tw \
+ ua us \
vn \
za
@@ -1184,6 +1186,7 @@
lv3:lsgt_switch_latch = +level3(lsgt_switch_latch)
lv5:lsgt_switch = +level5(lsgt_switch)
lv5:ralt_switch = +level5(ralt_switch)
+ lv5:menu_switch = +level5(menu_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)
