genStubs.tcl: No longer generate a space after

"*" and immediately after a function name, so
the format of function definitions in *Decls.h
match all other *.h header files.

1 files changed, 280 insertions, 299 deletions

diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index b6a3b8b..30517ab 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.27 2008/10/22 20:56:43 nijtmans Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.28 2010/01/29 18:07:31 nijtmans Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -38,151 +38,149 @@
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc,
-				int dash_offset, _Xconst char * dash_list,
-				int n);
+EXTERN void		XSetDashes(Display *display, GC gc, int dash_offset,
+				_Xconst char *dash_list, int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
 #define XGetModifierMapping_TCL_DECLARED
 /* 1 */
-EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
+EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
 #endif
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v,
-				unsigned int ui1, int i1, int i2, char * cp,
-				unsigned int ui2, unsigned int ui3, int i3,
-				int i4);
+EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
+				int i1, int i2, char *cp, unsigned int ui2,
+				unsigned int ui3, int i3, int i4);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
 #define XGetAtomName_TCL_DECLARED
 /* 4 */
-EXTERN char *		XGetAtomName (Display * d, Atom a);
+EXTERN char *		XGetAtomName(Display *d, Atom a);
 #endif
 #ifndef XKeysymToString_TCL_DECLARED
 #define XKeysymToString_TCL_DECLARED
 /* 5 */
-EXTERN char *		XKeysymToString (KeySym k);
+EXTERN char *		XKeysymToString(KeySym k);
 #endif
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
+EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
 #endif
 #ifndef XCreatePixmapCursor_TCL_DECLARED
 #define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
-EXTERN Cursor		XCreatePixmapCursor (Display * d, Pixmap p1,
-				Pixmap p2, XColor * x1, XColor * x2,
-				unsigned int ui1, unsigned int ui2);
+EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+				XColor *x1, XColor *x2, unsigned int ui1,
+				unsigned int ui2);
 #endif
 #ifndef XCreateGlyphCursor_TCL_DECLARED
 #define XCreateGlyphCursor_TCL_DECLARED
 /* 8 */
-EXTERN Cursor		XCreateGlyphCursor (Display * d, Font f1, Font f2,
+EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
 				unsigned int ui1, unsigned int ui2,
-				XColor * x1, XColor * x2);
+				XColor *x1, XColor *x2);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
 #define XGContextFromGC_TCL_DECLARED
 /* 9 */
-EXTERN GContext		XGContextFromGC (GC g);
+EXTERN GContext		XGContextFromGC(GC g);
 #endif
 #ifndef XListHosts_TCL_DECLARED
 #define XListHosts_TCL_DECLARED
 /* 10 */
-EXTERN XHostAddress *	XListHosts (Display * d, int * i, Bool * b);
+EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
 #endif
 #ifndef XKeycodeToKeysym_TCL_DECLARED
 #define XKeycodeToKeysym_TCL_DECLARED
 /* 11 */
-EXTERN KeySym		XKeycodeToKeysym (Display * d, unsigned int k, int i);
+EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
 #endif
 #ifndef XStringToKeysym_TCL_DECLARED
 #define XStringToKeysym_TCL_DECLARED
 /* 12 */
-EXTERN KeySym		XStringToKeysym (_Xconst char * c);
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
 #endif
 #ifndef XRootWindow_TCL_DECLARED
 #define XRootWindow_TCL_DECLARED
 /* 13 */
-EXTERN Window		XRootWindow (Display * d, int i);
+EXTERN Window		XRootWindow(Display *d, int i);
 #endif
 #ifndef XSetErrorHandler_TCL_DECLARED
 #define XSetErrorHandler_TCL_DECLARED
 /* 14 */
-EXTERN XErrorHandler	XSetErrorHandler (XErrorHandler x);
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
 #endif
 #ifndef XIconifyWindow_TCL_DECLARED
 #define XIconifyWindow_TCL_DECLARED
 /* 15 */
-EXTERN Status		XIconifyWindow (Display * d, Window w, int i);
+EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
 #endif
 #ifndef XWithdrawWindow_TCL_DECLARED
 #define XWithdrawWindow_TCL_DECLARED
 /* 16 */
-EXTERN Status		XWithdrawWindow (Display * d, Window w, int i);
+EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
 #endif
 #ifndef XGetWMColormapWindows_TCL_DECLARED
 #define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
-EXTERN Status		XGetWMColormapWindows (Display * d, Window w,
-				Window ** wpp, int * ip);
+EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
+				Window **wpp, int *ip);
 #endif
 #ifndef XAllocColor_TCL_DECLARED
 #define XAllocColor_TCL_DECLARED
 /* 18 */
-EXTERN Status		XAllocColor (Display * d, Colormap c, XColor * xp);
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
 #endif
 #ifndef XBell_TCL_DECLARED
 #define XBell_TCL_DECLARED
 /* 19 */
-EXTERN void		XBell (Display * d, int i);
+EXTERN void		XBell(Display *d, int i);
 #endif
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 20 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+EXTERN void		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
-				_Xconst unsigned char * c, int i3);
+				_Xconst unsigned char *c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 21 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w,
-				unsigned long ul, XSetWindowAttributes * x);
+EXTERN void		XChangeWindowAttributes(Display *d, Window w,
+				unsigned long ul, XSetWindowAttributes *x);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
 #define XClearWindow_TCL_DECLARED
 /* 22 */
