Regen

4 files changed, 472 insertions, 440 deletions

diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index ad29720..428fbee 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkIntDecls.h,v 1.26 2005/08/09 07:39:18 das Exp $
+ * RCS: @(#) $Id: tkIntDecls.h,v 1.27 2005/09/21 10:56:32 dkf Exp $
  */
 
 #ifndef _TKINTDECLS
@@ -507,12 +507,12 @@ EXTERN void		TkQueueEventForAllChildren _ANSI_ARGS_((
 #ifndef TkReadBitmapFile_TCL_DECLARED
 #define TkReadBitmapFile_TCL_DECLARED
 /* 78 */
-EXTERN int		TkReadBitmapFile _ANSI_ARGS_((Display* display, 
-				Drawable d, CONST char* filename, 
-				unsigned int* width_return, 
-				unsigned int* height_return, 
-				Pixmap* bitmap_return, int* x_hot_return, 
-				int* y_hot_return));
+EXTERN int		TkReadBitmapFile _ANSI_ARGS_((Display * display, 
+				Drawable d, CONST char * filename, 
+				unsigned int * width_return, 
+				unsigned int * height_return, 
+				Pixmap * bitmap_return, int * x_hot_return, 
+				int * y_hot_return));
 #endif
 #ifndef TkScrollWindow_TCL_DECLARED
 #define TkScrollWindow_TCL_DECLARED
@@ -709,7 +709,7 @@ EXTERN void		TkpMenuThreadInit _ANSI_ARGS_((void));
 #define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
-				XRectangle* rect_return));
+				XRectangle * rect_return));
 #endif
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
@@ -717,7 +717,7 @@ EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn,
 #define TkClipBox_TCL_DECLARED
 /* 113 */
 EXTERN void		TkClipBox _ANSI_ARGS_((TkRegion rgn, 
-				XRectangle* rect_return));
+				XRectangle * rect_return));
 #endif
 #endif /* MAC_OSX_TK */
 #ifdef __WIN32__
@@ -786,7 +786,7 @@ EXTERN int		TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x,
 #ifndef TkSetRegion_TCL_DECLARED
 #define TkSetRegion_TCL_DECLARED
 /* 118 */
-EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		TkSetRegion _ANSI_ARGS_((Display * display, GC gc, 
 				TkRegion rgn));
 #endif
 #endif /* __WIN32__ */
@@ -794,7 +794,7 @@ EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc,
 #ifndef TkSetRegion_TCL_DECLARED
 #define TkSetRegion_TCL_DECLARED
 /* 118 */
-EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		TkSetRegion _ANSI_ARGS_((Display * display, GC gc, 
 				TkRegion rgn));
 #endif
 #endif /* MAC_OSX_TK */
@@ -802,7 +802,7 @@ EXTERN void		TkSetRegion _ANSI_ARGS_((Display* display, GC gc,
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
-EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
+EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle * rect, 
 				TkRegion src, TkRegion dr_return));
 #endif
 #endif /* __WIN32__ */
@@ -810,7 +810,7 @@ EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect,
 #ifndef TkUnionRectWithRegion_TCL_DECLARED
 #define TkUnionRectWithRegion_TCL_DECLARED
 /* 119 */
-EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, 
+EXTERN void		TkUnionRectWithRegion _ANSI_ARGS_((XRectangle * rect, 
 				TkRegion src, TkRegion dr_return));
 #endif
 #endif /* MAC_OSX_TK */
@@ -966,6 +966,18 @@ EXTERN void		TkpDrawFrame _ANSI_ARGS_((Tk_Window tkwin,
 				Tk_3DBorder border, int highlightWidth, 
 				int borderWidth, int relief));
 #endif
+#ifndef TkCreateThreadExitHandler_TCL_DECLARED
+#define TkCreateThreadExitHandler_TCL_DECLARED
+/* 153 */
+EXTERN void		TkCreateThreadExitHandler _ANSI_ARGS_((
+				Tcl_ExitProc * proc, ClientData clientData));
+#endif
+#ifndef TkDeleteThreadExitHandler_TCL_DECLARED
+#define TkDeleteThreadExitHandler_TCL_DECLARED
+/* 154 */
+EXTERN void		TkDeleteThreadExitHandler _ANSI_ARGS_((
+				Tcl_ExitProc * proc, ClientData clientData));
+#endif
 
 typedef struct TkIntStubs {
     int magic;
@@ -1049,7 +1061,7 @@ typedef struct TkIntStubs {
     int (*tkpUseWindow) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Window tkwin, CONST char * string)); /* 75 */
     int (*tkpWindowWasRecentlyDeleted) _ANSI_ARGS_((Window win, TkDisplay * dispPtr)); /* 76 */
     void (*tkQueueEventForAllChildren) _ANSI_ARGS_((TkWindow * winPtr, XEvent * eventPtr)); /* 77 */
-    int (*tkReadBitmapFile) _ANSI_ARGS_((Display* display, Drawable d, CONST char* filename, unsigned int* width_return, unsigned int* height_return, Pixmap* bitmap_return, int* x_hot_return, int* y_hot_return)); /* 78 */
+    int (*tkReadBitmapFile) _ANSI_ARGS_((Display * display, Drawable d, CONST char * filename, unsigned int * width_return, unsigned int * height_return, Pixmap * bitmap_return, int * x_hot_return, int * y_hot_return)); /* 78 */
     int (*tkScrollWindow) _ANSI_ARGS_((Tk_Window tkwin, GC gc, int x, int y, int width, int height, int dx, int dy, TkRegion damageRgn)); /* 79 */
     void (*tkSelDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 80 */
     void (*tkSelEventProc) _ANSI_ARGS_((Tk_Window tkwin, XEvent * eventPtr)); /* 81 */
@@ -1088,10 +1100,10 @@ typedef struct TkIntStubs {
     void *reserved113;
 #endif /* UNIX */
 #ifdef __WIN32__
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
+    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle * rect_return)); /* 113 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
-    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */
+    void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle * rect_return)); /* 113 */
 #endif /* MAC_OSX_TK */
 #if !defined(__WIN32__) /* UNIX */
     void *reserved114;
@@ -1133,19 +1145,19 @@ typedef struct TkIntStubs {
     void *reserved118;
 #endif /* UNIX */
 #ifdef __WIN32__
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
+    void (*tkSetRegion) _ANSI_ARGS_((Display * display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
-    void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */
+    void (*tkSetRegion) _ANSI_ARGS_((Display * display, GC gc, TkRegion rgn)); /* 118 */
 #endif /* MAC_OSX_TK */
 #if !defined(__WIN32__) /* UNIX */
     void *reserved119;
 #endif /* UNIX */
 #ifdef __WIN32__
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
+    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle * rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
-    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */
+    void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle * rect, TkRegion src, TkRegion dr_return)); /* 119 */
 #endif /* MAC_OSX_TK */
     void *reserved120;
 #if !defined(__WIN32__) /* UNIX */
@@ -1212,6 +1224,8 @@ typedef struct TkIntStubs {
     int (*tkMakeRawCurve) _ANSI_ARGS_((Tk_Canvas canvas, double * pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[])); /* 150 */
     void (*tkMakeRawCurvePostscript) _ANSI_ARGS_((Tcl_Interp * interp, Tk_Canvas canvas, double * pointPtr, int numPoints)); /* 151 */
     void (*tkpDrawFrame) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief)); /* 152 */
+    void (*tkCreateThreadExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 153 */
+    void (*tkDeleteThreadExitHandler) _ANSI_ARGS_((Tcl_ExitProc * proc, ClientData clientData)); /* 154 */
 } TkIntStubs;
 
 #ifdef __cplusplus
@@ -1871,6 +1885,14 @@ extern TkIntStubs *tkIntStubsPtr;
 #define TkpDrawFrame \
 	(tkIntStubsPtr->tkpDrawFrame) /* 152 */
 #endif
+#ifndef TkCreateThreadExitHandler
+#define TkCreateThreadExitHandler \
+	(tkIntStubsPtr->tkCreateThreadExitHandler) /* 153 */
+#endif
+#ifndef TkDeleteThreadExitHandler
+#define TkDeleteThreadExitHandler \
+	(tkIntStubsPtr->tkDeleteThreadExitHandler) /* 154 */
+#endif
 
 #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */
 
diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index a21f92b..1cffb59 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.23 2005/08/09 07:39:18 das Exp $
+ * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.24 2005/09/21 10:56:32 dkf Exp $
  */
 
 #ifndef _TKINTPLATDECLS
@@ -123,7 +123,7 @@ EXTERN COLORREF		TkWinGetBorderPixels _ANSI_ARGS_((Tk_Window tkwin,
 #define TkWinGetDrawableDC_TCL_DECLARED
 /* 16 */
 EXTERN HDC		TkWinGetDrawableDC _ANSI_ARGS_((Display * display, 
-				Drawable d, TkWinDCState* state));
+				Drawable d, TkWinDCState * state));
 #endif
 #ifndef TkWinGetModifierState_TCL_DECLARED
 #define TkWinGetModifierState_TCL_DECLARED
