summaryrefslogtreecommitdiff
path: root/sway/commands/input/click_method.c
diff options
context:
space:
mode:
authorBrian Ashworth <[email protected]>2018-09-23 19:56:52 -0400
committerBrian Ashworth <[email protected]>2018-09-23 19:56:52 -0400
commitbaeb28ea6230ef9aa409ee52abe208720120e45c (patch)
treed5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input/click_method.c
parent4a4f07ac25d18dfeffc6a1ff55e175ba01abc290 (diff)
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input/click_method.c')
-rw-r--r--sway/commands/input/click_method.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 5d0d8cc2..4d7e1c93 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -10,27 +10,22 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) {
if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
return error;
}
- struct input_config *current_input_config =
- config->handler_context.input_config;
- if (!current_input_config) {
+ struct input_config *ic = config->handler_context.input_config;
+ if (!ic) {
return cmd_results_new(CMD_FAILURE, "click_method",
"No input device defined.");
}
- struct input_config *new_config =
- new_input_config(current_input_config->identifier);
if (strcasecmp(argv[0], "none") == 0) {
- new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
+ ic->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
} else if (strcasecmp(argv[0], "button_areas") == 0) {
- new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
+ ic->click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
} else if (strcasecmp(argv[0], "clickfinger") == 0) {
- new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
+ ic->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
} else {
- free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "click_method",
"Expected 'click_method <none|button_areas|clickfinger'");
}
- apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}