Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 111 insertions, 112 deletions

diff --git a/xorg-server/miext/cw/cw_ops.c b/xorg-server/miext/cw/cw_ops.c
index 9ae56cb6c..ccc558074 100644
--- a/xorg-server/miext/cw/cw_ops.c
+++ b/xorg-server/miext/cw/cw_ops.c
@@ -65,76 +65,75 @@ extern GCFuncs cwGCFuncs;
  */
 
 static void cwFillSpans(DrawablePtr pDst, GCPtr pGC, int nInit,
-			DDXPointPtr pptInit, int *pwidthInit, int fSorted);
+                        DDXPointPtr pptInit, int *pwidthInit, int fSorted);
 static void cwSetSpans(DrawablePtr pDst, GCPtr pGC, char *psrc,
-		       DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
+                       DDXPointPtr ppt, int *pwidth, int nspans, int fSorted);
 static void cwPutImage(DrawablePtr pDst, GCPtr pGC, int depth,
-		       int x, int y, int w, int h, int leftPad, int format,
-		       char *pBits);
+                       int x, int y, int w, int h, int leftPad, int format,
+                       char *pBits);
 static RegionPtr cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-			    int srcx, int srcy, int w, int h,
-			    int dstx, int dsty);
+                            int srcx, int srcy, int w, int h,
+                            int dstx, int dsty);
 static RegionPtr cwCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC,
-			     int srcx, int srcy, int w, int h,
-			     int dstx, int dsty, unsigned long plane);
+                             int srcx, int srcy, int w, int h,
+                             int dstx, int dsty, unsigned long plane);
 static void cwPolyPoint(DrawablePtr pDst, GCPtr pGC, int mode, int npt,
-			xPoint *pptInit);
+                        xPoint * pptInit);
 static void cwPolylines(DrawablePtr pDst, GCPtr pGC, int mode, int npt,
-			DDXPointPtr pptInit);
+                        DDXPointPtr pptInit);
 static void cwPolySegment(DrawablePtr pDst, GCPtr pGC, int nseg,
-			  xSegment *pSegs);
+                          xSegment * pSegs);
 static void cwPolyRectangle(DrawablePtr pDst, GCPtr pGC,
-			    int nrects, xRectangle *pRects);
-static void cwPolyArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc *parcs);
+                            int nrects, xRectangle *pRects);
+static void cwPolyArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc * parcs);
 static void cwFillPolygon(DrawablePtr pDst, GCPtr pGC, int shape, int mode,
-			  int count, DDXPointPtr pPts);
+                          int count, DDXPointPtr pPts);
 static void cwPolyFillRect(DrawablePtr pDst, GCPtr pGC,
-			   int nrectFill, xRectangle *prectInit);
-static void cwPolyFillArc(DrawablePtr pDst, GCPtr pGC,
-			  int narcs, xArc *parcs);
+                           int nrectFill, xRectangle *prectInit);
+static void cwPolyFillArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc * parcs);
 static int cwPolyText8(DrawablePtr pDrawable, GCPtr pGC, int x, int y,
-		       int count, char *chars);
+                       int count, char *chars);
 static int cwPolyText16(DrawablePtr pDst, GCPtr pGC, int x, int y,
-			int count, unsigned short *chars);
+                        int count, unsigned short *chars);
 static void cwImageText8(DrawablePtr pDst, GCPtr pGC, int x, int y,
-			 int count, char *chars);
+                         int count, char *chars);
 static void cwImageText16(DrawablePtr pDst, GCPtr pGC, int x, int y,
-			  int count, unsigned short *chars);
+                          int count, unsigned short *chars);
 static void cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y,
-			    unsigned int nglyph, CharInfoPtr *ppci,
-			    pointer pglyphBase);
+                            unsigned int nglyph, CharInfoPtr * ppci,
+                            pointer pglyphBase);
 static void cwPolyGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y,
