diff options
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/input.c | 5 | ||||
| -rw-r--r-- | sway/commands/input/xkb_file.c | 28 |
2 files changed, 31 insertions, 2 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c index 588ef2d5..2289ede5 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c @@ -28,6 +28,7 @@ static struct cmd_handler input_handlers[] = { { "scroll_method", input_cmd_scroll_method }, { "tap", input_cmd_tap }, { "tap_button_map", input_cmd_tap_button_map }, + { "xkb_file", input_cmd_xkb_file }, { "xkb_layout", input_cmd_xkb_layout }, { "xkb_model", input_cmd_xkb_model }, { "xkb_options", input_cmd_xkb_options }, @@ -48,8 +49,8 @@ static struct cmd_handler input_config_handlers[] = { static void retranslate_keysyms(struct input_config *input_config) { for (int i = 0; i < config->input_configs->length; ++i) { struct input_config *ic = config->input_configs->items[i]; - if (ic->xkb_layout) { - // this is the first config with xkb_layout + if (ic->xkb_layout || ic->xkb_file) { + // this is the first config with xkb_layout or xkb_file if (ic->identifier == input_config->identifier) { translate_keysyms(ic); } diff --git a/sway/commands/input/xkb_file.c b/sway/commands/input/xkb_file.c new file mode 100644 index 00000000..063f544d --- /dev/null +++ b/sway/commands/input/xkb_file.c @@ -0,0 +1,28 @@ +#define _POSIX_C_SOURCE 200809L +#include "sway/config.h" +#include "sway/commands.h" +#include "sway/input/input-manager.h" +#include "log.h" + +struct cmd_results *input_cmd_xkb_file(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "xkb_file", EXPECTED_EQUAL_TO, 1))) { + return error; + } + struct input_config *ic = config->handler_context.input_config; + if (!ic) { + return cmd_results_new(CMD_FAILURE, "No input device defined."); + } + + if (strcmp(argv[0], "-") == 0) { + free(ic->xkb_file); + ic->xkb_file = NULL; + } else { + ic->xkb_file = strdup(argv[0]); + } + ic->xkb_file_is_set = true; + + sway_log(SWAY_DEBUG, "set-xkb_file for config: %s file: %s", + ic->identifier, ic->xkb_file); + return cmd_results_new(CMD_SUCCESS, NULL); +} |