diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 09:32:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 09:32:42 +0000 |
| commit | 0afd2d366de6470b72f0d305643be9afd8cc461d (patch) | |
| tree | 9363104b0080ddd001256d1b3a0eceae078f13a0 /xorg-server/mi/misprite.c | |
| parent | 6412df1b3df28c6213b43821c4a98cc3857d9a3f (diff) | |
| download | vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.tar.gz vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.tar.bz2 vcxsrv-0afd2d366de6470b72f0d305643be9afd8cc461d.zip | |
git update 16/4/2010
Diffstat (limited to 'xorg-server/mi/misprite.c')
| -rw-r--r-- | xorg-server/mi/misprite.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c index 2ec67827e..ac025e1ff 100644 --- a/xorg-server/mi/misprite.c +++ b/xorg-server/mi/misprite.c @@ -765,10 +765,8 @@ miSpriteRealizeCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor) pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteRealizeCursor called for floating device.\n"); return FALSE; - } + pCursorInfo = MISPRITE(pDev); if (pCursor == pCursorInfo->pCursor) @@ -796,10 +794,8 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen, pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteSetCursor called for floating device.\n"); return; - } + pPointer = MISPRITE(pDev); if (!pCursor) @@ -913,10 +909,8 @@ miSpriteMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteMoveCursor called for floating device.\n"); return; - } + pCursor = MISPRITE(pDev)->pCursor; miSpriteSetCursor (pDev, pScreen, pCursor, x, y); @@ -981,10 +975,8 @@ miSpriteRemoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen) if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteRemoveCursor called for floating device.\n"); return; - } + DamageDrawInternal (pScreen, TRUE); pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pCursorInfo = MISPRITE(pDev); @@ -1021,10 +1013,8 @@ miSpriteSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen) miCursorInfoPtr pCursorInfo; if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteSaveUnderCursor called for floating device.\n"); return; - } + DamageDrawInternal (pScreen, TRUE); pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pCursorInfo = MISPRITE(pDev); @@ -1064,10 +1054,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen) miCursorInfoPtr pCursorInfo; if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteRestoreCursor called for floating device.\n"); return; - } DamageDrawInternal (pScreen, TRUE); pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); @@ -1108,10 +1095,8 @@ miSpriteComputeSaved (DeviceIntPtr pDev, ScreenPtr pScreen) miCursorInfoPtr pCursorInfo; if (!IsMaster(pDev) && !pDev->u.master) - { - ErrorF("[mi] miSpriteComputeSaved called for floating device.\n"); return; - } + pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pCursorInfo = MISPRITE(pDev); |