summaryrefslogtreecommitdiffstats
path: root/sway/input
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-07-13 04:07:11 -0700
committerLibravatar GitHub <noreply@github.com>2018-07-13 04:07:11 -0700
commitbcdf04d79c28866d971dc968a2497f7d95ec1aae (patch)
tree874386abb337c953b60ee2efe0a799d9dfb010ee /sway/input
parentMerge pull request #2255 from emersion/xwayland-floating-borders (diff)
parentadd error handling for scroll button out of range (diff)
downloadsway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.tar.gz
sway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.tar.zst
sway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.zip
Merge pull request #2252 from rkubosz/scroll-button-option
feature: scroll button option for input devices
Diffstat (limited to 'sway/input')
-rw-r--r--sway/input/input-manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index daaf1fb6..b18989d0 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -158,6 +158,12 @@ static void input_manager_libinput_config_pointer(
158 libinput_device_config_accel_set_speed(libinput_device, 158 libinput_device_config_accel_set_speed(libinput_device,
159 ic->pointer_accel); 159 ic->pointer_accel);
160 } 160 }
161 if (ic->scroll_button != INT_MIN) {
162 wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)",
163 ic->identifier, ic->scroll_button);
164 libinput_device_config_scroll_set_button(libinput_device,
165 ic->scroll_button);
166 }
161 if (ic->scroll_method != INT_MIN) { 167 if (ic->scroll_method != INT_MIN) {
162 wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", 168 wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
163 ic->identifier, ic->scroll_method); 169 ic->identifier, ic->scroll_method);