mi: remove mi motion history
This is now unneeded as we do motion history in the DIX.
This commit is contained in:
parent
b9e180e632
commit
b1debebf8f
|
@ -191,8 +191,6 @@ _X_HIDDEN void *miLookupTab[] = {
|
||||||
SYMFUNC(miSegregateChildren)
|
SYMFUNC(miSegregateChildren)
|
||||||
SYMFUNC(miHookInitVisuals)
|
SYMFUNC(miHookInitVisuals)
|
||||||
SYMFUNC(miPointerAbsoluteCursor)
|
SYMFUNC(miPointerAbsoluteCursor)
|
||||||
SYMFUNC(miPointerGetMotionEvents)
|
|
||||||
SYMFUNC(miPointerGetMotionBufferSize)
|
|
||||||
SYMFUNC(miOverlayCopyUnderlay)
|
SYMFUNC(miOverlayCopyUnderlay)
|
||||||
SYMFUNC(miOverlaySetTransFunction)
|
SYMFUNC(miOverlaySetTransFunction)
|
||||||
SYMFUNC(miOverlayCollectUnderlayRegions)
|
SYMFUNC(miOverlayCollectUnderlayRegions)
|
||||||
|
|
|
@ -128,7 +128,6 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
|
||||||
miPointer.confined = FALSE;
|
miPointer.confined = FALSE;
|
||||||
miPointer.x = 0;
|
miPointer.x = 0;
|
||||||
miPointer.y = 0;
|
miPointer.y = 0;
|
||||||
miPointer.history_start = miPointer.history_end = 0;
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -267,39 +266,6 @@ miPointerWarpCursor (pScreen, x, y)
|
||||||
* Pointer/CursorDisplay interface routines
|
* Pointer/CursorDisplay interface routines
|
||||||
*/
|
*/
|
||||||
|
|
||||||
_X_EXPORT int
|
|
||||||
miPointerGetMotionBufferSize ()
|
|
||||||
{
|
|
||||||
return MOTION_SIZE;
|
|
||||||
}
|
|
||||||
|
|
||||||
_X_EXPORT int
|
|
||||||
miPointerGetMotionEvents (pPtr, coords, start, stop, pScreen)
|
|
||||||
DeviceIntPtr pPtr;
|
|
||||||
xTimecoord *coords;
|
|
||||||
unsigned long start, stop;
|
|
||||||
ScreenPtr pScreen;
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int count = 0;
|
|
||||||
miHistoryPtr h;
|
|
||||||
|
|
||||||
for (i = miPointer.history_start; i != miPointer.history_end;)
|
|
||||||
{
|
|
||||||
h = &miPointer.history[i];
|
|
||||||
if (h->event.time >= stop)
|
|
||||||
break;
|
|
||||||
if (h->event.time >= start)
|
|
||||||
{
|
|
||||||
*coords++ = h->event;
|
|
||||||
count++;
|
|
||||||
}
|
|
||||||
if (++i == MOTION_SIZE) i = 0;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* miPointerUpdate
|
* miPointerUpdate
|
||||||
*
|
*
|
||||||
|
@ -518,44 +484,4 @@ miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
|
||||||
if(!miPointer.pCursor->bits->emptyMask)
|
if(!miPointer.pCursor->bits->emptyMask)
|
||||||
(*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y);
|
(*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
miPointerUpdateHistory(pDev, pScreen, x, y, time);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The pointer has moved to x, y; update the motion history. */
|
|
||||||
void
|
|
||||||
miPointerUpdateHistory (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
|
|
||||||
unsigned long time)
|
|
||||||
{
|
|
||||||
miHistoryPtr history;
|
|
||||||
int prev, end, start;
|
|
||||||
|
|
||||||
miPointer.x = x;
|
|
||||||
miPointer.y = y;
|
|
||||||
miPointer.pScreen = pScreen;
|
|
||||||
|
|
||||||
end = miPointer.history_end;
|
|
||||||
start = miPointer.history_start;
|
|
||||||
prev = end - 1;
|
|
||||||
if (end == 0)
|
|
||||||
prev = MOTION_SIZE - 1;
|
|
||||||
history = &miPointer.history[prev];
|
|
||||||
if (end == start || history->event.time != time)
|
|
||||||
{
|
|
||||||
history = &miPointer.history[end];
|
|
||||||
if (++end == MOTION_SIZE)
|
|
||||||
end = 0;
|
|
||||||
if (end == start)
|
|
||||||
{
|
|
||||||
start = end + 1;
|
|
||||||
if (start == MOTION_SIZE)
|
|
||||||
start = 0;
|
|
||||||
miPointer.history_start = start;
|
|
||||||
}
|
|
||||||
miPointer.history_end = end;
|
|
||||||
}
|
|
||||||
history->event.x = x;
|
|
||||||
history->event.y = y;
|
|
||||||
history->event.time = time;
|
|
||||||
history->pScreen = pScreen;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,14 +181,6 @@ extern void miPointerMoved(
|
||||||
int y,
|
int y,
|
||||||
unsigned long time);
|
unsigned long time);
|
||||||
|
|
||||||
/* Updates the event history. */
|
|
||||||
extern void miPointerUpdateHistory(
|
|
||||||
DeviceIntPtr pDev,
|
|
||||||
ScreenPtr pScreen,
|
|
||||||
int x,
|
|
||||||
int y,
|
|
||||||
unsigned long time);
|
|
||||||
|
|
||||||
extern int miPointerScreenIndex;
|
extern int miPointerScreenIndex;
|
||||||
|
|
||||||
#endif /* MIPOINTER_H */
|
#endif /* MIPOINTER_H */
|
||||||
|
|
|
@ -32,13 +32,6 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include "mipointer.h"
|
#include "mipointer.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
|
||||||
#define MOTION_SIZE 256
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
xTimecoord event;
|
|
||||||
ScreenPtr pScreen;
|
|
||||||
} miHistoryRec, *miHistoryPtr;
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ScreenPtr pScreen; /* current screen */
|
ScreenPtr pScreen; /* current screen */
|
||||||
ScreenPtr pSpriteScreen;/* screen containing current sprite */
|
ScreenPtr pSpriteScreen;/* screen containing current sprite */
|
||||||
|
@ -48,8 +41,6 @@ typedef struct {
|
||||||
Bool confined; /* pointer can't change screens */
|
Bool confined; /* pointer can't change screens */
|
||||||
int x, y; /* hot spot location */
|
int x, y; /* hot spot location */
|
||||||
int devx, devy; /* sprite position */
|
int devx, devy; /* sprite position */
|
||||||
miHistoryRec history[MOTION_SIZE];
|
|
||||||
int history_start, history_end;
|
|
||||||
} miPointerRec, *miPointerPtr;
|
} miPointerRec, *miPointerPtr;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user