From 23c64ab22da0067f2718b822ec1a14a8bb0a3199 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Mon, 13 May 2019 23:56:59 -0400 Subject: input/keyboard: attempt default keymap on failure This attempts to use the default keymap when the one defined in the input config fails to compile. The goal is to make it so the keyboard is always in a usable state, even if it is not the user's requested settings as usability is more important. This also removes the calls to `getenv` for the `XKB_DEFAULT_*` family of environment variables. The reasoning is libxkbcommon will fallback to using those (and then the system defaults) when any of the rule names are `NULL` or an empty string anyway so there is no need for sway to duplicate the efforts. --- include/sway/input/keyboard.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h index 0c8ada0f..b8622053 100644 --- a/include/sway/input/keyboard.h +++ b/include/sway/input/keyboard.h @@ -65,6 +65,8 @@ struct sway_keyboard { struct sway_binding *repeat_binding; }; +struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic); + struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat, struct sway_seat_device *device); -- cgit v1.2.3