frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: change all timestamps in pointer acceleration to CARD32 

CARD32 is being returned by GetTimeInMilis(), so use it consistently.

Signed-off-by: Simon Thum <simon.thum@gmx.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Simon Thum 2011-02-23 02:29:35 +01:00 committed by Peter Hutterer
parent a4b8526185
commit 1c008e7e78
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/ptrveloc.c
View File

@ -1072,7 +1072,7 @@ void
acceleratePointerPredictable( acceleratePointerPredictable(
DeviceIntPtr dev, DeviceIntPtr dev,
ValuatorMask* val, ValuatorMask* val,
int evtime) CARD32 evtime)
{ {
float fdx, fdy, tmp, mult; /* no need to init */ float fdx, fdy, tmp, mult; /* no need to init */
int dx = 0, dy = 0, tmpi; int dx = 0, dy = 0, tmpi;
@ -1151,7 +1151,7 @@ void
acceleratePointerLightweight( acceleratePointerLightweight(
DeviceIntPtr dev, DeviceIntPtr dev,
ValuatorMask* val, ValuatorMask* val,
int ignored) CARD32 ignored)
{ {
float mult = 0.0, tmpf; float mult = 0.0, tmpf;
int dx = 0, dy = 0, tmpi; int dx = 0, dy = 0, tmpi;

2
include/input.h
View File

@ -145,7 +145,7 @@ typedef void (*DeviceUnwrapProc)(
typedef void (*PointerAccelSchemeProc)( typedef void (*PointerAccelSchemeProc)(
DeviceIntPtr /*device*/, DeviceIntPtr /*device*/,
ValuatorMask* /*valuators*/, ValuatorMask* /*valuators*/,
int /*evtime*/); CARD32 /*evtime*/);
typedef void (*DeviceCallbackProc)( typedef void (*DeviceCallbackProc)(
DeviceIntPtr /*pDev*/); DeviceIntPtr /*pDev*/);

6
include/ptrveloc.h
View File

@ -134,9 +134,11 @@ InitPredictableAccelerationScheme(DeviceIntPtr dev,
struct _ValuatorAccelerationRec* protoScheme); struct _ValuatorAccelerationRec* protoScheme);
extern _X_INTERNAL void extern _X_INTERNAL void
acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val, int evtime); acceleratePointerPredictable(DeviceIntPtr dev, ValuatorMask* val,
CARD32 evtime);
extern _X_INTERNAL void extern _X_INTERNAL void
acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val, int evtime); acceleratePointerLightweight(DeviceIntPtr dev, ValuatorMask* val,
CARD32 evtime);
#endif /* POINTERVELOCITY_H */ #endif /* POINTERVELOCITY_H */