summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-04-20 11:13:16 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-04-20 11:13:16 +1000
commit5a176dc23d7dfb4648fef50ac0af144026b45078 (patch)
tree4b0987021d2e8b3af997df58dbb68262d8d2e3a9
parent0322d301844a7e78fc9aa4ec6493bf50bc7f926c (diff)
Don't release the button on TS_3 if TapAndDrag is disabled (#31854)
TS_3 is second tap down. Unconditionally set the button as down, later, in HandleTapProcessing we have the required conditions to reset it to TS_START and TBS_BUTTON_UP. Meanwhile, TBS_BUTTON_DOWN stays down, so the second tap is counted and sent as button event. This restores double-tapping if TapAndDrag is disabled. X.Org Bug 31854 <http://bugs.freedesktop.org/show_bug.cgi?id=31854> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/synaptics.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index 0de5c01..853bfa8 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1865,10 +1865,7 @@ SetTapState(SynapticsPrivate *priv, enum TapState tap_state, CARD32 millis)
priv->tap_button_state = TBS_BUTTON_UP;
break;
case TS_3:
- if (para->tap_and_drag_gesture)
- priv->tap_button_state = TBS_BUTTON_DOWN;
- else
- priv->tap_button_state = TBS_BUTTON_UP;
+ priv->tap_button_state = TBS_BUTTON_DOWN;
break;
case TS_SINGLETAP:
if (para->fast_taps)