frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: Add GetSpriteScreen macro to hide dixLookupPrivate 

Signed-off-by: Pauli Nieminen <ext-pauli.nieminen@nokia.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Pauli Nieminen 2010-12-30 19:19:36 +02:00 committed by Daniel Stone
parent ed8db09b4b
commit 4be2a6d1b3
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mi/misprite.c
View File

@ -184,6 +184,8 @@ miSpriteIsDown(miCursorInfoPtr pDevCursor)
static DevPrivateKeyRec miSpriteScreenKeyRec; static DevPrivateKeyRec miSpriteScreenKeyRec;
#define miSpriteScreenKey (&miSpriteScreenKeyRec) #define miSpriteScreenKey (&miSpriteScreenKeyRec)
#define GetSpriteScreen(pScreen) \
(dixLookupPrivate(&(pScreen)->devPrivates, miSpriteScreenKey))
static DevPrivateKeyRec miSpriteDevPrivatesKeyRec; static DevPrivateKeyRec miSpriteDevPrivatesKeyRec;
#define miSpriteDevPrivatesKey (&miSpriteDevPrivatesKeyRec) #define miSpriteDevPrivatesKey (&miSpriteDevPrivatesKeyRec)
@ -373,9 +375,8 @@ miSpriteInitialize (ScreenPtr pScreen,
static Bool static Bool
miSpriteCloseScreen (int i, ScreenPtr pScreen) miSpriteCloseScreen (int i, ScreenPtr pScreen)
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv = GetSpriteScreen(pScreen);
pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
pScreen->CloseScreen = pScreenPriv->CloseScreen; pScreen->CloseScreen = pScreenPriv->CloseScreen;
pScreen->GetImage = pScreenPriv->GetImage; pScreen->GetImage = pScreenPriv->GetImage;
pScreen->GetSpans = pScreenPriv->GetSpans; pScreen->GetSpans = pScreenPriv->GetSpans;
@ -546,11 +547,10 @@ miSpriteBlockHandler (int i, pointer blockData, pointer pTimeout,
pointer pReadmask) pointer pReadmask)
{ {
ScreenPtr pScreen = screenInfo.screens[i]; ScreenPtr pScreen = screenInfo.screens[i];
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
DeviceIntPtr pDev; DeviceIntPtr pDev;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
pPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, BlockHandler); SCREEN_PROLOGUE(pScreen, BlockHandler);
(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
@ -591,9 +591,8 @@ static void
miSpriteInstallColormap (ColormapPtr pMap) miSpriteInstallColormap (ColormapPtr pMap)
{ {
ScreenPtr pScreen = pMap->pScreen; ScreenPtr pScreen = pMap->pScreen;
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
pPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, InstallColormap); SCREEN_PROLOGUE(pScreen, InstallColormap);
(*pScreen->InstallColormap) (pMap); (*pScreen->InstallColormap) (pMap);
@ -624,14 +623,13 @@ static void
miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef) miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
{ {
ScreenPtr pScreen = pMap->pScreen; ScreenPtr pScreen = pMap->pScreen;
miSpriteScreenPtr pPriv; miSpriteScreenPtr pPriv = GetSpriteScreen(pScreen);
int i; int i;
int updated; int updated;
VisualPtr pVisual; VisualPtr pVisual;
DeviceIntPtr pDev; DeviceIntPtr pDev;
miCursorInfoPtr pCursorInfo; miCursorInfoPtr pCursorInfo;
pPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
SCREEN_PROLOGUE(pScreen, StoreColors); SCREEN_PROLOGUE(pScreen, StoreColors);
(*pScreen->StoreColors) (pMap, ndef, pdef); (*pScreen->StoreColors) (pMap, ndef, pdef);
@ -706,8 +704,7 @@ miSpriteStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
static void static void
miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen) miSpriteFindColors (miCursorInfoPtr pDevCursor, ScreenPtr pScreen)
{ {
miSpriteScreenPtr pScreenPriv = miSpriteScreenPtr pScreenPriv = GetSpriteScreen(pScreen);
dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey);
CursorPtr pCursor; CursorPtr pCursor;
xColorItem *sourceColor, *maskColor; xColorItem *sourceColor, *maskColor;
@ -884,7 +881,7 @@ miSpriteRemoveCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
return; return;
DamageDrawInternal (pScreen, TRUE); DamageDrawInternal (pScreen, TRUE);
pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pScreenPriv = GetSpriteScreen(pScreen);
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
miSpriteIsDown(pCursorInfo); miSpriteIsDown(pCursorInfo);
@ -922,7 +919,7 @@ miSpriteSaveUnderCursor(DeviceIntPtr pDev, ScreenPtr pScreen)
return; return;
DamageDrawInternal (pScreen, TRUE); DamageDrawInternal (pScreen, TRUE);
pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pScreenPriv = GetSpriteScreen(pScreen);
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
miSpriteComputeSaved (pDev, pScreen); miSpriteComputeSaved (pDev, pScreen);
@ -963,7 +960,7 @@ miSpriteRestoreCursor (DeviceIntPtr pDev, ScreenPtr pScreen)
return; return;
DamageDrawInternal (pScreen, TRUE); DamageDrawInternal (pScreen, TRUE);
pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, miSpriteScreenKey); pScreenPriv = GetSpriteScreen(pScreen);
pCursorInfo = MISPRITE(pDev); pCursorInfo = MISPRITE(pDev);
miSpriteComputeSaved (pDev, pScreen); miSpriteComputeSaved (pDev, pScreen);