fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-08 14:48:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'xkb-layout-fallback' into 'main'

Browse source 
ply-device-manager: fall back to default XKB keymap when no layout is configured

See merge request plymouth/plymouth!380
This commit is contained in:
n3rdopolis 2026-03-08 13:21:04 +00:00
commit 082c606b43
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libply-splash-core/ply-device-manager.c
View file

@ -832,14 +832,14 @@ parse_vconsole_conf (ply_device_manager_t *manager)
ply_trace ("KEYMAP: %s, XKBLAYOUT: %s, XKBMODEL %s, XKBVARIANT: %s, XKBOPTIONS: %s\n", keymap, xkb_layout, xkb_model, xkb_variant, xkb_options);
if (xkb_layout != NULL && manager->xkb_context != NULL) {
if (manager->xkb_context != NULL) {
struct xkb_rule_names xkb_keymap = {
.layout = xkb_layout,
.model = xkb_model,
.variant = xkb_variant,
.options = xkb_options,
};
manager->xkb_keymap = xkb_keymap_new_from_names (manager->xkb_context, &xkb_keymap, XKB_MAP_COMPILE_NO_FLAGS);
manager->xkb_keymap = xkb_keymap_new_from_names (manager->xkb_context, xkb_layout != NULL ? &xkb_keymap : NULL, XKB_MAP_COMPILE_NO_FLAGS);
if (manager->xkb_keymap == NULL) {
ply_trace ("Failed to set xkb keymap of LAYOUT: %s MODEL: %s VARIANT: %s OPTIONS: %s", xkb_layout, xkb_model, xkb_variant, xkb_options);