[xorg-x11-drv-synaptics/f20] Increase top software button area for easier clicks

[Peter Hutterer]

commit 6cd8fab74a1ff9884305b57b254d3049a6db7b74
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Aug 28 10:30:20 2014 +1000

    Increase top software button area for easier clicks
    
    - Prevent two-finger taps from being ignored

 ...f-increase-top-software-button-area-to-15.patch |   40 ++++++++++++++++++++
 ...revent-two-finger-taps-from-being-ignored.patch |   38 +++++++++++++++++++
 xorg-x11-drv-synaptics.spec                        |    9 ++++-
 3 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/0001-conf-increase-top-software-button-area-to-15.patch b/0001-conf-increase-top-software-button-area-to-15.patch
new file mode 100644
index 0000000..80bfc91
--- /dev/null
+++ b/0001-conf-increase-top-software-button-area-to-15.patch
@@ -0,0 +1,40 @@
+From e57b219a8c3b70433988f0b894a182cee0ef5736 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 6 Aug 2014 12:04:14 +1000
+Subject: [PATCH synaptics 1/2] conf: increase top software button area to 15%
+
+We had reports that the top software button area is hard to hit for those
+using the trackpoint and clicking the buttons with their thumb.
+
+Analysis of event recordings (3 different people) for left, right and middle
+clicks shows that there is a significant amount of events up to about 10mm
+(with outliers up to 12mm) from the top of the touchpad. That maps to 15%.
+
+Interestingly, the middle button does not seem to need this, presumably the
+haptic feedback of the little dots sticking out from the surface make hitting
+the button easier. Its size is increased to 15% anyway, for simplicity and
+because a sample set of 3 is too small to be definitive about this.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+Reviewed-by: Hans de Goede <hdegoede at redhat.com>
+(cherry picked from commit 730101223432f60397c61f74a5e6789b3ee34ecd)
+---
+ conf/50-synaptics.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/50-synaptics.conf b/conf/50-synaptics.conf
+index a3145b8..aa50456 100644
+--- a/conf/50-synaptics.conf
++++ b/conf/50-synaptics.conf
+@@ -33,7 +33,7 @@ Section "InputClass"
+         Identifier "Default clickpad buttons"
+         MatchDriver "synaptics"
+         Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0"
+-        Option "SecondarySoftButtonAreas" "58% 0 0 8% 42% 58% 0 8%"
++        Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%"
+ EndSection
+ 
+ # This option disables software buttons on Apple touchpads.
+-- 
+1.9.3
+
diff --git a/0002-Prevent-two-finger-taps-from-being-ignored.patch b/0002-Prevent-two-finger-taps-from-being-ignored.patch
new file mode 100644
index 0000000..a9db22c
--- /dev/null
+++ b/0002-Prevent-two-finger-taps-from-being-ignored.patch
@@ -0,0 +1,38 @@
+From a028ceb894ca3959dd32d83bc8226b5b0b05f9df Mon Sep 17 00:00:00 2001
+From: Gabriele Mazzotta <gabriele.mzt at gmail.com>
+Date: Sun, 27 Jul 2014 12:58:18 +0200
+Subject: [PATCH synaptics 2/2] Prevent two-finger taps from being ignored
+
+When two fingers are used, the coordinates of only one of them is taken into
+account. This can lead to sudden variations of the absolute coordinates when
+two-fingers taps are performed if the finger considered changes.
+
+Take into account coordinates variations to prevent unwanted taps only if
+the number of fingers doesn't change.
+
+Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit 7d0ff39519e4d3760722b914883bee276035061c)
+---
+ src/synaptics.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index a8784f9..8a51754 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -1945,8 +1945,9 @@ HandleTapProcessing(SynapticsPrivate * priv, struct SynapticsHwState *hw,
+             (priv->tap_max_fingers <=
+              ((priv->horiz_scroll_twofinger_on ||
+                priv->vert_scroll_twofinger_on) ? 2 : 1)) &&
+-            ((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
+-             (abs(hw->y - priv->touch_on.y) >= para->tap_move)));
++            (priv->prevFingers == hw->numFingers &&
++             ((abs(hw->x - priv->touch_on.x) >= para->tap_move) ||
++              (abs(hw->y - priv->touch_on.y) >= para->tap_move))));
+     press = (hw->left || hw->right || hw->middle);
+ 
+     if (touch) {
+-- 
+1.9.3
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 08eeea9..cf86266 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,7 +8,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.7.6
-Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -23,6 +23,9 @@ Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.
 Source3:        50-synaptics.conf
 Source4:        70-touchpad-quirks.rules
 
+Patch01:        0001-conf-increase-top-software-button-area-to-15.patch
+Patch02:        0002-Prevent-two-finger-taps-from-being-ignored.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  autoconf automake libtool pkgconfig
@@ -128,6 +131,10 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Thu Aug 28 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.7.6-3
+- Increase top software button area for easier clicks
+- Prevent two-finger taps from being ignored
+
 * Wed May 14 2014 Hans de Goede <hdegoede at redhat.com> - 1.7.6-2
 - Set Option "HasSecondarySoftButtons" "on" in 50-synaptics.conf for devices
   with the touchpad_softbutton_top udev quirk, to keep topbuttons working on