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, 131 insertions, 171 deletions

diff --git a/include/window.h b/include/window.h
index e13598b88..64c56aeb3 100644
--- a/include/window.h
+++ b/include/window.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
@@ -73,76 +72,65 @@ struct _Cursor;
 typedef struct _BackingStore *BackingStorePtr;
 typedef struct _Window *WindowPtr;
 
-typedef int (*VisitWindowProcPtr)(
-    WindowPtr /*pWin*/,
-    pointer /*data*/);
-
-extern _X_EXPORT int TraverseTree(
-    WindowPtr /*pWin*/,
-    VisitWindowProcPtr /*func*/,
-    pointer /*data*/);
-
-extern _X_EXPORT int WalkTree(
-    ScreenPtr /*pScreen*/,
-    VisitWindowProcPtr /*func*/,
-    pointer /*data*/);
-
-extern _X_EXPORT Bool CreateRootWindow(
-    ScreenPtr /*pScreen*/);
-
-extern _X_EXPORT void InitRootWindow(
-    WindowPtr /*pWin*/);
-
-typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin);
-
-extern _X_EXPORT void RegisterRealChildHeadProc (RealChildHeadProc proc);
-
-extern _X_EXPORT WindowPtr RealChildHead(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT WindowPtr CreateWindow(
-    Window /*wid*/,
-    WindowPtr /*pParent*/,
-    int /*x*/,
-    int /*y*/,
-    unsigned int /*w*/,
-    unsigned int /*h*/,
-    unsigned int /*bw*/,
-    unsigned int /*class*/,
-    Mask /*vmask*/,
-    XID* /*vlist*/,
-    int /*depth*/,
-    ClientPtr /*client*/,
-    VisualID /*visual*/,
-    int* /*error*/);
-
-extern _X_EXPORT int DeleteWindow(
-    pointer /*pWin*/,
-    XID /*wid*/);
-
-extern _X_EXPORT int DestroySubwindows(
-    WindowPtr /*pWin*/,
-    ClientPtr /*client*/);
+typedef int (*VisitWindowProcPtr) (WindowPtr /*pWin */ ,
+                                   pointer /*data */ );
+
+extern _X_EXPORT int TraverseTree(WindowPtr /*pWin */ ,
+                                  VisitWindowProcPtr /*func */ ,
+                                  pointer /*data */ );
+
+extern _X_EXPORT int WalkTree(ScreenPtr /*pScreen */ ,
+                              VisitWindowProcPtr /*func */ ,
+                              pointer /*data */ );
+
+extern _X_EXPORT Bool CreateRootWindow(ScreenPtr /*pScreen */ );
+
+extern _X_EXPORT void InitRootWindow(WindowPtr /*pWin */ );
+
+typedef WindowPtr (*RealChildHeadProc) (WindowPtr pWin);
+
+extern _X_EXPORT void RegisterRealChildHeadProc(RealChildHeadProc proc);
+
+extern _X_EXPORT WindowPtr RealChildHead(WindowPtr /*pWin */ );
+
+extern _X_EXPORT WindowPtr CreateWindow(Window /*wid */ ,
+                                        WindowPtr /*pParent */ ,
+                                        int /*x */ ,
+                                        int /*y */ ,
+                                        unsigned int /*w */ ,
+                                        unsigned int /*h */ ,
+                                        unsigned int /*bw */ ,
+                                        unsigned int /*class */ ,
+                                        Mask /*vmask */ ,
+                                        XID * /*vlist */ ,
+                                        int /*depth */ ,
+                                        ClientPtr /*client */ ,
+                                        VisualID /*visual */ ,
+                                        int * /*error */ );
+
+extern _X_EXPORT int DeleteWindow(pointer /*pWin */ ,
+                                  XID /*wid */ );
+
+extern _X_EXPORT int DestroySubwindows(WindowPtr /*pWin */ ,
+                                       ClientPtr /*client */ );
 
 /* Quartz support on Mac OS X uses the HIToolbox
    framework whose ChangeWindowAttributes function conflicts here. */
 #ifdef __APPLE__
 #define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes
 #endif
-extern _X_EXPORT int ChangeWindowAttributes(
-    WindowPtr /*pWin*/,
-    Mask /*vmask*/,
-    XID* /*vlist*/,
-    ClientPtr /*client*/);
+extern _X_EXPORT int ChangeWindowAttributes(WindowPtr /*pWin */ ,
+                                            Mask /*vmask */ ,
+                                            XID * /*vlist */ ,
+                                            ClientPtr /*client */ );
 
-extern _X_EXPORT int ChangeWindowDeviceCursor(
-    WindowPtr /*pWin*/,
-    struct _DeviceIntRec* /*pDev*/,
-    struct _Cursor* /*pCursor*/);
+extern _X_EXPORT int ChangeWindowDeviceCursor(WindowPtr /*pWin */ ,
+                                              struct _DeviceIntRec * /*pDev */ ,
+                                              struct _Cursor * /*pCursor */ );
 
-extern _X_EXPORT struct _Cursor* WindowGetDeviceCursor(
-    WindowPtr /*pWin*/,
-    struct _DeviceIntRec* /*pDev*/);
+extern _X_EXPORT struct _Cursor *WindowGetDeviceCursor(WindowPtr /*pWin */ ,
+                                                       struct _DeviceIntRec *
+                                                       /*pDev */ );
 
 /* Quartz support on Mac OS X uses the HIToolbox
    framework whose GetWindowAttributes function conflicts here. */
@@ -152,121 +140,93 @@ extern void Darwin_X_GetWindowAttributes(
 #else
 extern _X_EXPORT void GetWindowAttributes(
 #endif
-    WindowPtr /*pWin*/,
-    ClientPtr /*client*/,
-    xGetWindowAttributesReply* /* wa */);
-
-extern _X_EXPORT void GravityTranslate(
-    int /*x*/,
-    int /*y*/,
-    int /*oldx*/,
-    int /*oldy*/,
-    int /*dw*/,
-    int /*dh*/,
-    unsigned /*gravity*/,
-    int* /*destx*/,
-    int* /*desty*/);
-
-extern _X_EXPORT int ConfigureWindow(
-    WindowPtr /*pWin*/,
-    Mask /*mask*/,
-    XID* /*vlist*/,
-    ClientPtr /*client*/);
-
-extern _X_EXPORT int CirculateWindow(
-    WindowPtr /*pParent*/,
-    int /*direction*/,
-    ClientPtr /*client*/);
-
-extern _X_EXPORT int ReparentWindow(
-    WindowPtr /*pWin*/,
-    WindowPtr /*pParent*/,
-    int /*x*/,
-    int /*y*/,
-    ClientPtr /*client*/);
-
-extern _X_EXPORT int MapWindow(
-    WindowPtr /*pWin*/,
-    ClientPtr /*client*/);
-
-extern _X_EXPORT void MapSubwindows(
-    WindowPtr /*pParent*/,
-    ClientPtr /*client*/);
-
-extern _X_EXPORT int UnmapWindow(
-    WindowPtr /*pWin*/,
-    Bool /*fromConfigure*/);
-
-extern _X_EXPORT void UnmapSubwindows(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT void HandleSaveSet(
-    ClientPtr /*client*/);
-
-extern _X_EXPORT Bool PointInWindowIsVisible(
-    WindowPtr /*pWin*/,
-    int /*x*/,
-    int /*y*/);
-
-extern _X_EXPORT RegionPtr NotClippedByChildren(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT void SendVisibilityNotify(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT int dixSaveScreens(
-    ClientPtr client,
-    int on,
-    int mode);
-
-extern _X_EXPORT int SaveScreens(
-    int on,
-    int mode);
-
-extern _X_EXPORT WindowPtr FindWindowWithOptional(
-    WindowPtr /*w*/);
-
-extern _X_EXPORT void CheckWindowOptionalNeed(
-    WindowPtr /*w*/);
-
-extern _X_EXPORT Bool MakeWindowOptional(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT WindowPtr MoveWindowInStack(
-    WindowPtr /*pWin*/,
-    WindowPtr /*pNextSib*/);
-
-extern _X_EXPORT void SetWinSize(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT void SetBorderSize(
-    WindowPtr /*pWin*/);
-
-extern _X_EXPORT void ResizeChildrenWinSize(
-    WindowPtr /*pWin*/,
-    int /*dx*/,
-    int /*dy*/,
-    int /*dw*/,
-    int /*dh*/);
+                                             WindowPtr /*pWin */ ,
+                                             ClientPtr /*client */ ,
+                                             xGetWindowAttributesReply *
+                                             /* wa */ );
+
+extern _X_EXPORT void GravityTranslate(int /*x */ ,
+                                       int /*y */ ,
+                                       int /*oldx */ ,
+                                       int /*oldy */ ,
+                                       int /*dw */ ,
+                                       int /*dh */ ,
+                                       unsigned /*gravity */ ,
+                                       int * /*destx */ ,
+                                       int * /*desty */ );
+
+extern _X_EXPORT int ConfigureWindow(WindowPtr /*pWin */ ,
+                                     Mask /*mask */ ,
+                                     XID * /*vlist */ ,
+                                     ClientPtr /*client */ );
+
+extern _X_EXPORT int CirculateWindow(WindowPtr /*pParent */ ,
+                                     int /*direction */ ,
+                                     ClientPtr /*client */ );
+
+extern _X_EXPORT int ReparentWindow(WindowPtr /*pWin */ ,
+                                    WindowPtr /*pParent */ ,
+                                    int /*x */ ,
+                                    int /*y */ ,
+                                    ClientPtr /*client */ );
+
+extern _X_EXPORT int MapWindow(WindowPtr /*pWin */ ,
+                               ClientPtr /*client */ );
+
+extern _X_EXPORT void MapSubwindows(WindowPtr /*pParent */ ,
+                                    ClientPtr /*client */ );
+
+extern _X_EXPORT int UnmapWindow(WindowPtr /*pWin */ ,
+                                 Bool /*fromConfigure */ );
+
+extern _X_EXPORT void UnmapSubwindows(WindowPtr /*pWin */ );
+
+extern _X_EXPORT void HandleSaveSet(ClientPtr /*client */ );
+
+extern _X_EXPORT Bool PointInWindowIsVisible(WindowPtr /*pWin */ ,
+                                             int /*x */ ,
+                                             int /*y */ );
+
+extern _X_EXPORT RegionPtr NotClippedByChildren(WindowPtr /*pWin */ );
+
+extern _X_EXPORT void SendVisibilityNotify(WindowPtr /*pWin */ );
+
+extern _X_EXPORT int dixSaveScreens(ClientPtr client, int on, int mode);
+
+extern _X_EXPORT int SaveScreens(int on, int mode);
+
+extern _X_EXPORT WindowPtr FindWindowWithOptional(WindowPtr /*w */ );
+
+extern _X_EXPORT void CheckWindowOptionalNeed(WindowPtr /*w */ );
+
+extern _X_EXPORT Bool MakeWindowOptional(WindowPtr /*pWin */ );
+
+extern _X_EXPORT WindowPtr MoveWindowInStack(WindowPtr /*pWin */ ,
+                                             WindowPtr /*pNextSib */ );
+
+extern _X_EXPORT void SetWinSize(WindowPtr /*pWin */ );
+
+extern _X_EXPORT void SetBorderSize(WindowPtr /*pWin */ );
+
+extern _X_EXPORT void ResizeChildrenWinSize(WindowPtr /*pWin */ ,
+                                            int /*dx */ ,
+                                            int /*dy */ ,
+                                            int /*dw */ ,
+                                            int /*dh */ );
 
 extern _X_EXPORT void ShapeExtensionInit(void);
 
-extern _X_EXPORT void SendShapeNotify(
-    WindowPtr /* pWin */,
-    int /* which */ );
+extern _X_EXPORT void SendShapeNotify(WindowPtr /* pWin */ ,
+                                      int /* which */ );
 
-extern _X_EXPORT RegionPtr CreateBoundingShape(
-    WindowPtr /* pWin */ );
+extern _X_EXPORT RegionPtr CreateBoundingShape(WindowPtr /* pWin */ );
 
-extern _X_EXPORT RegionPtr CreateClipShape(
-    WindowPtr /* pWin */ );
+extern _X_EXPORT RegionPtr CreateClipShape(WindowPtr /* pWin */ );
 
-extern _X_EXPORT void DisableMapUnmapEvents(
-    WindowPtr /* pWin */ );
-extern _X_EXPORT void EnableMapUnmapEvents(
-    WindowPtr /* pWin */ );
+extern _X_EXPORT void DisableMapUnmapEvents(WindowPtr /* pWin */ );
+extern _X_EXPORT void EnableMapUnmapEvents(WindowPtr /* pWin */ );
 
 extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable);
 extern _X_EXPORT void PrintWindowTree(void);
 
-#endif /* WINDOW_H */
+#endif                          /* WINDOW_H */