diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-13 04:07:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 04:07:11 -0700 |
| commit | bcdf04d79c28866d971dc968a2497f7d95ec1aae (patch) | |
| tree | 874386abb337c953b60ee2efe0a799d9dfb010ee /sway/config/input.c | |
| parent | 683a307151764f7cad38ff12c4175e8e0cf94226 (diff) | |
| parent | f8bc928b2d3f5166e8d51422c07bc16ca35b0b83 (diff) | |
Merge pull request #2252 from rkubosz/scroll-button-option
feature: scroll button option for input devices
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 9840df18..cbd7d5f0 100644 --- a/sway/config/input.c +++ b/sway/config/input.c @@ -27,6 +27,7 @@ struct input_config *new_input_config(const char* identifier) { input->natural_scroll = INT_MIN; input->accel_profile = INT_MIN; input->pointer_accel = FLT_MIN; + input->scroll_button = INT_MIN; input->scroll_method = INT_MIN; input->left_handed = INT_MIN; input->repeat_delay = INT_MIN; @@ -70,6 +71,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { if (src->scroll_method != INT_MIN) { dst->scroll_method = src->scroll_method; } + if (src->scroll_button != INT_MIN) { + dst->scroll_button = src->scroll_button; + } if (src->send_events != INT_MIN) { dst->send_events = src->send_events; } |