From f35575f71dfab5be9a935bc5e21ca5ee5dc4c2c2 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Tue, 19 Dec 2017 05:36:17 -0500 Subject: [PATCH] handle keymap not found --- sway/input/keyboard.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index bb18edd2..724941d8 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -85,10 +85,19 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) { return; } - xkb_keymap_unref(keyboard->keymap); - keyboard->keymap = + struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS); + + if (!keymap) { + sway_log(L_DEBUG, "cannot configure keyboard: keymap does not exist"); + xkb_context_unref(context); + return; + } + + xkb_keymap_unref(keyboard->keymap); + keyboard->keymap = keymap; wlr_keyboard_set_keymap(wlr_device->keyboard, keyboard->keymap); + wlr_keyboard_set_repeat_info(wlr_device->keyboard, 25, 600); xkb_context_unref(context); struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;