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, 384 insertions, 443 deletions

diff --git a/mi/mi.h b/mi/mi.h
index 24d1af911..638fc6bc7 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -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
@@ -62,538 +61,480 @@ SOFTWARE.
 #define MiBits	CARD32
 
 typedef struct _miDash *miDashPtr;
+
 #define EVEN_DASH	0
 #define ODD_DASH	~0
 
 /* miarc.c */
 
-extern _X_EXPORT void miPolyArc(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*narcs*/,
-    xArc * /*parcs*/
-);
+extern _X_EXPORT void miPolyArc(DrawablePtr /*pDraw */ ,
+                                GCPtr /*pGC */ ,
+                                int /*narcs */ ,
+                                xArc *  /*parcs */
+    );
 
 /* mibitblt.c */
 
-extern _X_EXPORT RegionPtr miCopyArea(
-    DrawablePtr /*pSrcDrawable*/,
-    DrawablePtr /*pDstDrawable*/,
-    GCPtr /*pGC*/,
-    int /*xIn*/,
-    int /*yIn*/,
-    int /*widthSrc*/,
-    int /*heightSrc*/,
-    int /*xOut*/,
-    int /*yOut*/
-);
-
-extern _X_EXPORT RegionPtr miCopyPlane(
-    DrawablePtr /*pSrcDrawable*/,
-    DrawablePtr /*pDstDrawable*/,
-    GCPtr /*pGC*/,
-    int /*srcx*/,
-    int /*srcy*/,
-    int /*width*/,
-    int /*height*/,
-    int /*dstx*/,
-    int /*dsty*/,
-    unsigned long /*bitPlane*/
-);
-
-extern _X_EXPORT void miGetImage(
-    DrawablePtr /*pDraw*/,
-    int /*sx*/,
-    int /*sy*/,
-    int /*w*/,
-    int /*h*/,
-    unsigned int /*format*/,
-    unsigned long /*planeMask*/,
-    char * /*pdstLine*/
-);
-
-extern _X_EXPORT void miPutImage(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*depth*/,
-    int /*x*/,
-    int /*y*/,
-    int /*w*/,
-    int /*h*/,
-    int /*leftPad*/,
-    int /*format*/,
-    char * /*pImage*/
-);
+extern _X_EXPORT RegionPtr miCopyArea(DrawablePtr /*pSrcDrawable */ ,
+                                      DrawablePtr /*pDstDrawable */ ,
+                                      GCPtr /*pGC */ ,
+                                      int /*xIn */ ,
+                                      int /*yIn */ ,
+                                      int /*widthSrc */ ,
+                                      int /*heightSrc */ ,
+                                      int /*xOut */ ,
+                                      int       /*yOut */
+    );
+
+extern _X_EXPORT RegionPtr miCopyPlane(DrawablePtr /*pSrcDrawable */ ,
+                                       DrawablePtr /*pDstDrawable */ ,
+                                       GCPtr /*pGC */ ,
+                                       int /*srcx */ ,
+                                       int /*srcy */ ,
+                                       int /*width */ ,
+                                       int /*height */ ,
+                                       int /*dstx */ ,
+                                       int /*dsty */ ,
+                                       unsigned long    /*bitPlane */
+    );
+
+extern _X_EXPORT void miGetImage(DrawablePtr /*pDraw */ ,
+                                 int /*sx */ ,
+                                 int /*sy */ ,
+                                 int /*w */ ,
+                                 int /*h */ ,
+                                 unsigned int /*format */ ,
+                                 unsigned long /*planeMask */ ,
+                                 char * /*pdstLine */
+    );
+
+extern _X_EXPORT void miPutImage(DrawablePtr /*pDraw */ ,
+                                 GCPtr /*pGC */ ,
+                                 int /*depth */ ,
+                                 int /*x */ ,
+                                 int /*y */ ,
+                                 int /*w */ ,
+                                 int /*h */ ,
+                                 int /*leftPad */ ,
+                                 int /*format */ ,
+                                 char * /*pImage */
+    );
 
 /* micopy.c  */
 
 #define miGetCompositeClip(pGC) ((pGC)->pCompositeClip)
 
-typedef void	(*miCopyProc) (DrawablePtr  pSrcDrawable,
-			       DrawablePtr  pDstDrawable,
-			       GCPtr	    pGC,
-			       BoxPtr	    pDstBox,
-			       int	    nbox,
-			       int	    dx,
-			       int	    dy,
-			       Bool	    reverse,
-			       Bool	    upsidedown,
-			       Pixel	    bitplane,
-			       void	    *closure);
+typedef void (*miCopyProc) (DrawablePtr pSrcDrawable,
+                            DrawablePtr pDstDrawable,
+                            GCPtr pGC,
+                            BoxPtr pDstBox,
+                            int nbox,
+                            int dx,
+                            int dy,
+                            Bool reverse,
+                            Bool upsidedown, Pixel bitplane, void *closure);
 
 extern _X_EXPORT void
-miCopyRegion (DrawablePtr   pSrcDrawable,
-	      DrawablePtr   pDstDrawable,
-	      GCPtr	    pGC,
-	      RegionPtr	    pDstRegion,
-	      int	    dx,
-	      int	    dy,
-	      miCopyProc    copyProc,
-	      Pixel	    bitPlane,
-	      void	    *closure);
+
+miCopyRegion(DrawablePtr pSrcDrawable,
+             DrawablePtr pDstDrawable,
+             GCPtr pGC,
+             RegionPtr pDstRegion,
+             int dx,
+             int dy, miCopyProc copyProc, Pixel bitPlane, void *closure);
 
 extern _X_EXPORT RegionPtr
-miDoCopy (DrawablePtr	pSrcDrawable,
-	  DrawablePtr	pDstDrawable,
-	  GCPtr		pGC,
-	  int		xIn, 
-	  int		yIn,
-	  int		widthSrc, 
-	  int		heightSrc,
-	  int		xOut, 
-	  int		yOut,
-	  miCopyProc	copyProc,
-	  Pixel		bitplane,
-	  void		*closure);
+
+miDoCopy(DrawablePtr pSrcDrawable,
+         DrawablePtr pDstDrawable,
+         GCPtr pGC,
+         int xIn,
+         int yIn,
+         int widthSrc,
+         int heightSrc,
+         int xOut,
+         int yOut, miCopyProc copyProc, Pixel bitplane, void *closure);
 
 /* micursor.c */
 
-extern _X_EXPORT void miRecolorCursor(
-    DeviceIntPtr /* pDev */,
-    ScreenPtr /*pScr*/,
-    CursorPtr /*pCurs*/,
-    Bool /*displayed*/
-);
+extern _X_EXPORT void miRecolorCursor(DeviceIntPtr /* pDev */ ,
+                                      ScreenPtr /*pScr */ ,
+                                      CursorPtr /*pCurs */ ,
+                                      Bool      /*displayed */
+    );
 
 /* midash.c */
 
-extern _X_EXPORT void miStepDash(
-    int /*dist*/,
-    int * /*pDashIndex*/,
-    unsigned char * /*pDash*/,
-    int /*numInDashList*/,
-    int * /*pDashOffset*/
-);
+extern _X_EXPORT void miStepDash(int /*dist */ ,
+                                 int * /*pDashIndex */ ,
+                                 unsigned char * /*pDash */ ,
+                                 int /*numInDashList */ ,
+                                 int *  /*pDashOffset */
+    );
 
 /* mieq.c */
 
-
 #ifndef INPUT_H
 typedef struct _DeviceRec *DevicePtr;
 #endif
 
-extern _X_EXPORT Bool mieqInit(
-    void
-);
+extern _X_EXPORT Bool mieqInit(void
+    );
 
 extern _X_EXPORT void mieqFini(void);
 
