summaryrefslogtreecommitdiff
path: root/mi/mipointer.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@benzedrine.nwnk.net>2007-03-25 17:56:32 -0400
committerAdam Jackson <ajax@benzedrine.nwnk.net>2007-03-25 17:56:32 -0400
commitaf769892a91c9af59de53ca3bcd77fc4967daffb (patch)
tree2c5086885337e8f52d7f571511a8174938b73ad2 /mi/mipointer.c
parent62224e39727fd6f1cf11a461983662f615a9fea1 (diff)
Static and dead code cleanup from mi/
Diffstat (limited to 'mi/mipointer.c')
-rw-r--r--mi/mipointer.c47
1 files changed, 21 insertions, 26 deletions
diff --git a/mi/mipointer.c b/mi/mipointer.c
index b94feaa91..b86a26a97 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -1,9 +1,4 @@
/*
- * mipointer.c
- */
-
-
-/*
Copyright 1989, 1998 The Open Group
@@ -409,6 +404,27 @@ miPointerAbsoluteCursor (int x, int y, unsigned long time)
miPointerSetPosition(inputInfo.pointer, &x, &y, time);
}
+/* Move the pointer on the current screen, and update the sprite. */
+static void
+miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
+ unsigned long time)
+{
+ SetupScreen(pScreen);
+
+ if (pDev && (pDev->coreEvents || pDev == inputInfo.pointer) &&
+ !pScreenPriv->waitForUpdate && pScreen == miPointer.pSpriteScreen)
+ {
+ miPointer.devx = x;
+ miPointer.devy = y;
+ if(!miPointer.pCursor->bits->emptyMask)
+ (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y);
+ }
+
+ miPointer.x = x;
+ miPointer.y = y;
+ miPointer.pScreen = pScreen;
+}
+
_X_EXPORT void
miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y, unsigned long time)
{
@@ -499,24 +515,3 @@ miPointerMove (ScreenPtr pScreen, int x, int y, unsigned long time)
for (i = 0; i < nevents; i++)
mieqEnqueue(inputInfo.pointer, &events[i]);
}
-
-/* Move the pointer on the current screen, and update the sprite. */
-void
-miPointerMoved (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y,
- unsigned long time)
-{
- SetupScreen(pScreen);
-
- if (pDev && (pDev->coreEvents || pDev == inputInfo.pointer) &&
- !pScreenPriv->waitForUpdate && pScreen == miPointer.pSpriteScreen)
- {
- miPointer.devx = x;
- miPointer.devy = y;
- if(!miPointer.pCursor->bits->emptyMask)
- (*pScreenPriv->spriteFuncs->MoveCursor) (pScreen, x, y);
- }
-
- miPointer.x = x;
- miPointer.y = y;
- miPointer.pScreen = pScreen;
-}