mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Robert Kubosz 2018-07-12 23:50:34 +02:00
parent 094edcbea2
commit 89db5b5716
No known key found for this signature in database
GPG Key ID: 781954F8F9DF3043
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/commands/input/scroll_button.c
View File

@ -18,11 +18,17 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
struct input_config *new_config =
new_input_config(current_input_config->identifier);
int scroll_button = atoi(argv[0]);
char *endptr;
long 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 (scroll_button < 0) {
free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button",
"Scroll button identifier cannot be negative");
"Scroll button identifier cannot be negative.");
}
new_config->scroll_button = scroll_button;