-extern _X_EXPORT void mieqEnqueue(
-    DeviceIntPtr /*pDev*/,
-    InternalEvent* /*e*/
-);
-
-extern _X_EXPORT void mieqSwitchScreen(
-    DeviceIntPtr /* pDev */,
-    ScreenPtr /*pScreen*/,
-    Bool /*set_dequeue_screen*/
-);
-
-extern _X_EXPORT void mieqProcessDeviceEvent(
-    DeviceIntPtr /* dev*/,
-    InternalEvent* /* event */,
-    ScreenPtr /* screen*/
-);
-
-extern _X_EXPORT void mieqProcessInputEvents(
-    void
-);
-
-extern DeviceIntPtr CopyGetMasterEvent(
-    DeviceIntPtr /* sdev */,
-    InternalEvent* /* original */,
-    InternalEvent* /* copy */
-);
+extern _X_EXPORT void mieqEnqueue(DeviceIntPtr /*pDev */ ,
+                                  InternalEvent *       /*e */
+    );
+
+extern _X_EXPORT void mieqSwitchScreen(DeviceIntPtr /* pDev */ ,
+                                       ScreenPtr /*pScreen */ ,
+                                       Bool     /*set_dequeue_screen */
+    );
+
+extern _X_EXPORT void mieqProcessDeviceEvent(DeviceIntPtr /* dev */ ,
+                                             InternalEvent * /* event */ ,
+                                             ScreenPtr  /* screen */
+    );
+
+extern _X_EXPORT void mieqProcessInputEvents(void
+    );
+
+extern DeviceIntPtr CopyGetMasterEvent(DeviceIntPtr /* sdev */ ,
+                                       InternalEvent * /* original */ ,
+                                       InternalEvent *  /* copy */
+    );
 
 /**
  * Custom input event handler. If you need to process input events in some
  * other way than the default path, register an input event handler for the
  * given internal event type.
  */
-typedef void (*mieqHandler)(int screen, InternalEvent* event, DeviceIntPtr dev);
+typedef void (*mieqHandler) (int screen, InternalEvent *event,
+                             DeviceIntPtr dev);
 void _X_EXPORT mieqSetHandler(int event, mieqHandler handler);
 
 /* miexpose.c */
 
-extern _X_EXPORT RegionPtr miHandleExposures(
-    DrawablePtr /*pSrcDrawable*/,
-    DrawablePtr /*pDstDrawable*/,
-    GCPtr /*pGC*/,
-    int /*srcx*/,
-    int /*srcy*/,
-    int /*width*/,
-    int /*height*/,
-    int /*dstx*/,
-    int /*dsty*/,
-    unsigned long /*plane*/
-);
-
-extern _X_EXPORT void miSendGraphicsExpose(
-    ClientPtr /*client*/,
-    RegionPtr /*pRgn*/,
-    XID /*drawable*/,
-    int /*major*/,
-    int /*minor*/
-);
-
-extern _X_EXPORT void miSendExposures(
-    WindowPtr /*pWin*/,
-    RegionPtr /*pRgn*/,
-    int /*dx*/,
-    int /*dy*/
-);
-
-extern _X_EXPORT void miWindowExposures(
-    WindowPtr /*pWin*/,
-    RegionPtr /*prgn*/,
-    RegionPtr /*other_exposed*/
-);
-
-extern _X_EXPORT void miPaintWindow(
-    WindowPtr /*pWin*/,
-    RegionPtr /*prgn*/,
-    int /*what*/
-);
-
-extern _X_EXPORT void miClearDrawable(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/
-);
+extern _X_EXPORT RegionPtr miHandleExposures(DrawablePtr /*pSrcDrawable */ ,
+                                             DrawablePtr /*pDstDrawable */ ,
+                                             GCPtr /*pGC */ ,
+                                             int /*srcx */ ,
+                                             int /*srcy */ ,
+                                             int /*width */ ,
+                                             int /*height */ ,
+                                             int /*dstx */ ,
+                                             int /*dsty */ ,
+                                             unsigned long      /*plane */
+    );
+
+extern _X_EXPORT void miSendGraphicsExpose(ClientPtr /*client */ ,
+                                           RegionPtr /*pRgn */ ,
+                                           XID /*drawable */ ,
+                                           int /*major */ ,
+                                           int  /*minor */
+    );
+
+extern _X_EXPORT void miSendExposures(WindowPtr /*pWin */ ,
+                                      RegionPtr /*pRgn */ ,
+                                      int /*dx */ ,
+                                      int       /*dy */
+    );
+
+extern _X_EXPORT void miWindowExposures(WindowPtr /*pWin */ ,
+                                        RegionPtr /*prgn */ ,
+                                        RegionPtr       /*other_exposed */
+    );
+
+extern _X_EXPORT void miPaintWindow(WindowPtr /*pWin */ ,
+                                    RegionPtr /*prgn */ ,
+                                    int /*what */
+    );
+
+extern _X_EXPORT void miClearDrawable(DrawablePtr /*pDraw */ ,
+                                      GCPtr     /*pGC */
+    );
 
 /* mifillrct.c */
 
