Date: Wed, 4 Apr 2018 08:45:41 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r331997 - stable/10/sys/dev/usb/input Message-ID: <201804040845.w348jfNI043661@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Wed Apr 4 08:45:41 2018 New Revision: 331997 URL: https://svnweb.freebsd.org/changeset/base/331997 Log: MFC r331642: Add support for right and middle click with integrated button to WSP USB trackpad driver. Submitted by: James Wright <james.wright@jigsawdezign.com> PR: 226961 Sponsored by: Mellanox Technologies Modified: stable/10/sys/dev/usb/input/wsp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/usb/input/wsp.c ============================================================================== --- stable/10/sys/dev/usb/input/wsp.c Wed Apr 4 08:41:10 2018 (r331996) +++ stable/10/sys/dev/usb/input/wsp.c Wed Apr 4 08:45:41 2018 (r331997) @@ -922,7 +922,12 @@ wsp_intr_callback(struct usb_xfer *xfer, usb_error_t e sc->sc_status.button = 0; if (ibt != 0) { - sc->sc_status.button |= MOUSE_BUTTON1DOWN; + if ((params->caps & HAS_INTEGRATED_BUTTON) && ntouch == 2) + sc->sc_status.button |= MOUSE_BUTTON3DOWN; + else if ((params->caps & HAS_INTEGRATED_BUTTON) && ntouch == 3) + sc->sc_status.button |= MOUSE_BUTTON2DOWN; + else + sc->sc_status.button |= MOUSE_BUTTON1DOWN; sc->ibtn = 1; } sc->intr_count++;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804040845.w348jfNI043661>