Introduce a consistent coding style

This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>

1 files changed, 627 insertions, 665 deletions

diff --git a/dix/gc.c b/dix/gc.c
index fc251dd01..7be050221 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -22,7 +22,6 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
-
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
@@ -45,7 +44,6 @@ SOFTWARE.
 
 ******************************************************************/
 
-
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
@@ -71,17 +69,16 @@ extern FontPtr defaultFont;
 
 static Bool CreateDefaultTile(GCPtr pGC);
 
-static unsigned char DefaultDash[2] = {4, 4};
+static unsigned char DefaultDash[2] = { 4, 4 };
 
 void
-ValidateGC(DrawablePtr pDraw, GC *pGC)
+ValidateGC(DrawablePtr pDraw, GC * pGC)
 {
     (*pGC->funcs->ValidateGC) (pGC, pGC->stateChanges, pDraw);
     pGC->stateChanges = 0;
     pGC->serialNumber = pDraw->serialNumber;
 }
 
-
 /*
  * ChangeGC/ChangeGCXIDs:
  *
@@ -123,296 +120,294 @@ ValidateGC(DrawablePtr pDraw, GC *pGC)
     _var = (_type)pUnion->ptr; pUnion++; }
 
 int
-ChangeGC(ClientPtr client, GC *pGC, BITS32 mask, ChangeGCValPtr pUnion)
+ChangeGC(ClientPtr client, GC * pGC, BITS32 mask, ChangeGCValPtr pUnion)
 {
-    BITS32 	index2;
-    int 	error = 0;
-    PixmapPtr 	pPixmap;
-    BITS32	maskQ;
+    BITS32 index2;
+    int error = 0;
+    PixmapPtr pPixmap;
+    BITS32 maskQ;
 
     assert(pUnion);
     pGC->serialNumber |= GC_CHANGE_SERIAL_BIT;
 
-    maskQ = mask;	/* save these for when we walk the GCque */
-    while (mask && !error) 
-    {
-	index2 = (BITS32) lowbit (mask);
-	mask &= ~index2;
-	pGC->stateChanges |= index2;
-	switch (index2)
-	{
-	    case GCFunction:
-	    {
-		CARD8 newalu;
-		NEXTVAL(CARD8, newalu);
-		if (newalu <= GXset)
-		    pGC->alu = newalu;
-		else
-		{
-		    if (client)
-			client->errorValue = newalu;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCPlaneMask:
-		NEXTVAL(unsigned long, pGC->planemask);
-		break;
-	    case GCForeground:
-		NEXTVAL(unsigned long, pGC->fgPixel);
-		/*
-		 * this is for CreateGC
-		 */
-		if (!pGC->tileIsPixel && !pGC->tile.pixmap)
-		{
-		    pGC->tileIsPixel = TRUE;
-		    pGC->tile.pixel = pGC->fgPixel;
-		}
-		break;
-	    case GCBackground:
-		NEXTVAL(unsigned long, pGC->bgPixel);
-		break;
-	    case GCLineWidth:		/* ??? line width is a CARD16 */
-		 NEXTVAL(CARD16, pGC->lineWidth);
-		break;
-	    case GCLineStyle:
-	    {
-		unsigned int newlinestyle;
-		NEXTVAL(unsigned int, newlinestyle);
-		if (newlinestyle <= LineDoubleDash)
-		    pGC->lineStyle = newlinestyle;
-		else
-		{
-		    if (client)
-			client->errorValue = newlinestyle;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCCapStyle:
-	    {
-		unsigned int newcapstyle;
-		NEXTVAL(unsigned int, newcapstyle);
-		if (newcapstyle <= CapProjecting)
-		    pGC->capStyle = newcapstyle;
-		else
-		{
-		    if (client)
-			client->errorValue = newcapstyle;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCJoinStyle:
-	    {
-		unsigned int newjoinstyle;
-		NEXTVAL(unsigned int, newjoinstyle);
-		if (newjoinstyle <= JoinBevel)
-		    pGC->joinStyle = newjoinstyle;
-		else
-		{
-		    if (client)
-			client->errorValue = newjoinstyle;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCFillStyle:
-	    {
-		unsigned int newfillstyle;
-		NEXTVAL(unsigned int, newfillstyle);
-		if (newfillstyle <= FillOpaqueStippled)
-		    pGC->fillStyle = newfillstyle;
-		else
-		{
-		    if (client)
-			client->errorValue = newfillstyle;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCFillRule:
-	    {
-		unsigned int newfillrule;
-		NEXTVAL(unsigned int, newfillrule);
-		if (newfillrule <= WindingRule)
-		    pGC->fillRule = newfillrule;
-		else
-		{
-		    if (client)
-			client->errorValue = newfillrule;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCTile:
-		NEXT_PTR(PixmapPtr, pPixmap);
-		if ((pPixmap->drawable.depth != pGC->depth) ||
-		    (pPixmap->drawable.pScreen != pGC->pScreen))
-		{
-		    error = BadMatch;
-		}
-		else
-		{
-		    pPixmap->refcnt++;
-		    if (!pGC->tileIsPixel)
-			(* pGC->pScreen->DestroyPixmap)(pGC->tile.pixmap);
-		    pGC->tileIsPixel = FALSE;
-		    pGC->tile.pixmap = pPixmap;
-		}
-		break;
-	    case GCStipple:
-		NEXT_PTR(PixmapPtr, pPixmap);
-		if ((pPixmap->drawable.depth != 1) ||
-		    (pPixmap->drawable.pScreen != pGC->pScreen))
-		{
-		    error = BadMatch;
-		}
-		else
-		{
-		    pPixmap->refcnt++;
-		    if (pGC->stipple)
-			(* pGC->pScreen->DestroyPixmap)(pGC->stipple);
-		    pGC->stipple = pPixmap;
-		}
-		break;
-	    case GCTileStipXOrigin:
-		NEXTVAL(INT16, pGC->patOrg.x);
-		break;
-	    case GCTileStipYOrigin:
-		NEXTVAL(INT16, pGC->patOrg.y);
-		break;
-	    case GCFont:
-    	    {
-		FontPtr	pFont;
-		NEXT_PTR(FontPtr, pFont);
-		pFont->refcnt++;
-		if (pGC->font)
-		    CloseFont(pGC->font, (Font)0);
-		pGC->font = pFont;
-		break;
-	    }
-	    case GCSubwindowMode:
-	    {
-		unsigned int newclipmode;
-		NEXTVAL(unsigned int, newclipmode);
-		if (newclipmode <= IncludeInferiors)
-		    pGC->subWindowMode = newclipmode;
-		else
-		{
-		    if (client)
-			client->errorValue = newclipmode;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCGraphicsExposures:
-    	    {
-		unsigned int newge;
-		NEXTVAL(unsigned int, newge);
-		if (newge <= xTrue)
-		    pGC->graphicsExposures = newge;
-		else
-		{
-		    if (client)
-			client->errorValue = newge;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    case GCClipXOrigin:
-		NEXTVAL(INT16, pGC->clipOrg.x);
-		break;
-	    case GCClipYOrigin:
-		NEXTVAL(INT16, pGC->clipOrg.y);
-		break;
-	    case GCClipMask:
-		NEXT_PTR(PixmapPtr, pPixmap);
-		if (pPixmap)
-		{
-		    if ((pPixmap->drawable.depth != 1) ||
-			(pPixmap->drawable.pScreen != pGC->pScreen))
-		    {
-			error = BadMatch;
-			break;
-		    }
-		    pPixmap->refcnt++;
-		}
-		(*pGC->funcs->ChangeClip)(pGC, pPixmap ? CT_PIXMAP : CT_NONE,
-					  (pointer)pPixmap, 0);
-		break;
-	    case GCDashOffset:
-		NEXTVAL(INT16, pGC->dashOffset);
-		break;
-	    case GCDashList:
-	    {
-		CARD8 newdash;
-		NEXTVAL(CARD8, newdash);
-		if (newdash == 4)
-		{
-		    if (pGC->dash != DefaultDash)
-		    {
-			free(pGC->dash);
-			pGC->numInDashList = 2;
-			pGC->dash = DefaultDash;
-		    }
-		}
-		else if (newdash != 0)
- 		{
-		    unsigned char *dash;
-
-		    dash = malloc(2 * sizeof(unsigned char));
-		    if (dash)
-		    {
-			if (pGC->dash != DefaultDash)
-			    free(pGC->dash);
-			pGC->numInDashList = 2;
-			pGC->dash = dash;
-			dash[0] = newdash;
-			dash[1] = newdash;
-		    }
-		    else
-			error = BadAlloc;
-		}
- 		else
-		{
-		   if (client)
-			client->errorValue = newdash;
-		   error = BadValue;
-		}
-		break;
-	    }
-	    case GCArcMode:
-	    {
-		unsigned int newarcmode;
-		NEXTVAL(unsigned int, newarcmode);
-		if (newarcmode <= ArcPieSlice)
-		    pGC->arcMode = newarcmode;
-		else
-		{
-		    if (client)
-			client->errorValue = newarcmode;
-		    error = BadValue;
-		}
-		break;
-	    }
-	    default:
-		if (client)
-		    client->errorValue = maskQ;
-		error = BadValue;
-		break;
-	}
-    } /* end while mask && !error */
-
-    if (pGC->fillStyle == FillTiled && pGC->tileIsPixel)
-    {
-	if (!CreateDefaultTile (pGC))
-	{
-	    pGC->fillStyle = FillSolid;
-	    error = BadAlloc;
-	}
+    maskQ = mask;               /* save these for when we walk the GCque */
+    while (mask && !error) {
+        index2 = (BITS32) lowbit(mask);
+        mask &= ~index2;
+        pGC->stateChanges |= index2;
+        switch (index2) {
+        case GCFunction:
+        {
+            CARD8 newalu;
+            NEXTVAL(CARD8, newalu);
+
+            if (newalu <= GXset)
+                pGC->alu = newalu;
+            else {
+                if (client)
+                    client->errorValue = newalu;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCPlaneMask:
+            NEXTVAL(unsigned long, pGC->planemask);
+
+            break;
+        case GCForeground:
+            NEXTVAL(unsigned long, pGC->fgPixel);
+
+            /*
+             * this is for CreateGC
+             */
+            if (!pGC->tileIsPixel && !pGC->tile.pixmap) {
+                pGC->tileIsPixel = TRUE;
+                pGC->tile.pixel = pGC->fgPixel;
+            }
+            break;
+        case GCBackground:
+            NEXTVAL(unsigned long, pGC->bgPixel);
+
+            break;
+        case GCLineWidth:      /* ??? line width is a CARD16 */
+            NEXTVAL(CARD16, pGC->lineWidth);
+
+            break;
+        case GCLineStyle:
+        {
+            unsigned int newlinestyle;
+            NEXTVAL(unsigned int, newlinestyle);
+
+            if (newlinestyle <= LineDoubleDash)
+                pGC->lineStyle = newlinestyle;
+            else {
+                if (client)
+                    client->errorValue = newlinestyle;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCCapStyle:
+        {
+            unsigned int newcapstyle;
+            NEXTVAL(unsigned int, newcapstyle);
+
+            if (newcapstyle <= CapProjecting)
+                pGC->capStyle = newcapstyle;
+            else {
+                if (client)
+                    client->errorValue = newcapstyle;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCJoinStyle:
+        {
+            unsigned int newjoinstyle;
+            NEXTVAL(unsigned int, newjoinstyle);
+
+            if (newjoinstyle <= JoinBevel)
+                pGC->joinStyle = newjoinstyle;
+            else {
+                if (client)
+                    client->errorValue = newjoinstyle;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCFillStyle:
+        {
+            unsigned int newfillstyle;
+            NEXTVAL(unsigned int, newfillstyle);
+
+            if (newfillstyle <= FillOpaqueStippled)
+                pGC->fillStyle = newfillstyle;
+            else {
+                if (client)
+                    client->errorValue = newfillstyle;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCFillRule:
+        {
+            unsigned int newfillrule;
+            NEXTVAL(unsigned int, newfillrule);
+
+            if (newfillrule <= WindingRule)
+                pGC->fillRule = newfillrule;
+            else {
+                if (client)
+                    client->errorValue = newfillrule;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCTile:
+            NEXT_PTR(PixmapPtr, pPixmap);
+
+            if ((pPixmap->drawable.depth != pGC->depth) ||
+                (pPixmap->drawable.pScreen != pGC->pScreen)) {
+                error = BadMatch;
+            }
+            else {
+                pPixmap->refcnt++;
+                if (!pGC->tileIsPixel)
+                    (*pGC->pScreen->DestroyPixmap) (pGC->tile.pixmap);
+                pGC->tileIsPixel = FALSE;
+                pGC->tile.pixmap = pPixmap;
+            }
+            break;
+        case GCStipple:
+            NEXT_PTR(PixmapPtr, pPixmap);
+
+            if ((pPixmap->drawable.depth != 1) ||
+                (pPixmap->drawable.pScreen != pGC->pScreen)) {
+                error = BadMatch;
+            }
+            else {
+                pPixmap->refcnt++;
+                if (pGC->stipple)
+                    (*pGC->pScreen->DestroyPixmap) (pGC->stipple);
+                pGC->stipple = pPixmap;
+            }
+            break;
+        case GCTileStipXOrigin:
+            NEXTVAL(INT16, pGC->patOrg.x);
+
+            break;
+        case GCTileStipYOrigin:
+            NEXTVAL(INT16, pGC->patOrg.y);
+
+            break;
+        case GCFont:
+        {
+            FontPtr pFont;
+            NEXT_PTR(FontPtr, pFont);
+
+            pFont->refcnt++;
+            if (pGC->font)
+                CloseFont(pGC->font, (Font) 0);
+            pGC->font = pFont;
+            break;
+        }
+        case GCSubwindowMode:
+        {
+            unsigned int newclipmode;
+            NEXTVAL(unsigned int, newclipmode);
+
+            if (newclipmode <= IncludeInferiors)
+                pGC->subWindowMode = newclipmode;
+            else {
+                if (client)
+                    client->errorValue = newclipmode;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCGraphicsExposures:
+        {
+            unsigned int newge;
+            NEXTVAL(unsigned int, newge);
+
+            if (newge <= xTrue)
+                pGC->graphicsExposures = newge;
+            else {
+                if (client)
+                    client->errorValue = newge;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCClipXOrigin:
+            NEXTVAL(INT16, pGC->clipOrg.x);
+
+            break;
+        case GCClipYOrigin:
+            NEXTVAL(INT16, pGC->clipOrg.y);
+
+            break;
+        case GCClipMask:
+            NEXT_PTR(PixmapPtr, pPixmap);
+
+            if (pPixmap) {
+                if ((pPixmap->drawable.depth != 1) ||
+                    (pPixmap->drawable.pScreen != pGC->pScreen)) {
+                    error = BadMatch;
+                    break;
+                }
+                pPixmap->refcnt++;
+            }
+            (*pGC->funcs->ChangeClip) (pGC, pPixmap ? CT_PIXMAP : CT_NONE,
+                                       (pointer) pPixmap, 0);
+            break;
+        case GCDashOffset:
+            NEXTVAL(INT16, pGC->dashOffset);
+
+            break;
+        case GCDashList:
+        {
+            CARD8 newdash;
+            NEXTVAL(CARD8, newdash);
+
+            if (newdash == 4) {
+                if (pGC->dash != DefaultDash) {
+                    free(pGC->dash);
+                    pGC->numInDashList = 2;
+                    pGC->dash = DefaultDash;
+                }
+            }
+            else if (newdash != 0) {
+                unsigned char *dash;
+
+                dash = malloc(2 * sizeof(unsigned char));
+                if (dash) {
+                    if (pGC->dash != DefaultDash)
+                        free(pGC->dash);
+                    pGC->numInDashList = 2;
+                    pGC->dash = dash;
+                    dash[0] = newdash;
+                    dash[1] = newdash;
+                }
+                else
+                    error = BadAlloc;
+            }
+            else {
+                if (client)
+                    client->errorValue = newdash;
+                error = BadValue;
+            }
+            break;
+        }
+        case GCArcMode:
+        {
+            unsigned int newarcmode;
+            NEXTVAL(unsigned int, newarcmode);
+
+            if (newarcmode <= ArcPieSlice)
+                pGC->arcMode = newarcmode;
+            else {
+                if (client)
+                    client->errorValue = newarcmode;
+                error = BadValue;
+            }
+            break;
+        }
+        default:
+            if (client)
+                client->errorValue = maskQ;
+            error = BadValue;
+            break;
+        }
+    }                           /* end while mask && !error */
+
+    if (pGC->fillStyle == FillTiled && pGC->tileIsPixel) {
+        if (!CreateDefaultTile(pGC)) {
+            pGC->fillStyle = FillSolid;
+            error = BadAlloc;
+        }
     }
-    (*pGC->funcs->ChangeGC)(pGC, maskQ);
+    (*pGC->funcs->ChangeGC) (pGC, maskQ);
     return error;
 }
 
@@ -424,42 +419,41 @@ static const struct {
     RESTYPE type;
     Mask access_mode;
 } xidfields[] = {
-    { GCTile, RT_PIXMAP, DixReadAccess },
-    { GCStipple, RT_PIXMAP, DixReadAccess },
-    { GCFont, RT_FONT, DixUseAccess },
-    { GCClipMask, RT_PIXMAP, DixReadAccess },
-};
+    {
+    GCTile, RT_PIXMAP, DixReadAccess}, {
+    GCStipple, RT_PIXMAP, DixReadAccess}, {
+    GCFont, RT_FONT, DixUseAccess}, {
+GCClipMask, RT_PIXMAP, DixReadAccess},};
 
 int
-ChangeGCXIDs(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32)
+ChangeGCXIDs(ClientPtr client, GC * pGC, BITS32 mask, CARD32 *pC32)
 {
     ChangeGCVal vals[GCLastBit + 1];
     int i;
-    if (mask & ~GCAllBits)
-    {
-	client->errorValue = mask;
-	return BadValue;
+
+    if (mask & ~GCAllBits) {
+        client->errorValue = mask;
+        return BadValue;
     }
-    for (i = Ones(mask); i--; )
-	vals[i].val = pC32[i];
-    for (i = 0; i < sizeof(xidfields) / sizeof(*xidfields); ++i)
-    {
-	int offset, rc;
-	if (!(mask & xidfields[i].mask))
-	    continue;
-	offset = Ones(mask & (xidfields[i].mask - 1));
-	if (xidfields[i].mask == GCClipMask && vals[offset].val == None)
-	{
-	    vals[offset].ptr = NullPixmap;
-	    continue;
-	}
-	rc = dixLookupResourceByType(&vals[offset].ptr, vals[offset].val,
-		xidfields[i].type, client, xidfields[i].access_mode);
-	if (rc != Success)
-	{
-	    client->errorValue = vals[offset].val;
-	    return rc;
-	}
+    for (i = Ones(mask); i--;)
+        vals[i].val = pC32[i];
+    for (i = 0; i < sizeof(xidfields) / sizeof(*xidfields); ++i) {
+        int offset, rc;
+
+        if (!(mask & xidfields[i].mask))
+            continue;
+        offset = Ones(mask & (xidfields[i].mask - 1));
+        if (xidfields[i].mask == GCClipMask && vals[offset].val == None) {
+            vals[offset].ptr = NullPixmap;
+            continue;
+        }
+        rc = dixLookupResourceByType(&vals[offset].ptr, vals[offset].val,
+                                     xidfields[i].type, client,
+                                     xidfields[i].access_mode);
+        if (rc != Success) {
+            client->errorValue = vals[offset].val;
+            return rc;
+        }
     }
     return ChangeGC(client, pGC, mask, vals);
 }
@@ -475,20 +469,19 @@ BUG:
 */
 GCPtr
 CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
-	 XID gcid, ClientPtr client)
+         XID gcid, ClientPtr client)
 {
     GCPtr pGC;
 
     pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
-    if (!pGC)
-    {
-	*pStatus = BadAlloc;
-	return (GCPtr)NULL;
+    if (!pGC) {
+        *pStatus = BadAlloc;
+        return (GCPtr) NULL;
     }
 
     pGC->pScreen = pDrawable->pScreen;
     pGC->depth = pDrawable->depth;
-    pGC->alu = GXcopy; /* dst <- src */
+    pGC->alu = GXcopy;          /* dst <- src */
     pGC->planemask = ~0;
     pGC->serialNumber = GC_CHANGE_SERIAL_BIT;
     pGC->funcs = 0;
@@ -503,17 +496,15 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->arcMode = ArcPieSlice;
     pGC->tile.pixel = 0;
     pGC->tile.pixmap = NullPixmap;
-    if (mask & GCForeground)
-    {
-	/*
-	 * magic special case -- ChangeGC checks for this condition
-	 * and snags the Foreground value to create a pseudo default-tile
-	 */
-	pGC->tileIsPixel = FALSE;
+    if (mask & GCForeground) {
+        /*
+         * magic special case -- ChangeGC checks for this condition
+         * and snags the Foreground value to create a pseudo default-tile
+         */
+        pGC->tileIsPixel = FALSE;
     }
-    else
-    {
-	pGC->tileIsPixel = TRUE;
+    else {
+        pGC->tileIsPixel = TRUE;
     }
 
     pGC->patOrg.x = 0;
@@ -523,7 +514,7 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->clipOrg.x = 0;
     pGC->clipOrg.y = 0;
     pGC->clientClipType = CT_NONE;
-    pGC->clientClip = (pointer)NULL;
+    pGC->clientClip = (pointer) NULL;
     pGC->numInDashList = 2;
     pGC->dash = DefaultDash;
     pGC->dashOffset = 0;
@@ -539,64 +530,63 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
 
     /* security creation/labeling check */
     *pStatus = XaceHook(XACE_RESOURCE_ACCESS, client, gcid, RT_GC, pGC,
-			RT_NONE, NULL, DixCreateAccess|DixSetAttrAccess);
+                        RT_NONE, NULL, DixCreateAccess | DixSetAttrAccess);
     if (*pStatus != Success)
-	goto out;
+        goto out;
 
     pGC->stateChanges = GCAllBits;
-    if (!(*pGC->pScreen->CreateGC)(pGC))
-	*pStatus = BadAlloc;
+    if (!(*pGC->pScreen->CreateGC) (pGC))
+        *pStatus = BadAlloc;
     else if (mask)
         *pStatus = ChangeGCXIDs(client, pGC, mask, pval);
     else
-	*pStatus = Success;
-
-out:
-    if (*pStatus != Success)
-    {
-	if (!pGC->tileIsPixel && !pGC->tile.pixmap)
-	    pGC->tileIsPixel = TRUE; /* undo special case */
-	FreeGC(pGC, (XID)0);
-	pGC = (GCPtr)NULL;
+        *pStatus = Success;
+
+ out:
+    if (*pStatus != Success) {
+        if (!pGC->tileIsPixel && !pGC->tile.pixmap)
+            pGC->tileIsPixel = TRUE;    /* undo special case */
+        FreeGC(pGC, (XID) 0);
+        pGC = (GCPtr) NULL;
     }
 
     return pGC;
 }
 
 static Bool
-CreateDefaultTile (GCPtr pGC)
+CreateDefaultTile(GCPtr pGC)
 {
-    ChangeGCVal	tmpval[3];
-    PixmapPtr 	pTile;
-    GCPtr	pgcScratch;
-    xRectangle	rect;
-    CARD16	w, h;
+    ChangeGCVal tmpval[3];
+    PixmapPtr pTile;
+    GCPtr pgcScratch;
+    xRectangle rect;
+    CARD16 w, h;
 
     w = 1;
     h = 1;
-    (*pGC->pScreen->QueryBestSize)(TileShape, &w, &h, pGC->pScreen);
+    (*pGC->pScreen->QueryBestSize) (TileShape, &w, &h, pGC->pScreen);
     pTile = (PixmapPtr)
-	    (*pGC->pScreen->CreatePixmap)(pGC->pScreen,
-					  w, h, pGC->depth, 0);
+        (*pGC->pScreen->CreatePixmap) (pGC->pScreen, w, h, pGC->depth, 0);
     pgcScratch = GetScratchGC(pGC->depth, pGC->pScreen);
-    if (!pTile || !pgcScratch)
-    {
-	if (pTile)
-	    (*pTile->drawable.pScreen->DestroyPixmap)(pTile);
-	if (pgcScratch)
-	    FreeScratchGC(pgcScratch);
-	return FALSE;
+    if (!pTile || !pgcScratch) {
+        if (pTile)
+            (*pTile->drawable.pScreen->DestroyPixmap) (pTile);
+        if (pgcScratch)
+            FreeScratchGC(pgcScratch);
+        return FALSE;
     }
     tmpval[0].val = GXcopy;
     tmpval[1].val = pGC->tile.pixel;
     tmpval[2].val = FillSolid;
-    (void)ChangeGC(NullClient, pgcScratch, GCFunction | GCForeground | GCFillStyle, tmpval);
-    ValidateGC((DrawablePtr)pTile, pgcScratch);
+    (void) ChangeGC(NullClient, pgcScratch,
+                    GCFunction | GCForeground | GCFillStyle, tmpval);
+    ValidateGC((DrawablePtr) pTile, pgcScratch);
     rect.x = 0;
     rect.y = 0;
     rect.width = w;
     rect.height = h;
-    (*pgcScratch->ops->PolyFillRect)((DrawablePtr)pTile, pgcScratch, 1, &rect);
+    (*pgcScratch->ops->PolyFillRect) ((DrawablePtr) pTile, pgcScratch, 1,
+                                      &rect);
     /* Always remember to free the scratch graphics context after use. */
     FreeScratchGC(pgcScratch);
 
@@ -606,156 +596,146 @@ CreateDefaultTile (GCPtr pGC)
 }
 
 int
-CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
+CopyGC(GC * pgcSrc, GC * pgcDst, BITS32 mask)
 {
-    BITS32	index2;
-    BITS32	maskQ;
-    int 	error = 0;
+    BITS32 index2;
+    BITS32 maskQ;
+    int error = 0;
 
     if (pgcSrc == pgcDst)
-	return Success;
+        return Success;
     pgcDst->serialNumber |= GC_CHANGE_SERIAL_BIT;
     pgcDst->stateChanges |= mask;
     maskQ = mask;
-    while (mask)
-    {
-	index2 = (BITS32) lowbit (mask);
-	mask &= ~index2;
-	switch (index2)
-	{
-	    case GCFunction:
-		pgcDst->alu = pgcSrc->alu;
-		break;
-	    case GCPlaneMask:
-		pgcDst->planemask = pgcSrc->planemask;
-		break;
-	    case GCForeground:
-		pgcDst->fgPixel = pgcSrc->fgPixel;
-		break;
-	    case GCBackground:
-		pgcDst->bgPixel = pgcSrc->bgPixel;
-		break;
-	    case GCLineWidth:
-		pgcDst->lineWidth = pgcSrc->lineWidth;
-		break;
-	    case GCLineStyle:
-		pgcDst->lineStyle = pgcSrc->lineStyle;
-		break;
-	    case GCCapStyle:
-		pgcDst->capStyle = pgcSrc->capStyle;
-		break;
-	    case GCJoinStyle:
-		pgcDst->joinStyle = pgcSrc->joinStyle;
-		break;
-	    case GCFillStyle:
-		pgcDst->fillStyle = pgcSrc->fillStyle;
-		break;
-	    case GCFillRule:
-		pgcDst->fillRule = pgcSrc->fillRule;
-		break;
-	    case GCTile:
-		{
-		    if (EqualPixUnion(pgcDst->tileIsPixel,
-				      pgcDst->tile,
-				      pgcSrc->tileIsPixel,
-				      pgcSrc->tile))
-		    {
-			break;
-		    }
-		    if (!pgcDst->tileIsPixel)
-			(* pgcDst->pScreen->DestroyPixmap)(pgcDst->tile.pixmap);
-		    pgcDst->tileIsPixel = pgcSrc->tileIsPixel;
-		    pgcDst->tile = pgcSrc->tile;
-		    if (!pgcDst->tileIsPixel)
-		       pgcDst->tile.pixmap->refcnt++;
-		    break;
-		}
-	    case GCStipple:
-		{
-		    if (pgcDst->stipple == pgcSrc->stipple)
-			break;
-		    if (pgcDst->stipple)
-			(* pgcDst->pScreen->DestroyPixmap)(pgcDst->stipple);
-		    pgcDst->stipple = pgcSrc->stipple;
-		    if (pgcDst->stipple)
-			pgcDst->stipple->refcnt ++;
-		    break;
-		}
-	    case GCTileStipXOrigin:
-		pgcDst->patOrg.x = pgcSrc->patOrg.x;
-		break;
-	    case GCTileStipYOrigin:
-		pgcDst->patOrg.y = pgcSrc->patOrg.y;
-		break;
-	    case GCFont:
-		if (pgcDst->font == pgcSrc->font)
-		    break;
-		if (pgcDst->font)
-		    CloseFont(pgcDst->font, (Font)0);
-		if ((pgcDst->font = pgcSrc->font) != NullFont)
-		    (pgcDst->font)->refcnt++;
-		break;
-	    case GCSubwindowMode:
-		pgcDst->subWindowMode = pgcSrc->subWindowMode;
-		break;
-	    case GCGraphicsExposures:
-		pgcDst->graphicsExposures = pgcSrc->graphicsExposures;
-		break;
-	    case GCClipXOrigin:
-		pgcDst->clipOrg.x = pgcSrc->clipOrg.x;
-		break;
-	    case GCClipYOrigin:
-		pgcDst->clipOrg.y = pgcSrc->clipOrg.y;
-		break;
-	    case GCClipMask:
-		(* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);
-		break;
-	    case GCDashOffset:
-		pgcDst->dashOffset = pgcSrc->dashOffset;
-		break;
-	    case GCDashList:
-		if (pgcSrc->dash == DefaultDash)
-		{
-		    if (pgcDst->dash != DefaultDash)
-		    {
-			free(pgcDst->dash);
-			pgcDst->numInDashList = pgcSrc->numInDashList;
-			pgcDst->dash = pgcSrc->dash;
-		    }
-		}
-		else
-		{
-		    unsigned char *dash;
-		    unsigned int i;
-
-		    dash = malloc(pgcSrc->numInDashList * sizeof(unsigned char));
-		    if (dash)
-		    {
-			if (pgcDst->dash != DefaultDash)
-			    free(pgcDst->dash);
-			pgcDst->numInDashList = pgcSrc->numInDashList;
-			pgcDst->dash = dash;
-			for (i=0; i<pgcSrc->numInDashList; i++)
-			    dash[i] = pgcSrc->dash[i];
-		    }
-		    else
-			error = BadAlloc;
-		}
-		break;
-	    case GCArcMode:
-		pgcDst->arcMode = pgcSrc->arcMode;
-		break;
-	    default:
-		FatalError ("CopyGC: Unhandled mask!\n");
-	}
+    while (mask) {
+        index2 = (BITS32) lowbit(mask);
+        mask &= ~index2;
+        switch (index2) {
+        case GCFunction:
+            pgcDst->alu = pgcSrc->alu;
+            break;
+        case GCPlaneMask:
+            pgcDst->planemask = pgcSrc->planemask;
+            break;
+        case GCForeground:
+            pgcDst->fgPixel = pgcSrc->fgPixel;
+            break;
+        case GCBackground:
+            pgcDst->bgPixel = pgcSrc->bgPixel;
+            break;
+        case GCLineWidth:
+            pgcDst->lineWidth = pgcSrc->lineWidth;
+            break;
+        case GCLineStyle:
+            pgcDst->lineStyle = pgcSrc->lineStyle;
+            break;
+        case GCCapStyle:
+            pgcDst->capStyle = pgcSrc->capStyle;
+            break;
+        case GCJoinStyle:
+            pgcDst->joinStyle = pgcSrc->joinStyle;
+            break;
+        case GCFillStyle:
+            pgcDst->fillStyle = pgcSrc->fillStyle;
+            break;
+        case GCFillRule:
+            pgcDst->fillRule = pgcSrc->fillRule;
+            break;
+        case GCTile:
+        {
+            if (EqualPixUnion(pgcDst->tileIsPixel,
+                              pgcDst->tile,
+                              pgcSrc->tileIsPixel, pgcSrc->tile)) {
+                break;
+            }
+            if (!pgcDst->tileIsPixel)
+                (*pgcDst->pScreen->DestroyPixmap) (pgcDst->tile.pixmap);
+            pgcDst->tileIsPixel = pgcSrc->tileIsPixel;
+            pgcDst->tile = pgcSrc->tile;
+            if (!pgcDst->tileIsPixel)
+                pgcDst->tile.pixmap->refcnt++;
+            break;
+        }
+        case GCStipple:
+        {
+            if (pgcDst->stipple == pgcSrc->stipple)
+                break;
+            if (pgcDst->stipple)
+                (*pgcDst->pScreen->DestroyPixmap) (pgcDst->stipple);
+            pgcDst->stipple = pgcSrc->stipple;
+            if (pgcDst->stipple)
+                pgcDst->stipple->refcnt++;
+            break;
+        }
+        case GCTileStipXOrigin:
+            pgcDst->patOrg.x = pgcSrc->patOrg.x;
+            break;
+        case GCTileStipYOrigin:
+            pgcDst->patOrg.y = pgcSrc->patOrg.y;
+            break;
+        case GCFont:
+            if (pgcDst->font == pgcSrc->font)
+                break;
+            if (pgcDst->font)
+                CloseFont(pgcDst->font, (Font) 0);
+            if ((pgcDst->font = pgcSrc->font) != NullFont)
+                (pgcDst->font)->refcnt++;
+            break;
+        case GCSubwindowMode:
+            pgcDst->subWindowMode = pgcSrc->subWindowMode;
+            break;
+        case GCGraphicsExposures:
+            pgcDst->graphicsExposures = pgcSrc->graphicsExposures;
+            break;
+        case GCClipXOrigin:
+            pgcDst->clipOrg.x = pgcSrc->clipOrg.x;
+            break;
+        case GCClipYOrigin:
+            pgcDst->clipOrg.y = pgcSrc->clipOrg.y;
+            break;
+        case GCClipMask:
+            (*pgcDst->funcs->CopyClip) (pgcDst, pgcSrc);
+            break;
+        case GCDashOffset:
+            pgcDst->dashOffset = pgcSrc->dashOffset;
+            break;
+        case GCDashList:
+            if (pgcSrc->dash == DefaultDash) {
+                if (pgcDst->dash != DefaultDash) {
+                    free(pgcDst->dash);
+                    pgcDst->numInDashList = pgcSrc->numInDashList;
+                    pgcDst->dash = pgcSrc->dash;
+                }
+            }
+            else {
+                unsigned char *dash;
+                unsigned int i;
+
+                dash = malloc(pgcSrc->numInDashList * sizeof(unsigned char));
+                if (dash) {
+                    if (pgcDst->dash != DefaultDash)
+                        free(pgcDst->dash);
+                    pgcDst->numInDashList = pgcSrc->numInDashList;
+                    pgcDst->dash = dash;
+                    for (i = 0; i < pgcSrc->numInDashList; i++)
+                        dash[i] = pgcSrc->dash[i];
+                }
+                else
+                    error = BadAlloc;
+            }
+            break;
+        case GCArcMode:
+            pgcDst->arcMode = pgcSrc->arcMode;
+            break;
+        default:
+            FatalError("CopyGC: Unhandled mask!\n");
+        }
     }
-    if (pgcDst->fillStyle == FillTiled && pgcDst->tileIsPixel)
-    {
-	if (!CreateDefaultTile (pgcDst))
-	{
-	    pgcDst->fillStyle = FillSolid;
-	    error = BadAlloc;
-	}
+    if (pgcDst->fillStyle == FillTiled && pgcDst->tileIsPixel) {
+        if (!CreateDefaultTile(pgcDst)) {
+            pgcDst->fillStyle = FillSolid;
+            error = BadAlloc;
+        }
     }
     (*pgcDst->funcs->CopyGC) (pgcSrc, maskQ, pgcDst);
     return error;
@@ -769,19 +749,19 @@ CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
 int
 FreeGC(pointer value, XID gid)
 {
-    GCPtr pGC = (GCPtr)value;
+    GCPtr pGC = (GCPtr) value;
 
-    CloseFont(pGC->font, (Font)0);
-    (* pGC->funcs->DestroyClip)(pGC);
+    CloseFont(pGC->font, (Font) 0);
+    (*pGC->funcs->DestroyClip) (pGC);
 
     if (!pGC->tileIsPixel)
-	(* pGC->pScreen->DestroyPixmap)(pGC->tile.pixmap);
+        (*pGC->pScreen->DestroyPixmap) (pGC->tile.pixmap);
     if (pGC->stipple)
-	(* pGC->pScreen->DestroyPixmap)(pGC->stipple);
+        (*pGC->pScreen->DestroyPixmap) (pGC->stipple);
 
     (*pGC->funcs->DestroyGC) (pGC);
     if (pGC->dash != DefaultDash)
-	free(pGC->dash);
+        free(pGC->dash);
     dixFreeObjectWithPrivates(pGC, PRIVATE_GC);
     return Success;
 }
@@ -806,11 +786,11 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
 
     pGC = dixAllocateObjectWithPrivates(GC, PRIVATE_GC);
     if (!pGC)
-	return (GCPtr)NULL;
+        return (GCPtr) NULL;
 
     pGC->pScreen = pScreen;
     pGC->depth = depth;
-    pGC->alu = GXcopy; /* dst <- src */
+    pGC->alu = GXcopy;          /* dst <- src */
     pGC->planemask = ~0;
     pGC->serialNumber = 0;
     pGC->fgPixel = 0;
@@ -823,8 +803,8 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
     pGC->fillRule = EvenOddRule;
     pGC->arcMode = ArcPieSlice;
     pGC->font = defaultFont;
-    if ( pGC->font)  /* necessary, because open of default font could fail */
-	pGC->font->refcnt++;
+    if (pGC->font)              /* necessary, because open of default font could fail */
+        pGC->font->refcnt++;
     pGC->tileIsPixel = TRUE;
     pGC->tile.pixel = 0;
     pGC->tile.pixmap = NullPixmap;
@@ -844,10 +824,9 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
     pGC->scratch_inuse = FALSE;
 
     pGC->stateChanges = GCAllBits;
-    if (!(*pScreen->CreateGC)(pGC))
-    {
-	FreeGC(pGC, (XID)0);
-	pGC = (GCPtr)NULL;
+    if (!(*pScreen->CreateGC) (pGC)) {
+        FreeGC(pGC, (XID) 0);
+        pGC = (GCPtr) NULL;
     }
     return pGC;
 }
@@ -862,14 +841,12 @@ FreeGCperDepth(int screenNum)
     pScreen = screenInfo.screens[screenNum];
     ppGC = pScreen->GCperDepth;
 
-    for (i = 0; i <= pScreen->numDepths; i++)
-    {
-	(void)FreeGC(ppGC[i], (XID)0);
-	ppGC[i] = NULL;
+    for (i = 0; i <= pScreen->numDepths; i++) {
+        (void) FreeGC(ppGC[i], (XID) 0);
+        ppGC[i] = NULL;
     }
 }
 
-
 Bool
 CreateGCperDepth(int screenNum)
 {
@@ -882,22 +859,20 @@ CreateGCperDepth(int screenNum)
     ppGC = pScreen->GCperDepth;
     /* do depth 1 separately because it's not included in list */
     if (!(ppGC[0] = CreateScratchGC(pScreen, 1)))
-	return FALSE;
+        return FALSE;
     ppGC[0]->graphicsExposures = FALSE;
     /* Make sure we don't overflow GCperDepth[] */
-    if( pScreen->numDepths > MAXFORMATS )
-	    return FALSE;
+    if (pScreen->numDepths > MAXFORMATS)
+        return FALSE;
 
     pDepth = pScreen->allowedDepths;
-    for (i=0; i<pScreen->numDepths; i++, pDepth++)
-    {
-	if (!(ppGC[i+1] = CreateScratchGC(pScreen, pDepth->depth)))
-	{
-	    for (; i >= 0; i--)
-		(void)FreeGC(ppGC[i], (XID)0);
-	    return FALSE;
-	}
-	ppGC[i+1]->graphicsExposures = FALSE;
+    for (i = 0; i < pScreen->numDepths; i++, pDepth++) {
+        if (!(ppGC[i + 1] = CreateScratchGC(pScreen, pDepth->depth))) {
+            for (; i >= 0; i--)
+                (void) FreeGC(ppGC[i], (XID) 0);
+            return FALSE;
+        }
+        ppGC[i + 1]->graphicsExposures = FALSE;
     }
     return TRUE;
 }
@@ -915,28 +890,28 @@ CreateDefaultStipple(int screenNum)
 
     w = 16;
     h = 16;
-    (* pScreen->QueryBestSize)(StippleShape, &w, &h, pScreen);
+    (*pScreen->QueryBestSize) (StippleShape, &w, &h, pScreen);
     if (!(pScreen->PixmapPerDepth[0] =
-			(*pScreen->CreatePixmap)(pScreen, w, h, 1, 0)))
-	return FALSE;
+          (*pScreen->CreatePixmap) (pScreen, w, h, 1, 0)))
+        return FALSE;
     /* fill stipple with 1 */
     tmpval[0].val = GXcopy;
     tmpval[1].val = 1;
     tmpval[2].val = FillSolid;
     pgcScratch = GetScratchGC(1, pScreen);
-    if (!pgcScratch)
-    {
-	(*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]);
-	return FALSE;
+    if (!pgcScratch) {
+        (*pScreen->DestroyPixmap) (pScreen->PixmapPerDepth[0]);
+        return FALSE;
     }
-    (void)ChangeGC(NullClient, pgcScratch, GCFunction|GCForeground|GCFillStyle, tmpval);
-    ValidateGC((DrawablePtr)pScreen->PixmapPerDepth[0], pgcScratch);
+    (void) ChangeGC(NullClient, pgcScratch,
+                    GCFunction | GCForeground | GCFillStyle, tmpval);
+    ValidateGC((DrawablePtr) pScreen->PixmapPerDepth[0], pgcScratch);
     rect.x = 0;
     rect.y = 0;
     rect.width = w;
     rect.height = h;
-    (*pgcScratch->ops->PolyFillRect)((DrawablePtr)pScreen->PixmapPerDepth[0], 
-				     pgcScratch, 1, &rect);
+    (*pgcScratch->ops->PolyFillRect) ((DrawablePtr) pScreen->PixmapPerDepth[0],
+                                      pgcScratch, 1, &rect);
     FreeScratchGC(pgcScratch);
     return TRUE;
 }
@@ -945,7 +920,8 @@ void
 FreeDefaultStipple(int screenNum)
 {
     ScreenPtr pScreen = screenInfo.screens[screenNum];
-    (*pScreen->DestroyPixmap)(pScreen->PixmapPerDepth[0]);
+
+    (*pScreen->DestroyPixmap) (pScreen->PixmapPerDepth[0]);
 }
 
 int
@@ -957,133 +933,121 @@ SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
 
     i = ndash;
     p = pdash;
-    while (i--)
-    {
-	if (!*p++)
-	{
-	    /* dash segment must be > 0 */
-	    return BadValue;
-	}
+    while (i--) {
+        if (!*p++) {
+            /* dash segment must be > 0 */
+            return BadValue;
+        }
     }
 
     if (ndash & 1)
-	p = malloc(2 * ndash * sizeof(unsigned char));
+        p = malloc(2 * ndash * sizeof(unsigned char));
     else
-	p = malloc(ndash * sizeof(unsigned char));
+        p = malloc(ndash * sizeof(unsigned char));
     if (!p)
-	return BadAlloc;
+        return BadAlloc;
 
     pGC->serialNumber |= GC_CHANGE_SERIAL_BIT;
-    if (offset != pGC->dashOffset)
-    {
-	pGC->dashOffset = offset;
-	pGC->stateChanges |= GCDashOffset;
-	maskQ |= GCDashOffset;
+    if (offset != pGC->dashOffset) {
+        pGC->dashOffset = offset;
+        pGC->stateChanges |= GCDashOffset;
+        maskQ |= GCDashOffset;
     }
 
     if (pGC->dash != DefaultDash)
-	free(pGC->dash);
+        free(pGC->dash);
     pGC->numInDashList = ndash;
     pGC->dash = p;
-    if (ndash & 1)
-    {
-	pGC->numInDashList += ndash;
-	indash = pdash;
-	i = ndash;
-	while (i--)
-	    *p++ = *indash++;
+    if (ndash & 1) {
+        pGC->numInDashList += ndash;
+        indash = pdash;
+        i = ndash;
+        while (i--)
+            *p++ = *indash++;
     }
-    while(ndash--)
-	*p++ = *pdash++;
+    while (ndash--)
+        *p++ = *pdash++;
     pGC->stateChanges |= GCDashList;
     maskQ |= GCDashList;
 
     if (pGC->funcs->ChangeGC)
-	(*pGC->funcs->ChangeGC) (pGC, maskQ);
+        (*pGC->funcs->ChangeGC) (pGC, maskQ);
     return Success;
 }
 
 int
 VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
 {
-    xRectangle	*prectP, *prectN;
-    int	i;
+    xRectangle *prectP, *prectN;
+    int i;
 
-    switch(ordering)
-    {
-      case Unsorted:
-	  return CT_UNSORTED;
-      case YSorted:
-	  if(nrects > 1)
-	  {
-	      for(i = 1, prectP = prects, prectN = prects + 1;
-		  i < nrects;
-		  i++, prectP++, prectN++)
-		  if(prectN->y < prectP->y)
-		      return -1;
-	  }
-	  return CT_YSORTED;
-      case YXSorted:
-	  if(nrects > 1)
-	  {
-	      for(i = 1, prectP = prects, prectN = prects + 1;
-		  i < nrects;
-		  i++, prectP++, prectN++)
-		  if((prectN->y < prectP->y) ||
-		      ( (prectN->y == prectP->y) &&
-		        (prectN->x < prectP->x) ) )
-		      return -1;
-	  }
-	  return CT_YXSORTED;
-      case YXBanded:
-	  if(nrects > 1)
-	  {
-	      for(i = 1, prectP = prects, prectN = prects + 1;
-		  i < nrects;
-		  i++, prectP++, prectN++)
-		  if((prectN->y != prectP->y &&
- 		      prectN->y < prectP->y + (int) prectP->height) ||
-		     ((prectN->y == prectP->y) &&
-		      (prectN->height != prectP->height ||
-		       prectN->x < prectP->x + (int) prectP->width)))
-		      return -1;
-	  }
-	  return CT_YXBANDED;
+    switch (ordering) {
+    case Unsorted:
+        return CT_UNSORTED;
+    case YSorted:
+        if (nrects > 1) {
+            for (i = 1, prectP = prects, prectN = prects + 1;
+                 i < nrects; i++, prectP++, prectN++)
+                if (prectN->y < prectP->y)
+                    return -1;
+        }
+        return CT_YSORTED;
+    case YXSorted:
+        if (nrects > 1) {
+            for (i = 1, prectP = prects, prectN = prects + 1;
+                 i < nrects; i++, prectP++, prectN++)
+                if ((prectN->y < prectP->y) ||
+                    ((prectN->y == prectP->y) && (prectN->x < prectP->x)))
+                    return -1;
+        }
+        return CT_YXSORTED;
+    case YXBanded:
+        if (nrects > 1) {
+            for (i = 1, prectP = prects, prectN = prects + 1;
+                 i < nrects; i++, prectP++, prectN++)
+                if ((prectN->y != prectP->y &&
+                     prectN->y < prectP->y + (int) prectP->height) ||
+                    ((prectN->y == prectP->y) &&
+                     (prectN->height != prectP->height ||
+                      prectN->x < prectP->x + (int) prectP->width)))
+                    return -1;
+        }
+        return CT_YXBANDED;
     }
     return -1;
 }
 
 int
-SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects, 
+SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
              xRectangle *prects, int ordering)
 {
-    int			newct, size;
-    xRectangle 		*prectsNew;
+    int newct, size;
+    xRectangle *prectsNew;
 
     newct = VerifyRectOrder(nrects, prects, ordering);
     if (newct < 0)
-	return BadMatch;
+        return BadMatch;
     size = nrects * sizeof(xRectangle);
     prectsNew = malloc(size);
     if (!prectsNew && size)
-	return BadAlloc;
+        return BadAlloc;
 
     pGC->serialNumber |= GC_CHANGE_SERIAL_BIT;
     pGC->clipOrg.x = xOrigin;
     pGC->stateChanges |= GCClipXOrigin;
-		 
+
     pGC->clipOrg.y = yOrigin;
     pGC->stateChanges |= GCClipYOrigin;
 
     if (size)
-	memmove((char *)prectsNew, (char *)prects, size);
-    (*pGC->funcs->ChangeClip)(pGC, newct, (pointer)prectsNew, nrects);
+        memmove((char *) prectsNew, (char *) prects, size);
+    (*pGC->funcs->ChangeClip) (pGC, newct, (pointer) prectsNew, nrects);
     if (pGC->funcs->ChangeGC)
-	(*pGC->funcs->ChangeGC) (pGC, GCClipXOrigin|GCClipYOrigin|GCClipMask);
+        (*pGC->funcs->ChangeGC) (pGC,
+                                 GCClipXOrigin | GCClipYOrigin | GCClipMask);
     return Success;
 }
 
-
 /*
    sets reasonable defaults 
    if we can get a pre-allocated one, use it and mark it as used.
@@ -1096,41 +1060,39 @@ GetScratchGC(unsigned depth, ScreenPtr pScreen)
     int i;
     GCPtr pGC;
 
-    for (i=0; i<=pScreen->numDepths; i++)
-    {
-	pGC = pScreen->GCperDepth[i];
-	if (pGC && pGC->depth == depth && !pGC->scratch_inuse)
-	{
-	    pGC->scratch_inuse = TRUE;
-
-	    pGC->alu = GXcopy;
-	    pGC->planemask = ~0;
-	    pGC->serialNumber = 0;
-	    pGC->fgPixel = 0;
-	    pGC->bgPixel = 1;
-	    pGC->lineWidth = 0;
-	    pGC->lineStyle = LineSolid;
-	    pGC->capStyle = CapButt;
-	    pGC->joinStyle = JoinMiter;
-	    pGC->fillStyle = FillSolid;
-	    pGC->fillRule = EvenOddRule;
-	    pGC->arcMode = ArcChord;
-	    pGC->patOrg.x = 0;
-	    pGC->patOrg.y = 0;
-	    pGC->subWindowMode = ClipByChildren;
-	    pGC->graphicsExposures = FALSE;
-	    pGC->clipOrg.x = 0;
-	    pGC->clipOrg.y = 0;
-	    if (pGC->clientClipType != CT_NONE)
-		(*pGC->funcs->ChangeClip) (pGC, CT_NONE, NULL, 0);
-	    pGC->stateChanges = GCAllBits;
-	    return pGC;
-	}
+    for (i = 0; i <= pScreen->numDepths; i++) {
+        pGC = pScreen->GCperDepth[i];
+        if (pGC && pGC->depth == depth && !pGC->scratch_inuse) {
+            pGC->scratch_inuse = TRUE;
+
+            pGC->alu = GXcopy;
+            pGC->planemask = ~0;
+            pGC->serialNumber = 0;
+            pGC->fgPixel = 0;
+            pGC->bgPixel = 1;
+            pGC->lineWidth = 0;
+            pGC->lineStyle = LineSolid;
+            pGC->capStyle = CapButt;
+            pGC->joinStyle = JoinMiter;
+            pGC->fillStyle = FillSolid;
+            pGC->fillRule = EvenOddRule;
+            pGC->arcMode = ArcChord;
+            pGC->patOrg.x = 0;
+            pGC->patOrg.y = 0;
+            pGC->subWindowMode = ClipByChildren;
+            pGC->graphicsExposures = FALSE;
+            pGC->clipOrg.x = 0;
+            pGC->clipOrg.y = 0;
+            if (pGC->clientClipType != CT_NONE)
+                (*pGC->funcs->ChangeClip) (pGC, CT_NONE, NULL, 0);
+            pGC->stateChanges = GCAllBits;
+            return pGC;
+        }
     }
     /* if we make it this far, need to roll our own */
     pGC = CreateScratchGC(pScreen, depth);
     if (pGC)
-	pGC->graphicsExposures = FALSE;
+        pGC->graphicsExposures = FALSE;
     return pGC;
 }
 
@@ -1143,7 +1105,7 @@ void
 FreeScratchGC(GCPtr pGC)
 {
     if (pGC->scratch_inuse)
-	pGC->scratch_inuse = FALSE;
+        pGC->scratch_inuse = FALSE;
     else
-	FreeGC(pGC, (GContext)0);
+        FreeGC(pGC, (GContext) 0);
 }