aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config/input.c
diff options
context:
space:
mode:
authorLibravatar Spencer Michaels <spencer@smichaels.net>2018-11-17 14:31:33 -0500
committerLibravatar Spencer Michaels <spencer@smichaels.net>2018-11-18 13:49:30 -0500
commit70bc4c3ab6c408850543d827f788ef310fdb269c (patch)
tree265d4ea923f1329d1e7661c0f92a242337318d58 /sway/config/input.c
parentMerge pull request #3147 from emersion/set10 (diff)
downloadsway-70bc4c3ab6c408850543d827f788ef310fdb269c.tar.gz
sway-70bc4c3ab6c408850543d827f788ef310fdb269c.tar.zst
sway-70bc4c3ab6c408850543d827f788ef310fdb269c.zip
Add scroll factor config option.
Diffstat (limited to 'sway/config/input.c')
-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 794d5194..d5d2d90b 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -29,6 +29,7 @@ struct input_config *new_input_config(const char* identifier) {
29 input->natural_scroll = INT_MIN; 29 input->natural_scroll = INT_MIN;
30 input->accel_profile = INT_MIN; 30 input->accel_profile = INT_MIN;
31 input->pointer_accel = FLT_MIN; 31 input->pointer_accel = FLT_MIN;
32 input->scroll_factor = FLT_MIN;
32 input->scroll_button = INT_MIN; 33 input->scroll_button = INT_MIN;
33 input->scroll_method = INT_MIN; 34 input->scroll_method = INT_MIN;
34 input->left_handed = INT_MIN; 35 input->left_handed = INT_MIN;
@@ -68,6 +69,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
68 if (src->pointer_accel != FLT_MIN) { 69 if (src->pointer_accel != FLT_MIN) {
69 dst->pointer_accel = src->pointer_accel; 70 dst->pointer_accel = src->pointer_accel;
70 } 71 }
72 if (src->scroll_factor != FLT_MIN) {
73 dst->scroll_factor = src->scroll_factor;
74 }
71 if (src->repeat_delay != INT_MIN) { 75 if (src->repeat_delay != INT_MIN) {
72 dst->repeat_delay = src->repeat_delay; 76 dst->repeat_delay = src->repeat_delay;
73 } 77 }