aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2016-09-15 08:38:53 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2016-09-15 08:38:53 +0000
commitadb97d5831362becad272e5698c8f072079742c8 (patch)
tree9f72cc88033fdfe62608da095c480d85e94666db
parent2bb33dd7772af050018cc070d814ca817fa006ff (diff)
downloadsrc-adb97d5831362becad272e5698c8f072079742c8.tar.gz
src-adb97d5831362becad272e5698c8f072079742c8.zip
MFC r305590:
Correctly map the USB mouse tilt delta values into buttons 5 and 6 instead of 3 and 4 which is used for the scroll wheel, according to X.org. PR: 170358
Notes
Notes: svn path=/stable/8/; revision=305831
-rw-r--r--sys/dev/usb/input/ums.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index e87503cbda6a..cdf30eb01a3e 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -288,9 +288,9 @@ ums_intr_callback(struct usb_xfer *xfer, usb_error_t error)
/* translate T-axis into button presses until further */
if (dt > 0)
- buttons |= 1UL << 3;
+ buttons |= 1UL << 5;
else if (dt < 0)
- buttons |= 1UL << 4;
+ buttons |= 1UL << 6;
sc->sc_status.button = buttons;
sc->sc_status.dx += dx;