diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-05-23 03:06:28 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-06-09 20:13:22 +0300 |
commit | be2d2a299a6f854f0494f84169ef82ad5b31a917 (patch) | |
tree | 1afefdc25efda19c13f137a49a88346b763ac8d9 /sway/commands | |
parent | 4d93b96b6ec724e31363ebff725486167b99f660 (diff) | |
download | sway-be2d2a299a6f854f0494f84169ef82ad5b31a917.tar.xz |
commands/input: perform basic keymap validation
Before the delta input config is stored, this attempts to compile a
keymap with it. If the keymap fails to compile, then the first line of
the xkbcommon log entry will be included with a `CMD_FAILURE`, the
entire xkbcommon log entry will be included in the sway error log, and
the delta will not be stored.
This only handles basic issues such as a layouts not existing. This
will NOT catch more complex issues such as when a variant does
exist, but not for the given layout (ex: `azerty` is a valid variant,
but the `us` layout does not have a `azerty` variant).
Diffstat (limited to 'sway/commands')
-rw-r--r-- | sway/commands/input.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c index 0195082c..23a6644f 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -2,6 +2,7 @@ #include <strings.h> #include "sway/commands.h" #include "sway/input/input-manager.h" +#include "sway/input/keyboard.h" #include "log.h" #include "stringop.h" @@ -86,6 +87,20 @@ struct cmd_results *cmd_input(int argc, char **argv) { } if (!res || res->status == CMD_SUCCESS) { + char *error = NULL; + struct xkb_keymap *keymap = sway_keyboard_compile_keymap( + config->handler_context.input_config, &error); + if (!keymap) { + if (res) { + free_cmd_results(res); + } + res = cmd_results_new(CMD_FAILURE, "Failed to compile keymap: %s", + error ? error : "(details unavailable)"); + free(error); + return res; + } + xkb_keymap_unref(keymap); + struct input_config *ic = store_input_config(config->handler_context.input_config); |