Date: Tue, 27 Mar 2018 18:44:05 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331642 - head/sys/dev/usb/input Message-ID: <201803271844.w2RIi5UC001585@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Tue Mar 27 18:44:05 2018 New Revision: 331642 URL: https://svnweb.freebsd.org/changeset/base/331642 Log: 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 MFC after: 1 week Sponsored by: Mellanox Technologies Modified: head/sys/dev/usb/input/wsp.c Modified: head/sys/dev/usb/input/wsp.c ============================================================================== --- head/sys/dev/usb/input/wsp.c Tue Mar 27 18:26:50 2018 (r331641) +++ head/sys/dev/usb/input/wsp.c Tue Mar 27 18:44:05 2018 (r331642) @@ -929,7 +929,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?201803271844.w2RIi5UC001585>