diff options
author | 2019-01-14 11:44:18 -0500 | |
---|---|---|
committer | 2019-01-14 11:44:18 -0500 | |
commit | 15cd8b6a86295a445a1037afd0028b1226a14c82 (patch) | |
tree | 56332b9c150459beb5aef94605372ef179ec8854 /sway/commands/input/click_method.c | |
parent | Merge pull request #3418 from RyanDwyer/remove-resize-axis (diff) | |
parent | Remove now-unused "input" argument of cmd_results_new (diff) | |
download | sway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.gz sway-15cd8b6a86295a445a1037afd0028b1226a14c82.tar.zst sway-15cd8b6a86295a445a1037afd0028b1226a14c82.zip |
Merge pull request #3403 from mstoeckl/ipcleanup
Remove 'input' field of IPC command return json
Diffstat (limited to 'sway/commands/input/click_method.c')
-rw-r--r-- | sway/commands/input/click_method.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c index 24777475..03fcb458 100644 --- a/sway/commands/input/click_method.c +++ b/sway/commands/input/click_method.c | |||
@@ -12,8 +12,7 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) { | |||
12 | } | 12 | } |
13 | struct input_config *ic = config->handler_context.input_config; | 13 | struct input_config *ic = config->handler_context.input_config; |
14 | if (!ic) { | 14 | if (!ic) { |
15 | return cmd_results_new(CMD_FAILURE, "click_method", | 15 | return cmd_results_new(CMD_FAILURE, "No input device defined."); |
16 | "No input device defined."); | ||
17 | } | 16 | } |
18 | 17 | ||
19 | if (strcasecmp(argv[0], "none") == 0) { | 18 | if (strcasecmp(argv[0], "none") == 0) { |
@@ -23,9 +22,9 @@ struct cmd_results *input_cmd_click_method(int argc, char **argv) { | |||
23 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { | 22 | } else if (strcasecmp(argv[0], "clickfinger") == 0) { |
24 | ic->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; | 23 | ic->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER; |
25 | } else { | 24 | } else { |
26 | return cmd_results_new(CMD_INVALID, "click_method", | 25 | return cmd_results_new(CMD_INVALID, |
27 | "Expected 'click_method <none|button_areas|clickfinger'>"); | 26 | "Expected 'click_method <none|button_areas|clickfinger'>"); |
28 | } | 27 | } |
29 | 28 | ||
30 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 29 | return cmd_results_new(CMD_SUCCESS, NULL); |
31 | } | 30 | } |