aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-05-13 23:56:59 -0400
committerDrew DeVault <sir@cmpwn.com>2019-05-21 10:16:17 -0400
commitb8f12b478335868a12466363b22095e2b93c02af (patch)
tree24dc0c936cb2a232378c3863cc4a5654fb00fab6 /include
parent56b7d8936ad4f62d43d6ac1989b90b8b1b5a8731 (diff)
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.
Diffstat (limited to 'include')
-rw-r--r--include/sway/input/keyboard.h2
1 files changed, 2 insertions, 0 deletions
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);