diff options
| author | emersion <contact@emersion.fr> | 2018-09-24 10:43:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-24 10:43:18 +0200 |
| commit | a032925ae7667e917f2bd8d1b77de97b400b3bf7 (patch) | |
| tree | d5a6fffc3470b3fbbb18a6ae01851451bea1dbb2 /sway/commands/input/scroll_method.c | |
| parent | 4a4f07ac25d18dfeffc6a1ff55e175ba01abc290 (diff) | |
| parent | baeb28ea6230ef9aa409ee52abe208720120e45c (diff) | |
Merge pull request #2701 from RedSoxFan/input-wildcard
Implement support for input wildcard
Diffstat (limited to 'sway/commands/input/scroll_method.c')
| -rw-r--r-- | sway/commands/input/scroll_method.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c index 4c6ac6b6..c116b052 100644 --- a/sway/commands/input/scroll_method.c +++ b/sway/commands/input/scroll_method.c @@ -9,29 +9,24 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) { if ((error = checkarg(argc, "scroll_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, "scroll_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->scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL; + ic->scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL; } else if (strcasecmp(argv[0], "two_finger") == 0) { - new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_2FG; + ic->scroll_method = LIBINPUT_CONFIG_SCROLL_2FG; } else if (strcasecmp(argv[0], "edge") == 0) { - new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE; + ic->scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE; } else if (strcasecmp(argv[0], "on_button_down") == 0) { - new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; + ic->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN; } else { - free_input_config(new_config); return cmd_results_new(CMD_INVALID, "scroll_method", "Expected 'scroll_method <none|two_finger|edge|on_button_down>'"); } - apply_input_config(new_config); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } |