From owner-svn-src-head@freebsd.org  Wed Feb 15 02:52:44 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5354ECDFB31;
 Wed, 15 Feb 2017 02:52:44 +0000 (UTC)
 (envelope-from gonzo@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 mx1.freebsd.org (Postfix) with ESMTPS id 1AAB1379;
 Wed, 15 Feb 2017 02:52:44 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1F2qh6D091868;
 Wed, 15 Feb 2017 02:52:43 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1F2qh8P091867;
 Wed, 15 Feb 2017 02:52:43 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201702150252.v1F2qh8P091867@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 15 Feb 2017 02:52:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r313757 - head/sys/dev/atkbdc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Feb 2017 02:52:44 -0000

Author: gonzo
Date: Wed Feb 15 02:52:43 2017
New Revision: 313757
URL: https://svnweb.freebsd.org/changeset/base/313757

Log:
  [psm] Fix calculation for clickpad softbuttons at the top
  
  On laptops like the ThinkPad X240, ClickPad buttons are located at the
  top. The hw.psm.synaptics.softbuttons_y sysctl was supposed to allow this
  by setting the value to a negative one (e.g. -1700). However, the
  condition was wrong (double negative), and doing that placed the buttons
  in an unreachable area.
  
  PR:		216342
  Submitted by:	Greg V <greg@unrelenting.technology>
  MFC after:	1 week

Modified:
  head/sys/dev/atkbdc/psm.c

Modified: head/sys/dev/atkbdc/psm.c
==============================================================================
--- head/sys/dev/atkbdc/psm.c	Wed Feb 15 01:50:58 2017	(r313756)
+++ head/sys/dev/atkbdc/psm.c	Wed Feb 15 02:52:43 2017	(r313757)
@@ -3194,7 +3194,7 @@ psmgestures(struct psm_softc *sc, finger
 		if (sc->synhw.capClickPad && ms->button & MOUSE_BUTTON1DOWN) {
 			y_ok = sc->syninfo.softbuttons_y >= 0 ?
 			    start_y < sc->syninfo.softbuttons_y :
-			    start_y > max_y - sc->syninfo.softbuttons_y;
+			    start_y > max_y + sc->syninfo.softbuttons_y;
 
 			center_button = MOUSE_BUTTON2DOWN;
 			center_x = sc->syninfo.softbutton2_x;