summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorhselasky <hselasky@FreeBSD.org>2016-09-15 08:35:46 +0000
committerhselasky <hselasky@FreeBSD.org>2016-09-15 08:35:46 +0000
commit0042789fce224f7387a9a1e82ef4ebeddb5dd2ec (patch)
tree61cc52ff92252598c7dd216d421ec789f1970550 /sys/dev/usb
parent8628e8e91075a172055f3ae854d7f73481dd9d02 (diff)
downloadFreeBSD-src-0042789fce224f7387a9a1e82ef4ebeddb5dd2ec.zip
FreeBSD-src-0042789fce224f7387a9a1e82ef4ebeddb5dd2ec.tar.gz
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
Diffstat (limited to 'sys/dev/usb')
-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 cc52b99..4b122f2 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;
OpenPOWER on IntegriCloud