diff options
Diffstat (limited to 'sway/config/input.c')
-rw-r--r-- | sway/config/input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c index 2ee165c9..44c2be28 100644 --- a/sway/config/input.c +++ b/sway/config/input.c | |||
@@ -35,6 +35,7 @@ struct input_config *new_input_config(const char* identifier) { | |||
35 | input->pointer_accel = FLT_MIN; | 35 | input->pointer_accel = FLT_MIN; |
36 | input->scroll_factor = FLT_MIN; | 36 | input->scroll_factor = FLT_MIN; |
37 | input->scroll_button = INT_MIN; | 37 | input->scroll_button = INT_MIN; |
38 | input->scroll_button_lock = INT_MIN; | ||
38 | input->scroll_method = INT_MIN; | 39 | input->scroll_method = INT_MIN; |
39 | input->left_handed = INT_MIN; | 40 | input->left_handed = INT_MIN; |
40 | input->repeat_delay = INT_MIN; | 41 | input->repeat_delay = INT_MIN; |
@@ -96,6 +97,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { | |||
96 | if (src->scroll_button != INT_MIN) { | 97 | if (src->scroll_button != INT_MIN) { |
97 | dst->scroll_button = src->scroll_button; | 98 | dst->scroll_button = src->scroll_button; |
98 | } | 99 | } |
100 | if (src->scroll_button_lock != INT_MIN) { | ||
101 | dst->scroll_button_lock = src->scroll_button_lock; | ||
102 | } | ||
99 | if (src->send_events != INT_MIN) { | 103 | if (src->send_events != INT_MIN) { |
100 | dst->send_events = src->send_events; | 104 | dst->send_events = src->send_events; |
101 | } | 105 | } |