mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: error out on keysym translation XKB state failure

Browse source 
If we can't create the XKB keymap used for keysym translation,
gracefully error out instead of crashing. This can happen if the
XKB_DEFAULT_LAYOUT is set to an invalid value, for instance.

Closes: https://github.com/swaywm/sway/issues/7789
This commit is contained in:
Simon Ser 2024-03-05 08:44:04 +01:00 committed by Simon Zeni
parent 5e18ed3cf0
commit fd9ab9ee06
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/config.c
View file

@ -43,13 +43,20 @@ static struct xkb_state *keysym_translation_state_create(
context, context,
&rules, &rules,
XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_COMPILE_NO_FLAGS);
xkb_context_unref(context); xkb_context_unref(context);
if (xkb_keymap == NULL) {
sway_log(SWAY_ERROR, "Failed to compile keysym translation XKB keymap");
return NULL;
}
return xkb_state_new(xkb_keymap); return xkb_state_new(xkb_keymap);
} }
static void keysym_translation_state_destroy( static void keysym_translation_state_destroy(
struct xkb_state *state) { struct xkb_state *state) {
if (state == NULL) {
return;
}
xkb_keymap_unref(xkb_state_get_keymap(state)); xkb_keymap_unref(xkb_state_get_keymap(state));
xkb_state_unref(state); xkb_state_unref(state);
} }
@ -339,6 +346,9 @@ static void config_defaults(struct sway_config *config) {
struct xkb_rule_names rules = {0}; struct xkb_rule_names rules = {0};
config->keysym_translation_state = config->keysym_translation_state =
keysym_translation_state_create(rules); keysym_translation_state_create(rules);
if (config->keysym_translation_state == NULL) {
goto cleanup;
}
return; return;
cleanup: cleanup:
@ -987,6 +997,11 @@ void translate_keysyms(struct input_config *input_config) {
input_config_fill_rule_names(input_config, &rules); input_config_fill_rule_names(input_config, &rules);
config->keysym_translation_state = config->keysym_translation_state =
keysym_translation_state_create(rules); keysym_translation_state_create(rules);
if (config->keysym_translation_state == NULL) {
sway_log(SWAY_ERROR, "Failed to create keysym translation XKB state "
"for device '%s'", input_config->identifier);
return;
}
for (int i = 0; i < config->modes->length; ++i) { for (int i = 0; i < config->modes->length; ++i) {
struct sway_mode *mode = config->modes->items[i]; struct sway_mode *mode = config->modes->items[i];