diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2011-04-01 15:21:35 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-04-04 09:41:56 +1000 |
| commit | 4aa16879bd5084f061a55e5b8a0754e1b037212a (patch) | |
| tree | cbf531c078fbf5079f40fb67e03371dd66fae56b | |
| parent | 2898098469457a0d7c3d3610065ccc75c46bdfa0 (diff) | |
Revert "Default to 2-finger emulation when HW supports it"
This changes the default behavior for trackpads that have only pressure
information to emulate two finger actions. It's been reported that the
default value is too low and/or that the pressure values may fluctuate
with environmental factors (temperature, humidity, etc.). When the
value is wrong, spurious right clicks and scroll events are triggered.
Fixes: http://bugs.launchpad.net/bugs/742213
This reverts commit ffa6dc2809734a6aaa690e9133d6761480603a68.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/synaptics.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 102a701..40cf6b9 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -450,18 +450,13 @@ static void set_default_parameters(InputInfoPtr pInfo) fingerLow = priv->minp + range * (25.0/256); fingerHigh = priv->minp + range * (30.0/256); fingerPress = priv->minp + range * 1.000; + emulateTwoFingerMinZ = priv->minp + range * (282.0/256); edgeMotionMinZ = priv->minp + range * (30.0/256); edgeMotionMaxZ = priv->minp + range * (160.0/256); pressureMotionMinZ = priv->minp + range * (30.0/256); pressureMotionMaxZ = priv->minp + range * (160.0/256); palmMinZ = priv->minp + range * (200.0/256); - /* Enable emulation when hw supports both pressure and width. */ - if (!priv->has_double && priv->has_width) - emulateTwoFingerMinZ = fingerHigh; - else - emulateTwoFingerMinZ = priv->minp + range * (282.0/256); - range = priv->maxw - priv->minw; /* scaling based on defaults below and a tool width of 16 */ |