mirror of
https://github.com/swaywm/sway.git
synced 2024-11-26 09:51:29 +00:00
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:
parent
094edcbea2
commit
89db5b5716
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue