summaryrefslogtreecommitdiff
path: root/sway/commands/input.c
diff options
context:
space:
mode:
authoremersion <[email protected]>2018-09-24 10:43:18 +0200
committerGitHub <[email protected]>2018-09-24 10:43:18 +0200
commita032925ae7667e917f2bd8d1b77de97b400b3bf7 (patch)
treed5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input.c
parent4a4f07ac25d18dfeffc6a1ff55e175ba01abc290 (diff)
parentbaeb28ea6230ef9aa409ee52abe208720120e45c (diff)
Merge pull request #2701 from RedSoxFan/input-wildcard
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input.c')
-rw-r--r--sway/commands/input.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 84888fbb..9091da2a 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -66,7 +66,15 @@ struct cmd_results *cmd_input(int argc, char **argv) {
input_handlers, sizeof(input_handlers));
}
- free_input_config(config->handler_context.input_config);
+ if (!res || res->status == CMD_SUCCESS) {
+ struct input_config *ic =
+ store_input_config(config->handler_context.input_config);
+
+ input_manager_apply_input_config(input_manager, ic);
+ } else {
+ free_input_config(config->handler_context.input_config);
+ }
+
config->handler_context.input_config = NULL;
return res;