aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/input/scroll_button.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/commands/input/scroll_button.c')
-rw-r--r--sway/commands/input/scroll_button.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
index 350fcca2..1958f23c 100644
--- a/sway/commands/input/scroll_button.c
+++ b/sway/commands/input/scroll_button.c
@@ -10,35 +10,28 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
if ((error = checkarg(argc, "scroll_button", 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_button",
"No input device defined.");
}
- struct input_config *new_config =
- new_input_config(current_input_config->identifier);
errno = 0;
char *endptr;
int scroll_button = strtol(*argv, &endptr, 10);
if (endptr == *argv && scroll_button == 0) {
- free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier must be an integer.");
}
if (errno == ERANGE) {
- free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier out of range.");
}
if (scroll_button < 0) {
- free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier cannot be negative.");
}
- new_config->scroll_button = scroll_button;
+ ic->scroll_button = scroll_button;
- apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}