aboutsummaryrefslogtreecommitdiff
path: root/input.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-03-11 07:42:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-03-11 07:42:03 +0000
commitcfa178ab259528a106a2855bdd2e07c34a822224 (patch)
tree9530261d2a6bbfe3d25f1c3e6c2fb87998544146 /input.c
parentchangelog: kitty: release events for composed keys (diff)
input: kitty: unittest: don't fail if system has no compose tables
Diffstat (limited to 'input.c')
-rw-r--r--input.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/input.c b/input.c
index c0b2323f..cbe8e1c7 100644
--- a/input.c
+++ b/input.c
@@ -2100,11 +2100,15 @@ UNITTEST
seat.kbd.xkb_compose_table = xkb_compose_table_new_from_locale(
seat.kbd.xkb, setlocale(LC_CTYPE, NULL), XKB_COMPOSE_COMPILE_NO_FLAGS);
- xassert(seat.kbd.xkb_compose_table != NULL);
+ if (seat.kbd.xkb_compose_table == NULL)
+ goto no_keymap;
seat.kbd.xkb_compose_state = xkb_compose_state_new(
seat.kbd.xkb_compose_table, XKB_COMPOSE_STATE_NO_FLAGS);
- xassert(seat.kbd.xkb_compose_state != NULL);
+ if (seat.kbd.xkb_compose_state == NULL) {
+ xkb_compose_table_unref(seat.kbd.xkb_compose_table);
+ goto no_keymap;
+ }
seat.kbd.mod_shift = xkb_keymap_mod_get_index(seat.kbd.xkb_keymap, XKB_MOD_NAME_SHIFT);
seat.kbd.mod_alt = xkb_keymap_mod_get_index(seat.kbd.xkb_keymap, XKB_MOD_NAME_ALT) ;