[xorg-x11-drv-synaptics/f20] Unset ClickPad for Cypress touchpads, they do everything in firmware, we

[Peter Hutterer]

commit 186850f487769e455eabed6ac0ac69f02f9baf0f
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Mar 21 08:00:50 2014 +1000

    Unset ClickPad for Cypress touchpads, they do everything in firmware, we
    
      can't compete with that. (fdo bug 76341 and 70819)

 50-synaptics.conf           |   12 ++++++++++++
 xorg-x11-drv-synaptics.spec |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/50-synaptics.conf b/50-synaptics.conf
index 691edc7..da86e17 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -34,6 +34,18 @@ Section "InputClass"
         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.
+# https://bugs.freedesktop.org/show_bug.cgi?id=70819
+# https://bugs.freedesktop.org/show_bug.cgi?id=76341
+Section "InputClass"
+        Identifier "Disable clickpad for CyPS/2 Cypress Trackpad"
+        MatchProduct "CyPS/2 Cypress Trackpad"
+        MatchDriver "synaptics"
+        Option "ClickPad" "off"
+EndSection
+
 # Some devices have the buttons as part of the lower edge of the
 # touchpad.  Pressing a button moves the cursor, causing cursor jumps and
 # erroneous clicks.
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index e907d0a..28acabc 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:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -135,6 +135,10 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Fri Mar 21 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.7.4-2
+- Unset ClickPad for Cypress touchpads, they do everything in firmware, we
+  can't compete with that. (fdo bug 76341 and 70819)
+
 * Wed Mar 12 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.7.4-1
 - synaptics 1.7.4