mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-06 13:29:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

commands/input: perform basic keymap validation

Browse source 
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).
This commit is contained in:
Brian Ashworth 2019-05-23 03:06:28 -04:00 • committed by Simon Ser
parent 4d93b96b6e
commit be2d2a299a
3 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/commands/input.c
View file

@ -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);