hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

Remove UndisplayCursor API.

Browse source 
We can achieve the same thing by simply displaying a NullCursor, there's no
need for a separate API.
This commit is contained in:
Peter Hutterer 2008-05-12 20:14:05 +09:30
commit 1fc1a2897e
6 changed files with 3 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mi/mipointer.c
View file

@ -60,7 +60,6 @@ static Bool miPointerUnrealizeCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor);
static Bool miPointerDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor);
static void miPointerUndisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen);
static void miPointerConstrainCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
BoxPtr pBox);
static void miPointerPointerNonInterestBox(DeviceIntPtr pDev,
@ -113,8 +112,6 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate)
pScreen->ConstrainCursor = miPointerConstrainCursor;
pScreen->CursorLimits = miPointerCursorLimits;
pScreen->DisplayCursor = miPointerDisplayCursor;
pScreen->UndisplayCursor = miPointerUndisplayCursor;
pScreen->UndisplayCursor = miPointerUndisplayCursor;
pScreen->RealizeCursor = miPointerRealizeCursor;
pScreen->UnrealizeCursor = miPointerUnrealizeCursor;
pScreen->SetCursorPosition = miPointerSetCursorPosition;
@ -212,16 +209,6 @@ miPointerDisplayCursor (pDev, pScreen, pCursor)
return TRUE;
}
static void
miPointerUndisplayCursor(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{
SetupScreen(pScreen);
if (pDev->isMaster && pDev->spriteInfo->spriteOwner)
(*pScreenPriv->spriteFuncs->UndisplayCursor)(pDev, pScreen);
}
static void
miPointerConstrainCursor (pDev, pScreen, pBox)
DeviceIntPtr pDev;

4
mi/mipointer.h
View file

@ -62,10 +62,6 @@ typedef struct _miPointerSpriteFuncRec {
DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */
);
void (*UndisplayCursor)(
DeviceIntPtr /* pDev */,
ScreenPtr /* pScr */
);
} miPointerSpriteFuncRec, *miPointerSpriteFuncPtr;
typedef struct _miPointerScreenFuncRec {

19
mi/misprite.c
View file

@ -125,7 +125,6 @@ static void miSpriteSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, int x, int y);
static void miSpriteMoveCursor(DeviceIntPtr pDev, ScreenPtr pScreen,
int x, int y);
static void miSpriteUndisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen);
_X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
miSpriteRealizeCursor,
@ -134,7 +133,6 @@ _X_EXPORT miPointerSpriteFuncRec miSpritePointerFuncs = {
miSpriteMoveCursor,
miSpriteDeviceCursorInitialize,
miSpriteDeviceCursorCleanup,
miSpriteUndisplayCursor
};
/*
@ -911,23 +909,6 @@ miSpriteDeviceCursorCleanup(pDev, pScreen)
}
}
static void
miSpriteUndisplayCursor(pDev, pScreen)
DeviceIntPtr pDev;
ScreenPtr pScreen;
{
miCursorInfoPtr pCursorInfo;
if (!pDev->isMaster && !pDev->u.master)
{
ErrorF("[mi] miSpriteUndisplayCursor called for floating device.\n");
return;
}
pCursorInfo = MISPRITE(pDev);
if (pCursorInfo && pCursorInfo->isUp)
miSpriteRemoveCursor(pDev, pScreen);
}
/*
* undraw/draw cursor
*/