aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/input
diff options
context:
space:
mode:
authorLibravatar Robert Kubosz <kubosz.robert@gmail.com>2018-07-12 23:50:34 +0200
committerLibravatar Robert Kubosz <kubosz.robert@gmail.com>2018-07-12 23:50:34 +0200
commit89db5b57165a0805c9e79aafdb7cf047e877152f (patch)
tree5ceb943821f80a2c4e807a3a164576037e7ffd6a /sway/commands/input
parentrm constraint for max value of button identifier (diff)
downloadsway-89db5b57165a0805c9e79aafdb7cf047e877152f.tar.gz
sway-89db5b57165a0805c9e79aafdb7cf047e877152f.tar.zst
sway-89db5b57165a0805c9e79aafdb7cf047e877152f.zip
expanded error detection for scroll button option
Now the scroll_button will not accept: - letters on string beginning; - negative numbers. What is tolerated: - letters after number; - rational numbers: the fraction after dot will be omitted.
Diffstat (limited to 'sway/commands/input')
-rw-r--r--sway/commands/input/scroll_button.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
index d19f3516..6345b71b 100644
--- a/sway/commands/input/scroll_button.c
+++ b/sway/commands/input/scroll_button.c
@@ -18,11 +18,17 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
18 struct input_config *new_config = 18 struct input_config *new_config =
19 new_input_config(current_input_config->identifier); 19 new_input_config(current_input_config->identifier);
20 20
21 int scroll_button = atoi(argv[0]); 21 char *endptr;
22 long scroll_button = strtol(*argv, &endptr, 10);
23 if (endptr == *argv && scroll_button == 0) {
24 free_input_config(new_config);
25 return cmd_results_new(CMD_INVALID, "scroll_button",
26 "Scroll button identifier must be an integer.");
27 }
22 if (scroll_button < 0) { 28 if (scroll_button < 0) {
23 free_input_config(new_config); 29 free_input_config(new_config);
24 return cmd_results_new(CMD_INVALID, "scroll_button", 30 return cmd_results_new(CMD_INVALID, "scroll_button",
25 "Scroll button identifier cannot be negative"); 31 "Scroll button identifier cannot be negative.");
26 } 32 }
27 new_config->scroll_button = scroll_button; 33 new_config->scroll_button = scroll_button;
28 34