mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

increase maximum value of button identifier

Browse source 
and also cleanup spaces
This commit is contained in:
Robert Kubosz 2018-07-12 12:08:53 +02:00
parent 41b80c28df
commit 08edaf4e76
Failed to generate hash of commit
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/input/scroll_button.c
View file

@ -19,7 +19,7 @@ struct cmd_results *input_cmd_scroll_button(int argc, char **argv) {
new_input_config(current_input_config->identifier); new_input_config(current_input_config->identifier);
int scroll_button = atoi(argv[0]); int scroll_button = atoi(argv[0]);
if (scroll_button < 1 || scroll_button > 10) { if (scroll_button < 0 || scroll_button > 1000) {
free_input_config(new_config); free_input_config(new_config);
return cmd_results_new(CMD_INVALID, "scroll_button", return cmd_results_new(CMD_INVALID, "scroll_button",
"Input out of range [1, 10]"); "Input out of range [1, 10]");

4
sway/config/input.c
View file

@ -27,8 +27,8 @@ struct input_config *new_input_config(const char* identifier) {
input->natural_scroll = INT_MIN; input->natural_scroll = INT_MIN;
input->accel_profile = INT_MIN; input->accel_profile = INT_MIN;
input->pointer_accel = FLT_MIN; input->pointer_accel = FLT_MIN;
input->scroll_method = INT_MIN;
input->scroll_button = INT_MIN; input->scroll_button = INT_MIN;
input->scroll_method = INT_MIN;
input->left_handed = INT_MIN; input->left_handed = INT_MIN;
input->repeat_delay = INT_MIN; input->repeat_delay = INT_MIN;
input->repeat_rate = INT_MIN; input->repeat_rate = INT_MIN;
@ -72,7 +72,7 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
dst->scroll_method = src->scroll_method; dst->scroll_method = src->scroll_method;
} }
if (src->scroll_button != INT_MIN) { if (src->scroll_button != INT_MIN) {
dst->scroll_button= src->scroll_button; dst->scroll_button = src->scroll_button;
} }
if (src->send_events != INT_MIN) { if (src->send_events != INT_MIN) {
dst->send_events = src->send_events; dst->send_events = src->send_events;