diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-12-14 10:50:18 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-12-14 10:50:18 +1030 |
| commit | a96788058e48f3e97c66da6dafd58828f0c2ce53 (patch) | |
| tree | 6f0796ff873ea30c59588330fd5f63e32280f36f /dix/cursor.c | |
| parent | ae3c24da34cd8eeb77a6389861856fd51e0841f5 (diff) | |
mi: removing MPX ifdefs
global sprite renaming in mipointer and misprite
fixed: multiple remove cursor call in miSpriteInstallColormap
fixed: wrong core pointer usage in miSpriteStoreColors
dix: bugfix in CheckCursorConfinement
removing MPX ifdefs
removing MPX event generation (using Xi solely now)
Diffstat (limited to 'dix/cursor.c')
| -rw-r--r-- | dix/cursor.c | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/dix/cursor.c b/dix/cursor.c index 6da763b44..7df854cd4 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -128,16 +128,11 @@ FreeCursor(pointer value, XID cid) for (nscr = 0; nscr < screenInfo.numScreens; nscr++) { pscr = screenInfo.screens[nscr]; -#ifdef MPX - pDev = inputInfo.devices; - while(pDev) + for(pDev = inputInfo.devices; pDev; pDev = pDev->next) { -#endif - (void)( *pscr->UnrealizeCursor)(pDev, pscr, pCurs); -#ifdef MPX - pDev = pDev->next; + if (MPHasCursor(pDev)) + (void)( *pscr->UnrealizeCursor)(pDev, pscr, pCurs); } -#endif } FreeCursorBits(pCurs->bits); xfree( pCurs); @@ -231,16 +226,12 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, for (nscr = 0; nscr < screenInfo.numScreens; nscr++) { pscr = screenInfo.screens[nscr]; -#ifdef MPX - pDev = inputInfo.devices; - while(pDev) + for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { if (MPHasCursor(pDev)) { -#endif if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs)) { -#ifdef MPX /* Realize failed for device pDev on screen pscr. * We have to assume that for all devices before, realize * worked. We need to rollback all devices so far on the @@ -254,11 +245,9 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, ( *pscr->UnrealizeCursor)(pDevIt, pscr, pCurs); pDevIt = pDevIt->next; } -#endif while (--nscr >= 0) { pscr = screenInfo.screens[nscr]; -#ifdef MPX /* now unrealize all devices on previous screens */ pDevIt = inputInfo.devices; while (pDevIt) @@ -267,19 +256,14 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb, ( *pscr->UnrealizeCursor)(pDevIt, pscr, pCurs); pDevIt = pDevIt->next; } -#else ( *pscr->UnrealizeCursor)(pDev, pscr, pCurs); -#endif } FreeCursorBits(bits); xfree(pCurs); return (CursorPtr)NULL; } -#ifdef MPX } - pDev = pDev->next; } -#endif } return pCurs; } @@ -462,16 +446,12 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, for (nscr = 0; nscr < screenInfo.numScreens; nscr++) { pscr = screenInfo.screens[nscr]; -#ifdef MPX - pDev = inputInfo.devices; - while(pDev) + for (pDev = inputInfo.devices; pDev; pDev = pDev->next) { if (MPHasCursor(pDev)) { -#endif if (!( *pscr->RealizeCursor)(pDev, pscr, pCurs)) { -#ifdef MPX /* Realize failed for device pDev on screen pscr. * We have to assume that for all devices before, realize * worked. We need to rollback all devices so far on the @@ -485,11 +465,9 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, ( *pscr->UnrealizeCursor)(pDevIt, pscr, pCurs); pDevIt = pDevIt->next; } -#endif while (--nscr >= 0) { pscr = screenInfo.screens[nscr]; -#ifdef MPX /* now unrealize all devices on previous screens */ pDevIt = inputInfo.devices; while (pDevIt) @@ -498,19 +476,14 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, ( *pscr->UnrealizeCursor)(pDevIt, pscr, pCurs); pDevIt = pDevIt->next; } -#else ( *pscr->UnrealizeCursor)(pDev, pscr, pCurs); -#endif } FreeCursorBits(bits); xfree(pCurs); return BadAlloc; } -#ifdef MPX } - pDev = pDev->next; } -#endif } *ppCurs = pCurs; return Success; |