-			   unsigned int nglyph, CharInfoPtr *ppci,
-			   pointer pglyphBase);
+                           unsigned int nglyph, CharInfoPtr * ppci,
+                           pointer pglyphBase);
 static void cwPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst,
-			 int w, int h, int x, int y);
+                         int w, int h, int x, int y);
 
 GCOps cwGCOps = {
-	cwFillSpans,
-	cwSetSpans,
-	cwPutImage,
-	cwCopyArea,
-	cwCopyPlane,
-	cwPolyPoint,
-	cwPolylines,
-	cwPolySegment,
-	cwPolyRectangle,
-	cwPolyArc,
-	cwFillPolygon,
-	cwPolyFillRect,
-	cwPolyFillArc,
-	cwPolyText8,
-	cwPolyText16,
-	cwImageText8,
-	cwImageText16,
-	cwImageGlyphBlt,
-	cwPolyGlyphBlt,
-	cwPushPixels
+    cwFillSpans,
+    cwSetSpans,
+    cwPutImage,
+    cwCopyArea,
+    cwCopyPlane,
+    cwPolyPoint,
+    cwPolylines,
+    cwPolySegment,
+    cwPolyRectangle,
+    cwPolyArc,
+    cwFillPolygon,
+    cwPolyFillRect,
+    cwPolyFillArc,
+    cwPolyText8,
+    cwPolyText16,
+    cwImageText8,
+    cwImageText16,
+    cwImageGlyphBlt,
+    cwPolyGlyphBlt,
+    cwPushPixels
 };
 
 static void
 cwFillSpans(DrawablePtr pDst, GCPtr pGC, int nspans, DDXPointPtr ppt,
-	    int *pwidth, int fSorted)
+            int *pwidth, int fSorted)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -142,15 +141,15 @@ cwFillSpans(DrawablePtr pDst, GCPtr pGC, int nspans, DDXPointPtr ppt,
 
     CW_OFFSET_XYPOINTS(ppt, nspans);
 
-    (*pBackingGC->ops->FillSpans)(pBackingDst, pBackingGC, nspans, ppt,
-				  pwidth, fSorted);
+    (*pBackingGC->ops->FillSpans) (pBackingDst, pBackingGC, nspans, ppt,
+                                   pwidth, fSorted);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwSetSpans(DrawablePtr pDst, GCPtr pGC, char *psrc, DDXPointPtr ppt,
-	   int *pwidth, int nspans, int fSorted)
+           int *pwidth, int nspans, int fSorted)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -158,15 +157,15 @@ cwSetSpans(DrawablePtr pDst, GCPtr pGC, char *psrc, DDXPointPtr ppt,
 
     CW_OFFSET_XYPOINTS(ppt, nspans);
 
-    (*pBackingGC->ops->SetSpans)(pBackingDst, pBackingGC, psrc, ppt, pwidth,
-				 nspans, fSorted);
+    (*pBackingGC->ops->SetSpans) (pBackingDst, pBackingGC, psrc, ppt, pwidth,
+                                  nspans, fSorted);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwPutImage(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y, int w, int h,
-	   int leftPad, int format, char *pBits)
+           int leftPad, int format, char *pBits)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -174,18 +173,19 @@ cwPutImage(DrawablePtr pDst, GCPtr pGC, int depth, int x, int y, int w, int h,
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->PutImage)(pBackingDst, pBackingGC, depth, x, y, w, h,
-				 leftPad, format, pBits);
+    (*pBackingGC->ops->PutImage) (pBackingDst, pBackingGC, depth, x, y, w, h,
+                                  leftPad, format, pBits);
 
     EPILOGUE(pGC);
 }
 
 static RegionPtr
 cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
