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

Clean up cw initialization, make sure wrappers re-wrap on exit.

This commit is contained in:
Keith Packard 2004-08-07 01:02:41 +00:00
parent cff0043a34
commit 2bdbc2c0d3
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
miext/cw/cw.c
View File

@ -344,8 +344,7 @@ cwCheapValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable)
* cwCreateGCPrivate will wrap with the backing-pixmap GC funcs and we won't * cwCreateGCPrivate will wrap with the backing-pixmap GC funcs and we won't
* re-wrap on return. * re-wrap on return.
*/ */
if (pDrawable->type == DRAWABLE_WINDOW && if (cwDrawableIsRedirWindow(pDrawable) &&
cwDrawableIsRedirWindow(pDrawable) &&
cwCreateGCPrivate(pGC, pDrawable)) cwCreateGCPrivate(pGC, pDrawable))
{ {
(*pGC->funcs->ValidateGC)(pGC, stateChanges, pDrawable); (*pGC->funcs->ValidateGC)(pGC, stateChanges, pDrawable);
@ -427,11 +426,11 @@ cwCheapDestroyClip(GCPtr pGC)
*/ */
#define SCREEN_PROLOGUE(pScreen, field)\ #define SCREEN_PROLOGUE(pScreen, field)\
((pScreen)->field = ((cwScreenPtr) \ ((pScreen)->field = getCwScreen(pScreen)->field)
(pScreen)->devPrivates[cwScreenIndex].ptr)->field)
#define SCREEN_EPILOGUE(pScreen, field, wrapper)\ #define SCREEN_EPILOGUE(pScreen, field, wrapper)\
((pScreen)->field = wrapper) ((getCwScreen(pScreen)->field = (pScreen)->field), \
((pScreen)->field = (wrapper)))
static Bool static Bool
cwCreateGC(GCPtr pGC) cwCreateGC(GCPtr pGC)
@ -667,22 +666,15 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
if (!pScreenPriv) if (!pScreenPriv)
return; return;
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreenPriv->GetImage = pScreen->GetImage;
pScreenPriv->GetSpans = pScreen->GetSpans;
pScreenPriv->CreateGC = pScreen->CreateGC;
pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground;
pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder;
pScreen->CloseScreen = cwCloseScreen;
pScreen->GetImage = cwGetImage;
pScreen->GetSpans = cwGetSpans;
pScreen->CreateGC = cwCreateGC;
pScreen->PaintWindowBackground = cwPaintWindowBackground;
pScreen->PaintWindowBorder = cwPaintWindowBorder;
pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv; pScreen->devPrivates[cwScreenIndex].ptr = (pointer)pScreenPriv;
SCREEN_EPILOGUE(pScreen, CloseScreen, cwCloseScreen);
SCREEN_EPILOGUE(pScreen, GetImage, cwGetImage);
SCREEN_EPILOGUE(pScreen, GetSpans, cwGetSpans);
SCREEN_EPILOGUE(pScreen, CreateGC, cwCreateGC);
SCREEN_EPILOGUE(pScreen, PaintWindowBackground, cwPaintWindowBackground);
SCREEN_EPILOGUE(pScreen, PaintWindowBorder, cwPaintWindowBorder);
#ifdef RENDER #ifdef RENDER
if (GetPictureScreen (pScreen)) if (GetPictureScreen (pScreen))
cwInitializeRender(pScreen); cwInitializeRender(pScreen);