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

mi: functions here are carrying 'time' without need.

This commit is contained in:
Tiago Vignatti 2008-10-08 03:19:45 -03:00
parent 4964a9ca6c
commit d1bb5e3b47
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/getevents.c
View File

@ -916,7 +916,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
/* This takes care of crossing screens for us, as well as clipping /* This takes care of crossing screens for us, as well as clipping
* to the current screen. Right now, we only have one history buffer, * to the current screen. Right now, we only have one history buffer,
* so we don't set this for both the device and core.*/ * so we don't set this for both the device and core.*/
miPointerSetPosition(pDev, &pDev->last.valuators[0], &pDev->last.valuators[1], ms); miPointerSetPosition(pDev, &pDev->last.valuators[0], &pDev->last.valuators[1]);
if (master) { if (master) {
master->last.valuators[0] = pDev->last.valuators[0]; master->last.valuators[0] = pDev->last.valuators[0];

17
mi/mipointer.c
View File

@ -74,8 +74,7 @@ static Bool miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen,
Bool generateEvent); Bool generateEvent);
static Bool miPointerCloseScreen(int index, ScreenPtr pScreen); static Bool miPointerCloseScreen(int index, ScreenPtr pScreen);
static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen, static void miPointerMove(DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, int x, int y);
unsigned long time);
static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen); static Bool miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen);
static void miPointerDeviceCleanup(DeviceIntPtr pDev, static void miPointerDeviceCleanup(DeviceIntPtr pDev,
ScreenPtr pScreen); ScreenPtr pScreen);
@ -315,7 +314,7 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
if (GenerateEvent) if (GenerateEvent)
{ {
miPointerMove (pDev, pScreen, x, y, GetTimeInMillis()); miPointerMove (pDev, pScreen, x, y);
} }
else else
{ {
@ -457,13 +456,13 @@ miPointerGetScreen(DeviceIntPtr pDev)
_X_EXPORT void _X_EXPORT void
miPointerAbsoluteCursor (int x, int y, unsigned long time) miPointerAbsoluteCursor (int x, int y, unsigned long time)
{ {
miPointerSetPosition(inputInfo.pointer, &x, &y, time); miPointerSetPosition(inputInfo.pointer, &x, &y);
} }
/* Move the pointer on the current screen, and update the sprite. */ /* Move the pointer on the current screen, and update the sprite. */
static void static void
miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y, unsigned long time) int x, int y)
{ {
miPointerPtr pPointer; miPointerPtr pPointer;
SetupScreen(pScreen); SetupScreen(pScreen);
@ -489,7 +488,7 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen,
} }
_X_EXPORT void _X_EXPORT void
miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time) miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y)
{ {
miPointerScreenPtr pScreenPriv; miPointerScreenPtr pScreenPriv;
ScreenPtr pScreen; ScreenPtr pScreen;
@ -538,7 +537,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time)
pPointer->pScreen == pScreen) pPointer->pScreen == pScreen)
return; return;
miPointerMoved(pDev, pScreen, *x, *y, time); miPointerMoved(pDev, pScreen, *x, *y);
} }
_X_EXPORT void _X_EXPORT void
@ -549,12 +548,12 @@ miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y)
} }
void void
miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y, unsigned long time) miPointerMove (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
{ {
int i, nevents; int i, nevents;
int valuators[2]; int valuators[2];
miPointerMoved(pDev, pScreen, x, y, time); miPointerMoved(pDev, pScreen, x, y);
/* generate motion notify */ /* generate motion notify */
valuators[0] = x; valuators[0] = x;

3
mi/mipointer.h
View File

@ -149,8 +149,7 @@ extern void miPointerGetPosition(
extern void miPointerSetPosition( extern void miPointerSetPosition(
DeviceIntPtr pDev, DeviceIntPtr pDev,
int *x, int *x,
int *y, int *y);
unsigned long time);
extern void miPointerUpdateSprite( extern void miPointerUpdateSprite(
DeviceIntPtr pDev); DeviceIntPtr pDev);