summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-09 16:56:29 -0800
committerChase Douglas <chase.douglas@canonical.com>2012-02-11 20:21:35 +0100
commit345de6fb3333f92cade1920e20ca9151307fa1b4 (patch)
tree9fdba7a4052e4562d08f1071ac550bb247cdf561
parent7fae09d60ae0ed888a639ccaed6c7a111c9daeed (diff)
Ignore motion during touch count changes on semi-mt devicesclickpad-synaptics-ubuntu
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--src/synaptics.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index c9be7b6..a74f7a6 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1435,6 +1435,14 @@ ReadInput(InputInfoPtr pInfo)
SynapticsResetTouchHwState(hw);
while (SynapticsGetHwState(pInfo, priv, hw)) {
+ /* Semi-mt device touch slots do not track touches. When there is a
+ * change in the number of touches, we must disregard the temporary
+ * motion changes. */
+ if (priv->has_semi_mt && hw->numFingers != priv->hwState->numFingers) {
+ hw->cumulative_dx = priv->hwState->cumulative_dx;
+ hw->cumulative_dy = priv->hwState->cumulative_dy;
+ }
+
SynapticsCopyHwState(priv->hwState, hw);
delay = HandleState(pInfo, hw, hw->millis, FALSE);
newDelay = TRUE;