From owner-svn-src-stable-10@freebsd.org  Wed Apr  4 08:45:42 2018
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32F88F9E9F5;
 Wed,  4 Apr 2018 08:45:42 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D8DE56CB4B;
 Wed,  4 Apr 2018 08:45:41 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D3BDB11631;
 Wed,  4 Apr 2018 08:45:41 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w348jfgu043662;
 Wed, 4 Apr 2018 08:45:41 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w348jfNI043661;
 Wed, 4 Apr 2018 08:45:41 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201804040845.w348jfNI043661@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 4 Apr 2018 08:45:41 +0000 (UTC)
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
X-SVN-Group: stable-10
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/10/sys/dev/usb/input
X-SVN-Commit-Revision: 331997
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2018 08:45:42 -0000

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++;