From f080a0a61e3b2edf0c8e3a8c71a885702fee5c71 Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 23 Mar 2023 06:23:13 +0000 Subject: [PATCH] updates for xkeyboard-config 2.38. --- .../mit/xorg/lib/xkeyboard-config/rules/base | 3 ++ .../xorg/lib/xkeyboard-config/rules/base.lst | 8 ++++- .../mit/xorg/lib/xkeyboard-config/rules/evdev | 3 ++ .../xorg/lib/xkeyboard-config/rules/evdev.lst | 8 ++++- .../lib/xkeyboard-config/xkeyboard-config.man | 32 +++++++++++-------- 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/external/mit/xorg/lib/xkeyboard-config/rules/base b/external/mit/xorg/lib/xkeyboard-config/rules/base index 535465beb1e6..0da05e48e960 100644 --- a/external/mit/xorg/lib/xkeyboard-config/rules/base +++ b/external/mit/xorg/lib/xkeyboard-config/rules/base @@ -1027,6 +1027,7 @@ ctrl:menu_rctrl = +ctrl(menu_rctrl) ctrl:ralt_rctrl = +ctrl(ralt_rctrl) ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl) + ctrl:swap_ralt_rctl = +ctrl(swap_ralt_rctl) ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl) ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl) ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin) @@ -1098,6 +1099,8 @@ terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) keypad:pointerkeys = +keypad(pointerkeys) apple:alupckeys = +macintosh_vndr/apple(alupckeys) + apple:jp_pc106 = +macintosh_vndr/apple(jp_pc106) + apple:jp_oadg109a = +macintosh_vndr/apple(jp_oadg109a) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) shift:rshift_both_capslock = +shift(rshift_both_capslock) diff --git a/external/mit/xorg/lib/xkeyboard-config/rules/base.lst b/external/mit/xorg/lib/xkeyboard-config/rules/base.lst index c5fa7a2eb9ec..b9b95d8c0763 100644 --- a/external/mit/xorg/lib/xkeyboard-config/rules/base.lst +++ b/external/mit/xorg/lib/xkeyboard-config/rules/base.lst @@ -300,6 +300,7 @@ colemak us: English (Colemak) colemak_dh us: English (Colemak-DH) colemak_dh_iso us: English (Colemak-DH ISO) + colemak_dh_ortho us: English (Colemak-DH Ortholinear) dvorak us: English (Dvorak) dvorak-intl us: English (Dvorak, intl., with dead keys) dvorak-alt-intl us: English (Dvorak, alt. intl.) @@ -359,6 +360,7 @@ ben_inscript in: Bangla (India, Baishakhi InScript) eeyek in: Manipuri (Eeyek) guj in: Gujarati + guj-kagapa in: Gujarati (KaGaPa, phonetic) guru in: Punjabi (Gurmukhi) jhelum in: Punjabi (Gurmukhi Jhelum) kan in: Kannada @@ -591,7 +593,8 @@ apostrophe lv: Latvian (apostrophe) tilde lv: Latvian (tilde) fkey lv: Latvian (F) - modern lv: Latvian (modern) + modern lv: Latvian (Modern Latin) + modern-cyr lv: Latvian (Modern Cyrillic) ergonomic lv: Latvian (ergonomic, ŪGJRMV) adapted lv: Latvian (adapted) cyrillic me: Montenegrin (Cyrillic) @@ -850,6 +853,7 @@ ctrl:rctrl_ralt Right Ctrl as Right Alt ctrl:menu_rctrl Menu as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt with Left Ctrl + ctrl:swap_ralt_rctl Swap Right Alt with Right Ctrl ctrl:swap_lwin_lctl Swap Left Win with Left Ctrl ctrl:swap_rwin_rctl Swap Right Win with Right Ctrl ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt @@ -936,6 +940,8 @@ numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server apple:alupckeys Apple Aluminium emulates Pause, PrtSc, Scroll Lock + apple:jp_oadg109a Japanese Apple keyboards emulate OADG109A backslash + apple:jp_pc106 Japanese Apple keyboards emulate PC106 backslash shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:apl Enable APL overlay characters diff --git a/external/mit/xorg/lib/xkeyboard-config/rules/evdev b/external/mit/xorg/lib/xkeyboard-config/rules/evdev index 68e4f7d8a082..8ed11f47f22e 100644 --- a/external/mit/xorg/lib/xkeyboard-config/rules/evdev +++ b/external/mit/xorg/lib/xkeyboard-config/rules/evdev @@ -913,6 +913,7 @@ ctrl:menu_rctrl = +ctrl(menu_rctrl) ctrl:ralt_rctrl = +ctrl(ralt_rctrl) ctrl:swap_lalt_lctl = +ctrl(swap_lalt_lctl) + ctrl:swap_ralt_rctl = +ctrl(swap_ralt_rctl) ctrl:swap_lwin_lctl = +ctrl(swap_lwin_lctl) ctrl:swap_rwin_rctl = +ctrl(swap_rwin_rctl) ctrl:swap_lalt_lctl_lwin = +ctrl(swap_lalt_lctl_lwin) @@ -984,6 +985,8 @@ terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) keypad:pointerkeys = +keypad(pointerkeys) apple:alupckeys = +macintosh_vndr/apple(alupckeys) + apple:jp_pc106 = +macintosh_vndr/apple(jp_pc106) + apple:jp_oadg109a = +macintosh_vndr/apple(jp_oadg109a) shift:both_capslock = +shift(both_capslock) shift:lshift_both_capslock = +shift(lshift_both_capslock) shift:rshift_both_capslock = +shift(rshift_both_capslock) diff --git a/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst b/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst index c5fa7a2eb9ec..b9b95d8c0763 100644 --- a/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst +++ b/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst @@ -300,6 +300,7 @@ colemak us: English (Colemak) colemak_dh us: English (Colemak-DH) colemak_dh_iso us: English (Colemak-DH ISO) + colemak_dh_ortho us: English (Colemak-DH Ortholinear) dvorak us: English (Dvorak) dvorak-intl us: English (Dvorak, intl., with dead keys) dvorak-alt-intl us: English (Dvorak, alt. intl.) @@ -359,6 +360,7 @@ ben_inscript in: Bangla (India, Baishakhi InScript) eeyek in: Manipuri (Eeyek) guj in: Gujarati + guj-kagapa in: Gujarati (KaGaPa, phonetic) guru in: Punjabi (Gurmukhi) jhelum in: Punjabi (Gurmukhi Jhelum) kan in: Kannada @@ -591,7 +593,8 @@ apostrophe lv: Latvian (apostrophe) tilde lv: Latvian (tilde) fkey lv: Latvian (F) - modern lv: Latvian (modern) + modern lv: Latvian (Modern Latin) + modern-cyr lv: Latvian (Modern Cyrillic) ergonomic lv: Latvian (ergonomic, ŪGJRMV) adapted lv: Latvian (adapted) cyrillic me: Montenegrin (Cyrillic) @@ -850,6 +853,7 @@ ctrl:rctrl_ralt Right Ctrl as Right Alt ctrl:menu_rctrl Menu as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt with Left Ctrl + ctrl:swap_ralt_rctl Swap Right Alt with Right Ctrl ctrl:swap_lwin_lctl Swap Left Win with Left Ctrl ctrl:swap_rwin_rctl Swap Right Win with Right Ctrl ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt @@ -936,6 +940,8 @@ numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server apple:alupckeys Apple Aluminium emulates Pause, PrtSc, Scroll Lock + apple:jp_oadg109a Japanese Apple keyboards emulate OADG109A backslash + apple:jp_pc106 Japanese Apple keyboards emulate PC106 backslash shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:apl Enable APL overlay characters diff --git a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man index d8819ff709b8..807f61fbfa25 100644 --- a/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man +++ b/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man @@ -1,5 +1,5 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.37" "X Version 11" +.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.38" "X Version 11" .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION @@ -13,7 +13,7 @@ settings in the xorg.conf(5). .SH XKB DATA FILES LOAD PATHS xkeyboard-config provides the XKB data files installed in -@xkb_base@. User-specific data files may be elsewhere but it depends on +/usr/X11R7/share/X11/xkb. User-specific data files may be elsewhere but it depends on the tool whether those files are loaded. For example, the libxkbcommon library will by default load XKB data files from the user's home directory. See the libxkbcommon documentation for details. @@ -22,7 +22,7 @@ See the libxkbcommon documentation for details. The "custom" layout is a layout that is listed as available to tools reading the data files but is not actually provided by xkeyboard-config. -A user may save a layout specification in the @xkb_base@/symbols/custom file +A user may save a layout specification in the /usr/X11R7/share/X11/xkb/symbols/custom file and that layout will be available to most tools interacting with the xkeyboard-config data files. This is primarily aimed at systems running X where additional lookup paths cannot easily be added. @@ -246,6 +246,7 @@ us(alt-intl) English (US, alt. intl.) us(colemak) English (Colemak) us(colemak_dh) English (Colemak-DH) us(colemak_dh_iso) English (Colemak-DH ISO) +us(colemak_dh_ortho) English (Colemak-DH Ortholinear) us(dvorak) English (Dvorak) us(dvorak-intl) English (Dvorak, intl., with dead keys) us(dvorak-alt-intl) English (Dvorak, alt. intl.) @@ -338,6 +339,7 @@ in(ben_gitanjali) Bangla (India, Gitanjali) in(ben_inscript) Bangla (India, Baishakhi InScript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati +in(guj-kagapa) Gujarati (KaGaPa, phonetic) in(guru) Punjabi (Gurmukhi) in(jhelum) Punjabi (Gurmukhi Jhelum) in(kan) Kannada @@ -684,7 +686,8 @@ lv Latvian lv(apostrophe) Latvian (apostrophe) lv(tilde) Latvian (tilde) lv(fkey) Latvian (F) -lv(modern) Latvian (modern) +lv(modern) Latvian (Modern Latin) +lv(modern-cyr) Latvian (Modern Cyrillic) lv(ergonomic) Latvian (ergonomic, ŪGJRMV) lv(adapted) Latvian (adapted) @@ -1135,6 +1138,7 @@ ctrl:aa_ctrl At the bottom left ctrl:rctrl_ralt Right Ctrl as Right Alt ctrl:menu_rctrl Menu as Right Ctrl ctrl:swap_lalt_lctl Swap Left Alt with Left Ctrl +ctrl:swap_ralt_rctl Swap Right Alt with Right Ctrl ctrl:swap_lwin_lctl Swap Left Win with Left Ctrl ctrl:swap_rwin_rctl Swap Right Win with Right Ctrl ctrl:swap_lalt_lctl_lwin Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt @@ -1317,6 +1321,8 @@ numpad:microsoft Num Lock on: digits; Shift for arrows. Num Lock off: arrows (as numpad:shift3 Shift does not cancel Num Lock, chooses 3rd level instead srvrkeys:none Special keys (Ctrl+Alt+) handled in a server apple:alupckeys Apple Aluminium emulates Pause, PrtSc, Scroll Lock +apple:jp_oadg109a Japanese Apple keyboards emulate OADG109A backslash +apple:jp_pc106 Japanese Apple keyboards emulate PC106 backslash shift:breaks_caps Shift cancels Caps Lock misc:typo Enable extra typographic characters misc:apl Enable APL overlay characters @@ -1475,23 +1481,23 @@ terminate:ctrl_alt_bksp Ctrl+Alt+Backspace .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(1)