Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/securitysrv.h
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_size_get.c
	xorg-server/hw/xwin/winclip.c
	xorg-server/hw/xwin/winfont.c
	xorg-server/hw/xwin/winglobals.c
	xorg-server/hw/xwin/winglobals.h
	xorg-server/hw/xwin/winmonitors.h
	xorg-server/include/closestr.h
	xorg-server/include/pixmapstr.h
	xorg-server/include/servermd.h
	xorg-server/include/site.h
	xorg-server/include/windowstr.h
	xorg-server/include/xkbstr.h

1 files changed, 75 insertions, 79 deletions

diff --git a/xorg-server/hw/xfree86/xaa/xaawrap.h b/xorg-server/hw/xfree86/xaa/xaawrap.h
index 1b7595e95..2d2d7881a 100644
--- a/xorg-server/hw/xfree86/xaa/xaawrap.h
+++ b/xorg-server/hw/xfree86/xaa/xaawrap.h
@@ -1,79 +1,75 @@
-

-#define XAA_SCREEN_PROLOGUE(pScreen, field)\

-  ((pScreen)->field = \

-   ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)

-

-#define XAA_SCREEN_EPILOGUE(pScreen, field, wrapper)\

-    ((pScreen)->field = wrapper)

-

-

-#define XAA_GC_FUNC_PROLOGUE(pGC)\

-    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \

-    (pGC)->funcs = pGCPriv->wrapFuncs;\

-    if(pGCPriv->flags)\

-	(pGC)->ops = pGCPriv->wrapOps

-

-#define XAA_GC_FUNC_EPILOGUE(pGC)\

-    pGCPriv->wrapFuncs = (pGC)->funcs;\

-    (pGC)->funcs = &XAAGCFuncs;\

-    if(pGCPriv->flags) {\

-	pGCPriv->wrapOps = (pGC)->ops;\

-	(pGC)->ops = (pGCPriv->flags & OPS_ARE_ACCEL) ? pGCPriv->XAAOps :\

-				&XAAPixmapOps;\

-    }

-

-

-#define XAA_GC_OP_PROLOGUE(pGC)\

-    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \

-    GCFuncs *oldFuncs = pGC->funcs;\

-    pGC->funcs = pGCPriv->wrapFuncs;\

-    pGC->ops = pGCPriv->wrapOps

-

-#define XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC)\

-    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \

-    GCFuncs *oldFuncs = pGC->funcs;\

-    if(!RegionNumRects(pGC->pCompositeClip)) return; \

-    pGC->funcs = pGCPriv->wrapFuncs;\

-    pGC->ops = pGCPriv->wrapOps

-

-    

-#define XAA_GC_OP_EPILOGUE(pGC)\

-    pGCPriv->wrapOps = pGC->ops;\

-    pGC->funcs = oldFuncs;\

-    pGC->ops   = pGCPriv->XAAOps

-

-

-#define XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw)\

-    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \

-    XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\

-    GCFuncs *oldFuncs = pGC->funcs;\

-    pGC->funcs = pGCPriv->wrapFuncs;\

-    pGC->ops = pGCPriv->wrapOps; \

-    SYNC_CHECK(pGC)

-    

-#define XAA_PIXMAP_OP_EPILOGUE(pGC)\

-    pGCPriv->wrapOps = pGC->ops;\

-    pGC->funcs = oldFuncs;\

-    pGC->ops   = &XAAPixmapOps;\

-    pixPriv->flags |= DIRTY

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#define XAA_RENDER_PROLOGUE(pScreen,field)\

-    (GetPictureScreen(pScreen)->field = \

-     ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)

-

-#define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\

-    (GetPictureScreen(pScreen)->field = wrapper)

-

-/* This also works fine for drawables */

-

-#define SYNC_CHECK(pGC) {\

-     XAAInfoRecPtr infoRec =\

-((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec;	\

-    if(infoRec->NeedToSync) {\

-	(*infoRec->Sync)(infoRec->pScrn);\

-	infoRec->NeedToSync = FALSE;\

-    }}

+
+#define XAA_SCREEN_PROLOGUE(pScreen, field)\
+  ((pScreen)->field = \
+   ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
+
+#define XAA_SCREEN_EPILOGUE(pScreen, field, wrapper)\
+    ((pScreen)->field = wrapper)
+
+#define XAA_GC_FUNC_PROLOGUE(pGC)\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
+    (pGC)->funcs = pGCPriv->wrapFuncs;\
+    if(pGCPriv->flags)\
+	(pGC)->ops = pGCPriv->wrapOps
+
+#define XAA_GC_FUNC_EPILOGUE(pGC)\
+    pGCPriv->wrapFuncs = (pGC)->funcs;\
+    (pGC)->funcs = &XAAGCFuncs;\
+    if(pGCPriv->flags) {\
+	pGCPriv->wrapOps = (pGC)->ops;\
+	(pGC)->ops = (pGCPriv->flags & OPS_ARE_ACCEL) ? pGCPriv->XAAOps :\
+				&XAAPixmapOps;\
+    }
+
+#define XAA_GC_OP_PROLOGUE(pGC)\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
+    GCFuncs *oldFuncs = pGC->funcs;\
+    pGC->funcs = pGCPriv->wrapFuncs;\
+    pGC->ops = pGCPriv->wrapOps
+
+#define XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC)\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
+    GCFuncs *oldFuncs = pGC->funcs;\
+    if(!RegionNumRects(pGC->pCompositeClip)) return; \
+    pGC->funcs = pGCPriv->wrapFuncs;\
+    pGC->ops = pGCPriv->wrapOps
+
+#define XAA_GC_OP_EPILOGUE(pGC)\
+    pGCPriv->wrapOps = pGC->ops;\
+    pGC->funcs = oldFuncs;\
+    pGC->ops   = pGCPriv->XAAOps
+
+#define XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw)\
+    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
+    XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\
+    GCFuncs *oldFuncs = pGC->funcs;\
+    pGC->funcs = pGCPriv->wrapFuncs;\
+    pGC->ops = pGCPriv->wrapOps; \
+    SYNC_CHECK(pGC)
+
+#define XAA_PIXMAP_OP_EPILOGUE(pGC)\
+    pGCPriv->wrapOps = pGC->ops;\
+    pGC->funcs = oldFuncs;\
+    pGC->ops   = &XAAPixmapOps;\
+    pixPriv->flags |= DIRTY
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#define XAA_RENDER_PROLOGUE(pScreen,field)\
+    (GetPictureScreen(pScreen)->field = \
+     ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
+
+#define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
+    (GetPictureScreen(pScreen)->field = wrapper)
+
+/* This also works fine for drawables */
+
+#define SYNC_CHECK(pGC) {\
+     XAAInfoRecPtr infoRec =\
+((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec;	\
+    if(infoRec->NeedToSync) {\
+	(*infoRec->Sync)(infoRec->pScrn);\
+	infoRec->NeedToSync = FALSE;\
+    }}