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

mi: don't try to display a cursor for devices w/o cursors.

This commit is contained in:
Peter Hutterer 2008-05-12 20:05:43 +09:30
parent 248a1df634
commit 913989d643
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mi/mipointer.c
View File

@ -199,6 +199,11 @@ miPointerDisplayCursor (pDev, pScreen, pCursor)
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
return FALSE; return FALSE;
/* return for keyboards */
if ((pDev->isMaster && !DevHasCursor(pDev)) ||
(!pDev->isMaster && pDev->u.master && !DevHasCursor(pDev->u.master)))
return;
pPointer = MIPOINTER(pDev); pPointer = MIPOINTER(pDev);
pPointer->pCursor = pCursor; pPointer->pCursor = pCursor;
@ -449,7 +454,7 @@ miPointerUpdateSprite (DeviceIntPtr pDev)
else if (pPointer->pCursor != pPointer->pSpriteCursor) else if (pPointer->pCursor != pPointer->pSpriteCursor)
{ {
pCursor = pPointer->pCursor; pCursor = pPointer->pCursor;
if (pCursor->bits->emptyMask && !pScreenPriv->showTransparent) if (!pCursor || (pCursor->bits->emptyMask && !pScreenPriv->showTransparent))
pCursor = NullCursor; pCursor = NullCursor;
(*pScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, pCursor, x, y); (*pScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, pCursor, x, y);
@ -461,7 +466,7 @@ miPointerUpdateSprite (DeviceIntPtr pDev)
{ {
pPointer->devx = x; pPointer->devx = x;
pPointer->devy = y; pPointer->devy = y;
if(!pPointer->pCursor->bits->emptyMask) if(pPointer->pCursor && !pPointer->pCursor->bits->emptyMask)
(*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y); (*pScreenPriv->spriteFuncs->MoveCursor) (pDev, pScreen, x, y);
} }
} }