shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-21 18:03:41 +03:00
Code

kbd-model-map: add mapping 'es-dvorak'

Browse Source 
And update test-keymap-util accordingly.

While at it, make sure to use tabs everywhere.

(cherry picked from commit 0495728429096a405b1d2cf1fa283a90c30ebaa9)
(cherry picked from commit 644a8ca3e026d22e71cb1f37034e6713bb8ee982)
(cherry picked from commit b47bc5bd13e79dde173740d894c6d06d596c1003)
This commit is contained in:
Franck Bui 2021-05-19 10:18:21 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 8fa9e11e55
commit c44e740133
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/locale/kbd-model-map
View File

@ -1,4 +1,4 @@
# Generated from system-config-keyboard's model list # Originally generated from system-config-keyboard's model list.
# consolelayout xlayout xmodel xvariant xoptions # consolelayout xlayout xmodel xvariant xoptions
sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
nl nl pc105 - terminate:ctrl_alt_bksp nl nl pc105 - terminate:ctrl_alt_bksp
@ -63,6 +63,7 @@ by by,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
il il pc105 - terminate:ctrl_alt_bksp il il pc105 - terminate:ctrl_alt_bksp
kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll kazakh kz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
lt.baltic lt pc105 - terminate:ctrl_alt_bksp lt.baltic lt pc105 - terminate:ctrl_alt_bksp
lt.l4 lt pc105 - terminate:ctrl_alt_bksp lt.l4 lt pc105 - terminate:ctrl_alt_bksp
lt lt pc105 - terminate:ctrl_alt_bksp lt lt pc105 - terminate:ctrl_alt_bksp
khmer kh,us pc105 - terminate:ctrl_alt_bksp khmer kh,us pc105 - terminate:ctrl_alt_bksp
es-dvorak es microsoftpro dvorak terminate:ctrl_alt_bksp

4
src/locale/test-keymap-util.c
View File

@ -93,9 +93,9 @@ static void test_vconsole_convert_to_x11(void) {
log_info("/* test with known variant, new mapping (es:dvorak) */"); log_info("/* test with known variant, new mapping (es:dvorak) */");
assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0); assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0);
assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME assert_se(vconsole_convert_to_x11(&c) == 1);
assert_se(streq(c.x11_layout, "es")); assert_se(streq(c.x11_layout, "es"));
assert_se(c.x11_variant == NULL); // FIXME: "dvorak" assert_se(streq(c.x11_variant, "dvorak"));
log_info("/* test with old mapping (fr:latin9) */"); log_info("/* test with old mapping (fr:latin9) */");
assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0); assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0);