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

dix: remove XineramaChangeToCursor. 

It's nearly identical to ChangeToCursor now anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-01-30 16:37:19 +10:00
parent 942eae6868
commit 34820f9c13
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dix/events.c
View File

@ -550,24 +550,6 @@ XineramaConfineCursorToWindow(DeviceIntPtr pDev,
CheckPhysLimits(pDev, pSprite->current, generateEvents, FALSE, NULL); CheckPhysLimits(pDev, pSprite->current, generateEvents, FALSE, NULL);
} }
static void
XineramaChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
{
SpritePtr pSprite = pDev->spriteInfo->sprite;
if (cursor != pSprite->current)
{
if ((pSprite->current->bits->xhot != cursor->bits->xhot) ||
(pSprite->current->bits->yhot != cursor->bits->yhot))
CheckPhysLimits(pDev, cursor, FALSE, FALSE, NULL);
(*pSprite->screen->DisplayCursor)(pDev, pSprite->screen, cursor);
FreeCursor(pSprite->current, (Cursor)0);
pSprite->current = cursor;
pSprite->current->refcnt++;
}
}
#else #else
#define SyntheticMotion(dev, x, y) \ #define SyntheticMotion(dev, x, y) \
PostSyntheticMotion(dev, x, y, \ PostSyntheticMotion(dev, x, y, \
@ -849,13 +831,7 @@ static void
ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor) ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
{ {
SpritePtr pSprite = pDev->spriteInfo->sprite; SpritePtr pSprite = pDev->spriteInfo->sprite;
ScreenPtr pScreen;
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaChangeToCursor(pDev, cursor);
return;
}
#endif
if (cursor != pSprite->current) if (cursor != pSprite->current)
{ {
@ -863,9 +839,15 @@ ChangeToCursor(DeviceIntPtr pDev, CursorPtr cursor)
(pSprite->current->bits->yhot != cursor->bits->yhot)) (pSprite->current->bits->yhot != cursor->bits->yhot))
CheckPhysLimits(pDev, cursor, FALSE, pSprite->confined, CheckPhysLimits(pDev, cursor, FALSE, pSprite->confined,
(ScreenPtr)NULL); (ScreenPtr)NULL);
(*pSprite->hotPhys.pScreen->DisplayCursor) (pDev, #ifdef PANORAMIX
pSprite->hotPhys.pScreen, /* XXX: is this really necessary?? (whot) */
cursor); if (!noPanoramiXExtension)
pScreen = pSprite->screen;
else
#endif
pScreen = pSprite->hotPhys.pScreen;
(*pScreen->DisplayCursor)(pDev, pScreen, cursor);
FreeCursor(pSprite->current, (Cursor)0); FreeCursor(pSprite->current, (Cursor)0);
pSprite->current = cursor; pSprite->current = cursor;
pSprite->current->refcnt++; pSprite->current->refcnt++;