summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-11-06 10:52:55 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-11-06 10:52:55 +1000
commit3b9267e5a67a153675174818114e390e17c61f2d (patch)
tree05397f25f8a0fd0fd6c2f82ae7bdb06b2b32bbf7
parent0fc2679c4d148f9753e1964d7df8b00dc94401f6 (diff)
Drop edge speed from get_delta
Always 0 anyway, and the feature was purged in xf86-input-synaptics-1.6.0-8-g54f65f3 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/synaptics.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/synaptics.c b/src/synaptics.c
index e391a98..d0a6c48 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -2020,11 +2020,8 @@ static void
get_delta(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
enum EdgeType edge, double *dx, double *dy)
{
- double dtime = (hw->millis - HIST(0).millis) / 1000.0;
double integral;
double tmpf;
- int x_edge_speed = 0;
- int y_edge_speed = 0;
*dx = hw->x - HIST(0).x;
*dy = hw->y - HIST(0).y;
@@ -2039,10 +2036,10 @@ get_delta(SynapticsPrivate *priv, const struct SynapticsHwState *hw,
if (isnan(priv->frac_y))
priv->frac_y = 0;
- tmpf = *dx + x_edge_speed * dtime + priv->frac_x;
+ tmpf = *dx + priv->frac_x;
priv->frac_x = modf(tmpf, &integral);
*dx = integral;
- tmpf = *dy + y_edge_speed * dtime + priv->frac_y;
+ tmpf = *dy + priv->frac_y;
priv->frac_y = modf(tmpf, &integral);
*dy = integral;
}