-extern _X_EXPORT void miPolyFillRect(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*nrectFill*/,
-    xRectangle * /*prectInit*/
-);
+extern _X_EXPORT void miPolyFillRect(DrawablePtr /*pDrawable */ ,
+                                     GCPtr /*pGC */ ,
+                                     int /*nrectFill */ ,
+                                     xRectangle *       /*prectInit */
+    );
 
 /* miglblt.c */
 
-extern _X_EXPORT void miPolyGlyphBlt(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    unsigned int /*nglyph*/,
-    CharInfoPtr * /*ppci*/,
-    pointer /*pglyphBase*/
-);
-
-extern _X_EXPORT void miImageGlyphBlt(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    unsigned int /*nglyph*/,
-    CharInfoPtr * /*ppci*/,
-    pointer /*pglyphBase*/
-);
+extern _X_EXPORT void miPolyGlyphBlt(DrawablePtr /*pDrawable */ ,
+                                     GCPtr /*pGC */ ,
+                                     int /*x */ ,
+                                     int /*y */ ,
+                                     unsigned int /*nglyph */ ,
+                                     CharInfoPtr * /*ppci */ ,
+                                     pointer    /*pglyphBase */
+    );
+
+extern _X_EXPORT void miImageGlyphBlt(DrawablePtr /*pDrawable */ ,
+                                      GCPtr /*pGC */ ,
+                                      int /*x */ ,
+                                      int /*y */ ,
+                                      unsigned int /*nglyph */ ,
+                                      CharInfoPtr * /*ppci */ ,
+                                      pointer   /*pglyphBase */
+    );
 
 /* mipoly.c */
 
-extern _X_EXPORT void miFillPolygon(
-    DrawablePtr /*dst*/,
-    GCPtr /*pgc*/,
-    int /*shape*/,
-    int /*mode*/,
-    int /*count*/,
-    DDXPointPtr /*pPts*/
-);
+extern _X_EXPORT void miFillPolygon(DrawablePtr /*dst */ ,
+                                    GCPtr /*pgc */ ,
+                                    int /*shape */ ,
+                                    int /*mode */ ,
+                                    int /*count */ ,
+                                    DDXPointPtr /*pPts */
+    );
 
 /* mipolycon.c */
 
-extern _X_EXPORT Bool miFillConvexPoly(
-    DrawablePtr /*dst*/,
-    GCPtr /*pgc*/,
-    int /*count*/,
-    DDXPointPtr /*ptsIn*/
-);
+extern _X_EXPORT Bool miFillConvexPoly(DrawablePtr /*dst */ ,
+                                       GCPtr /*pgc */ ,
+                                       int /*count */ ,
+                                       DDXPointPtr      /*ptsIn */
+    );
 
 /* mipolygen.c */
 
-extern _X_EXPORT Bool miFillGeneralPoly(
-    DrawablePtr /*dst*/,
-    GCPtr /*pgc*/,
-    int /*count*/,
-    DDXPointPtr /*ptsIn*/
-);
+extern _X_EXPORT Bool miFillGeneralPoly(DrawablePtr /*dst */ ,
+                                        GCPtr /*pgc */ ,
+                                        int /*count */ ,
+                                        DDXPointPtr     /*ptsIn */
+    );
 
 /* mipolypnt.c */
 
-extern _X_EXPORT void miPolyPoint(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*mode*/,
-    int /*npt*/,
-    xPoint * /*pptInit*/
-);
+extern _X_EXPORT void miPolyPoint(DrawablePtr /*pDrawable */ ,
+                                  GCPtr /*pGC */ ,
+                                  int /*mode */ ,
+                                  int /*npt */ ,
+                                  xPoint *      /*pptInit */
+    );
 
 /* mipolyrect.c */
 
-extern _X_EXPORT void miPolyRectangle(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*nrects*/,
-    xRectangle * /*pRects*/
-);
+extern _X_EXPORT void miPolyRectangle(DrawablePtr /*pDraw */ ,
+                                      GCPtr /*pGC */ ,
+                                      int /*nrects */ ,
+                                      xRectangle *      /*pRects */
+    );
 
 /* mipolyseg.c */
 
-extern _X_EXPORT void miPolySegment(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*nseg*/,
-    xSegment * /*pSegs*/
-);
+extern _X_EXPORT void miPolySegment(DrawablePtr /*pDraw */ ,
+                                    GCPtr /*pGC */ ,
+                                    int /*nseg */ ,
+                                    xSegment *  /*pSegs */
+    );
 
 /* mipolytext.c */
 