@@ -156,7 +156,7 @@ EXTERN int		TkWinIndexOfColor _ANSI_ARGS_((XColor * colorPtr));
 #define TkWinReleaseDrawableDC_TCL_DECLARED
 /* 22 */
 EXTERN void		TkWinReleaseDrawableDC _ANSI_ARGS_((Drawable d, 
-				HDC hdc, TkWinDCState* state));
+				HDC hdc, TkWinDCState * state));
 #endif
 #ifndef TkWinResendEvent_TCL_DECLARED
 #define TkWinResendEvent_TCL_DECLARED
@@ -590,13 +590,13 @@ typedef struct TkIntPlatStubs {
     LRESULT (*tkWinEmbeddedEventProc) _ANSI_ARGS_((HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)); /* 13 */
     void (*tkWinFillRect) _ANSI_ARGS_((HDC dc, int x, int y, int width, int height, int pixel)); /* 14 */
     COLORREF (*tkWinGetBorderPixels) _ANSI_ARGS_((Tk_Window tkwin, Tk_3DBorder border, int which)); /* 15 */
-    HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState* state)); /* 16 */
+    HDC (*tkWinGetDrawableDC) _ANSI_ARGS_((Display * display, Drawable d, TkWinDCState * state)); /* 16 */
     int (*tkWinGetModifierState) _ANSI_ARGS_((void)); /* 17 */
     HPALETTE (*tkWinGetSystemPalette) _ANSI_ARGS_((void)); /* 18 */
     HWND (*tkWinGetWrapperWindow) _ANSI_ARGS_((Tk_Window tkwin)); /* 19 */
     int (*tkWinHandleMenuEvent) _ANSI_ARGS_((HWND * phwnd, UINT * pMessage, WPARAM * pwParam, LPARAM * plParam, LRESULT * plResult)); /* 20 */
     int (*tkWinIndexOfColor) _ANSI_ARGS_((XColor * colorPtr)); /* 21 */
-    void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState* state)); /* 22 */
+    void (*tkWinReleaseDrawableDC) _ANSI_ARGS_((Drawable d, HDC hdc, TkWinDCState * state)); /* 22 */
     LRESULT (*tkWinResendEvent) _ANSI_ARGS_((WNDPROC wndproc, HWND hwnd, XEvent * eventPtr)); /* 23 */
     HPALETTE (*tkWinSelectPalette) _ANSI_ARGS_((HDC dc, Colormap colormap)); /* 24 */
     void (*tkWinSetMenu) _ANSI_ARGS_((Tk_Window tkwin, HMENU hMenu)); /* 25 */
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 060cfc2..a024f0b 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.18 2004/03/17 18:15:43 das Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.19 2005/09/21 10:56:33 dkf Exp $
  */
 
 #ifndef _TKINTXLIBDECLS
@@ -38,34 +38,34 @@
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes _ANSI_ARGS_((Display* display, GC gc, 
-				int dash_offset, _Xconst char* dash_list, 
+EXTERN void		XSetDashes _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d));
+EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display * d));
 #endif
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage _ANSI_ARGS_((Display* d, Visual* v, 
-				unsigned int ui1, int i1, int i2, char* cp, 
+EXTERN XImage *		XCreateImage _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
+EXTERN XImage *		XGetImage _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Atom a));
+EXTERN char *		XGetAtomName _ANSI_ARGS_((Display * d, Atom a));
 #endif
 #ifndef XKeysymToString_TCL_DECLARED
 #define XKeysymToString_TCL_DECLARED
@@ -75,22 +75,23 @@ EXTERN char *		XKeysymToString _ANSI_ARGS_((KeySym k));
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display* d, Window w, 
-				Visual* v, int i));
+EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display * d, Window w, 
+				Visual * v, int i));
 #endif
 #ifndef XCreatePixmapCursor_TCL_DECLARED
 #define XCreatePixmapCursor_TCL_DECLARED
 /* 7 */
-EXTERN Cursor		XCreatePixmapCursor _ANSI_ARGS_((Display* d, 
-				Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, 
-				unsigned int ui1, unsigned int ui2));
+EXTERN Cursor		XCreatePixmapCursor _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Font f1, 
+EXTERN Cursor		XCreateGlyphCursor _ANSI_ARGS_((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
@@ -100,23 +101,24 @@ EXTERN GContext		XGContextFromGC _ANSI_ARGS_((GC g));
 #ifndef XListHosts_TCL_DECLARED
 #define XListHosts_TCL_DECLARED
 /* 10 */
-EXTERN XHostAddress *	XListHosts _ANSI_ARGS_((Display* d, int* i, Bool* b));
+EXTERN XHostAddress *	XListHosts _ANSI_ARGS_((Display * d, int * i, 
+				Bool * b));
 #endif
 #ifndef XKeycodeToKeysym_TCL_DECLARED
 #define XKeycodeToKeysym_TCL_DECLARED
 /* 11 */
-EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display* d, 
+EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display * d, 
 				unsigned int k, int i));
 #endif
 #ifndef XStringToKeysym_TCL_DECLARED
 #define XStringToKeysym_TCL_DECLARED
 /* 12 */
-EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char* c));
+EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char * c));
 #endif
 #ifndef XRootWindow_TCL_DECLARED
 #define XRootWindow_TCL_DECLARED
 /* 13 */
-EXTERN Window		XRootWindow _ANSI_ARGS_((Display* d, int i));
+EXTERN Window		XRootWindow _ANSI_ARGS_((Display * d, int i));
 #endif
 #ifndef XSetErrorHandler_TCL_DECLARED
 #define XSetErrorHandler_TCL_DECLARED
@@ -126,61 +128,61 @@ EXTERN XErrorHandler	XSetErrorHandler _ANSI_ARGS_((XErrorHandler x));
 #ifndef XIconifyWindow_TCL_DECLARED
 #define XIconifyWindow_TCL_DECLARED
 /* 15 */
-EXTERN Status		XIconifyWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN Status		XIconifyWindow _ANSI_ARGS_((Display * d, Window w, 
 				int i));
 #endif
 #ifndef XWithdrawWindow_TCL_DECLARED
 #define XWithdrawWindow_TCL_DECLARED
 /* 16 */
-EXTERN Status		XWithdrawWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN Status		XWithdrawWindow _ANSI_ARGS_((Display * d, Window w, 
 				int i));
 #endif
 #ifndef XGetWMColormapWindows_TCL_DECLARED
 #define XGetWMColormapWindows_TCL_DECLARED
 /* 17 */
-EXTERN Status		XGetWMColormapWindows _ANSI_ARGS_((Display* d, 
-				Window w, Window** wpp, int* ip));
+EXTERN Status		XGetWMColormapWindows _ANSI_ARGS_((Display * d, 
+				Window w, Window ** wpp, int * ip));
 #endif
 #ifndef XAllocColor_TCL_DECLARED
 #define XAllocColor_TCL_DECLARED
 /* 18 */
-EXTERN Status		XAllocColor _ANSI_ARGS_((Display* d, Colormap c, 
-				XColor* xp));
+EXTERN Status		XAllocColor _ANSI_ARGS_((Display * d, Colormap c, 
+				XColor * xp));
 #endif
 #ifndef XBell_TCL_DECLARED
 #define XBell_TCL_DECLARED
 /* 19 */
-EXTERN void		XBell _ANSI_ARGS_((Display* d, int i));
+EXTERN void		XBell _ANSI_ARGS_((Display * d, int i));
 #endif
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 20 */
-EXTERN void		XChangeProperty _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XChangeProperty _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, 
+EXTERN void		XChangeWindowAttributes _ANSI_ARGS_((Display * d, 
 				Window w, unsigned long ul, 
-				XSetWindowAttributes* x));
+				XSetWindowAttributes * x));
 #endif
 #ifndef XClearWindow_TCL_DECLARED
 #define XClearWindow_TCL_DECLARED
 /* 22 */
-EXTERN void		XClearWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XClearWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 23 */
-EXTERN void		XConfigureWindow _ANSI_ARGS_((Display* d, Window w, 
-				unsigned int i, XWindowChanges* x));
+EXTERN void		XConfigureWindow _ANSI_ARGS_((Display * d, Window w, 
+				unsigned int i, XWindowChanges * x));
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 24 */
-EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, 
+EXTERN void		XCopyArea _ANSI_ARGS_((Display * d, Drawable dr1, 
 				Drawable dr2, GC g, int i1, int i2, 
 				unsigned int ui1, unsigned int ui2, int i3, 
 				int i4));
@@ -188,7 +190,7 @@ EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1,
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 25 */
-EXTERN void		XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, 
+EXTERN void		XCopyPlane _ANSI_ARGS_((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));
@@ -196,308 +198,309 @@ EXTERN void		XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1,
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 26 */
-EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((Display* display, 
-				Drawable d, _Xconst char* data, 
+EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XDefineCursor _ANSI_ARGS_((Display * d, Window w, 
 				Cursor c));
 #endif
 #ifndef XDeleteProperty_TCL_DECLARED
 #define XDeleteProperty_TCL_DECLARED
 /* 28 */
-EXTERN void		XDeleteProperty _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XDeleteProperty _ANSI_ARGS_((Display * d, Window w, 
 				Atom a));
 #endif
 #ifndef XDestroyWindow_TCL_DECLARED
 #define XDestroyWindow_TCL_DECLARED
 /* 29 */
-EXTERN void		XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XDestroyWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 30 */
-EXTERN void		XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+EXTERN void		XDrawArc _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2));
+EXTERN void		XDrawLines _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
+EXTERN void		XDrawRectangle _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+EXTERN void		XFillArc _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2, int i3));
+EXTERN void		XFillPolygon _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XRectangle* x, int i));
+EXTERN void		XFillRectangles _ANSI_ARGS_((Display * d, 
+				Drawable dr, GC g, XRectangle * x, int i));
 #endif
 #ifndef XForceScreenSaver_TCL_DECLARED
 #define XForceScreenSaver_TCL_DECLARED
 /* 36 */
-EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display* d, int i));
+EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display * d, int i));
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
 #define XFreeColormap_TCL_DECLARED
 /* 37 */
-EXTERN void		XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
+EXTERN void		XFreeColormap _ANSI_ARGS_((Display * d, Colormap c));
 #endif
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 38 */
-EXTERN void		XFreeColors _ANSI_ARGS_((Display* d, Colormap c, 
-				unsigned long* ulp, int i, unsigned long ul));
+EXTERN void		XFreeColors _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Cursor c));
+EXTERN void		XFreeCursor _ANSI_ARGS_((Display * d, Cursor c));
 #endif
 #ifndef XFreeModifiermap_TCL_DECLARED
 #define XFreeModifiermap_TCL_DECLARED
 /* 40 */
-EXTERN void		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
+EXTERN void		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap * x));
 #endif
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 41 */
-EXTERN Status		XGetGeometry _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window* w, 
-				int* i));
+EXTERN void		XGetInputFocus _ANSI_ARGS_((Display * d, Window * w, 
+				int * i));
 #endif
 #ifndef XGetWindowProperty_TCL_DECLARED
 #define XGetWindowProperty_TCL_DECLARED
 /* 43 */
-EXTERN int		XGetWindowProperty _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, 
-				Window w, XWindowAttributes* x));
+EXTERN Status		XGetWindowAttributes _ANSI_ARGS_((Display * d, 
+				Window w, XWindowAttributes * x));
 #endif
 #ifndef XGrabKeyboard_TCL_DECLARED
 #define XGrabKeyboard_TCL_DECLARED
 /* 45 */
-EXTERN int		XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, 
+EXTERN int		XGrabKeyboard _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w1, 
+EXTERN int		XGrabPointer _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, KeySym k));
+EXTERN KeyCode		XKeysymToKeycode _ANSI_ARGS_((Display * d, KeySym k));
 #endif
 #ifndef XLookupColor_TCL_DECLARED
 #define XLookupColor_TCL_DECLARED
 /* 48 */
-EXTERN Status		XLookupColor _ANSI_ARGS_((Display* d, Colormap c1, 
-				_Xconst char* c2, XColor* x1, XColor* x2));
+EXTERN Status		XLookupColor _ANSI_ARGS_((Display * d, Colormap c1, 
+				_Xconst char * c2, XColor * x1, XColor * x2));
 #endif
 #ifndef XMapWindow_TCL_DECLARED
 #define XMapWindow_TCL_DECLARED
 /* 49 */
-EXTERN void		XMapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XMapWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 50 */
-EXTERN void		XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XMoveResizeWindow _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XMoveWindow _ANSI_ARGS_((Display * d, Window w, 
 				int i1, int i2));
 #endif
 #ifndef XNextEvent_TCL_DECLARED
 #define XNextEvent_TCL_DECLARED
 /* 52 */
-EXTERN void		XNextEvent _ANSI_ARGS_((Display* d, XEvent* x));
+EXTERN void		XNextEvent _ANSI_ARGS_((Display * d, XEvent * x));
 #endif
 #ifndef XPutBackEvent_TCL_DECLARED
 #define XPutBackEvent_TCL_DECLARED
 /* 53 */
-EXTERN void		XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x));
+EXTERN void		XPutBackEvent _ANSI_ARGS_((Display * d, XEvent * x));
 #endif
 #ifndef XQueryColors_TCL_DECLARED
 #define XQueryColors_TCL_DECLARED
 /* 54 */
-EXTERN void		XQueryColors _ANSI_ARGS_((Display* d, Colormap c, 
-				XColor* x, int i));
+EXTERN void		XQueryColors _ANSI_ARGS_((Display * d, Colormap c, 
+				XColor * x, int i));
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 55 */
-EXTERN Bool		XQueryPointer _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, int* i1, int* i2, 
-				int* i3, int* i4, unsigned int* ui));
+EXTERN Bool		XQueryPointer _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, Window** w4, 
-				unsigned int* ui));
+EXTERN Status		XQueryTree _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XRaiseWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XRefreshKeyboardMapping_TCL_DECLARED
 #define XRefreshKeyboardMapping_TCL_DECLARED
 /* 58 */
 EXTERN void		XRefreshKeyboardMapping _ANSI_ARGS_((
-				XMappingEvent* x));
+				XMappingEvent * x));
 #endif
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 59 */
-EXTERN void		XResizeWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XResizeWindow _ANSI_ARGS_((Display * d, Window w, 
 				unsigned int ui1, unsigned int ui2));
 #endif
 #ifndef XSelectInput_TCL_DECLARED
 #define XSelectInput_TCL_DECLARED
 /* 60 */
-EXTERN void		XSelectInput _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSelectInput _ANSI_ARGS_((Display * d, Window w, 
 				long l));
 #endif
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 61 */
-EXTERN Status		XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, 
-				long l, XEvent* x));
+EXTERN Status		XSendEvent _ANSI_ARGS_((Display * d, Window w, 
+				Bool b, long l, XEvent * x));
 #endif
 #ifndef XSetCommand_TCL_DECLARED
 #define XSetCommand_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetCommand _ANSI_ARGS_((Display* d, Window w, 
-				CONST char** c, int i));
+EXTERN void		XSetCommand _ANSI_ARGS_((Display * d, Window w, 
+				CONST char ** c, int i));
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetIconName _ANSI_ARGS_((Display* d, Window w, 
-				_Xconst char* c));
+EXTERN void		XSetIconName _ANSI_ARGS_((Display * d, Window w, 
+				_Xconst char * c));
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
 #define XSetInputFocus_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetInputFocus _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSetInputFocus _ANSI_ARGS_((Display * d, Window w, 
 				int i, Time t));
 #endif
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, 
+EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display * d, Atom a, 
 				Window w, Time t));
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 66 */
-EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display * d, 
 				Window w, unsigned long ul));
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 67 */
-EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display * d, 
 				Window w, Pixmap p));
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 68 */
-EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display * d, Window w, 
 				unsigned long ul));
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 69 */
-EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display * d, 
 				Window w, Pixmap p));
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 70 */
-EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display * d, 
 				Window w, unsigned int ui));
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 71 */
-EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, 
-				Colormap c));
+EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display * d, 
+				Window w, Colormap c));
 #endif
 #ifndef XTranslateCoordinates_TCL_DECLARED
 #define XTranslateCoordinates_TCL_DECLARED
 /* 72 */
-EXTERN Bool		XTranslateCoordinates _ANSI_ARGS_((Display* d, 
+EXTERN Bool		XTranslateCoordinates _ANSI_ARGS_((Display * d, 
 				Window w1, Window w2, int i1, int i2, 
-				int* i3, int* i4, Window* w3));
+				int * i3, int * i4, Window * w3));
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
 #define XUngrabKeyboard_TCL_DECLARED
 /* 73 */
-EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
+EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display * d, Time t));
 #endif
 #ifndef XUngrabPointer_TCL_DECLARED
 #define XUngrabPointer_TCL_DECLARED
 /* 74 */
-EXTERN void		XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
+EXTERN void		XUngrabPointer _ANSI_ARGS_((Display * d, Time t));
 #endif
 #ifndef XUnmapWindow_TCL_DECLARED
 #define XUnmapWindow_TCL_DECLARED
 /* 75 */
-EXTERN void		XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XUnmapWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XWindowEvent_TCL_DECLARED
 #define XWindowEvent_TCL_DECLARED
 /* 76 */
-EXTERN void		XWindowEvent _ANSI_ARGS_((Display* d, Window w, 
-				long l, XEvent* x));
+EXTERN void		XWindowEvent _ANSI_ARGS_((Display * d, Window w, 
+				long l, XEvent * x));
 #endif
 #ifndef XDestroyIC_TCL_DECLARED
 #define XDestroyIC_TCL_DECLARED
@@ -507,21 +510,21 @@ EXTERN void		XDestroyIC _ANSI_ARGS_((XIC x));
 #ifndef XFilterEvent_TCL_DECLARED
 #define XFilterEvent_TCL_DECLARED
 /* 78 */
-EXTERN Bool		XFilterEvent _ANSI_ARGS_((XEvent* x, Window w));
+EXTERN Bool		XFilterEvent _ANSI_ARGS_((XEvent * x, Window w));
 #endif
 #ifndef XmbLookupString_TCL_DECLARED
 #define XmbLookupString_TCL_DECLARED
 /* 79 */
 EXTERN int		XmbLookupString _ANSI_ARGS_((XIC xi, 
-				XKeyPressedEvent* xk, char* c, int i, 
-				KeySym* k, Status* s));
+				XKeyPressedEvent * xk, char * c, int i, 
+				KeySym * k, Status * s));
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 80 */
 EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors, 