-	   int w, int h, int dstx, int dsty)
+           int w, int h, int dstx, int dsty)
 {
-    int		odstx, odsty;
-    int		osrcx, osrcy;
+    int odstx, odsty;
+    int osrcx, osrcy;
+
     SETUP_BACKING_DST(pDst, pGC);
     SETUP_BACKING_SRC(pSrc, pGC);
 
@@ -198,23 +198,22 @@ cwCopyArea(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
     CW_OFFSET_XY_DST(dstx, dsty);
     CW_OFFSET_XY_SRC(srcx, srcy);
 
-    (*pBackingGC->ops->CopyArea)(pBackingSrc, pBackingDst,
-				 pBackingGC, srcx, srcy, w, h,
-				 dstx, dsty);
-    
+    (*pBackingGC->ops->CopyArea) (pBackingSrc, pBackingDst,
+                                  pBackingGC, srcx, srcy, w, h, dstx, dsty);
+
     EPILOGUE(pGC);
 
     return miHandleExposures(pSrc, pDst, pGC,
-			     osrcx, osrcy, w, h,
-			     odstx, odsty, 0);
+                             osrcx, osrcy, w, h, odstx, odsty, 0);
 }
 
 static RegionPtr
 cwCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
-	    int w, int h, int dstx, int dsty, unsigned long plane)
+            int w, int h, int dstx, int dsty, unsigned long plane)
 {
-    int		odstx, odsty;
-    int		osrcx, osrcy;
+    int odstx, odsty;
+    int osrcx, osrcy;
+
     SETUP_BACKING_DST(pDst, pGC);
     SETUP_BACKING_SRC(pSrc, pGC);
 
@@ -227,30 +226,29 @@ cwCopyPlane(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, int srcx, int srcy,
     CW_OFFSET_XY_DST(dstx, dsty);
     CW_OFFSET_XY_SRC(srcx, srcy);
 
-    (*pBackingGC->ops->CopyPlane)(pBackingSrc, pBackingDst,
-				  pBackingGC, srcx, srcy, w, h,
-				  dstx, dsty, plane);
+    (*pBackingGC->ops->CopyPlane) (pBackingSrc, pBackingDst,
+                                   pBackingGC, srcx, srcy, w, h,
+                                   dstx, dsty, plane);
 
     EPILOGUE(pGC);
 
     return miHandleExposures(pSrc, pDst, pGC,
-			     osrcx, osrcy, w, h,
-			     odstx, odsty, plane);
+                             osrcx, osrcy, w, h, odstx, odsty, plane);
 }
 
 static void
-cwPolyPoint(DrawablePtr pDst, GCPtr pGC, int mode, int npt, xPoint *ppt)
+cwPolyPoint(DrawablePtr pDst, GCPtr pGC, int mode, int npt, xPoint * ppt)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
     PROLOGUE(pGC);
 
     if (mode == CoordModeOrigin)
-	CW_OFFSET_XYPOINTS(ppt, npt);
+        CW_OFFSET_XYPOINTS(ppt, npt);
     else
-	CW_OFFSET_XYPOINTS(ppt, 1);
+        CW_OFFSET_XYPOINTS(ppt, 1);
 
-    (*pBackingGC->ops->PolyPoint)(pBackingDst, pBackingGC, mode, npt, ppt);
+    (*pBackingGC->ops->PolyPoint) (pBackingDst, pBackingGC, mode, npt, ppt);
 
     EPILOGUE(pGC);
 }
@@ -263,17 +261,17 @@ cwPolylines(DrawablePtr pDst, GCPtr pGC, int mode, int npt, DDXPointPtr ppt)
     PROLOGUE(pGC);
 
     if (mode == CoordModeOrigin)
-	CW_OFFSET_XYPOINTS(ppt, npt);
+        CW_OFFSET_XYPOINTS(ppt, npt);
     else
-	CW_OFFSET_XYPOINTS(ppt, 1);
+        CW_OFFSET_XYPOINTS(ppt, 1);
 
-    (*pBackingGC->ops->Polylines)(pBackingDst, pBackingGC, mode, npt, ppt);
+    (*pBackingGC->ops->Polylines) (pBackingDst, pBackingGC, mode, npt, ppt);
 
     EPILOGUE(pGC);
 }
 
 static void
