[xorg-x11-drv-synaptics] Allow right softbuttons in dead area (#888051)

[Peter Hutterer]

commit 3a3d7118c9e211e470e6ab9aabd926d9071eeddb
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Dec 21 11:10:38 2012 +1000

    Allow right softbuttons in dead area (#888051)

 ...low-dead-areas-to-update-the-button-state.patch |   49 ++++++++++++++++++++
 xorg-x11-drv-synaptics.spec                        |    7 ++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/0001-Allow-dead-areas-to-update-the-button-state.patch b/0001-Allow-dead-areas-to-update-the-button-state.patch
new file mode 100644
index 0000000..08fbfa7
--- /dev/null
+++ b/0001-Allow-dead-areas-to-update-the-button-state.patch
@@ -0,0 +1,49 @@
+From eebb562e92349f428463b241f371b420c93b5081 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 21 Dec 2012 10:37:34 +1000
+Subject: [PATCH synaptics] Allow dead areas to update the button state
+
+On clickpads, a dead area helps prevent pointer movement when the buttons
+are pressed. Thus check for the button state before resetting the hw state
+in case we get a right-click in the soft button area.
+
+For clickfinger, the effect is that clickfinger events are now triggered if
+the finger rests in the dead area.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+(cherry picked from commit a5ac54f60af96b9b862425ccd8b6c7afaa4937e4)
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+
+Conflicts:
+	src/synaptics.c
+---
+ src/synaptics.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/synaptics.c b/src/synaptics.c
+index a28e984..56dc55b 100644
+--- a/src/synaptics.c
++++ b/src/synaptics.c
+@@ -3307,6 +3307,9 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
+ 
+     inside_active_area = is_inside_active_area(priv, hw->x, hw->y);
+ 
++    /* these two just update hw->left, right, etc. */
++    update_hw_button_state(pInfo, hw, priv->old_hw_state, now, &delay);
++
+     /* now we know that these _coordinates_ aren't in the area.
+        invalid are: x, y, z, numFingers, fingerWidth
+        valid are: millis, left/right/middle/up/down/etc.
+@@ -3318,8 +3321,6 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
+          * really release, the finger should remain down. */
+     }
+ 
+-    /* these two just update hw->left, right, etc. */
+-    update_hw_button_state(pInfo, hw, priv->old_hw_state, now, &delay);
+     if (priv->has_scrollbuttons)
+         double_click = adjust_state_from_scrollbuttons(pInfo, hw);
+ 
+-- 
+1.8.0.2
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 27f8e77..8280d47 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.6.2
-Release:        7%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        8%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -25,6 +25,7 @@ Source4:        70-touchpad-quirks.rules
 
 Patch01:        0001-Use-LogMessageVerbSigSafe-on-ABI-18.patch
 Patch02:        0001-Reset-num_active_touches-on-DeviceOff-52496.patch
+Patch03:        0001-Allow-dead-areas-to-update-the-button-state.patch
 
 ExcludeArch:    s390 s390x %{?rhel:ppc ppc64}
 
@@ -85,6 +86,7 @@ Features:
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -141,6 +143,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Fri Dec 21 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.6.2-8
+- Allow right softbuttons in dead area (#888051)
+
 * Wed Oct 31 2012 Peter Hutterer <peter.hutterer at redhat.com> - 1.6.2-7
 - Fix %{?dist} tag