StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keysyms: Fix failing tests 

- Update keymap to use reference keysym names.
- Fix x11comp test by handling old x11proto.

  We need xkbcomp to be compiled with at least x11proto-dev 2023.2.
  So we replace the unsupported keysyms with supported ones not
  already in the keymap. This is kind of ugly, but it works. If we
  ever want to restore the original keysyms with their supported names,
  the substitute keysyms will be easy to spot.
master
Pierre Le Marre 2023-09-28 07:18:56 +02:00 committed by Wismill
parent 49690d936b
commit 0d4541151f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/data/keymaps/host.xkb
View File

@ -1154,7 +1154,7 @@ xkb_symbols "pc_us_pt_2_us_3_inet(evdev)_group(shift_caps_toggle)_compose(ralt)"
key <AE12> {
type[Group2]= "FOUR_LEVEL",
symbols[Group1]= [ equal, plus ],
symbols[Group2]= [ guillemotleft, guillemotright, dead_cedilla, dead_ogonek ],
symbols[Group2]= [ Hangul_A, Hangul_E, dead_cedilla, dead_ogonek ],
symbols[Group3]= [ equal, plus ]
};
key <BKSP> { [ BackSpace, BackSpace ] };
@ -1334,7 +1334,7 @@ xkb_symbols "pc_us_pt_2_us_3_inet(evdev)_group(shift_caps_toggle)_compose(ralt)"
key <AC11> {
type[Group2]= "FOUR_LEVEL",
symbols[Group1]= [ apostrophe, quotedbl ],
symbols[Group2]= [ masculine, ordfeminine, dead_circumflex, dead_caron ],
symbols[Group2]= [ Hangul_O, ordfeminine, dead_circumflex, dead_caron ],
symbols[Group3]= [ apostrophe, quotedbl ]
};
key <TLDE> {
@ -1355,7 +1355,7 @@ xkb_symbols "pc_us_pt_2_us_3_inet(evdev)_group(shift_caps_toggle)_compose(ralt)"
type[Group2]= "FOUR_LEVEL_SEMIALPHABETIC",
type[Group3]= "ALPHABETIC",
symbols[Group1]= [ z, Z ],
symbols[Group2]= [ z, Z, guillemotleft, less ],
symbols[Group2]= [ z, Z, Hangul_A, less ],
symbols[Group3]= [ z, Z ]
};
key <AB02> {
@ -1363,7 +1363,7 @@ xkb_symbols "pc_us_pt_2_us_3_inet(evdev)_group(shift_caps_toggle)_compose(ralt)"
type[Group2]= "FOUR_LEVEL_SEMIALPHABETIC",
type[Group3]= "ALPHABETIC",
symbols[Group1]= [ x, X ],
symbols[Group2]= [ x, X, guillemotright, greater ],
symbols[Group2]= [ x, X, Hangul_E, greater ],
symbols[Group3]= [ x, X ]
};
key <AB03> {
@ -1403,7 +1403,7 @@ xkb_symbols "pc_us_pt_2_us_3_inet(evdev)_group(shift_caps_toggle)_compose(ralt)"
type[Group2]= "FOUR_LEVEL_SEMIALPHABETIC",
type[Group3]= "ALPHABETIC",
symbols[Group1]= [ m, M ],
symbols[Group2]= [ m, M, mu, masculine ],
symbols[Group2]= [ m, M, mu, Hangul_O ],
symbols[Group3]= [ m, M ]
};
key <AB08> {

12
test/data/keymaps/stringcomp.data
View File

@ -1093,7 +1093,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
symbols[Group1]= [ 2, at ],
symbols[Group2]= [ 2, quotedbl ],
symbols[Group3]= [ 2, at, at, NoSymbol, twosuperior, NoSymbol, NoSymbol, NoSymbol ],
symbols[Group4]= [ 2, section, twosuperior, twosubscript, masculine, NoSymbol, logicalor, NoSymbol ]
symbols[Group4]= [ 2, section, twosuperior, twosubscript, ordmasculine, NoSymbol, logicalor, NoSymbol ]
};
key <AE03> {
type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
@ -1109,7 +1109,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
symbols[Group1]= [ 4, dollar ],
symbols[Group2]= [ 4, semicolon ],
symbols[Group3]= [ 4, dollar, cent, NoSymbol, onequarter, currency, NoSymbol, NoSymbol ],
symbols[Group4]= [ 4, guillemotright, U203A, femalesymbol, NoSymbol, NoSymbol, U22A5, NoSymbol ]
symbols[Group4]= [ 4, guillemetright, U203A, femalesymbol, NoSymbol, NoSymbol, U22A5, NoSymbol ]
};
key <AE05> {
type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
@ -1117,7 +1117,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
symbols[Group1]= [ 5, percent ],
symbols[Group2]= [ 5, percent ],
symbols[Group3]= [ 5, percent, currency, NoSymbol, onehalf, threeeighths, NoSymbol, NoSymbol ],
symbols[Group4]= [ 5, guillemotleft, U2039, malesymbol, periodcentered, NoSymbol, U2221, NoSymbol ]
symbols[Group4]= [ 5, guillemetleft, U2039, malesymbol, periodcentered, NoSymbol, U2221, NoSymbol ]
};
key <AE06> {
type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
@ -1442,7 +1442,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
symbols[Group1]= [ z, Z ],
symbols[Group2]= [ Cyrillic_ya, Cyrillic_YA ],
symbols[Group3]= [ z, Z, guillemotleft, NoSymbol ],
symbols[Group3]= [ z, Z, guillemetleft, NoSymbol ],
symbols[Group4]= [ udiaeresis, Udiaeresis, numbersign, NoSymbol, Escape, Escape, union, NoSymbol ]
};
key <AB02> {
@ -1452,7 +1452,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
symbols[Group1]= [ x, X ],
symbols[Group2]= [ Cyrillic_che, Cyrillic_CHE ],
symbols[Group3]= [ x, X, guillemotright, NoSymbol ],
symbols[Group3]= [ x, X, guillemetright, NoSymbol ],
symbols[Group4]= [ odiaeresis, Odiaeresis, dollar, U03F5, Tab, Tab, intersection, NoSymbol ]
};
key <AB03> {
@ -1502,7 +1502,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
symbols[Group1]= [ m, M ],
symbols[Group2]= [ Cyrillic_softsign, Cyrillic_SOFTSIGN ],
symbols[Group3]= [ m, M, mu, NoSymbol, mu, masculine, NoSymbol, NoSymbol ],
symbols[Group3]= [ m, M, mu, NoSymbol, mu, ordmasculine, NoSymbol, NoSymbol ],
symbols[Group4]= [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ]
};
key <AB08> {