diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-23 14:35:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-16 07:53:24 +1000 |
| commit | 241b53b77750b5eea6759e79b23be4ff270a3d1f (patch) | |
| tree | 08ae38e3a390bae85b33411fc56f5471e07e3806 /mi/misprite.c | |
| parent | 00b8b7ad61b6f818271fb4d1e383113170309d72 (diff) | |
mi: remove log-spamming bogus error message (#26843)
miSpriteRealizeCursor is called whenever a device is set floating and it's
fine to do so, no need for an error message.
Same goes for the other miSprite messages.
X.Org Bug 26843 <http://bugs.freedesktop.org/show_bug.cgi?id=26843>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'mi/misprite.c')
| -rw-r--r-- | mi/misprite.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/mi/misprite.c b/mi/misprite.c index 2ec67827e..ac025e1ff 100644 --- a/mi/misprite.c +++ b/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); |