-EXTERN void		XClearWindow (Display * d, Window w);
+EXTERN void		XClearWindow(Display *d, Window w);
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 23 */
-EXTERN void		XConfigureWindow (Display * d, Window w,
-				unsigned int i, XWindowChanges * x);
+EXTERN void		XConfigureWindow(Display *d, Window w,
+				unsigned int i, XWindowChanges *x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 24 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+EXTERN void		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 25 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
+EXTERN void		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
@@ -190,322 +188,318 @@ EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
-				_Xconst char * data, unsigned int width,
+EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
+				_Xconst char *data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
 #define XDefineCursor_TCL_DECLARED
 /* 27 */
-EXTERN void		XDefineCursor (Display * d, Window w, Cursor c);
+EXTERN void		XDefineCursor(Display *d, Window w, Cursor c);
 #endif
 #ifndef XDeleteProperty_TCL_DECLARED
 #define XDeleteProperty_TCL_DECLARED
 /* 28 */
-EXTERN void		XDeleteProperty (Display * d, Window w, Atom a);
+EXTERN void		XDeleteProperty(Display *d, Window w, Atom a);
 #endif
 #ifndef XDestroyWindow_TCL_DECLARED
 #define XDestroyWindow_TCL_DECLARED
 /* 29 */
-EXTERN void		XDestroyWindow (Display * d, Window w);
+EXTERN void		XDestroyWindow(Display *d, Window w);
 #endif
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 30 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+EXTERN void		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 31 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
-				XPoint * x, int i1, int i2);
+EXTERN void		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
+				int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 32 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
-				int i1, int i2, unsigned int ui1,
-				unsigned int ui2);
+EXTERN void		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 33 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+EXTERN void		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 34 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
-				XPoint * x, int i1, int i2, int i3);
+EXTERN void		XFillPolygon(Display *d, Drawable dr, GC g,
+				XPoint *x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 35 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
-				XRectangle * x, int i);
+EXTERN void		XFillRectangles(Display *d, Drawable dr, GC g,
+				XRectangle *x, int i);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
 #define XForceScreenSaver_TCL_DECLARED
 /* 36 */
-EXTERN void		XForceScreenSaver (Display * d, int i);
+EXTERN void		XForceScreenSaver(Display *d, int i);
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
 #define XFreeColormap_TCL_DECLARED
 /* 37 */
-EXTERN void		XFreeColormap (Display * d, Colormap c);
+EXTERN void		XFreeColormap(Display *d, Colormap c);
 #endif
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 38 */
-EXTERN void		XFreeColors (Display * d, Colormap c,
-				unsigned long * ulp, int i, unsigned long ul);
+EXTERN void		XFreeColors(Display *d, Colormap c,
+				unsigned long *ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeCursor_TCL_DECLARED
 #define XFreeCursor_TCL_DECLARED
 /* 39 */
-EXTERN void		XFreeCursor (Display * d, Cursor c);
+EXTERN void		XFreeCursor(Display *d, Cursor c);
 #endif
 #ifndef XFreeModifiermap_TCL_DECLARED
 #define XFreeModifiermap_TCL_DECLARED
 /* 40 */
-EXTERN void		XFreeModifiermap (XModifierKeymap * x);
+EXTERN void		XFreeModifiermap(XModifierKeymap *x);
 #endif
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 41 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
-				int * i1, int * i2, unsigned int * ui1,
-				unsigned int * ui2, unsigned int * ui3,
-				unsigned int * ui4);
+EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
+				int *i1, int *i2, unsigned int *ui1,
+				unsigned int *ui2, unsigned int *ui3,
+				unsigned int *ui4);
 #endif
 #ifndef XGetInputFocus_TCL_DECLARED
 #define XGetInputFocus_TCL_DECLARED
 /* 42 */
-EXTERN void		XGetInputFocus (Display * d, Window * w, int * i);
+EXTERN void		XGetInputFocus(Display *d, Window *w, int *i);
 #endif
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 43 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1,
-				long l1, long l2, Bool b, Atom a2, Atom * ap,
-				int * ip, unsigned long * ulp1,
-				unsigned long * ulp2, unsigned char ** cpp);
+EXTERN int		XGetWindowProperty(Display *d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom *ap,
+				int *ip, unsigned long *ulp1,
+				unsigned long *ulp2, unsigned char **cpp);
 #endif
 #ifndef XGetWindowAttributes_TCL_DECLARED
 #define XGetWindowAttributes_TCL_DECLARED
 /* 44 */
-EXTERN Status		XGetWindowAttributes (Display * d, Window w,
-				XWindowAttributes * x);
+EXTERN Status		XGetWindowAttributes(Display *d, Window w,
+				XWindowAttributes *x);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 45 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
+EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 46 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
 #define XKeysymToKeycode_TCL_DECLARED
 /* 47 */
-EXTERN KeyCode		XKeysymToKeycode (Display * d, KeySym k);
+EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
 #endif
 #ifndef XLookupColor_TCL_DECLARED
 #define XLookupColor_TCL_DECLARED
 /* 48 */
-EXTERN Status		XLookupColor (Display * d, Colormap c1,
-				_Xconst char * c2, XColor * x1, XColor * x2);
+EXTERN Status		XLookupColor(Display *d, Colormap c1,
+				_Xconst char *c2, XColor *x1, XColor *x2);
 #endif
 #ifndef XMapWindow_TCL_DECLARED
 #define XMapWindow_TCL_DECLARED
 /* 49 */
-EXTERN void		XMapWindow (Display * d, Window w);
+EXTERN void		XMapWindow(Display *d, Window w);
 #endif
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
+EXTERN void		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
 #define XMoveWindow_TCL_DECLARED
 /* 51 */
-EXTERN void		XMoveWindow (Display * d, Window w, int i1, int i2);
+EXTERN void		XMoveWindow(Display *d, Window w, int i1, int i2);
 #endif
 #ifndef XNextEvent_TCL_DECLARED
 #define XNextEvent_TCL_DECLARED
 /* 52 */