-extern _X_EXPORT int miPolyText8(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    int /*count*/,
-    char * /*chars*/
-);
-
-extern _X_EXPORT int miPolyText16(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    int /*count*/,
-    unsigned short * /*chars*/
-);
-
-extern _X_EXPORT void miImageText8(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    int /*count*/,
-    char * /*chars*/
-);
-
-extern _X_EXPORT void miImageText16(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*x*/,
-    int /*y*/,
-    int /*count*/,
-    unsigned short * /*chars*/
-);
+extern _X_EXPORT int miPolyText8(DrawablePtr /*pDraw */ ,
+                                 GCPtr /*pGC */ ,
+                                 int /*x */ ,
+                                 int /*y */ ,
+                                 int /*count */ ,
+                                 char * /*chars */
+    );
+
+extern _X_EXPORT int miPolyText16(DrawablePtr /*pDraw */ ,
+                                  GCPtr /*pGC */ ,
+                                  int /*x */ ,
+                                  int /*y */ ,
+                                  int /*count */ ,
+                                  unsigned short *      /*chars */
+    );
+
+extern _X_EXPORT void miImageText8(DrawablePtr /*pDraw */ ,
+                                   GCPtr /*pGC */ ,
+                                   int /*x */ ,
+                                   int /*y */ ,
+                                   int /*count */ ,
+                                   char *       /*chars */
+    );
+
+extern _X_EXPORT void miImageText16(DrawablePtr /*pDraw */ ,
+                                    GCPtr /*pGC */ ,
+                                    int /*x */ ,
+                                    int /*y */ ,
+                                    int /*count */ ,
+                                    unsigned short *    /*chars */
+    );
 
 /* mipushpxl.c */
 
-extern _X_EXPORT void miPushPixels(
-    GCPtr /*pGC*/,
-    PixmapPtr /*pBitMap*/,
-    DrawablePtr /*pDrawable*/,
-    int /*dx*/,
-    int /*dy*/,
-    int /*xOrg*/,
-    int /*yOrg*/
-);
+extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ ,
+                                   PixmapPtr /*pBitMap */ ,
+                                   DrawablePtr /*pDrawable */ ,
+                                   int /*dx */ ,
+                                   int /*dy */ ,
+                                   int /*xOrg */ ,
+                                   int  /*yOrg */
+    );
 
 /* miscrinit.c */
 
-extern _X_EXPORT Bool miModifyPixmapHeader(
-    PixmapPtr /*pPixmap*/,
-    int /*width*/,
-    int /*height*/,
-    int /*depth*/,
-    int /*bitsPerPixel*/,
-    int /*devKind*/,
-    pointer /*pPixData*/
-);
-
-extern _X_EXPORT Bool miCreateScreenResources(
-    ScreenPtr /*pScreen*/
-);
-
-extern _X_EXPORT Bool miScreenDevPrivateInit(
-    ScreenPtr /*pScreen*/,
-    int /*width*/,
-    pointer /*pbits*/
-);
-
-extern _X_EXPORT Bool miScreenInit(
-    ScreenPtr /*pScreen*/,
-    pointer /*pbits*/,
-    int /*xsize*/,
-    int /*ysize*/,
-    int /*dpix*/,
-    int /*dpiy*/,
-    int /*width*/,
-    int /*rootDepth*/,
-    int /*numDepths*/,
-    DepthPtr /*depths*/,
-    VisualID /*rootVisual*/,
-    int /*numVisuals*/,
-    VisualPtr /*visuals*/
-);
+extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr /*pPixmap */ ,
+                                           int /*width */ ,
+                                           int /*height */ ,
+                                           int /*depth */ ,
+                                           int /*bitsPerPixel */ ,
+                                           int /*devKind */ ,
+                                           pointer      /*pPixData */
+    );
+
+extern _X_EXPORT Bool miCreateScreenResources(ScreenPtr /*pScreen */
+    );
+
+extern _X_EXPORT Bool miScreenDevPrivateInit(ScreenPtr /*pScreen */ ,
+                                             int /*width */ ,
+                                             pointer    /*pbits */
+    );
+
+extern _X_EXPORT Bool miScreenInit(ScreenPtr /*pScreen */ ,
+                                   pointer /*pbits */ ,
+                                   int /*xsize */ ,
+                                   int /*ysize */ ,
+                                   int /*dpix */ ,
+                                   int /*dpiy */ ,
+                                   int /*width */ ,
+                                   int /*rootDepth */ ,
+                                   int /*numDepths */ ,
+                                   DepthPtr /*depths */ ,
+                                   VisualID /*rootVisual */ ,
+                                   int /*numVisuals */ ,
+                                   VisualPtr    /*visuals */
+    );
 
 /* mivaltree.c */
 