-				int ncolors, Display* display, Drawable d, 
-				GC gc, XImage* image, int src_x, int src_y, 
+				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
@@ -530,54 +533,55 @@ EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors,
 #define XParseColor_TCL_DECLARED
 /* 82 */
 EXTERN Status		XParseColor _ANSI_ARGS_((Display * display, 
-				Colormap map, _Xconst char* spec, 
+				Colormap map, _Xconst char * spec, 
 				XColor * colorPtr));
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 83 */
-EXTERN GC		XCreateGC _ANSI_ARGS_((Display* display, Drawable d, 
-				unsigned long valuemask, XGCValues* values));
+EXTERN GC		XCreateGC _ANSI_ARGS_((Display * display, Drawable d, 
+				unsigned long valuemask, XGCValues * values));
 #endif
 #ifndef XFreeGC_TCL_DECLARED
 #define XFreeGC_TCL_DECLARED
 /* 84 */
-EXTERN void		XFreeGC _ANSI_ARGS_((Display* display, GC gc));
+EXTERN void		XFreeGC _ANSI_ARGS_((Display * display, GC gc));
 #endif
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 85 */
-EXTERN Atom		XInternAtom _ANSI_ARGS_((Display* display, 
-				_Xconst char* atom_name, Bool only_if_exists));
+EXTERN Atom		XInternAtom _ANSI_ARGS_((Display * display, 
+				_Xconst char * atom_name, 
+				Bool only_if_exists));
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 86 */
-EXTERN void		XSetBackground _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetBackground _ANSI_ARGS_((Display * display, GC gc, 
 				unsigned long foreground));
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 87 */
-EXTERN void		XSetForeground _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetForeground _ANSI_ARGS_((Display * display, GC gc, 
 				unsigned long foreground));
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 88 */
-EXTERN void		XSetClipMask _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetClipMask _ANSI_ARGS_((Display * display, GC gc, 
 				Pixmap pixmap));
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 89 */
-EXTERN void		XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetClipOrigin _ANSI_ARGS_((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 _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetTSOrigin _ANSI_ARGS_((Display * display, GC gc, 
 				int ts_x_origin, int ts_y_origin));
 #endif
 #ifndef XChangeGC_TCL_DECLARED
@@ -643,39 +647,40 @@ EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 101 */
-EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display* display, 
-				long vinfo_mask, XVisualInfo* vinfo_template, 
-				int* nitems_return));
+EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display * display, 
+				long vinfo_mask, 
+				XVisualInfo * vinfo_template, 
+				int * nitems_return));
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 102 */
-EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display, 
-				Window w, XTextProperty* text_prop));
+EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display * display, 
+				Window w, XTextProperty * text_prop));
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 103 */
-EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
-				int count, XTextProperty* text_prop_return));
+EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char ** list, 
+				int count, XTextProperty * text_prop_return));
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 104 */
-EXTERN void		XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
-				int x1, int y1, int x2, int y2));
+EXTERN void		XDrawLine _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window s, 
+EXTERN void		XWarpPointer _ANSI_ARGS_((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 _ANSI_ARGS_((Display* display, 
+EXTERN void		XFillRectangle _ANSI_ARGS_((Display * display, 
 				Drawable d, GC gc, int x, int y, 
 				unsigned int width, unsigned int height));
 #endif
@@ -684,34 +689,34 @@ EXTERN void		XFillRectangle _ANSI_ARGS_((Display* display,
 #ifndef XSetDashes_TCL_DECLARED
 #define XSetDashes_TCL_DECLARED
 /* 0 */
-EXTERN void		XSetDashes _ANSI_ARGS_((Display* display, GC gc, 
-				int dash_offset, _Xconst char* dash_list, 
+EXTERN void		XSetDashes _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d));
+EXTERN XModifierKeymap * XGetModifierMapping _ANSI_ARGS_((Display * d));
 #endif
 #ifndef XCreateImage_TCL_DECLARED
 #define XCreateImage_TCL_DECLARED
 /* 2 */
-EXTERN XImage *		XCreateImage _ANSI_ARGS_((Display* d, Visual* v, 
-				unsigned int ui1, int i1, int i2, char* cp, 
+EXTERN XImage *		XCreateImage _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
+EXTERN XImage *		XGetImage _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Atom a));
+EXTERN char *		XGetAtomName _ANSI_ARGS_((Display * d, Atom a));
 #endif
 #ifndef XKeysymToString_TCL_DECLARED
 #define XKeysymToString_TCL_DECLARED
@@ -721,8 +726,8 @@ EXTERN char *		XKeysymToString _ANSI_ARGS_((KeySym k));
 #ifndef XCreateColormap_TCL_DECLARED
 #define XCreateColormap_TCL_DECLARED
 /* 6 */
-EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display* d, Window w, 
-				Visual* v, int i));
+EXTERN Colormap		XCreateColormap _ANSI_ARGS_((Display * d, Window w, 
+				Visual * v, int i));
 #endif
 #ifndef XGContextFromGC_TCL_DECLARED
 #define XGContextFromGC_TCL_DECLARED
@@ -732,18 +737,18 @@ EXTERN GContext		XGContextFromGC _ANSI_ARGS_((GC g));
 #ifndef XKeycodeToKeysym_TCL_DECLARED
 #define XKeycodeToKeysym_TCL_DECLARED
 /* 8 */
-EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, 
+EXTERN KeySym		XKeycodeToKeysym _ANSI_ARGS_((Display * d, KeyCode k, 
 				int i));
 #endif
 #ifndef XStringToKeysym_TCL_DECLARED
 #define XStringToKeysym_TCL_DECLARED
 /* 9 */
-EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char* c));
+EXTERN KeySym		XStringToKeysym _ANSI_ARGS_((_Xconst char * c));
 #endif
 #ifndef XRootWindow_TCL_DECLARED
 #define XRootWindow_TCL_DECLARED
 /* 10 */
-EXTERN Window		XRootWindow _ANSI_ARGS_((Display* d, int i));
+EXTERN Window		XRootWindow _ANSI_ARGS_((Display * d, int i));
 #endif
 #ifndef XSetErrorHandler_TCL_DECLARED
 #define XSetErrorHandler_TCL_DECLARED
@@ -753,38 +758,38 @@ EXTERN XErrorHandler	XSetErrorHandler _ANSI_ARGS_((XErrorHandler x));
 #ifndef XAllocColor_TCL_DECLARED
 #define XAllocColor_TCL_DECLARED
 /* 12 */
-EXTERN Status		XAllocColor _ANSI_ARGS_((Display* d, Colormap c, 
-				XColor* xp));
+EXTERN Status		XAllocColor _ANSI_ARGS_((Display * d, Colormap c, 
+				XColor * xp));
 #endif
 #ifndef XBell_TCL_DECLARED
 #define XBell_TCL_DECLARED
 /* 13 */
-EXTERN void		XBell _ANSI_ARGS_((Display* d, int i));
+EXTERN void		XBell _ANSI_ARGS_((Display * d, int i));
 #endif
 #ifndef XChangeProperty_TCL_DECLARED
 #define XChangeProperty_TCL_DECLARED
 /* 14 */
-EXTERN void		XChangeProperty _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XChangeProperty _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, 
+EXTERN void		XChangeWindowAttributes _ANSI_ARGS_((Display * d, 
 				Window w, unsigned long ul, 
-				XSetWindowAttributes* x));
+				XSetWindowAttributes * x));
 #endif
 #ifndef XConfigureWindow_TCL_DECLARED
 #define XConfigureWindow_TCL_DECLARED
 /* 16 */
-EXTERN void		XConfigureWindow _ANSI_ARGS_((Display* d, Window w, 
-				unsigned int i, XWindowChanges* x));
+EXTERN void		XConfigureWindow _ANSI_ARGS_((Display * d, Window w, 
+				unsigned int i, XWindowChanges * x));
 #endif
 #ifndef XCopyArea_TCL_DECLARED
 #define XCopyArea_TCL_DECLARED
 /* 17 */
-EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, 
+EXTERN void		XCopyArea _ANSI_ARGS_((Display * d, Drawable dr1, 
 				Drawable dr2, GC g, int i1, int i2, 
 				unsigned int ui1, unsigned int ui2, int i3, 
 				int i4));
@@ -792,7 +797,7 @@ EXTERN void		XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1,
 #ifndef XCopyPlane_TCL_DECLARED
 #define XCopyPlane_TCL_DECLARED
 /* 18 */
-EXTERN void		XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, 
+EXTERN void		XCopyPlane _ANSI_ARGS_((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));
@@ -800,239 +805,240 @@ EXTERN void		XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1,
 #ifndef XCreateBitmapFromData_TCL_DECLARED
 #define XCreateBitmapFromData_TCL_DECLARED
 /* 19 */
-EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((Display* display, 
-				Drawable d, _Xconst char* data, 
+EXTERN Pixmap		XCreateBitmapFromData _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XDefineCursor _ANSI_ARGS_((Display * d, Window w, 
 				Cursor c));
 #endif
 #ifndef XDestroyWindow_TCL_DECLARED
 #define XDestroyWindow_TCL_DECLARED
 /* 21 */
-EXTERN void		XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XDestroyWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XDrawArc_TCL_DECLARED
 #define XDrawArc_TCL_DECLARED
 /* 22 */
-EXTERN void		XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+EXTERN void		XDrawArc _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2));
+EXTERN void		XDrawLines _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
+EXTERN void		XDrawRectangle _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
+EXTERN void		XFillArc _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XPoint* x, int i1, int i2, int i3));
+EXTERN void		XFillPolygon _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Drawable dr, 
-				GC g, XRectangle* x, int i));
+EXTERN void		XFillRectangles _ANSI_ARGS_((Display * d, 
+				Drawable dr, GC g, XRectangle * x, int i));
 #endif
 #ifndef XFreeColormap_TCL_DECLARED
 #define XFreeColormap_TCL_DECLARED
 /* 28 */
