diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2006-12-18 15:33:54 +1030 |
|---|---|---|
| committer | Peter Hutterer <whot@hyena.localdomain> | 2006-12-18 15:33:54 +1030 |
| commit | 03c554283e49e449fd1282cf32564d15d9fd2c77 (patch) | |
| tree | 2e27f94fb8140c55c5664604f101be72ee38e61d /mi/midispcur.c | |
| parent | a96788058e48f3e97c66da6dafd58828f0c2ce53 (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)
bugfix GrabDevice: uninitialized field in grab struct caused segfault
xfree86: removing MPX fdefs
Xi: removing MPX protocol events
Diffstat (limited to 'mi/midispcur.c')
| -rw-r--r-- | mi/midispcur.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index 38772f609..35f0fbaa7 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -538,7 +538,7 @@ miDCPutUpCursor (pDev, pScreen, pCursor, x, y, source, mask) pWin = WindowTable[pScreen->myNum]; pBuffer = pScreenPriv->pCoreBuffer; - if (MPHasCursor(pDev)) + if (DevHasCursor(pDev)) pBuffer = &pScreenPriv->pCursorBuffers[pDev->id]; #ifdef ARGB_CURSOR @@ -589,7 +589,7 @@ miDCSaveUnderCursor (pDev, pScreen, x, y, w, h) pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr; pBuffer = pScreenPriv->pCoreBuffer; - if (MPHasCursor(pDev)) + if (DevHasCursor(pDev)) pBuffer = &pScreenPriv->pCursorBuffers[pDev->id]; pSave = pBuffer->pSave; @@ -628,7 +628,7 @@ miDCRestoreUnderCursor (pDev, pScreen, x, y, w, h) pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr; pBuffer = pScreenPriv->pCoreBuffer; - if (MPHasCursor(pDev)) + if (DevHasCursor(pDev)) pBuffer = &pScreenPriv->pCursorBuffers[pDev->id]; pSave = pBuffer->pSave; @@ -661,7 +661,7 @@ miDCChangeSave (pDev, pScreen, x, y, w, h, dx, dy) pScreenPriv = (miDCScreenPtr) pScreen->devPrivates[miDCScreenIndex].ptr; pBuffer = pScreenPriv->pCoreBuffer; - if (MPHasCursor(pDev)) + if (DevHasCursor(pDev)) pBuffer = &pScreenPriv->pCursorBuffers[pDev->id]; pSave = pBuffer->pSave; @@ -812,7 +812,7 @@ miDCMoveCursor (pDev, pScreen, pCursor, x, y, w, h, dx, dy, source, mask) pWin = WindowTable[pScreen->myNum]; pBuffer = pScreenPriv->pCoreBuffer; - if (MPHasCursor(pDev)) + if (DevHasCursor(pDev)) pBuffer = &pScreenPriv->pCursorBuffers[pDev->id]; pTemp = pBuffer->pTemp; |