[xorg-x11-drv-synaptics] Match for T440s and move the softbuttons to the top of the touchpad (#1035469)

[Peter Hutterer]

commit bb99d998428512589d50f2be641ccf006d0df4c5
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Dec 12 14:18:57 2013 +1000

    Match for T440s and move the softbuttons to the top of the touchpad (#1035469)

 50-synaptics.conf           |   10 ++++++++++
 70-touchpad-quirks.rules    |    3 +++
 xorg-x11-drv-synaptics.spec |    6 +++++-
 3 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/50-synaptics.conf b/50-synaptics.conf
index 7f022bc..691edc7 100644
--- a/50-synaptics.conf
+++ b/50-synaptics.conf
@@ -46,3 +46,13 @@ Section "InputClass"
         MatchTag "touchpad_button_overlap"
         Option "AreaBottomEdge" "4000"
 EndSection
+
+# Some devices have the buttons on the top of the touchpad. For those, set
+# the touchpad buttons to exactly that.
+# Affected: Lenovo T440
+Section "InputClass"
+        Identifier "touchpad buttons on top"
+        MatchIsTouchpad "on"
+        MatchTag "touchpad_softbutton_top"
+        Option "SoftButtonAreas" "60% 0 0 0 40% 60% 0 0"
+EndSection
diff --git a/70-touchpad-quirks.rules b/70-touchpad-quirks.rules
index 6c65c29..31fa0cb 100644
--- a/70-touchpad-quirks.rules
+++ b/70-touchpad-quirks.rules
@@ -12,4 +12,7 @@ ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="touchpad_quirks_end"
 ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \
   ENV{ID_INPUT.tags}="touchpad_button_overlap"
 
+ATTR{[dmi/id]product_version}=="*T440*", \
+  ENV{ID_INPUT.tags}="touchpad_softbutton_top"
+
 LABEL="touchpad_quirks_end"
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 65170fb..6e2eb97 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.2
-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
@@ -135,6 +135,10 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Thu Dec 12 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.7.2-3
+- Match for T440s and move the softbuttons to the top of the touchpad
+  (#1035469)
+
 * Mon Dec 09 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.7.2-2
 - Drop the patch now merged upstream