aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/input.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-05-23 03:06:28 -0400
committerLibravatar Simon Ser <contact@emersion.fr>2019-06-09 20:13:22 +0300
commitbe2d2a299a6f854f0494f84169ef82ad5b31a917 (patch)
tree1afefdc25efda19c13f137a49a88346b763ac8d9 /sway/commands/input.c
parentUnhide cursor on cursor activity after touch (diff)
downloadsway-be2d2a299a6f854f0494f84169ef82ad5b31a917.tar.gz
sway-be2d2a299a6f854f0494f84169ef82ad5b31a917.tar.zst
sway-be2d2a299a6f854f0494f84169ef82ad5b31a917.zip
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/input.c')
-rw-r--r--sway/commands/input.c15
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 @@
2#include <strings.h> 2#include <strings.h>
3#include "sway/commands.h" 3#include "sway/commands.h"
4#include "sway/input/input-manager.h" 4#include "sway/input/input-manager.h"
5#include "sway/input/keyboard.h"
5#include "log.h" 6#include "log.h"
6#include "stringop.h" 7#include "stringop.h"
7 8
@@ -86,6 +87,20 @@ struct cmd_results *cmd_input(int argc, char **argv) {
86 } 87 }
87 88
88 if (!res || res->status == CMD_SUCCESS) { 89 if (!res || res->status == CMD_SUCCESS) {
90 char *error = NULL;
91 struct xkb_keymap *keymap = sway_keyboard_compile_keymap(
92 config->handler_context.input_config, &error);
93 if (!keymap) {
94 if (res) {
95 free_cmd_results(res);
96 }
97 res = cmd_results_new(CMD_FAILURE, "Failed to compile keymap: %s",
98 error ? error : "(details unavailable)");
99 free(error);
100 return res;
101 }
102 xkb_keymap_unref(keymap);
103
89 struct input_config *ic = 104 struct input_config *ic =
90 store_input_config(config->handler_context.input_config); 105 store_input_config(config->handler_context.input_config);
91 106