[xorg-x11-drv-synaptics] Upstream git snapshot, includes better handling for the LEN0034 touchpads

[Peter Hutterer]

commit 94fe78d504ae422cf89d693da06afaaf6f685eb7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Feb 26 15:16:32 2014 +1000

    Upstream git snapshot, includes better handling for the LEN0034 touchpads
    
      in the T440, T540, x240, etc. series.
    - Update .conf file with a PnP match rule. Won't take effect just yet until
      we have the matching kernel and server patch in place though

 .gitignore                  |    1 +
 50-synaptics.conf           |   19 ++++++++++++++++++-
 commitid                    |    2 +-
 sources                     |    2 +-
 xorg-x11-drv-synaptics.spec |   14 ++++++++++----
 5 files changed, 31 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16e530d..44e5c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ xf86-input-synaptics-20100823.tar.bz2
 /xf86-input-synaptics-1.7.1.tar.bz2
 /xf86-input-synaptics-1.7.2.tar.bz2
 /xf86-input-synaptics-1.7.3.tar.bz2
+/xf86-input-synaptics-20140226.tar.bz2
diff --git a/50-synaptics.conf b/50-synaptics.conf
index 691edc7..5fa6d29 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -49,10 +49,27 @@ EndSection
 
 # Some devices have the buttons on the top of the touchpad. For those, set
 # the touchpad buttons to exactly that.
-# Affected: Lenovo T440
+# Affected: Lenovo T440, T540, x240, ...
 Section "InputClass"
         Identifier "touchpad buttons on top"
         MatchIsTouchpad "on"
         MatchTag "touchpad_softbutton_top"
         Option "SoftButtonAreas" "60% 0 0 0 40% 60% 0 0"
 EndSection
+
+# FIXME: This config below requires a kernel fix to expose the device's PnPID
+# correctly https://lkml.org/lkml/2014/2/23/63, and an Xserver fix to
+# actually find that PNPID. So for now, leave the above snippet in place as well
+# so we have something for those who haven't updated everything yet.
+Section "InputClass"
+        Identifier "Lenovo 40 series top buttons custom"
+        MatchDriver "synaptics"
+        MatchPnPID  "LEN0034*"
+        # WARNING: these devices are affected by a kernel bug that
+        # provides us with wrong min/max ranges. So we can't use percentages
+        # here and instead hardcode some range that seems sensible for now.
+        # Do not copy this into your custom file, wait for the kernel bug to be
+        # fixed and use percentages
+        Option "SoftButtonAreas" "3251 0 4390 0 2950 3250 4390 0"
+        Option "SecondarySoftButtonAreas" "3251 0 0 2270 2950 3250 0 2270"
+EndSection
diff --git a/commitid b/commitid
index 334a889..65d68fb 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-4cdee40054b2d6e222a7efb427f0f35479c04ec3
+bbe4c56c4998a90b478581a4d93717251d8e05be
diff --git a/sources b/sources
index dd5550b..a27abea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74c83e6cb53a0e15bcbe7cc73d63d2a1  xf86-input-synaptics-1.7.3.tar.bz2
+810693c0cc1691384f45cc0998f36ea9  xf86-input-synaptics-20140226.tar.bz2
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 9b98186..eb1ad87 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -2,13 +2,13 @@
 %global moduledir %(pkg-config xorg-server --variable=moduledir )
 %global driverdir %{moduledir}/input
 
-#global gitdate 20130214
-%global gitversion 4cdee4005
+%global gitdate 20140226
+%global gitversion bbe4c56c4
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.7.3
-Release:        2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:        1.7.99
+Release:        1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -135,6 +135,12 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Wed Feb 26 2014 Peter Hutterer <peter.hutterer at redhat.com>  1.7.99-1.20140226gitbbe4c56c4
+- Upstream git snapshot, includes better handling for the LEN0034 touchpads
+  in the T440, T540, x240, etc. series.
+- Update .conf file with a PnP match rule. Won't take effect just yet until
+  we have the matching kernel and server patch in place though
+
 * Mon Jan 13 2014 Adam Jackson <ajax at redhat.com> - 1.7.3-2
 - 1.15 ABI rebuild