summaryrefslogtreecommitdiffstats
path: root/sway/commands/input/xkb_layout.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-09-23 19:56:52 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-09-23 19:56:52 -0400
commitbaeb28ea6230ef9aa409ee52abe208720120e45c (patch)
treed5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input/xkb_layout.c
parentMerge pull request #2699 from RedSoxFan/fix-2667 (diff)
downloadsway-baeb28ea6230ef9aa409ee52abe208720120e45c.tar.gz
sway-baeb28ea6230ef9aa409ee52abe208720120e45c.tar.zst
sway-baeb28ea6230ef9aa409ee52abe208720120e45c.zip
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input/xkb_layout.c')
-rw-r--r--sway/commands/input/xkb_layout.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 9fa5a344..5fccd4a3 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -9,18 +9,15 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
9 if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) { 9 if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) {
10 return error; 10 return error;
11 } 11 }
12 struct input_config *current_input_config = 12 struct input_config *ic = config->handler_context.input_config;
13 config->handler_context.input_config; 13 if (!ic) {
14 if (!current_input_config) { 14 return cmd_results_new(CMD_FAILURE, "xkb_layout",
15 return cmd_results_new(CMD_FAILURE, "xkb_layout", "No input device defined."); 15 "No input device defined.");
16 } 16 }
17 struct input_config *new_config =
18 new_input_config(current_input_config->identifier);
19 17
20 new_config->xkb_layout = strdup(argv[0]); 18 ic->xkb_layout = strdup(argv[0]);
21 19
22 wlr_log(WLR_DEBUG, "apply-xkb_layout for device: %s layout: %s", 20 wlr_log(WLR_DEBUG, "set-xkb_layout for config: %s layout: %s",
23 current_input_config->identifier, new_config->xkb_layout); 21 ic->identifier, ic->xkb_layout);
24 apply_input_config(new_config);
25 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 22 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
26} 23}