diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-09-23 19:56:52 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-09-23 19:56:52 -0400 |
commit | baeb28ea6230ef9aa409ee52abe208720120e45c (patch) | |
tree | d5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input/tap.c | |
parent | Merge pull request #2699 from RedSoxFan/fix-2667 (diff) | |
download | sway-baeb28ea6230ef9aa409ee52abe208720120e45c.tar.gz sway-baeb28ea6230ef9aa409ee52abe208720120e45c.tar.zst sway-baeb28ea6230ef9aa409ee52abe208720120e45c.zip |
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input/tap.c')
-rw-r--r-- | sway/commands/input/tap.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c index ac3b8237..c455b696 100644 --- a/sway/commands/input/tap.c +++ b/sway/commands/input/tap.c | |||
@@ -11,22 +11,16 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) { | |||
11 | if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) { | 11 | if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) { |
12 | return error; | 12 | return error; |
13 | } | 13 | } |
14 | struct input_config *current_input_config = | 14 | struct input_config *ic = config->handler_context.input_config; |
15 | config->handler_context.input_config; | 15 | if (!ic) { |
16 | if (!current_input_config) { | ||
17 | return cmd_results_new(CMD_FAILURE, "tap", "No input device defined."); | 16 | return cmd_results_new(CMD_FAILURE, "tap", "No input device defined."); |
18 | } | 17 | } |
19 | struct input_config *new_config = | ||
20 | new_input_config(current_input_config->identifier); | ||
21 | 18 | ||
22 | if (parse_boolean(argv[0], true)) { | 19 | if (parse_boolean(argv[0], true)) { |
23 | new_config->tap = LIBINPUT_CONFIG_TAP_ENABLED; | 20 | ic->tap = LIBINPUT_CONFIG_TAP_ENABLED; |
24 | } else { | 21 | } else { |
25 | new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED; | 22 | ic->tap = LIBINPUT_CONFIG_TAP_DISABLED; |
26 | } | 23 | } |
27 | 24 | ||
28 | wlr_log(WLR_DEBUG, "apply-tap for device: %s", | ||
29 | current_input_config->identifier); | ||
30 | apply_input_config(new_config); | ||
31 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
32 | } | 26 | } |