[xorg-x11-drv-synaptics/f20] Add topbuttons quirk for Thinkpad Edge E341 (#1089689)

[Hans de Goede]

commit 7ae37ff44428516f94eb34869131e2509bc8812d
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Tue Apr 22 10:01:41 2014 +0200

    Add topbuttons quirk for Thinkpad Edge E341 (#1089689)

 ...t-tripletap-click-as-3-fingerclick-on-pad.patch |   24 ++++++++++++++++++++
 50-synaptics.conf                                  |   11 +--------
 70-touchpad-quirks.rules                           |    5 ++-
 xorg-x11-drv-synaptics.spec                        |    5 +++-
 4 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/0001-Always-count-tripletap-click-as-3-fingerclick-on-pad.patch b/0001-Always-count-tripletap-click-as-3-fingerclick-on-pad.patch
index 4b9c795..3cd5f86 100644
--- a/0001-Always-count-tripletap-click-as-3-fingerclick-on-pad.patch
+++ b/0001-Always-count-tripletap-click-as-3-fingerclick-on-pad.patch
@@ -1,3 +1,27 @@
+From 0791cec5d0e0e6f7dfc18735ad12cbcb10551ce8 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Fri, 11 Apr 2014 15:15:09 +0200
+Subject: [PATCH xf86-input-synaptics] Always count tripletap + click as 3
+ fingerclick on pads with < 3 touches
+
+When trying to do a 3 fingerclick on a touchpad which only tracks 2 touches,
+this may register as a 3 or 2 fingerclick depending on the order in which
+the touchpad detects the fingers. If the 2 outer fingers of the 3 get seen
+first, then the 2 touches will be too far apart for the heuristic to see
+them as being close together, and the click gets counted as a 2 finger click.
+
+A user will likely never do a 2 finger click with a 3th finger resting
+somewhere else on the pad, where-as the above misdetection of the clicks is
+a real issue, so simply always count a click with trippletap set as a
+3 finger click on pads which track less then 3 touches.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1086218
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/synaptics.c | 25 +++++--------------------
+ 1 file changed, 5 insertions(+), 20 deletions(-)
+
 diff -up xf86-input-synaptics-1.7.4/src/synaptics.c.orig xf86-input-synaptics-1.7.4/src/synaptics.c
 --- xf86-input-synaptics-1.7.4/src/synaptics.c.orig	2014-04-11 21:26:55.308988916 +0200
 +++ xf86-input-synaptics-1.7.4/src/synaptics.c	2014-04-11 21:28:41.349076981 +0200
diff --git a/50-synaptics.conf b/50-synaptics.conf
index b784593..b670a51 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -25,15 +25,6 @@ EndSection
 
 # Quirks for special touchpads
 
-# Force clickpad on for wireless trackpad. The propbit isn't set on 3.3.
-# Remove once we're on 3.4
-Section "InputClass"
-        Identifier "Disable clickpad buttons on Apple touchpads"
-        MatchProduct "Apple Wireless Trackpad"
-        MatchDriver "synaptics"
-        Option "ClickPad" "on"
-EndSection
-
 # The Cypress touchpads provide BTN_RIGHT in firmware, together with
 # clickfinger, and two-finger scrolling. Disable Clickpads, otherwise we
 # get flaky button behaviour.
@@ -65,7 +56,7 @@ EndSection
 
 # Some devices have the buttons on the top of the touchpad. For those, set
 # the secondary button area to exactly that.
-# Affected: Lenovo T440, T540, X240, Helix, Yoga
+# Affected: All Haswell Lenovos and *431* models
 #
 # Note the touchpad_softbutton_top tag is a temporary solution, we're working
 # on a more permanent solution upstream (likely adding INPUT_PROP_TOPBUTTONPAD)
diff --git a/70-touchpad-quirks.rules b/70-touchpad-quirks.rules
index fc84ce6..4eea99b 100644
--- a/70-touchpad-quirks.rules
+++ b/70-touchpad-quirks.rules
@@ -13,11 +13,12 @@ ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
   ENV{ID_INPUT.tags}="touchpad_button_overlap"
 
 ATTR{[dmi/id]product_version}=="ThinkPad X240*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
+ATTR{[dmi/id]product_version}=="ThinkPad Edge E431*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad T431*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
-ATTR{[dmi/id]product_version}=="ThinkPad T440*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad L440*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
-ATTR{[dmi/id]product_version}=="ThinkPad T540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
+ATTR{[dmi/id]product_version}=="ThinkPad T440*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad L540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
+ATTR{[dmi/id]product_version}=="ThinkPad T540*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad Helix*" ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad S1 Yoga", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
 ATTR{[dmi/id]product_version}=="ThinkPad X1 Carbon 2nd*", ENV{ID_INPUT.tags}="touchpad_softbutton_top"
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 04327ce..226ca4d 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.4
-Release:        8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -157,6 +157,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Tue Apr 22 2014 Hans de Goede <hdegoede at redhat.com> - 1.7.4-9
+- Add topbuttons quirk for Thinkpad Edge E341 (#1089689)
+
 * Fri Apr 18 2014 Hans de Goede <hdegoede at redhat.com> - 1.7.4-8
 - Add L540 to 70-touchpad-quirks.rules as touchpad_softbutton_top (#1088588)