-EXTERN void		XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
+EXTERN void		XFreeColormap _ANSI_ARGS_((Display * d, Colormap c));
 #endif
 #ifndef XFreeColors_TCL_DECLARED
 #define XFreeColors_TCL_DECLARED
 /* 29 */
-EXTERN void		XFreeColors _ANSI_ARGS_((Display* d, Colormap c, 
-				unsigned long* ulp, int i, unsigned long ul));
+EXTERN void		XFreeColors _ANSI_ARGS_((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 _ANSI_ARGS_((XModifierKeymap* x));
+EXTERN void		XFreeModifiermap _ANSI_ARGS_((XModifierKeymap * x));
 #endif
 #ifndef XGetGeometry_TCL_DECLARED
 #define XGetGeometry_TCL_DECLARED
 /* 31 */
-EXTERN Status		XGetGeometry _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w, 
+EXTERN int		XGrabKeyboard _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w1, 
+EXTERN int		XGrabPointer _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, KeySym k));
+EXTERN KeyCode		XKeysymToKeycode _ANSI_ARGS_((Display * d, KeySym k));
 #endif
 #ifndef XMapWindow_TCL_DECLARED
 #define XMapWindow_TCL_DECLARED
 /* 36 */
-EXTERN void		XMapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XMapWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XMoveResizeWindow_TCL_DECLARED
 #define XMoveResizeWindow_TCL_DECLARED
 /* 37 */
-EXTERN void		XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XMoveResizeWindow _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XMoveWindow _ANSI_ARGS_((Display * d, Window w, 
 				int i1, int i2));
 #endif
 #ifndef XQueryPointer_TCL_DECLARED
 #define XQueryPointer_TCL_DECLARED
 /* 39 */
-EXTERN Bool		XQueryPointer _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, int* i1, int* i2, 
-				int* i3, int* i4, unsigned int* ui));
+EXTERN Bool		XQueryPointer _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XRaiseWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XRefreshKeyboardMapping_TCL_DECLARED
 #define XRefreshKeyboardMapping_TCL_DECLARED
 /* 41 */
 EXTERN void		XRefreshKeyboardMapping _ANSI_ARGS_((
-				XMappingEvent* x));
+				XMappingEvent * x));
 #endif
 #ifndef XResizeWindow_TCL_DECLARED
 #define XResizeWindow_TCL_DECLARED
 /* 42 */
-EXTERN void		XResizeWindow _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XResizeWindow _ANSI_ARGS_((Display * d, Window w, 
 				unsigned int ui1, unsigned int ui2));
 #endif
 #ifndef XSelectInput_TCL_DECLARED
 #define XSelectInput_TCL_DECLARED
 /* 43 */
-EXTERN void		XSelectInput _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSelectInput _ANSI_ARGS_((Display * d, Window w, 
 				long l));
 #endif
 #ifndef XSendEvent_TCL_DECLARED
 #define XSendEvent_TCL_DECLARED
 /* 44 */
-EXTERN Status		XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, 
-				long l, XEvent* x));
+EXTERN Status		XSendEvent _ANSI_ARGS_((Display * d, Window w, 
+				Bool b, long l, XEvent * x));
 #endif
 #ifndef XSetIconName_TCL_DECLARED
 #define XSetIconName_TCL_DECLARED
 /* 45 */
-EXTERN void		XSetIconName _ANSI_ARGS_((Display* d, Window w, 
-				_Xconst char* c));
+EXTERN void		XSetIconName _ANSI_ARGS_((Display * d, Window w, 
+				_Xconst char * c));
 #endif
 #ifndef XSetInputFocus_TCL_DECLARED
 #define XSetInputFocus_TCL_DECLARED
 /* 46 */
-EXTERN void		XSetInputFocus _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSetInputFocus _ANSI_ARGS_((Display * d, Window w, 
 				int i, Time t));
 #endif
 #ifndef XSetSelectionOwner_TCL_DECLARED
 #define XSetSelectionOwner_TCL_DECLARED
 /* 47 */
-EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, 
+EXTERN void		XSetSelectionOwner _ANSI_ARGS_((Display * d, Atom a, 
 				Window w, Time t));
 #endif
 #ifndef XSetWindowBackground_TCL_DECLARED
 #define XSetWindowBackground_TCL_DECLARED
 /* 48 */
-EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBackground _ANSI_ARGS_((Display * d, 
 				Window w, unsigned long ul));
 #endif
 #ifndef XSetWindowBackgroundPixmap_TCL_DECLARED
 #define XSetWindowBackgroundPixmap_TCL_DECLARED
 /* 49 */
-EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBackgroundPixmap _ANSI_ARGS_((Display * d, 
 				Window w, Pixmap p));
 #endif
 #ifndef XSetWindowBorder_TCL_DECLARED
 #define XSetWindowBorder_TCL_DECLARED
 /* 50 */
-EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, 
+EXTERN void		XSetWindowBorder _ANSI_ARGS_((Display * d, Window w, 
 				unsigned long ul));
 #endif
 #ifndef XSetWindowBorderPixmap_TCL_DECLARED
 #define XSetWindowBorderPixmap_TCL_DECLARED
 /* 51 */
-EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBorderPixmap _ANSI_ARGS_((Display * d, 
 				Window w, Pixmap p));
 #endif
 #ifndef XSetWindowBorderWidth_TCL_DECLARED
 #define XSetWindowBorderWidth_TCL_DECLARED
 /* 52 */
-EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display* d, 
+EXTERN void		XSetWindowBorderWidth _ANSI_ARGS_((Display * d, 
 				Window w, unsigned int ui));
 #endif
 #ifndef XSetWindowColormap_TCL_DECLARED
 #define XSetWindowColormap_TCL_DECLARED
 /* 53 */
-EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, 
-				Colormap c));
+EXTERN void		XSetWindowColormap _ANSI_ARGS_((Display * d, 
+				Window w, Colormap c));
 #endif
 #ifndef XUngrabKeyboard_TCL_DECLARED
 #define XUngrabKeyboard_TCL_DECLARED
 /* 54 */
-EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
+EXTERN void		XUngrabKeyboard _ANSI_ARGS_((Display * d, Time t));
 #endif
 #ifndef XUngrabPointer_TCL_DECLARED
 #define XUngrabPointer_TCL_DECLARED
 /* 55 */
-EXTERN void		XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
+EXTERN void		XUngrabPointer _ANSI_ARGS_((Display * d, Time t));
 #endif
 #ifndef XUnmapWindow_TCL_DECLARED
 #define XUnmapWindow_TCL_DECLARED
 /* 56 */
-EXTERN void		XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XUnmapWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef TkPutImage_TCL_DECLARED
 #define TkPutImage_TCL_DECLARED
 /* 57 */
 EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors, 