-EXTERN void		XNextEvent (Display * d, XEvent * x);
+EXTERN void		XNextEvent(Display *d, XEvent *x);
 #endif
 #ifndef XPutBackEvent_TCL_DECLARED
 #define XPutBackEvent_TCL_DECLARED
 /* 53 */
-EXTERN void		XPutBackEvent (Display * d, XEvent * x);
+EXTERN void		XPutBackEvent(Display *d, XEvent *x);
 #endif
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 54 */
-EXTERN void		XQueryColors (Display * d, Colormap c, XColor * x,
+EXTERN void		XQueryColors(Display *d, Colormap c, XColor *x,
 				int i);
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 55 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
-				Window * w3, int * i1, int * i2, int * i3,
-				int * i4, unsigned int * ui);
+EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
+				Window *w3, int *i1, int *i2, int *i3,
+				int *i4, unsigned int *ui);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 56 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
-				Window * w3, Window ** w4, unsigned int * ui);
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
 #define XRaiseWindow_TCL_DECLARED
 /* 57 */
-EXTERN void		XRaiseWindow (Display * d, Window w);
+EXTERN void		XRaiseWindow(Display *d, Window w);
 #endif
 #ifndef XRefreshKeyboardMapping_TCL_DECLARED
 #define XRefreshKeyboardMapping_TCL_DECLARED
 /* 58 */
-EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
+EXTERN void		XRefreshKeyboardMapping(XMappingEvent *x);
 #endif
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 59 */
-EXTERN void		XResizeWindow (Display * d, Window w,
-				unsigned int ui1, unsigned int ui2);
+EXTERN void		XResizeWindow(Display *d, Window w, unsigned int ui1,
+				unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
 #define XSelectInput_TCL_DECLARED
 /* 60 */
-EXTERN void		XSelectInput (Display * d, Window w, long l);
+EXTERN void		XSelectInput(Display *d, Window w, long l);
 #endif
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 61 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
-				XEvent * x);
+EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
+				XEvent *x);
 #endif
 #ifndef XSetCommand_TCL_DECLARED
 #define XSetCommand_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetCommand (Display * d, Window w, const char ** c,
