diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-08-27 19:27:13 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2008-08-27 19:27:13 -0400 |
| commit | ec7907f8fa04dcff2649cc4846975844314f737e (patch) | |
| tree | 29236baa9e98868c99fe5a18cb8aad0446d8a93c /mi/midispcur.c | |
| parent | 86898491497a43814caf42013651086e62fe6162 (diff) | |
Add an array of integers for use as per-screen cursor private keys.
Replaces the use of the screen pointer itself as the key, which was
nice but won't work now that an array index is being stored.
Diffstat (limited to 'mi/midispcur.c')
| -rw-r--r-- | mi/midispcur.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mi/midispcur.c b/mi/midispcur.c index 875527727..1f2d8cf03 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -178,7 +178,7 @@ static Bool miDCRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { if (pCursor->bits->refcnt <= 1) - dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL); + dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), NULL); return TRUE; } @@ -277,7 +277,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor) xfree ((pointer) pPriv); return (miDCCursorPtr)NULL; } - dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv); + dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), pPriv); return pPriv; } pPriv->pPicture = 0; @@ -295,7 +295,7 @@ miDCRealize (ScreenPtr pScreen, CursorPtr pCursor) xfree ((pointer) pPriv); return (miDCCursorPtr)NULL; } - dixSetPrivate(&pCursor->bits->devPrivates, pScreen, pPriv); + dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), pPriv); /* create the two sets of bits, clipping as appropriate */ @@ -340,7 +340,7 @@ miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) miDCCursorPtr pPriv; pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates, - pScreen); + CursorScreenKey(pScreen)); if (pPriv && (pCursor->bits->refcnt <= 1)) { if (pPriv->sourceBits) @@ -352,7 +352,7 @@ miDCUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) FreePicture (pPriv->pPicture, 0); #endif xfree ((pointer) pPriv); - dixSetPrivate(&pCursor->bits->devPrivates, pScreen, NULL); + dixSetPrivate(&pCursor->bits->devPrivates, CursorScreenKey(pScreen), NULL); } return TRUE; } @@ -446,7 +446,7 @@ miDCPutUpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, WindowPtr pWin; pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates, - pScreen); + CursorScreenKey(pScreen)); if (!pPriv) { pPriv = miDCRealize(pScreen, pCursor); @@ -756,7 +756,7 @@ miDCMoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor, PixmapPtr pTemp; pPriv = (miDCCursorPtr)dixLookupPrivate(&pCursor->bits->devPrivates, - pScreen); + CursorScreenKey(pScreen)); if (!pPriv) { pPriv = miDCRealize(pScreen, pCursor); |