diff options
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/input.c | 11 | ||||
-rw-r--r-- | sway/commands/input/events.c | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c index 23a6644f..d95c4baf 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c | |||
@@ -88,9 +88,10 @@ struct cmd_results *cmd_input(int argc, char **argv) { | |||
88 | 88 | ||
89 | if (!res || res->status == CMD_SUCCESS) { | 89 | if (!res || res->status == CMD_SUCCESS) { |
90 | char *error = NULL; | 90 | char *error = NULL; |
91 | struct xkb_keymap *keymap = sway_keyboard_compile_keymap( | 91 | struct input_config *ic = |
92 | config->handler_context.input_config, &error); | 92 | store_input_config(config->handler_context.input_config, &error); |
93 | if (!keymap) { | 93 | if (!ic) { |
94 | free_input_config(config->handler_context.input_config); | ||
94 | if (res) { | 95 | if (res) { |
95 | free_cmd_results(res); | 96 | free_cmd_results(res); |
96 | } | 97 | } |
@@ -99,10 +100,6 @@ struct cmd_results *cmd_input(int argc, char **argv) { | |||
99 | free(error); | 100 | free(error); |
100 | return res; | 101 | return res; |
101 | } | 102 | } |
102 | xkb_keymap_unref(keymap); | ||
103 | |||
104 | struct input_config *ic = | ||
105 | store_input_config(config->handler_context.input_config); | ||
106 | 103 | ||
107 | input_manager_apply_input_config(ic); | 104 | input_manager_apply_input_config(ic); |
108 | retranslate_keysyms(ic); | 105 | retranslate_keysyms(ic); |
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c index 44bc9e74..cd2985ee 100644 --- a/sway/commands/input/events.c +++ b/sway/commands/input/events.c | |||
@@ -101,7 +101,7 @@ static void toggle_wildcard_send_events(int argc, char **argv) { | |||
101 | } else { | 101 | } else { |
102 | toggle_supported_send_events_for_device(ic, input_device); | 102 | toggle_supported_send_events_for_device(ic, input_device); |
103 | } | 103 | } |
104 | store_input_config(ic); | 104 | store_input_config(ic, NULL); |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||