Author: hselasky
Date: Thu Sep 15 08:38:53 2016
New Revision: 305831
URL: https://svnweb.freebsd.org/changeset/base/305831

Log:
  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

Modified:
  stable/8/sys/dev/usb/input/ums.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/usb/   (props changed)

Modified: stable/8/sys/dev/usb/input/ums.c
==============================================================================
--- stable/8/sys/dev/usb/input/ums.c    Thu Sep 15 08:37:20 2016        
(r305830)
+++ stable/8/sys/dev/usb/input/ums.c    Thu Sep 15 08:38:53 2016        
(r305831)
@@ -288,9 +288,9 @@ ums_intr_callback(struct usb_xfer *xfer,
 
                        /* 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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to