-cwPolySegment(DrawablePtr pDst, GCPtr pGC, int nseg, xSegment *pSegs)
+cwPolySegment(DrawablePtr pDst, GCPtr pGC, int nseg, xSegment * pSegs)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -281,7 +279,7 @@ cwPolySegment(DrawablePtr pDst, GCPtr pGC, int nseg, xSegment *pSegs)
 
     CW_OFFSET_XYPOINTS(pSegs, nseg * 2);
 
-    (*pBackingGC->ops->PolySegment)(pBackingDst, pBackingGC, nseg, pSegs);
+    (*pBackingGC->ops->PolySegment) (pBackingDst, pBackingGC, nseg, pSegs);
 
     EPILOGUE(pGC);
 }
@@ -295,13 +293,13 @@ cwPolyRectangle(DrawablePtr pDst, GCPtr pGC, int nrects, xRectangle *pRects)
 
     CW_OFFSET_RECTS(pRects, nrects);
 
-    (*pBackingGC->ops->PolyRectangle)(pBackingDst, pBackingGC, nrects, pRects);
+    (*pBackingGC->ops->PolyRectangle) (pBackingDst, pBackingGC, nrects, pRects);
 
     EPILOGUE(pGC);
 }
 
 static void
-cwPolyArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc *pArcs)
+cwPolyArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc * pArcs)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -309,26 +307,26 @@ cwPolyArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc *pArcs)
 
     CW_OFFSET_RECTS(pArcs, narcs);
 
-    (*pBackingGC->ops->PolyArc)(pBackingDst, pBackingGC, narcs, pArcs);
+    (*pBackingGC->ops->PolyArc) (pBackingDst, pBackingGC, narcs, pArcs);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwFillPolygon(DrawablePtr pDst, GCPtr pGC, int shape, int mode, int npt,
-	      DDXPointPtr ppt)
+              DDXPointPtr ppt)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
     PROLOGUE(pGC);
 
     if (mode == CoordModeOrigin)
-	CW_OFFSET_XYPOINTS(ppt, npt);
+        CW_OFFSET_XYPOINTS(ppt, npt);
     else
-	CW_OFFSET_XYPOINTS(ppt, 1);
+        CW_OFFSET_XYPOINTS(ppt, 1);
 
-    (*pBackingGC->ops->FillPolygon)(pBackingDst, pBackingGC, shape, mode, npt,
-				    ppt);
+    (*pBackingGC->ops->FillPolygon) (pBackingDst, pBackingGC, shape, mode, npt,
+                                     ppt);
 
     EPILOGUE(pGC);
 }
@@ -342,13 +340,13 @@ cwPolyFillRect(DrawablePtr pDst, GCPtr pGC, int nrects, xRectangle *pRects)
 
     CW_OFFSET_RECTS(pRects, nrects);
 
-    (*pBackingGC->ops->PolyFillRect)(pBackingDst, pBackingGC, nrects, pRects);
+    (*pBackingGC->ops->PolyFillRect) (pBackingDst, pBackingGC, nrects, pRects);
 
     EPILOGUE(pGC);
 }
 
 static void
-cwPolyFillArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc *parcs)
+cwPolyFillArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc * parcs)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -356,7 +354,7 @@ cwPolyFillArc(DrawablePtr pDst, GCPtr pGC, int narcs, xArc *parcs)
 
     CW_OFFSET_RECTS(parcs, narcs);
 
-    (*pBackingGC->ops->PolyFillArc)(pBackingDst, pBackingGC, narcs, parcs);
+    (*pBackingGC->ops->PolyFillArc) (pBackingDst, pBackingGC, narcs, parcs);
 
     EPILOGUE(pGC);
 }