-extern _X_EXPORT int miShapedWindowIn(
-    RegionPtr /*universe*/,
-    RegionPtr /*bounding*/,
-    BoxPtr /*rect*/,
-    int /*x*/,
-    int /*y*/
-);
+extern _X_EXPORT int miShapedWindowIn(RegionPtr /*universe */ ,
+                                      RegionPtr /*bounding */ ,
+                                      BoxPtr /*rect */ ,
+                                      int /*x */ ,
+                                      int       /*y */
+    );
 
-typedef void 
-(*SetRedirectBorderClipProcPtr) (WindowPtr pWindow, RegionPtr pRegion);
+typedef void
+ (*SetRedirectBorderClipProcPtr) (WindowPtr pWindow, RegionPtr pRegion);
 
 typedef RegionPtr
-(*GetRedirectBorderClipProcPtr) (WindowPtr pWindow);
+ (*GetRedirectBorderClipProcPtr) (WindowPtr pWindow);
 
 extern _X_EXPORT void
-miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip,
-				  GetRedirectBorderClipProcPtr getBorderClip);
-
-extern _X_EXPORT int miValidateTree(
-    WindowPtr /*pParent*/,
-    WindowPtr /*pChild*/,
-    VTKind /*kind*/
-);
-
-extern _X_EXPORT void miWideLine(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*mode*/,
-    int /*npt*/,
-    DDXPointPtr /*pPts*/
-);
-
-extern _X_EXPORT void miWideDash(
-    DrawablePtr /*pDrawable*/,
-    GCPtr /*pGC*/,
-    int /*mode*/,
-    int /*npt*/,
-    DDXPointPtr /*pPts*/
-);
+
+miRegisterRedirectBorderClipProc(SetRedirectBorderClipProcPtr setBorderClip,
+                                 GetRedirectBorderClipProcPtr getBorderClip);
+
+extern _X_EXPORT int miValidateTree(WindowPtr /*pParent */ ,
+                                    WindowPtr /*pChild */ ,
+                                    VTKind      /*kind */
+    );
+
+extern _X_EXPORT void miWideLine(DrawablePtr /*pDrawable */ ,
+                                 GCPtr /*pGC */ ,
+                                 int /*mode */ ,
+                                 int /*npt */ ,
+                                 DDXPointPtr    /*pPts */
+    );
+
+extern _X_EXPORT void miWideDash(DrawablePtr /*pDrawable */ ,
+                                 GCPtr /*pGC */ ,
+                                 int /*mode */ ,
+                                 int /*npt */ ,
+                                 DDXPointPtr    /*pPts */
+    );
 
 /* miwindow.c */
 
