diff options
| author | Simon Thum <simon.thum@gmx.de> | 2009-04-08 14:35:01 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-04-10 13:49:51 +1000 |
| commit | 06aebecb19dd9d90d73b742a09b6068b862f1d05 (patch) | |
| tree | bf2e21ce4b24432e5743b52329385fb106270950 | |
| parent | 98f4179156391752e6688339487458ad7828abf4 (diff) | |
dix: fix pointer accelerations remainder handling
This didn't really work as intended, but did amazingly well thanks
to roundf() hiding the defect. Cheers!
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/ptrveloc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index a3a04512f..fc1d1210b 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -950,7 +950,7 @@ acceleratePointerPredictable( int *px = NULL, *py = NULL; DeviceVelocityPtr velocitydata = (DeviceVelocityPtr) pDev->valuator->accelScheme.accelData; - float fdx, fdy; /* no need to init */ + float fdx, fdy, tmp; /* no need to init */ Bool soften = TRUE; if (!num_valuators || !valuators || !velocitydata) @@ -991,14 +991,14 @@ acceleratePointerPredictable( (mult > 1.0) && soften); if (dx) { - pDev->last.remainder[0] = roundf(mult * fdx + pDev->last.remainder[0]); - *px = (int)pDev->last.remainder[0]; - pDev->last.remainder[0] = pDev->last.remainder[0] - (float)*px; + tmp = mult * fdx + pDev->last.remainder[0]; + *px = (int)roundf(tmp); + pDev->last.remainder[0] = tmp - (float)*px; } if (dy) { - pDev->last.remainder[1] = roundf(mult * fdy + pDev->last.remainder[1]); - *py = (int)pDev->last.remainder[1]; - pDev->last.remainder[1] = pDev->last.remainder[1] - (float)*py; + tmp = mult * fdy + pDev->last.remainder[1]; + *py = (int)roundf(tmp); + pDev->last.remainder[1] = tmp - (float)*py; } } } |