alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

input/keyboard: attempt default keymap on failure

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-05-13 23:56:59 -04:00 committed by Drew DeVault
parent ed2e553b8d
commit 23c64ab22d
2 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/input/keyboard.h
View file

@ -65,6 +65,8 @@ struct sway_keyboard {
struct sway_binding *repeat_binding; 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_keyboard *sway_keyboard_create(struct sway_seat *seat,
struct sway_seat_device *device); struct sway_seat_device *device);

58
sway/input/keyboard.c
View file

@ -476,45 +476,38 @@ struct sway_keyboard *sway_keyboard_create(struct sway_seat *seat,
return keyboard; return keyboard;
} }
struct xkb_keymap *sway_keyboard_compile_keymap(struct input_config *ic) {
struct xkb_rule_names rules = {0};
if (ic) {
input_config_fill_rule_names(ic, &rules);
}
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!sway_assert(context, "cannot create XKB context")) {
return NULL;
}
struct xkb_keymap *keymap =
xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
xkb_context_unref(context);
return keymap;
}
void sway_keyboard_configure(struct sway_keyboard *keyboard) { void sway_keyboard_configure(struct sway_keyboard *keyboard) {
struct input_config *input_config = struct input_config *input_config =
input_device_get_config(keyboard->seat_device->input_device); input_device_get_config(keyboard->seat_device->input_device);
struct wlr_input_device *wlr_device = struct wlr_input_device *wlr_device =
keyboard->seat_device->input_device->wlr_device; keyboard->seat_device->input_device->wlr_device;
struct xkb_rule_names rules = {0}; struct xkb_keymap *keymap = sway_keyboard_compile_keymap(input_config);
if (input_config) {
input_config_fill_rule_names(input_config, &rules);
}
if (!rules.layout) {
rules.layout = getenv("XKB_DEFAULT_LAYOUT");
}
if (!rules.model) {
rules.model = getenv("XKB_DEFAULT_MODEL");
}
if (!rules.options) {
rules.options = getenv("XKB_DEFAULT_OPTIONS");
}
if (!rules.rules) {
rules.rules = getenv("XKB_DEFAULT_RULES");
}
if (!rules.variant) {
rules.variant = getenv("XKB_DEFAULT_VARIANT");
}
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!sway_assert(context, "cannot create XKB context")) {
return;
}
struct xkb_keymap *keymap =
xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) { if (!keymap) {
sway_log(SWAY_DEBUG, "cannot configure keyboard: keymap does not exist"); sway_log(SWAY_ERROR, "Failed to compile keymap. Attempting defaults");
xkb_context_unref(context); keymap = sway_keyboard_compile_keymap(NULL);
return; if (!keymap) {
sway_log(SWAY_ERROR,
"Failed to compile default keymap. Aborting configure");
return;
}
} }
xkb_keymap_unref(keyboard->keymap); xkb_keymap_unref(keyboard->keymap);
@ -557,7 +550,6 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
wlr_keyboard_set_repeat_info(wlr_device->keyboard, repeat_rate, wlr_keyboard_set_repeat_info(wlr_device->keyboard, repeat_rate,
repeat_delay); repeat_delay);
xkb_context_unref(context);
struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat; struct wlr_seat *seat = keyboard->seat_device->sway_seat->wlr_seat;
wlr_seat_set_keyboard(seat, wlr_device); wlr_seat_set_keyboard(seat, wlr_device);