-extern _X_EXPORT void miClearToBackground(
-    WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/,
-    int /*w*/,
-    int /*h*/,
-    Bool /*generateExposures*/
-);
-
-extern _X_EXPORT void miMarkWindow(
-    WindowPtr /*pWin*/
-);
-
-extern _X_EXPORT Bool miMarkOverlappedWindows(
-    WindowPtr /*pWin*/,
-    WindowPtr /*pFirst*/,
-    WindowPtr * /*ppLayerWin*/
-);
-
-extern _X_EXPORT void miHandleValidateExposures(
-    WindowPtr /*pWin*/
-);
-
-extern _X_EXPORT void miMoveWindow(
-    WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/,
-    WindowPtr /*pNextSib*/,
-    VTKind /*kind*/
-);
-
-extern _X_EXPORT void miSlideAndSizeWindow(
-    WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/,
-    unsigned int /*w*/,
-    unsigned int /*h*/,
-    WindowPtr /*pSib*/
-);
-
-extern _X_EXPORT WindowPtr miGetLayerWindow(
-    WindowPtr /*pWin*/
-);
-
-extern _X_EXPORT void miSetShape(
-    WindowPtr /*pWin*/,
-    int /*kind*/
-);
-
-extern _X_EXPORT void miChangeBorderWidth(
-    WindowPtr /*pWin*/,
-    unsigned int /*width*/
-);
-
-extern _X_EXPORT void miMarkUnrealizedWindow(
-    WindowPtr /*pChild*/,
-    WindowPtr /*pWin*/,
-    Bool /*fromConfigure*/
-);
-
-extern _X_EXPORT void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth);
+extern _X_EXPORT void miClearToBackground(WindowPtr /*pWin */ ,
+                                          int /*x */ ,
+                                          int /*y */ ,
+                                          int /*w */ ,
+                                          int /*h */ ,
+                                          Bool  /*generateExposures */
+    );
+
+extern _X_EXPORT void miMarkWindow(WindowPtr    /*pWin */
+    );
+
+extern _X_EXPORT Bool miMarkOverlappedWindows(WindowPtr /*pWin */ ,
+                                              WindowPtr /*pFirst */ ,
+                                              WindowPtr *       /*ppLayerWin */
+    );
+
+extern _X_EXPORT void miHandleValidateExposures(WindowPtr       /*pWin */
+    );
+
+extern _X_EXPORT void miMoveWindow(WindowPtr /*pWin */ ,
+                                   int /*x */ ,
+                                   int /*y */ ,
+                                   WindowPtr /*pNextSib */ ,
+                                   VTKind       /*kind */
+    );
+
+extern _X_EXPORT void miSlideAndSizeWindow(WindowPtr /*pWin */ ,
+                                           int /*x */ ,
+                                           int /*y */ ,
+                                           unsigned int /*w */ ,
+                                           unsigned int /*h */ ,
+                                           WindowPtr    /*pSib */
+    );
+
+extern _X_EXPORT WindowPtr miGetLayerWindow(WindowPtr   /*pWin */
+    );
+
+extern _X_EXPORT void miSetShape(WindowPtr /*pWin */ ,
+                                 int    /*kind */
+    );
+
+extern _X_EXPORT void miChangeBorderWidth(WindowPtr /*pWin */ ,
+                                          unsigned int  /*width */
+    );
+
+extern _X_EXPORT void miMarkUnrealizedWindow(WindowPtr /*pChild */ ,
+                                             WindowPtr /*pWin */ ,
+                                             Bool       /*fromConfigure */
+    );
+
+extern _X_EXPORT void miSegregateChildren(WindowPtr pWin, RegionPtr pReg,
+                                          int depth);
 
 /* mizerarc.c */
 
-extern _X_EXPORT void miZeroPolyArc(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*narcs*/,
-    xArc * /*parcs*/
-);
+extern _X_EXPORT void miZeroPolyArc(DrawablePtr /*pDraw */ ,
+                                    GCPtr /*pGC */ ,
+                                    int /*narcs */ ,
+                                    xArc *      /*parcs */
+    );
 
 /* mizerline.c */
 
-extern _X_EXPORT void miZeroLine(
-    DrawablePtr /*dst*/,
-    GCPtr /*pgc*/,
-    int /*mode*/,
-    int /*nptInit*/,
-    DDXPointRec * /*pptInit*/
-);
-
-extern _X_EXPORT void miZeroDashLine(
-    DrawablePtr /*dst*/,
-    GCPtr /*pgc*/,
-    int /*mode*/,
-    int /*nptInit*/,
-    DDXPointRec * /*pptInit*/
-);
-
-extern _X_EXPORT void miPolyFillArc(
-    DrawablePtr /*pDraw*/,
-    GCPtr /*pGC*/,
-    int /*narcs*/,
-    xArc * /*parcs*/
-);
-
-#endif /* MI_H */
+extern _X_EXPORT void miZeroLine(DrawablePtr /*dst */ ,
+                                 GCPtr /*pgc */ ,
+                                 int /*mode */ ,
+                                 int /*nptInit */ ,
+                                 DDXPointRec *  /*pptInit */
+    );
+
+extern _X_EXPORT void miZeroDashLine(DrawablePtr /*dst */ ,
+                                     GCPtr /*pgc */ ,
+                                     int /*mode */ ,
+                                     int /*nptInit */ ,
+                                     DDXPointRec *      /*pptInit */
+    );
+
+extern _X_EXPORT void miPolyFillArc(DrawablePtr /*pDraw */ ,
+                                    GCPtr /*pGC */ ,
+                                    int /*narcs */ ,
+                                    xArc *      /*parcs */
+    );
+
+#endif                          /* MI_H */