-				int ncolors, Display* display, Drawable d, 
-				GC gc, XImage* image, int src_x, int src_y, 
+				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
@@ -1040,54 +1046,55 @@ EXTERN void		TkPutImage _ANSI_ARGS_((unsigned long * colors,
 #define XParseColor_TCL_DECLARED
 /* 58 */
 EXTERN Status		XParseColor _ANSI_ARGS_((Display * display, 
-				Colormap map, _Xconst char* spec, 
+				Colormap map, _Xconst char * spec, 
 				XColor * colorPtr));
 #endif
 #ifndef XCreateGC_TCL_DECLARED
 #define XCreateGC_TCL_DECLARED
 /* 59 */
-EXTERN GC		XCreateGC _ANSI_ARGS_((Display* display, Drawable d, 
-				unsigned long valuemask, XGCValues* values));
+EXTERN GC		XCreateGC _ANSI_ARGS_((Display * display, Drawable d, 
+				unsigned long valuemask, XGCValues * values));
 #endif
 #ifndef XFreeGC_TCL_DECLARED
 #define XFreeGC_TCL_DECLARED
 /* 60 */
-EXTERN void		XFreeGC _ANSI_ARGS_((Display* display, GC gc));
+EXTERN void		XFreeGC _ANSI_ARGS_((Display * display, GC gc));
 #endif
 #ifndef XInternAtom_TCL_DECLARED
 #define XInternAtom_TCL_DECLARED
 /* 61 */
-EXTERN Atom		XInternAtom _ANSI_ARGS_((Display* display, 
-				_Xconst char* atom_name, Bool only_if_exists));
+EXTERN Atom		XInternAtom _ANSI_ARGS_((Display * display, 
+				_Xconst char * atom_name, 
+				Bool only_if_exists));
 #endif
 #ifndef XSetBackground_TCL_DECLARED
 #define XSetBackground_TCL_DECLARED
 /* 62 */
-EXTERN void		XSetBackground _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetBackground _ANSI_ARGS_((Display * display, GC gc, 
 				unsigned long foreground));
 #endif
 #ifndef XSetForeground_TCL_DECLARED
 #define XSetForeground_TCL_DECLARED
 /* 63 */
-EXTERN void		XSetForeground _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetForeground _ANSI_ARGS_((Display * display, GC gc, 
 				unsigned long foreground));
 #endif
 #ifndef XSetClipMask_TCL_DECLARED
 #define XSetClipMask_TCL_DECLARED
 /* 64 */
-EXTERN void		XSetClipMask _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetClipMask _ANSI_ARGS_((Display * display, GC gc, 
 				Pixmap pixmap));
 #endif
 #ifndef XSetClipOrigin_TCL_DECLARED
 #define XSetClipOrigin_TCL_DECLARED
 /* 65 */
-EXTERN void		XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetClipOrigin _ANSI_ARGS_((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 _ANSI_ARGS_((Display* display, GC gc, 
+EXTERN void		XSetTSOrigin _ANSI_ARGS_((Display * display, GC gc, 
 				int ts_x_origin, int ts_y_origin));
 #endif
 #ifndef XChangeGC_TCL_DECLARED
@@ -1153,21 +1160,22 @@ EXTERN XIC		XCreateIC _ANSI_ARGS_((void));
 #ifndef XGetVisualInfo_TCL_DECLARED
 #define XGetVisualInfo_TCL_DECLARED
 /* 77 */
-EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display* display, 
-				long vinfo_mask, XVisualInfo* vinfo_template, 
-				int* nitems_return));
+EXTERN XVisualInfo *	XGetVisualInfo _ANSI_ARGS_((Display * display, 
+				long vinfo_mask, 
+				XVisualInfo * vinfo_template, 
+				int * nitems_return));
 #endif
 #ifndef XSetWMClientMachine_TCL_DECLARED
 #define XSetWMClientMachine_TCL_DECLARED
 /* 78 */
-EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display* display, 
-				Window w, XTextProperty* text_prop));
+EXTERN void		XSetWMClientMachine _ANSI_ARGS_((Display * display, 
+				Window w, XTextProperty * text_prop));
 #endif
 #ifndef XStringListToTextProperty_TCL_DECLARED
 #define XStringListToTextProperty_TCL_DECLARED
 /* 79 */
-EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char** list, 
-				int count, XTextProperty* text_prop_return));
+EXTERN Status		XStringListToTextProperty _ANSI_ARGS_((char ** list, 
+				int count, XTextProperty * text_prop_return));
 #endif
 #ifndef XDrawSegments_TCL_DECLARED
 #define XDrawSegments_TCL_DECLARED
@@ -1179,44 +1187,44 @@ EXTERN void		XDrawSegments _ANSI_ARGS_((Display * display,
 #ifndef XForceScreenSaver_TCL_DECLARED
 #define XForceScreenSaver_TCL_DECLARED
 /* 81 */
-EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display* display, 
+EXTERN void		XForceScreenSaver _ANSI_ARGS_((Display * display, 
 				int mode));
 #endif
 #ifndef XDrawLine_TCL_DECLARED
 #define XDrawLine_TCL_DECLARED
 /* 82 */
-EXTERN void		XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, 
-				int x1, int y1, int x2, int y2));
+EXTERN void		XDrawLine _ANSI_ARGS_((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 _ANSI_ARGS_((Display* display, 
+EXTERN void		XFillRectangle _ANSI_ARGS_((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 _ANSI_ARGS_((Display* d, Window w));
+EXTERN void		XClearWindow _ANSI_ARGS_((Display * d, Window w));
 #endif
 #ifndef XDrawPoint_TCL_DECLARED
 #define XDrawPoint_TCL_DECLARED
 /* 85 */
-EXTERN void		XDrawPoint _ANSI_ARGS_((Display* display, Drawable d, 
-				GC gc, int x, int y));
+EXTERN void		XDrawPoint _ANSI_ARGS_((Display * display, 
+				Drawable d, GC gc, int x, int y));
 #endif
 #ifndef XDrawPoints_TCL_DECLARED
 #define XDrawPoints_TCL_DECLARED
 /* 86 */
-EXTERN void		XDrawPoints _ANSI_ARGS_((Display* display, 
+EXTERN void		XDrawPoints _ANSI_ARGS_((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 _ANSI_ARGS_((Display* display, 
+EXTERN void		XWarpPointer _ANSI_ARGS_((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, 
@@ -1238,9 +1246,9 @@ EXTERN void		XQueryColors _ANSI_ARGS_((Display * display,
 #ifndef XQueryTree_TCL_DECLARED
 #define XQueryTree_TCL_DECLARED
 /* 90 */
-EXTERN Status		XQueryTree _ANSI_ARGS_((Display* d, Window w1, 
-				Window* w2, Window* w3, Window** w4, 
-				unsigned int* ui));
+EXTERN Status		XQueryTree _ANSI_ARGS_((Display * d, Window w1, 
+				Window * w2, Window * w3, Window ** w4, 
+				unsigned int * ui));
 #endif
 #endif /* MAC_OSX_TK */
 
@@ -1249,97 +1257,97 @@ typedef struct TkIntXlibStubs {
     struct TkIntXlibStubHooks *hooks;
 
 #ifdef __WIN32__
-    void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */
-    XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */
-    XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
-    XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
-    char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */
+    void (*xSetDashes) _ANSI_ARGS_((Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n)); /* 0 */
+    XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display * d)); /* 1 */
+    XImage * (*xCreateImage) _ANSI_ARGS_((Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
+    XImage * (*xGetImage) _ANSI_ARGS_((Display * d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
+    char * (*xGetAtomName) _ANSI_ARGS_((Display * d, Atom a)); /* 4 */
     char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */
-    Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */
-    Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display* d, Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, unsigned int ui1, unsigned int ui2)); /* 7 */
-    Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display* d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)); /* 8 */
+    Colormap (*xCreateColormap) _ANSI_ARGS_((Display * d, Window w, Visual * v, int i)); /* 6 */
+    Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display * d, Pixmap p1, Pixmap p2, XColor * x1, XColor * x2, unsigned int ui1, unsigned int ui2)); /* 7 */
+    Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display * d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor * x1, XColor * x2)); /* 8 */
     GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 9 */
-    XHostAddress * (*xListHosts) _ANSI_ARGS_((Display* d, int* i, Bool* b)); /* 10 */
-    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, unsigned int k, int i)); /* 11 */
-    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 12 */
-    Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 13 */
+    XHostAddress * (*xListHosts) _ANSI_ARGS_((Display * d, int * i, Bool * b)); /* 10 */
+    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display * d, unsigned int k, int i)); /* 11 */
+    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char * c)); /* 12 */
+    Window (*xRootWindow) _ANSI_ARGS_((Display * d, int i)); /* 13 */
     XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 14 */
-    Status (*xIconifyWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 15 */
-    Status (*xWithdrawWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 16 */
-    Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display* d, Window w, Window** wpp, int* ip)); /* 17 */
-    Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 18 */
-    void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 19 */
-    void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 20 */
-    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 21 */
-    void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 22 */
-    void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 23 */
-    void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */
-    void (*xCopyPlane) _ANSI_ARGS_((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)); /* 25 */
-    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 26 */
-    void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 27 */
-    void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 28 */
-    void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 29 */
-    void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */
-    void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 31 */
-    void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */
-    void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */
-    void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 34 */
-    void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 35 */
-    void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 36 */
-    void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 37 */
-    void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 38 */
-    void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 39 */
-    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 40 */
-    Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 41 */
-    void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 42 */
-    int (*xGetWindowProperty) _ANSI_ARGS_((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)); /* 43 */
-    Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 44 */
-    int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */
-    int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */
-    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 47 */
-    Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 48 */
-    void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 49 */
-    void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */
-    void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 51 */
-    void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */
-    void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 53 */
-    void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 54 */
-    Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 55 */
-    Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 56 */
-    void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 57 */
-    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 58 */
-    void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */
-    void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 60 */
-    Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 61 */
-    void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, CONST char** c, int i)); /* 62 */
-    void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 63 */
-    void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 64 */
-    void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 65 */
-    void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 66 */
-    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 67 */
-    void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 68 */
-    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 69 */
-    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 70 */
-    void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 71 */
-    Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 72 */
-    void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 73 */
-    void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 74 */
-    void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 75 */
-    void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 76 */
+    Status (*xIconifyWindow) _ANSI_ARGS_((Display * d, Window w, int i)); /* 15 */
+    Status (*xWithdrawWindow) _ANSI_ARGS_((Display * d, Window w, int i)); /* 16 */
+    Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display * d, Window w, Window ** wpp, int * ip)); /* 17 */
+    Status (*xAllocColor) _ANSI_ARGS_((Display * d, Colormap c, XColor * xp)); /* 18 */
+    void (*xBell) _ANSI_ARGS_((Display * d, int i)); /* 19 */
+    void (*xChangeProperty) _ANSI_ARGS_((Display * d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char * c, int i3)); /* 20 */
+    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display * d, Window w, unsigned long ul, XSetWindowAttributes * x)); /* 21 */
+    void (*xClearWindow) _ANSI_ARGS_((Display * d, Window w)); /* 22 */
+    void (*xConfigureWindow) _ANSI_ARGS_((Display * d, Window w, unsigned int i, XWindowChanges * x)); /* 23 */
+    void (*xCopyArea) _ANSI_ARGS_((Display * d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */
+    void (*xCopyPlane) _ANSI_ARGS_((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)); /* 25 */
+    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display * display, Drawable d, _Xconst char * data, unsigned int width, unsigned int height)); /* 26 */
+    void (*xDefineCursor) _ANSI_ARGS_((Display * d, Window w, Cursor c)); /* 27 */
+    void (*xDeleteProperty) _ANSI_ARGS_((Display * d, Window w, Atom a)); /* 28 */
+    void (*xDestroyWindow) _ANSI_ARGS_((Display * d, Window w)); /* 29 */
+    void (*xDrawArc) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */
+    void (*xDrawLines) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XPoint * x, int i1, int i2)); /* 31 */
+    void (*xDrawRectangle) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */
+    void (*xFillArc) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */
+    void (*xFillPolygon) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XPoint * x, int i1, int i2, int i3)); /* 34 */
+    void (*xFillRectangles) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XRectangle * x, int i)); /* 35 */
+    void (*xForceScreenSaver) _ANSI_ARGS_((Display * d, int i)); /* 36 */
+    void (*xFreeColormap) _ANSI_ARGS_((Display * d, Colormap c)); /* 37 */
+    void (*xFreeColors) _ANSI_ARGS_((Display * d, Colormap c, unsigned long * ulp, int i, unsigned long ul)); /* 38 */
+    void (*xFreeCursor) _ANSI_ARGS_((Display * d, Cursor c)); /* 39 */
+    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap * x)); /* 40 */
+    Status (*xGetGeometry) _ANSI_ARGS_((Display * d, Drawable dr, Window * w, int * i1, int * i2, unsigned int * ui1, unsigned int * ui2, unsigned int * ui3, unsigned int * ui4)); /* 41 */
+    void (*xGetInputFocus) _ANSI_ARGS_((Display * d, Window * w, int * i)); /* 42 */
+    int (*xGetWindowProperty) _ANSI_ARGS_((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)); /* 43 */
+    Status (*xGetWindowAttributes) _ANSI_ARGS_((Display * d, Window w, XWindowAttributes * x)); /* 44 */
+    int (*xGrabKeyboard) _ANSI_ARGS_((Display * d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */
+    int (*xGrabPointer) _ANSI_ARGS_((Display * d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */
+    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display * d, KeySym k)); /* 47 */
+    Status (*xLookupColor) _ANSI_ARGS_((Display * d, Colormap c1, _Xconst char * c2, XColor * x1, XColor * x2)); /* 48 */
+    void (*xMapWindow) _ANSI_ARGS_((Display * d, Window w)); /* 49 */
+    void (*xMoveResizeWindow) _ANSI_ARGS_((Display * d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */
+    void (*xMoveWindow) _ANSI_ARGS_((Display * d, Window w, int i1, int i2)); /* 51 */
+    void (*xNextEvent) _ANSI_ARGS_((Display * d, XEvent * x)); /* 52 */
+    void (*xPutBackEvent) _ANSI_ARGS_((Display * d, XEvent * x)); /* 53 */
+    void (*xQueryColors) _ANSI_ARGS_((Display * d, Colormap c, XColor * x, int i)); /* 54 */
+    Bool (*xQueryPointer) _ANSI_ARGS_((Display * d, Window w1, Window * w2, Window * w3, int * i1, int * i2, int * i3, int * i4, unsigned int * ui)); /* 55 */
+    Status (*xQueryTree) _ANSI_ARGS_((Display * d, Window w1, Window * w2, Window * w3, Window ** w4, unsigned int * ui)); /* 56 */
+    void (*xRaiseWindow) _ANSI_ARGS_((Display * d, Window w)); /* 57 */
+    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent * x)); /* 58 */
+    void (*xResizeWindow) _ANSI_ARGS_((Display * d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */
+    void (*xSelectInput) _ANSI_ARGS_((Display * d, Window w, long l)); /* 60 */
+    Status (*xSendEvent) _ANSI_ARGS_((Display * d, Window w, Bool b, long l, XEvent * x)); /* 61 */
+    void (*xSetCommand) _ANSI_ARGS_((Display * d, Window w, CONST char ** c, int i)); /* 62 */
+    void (*xSetIconName) _ANSI_ARGS_((Display * d, Window w, _Xconst char * c)); /* 63 */
+    void (*xSetInputFocus) _ANSI_ARGS_((Display * d, Window w, int i, Time t)); /* 64 */
+    void (*xSetSelectionOwner) _ANSI_ARGS_((Display * d, Atom a, Window w, Time t)); /* 65 */
+    void (*xSetWindowBackground) _ANSI_ARGS_((Display * d, Window w, unsigned long ul)); /* 66 */
+    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display * d, Window w, Pixmap p)); /* 67 */
+    void (*xSetWindowBorder) _ANSI_ARGS_((Display * d, Window w, unsigned long ul)); /* 68 */
+    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display * d, Window w, Pixmap p)); /* 69 */
+    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display * d, Window w, unsigned int ui)); /* 70 */
+    void (*xSetWindowColormap) _ANSI_ARGS_((Display * d, Window w, Colormap c)); /* 71 */
+    Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display * d, Window w1, Window w2, int i1, int i2, int * i3, int * i4, Window * w3)); /* 72 */
+    void (*xUngrabKeyboard) _ANSI_ARGS_((Display * d, Time t)); /* 73 */
+    void (*xUngrabPointer) _ANSI_ARGS_((Display * d, Time t)); /* 74 */
+    void (*xUnmapWindow) _ANSI_ARGS_((Display * d, Window w)); /* 75 */
+    void (*xWindowEvent) _ANSI_ARGS_((Display * d, Window w, long l, XEvent * x)); /* 76 */
     void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */
-    Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 78 */
-    int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 79 */
-    void (*tkPutImage) _ANSI_ARGS_((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)); /* 80 */
+    Bool (*xFilterEvent) _ANSI_ARGS_((XEvent * x, Window w)); /* 78 */
+    int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent * xk, char * c, int i, KeySym * k, Status * s)); /* 79 */
+    void (*tkPutImage) _ANSI_ARGS_((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)); /* 80 */
     void *reserved81;
-    Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 82 */
-    GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 83 */
-    void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 84 */
-    Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 85 */
-    void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 86 */
-    void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 87 */
-    void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 88 */
-    void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */
-    void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */
+    Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char * spec, XColor * colorPtr)); /* 82 */
+    GC (*xCreateGC) _ANSI_ARGS_((Display * display, Drawable d, unsigned long valuemask, XGCValues * values)); /* 83 */
+    void (*xFreeGC) _ANSI_ARGS_((Display * display, GC gc)); /* 84 */
+    Atom (*xInternAtom) _ANSI_ARGS_((Display * display, _Xconst char * atom_name, Bool only_if_exists)); /* 85 */
+    void (*xSetBackground) _ANSI_ARGS_((Display * display, GC gc, unsigned long foreground)); /* 86 */
+    void (*xSetForeground) _ANSI_ARGS_((Display * display, GC gc, unsigned long foreground)); /* 87 */
+    void (*xSetClipMask) _ANSI_ARGS_((Display * display, GC gc, Pixmap pixmap)); /* 88 */
+    void (*xSetClipOrigin) _ANSI_ARGS_((Display * display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */
+    void (*xSetTSOrigin) _ANSI_ARGS_((Display * display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */
     void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 91 */
     void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 92 */
     void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 93 */
@@ -1350,81 +1358,81 @@ typedef struct TkIntXlibStubs {
     void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */
     int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 99 */
     XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */
-    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 101 */
-    void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 102 */
-    Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 103 */
-    void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */
-    void (*xWarpPointer) _ANSI_ARGS_((Display* d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */
-    void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */
+    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display * display, long vinfo_mask, XVisualInfo * vinfo_template, int * nitems_return)); /* 101 */
+    void (*xSetWMClientMachine) _ANSI_ARGS_((Display * display, Window w, XTextProperty * text_prop)); /* 102 */
+    Status (*xStringListToTextProperty) _ANSI_ARGS_((char ** list, int count, XTextProperty * text_prop_return)); /* 103 */
+    void (*xDrawLine) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 104 */
+    void (*xWarpPointer) _ANSI_ARGS_((Display * d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy)); /* 105 */
+    void (*xFillRectangle) _ANSI_ARGS_((Display * display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 106 */
 #endif /* __WIN32__ */
 #ifdef MAC_OSX_TK
-    void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */
-    XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */
-    XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
-    XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
-    char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */
+    void (*xSetDashes) _ANSI_ARGS_((Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n)); /* 0 */
+    XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display * d)); /* 1 */
+    XImage * (*xCreateImage) _ANSI_ARGS_((Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
+    XImage * (*xGetImage) _ANSI_ARGS_((Display * d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */
+    char * (*xGetAtomName) _ANSI_ARGS_((Display * d, Atom a)); /* 4 */
     char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */
-    Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */
+    Colormap (*xCreateColormap) _ANSI_ARGS_((Display * d, Window w, Visual * v, int i)); /* 6 */
     GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */
-    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 8 */
-    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 9 */
-    Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 10 */
+    KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display * d, KeyCode k, int i)); /* 8 */
+    KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char * c)); /* 9 */
+    Window (*xRootWindow) _ANSI_ARGS_((Display * d, int i)); /* 10 */
     XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */
-    Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */
-    void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */
-    void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */
-    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */
-    void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */
-    void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */
-    void (*xCopyPlane) _ANSI_ARGS_((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)); /* 18 */
-    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 19 */
-    void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 20 */
-    void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */
-    void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */
-    void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 23 */
-    void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */
-    void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */
-    void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 26 */
-    void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 27 */
-    void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */
-    void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 29 */
-    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */
-    Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 31 */
-    int (*xGetWindowProperty) _ANSI_ARGS_((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)); /* 32 */
-    int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */
-    int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */
-    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */
-    void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 36 */
-    void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */
-    void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 38 */
-    Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 39 */
-    void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 40 */
-    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 41 */
-    void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */
-    void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 43 */
-    Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 44 */
-    void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 45 */
-    void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 46 */
-    void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 47 */
-    void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */
-    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */
-    void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 50 */
-    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 51 */
-    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 52 */
-    void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 53 */
-    void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 54 */
-    void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 55 */
-    void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */
-    void (*tkPutImage) _ANSI_ARGS_((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)); /* 57 */
-    Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */
-    GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */
-    void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */
-    Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */
-    void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */
-    void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */
-    void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */
-    void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
-    void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
+    Status (*xAllocColor) _ANSI_ARGS_((Display * d, Colormap c, XColor * xp)); /* 12 */
+    void (*xBell) _ANSI_ARGS_((Display * d, int i)); /* 13 */
+    void (*xChangeProperty) _ANSI_ARGS_((Display * d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char * c, int i3)); /* 14 */
+    void (*xChangeWindowAttributes) _ANSI_ARGS_((Display * d, Window w, unsigned long ul, XSetWindowAttributes * x)); /* 15 */
+    void (*xConfigureWindow) _ANSI_ARGS_((Display * d, Window w, unsigned int i, XWindowChanges * x)); /* 16 */
+    void (*xCopyArea) _ANSI_ARGS_((Display * d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */
+    void (*xCopyPlane) _ANSI_ARGS_((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)); /* 18 */
+    Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display * display, Drawable d, _Xconst char * data, unsigned int width, unsigned int height)); /* 19 */
+    void (*xDefineCursor) _ANSI_ARGS_((Display * d, Window w, Cursor c)); /* 20 */
+    void (*xDestroyWindow) _ANSI_ARGS_((Display * d, Window w)); /* 21 */
+    void (*xDrawArc) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */
+    void (*xDrawLines) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XPoint * x, int i1, int i2)); /* 23 */
+    void (*xDrawRectangle) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */
+    void (*xFillArc) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */
+    void (*xFillPolygon) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XPoint * x, int i1, int i2, int i3)); /* 26 */
+    void (*xFillRectangles) _ANSI_ARGS_((Display * d, Drawable dr, GC g, XRectangle * x, int i)); /* 27 */
+    void (*xFreeColormap) _ANSI_ARGS_((Display * d, Colormap c)); /* 28 */
+    void (*xFreeColors) _ANSI_ARGS_((Display * d, Colormap c, unsigned long * ulp, int i, unsigned long ul)); /* 29 */
+    void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap * x)); /* 30 */
+    Status (*xGetGeometry) _ANSI_ARGS_((Display * d, Drawable dr, Window * w, int * i1, int * i2, unsigned int * ui1, unsigned int * ui2, unsigned int * ui3, unsigned int * ui4)); /* 31 */
+    int (*xGetWindowProperty) _ANSI_ARGS_((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)); /* 32 */
+    int (*xGrabKeyboard) _ANSI_ARGS_((Display * d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */
+    int (*xGrabPointer) _ANSI_ARGS_((Display * d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */
+    KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display * d, KeySym k)); /* 35 */
+    void (*xMapWindow) _ANSI_ARGS_((Display * d, Window w)); /* 36 */
+    void (*xMoveResizeWindow) _ANSI_ARGS_((Display * d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */
+    void (*xMoveWindow) _ANSI_ARGS_((Display * d, Window w, int i1, int i2)); /* 38 */
+    Bool (*xQueryPointer) _ANSI_ARGS_((Display * d, Window w1, Window * w2, Window * w3, int * i1, int * i2, int * i3, int * i4, unsigned int * ui)); /* 39 */
+    void (*xRaiseWindow) _ANSI_ARGS_((Display * d, Window w)); /* 40 */
+    void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent * x)); /* 41 */
+    void (*xResizeWindow) _ANSI_ARGS_((Display * d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */
+    void (*xSelectInput) _ANSI_ARGS_((Display * d, Window w, long l)); /* 43 */
+    Status (*xSendEvent) _ANSI_ARGS_((Display * d, Window w, Bool b, long l, XEvent * x)); /* 44 */
+    void (*xSetIconName) _ANSI_ARGS_((Display * d, Window w, _Xconst char * c)); /* 45 */
+    void (*xSetInputFocus) _ANSI_ARGS_((Display * d, Window w, int i, Time t)); /* 46 */
+    void (*xSetSelectionOwner) _ANSI_ARGS_((Display * d, Atom a, Window w, Time t)); /* 47 */
+    void (*xSetWindowBackground) _ANSI_ARGS_((Display * d, Window w, unsigned long ul)); /* 48 */
+    void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display * d, Window w, Pixmap p)); /* 49 */
+    void (*xSetWindowBorder) _ANSI_ARGS_((Display * d, Window w, unsigned long ul)); /* 50 */
+    void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display * d, Window w, Pixmap p)); /* 51 */
+    void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display * d, Window w, unsigned int ui)); /* 52 */
+    void (*xSetWindowColormap) _ANSI_ARGS_((Display * d, Window w, Colormap c)); /* 53 */
+    void (*xUngrabKeyboard) _ANSI_ARGS_((Display * d, Time t)); /* 54 */
+    void (*xUngrabPointer) _ANSI_ARGS_((Display * d, Time t)); /* 55 */
+    void (*xUnmapWindow) _ANSI_ARGS_((Display * d, Window w)); /* 56 */
+    void (*tkPutImage) _ANSI_ARGS_((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)); /* 57 */
+    Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char * spec, XColor * colorPtr)); /* 58 */
+    GC (*xCreateGC) _ANSI_ARGS_((Display * display, Drawable d, unsigned long valuemask, XGCValues * values)); /* 59 */
+    void (*xFreeGC) _ANSI_ARGS_((Display * display, GC gc)); /* 60 */
+    Atom (*xInternAtom) _ANSI_ARGS_((Display * display, _Xconst char * atom_name, Bool only_if_exists)); /* 61 */
+    void (*xSetBackground) _ANSI_ARGS_((Display * display, GC gc, unsigned long foreground)); /* 62 */
+    void (*xSetForeground) _ANSI_ARGS_((Display * display, GC gc, unsigned long foreground)); /* 63 */
+    void (*xSetClipMask) _ANSI_ARGS_((Display * display, GC gc, Pixmap pixmap)); /* 64 */
+    void (*xSetClipOrigin) _ANSI_ARGS_((Display * display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
+    void (*xSetTSOrigin) _ANSI_ARGS_((Display * display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
     void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */
     void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */
     void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */
@@ -1435,20 +1443,20 @@ typedef struct TkIntXlibStubs {
     void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
     int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */
     XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
-    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */
-    void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */
-    Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */
+    XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display * display, long vinfo_mask, XVisualInfo * vinfo_template, int * nitems_return)); /* 77 */
+    void (*xSetWMClientMachine) _ANSI_ARGS_((Display * display, Window w, XTextProperty * text_prop)); /* 78 */
+    Status (*xStringListToTextProperty) _ANSI_ARGS_((char ** list, int count, XTextProperty * text_prop_return)); /* 79 */
     void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */
-    void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */
-    void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
-    void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
-    void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */
-    void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */
-    void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */
-    void (*xWarpPointer) _ANSI_ARGS_((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, int dest_y)); /* 87 */
+    void (*xForceScreenSaver) _ANSI_ARGS_((Display * display, int mode)); /* 81 */
+    void (*xDrawLine) _ANSI_ARGS_((Display * d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
+    void (*xFillRectangle) _ANSI_ARGS_((Display * display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
+    void (*xClearWindow) _ANSI_ARGS_((Display * d, Window w)); /* 84 */
+    void (*xDrawPoint) _ANSI_ARGS_((Display * display, Drawable d, GC gc, int x, int y)); /* 85 */
+    void (*xDrawPoints) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */
+    void (*xWarpPointer) _ANSI_ARGS_((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, int dest_y)); /* 87 */
     void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */
     void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */
-    Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 90 */
+    Status (*xQueryTree) _ANSI_ARGS_((Display * d, Window w1, Window * w2, Window * w3, Window ** w4, unsigned int * ui)); /* 90 */
 #endif /* MAC_OSX_TK */
 } TkIntXlibStubs;
 
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 508b415..c4b6c9d 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubInit.c,v 1.51 2005/08/09 07:39:19 das Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.52 2005/09/21 10:56:33 dkf Exp $
  */
 
 #include "tkInt.h"
@@ -295,6 +295,8 @@ TkIntStubs tkIntStubs = {
     TkMakeRawCurve, /* 150 */
     TkMakeRawCurvePostscript, /* 151 */
     TkpDrawFrame, /* 152 */
+    TkCreateThreadExitHandler, /* 153 */
+    TkDeleteThreadExitHandler, /* 154 */
 };
 
 TkIntPlatStubs tkIntPlatStubs = {