summaryrefslogtreecommitdiff
path: root/render/animcur.c
diff options
context:
space:
mode:
Diffstat (limited to 'render/animcur.c')
-rw-r--r--render/animcur.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/render/animcur.c b/render/animcur.c
index 485c068fe..ebc5b8ef7 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -89,7 +89,7 @@ static DevPrivateKeyRec AnimCurScreenPrivateKeyRec;
#define Unwrap(as,s,elt) ((s)->elt = (as)->elt)
static Bool
-AnimCurCloseScreen(int index, ScreenPtr pScreen)
+AnimCurCloseScreen(ScreenPtr pScreen)
{
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
Bool ret;
@@ -103,7 +103,7 @@ AnimCurCloseScreen(int index, ScreenPtr pScreen)
Unwrap(as, pScreen, UnrealizeCursor);
Unwrap(as, pScreen, RecolorCursor);
SetAnimCurScreen(pScreen, 0);
- ret = (*pScreen->CloseScreen) (index, pScreen);
+ ret = (*pScreen->CloseScreen) (pScreen);
free(as);
return ret;
}
@@ -135,11 +135,9 @@ AnimCurCursorLimits(DeviceIntPtr pDev,
*/
static void
-AnimCurScreenBlockHandler(int screenNum,
- pointer blockData,
+AnimCurScreenBlockHandler(ScreenPtr pScreen,
pointer pTimeout, pointer pReadmask)
{
- ScreenPtr pScreen = screenInfo.screens[screenNum];
AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
DeviceIntPtr dev;
Bool activeDevice = FALSE;
@@ -183,7 +181,7 @@ AnimCurScreenBlockHandler(int screenNum,
AdjustWaitForDelay(pTimeout, soonest - now);
Unwrap(as, pScreen, BlockHandler);
- (*pScreen->BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
if (activeDevice)
Wrap(as, pScreen, BlockHandler, AnimCurScreenBlockHandler);
else