@@ -365,14 +363,15 @@ static int
 cwPolyText8(DrawablePtr pDst, GCPtr pGC, int x, int y, int count, char *chars)
 {
     int result;
+
     SETUP_BACKING_DST(pDst, pGC);
 
     PROLOGUE(pGC);
 
     CW_OFFSET_XY_DST(x, y);
 
-    result = (*pBackingGC->ops->PolyText8)(pBackingDst, pBackingGC, x, y,
-					   count, chars);
+    result = (*pBackingGC->ops->PolyText8) (pBackingDst, pBackingGC, x, y,
+                                            count, chars);
 
     EPILOGUE(pGC);
 
@@ -381,17 +380,18 @@ cwPolyText8(DrawablePtr pDst, GCPtr pGC, int x, int y, int count, char *chars)
 
 static int
 cwPolyText16(DrawablePtr pDst, GCPtr pGC, int x, int y, int count,
-	     unsigned short *chars)
+             unsigned short *chars)
 {
     int result;
+
     SETUP_BACKING_DST(pDst, pGC);
 
     PROLOGUE(pGC);
 
     CW_OFFSET_XY_DST(x, y);
 
-    result = (*pBackingGC->ops->PolyText16)(pBackingDst, pBackingGC, x, y,
-					    count, chars);
+    result = (*pBackingGC->ops->PolyText16) (pBackingDst, pBackingGC, x, y,
+                                             count, chars);
 
     EPILOGUE(pGC);
     return result;
@@ -406,15 +406,15 @@ cwImageText8(DrawablePtr pDst, GCPtr pGC, int x, int y, int count, char *chars)
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->ImageText8)(pBackingDst, pBackingGC, x, y, count,
-				   chars);
+    (*pBackingGC->ops->ImageText8) (pBackingDst, pBackingGC, x, y, count,
+                                    chars);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwImageText16(DrawablePtr pDst, GCPtr pGC, int x, int y, int count,
-	     unsigned short *chars)
+              unsigned short *chars)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -422,15 +422,15 @@ cwImageText16(DrawablePtr pDst, GCPtr pGC, int x, int y, int count,
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->ImageText16)(pBackingDst, pBackingGC, x, y, count,
-				    chars);
+    (*pBackingGC->ops->ImageText16) (pBackingDst, pBackingGC, x, y, count,
+                                     chars);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph,
-		CharInfoPtr *ppci, pointer pglyphBase)
+                CharInfoPtr * ppci, pointer pglyphBase)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -438,15 +438,15 @@ cwImageGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph,
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->ImageGlyphBlt)(pBackingDst, pBackingGC, x, y, nglyph,
-				      ppci, pglyphBase);
+    (*pBackingGC->ops->ImageGlyphBlt) (pBackingDst, pBackingGC, x, y, nglyph,
+                                       ppci, pglyphBase);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwPolyGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph,
-	       CharInfoPtr *ppci, pointer pglyphBase)
+               CharInfoPtr * ppci, pointer pglyphBase)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -454,15 +454,15 @@ cwPolyGlyphBlt(DrawablePtr pDst, GCPtr pGC, int x, int y, unsigned int nglyph,
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->PolyGlyphBlt)(pBackingDst, pBackingGC, x, y, nglyph,
-				      ppci, pglyphBase);
+    (*pBackingGC->ops->PolyGlyphBlt) (pBackingDst, pBackingGC, x, y, nglyph,
+                                      ppci, pglyphBase);
 
     EPILOGUE(pGC);
 }
 
 static void
 cwPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h,
-	     int x, int y)
+             int x, int y)
 {
     SETUP_BACKING_DST(pDst, pGC);
 
@@ -470,9 +470,8 @@ cwPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h,
 
     CW_OFFSET_XY_DST(x, y);
 
-    (*pBackingGC->ops->PushPixels)(pBackingGC, pBitMap, pBackingDst, w, h,
-				   x, y);
+    (*pBackingGC->ops->PushPixels) (pBackingGC, pBitMap, pBackingDst, w, h,
+                                    x, y);
 
     EPILOGUE(pGC);
 }
-