diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-12 09:02:30 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-12 09:03:58 -0500 |
commit | 538903bc5ace56c1dab0f5287fb4d0bab78a0165 (patch) | |
tree | d45d08f64e98a76c730145cf3ea75dd199d9f6c8 /sway/commands/input/click_method.c | |
parent | sway input device (diff) | |
download | sway-538903bc5ace56c1dab0f5287fb4d0bab78a0165.tar.gz sway-538903bc5ace56c1dab0f5287fb4d0bab78a0165.tar.zst sway-538903bc5ace56c1dab0f5287fb4d0bab78a0165.zip |
config cleanup
Diffstat (limited to 'sway/commands/input/click_method.c')
-rw-r--r-- | sway/commands/input/click_method.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c index 40f075ce..a0e3bddf 100644 --- a/sway/commands/input/click_method.c +++ b/sway/commands/input/click_method.c | |||
@@ -5,15 +5,18 @@ | |||
5 | #include "log.h" | 5 | #include "log.h" |
6 | 6 | ||
7 | struct cmd_results *input_cmd_click_method(int argc, char **argv) { | 7 | struct cmd_results *input_cmd_click_method(int argc, char **argv) { |
8 | sway_log(L_DEBUG, "click_method for device: %d %s", current_input_config==NULL, current_input_config->identifier); | 8 | sway_log(L_DEBUG, "click_method for device: %d %s", |
9 | current_input_config==NULL, current_input_config->identifier); | ||
9 | struct cmd_results *error = NULL; | 10 | struct cmd_results *error = NULL; |
10 | if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) { | 11 | if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) { |
11 | return error; | 12 | return error; |
12 | } | 13 | } |
13 | if (!current_input_config) { | 14 | if (!current_input_config) { |
14 | return cmd_results_new(CMD_FAILURE, "click_method", "No input device defined."); | 15 | return cmd_results_new(CMD_FAILURE, "click_method", |
16 | "No input device defined."); | ||
15 | } | 17 | } |
16 | struct input_config *new_config = new_input_config(current_input_config->identifier); | 18 | struct input_config *new_config = |
19 | new_input_config(current_input_config->identifier); | ||
17 | 20 | ||
18 | if (strcasecmp(argv[0], "none") == 0) { | 21 | if (strcasecmp(argv[0], "none") == 0) { |
19 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE; | 22 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE; |
@@ -22,7 +25,8 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) { | |||
22 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { | 25 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { |
23 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; | 26 | new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; |
24 | } else { | 27 | } else { |
25 | return cmd_results_new(CMD_INVALID, "click_method", "Expected 'click_method <none|button_areas|clickfinger'"); | 28 | return cmd_results_new(CMD_INVALID, "click_method", |
29 | "Expected 'click_method <none|button_areas|clickfinger'"); | ||
26 | } | 30 | } |
27 | 31 | ||
28 | input_cmd_apply(new_config); | 32 | input_cmd_apply(new_config); |