+EXTERN void		XSetCommand(Display *d, Window w, const char **c,
 				int i);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetIconName (Display * d, Window w,
-				_Xconst char * c);
+EXTERN void		XSetIconName(Display *d, Window w, _Xconst char *c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
 #define XSetInputFocus_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
+EXTERN void		XSetInputFocus(Display *d, Window w, int i, Time t);
 #endif
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
+EXTERN void		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetWindowBackground (Display * d, Window w,
+EXTERN void		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
+EXTERN void		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 68 */
-EXTERN void		XSetWindowBorder (Display * d, Window w,
+EXTERN void		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
+EXTERN void		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
+EXTERN void		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetWindowColormap (Display * d, Window w,
-				Colormap c);
+EXTERN void		XSetWindowColormap(Display *d, Window w, Colormap c);
 #endif
 #ifndef XTranslateCoordinates_TCL_DECLARED
 #define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
-EXTERN Bool		XTranslateCoordinates (Display * d, Window w1,
-				Window w2, int i1, int i2, int * i3,
-				int * i4, Window * w3);
+EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
+				Window w2, int i1, int i2, int *i3, int *i4,
+				Window *w3);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
 #define XUngrabKeyboard_TCL_DECLARED
 /* 73 */
-EXTERN void		XUngrabKeyboard (Display * d, Time t);
+EXTERN void		XUngrabKeyboard(Display *d, Time t);
 #endif
 #ifndef XUngrabPointer_TCL_DECLARED
 #define XUngrabPointer_TCL_DECLARED
 /* 74 */
-EXTERN void		XUngrabPointer (Display * d, Time t);
+EXTERN void		XUngrabPointer(Display *d, Time t);
 #endif
 #ifndef XUnmapWindow_TCL_DECLARED
 #define XUnmapWindow_TCL_DECLARED
 /* 75 */
-EXTERN void		XUnmapWindow (Display * d, Window w);
+EXTERN void		XUnmapWindow(Display *d, Window w);
 #endif
 #ifndef XWindowEvent_TCL_DECLARED
 #define XWindowEvent_TCL_DECLARED
 /* 76 */
-EXTERN void		XWindowEvent (Display * d, Window w, long l,
-				XEvent * x);
+EXTERN void		XWindowEvent(Display *d, Window w, long l, XEvent *x);
 #endif
 #ifndef XDestroyIC_TCL_DECLARED
 #define XDestroyIC_TCL_DECLARED
 /* 77 */
-EXTERN void		XDestroyIC (XIC x);
+EXTERN void		XDestroyIC(XIC x);
 #endif
 #ifndef XFilterEvent_TCL_DECLARED
 #define XFilterEvent_TCL_DECLARED
 /* 78 */
-EXTERN Bool		XFilterEvent (XEvent * x, Window w);
+EXTERN Bool		XFilterEvent(XEvent *x, Window w);
 #endif
 #ifndef XmbLookupString_TCL_DECLARED
 #define XmbLookupString_TCL_DECLARED
 /* 79 */
-EXTERN int		XmbLookupString (XIC xi, XKeyPressedEvent * xk,
-				char * c, int i, KeySym * k, Status * s);
+EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
+				char *c, int i, KeySym *k, Status *s);
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 80 */
-EXTERN void		TkPutImage (unsigned long * colors, int ncolors,
-				Display * display, Drawable d, GC gc,
-				XImage * image, int src_x, int src_y,
+EXTERN void		TkPutImage(unsigned long *colors, int ncolors,
+				Display *display, Drawable d, GC gc,
+				XImage *image, int src_x, int src_y,
 				int dest_x, int dest_y, unsigned int width,
 				unsigned int height);
 #endif
@@ -513,149 +507,145 @@ EXTERN void		TkPutImage (unsigned long * colors, int ncolors,
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 82 */
-EXTERN Status		XParseColor (Display * display, Colormap map,
-				_Xconst char * spec, XColor * colorPtr);
+EXTERN Status		XParseColor(Display *display, Colormap map,
+				_Xconst char *spec, XColor *colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 83 */
-EXTERN GC		XCreateGC (Display * display, Drawable d,
-				unsigned long valuemask, XGCValues * values);
+EXTERN GC		XCreateGC(Display *display, Drawable d,
+				unsigned long valuemask, XGCValues *values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
 #define XFreeGC_TCL_DECLARED
 /* 84 */
-EXTERN void		XFreeGC (Display * display, GC gc);
+EXTERN void		XFreeGC(Display *display, GC gc);
 #endif
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 85 */
-EXTERN Atom		XInternAtom (Display * display,
-				_Xconst char * atom_name,
-				Bool only_if_exists);
+EXTERN Atom		XInternAtom(Display *display,
+				_Xconst char *atom_name, Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 86 */
-EXTERN void		XSetBackground (Display * display, GC gc,
+EXTERN void		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 87 */
-EXTERN void		XSetForeground (Display * display, GC gc,
+EXTERN void		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 88 */
-EXTERN void		XSetClipMask (Display * display, GC gc,
-				Pixmap pixmap);
+EXTERN void		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 89 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc,
+EXTERN void		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 90 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc,
+EXTERN void		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 91 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
-				XGCValues * values);
+EXTERN void		XChangeGC(Display *d, GC gc, unsigned long mask,
+				XGCValues *values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
 #define XSetFont_TCL_DECLARED
 /* 92 */
-EXTERN void		XSetFont (Display * display, GC gc, Font font);
+EXTERN void		XSetFont(Display *display, GC gc, Font font);
 #endif
 #ifndef XSetArcMode_TCL_DECLARED
 #define XSetArcMode_TCL_DECLARED
 /* 93 */
-EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
+EXTERN void		XSetArcMode(Display *display, GC gc, int arc_mode);
 #endif
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 94 */
-EXTERN void		XSetStipple (Display * display, GC gc,
-				Pixmap stipple);
+EXTERN void		XSetStipple(Display *display, GC gc, Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 95 */
-EXTERN void		XSetFillRule (Display * display, GC gc,
-				int fill_rule);
+EXTERN void		XSetFillRule(Display *display, GC gc, int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 96 */
-EXTERN void		XSetFillStyle (Display * display, GC gc,
+EXTERN void		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
 #define XSetFunction_TCL_DECLARED
 /* 97 */
-EXTERN void		XSetFunction (Display * display, GC gc, int function);
+EXTERN void		XSetFunction(Display *display, GC gc, int function);
 #endif
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 98 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc,
+EXTERN void		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
 #define _XInitImageFuncPtrs_TCL_DECLARED
 /* 99 */
-EXTERN int		_XInitImageFuncPtrs (XImage * image);
+EXTERN int		_XInitImageFuncPtrs(XImage *image);
 #endif
 #ifndef XCreateIC_TCL_DECLARED
 #define XCreateIC_TCL_DECLARED
 /* 100 */
-EXTERN XIC		XCreateIC (void);
+EXTERN XIC		XCreateIC(void);
 #endif
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 101 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
-				XVisualInfo * vinfo_template,
-				int * nitems_return);
+EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
+				XVisualInfo *vinfo_template,
+				int *nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w,
-				XTextProperty * text_prop);
+EXTERN void		XSetWMClientMachine(Display *display, Window w,
+				XTextProperty *text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count,
-				XTextProperty * text_prop_return);
+EXTERN Status		XStringListToTextProperty(char **list, int count,
+				XTextProperty *text_prop_return);
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 104 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
+EXTERN void		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 105 */
-EXTERN void		XWarpPointer (Display * d, Window s, Window dw,
-				int sx, int sy, unsigned int sw,
-				unsigned int sh, int dx, int dy);
+EXTERN void		XWarpPointer(Display *d, Window s, Window dw, int sx,
+				int sy, unsigned int sw, unsigned int sh,
+				int dx, int dy);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 106 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+EXTERN void		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
@@ -664,111 +654,109 @@ EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes (Display * display, GC gc,
-				int dash_offset, _Xconst char * dash_list,
-				int n);
+EXTERN void		XSetDashes(Display *display, GC gc, int dash_offset,
+				_Xconst char *dash_list, int n);
 #endif
 #ifndef XGetModifierMapping_TCL_DECLARED
 #define XGetModifierMapping_TCL_DECLARED
 /* 1 */
-EXTERN XModifierKeymap * XGetModifierMapping (Display * d);
+EXTERN XModifierKeymap * XGetModifierMapping(Display *d);
 #endif
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage (Display * d, Visual * v,
-				unsigned int ui1, int i1, int i2, char * cp,
-				unsigned int ui2, unsigned int ui3, int i3,
-				int i4);
+EXTERN XImage *		XCreateImage(Display *d, Visual *v, unsigned int ui1,
+				int i1, int i2, char *cp, unsigned int ui2,
+				unsigned int ui3, int i3, int i4);
 #endif
 #ifndef XGetImage_TCL_DECLARED
 #define XGetImage_TCL_DECLARED
 /* 3 */
-EXTERN XImage *		XGetImage (Display * d, Drawable dr, int i1, int i2,
+EXTERN XImage *		XGetImage(Display *d, Drawable dr, int i1, int i2,
 				unsigned int ui1, unsigned int ui2,
 				unsigned long ul, int i3);
 #endif
 #ifndef XGetAtomName_TCL_DECLARED
 #define XGetAtomName_TCL_DECLARED
 /* 4 */
-EXTERN char *		XGetAtomName (Display * d, Atom a);
+EXTERN char *		XGetAtomName(Display *d, Atom a);
 #endif
 #ifndef XKeysymToString_TCL_DECLARED
 #define XKeysymToString_TCL_DECLARED
 /* 5 */
-EXTERN char *		XKeysymToString (KeySym k);
+EXTERN char *		XKeysymToString(KeySym k);
 #endif
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap (Display * d, Window w, Visual * v,
+EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
 #define XGContextFromGC_TCL_DECLARED
 /* 7 */
-EXTERN GContext		XGContextFromGC (GC g);
+EXTERN GContext		XGContextFromGC(GC g);
 #endif
 #ifndef XKeycodeToKeysym_TCL_DECLARED
 #define XKeycodeToKeysym_TCL_DECLARED
 /* 8 */
-EXTERN KeySym		XKeycodeToKeysym (Display * d, KeyCode k, int i);
+EXTERN KeySym		XKeycodeToKeysym(Display *d, KeyCode k, int i);
 #endif
 #ifndef XStringToKeysym_TCL_DECLARED
 #define XStringToKeysym_TCL_DECLARED
 /* 9 */
-EXTERN KeySym		XStringToKeysym (_Xconst char * c);
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
 #endif
 #ifndef XRootWindow_TCL_DECLARED
 #define XRootWindow_TCL_DECLARED
 /* 10 */
-EXTERN Window		XRootWindow (Display * d, int i);
+EXTERN Window		XRootWindow(Display *d, int i);
 #endif
 #ifndef XSetErrorHandler_TCL_DECLARED
 #define XSetErrorHandler_TCL_DECLARED
 /* 11 */
-EXTERN XErrorHandler	XSetErrorHandler (XErrorHandler x);
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
 #endif
 #ifndef XAllocColor_TCL_DECLARED
 #define XAllocColor_TCL_DECLARED
 /* 12 */
-EXTERN Status		XAllocColor (Display * d, Colormap c, XColor * xp);
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
 #endif
 #ifndef XBell_TCL_DECLARED
 #define XBell_TCL_DECLARED
 /* 13 */
-EXTERN void		XBell (Display * d, int i);
+EXTERN void		XBell(Display *d, int i);
 #endif
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 14 */
-EXTERN void		XChangeProperty (Display * d, Window w, Atom a1,
+EXTERN void		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
-				_Xconst unsigned char * c, int i3);
+				_Xconst unsigned char *c, int i3);
 #endif
 #ifndef XChangeWindowAttributes_TCL_DECLARED
 #define XChangeWindowAttributes_TCL_DECLARED
 /* 15 */
-EXTERN void		XChangeWindowAttributes (Display * d, Window w,
-				unsigned long ul, XSetWindowAttributes * x);
+EXTERN void		XChangeWindowAttributes(Display *d, Window w,
+				unsigned long ul, XSetWindowAttributes *x);
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 16 */
-EXTERN void		XConfigureWindow (Display * d, Window w,
-				unsigned int i, XWindowChanges * x);
+EXTERN void		XConfigureWindow(Display *d, Window w,
+				unsigned int i, XWindowChanges *x);
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 17 */
-EXTERN void		XCopyArea (Display * d, Drawable dr1, Drawable dr2,
+EXTERN void		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
 #endif
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 18 */
-EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
+EXTERN void		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
@@ -776,410 +764,403 @@ EXTERN void		XCopyPlane (Display * d, Drawable dr1, Drawable dr2,
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
-EXTERN Pixmap		XCreateBitmapFromData (Display * display, Drawable d,
-				_Xconst char * data, unsigned int width,
+EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
+				_Xconst char *data, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XDefineCursor_TCL_DECLARED
 #define XDefineCursor_TCL_DECLARED
 /* 20 */
-EXTERN void		XDefineCursor (Display * d, Window w, Cursor c);
+EXTERN void		XDefineCursor(Display *d, Window w, Cursor c);
 #endif
 #ifndef XDestroyWindow_TCL_DECLARED
 #define XDestroyWindow_TCL_DECLARED
 /* 21 */
-EXTERN void		XDestroyWindow (Display * d, Window w);
+EXTERN void		XDestroyWindow(Display *d, Window w);
 #endif
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 22 */
-EXTERN void		XDrawArc (Display * d, Drawable dr, GC g, int i1,
+EXTERN void		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XDrawLines_TCL_DECLARED
 #define XDrawLines_TCL_DECLARED
 /* 23 */
-EXTERN void		XDrawLines (Display * d, Drawable dr, GC g,
-				XPoint * x, int i1, int i2);
+EXTERN void		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
+				int i1, int i2);
 #endif
 #ifndef XDrawRectangle_TCL_DECLARED
 #define XDrawRectangle_TCL_DECLARED
 /* 24 */
-EXTERN void		XDrawRectangle (Display * d, Drawable dr, GC g,
-				int i1, int i2, unsigned int ui1,
-				unsigned int ui2);
+EXTERN void		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
+				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XFillArc_TCL_DECLARED
 #define XFillArc_TCL_DECLARED
 /* 25 */
-EXTERN void		XFillArc (Display * d, Drawable dr, GC g, int i1,
+EXTERN void		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
 #endif
 #ifndef XFillPolygon_TCL_DECLARED
 #define XFillPolygon_TCL_DECLARED
 /* 26 */
-EXTERN void		XFillPolygon (Display * d, Drawable dr, GC g,
-				XPoint * x, int i1, int i2, int i3);
+EXTERN void		XFillPolygon(Display *d, Drawable dr, GC g,
+				XPoint *x, int i1, int i2, int i3);
 #endif
 #ifndef XFillRectangles_TCL_DECLARED
 #define XFillRectangles_TCL_DECLARED
 /* 27 */
-EXTERN void		XFillRectangles (Display * d, Drawable dr, GC g,
-				XRectangle * x, int i);
+EXTERN void		XFillRectangles(Display *d, Drawable dr, GC g,
+				XRectangle *x, int i);
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
 #define XFreeColormap_TCL_DECLARED
 /* 28 */
-EXTERN void		XFreeColormap (Display * d, Colormap c);
+EXTERN void		XFreeColormap(Display *d, Colormap c);
 #endif
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 29 */
-EXTERN void		XFreeColors (Display * d, Colormap c,
-				unsigned long * ulp, int i, unsigned long ul);
+EXTERN void		XFreeColors(Display *d, Colormap c,
+				unsigned long *ulp, int i, unsigned long ul);
 #endif
 #ifndef XFreeModifiermap_TCL_DECLARED
 #define XFreeModifiermap_TCL_DECLARED
 /* 30 */
-EXTERN void		XFreeModifiermap (XModifierKeymap * x);
+EXTERN void		XFreeModifiermap(XModifierKeymap *x);
 #endif
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 31 */
-EXTERN Status		XGetGeometry (Display * d, Drawable dr, Window * w,
-				int * i1, int * i2, unsigned int * ui1,
-				unsigned int * ui2, unsigned int * ui3,
-				unsigned int * ui4);
+EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
+				int *i1, int *i2, unsigned int *ui1,
+				unsigned int *ui2, unsigned int *ui3,
+				unsigned int *ui4);
 #endif
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 32 */
-EXTERN int		XGetWindowProperty (Display * d, Window w, Atom a1,
-				long l1, long l2, Bool b, Atom a2, Atom * ap,
-				int * ip, unsigned long * ulp1,
-				unsigned long * ulp2, unsigned char ** cpp);
+EXTERN int		XGetWindowProperty(Display *d, Window w, Atom a1,
+				long l1, long l2, Bool b, Atom a2, Atom *ap,
+				int *ip, unsigned long *ulp1,
+				unsigned long *ulp2, unsigned char **cpp);
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 33 */
-EXTERN int		XGrabKeyboard (Display * d, Window w, Bool b, int i1,
+EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
 #endif
 #ifndef XGrabPointer_TCL_DECLARED
 #define XGrabPointer_TCL_DECLARED
 /* 34 */
-EXTERN int		XGrabPointer (Display * d, Window w1, Bool b,
+EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
 #endif
 #ifndef XKeysymToKeycode_TCL_DECLARED
 #define XKeysymToKeycode_TCL_DECLARED
 /* 35 */
-EXTERN KeyCode		XKeysymToKeycode (Display * d, KeySym k);
+EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
 #endif
 #ifndef XMapWindow_TCL_DECLARED
 #define XMapWindow_TCL_DECLARED
 /* 36 */
-EXTERN void		XMapWindow (Display * d, Window w);
+EXTERN void		XMapWindow(Display *d, Window w);
 #endif
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
-EXTERN void		XMoveResizeWindow (Display * d, Window w, int i1,
+EXTERN void		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
 #endif
 #ifndef XMoveWindow_TCL_DECLARED
 #define XMoveWindow_TCL_DECLARED
 /* 38 */
-EXTERN void		XMoveWindow (Display * d, Window w, int i1, int i2);
+EXTERN void		XMoveWindow(Display *d, Window w, int i1, int i2);
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 39 */
-EXTERN Bool		XQueryPointer (Display * d, Window w1, Window * w2,
-				Window * w3, int * i1, int * i2, int * i3,
-				int * i4, unsigned int * ui);
+EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
+				Window *w3, int *i1, int *i2, int *i3,
+				int *i4, unsigned int *ui);
 #endif
 #ifndef XRaiseWindow_TCL_DECLARED
 #define XRaiseWindow_TCL_DECLARED
 /* 40 */
-EXTERN void		XRaiseWindow (Display * d, Window w);
+EXTERN void		XRaiseWindow(Display *d, Window w);
 #endif
 #ifndef XRefreshKeyboardMapping_TCL_DECLARED
 #define XRefreshKeyboardMapping_TCL_DECLARED
 /* 41 */
-EXTERN void		XRefreshKeyboardMapping (XMappingEvent * x);
+EXTERN void		XRefreshKeyboardMapping(XMappingEvent *x);
 #endif
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 42 */
-EXTERN void		XResizeWindow (Display * d, Window w,
-				unsigned int ui1, unsigned int ui2);
+EXTERN void		XResizeWindow(Display *d, Window w, unsigned int ui1,
+				unsigned int ui2);
 #endif
 #ifndef XSelectInput_TCL_DECLARED
 #define XSelectInput_TCL_DECLARED
 /* 43 */
-EXTERN void		XSelectInput (Display * d, Window w, long l);
+EXTERN void		XSelectInput(Display *d, Window w, long l);
 #endif
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 44 */
-EXTERN Status		XSendEvent (Display * d, Window w, Bool b, long l,
-				XEvent * x);
+EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
+				XEvent *x);
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 45 */
-EXTERN void		XSetIconName (Display * d, Window w,
-				_Xconst char * c);
+EXTERN void		XSetIconName(Display *d, Window w, _Xconst char *c);
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
 #define XSetInputFocus_TCL_DECLARED
 /* 46 */
-EXTERN void		XSetInputFocus (Display * d, Window w, int i, Time t);
+EXTERN void		XSetInputFocus(Display *d, Window w, int i, Time t);
 #endif
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
-EXTERN void		XSetSelectionOwner (Display * d, Atom a, Window w,
+EXTERN void		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 48 */
-EXTERN void		XSetWindowBackground (Display * d, Window w,
+EXTERN void		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
-EXTERN void		XSetWindowBackgroundPixmap (Display * d, Window w,
+EXTERN void		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 50 */
-EXTERN void		XSetWindowBorder (Display * d, Window w,
+EXTERN void		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
-EXTERN void		XSetWindowBorderPixmap (Display * d, Window w,
+EXTERN void		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
-EXTERN void		XSetWindowBorderWidth (Display * d, Window w,
+EXTERN void		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 53 */
-EXTERN void		XSetWindowColormap (Display * d, Window w,
-				Colormap c);
+EXTERN void		XSetWindowColormap(Display *d, Window w, Colormap c);
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
 #define XUngrabKeyboard_TCL_DECLARED
 /* 54 */
-EXTERN void		XUngrabKeyboard (Display * d, Time t);
+EXTERN void		XUngrabKeyboard(Display *d, Time t);
 #endif
 #ifndef XUngrabPointer_TCL_DECLARED
 #define XUngrabPointer_TCL_DECLARED
 /* 55 */
-EXTERN void		XUngrabPointer (Display * d, Time t);
+EXTERN void		XUngrabPointer(Display *d, Time t);
 #endif
 #ifndef XUnmapWindow_TCL_DECLARED
 #define XUnmapWindow_TCL_DECLARED
 /* 56 */
-EXTERN void		XUnmapWindow (Display * d, Window w);
+EXTERN void		XUnmapWindow(Display *d, Window w);
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 57 */
-EXTERN void		TkPutImage (unsigned long * colors, int ncolors,
-				Display * display, Drawable d, GC gc,
-				XImage * image, int src_x, int src_y,
+EXTERN void		TkPutImage(unsigned long *colors, int ncolors,
+				Display *display, Drawable d, GC gc,
+				XImage *image, int src_x, int src_y,
 				int dest_x, int dest_y, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XParseColor_TCL_DECLARED
 #define XParseColor_TCL_DECLARED
 /* 58 */
-EXTERN Status		XParseColor (Display * display, Colormap map,
-				_Xconst char * spec, XColor * colorPtr);
+EXTERN Status		XParseColor(Display *display, Colormap map,
+				_Xconst char *spec, XColor *colorPtr);
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 59 */
-EXTERN GC		XCreateGC (Display * display, Drawable d,
-				unsigned long valuemask, XGCValues * values);
+EXTERN GC		XCreateGC(Display *display, Drawable d,
+				unsigned long valuemask, XGCValues *values);
 #endif
 #ifndef XFreeGC_TCL_DECLARED
 #define XFreeGC_TCL_DECLARED
 /* 60 */
-EXTERN void		XFreeGC (Display * display, GC gc);
+EXTERN void		XFreeGC(Display *display, GC gc);
 #endif
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 61 */
-EXTERN Atom		XInternAtom (Display * display,
-				_Xconst char * atom_name,
-				Bool only_if_exists);
+EXTERN Atom		XInternAtom(Display *display,
+				_Xconst char *atom_name, Bool only_if_exists);
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetBackground (Display * display, GC gc,
+EXTERN void		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetForeground (Display * display, GC gc,
+EXTERN void		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetClipMask (Display * display, GC gc,
-				Pixmap pixmap);
+EXTERN void		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetClipOrigin (Display * display, GC gc,
+EXTERN void		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
 #endif
 #ifndef XSetTSOrigin_TCL_DECLARED
 #define XSetTSOrigin_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetTSOrigin (Display * display, GC gc,
+EXTERN void		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
 #endif
 #ifndef XChangeGC_TCL_DECLARED
 #define XChangeGC_TCL_DECLARED
 /* 67 */
-EXTERN void		XChangeGC (Display * d, GC gc, unsigned long mask,
-				XGCValues * values);
+EXTERN void		XChangeGC(Display *d, GC gc, unsigned long mask,
+				XGCValues *values);
 #endif
 #ifndef XSetFont_TCL_DECLARED
 #define XSetFont_TCL_DECLARED
 /* 68 */
-EXTERN void		XSetFont (Display * display, GC gc, Font font);
+EXTERN void		XSetFont(Display *display, GC gc, Font font);
 #endif
 #ifndef XSetArcMode_TCL_DECLARED
 #define XSetArcMode_TCL_DECLARED
 /* 69 */
-EXTERN void		XSetArcMode (Display * display, GC gc, int arc_mode);
+EXTERN void		XSetArcMode(Display *display, GC gc, int arc_mode);
 #endif
 #ifndef XSetStipple_TCL_DECLARED
 #define XSetStipple_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetStipple (Display * display, GC gc,
-				Pixmap stipple);
+EXTERN void		XSetStipple(Display *display, GC gc, Pixmap stipple);
 #endif
 #ifndef XSetFillRule_TCL_DECLARED
 #define XSetFillRule_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetFillRule (Display * display, GC gc,
-				int fill_rule);
+EXTERN void		XSetFillRule(Display *display, GC gc, int fill_rule);
 #endif
 #ifndef XSetFillStyle_TCL_DECLARED
 #define XSetFillStyle_TCL_DECLARED
 /* 72 */
-EXTERN void		XSetFillStyle (Display * display, GC gc,
+EXTERN void		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
 #endif
 #ifndef XSetFunction_TCL_DECLARED
 #define XSetFunction_TCL_DECLARED
 /* 73 */
-EXTERN void		XSetFunction (Display * display, GC gc, int function);
+EXTERN void		XSetFunction(Display *display, GC gc, int function);
 #endif
 #ifndef XSetLineAttributes_TCL_DECLARED
 #define XSetLineAttributes_TCL_DECLARED
 /* 74 */
-EXTERN void		XSetLineAttributes (Display * display, GC gc,
+EXTERN void		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
 #endif
 #ifndef _XInitImageFuncPtrs_TCL_DECLARED
 #define _XInitImageFuncPtrs_TCL_DECLARED
 /* 75 */
-EXTERN int		_XInitImageFuncPtrs (XImage * image);
+EXTERN int		_XInitImageFuncPtrs(XImage *image);
 #endif
 #ifndef XCreateIC_TCL_DECLARED
 #define XCreateIC_TCL_DECLARED
 /* 76 */
-EXTERN XIC		XCreateIC (void);
+EXTERN XIC		XCreateIC(void);
 #endif
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo (Display * display, long vinfo_mask,
-				XVisualInfo * vinfo_template,
-				int * nitems_return);
+EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
+				XVisualInfo *vinfo_template,
+				int *nitems_return);
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
-EXTERN void		XSetWMClientMachine (Display * display, Window w,
-				XTextProperty * text_prop);
+EXTERN void		XSetWMClientMachine(Display *display, Window w,
+				XTextProperty *text_prop);
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
-EXTERN Status		XStringListToTextProperty (char ** list, int count,
-				XTextProperty * text_prop_return);
+EXTERN Status		XStringListToTextProperty(char **list, int count,
+				XTextProperty *text_prop_return);
 #endif
 #ifndef XDrawSegments_TCL_DECLARED
 #define XDrawSegments_TCL_DECLARED
 /* 80 */
-EXTERN void		XDrawSegments (Display * display, Drawable d, GC gc,
-				XSegment * segments, int nsegments);
+EXTERN void		XDrawSegments(Display *display, Drawable d, GC gc,
+				XSegment *segments, int nsegments);
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
 #define XForceScreenSaver_TCL_DECLARED
 /* 81 */
-EXTERN void		XForceScreenSaver (Display * display, int mode);
+EXTERN void		XForceScreenSaver(Display *display, int mode);
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 82 */
-EXTERN void		XDrawLine (Display * d, Drawable dr, GC g, int x1,
+EXTERN void		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
 #endif
 #ifndef XFillRectangle_TCL_DECLARED
 #define XFillRectangle_TCL_DECLARED
 /* 83 */
-EXTERN void		XFillRectangle (Display * display, Drawable d, GC gc,
+EXTERN void		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
 #endif
 #ifndef XClearWindow_TCL_DECLARED
 #define XClearWindow_TCL_DECLARED
 /* 84 */
-EXTERN void		XClearWindow (Display * d, Window w);
+EXTERN void		XClearWindow(Display *d, Window w);
 #endif
 #ifndef XDrawPoint_TCL_DECLARED
 #define XDrawPoint_TCL_DECLARED
 /* 85 */
-EXTERN void		XDrawPoint (Display * display, Drawable d, GC gc,
+EXTERN void		XDrawPoint(Display *display, Drawable d, GC gc,
 				int x, int y);
 #endif
 #ifndef XDrawPoints_TCL_DECLARED
 #define XDrawPoints_TCL_DECLARED
 /* 86 */
-EXTERN void		XDrawPoints (Display * display, Drawable d, GC gc,
-				XPoint * points, int npoints, int mode);
+EXTERN void		XDrawPoints(Display *display, Drawable d, GC gc,
+				XPoint *points, int npoints, int mode);
 #endif
 #ifndef XWarpPointer_TCL_DECLARED
 #define XWarpPointer_TCL_DECLARED
 /* 87 */
-EXTERN void		XWarpPointer (Display * display, Window src_w,
+EXTERN void		XWarpPointer(Display *display, Window src_w,
 				Window dest_w, int src_x, int src_y,
 				unsigned int src_width,
 				unsigned int src_height, int dest_x,
@@ -1188,25 +1169,25 @@ EXTERN void		XWarpPointer (Display * display, Window src_w,
 #ifndef XQueryColor_TCL_DECLARED
 #define XQueryColor_TCL_DECLARED
 /* 88 */
-EXTERN void		XQueryColor (Display * display, Colormap colormap,
-				XColor * def_in_out);
+EXTERN void		XQueryColor(Display *display, Colormap colormap,
+				XColor *def_in_out);
 #endif
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 89 */
-EXTERN void		XQueryColors (Display * display, Colormap colormap,
-				XColor * defs_in_out, int ncolors);
+EXTERN void		XQueryColors(Display *display, Colormap colormap,
+				XColor *defs_in_out, int ncolors);
 #endif
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 90 */
-EXTERN Status		XQueryTree (Display * d, Window w1, Window * w2,
-				Window * w3, Window ** w4, unsigned int * ui);
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
 #endif
 #ifndef XSync_TCL_DECLARED
 #define XSync_TCL_DECLARED
 /* 91 */
-EXTERN int		XSync (Display * display, Bool flag);
+EXTERN int		XSync(Display *display, Bool flag);
 #endif
 #endif /* AQUA */