summaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Robert Kubosz <kubosz.robert@gmail.com>2018-07-11 22:03:06 +0200
committerLibravatar Robert Kubosz <kubosz.robert@gmail.com>2018-07-11 22:03:06 +0200
commit41b80c28dfafb9bc13b68e4d5d2811d311b59863 (patch)
treebbc7fe4664da4e25e9d66b87a216e64024856b31 /sway/config
parentMerge pull request #2245 from RyanDwyer/floating-minmax-size (diff)
downloadsway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.tar.gz
sway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.tar.zst
sway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.zip
add scroll button option
This commit introduces a scroll_button option, which is intended to be used with scroll_method. Now user can edit his sway config and add an scroll_button option to device section.
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c
index 9840df18..62d77cf7 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -28,6 +28,7 @@ struct input_config *new_input_config(const char* identifier) {
28 input->accel_profile = INT_MIN; 28 input->accel_profile = INT_MIN;
29 input->pointer_accel = FLT_MIN; 29 input->pointer_accel = FLT_MIN;
30 input->scroll_method = INT_MIN; 30 input->scroll_method = INT_MIN;
31 input->scroll_button = INT_MIN;
31 input->left_handed = INT_MIN; 32 input->left_handed = INT_MIN;
32 input->repeat_delay = INT_MIN; 33 input->repeat_delay = INT_MIN;
33 input->repeat_rate = INT_MIN; 34 input->repeat_rate = INT_MIN;
@@ -70,6 +71,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
70 if (src->scroll_method != INT_MIN) { 71 if (src->scroll_method != INT_MIN) {
71 dst->scroll_method = src->scroll_method; 72 dst->scroll_method = src->scroll_method;
72 } 73 }
74 if (src->scroll_button != INT_MIN) {
75 dst->scroll_button= src->scroll_button;
76 }
73 if (src->send_events != INT_MIN) { 77 if (src->send_events != INT_MIN) {
74 dst->send_events = src->send_events; 78 dst->send_events = src->send_events;
75 } 79 }