From 1c008e7e7865b405b8033f625333cd64ece4499e Mon Sep 17 00:00:00 2001 From: Simon Thum Date: Wed, 23 Feb 2011 02:29:35 +0100 Subject: [PATCH] dix: change all timestamps in pointer acceleration to CARD32 CARD32 is being returned by GetTimeInMilis(), so use it consistently. Signed-off-by: Simon Thum Signed-off-by: Peter Hutterer --- dix/ptrveloc.c | 4 ++-- include/input.h | 2 +- include/ptrveloc.h | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c index ed80af5d7..ccd445e86 100644 --- a/dix/ptrveloc.c +++ b/dix/ptrveloc.c @@ -1072,7 +1072,7 @@ void acceleratePointerPredictable( DeviceIntPtr dev, ValuatorMask* val, - int evtime) + CARD32 evtime) { float fdx, fdy, tmp, mult; /* no need to init */ int dx = 0, dy = 0, tmpi; @@ -1151,7 +1151,7 @@ void acceleratePointerLightweight( DeviceIntPtr dev, ValuatorMask* val, - int ignored) + CARD32 ignored) { float mult = 0.0, tmpf; int dx = 0, dy = 0, tmpi; diff --git a/include/input.h b/include/input.h index 165992a23..bdef0389e 100644 --- a/include/input.h +++ b/include/input.h @@ -145,7 +145,7 @@ typedef void (*DeviceUnwrapProc)( typedef void (*PointerAccelSchemeProc)( DeviceIntPtr /*device*/, ValuatorMask* /*valuators*/, - int /*evtime*/); + CARD32 /*evtime*/); typedef void (*DeviceCallbackProc)( DeviceIntPtr /*pDev*/); diff --git a/include/ptrveloc.h b/include/ptrveloc.h index a1165b156..c14e12d61 100644 --- a/include/ptrveloc.h +++ b/include/ptrveloc.h @@ -134,9 +134,11 @@ InitPredictableAccelerationScheme(DeviceIntPtr dev, struct _ValuatorAccelerationRec* protoScheme); extern _X_INTERNAL void -acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val, int evtime); +acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val, + CARD32 evtime); extern _X_INTERNAL void -acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val, int evtime); +acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val, + CARD32 evtime); #endif /* POINTERVELOCITY_H */