Merge 9.0

1 files changed, 396 insertions, 399 deletions

diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 360594a..2f56d80 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -498,284 +498,283 @@ EXTERN char *		XKeysymToString(KeySym k);
 EXTERN Colormap		XCreateColormap(Display *d, Window w, Visual *v,
 				int i);
 /* 7 */
-EXTERN GContext		XGContextFromGC(GC g);
+EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
+				XColor *x1, XColor *x2, unsigned int ui1,
+				unsigned int ui2);
 /* 8 */
-EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
+EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
+				unsigned int ui1, unsigned int ui2,
+				XColor _Xconst *x1, XColor _Xconst *x2);
 /* 9 */
-EXTERN KeySym		XStringToKeysym(_Xconst char *c);
+EXTERN GContext		XGContextFromGC(GC g);
 /* 10 */
-EXTERN Window		XRootWindow(Display *d, int i);
+EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
 /* 11 */
-EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+EXTERN KeySym		XKeycodeToKeysym(Display *d, unsigned int k, int i);
 /* 12 */
-EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+EXTERN KeySym		XStringToKeysym(_Xconst char *c);
 /* 13 */
-EXTERN int		XBell(Display *d, int i);
+EXTERN Window		XRootWindow(Display *d, int i);
 /* 14 */
+EXTERN XErrorHandler	XSetErrorHandler(XErrorHandler x);
+/* 15 */
+EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
+/* 16 */
+EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
+/* 17 */
+EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
+				Window **wpp, int *ip);
+/* 18 */
+EXTERN Status		XAllocColor(Display *d, Colormap c, XColor *xp);
+/* 19 */
+EXTERN int		XBell(Display *d, int i);
+/* 20 */
 EXTERN int		XChangeProperty(Display *d, Window w, Atom a1,
 				Atom a2, int i1, int i2,
 				_Xconst unsigned char *c, int i3);
-/* 15 */
+/* 21 */
 EXTERN int		XChangeWindowAttributes(Display *d, Window w,
 				unsigned long ul, XSetWindowAttributes *x);
-/* 16 */
+/* 22 */
+EXTERN int		XClearWindow(Display *d, Window w);
+/* 23 */
 EXTERN int		XConfigureWindow(Display *d, Window w,
 				unsigned int i, XWindowChanges *x);
-/* 17 */
+/* 24 */
 EXTERN int		XCopyArea(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4);
-/* 18 */
+/* 25 */
 EXTERN int		XCopyPlane(Display *d, Drawable dr1, Drawable dr2,
 				GC g, int i1, int i2, unsigned int ui1,
 				unsigned int ui2, int i3, int i4,
 				unsigned long ul);
-/* 19 */
+/* 26 */
 EXTERN Pixmap		XCreateBitmapFromData(Display *display, Drawable d,
 				_Xconst char *data, unsigned int width,
 				unsigned int height);
-/* 20 */
+/* 27 */
 EXTERN int		XDefineCursor(Display *d, Window w, Cursor c);
-/* 21 */
+/* 28 */
+EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
+/* 29 */
 EXTERN int		XDestroyWindow(Display *d, Window w);
-/* 22 */
+/* 30 */
 EXTERN int		XDrawArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-/* 23 */
+/* 31 */
 EXTERN int		XDrawLines(Display *d, Drawable dr, GC g, XPoint *x,
 				int i1, int i2);
-/* 24 */
+/* 32 */
 EXTERN int		XDrawRectangle(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-/* 25 */
+/* 33 */
 EXTERN int		XFillArc(Display *d, Drawable dr, GC g, int i1,
 				int i2, unsigned int ui1, unsigned int ui2,
 				int i3, int i4);
-/* 26 */
+/* 34 */
 EXTERN int		XFillPolygon(Display *d, Drawable dr, GC g,
 				XPoint *x, int i1, int i2, int i3);
-/* 27 */
+/* 35 */
 EXTERN int		XFillRectangles(Display *d, Drawable dr, GC g,
 				XRectangle *x, int i);
-/* 28 */
+/* 36 */
+EXTERN int		XForceScreenSaver(Display *d, int i);
+/* 37 */
 EXTERN int		XFreeColormap(Display *d, Colormap c);
-/* 29 */
+/* 38 */
 EXTERN int		XFreeColors(Display *d, Colormap c,
 				unsigned long *ulp, int i, unsigned long ul);
-/* 30 */
+/* 39 */
+EXTERN int		XFreeCursor(Display *d, Cursor c);
+/* 40 */
 EXTERN int		XFreeModifiermap(XModifierKeymap *x);
-/* 31 */
+/* 41 */
 EXTERN Status		XGetGeometry(Display *d, Drawable dr, Window *w,
 				int *i1, int *i2, unsigned int *ui1,
 				unsigned int *ui2, unsigned int *ui3,
 				unsigned int *ui4);
-/* 32 */
+/* 42 */
+EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
+/* 43 */
 EXTERN int		XGetWindowProperty(Display *d, Window w, Atom a1,
 				long l1, long l2, Bool b, Atom a2, Atom *ap,
 				int *ip, unsigned long *ulp1,
 				unsigned long *ulp2, unsigned char **cpp);
-/* 33 */
+/* 44 */
+EXTERN Status		XGetWindowAttributes(Display *d, Window w,
+				XWindowAttributes *x);
+/* 45 */
 EXTERN int		XGrabKeyboard(Display *d, Window w, Bool b, int i1,
 				int i2, Time t);
-/* 34 */
+/* 46 */
 EXTERN int		XGrabPointer(Display *d, Window w1, Bool b,
 				unsigned int ui, int i1, int i2, Window w2,
 				Cursor c, Time t);
-/* 35 */
+/* 47 */
 EXTERN KeyCode		XKeysymToKeycode(Display *d, KeySym k);
-/* 36 */
+/* 48 */
+EXTERN Status		XLookupColor(Display *d, Colormap c1,
+				_Xconst char *c2, XColor *x1, XColor *x2);
+/* 49 */
 EXTERN int		XMapWindow(Display *d, Window w);
-/* 37 */
+/* 50 */
 EXTERN int		XMoveResizeWindow(Display *d, Window w, int i1,
 				int i2, unsigned int ui1, unsigned int ui2);
-/* 38 */
+/* 51 */
 EXTERN int		XMoveWindow(Display *d, Window w, int i1, int i2);
-/* 39 */
+/* 52 */
+EXTERN int		XNextEvent(Display *d, XEvent *x);
+/* 53 */
+EXTERN int		XPutBackEvent(Display *d, XEvent *x);
+/* 54 */
+EXTERN int		XQueryColors(Display *d, Colormap c, XColor *x,
+				int i);
+/* 55 */
 EXTERN Bool		XQueryPointer(Display *d, Window w1, Window *w2,
 				Window *w3, int *i1, int *i2, int *i3,
 				int *i4, unsigned int *ui);
-/* 40 */
+/* 56 */
+EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
+				Window *w3, Window **w4, unsigned int *ui);
+/* 57 */
 EXTERN int		XRaiseWindow(Display *d, Window w);
-/* 41 */
+/* 58 */
 EXTERN int		XRefreshKeyboardMapping(XMappingEvent *x);
-/* 42 */
+/* 59 */
 EXTERN int		XResizeWindow(Display *d, Window w, unsigned int ui1,
 				unsigned int ui2);
-/* 43 */
+/* 60 */
 EXTERN int		XSelectInput(Display *d, Window w, long l);
-/* 44 */
+/* 61 */
 EXTERN Status		XSendEvent(Display *d, Window w, Bool b, long l,
 				XEvent *x);
-/* 45 */
+/* 62 */
+EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
+/* 63 */
 EXTERN int		XSetIconName(Display *d, Window w, _Xconst char *c);
-/* 46 */
+/* 64 */
 EXTERN int		XSetInputFocus(Display *d, Window w, int i, Time t);
-/* 47 */
+/* 65 */
 EXTERN int		XSetSelectionOwner(Display *d, Atom a, Window w,
 				Time t);
-/* 48 */
+/* 66 */
 EXTERN int		XSetWindowBackground(Display *d, Window w,
 				unsigned long ul);
-/* 49 */
+/* 67 */
 EXTERN int		XSetWindowBackgroundPixmap(Display *d, Window w,
 				Pixmap p);
-/* 50 */
+/* 68 */
 EXTERN int		XSetWindowBorder(Display *d, Window w,
 				unsigned long ul);
-/* 51 */
+/* 69 */
 EXTERN int		XSetWindowBorderPixmap(Display *d, Window w,
 				Pixmap p);
-/* 52 */
+/* 70 */
 EXTERN int		XSetWindowBorderWidth(Display *d, Window w,
 				unsigned int ui);
-/* 53 */
+/* 71 */
 EXTERN int		XSetWindowColormap(Display *d, Window w, Colormap c);
-/* 54 */
+/* 72 */
+EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
+				Window w2, int i1, int i2, int *i3, int *i4,
+				Window *w3);
+/* 73 */
 EXTERN int		XUngrabKeyboard(Display *d, Time t);
-/* 55 */
+/* 74 */
 EXTERN int		XUngrabPointer(Display *d, Time t);
-/* 56 */
+/* 75 */
 EXTERN int		XUnmapWindow(Display *d, Window w);
-/* 57 */
+/* 76 */
+EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
+/* 77 */
+EXTERN void		XDestroyIC(XIC x);
+/* 78 */
+EXTERN Bool		XFilterEvent(XEvent *x, Window w);
+/* 79 */
+EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
+				char *c, int i, KeySym *k, Status *s);
+/* 80 */
 EXTERN int		TkPutImage(unsigned long *colors, int ncolors,
 				Display *display, Drawable d, GC gc,
 				XImage *image, int src_x, int src_y,
 				int dest_x, int dest_y, unsigned int width,
 				unsigned int height);
-/* 58 */
+/* 81 */
+EXTERN int		XSetClipRectangles(Display *display, GC gc,
+				int clip_x_origin, int clip_y_origin,
+				XRectangle rectangles[], int n, int ordering);
+/* 82 */
 EXTERN Status		XParseColor(Display *display, Colormap map,
 				_Xconst char *spec, XColor *colorPtr);
-/* 59 */
+/* 83 */
 EXTERN GC		XCreateGC(Display *display, Drawable d,
 				unsigned long valuemask, XGCValues *values);
-/* 60 */
+/* 84 */
 EXTERN int		XFreeGC(Display *display, GC gc);
-/* 61 */
+/* 85 */
 EXTERN Atom		XInternAtom(Display *display,
 				_Xconst char *atom_name, Bool only_if_exists);
-/* 62 */
+/* 86 */
 EXTERN int		XSetBackground(Display *display, GC gc,
 				unsigned long foreground);
-/* 63 */
+/* 87 */
 EXTERN int		XSetForeground(Display *display, GC gc,
 				unsigned long foreground);
-/* 64 */
+/* 88 */
 EXTERN int		XSetClipMask(Display *display, GC gc, Pixmap pixmap);
-/* 65 */
+/* 89 */
 EXTERN int		XSetClipOrigin(Display *display, GC gc,
 				int clip_x_origin, int clip_y_origin);
-/* 66 */
+/* 90 */
 EXTERN int		XSetTSOrigin(Display *display, GC gc,
 				int ts_x_origin, int ts_y_origin);
-/* 67 */
+/* 91 */
 EXTERN int		XChangeGC(Display *d, GC gc, unsigned long mask,
 				XGCValues *values);
-/* 68 */
+/* 92 */
 EXTERN int		XSetFont(Display *display, GC gc, Font font);
-/* 69 */
+/* 93 */
 EXTERN int		XSetArcMode(Display *display, GC gc, int arc_mode);
-/* 70 */
+/* 94 */
 EXTERN int		XSetStipple(Display *display, GC gc, Pixmap stipple);
-/* 71 */
+/* 95 */
 EXTERN int		XSetFillRule(Display *display, GC gc, int fill_rule);
-/* 72 */
+/* 96 */
 EXTERN int		XSetFillStyle(Display *display, GC gc,
 				int fill_style);
-/* 73 */
+/* 97 */
 EXTERN int		XSetFunction(Display *display, GC gc, int function);
-/* 74 */
+/* 98 */
 EXTERN int		XSetLineAttributes(Display *display, GC gc,
 				unsigned int line_width, int line_style,
 				int cap_style, int join_style);
-/* 75 */
+/* 99 */
 EXTERN int		_XInitImageFuncPtrs(XImage *image);
-/* 76 */
+/* 100 */
 EXTERN XIC		XCreateIC(XIM xim, ...);
-/* 77 */
+/* 101 */
 EXTERN XVisualInfo *	XGetVisualInfo(Display *display, long vinfo_mask,
 				XVisualInfo *vinfo_template,
 				int *nitems_return);
-/* 78 */
+/* 102 */
 EXTERN void		XSetWMClientMachine(Display *display, Window w,
 				XTextProperty *text_prop);
-/* 79 */
+/* 103 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
-/* 80 */
-EXTERN int		XDrawSegments(Display *display, Drawable d, GC gc,
-				XSegment *segments, int nsegments);
-/* 81 */
-EXTERN int		XForceScreenSaver(Display *display, int mode);
-/* 82 */
+/* 104 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
 				int y1, int x2, int y2);
-/* 83 */
+/* 105 */
+EXTERN int		XWarpPointer(Display *d, Window s, Window dw, int sx,
+				int sy, unsigned int sw, unsigned int sh,
+				int dx, int dy);
+/* 106 */
 EXTERN int		XFillRectangle(Display *display, Drawable d, GC gc,
 				int x, int y, unsigned int width,
 				unsigned int height);
-/* 84 */
-EXTERN int		XClearWindow(Display *d, Window w);
-/* 85 */
-EXTERN int		XDrawPoint(Display *display, Drawable d, GC gc,
-				int x, int y);
-/* 86 */
-EXTERN int		XDrawPoints(Display *display, Drawable d, GC gc,
-				XPoint *points, int npoints, int mode);
-/* 87 */
-EXTERN int		XWarpPointer(Display *display, Window src_w,
-				Window dest_w, int src_x, int src_y,
-				unsigned int src_width,
-				unsigned int src_height, int dest_x,
-				int dest_y);
-/* 88 */
-EXTERN int		XQueryColor(Display *display, Colormap colormap,
-				XColor *def_in_out);
-/* 89 */
-EXTERN int		XQueryColors(Display *display, Colormap colormap,
-				XColor *defs_in_out, int ncolors);
-/* 90 */
-EXTERN Status		XQueryTree(Display *d, Window w1, Window *w2,
-				Window *w3, Window **w4, unsigned int *ui);
-/* 91 */
-EXTERN int		XSync(Display *display, Bool discard);
-/* 92 */
-EXTERN Bool		XTranslateCoordinates(Display *d, Window w1,
-				Window w2, int i1, int i2, int *i3, int *i4,
-				Window *w3);
-/* 93 */
-EXTERN int		XDeleteProperty(Display *d, Window w, Atom a);
-/* 94 */
-EXTERN int		XFreeCursor(Display *d, Cursor c);
-/* 95 */
-EXTERN int		XGetInputFocus(Display *d, Window *w, int *i);
-/* 96 */
-EXTERN int		XmbLookupString(XIC xi, XKeyPressedEvent *xk,
-				char *c, int i, KeySym *k, Status *s);
-/* 97 */
-EXTERN int		XNextEvent(Display *d, XEvent *x);
-/* 98 */
-EXTERN int		XPutBackEvent(Display *d, XEvent *x);
-/* 99 */
-EXTERN int		XSetCommand(Display *d, Window w, char **c, int i);
-/* 100 */
-EXTERN int		XWindowEvent(Display *d, Window w, long l, XEvent *x);
-/* 101 */
-EXTERN Status		XGetWindowAttributes(Display *d, Window w,
-				XWindowAttributes *x);
-/* 102 */
-EXTERN Status		XGetWMColormapWindows(Display *d, Window w,
-				Window **wpp, int *ip);
-/* 103 */
-EXTERN Status		XIconifyWindow(Display *d, Window w, int i);
-/* 104 */
-EXTERN Status		XWithdrawWindow(Display *d, Window w, int i);
-/* 105 */
-EXTERN XHostAddress *	XListHosts(Display *d, int *i, Bool *b);
-/* 106 */
-EXTERN int		XSetClipRectangles(Display *display, GC gc,
-				int clip_x_origin, int clip_y_origin,
-				XRectangle rectangles[], int n, int ordering);
 /* 107 */
 EXTERN int		XFlush(Display *display);
 /* 108 */
@@ -789,8 +788,7 @@ EXTERN int		XNoOp(Display *display);
 /* 112 */
 EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
 /* 113 */
-EXTERN Status		XLookupColor(Display *d, Colormap c1,
-				_Xconst char *c2, XColor *x1, XColor *x2);
+EXTERN int		XSync(Display *display, Bool discard);
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
 /* Slot 115 is reserved */
@@ -828,9 +826,15 @@ EXTERN int		XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a,
 /* 132 */
 EXTERN int		XDrawRectangles(Display *d, Drawable dr, GC gc,
 				XRectangle *r, int n);
-/* Slot 133 is reserved */
-/* Slot 134 is reserved */
-/* Slot 135 is reserved */
+/* 133 */
+EXTERN int		XDrawSegments(Display *d, Drawable dr, GC gc,
+				XSegment *s, int n);
+/* 134 */
+EXTERN int		XDrawPoint(Display *d, Drawable dr, GC gc, int x,
+				int y);
+/* 135 */
+EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
+				XPoint *p, int n, int m);
 /* 136 */
 EXTERN int		XReparentWindow(Display *d, Window w, Window p,
 				int x, int y);
@@ -850,16 +854,9 @@ EXTERN char *		XSetICValues(XIC xic, ...);
 EXTERN char *		XGetICValues(XIC xic, ...);
 /* 143 */
 EXTERN void		XSetICFocus(XIC xic);
-/* 144 */
-EXTERN void		XDestroyIC(XIC xic);
-/* 145 */
-EXTERN Cursor		XCreatePixmapCursor(Display *d, Pixmap p1, Pixmap p2,
-				XColor *x1, XColor *x2, unsigned int ui1,
-				unsigned int ui2);
-/* 146 */
-EXTERN Cursor		XCreateGlyphCursor(Display *d, Font f1, Font f2,
-				unsigned int ui1, unsigned int ui2,
-				XColor _Xconst *x1, XColor _Xconst *x2);
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
+/* Slot 146 is reserved */
 /* 147 */
 EXTERN void		XFreeFontSet(Display *display, XFontSet fontset);
 /* 148 */
@@ -1073,113 +1070,113 @@ typedef struct TkIntXlibStubs {
     char * (*xGetAtomName) (Display *d, Atom a); /* 4 */
     char * (*xKeysymToString) (KeySym k); /* 5 */
     Colormap (*xCreateColormap) (Display *d, Window w, Visual *v, int i); /* 6 */
-    GContext (*xGContextFromGC) (GC g); /* 7 */
-    KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 8 */
-    KeySym (*xStringToKeysym) (_Xconst char *c); /* 9 */
-    Window (*xRootWindow) (Display *d, int i); /* 10 */
-    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 11 */
-    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 12 */
-    int (*xBell) (Display *d, int i); /* 13 */
-    int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 14 */
-    int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 15 */
-    int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 16 */
-    int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 17 */
-    int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 18 */
-    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 19 */
-    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 20 */
-    int (*xDestroyWindow) (Display *d, Window w); /* 21 */
-    int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 22 */
-    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 23 */
-    int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 24 */
-    int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 25 */
-    int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 26 */
-    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 27 */
-    int (*xFreeColormap) (Display *d, Colormap c); /* 28 */
-    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 29 */
-    int (*xFreeModifiermap) (XModifierKeymap *x); /* 30 */
-    Status (*xGetGeometry) (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) (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) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 33 */
-    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 34 */
-    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 35 */
-    int (*xMapWindow) (Display *d, Window w); /* 36 */
-    int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 37 */
-    int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 38 */
-    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 39 */
-    int (*xRaiseWindow) (Display *d, Window w); /* 40 */
-    int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 41 */
-    int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 42 */
-    int (*xSelectInput) (Display *d, Window w, long l); /* 43 */
-    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 44 */
-    int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 45 */
-    int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 46 */
-    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 47 */
-    int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 48 */
-    int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 49 */
-    int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 50 */
-    int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 51 */
-    int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 52 */
-    int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 53 */
-    int (*xUngrabKeyboard) (Display *d, Time t); /* 54 */
-    int (*xUngrabPointer) (Display *d, Time t); /* 55 */
-    int (*xUnmapWindow) (Display *d, Window w); /* 56 */
-    int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 57 */
-    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 58 */
-    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 59 */
-    int (*xFreeGC) (Display *display, GC gc); /* 60 */
-    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 61 */
-    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 62 */
-    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 63 */
-    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 64 */
-    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 65 */
-    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 66 */
-    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 67 */
-    int (*xSetFont) (Display *display, GC gc, Font font); /* 68 */
-    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 69 */
-    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 70 */
-    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 71 */
-    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 72 */
-    int (*xSetFunction) (Display *display, GC gc, int function); /* 73 */
-    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 74 */
-    int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */
-    XIC (*xCreateIC) (XIM xim, ...); /* 76 */
-    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */
-    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */
-    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */
-    int (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
-    int (*xForceScreenSaver) (Display *display, int mode); /* 81 */
-    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */
-    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */
-    int (*xClearWindow) (Display *d, Window w); /* 84 */
-    int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
-    int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
-    int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */
-    int (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
-    int (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
-    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */
-    int (*xSync) (Display *display, Bool discard); /* 91 */
-    Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 92 */
-    int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 93 */
-    int (*xFreeCursor) (Display *d, Cursor c); /* 94 */
-    int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 95 */
-    int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 96 */
-    int (*xNextEvent) (Display *d, XEvent *x); /* 97 */
-    int (*xPutBackEvent) (Display *d, XEvent *x); /* 98 */
-    int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 99 */
-    int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 100 */
-    Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 101 */
-    Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 102 */
-    Status (*xIconifyWindow) (Display *d, Window w, int i); /* 103 */
-    Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 104 */
-    XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 105 */
-    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 106 */
+    Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 7 */
+    Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 8 */
+    GContext (*xGContextFromGC) (GC g); /* 9 */
+    XHostAddress * (*xListHosts) (Display *d, int *i, Bool *b); /* 10 */
+    KeySym (*xKeycodeToKeysym) (Display *d, unsigned int k, int i); /* 11 */
+    KeySym (*xStringToKeysym) (_Xconst char *c); /* 12 */
+    Window (*xRootWindow) (Display *d, int i); /* 13 */
+    XErrorHandler (*xSetErrorHandler) (XErrorHandler x); /* 14 */
+    Status (*xIconifyWindow) (Display *d, Window w, int i); /* 15 */
+    Status (*xWithdrawWindow) (Display *d, Window w, int i); /* 16 */
+    Status (*xGetWMColormapWindows) (Display *d, Window w, Window **wpp, int *ip); /* 17 */
+    Status (*xAllocColor) (Display *d, Colormap c, XColor *xp); /* 18 */
+    int (*xBell) (Display *d, int i); /* 19 */
+    int (*xChangeProperty) (Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3); /* 20 */
+    int (*xChangeWindowAttributes) (Display *d, Window w, unsigned long ul, XSetWindowAttributes *x); /* 21 */
+    int (*xClearWindow) (Display *d, Window w); /* 22 */
+    int (*xConfigureWindow) (Display *d, Window w, unsigned int i, XWindowChanges *x); /* 23 */
+    int (*xCopyArea) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 24 */
+    int (*xCopyPlane) (Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul); /* 25 */
+    Pixmap (*xCreateBitmapFromData) (Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height); /* 26 */
+    int (*xDefineCursor) (Display *d, Window w, Cursor c); /* 27 */
+    int (*xDeleteProperty) (Display *d, Window w, Atom a); /* 28 */
+    int (*xDestroyWindow) (Display *d, Window w); /* 29 */
+    int (*xDrawArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 30 */
+    int (*xDrawLines) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2); /* 31 */
+    int (*xDrawRectangle) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 32 */
+    int (*xFillArc) (Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4); /* 33 */
+    int (*xFillPolygon) (Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3); /* 34 */
+    int (*xFillRectangles) (Display *d, Drawable dr, GC g, XRectangle *x, int i); /* 35 */
+    int (*xForceScreenSaver) (Display *d, int i); /* 36 */
+    int (*xFreeColormap) (Display *d, Colormap c); /* 37 */
+    int (*xFreeColors) (Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul); /* 38 */
+    int (*xFreeCursor) (Display *d, Cursor c); /* 39 */
+    int (*xFreeModifiermap) (XModifierKeymap *x); /* 40 */
+    Status (*xGetGeometry) (Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4); /* 41 */
+    int (*xGetInputFocus) (Display *d, Window *w, int *i); /* 42 */
+    int (*xGetWindowProperty) (Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp); /* 43 */
+    Status (*xGetWindowAttributes) (Display *d, Window w, XWindowAttributes *x); /* 44 */
+    int (*xGrabKeyboard) (Display *d, Window w, Bool b, int i1, int i2, Time t); /* 45 */
+    int (*xGrabPointer) (Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t); /* 46 */
+    KeyCode (*xKeysymToKeycode) (Display *d, KeySym k); /* 47 */
+    Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 48 */
+    int (*xMapWindow) (Display *d, Window w); /* 49 */
+    int (*xMoveResizeWindow) (Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2); /* 50 */
+    int (*xMoveWindow) (Display *d, Window w, int i1, int i2); /* 51 */
+    int (*xNextEvent) (Display *d, XEvent *x); /* 52 */
+    int (*xPutBackEvent) (Display *d, XEvent *x); /* 53 */
+    int (*xQueryColors) (Display *d, Colormap c, XColor *x, int i); /* 54 */
+    Bool (*xQueryPointer) (Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui); /* 55 */
+    Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 56 */
+    int (*xRaiseWindow) (Display *d, Window w); /* 57 */
+    int (*xRefreshKeyboardMapping) (XMappingEvent *x); /* 58 */
+    int (*xResizeWindow) (Display *d, Window w, unsigned int ui1, unsigned int ui2); /* 59 */
+    int (*xSelectInput) (Display *d, Window w, long l); /* 60 */
+    Status (*xSendEvent) (Display *d, Window w, Bool b, long l, XEvent *x); /* 61 */
+    int (*xSetCommand) (Display *d, Window w, char **c, int i); /* 62 */
+    int (*xSetIconName) (Display *d, Window w, _Xconst char *c); /* 63 */
+    int (*xSetInputFocus) (Display *d, Window w, int i, Time t); /* 64 */
+    int (*xSetSelectionOwner) (Display *d, Atom a, Window w, Time t); /* 65 */
+    int (*xSetWindowBackground) (Display *d, Window w, unsigned long ul); /* 66 */
+    int (*xSetWindowBackgroundPixmap) (Display *d, Window w, Pixmap p); /* 67 */
+    int (*xSetWindowBorder) (Display *d, Window w, unsigned long ul); /* 68 */
+    int (*xSetWindowBorderPixmap) (Display *d, Window w, Pixmap p); /* 69 */
+    int (*xSetWindowBorderWidth) (Display *d, Window w, unsigned int ui); /* 70 */
+    int (*xSetWindowColormap) (Display *d, Window w, Colormap c); /* 71 */
+    Bool (*xTranslateCoordinates) (Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3); /* 72 */
+    int (*xUngrabKeyboard) (Display *d, Time t); /* 73 */
+    int (*xUngrabPointer) (Display *d, Time t); /* 74 */
+    int (*xUnmapWindow) (Display *d, Window w); /* 75 */
+    int (*xWindowEvent) (Display *d, Window w, long l, XEvent *x); /* 76 */
+    void (*xDestroyIC) (XIC x); /* 77 */
+    Bool (*xFilterEvent) (XEvent *x, Window w); /* 78 */
+    int (*xmbLookupString) (XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s); /* 79 */
+    int (*tkPutImage) (unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height); /* 80 */
+    int (*xSetClipRectangles) (Display *display, GC gc, int clip_x_origin, int clip_y_origin, XRectangle rectangles[], int n, int ordering); /* 81 */
+    Status (*xParseColor) (Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr); /* 82 */
+    GC (*xCreateGC) (Display *display, Drawable d, unsigned long valuemask, XGCValues *values); /* 83 */
+    int (*xFreeGC) (Display *display, GC gc); /* 84 */
+    Atom (*xInternAtom) (Display *display, _Xconst char *atom_name, Bool only_if_exists); /* 85 */
+    int (*xSetBackground) (Display *display, GC gc, unsigned long foreground); /* 86 */
+    int (*xSetForeground) (Display *display, GC gc, unsigned long foreground); /* 87 */
+    int (*xSetClipMask) (Display *display, GC gc, Pixmap pixmap); /* 88 */
+    int (*xSetClipOrigin) (Display *display, GC gc, int clip_x_origin, int clip_y_origin); /* 89 */
+    int (*xSetTSOrigin) (Display *display, GC gc, int ts_x_origin, int ts_y_origin); /* 90 */
+    int (*xChangeGC) (Display *d, GC gc, unsigned long mask, XGCValues *values); /* 91 */
+    int (*xSetFont) (Display *display, GC gc, Font font); /* 92 */
+    int (*xSetArcMode) (Display *display, GC gc, int arc_mode); /* 93 */
+    int (*xSetStipple) (Display *display, GC gc, Pixmap stipple); /* 94 */
+    int (*xSetFillRule) (Display *display, GC gc, int fill_rule); /* 95 */
+    int (*xSetFillStyle) (Display *display, GC gc, int fill_style); /* 96 */
+    int (*xSetFunction) (Display *display, GC gc, int function); /* 97 */
+    int (*xSetLineAttributes) (Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style); /* 98 */
+    int (*_XInitImageFuncPtrs) (XImage *image); /* 99 */
+    XIC (*xCreateIC) (XIM xim, ...); /* 100 */
+    XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 101 */
+    void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 102 */
+    Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 103 */
+    int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */
+    int (*xWarpPointer) (Display *d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */
+    int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */
     int (*xFlush) (Display *display); /* 107 */
     int (*xGrabServer) (Display *display); /* 108 */
     int (*xUngrabServer) (Display *display); /* 109 */
     int (*xFree) (void *data); /* 110 */
     int (*xNoOp) (Display *display); /* 111 */
     XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
-    Status (*xLookupColor) (Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2); /* 113 */
+    int (*xSync) (Display *display, Bool discard); /* 113 */
     VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
     void (*reserved115)(void);
     void (*reserved116)(void);
@@ -1199,9 +1196,9 @@ typedef struct TkIntXlibStubs {
     int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */
     int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */
     int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */
-    void (*reserved133)(void);
-    void (*reserved134)(void);
-    void (*reserved135)(void);
+    int (*xDrawSegments) (Display *d, Drawable dr, GC gc, XSegment *s, int n); /* 133 */
+    int (*xDrawPoint) (Display *d, Drawable dr, GC gc, int x, int y); /* 134 */
+    int (*xDrawPoints) (Display *d, Drawable dr, GC gc, XPoint *p, int n, int m); /* 135 */
     int (*xReparentWindow) (Display *d, Window w, Window p, int x, int y); /* 136 */
     int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */
     Region (*xPolygonRegion) (XPoint *pts, int n, int rule); /* 138 */
@@ -1210,9 +1207,9 @@ typedef struct TkIntXlibStubs {
     char * (*xSetICValues) (XIC xic, ...); /* 141 */
     char * (*xGetICValues) (XIC xic, ...); /* 142 */
     void (*xSetICFocus) (XIC xic); /* 143 */
-    void (*xDestroyIC) (XIC xic); /* 144 */
-    Cursor (*xCreatePixmapCursor) (Display *d, Pixmap p1, Pixmap p2, XColor *x1, XColor *x2, unsigned int ui1, unsigned int ui2); /* 145 */
-    Cursor (*xCreateGlyphCursor) (Display *d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor _Xconst *x1, XColor _Xconst *x2); /* 146 */
+    void (*reserved144)(void);
+    void (*reserved145)(void);
+    void (*reserved146)(void);
     void (*xFreeFontSet) (Display *display, XFontSet fontset); /* 147 */
     int (*xCloseIM) (XIM im); /* 148 */
     Bool (*xRegisterIMInstantiateCallback) (Display *dpy, struct _XrmHashBucketRec *rbd, char *res_name, char *res_class, XIDProc callback, XPointer client_data); /* 149 */
@@ -1561,206 +1558,206 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xKeysymToString) /* 5 */
 #define XCreateColormap \
 	(tkIntXlibStubsPtr->xCreateColormap) /* 6 */
+#define XCreatePixmapCursor \
+	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 7 */
+#define XCreateGlyphCursor \
+	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 8 */
 #define XGContextFromGC \
-	(tkIntXlibStubsPtr->xGContextFromGC) /* 7 */
+	(tkIntXlibStubsPtr->xGContextFromGC) /* 9 */
+#define XListHosts \
+	(tkIntXlibStubsPtr->xListHosts) /* 10 */
 #define XKeycodeToKeysym \
-	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */
+	(tkIntXlibStubsPtr->xKeycodeToKeysym) /* 11 */
 #define XStringToKeysym \
-	(tkIntXlibStubsPtr->xStringToKeysym) /* 9 */
+	(tkIntXlibStubsPtr->xStringToKeysym) /* 12 */
 #define XRootWindow \
-	(tkIntXlibStubsPtr->xRootWindow) /* 10 */
+	(tkIntXlibStubsPtr->xRootWindow) /* 13 */
 #define XSetErrorHandler \
-	(tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */
+	(tkIntXlibStubsPtr->xSetErrorHandler) /* 14 */
+#define XIconifyWindow \
+	(tkIntXlibStubsPtr->xIconifyWindow) /* 15 */
+#define XWithdrawWindow \
+	(tkIntXlibStubsPtr->xWithdrawWindow) /* 16 */
+#define XGetWMColormapWindows \
+	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 17 */
 #define XAllocColor \
-	(tkIntXlibStubsPtr->xAllocColor) /* 12 */
+	(tkIntXlibStubsPtr->xAllocColor) /* 18 */
 #define XBell \
-	(tkIntXlibStubsPtr->xBell) /* 13 */
+	(tkIntXlibStubsPtr->xBell) /* 19 */
 #define XChangeProperty \
-	(tkIntXlibStubsPtr->xChangeProperty) /* 14 */
+	(tkIntXlibStubsPtr->xChangeProperty) /* 20 */
 #define XChangeWindowAttributes \
-	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */
+	(tkIntXlibStubsPtr->xChangeWindowAttributes) /* 21 */
+#define XClearWindow \
+	(tkIntXlibStubsPtr->xClearWindow) /* 22 */
 #define XConfigureWindow \
-	(tkIntXlibStubsPtr->xConfigureWindow) /* 16 */
+	(tkIntXlibStubsPtr->xConfigureWindow) /* 23 */
 #define XCopyArea \
-	(tkIntXlibStubsPtr->xCopyArea) /* 17 */
+	(tkIntXlibStubsPtr->xCopyArea) /* 24 */
 #define XCopyPlane \
-	(tkIntXlibStubsPtr->xCopyPlane) /* 18 */
+	(tkIntXlibStubsPtr->xCopyPlane) /* 25 */
 #define XCreateBitmapFromData \
-	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */
+	(tkIntXlibStubsPtr->xCreateBitmapFromData) /* 26 */
 #define XDefineCursor \
-	(tkIntXlibStubsPtr->xDefineCursor) /* 20 */
+	(tkIntXlibStubsPtr->xDefineCursor) /* 27 */
+#define XDeleteProperty \
+	(tkIntXlibStubsPtr->xDeleteProperty) /* 28 */
 #define XDestroyWindow \
-	(tkIntXlibStubsPtr->xDestroyWindow) /* 21 */
+	(tkIntXlibStubsPtr->xDestroyWindow) /* 29 */
 #define XDrawArc \
-	(tkIntXlibStubsPtr->xDrawArc) /* 22 */
+	(tkIntXlibStubsPtr->xDrawArc) /* 30 */
 #define XDrawLines \
-	(tkIntXlibStubsPtr->xDrawLines) /* 23 */
+	(tkIntXlibStubsPtr->xDrawLines) /* 31 */
 #define XDrawRectangle \
-	(tkIntXlibStubsPtr->xDrawRectangle) /* 24 */
+	(tkIntXlibStubsPtr->xDrawRectangle) /* 32 */
 #define XFillArc \
-	(tkIntXlibStubsPtr->xFillArc) /* 25 */
+	(tkIntXlibStubsPtr->xFillArc) /* 33 */
 #define XFillPolygon \
-	(tkIntXlibStubsPtr->xFillPolygon) /* 26 */
+	(tkIntXlibStubsPtr->xFillPolygon) /* 34 */
 #define XFillRectangles \
-	(tkIntXlibStubsPtr->xFillRectangles) /* 27 */
+	(tkIntXlibStubsPtr->xFillRectangles) /* 35 */
+#define XForceScreenSaver \
+	(tkIntXlibStubsPtr->xForceScreenSaver) /* 36 */
 #define XFreeColormap \
-	(tkIntXlibStubsPtr->xFreeColormap) /* 28 */
+	(tkIntXlibStubsPtr->xFreeColormap) /* 37 */
 #define XFreeColors \
-	(tkIntXlibStubsPtr->xFreeColors) /* 29 */
+	(tkIntXlibStubsPtr->xFreeColors) /* 38 */
+#define XFreeCursor \
+	(tkIntXlibStubsPtr->xFreeCursor) /* 39 */
 #define XFreeModifiermap \
-	(tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */
+	(tkIntXlibStubsPtr->xFreeModifiermap) /* 40 */
 #define XGetGeometry \
-	(tkIntXlibStubsPtr->xGetGeometry) /* 31 */
+	(tkIntXlibStubsPtr->xGetGeometry) /* 41 */
+#define XGetInputFocus \
+	(tkIntXlibStubsPtr->xGetInputFocus) /* 42 */
 #define XGetWindowProperty \
-	(tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */
+	(tkIntXlibStubsPtr->xGetWindowProperty) /* 43 */
+#define XGetWindowAttributes \
+	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 44 */
 #define XGrabKeyboard \
-	(tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */
+	(tkIntXlibStubsPtr->xGrabKeyboard) /* 45 */
 #define XGrabPointer \
-	(tkIntXlibStubsPtr->xGrabPointer) /* 34 */
+	(tkIntXlibStubsPtr->xGrabPointer) /* 46 */
 #define XKeysymToKeycode \
-	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */
+	(tkIntXlibStubsPtr->xKeysymToKeycode) /* 47 */
+#define XLookupColor \
+	(tkIntXlibStubsPtr->xLookupColor) /* 48 */
 #define XMapWindow \
-	(tkIntXlibStubsPtr->xMapWindow) /* 36 */
+	(tkIntXlibStubsPtr->xMapWindow) /* 49 */
 #define XMoveResizeWindow \
-	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */
+	(tkIntXlibStubsPtr->xMoveResizeWindow) /* 50 */
 #define XMoveWindow \
-	(tkIntXlibStubsPtr->xMoveWindow) /* 38 */
+	(tkIntXlibStubsPtr->xMoveWindow) /* 51 */
+#define XNextEvent \
+	(tkIntXlibStubsPtr->xNextEvent) /* 52 */
+#define XPutBackEvent \
+	(tkIntXlibStubsPtr->xPutBackEvent) /* 53 */
+#define XQueryColors \
+	(tkIntXlibStubsPtr->xQueryColors) /* 54 */
 #define XQueryPointer \
-	(tkIntXlibStubsPtr->xQueryPointer) /* 39 */
+	(tkIntXlibStubsPtr->xQueryPointer) /* 55 */
+#define XQueryTree \
+	(tkIntXlibStubsPtr->xQueryTree) /* 56 */
 #define XRaiseWindow \
-	(tkIntXlibStubsPtr->xRaiseWindow) /* 40 */
+	(tkIntXlibStubsPtr->xRaiseWindow) /* 57 */
 #define XRefreshKeyboardMapping \
-	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */
+	(tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 58 */
 #define XResizeWindow \
-	(tkIntXlibStubsPtr->xResizeWindow) /* 42 */
+	(tkIntXlibStubsPtr->xResizeWindow) /* 59 */
 #define XSelectInput \
-	(tkIntXlibStubsPtr->xSelectInput) /* 43 */
+	(tkIntXlibStubsPtr->xSelectInput) /* 60 */
 #define XSendEvent \
-	(tkIntXlibStubsPtr->xSendEvent) /* 44 */
+	(tkIntXlibStubsPtr->xSendEvent) /* 61 */
+#define XSetCommand \
+	(tkIntXlibStubsPtr->xSetCommand) /* 62 */
 #define XSetIconName \
-	(tkIntXlibStubsPtr->xSetIconName) /* 45 */
+	(tkIntXlibStubsPtr->xSetIconName) /* 63 */
 #define XSetInputFocus \
-	(tkIntXlibStubsPtr->xSetInputFocus) /* 46 */
+	(tkIntXlibStubsPtr->xSetInputFocus) /* 64 */
 #define XSetSelectionOwner \
-	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */
+	(tkIntXlibStubsPtr->xSetSelectionOwner) /* 65 */
 #define XSetWindowBackground \
-	(tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */
+	(tkIntXlibStubsPtr->xSetWindowBackground) /* 66 */
 #define XSetWindowBackgroundPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */
+	(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 67 */
 #define XSetWindowBorder \
-	(tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */
+	(tkIntXlibStubsPtr->xSetWindowBorder) /* 68 */
 #define XSetWindowBorderPixmap \
-	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */
+	(tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 69 */
 #define XSetWindowBorderWidth \
-	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */
+	(tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 70 */
 #define XSetWindowColormap \
-	(tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */
+	(tkIntXlibStubsPtr->xSetWindowColormap) /* 71 */
+#define XTranslateCoordinates \
+	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 72 */
 #define XUngrabKeyboard \
-	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */
+	(tkIntXlibStubsPtr->xUngrabKeyboard) /* 73 */
 #define XUngrabPointer \
-	(tkIntXlibStubsPtr->xUngrabPointer) /* 55 */
+	(tkIntXlibStubsPtr->xUngrabPointer) /* 74 */
 #define XUnmapWindow \
-	(tkIntXlibStubsPtr->xUnmapWindow) /* 56 */
+	(tkIntXlibStubsPtr->xUnmapWindow) /* 75 */
+#define XWindowEvent \
+	(tkIntXlibStubsPtr->xWindowEvent) /* 76 */
+#define XDestroyIC \
+	(tkIntXlibStubsPtr->xDestroyIC) /* 77 */
+#define XFilterEvent \
+	(tkIntXlibStubsPtr->xFilterEvent) /* 78 */
+#define XmbLookupString \
+	(tkIntXlibStubsPtr->xmbLookupString) /* 79 */
 #define TkPutImage \
-	(tkIntXlibStubsPtr->tkPutImage) /* 57 */
+	(tkIntXlibStubsPtr->tkPutImage) /* 80 */
+#define XSetClipRectangles \
+	(tkIntXlibStubsPtr->xSetClipRectangles) /* 81 */
 #define XParseColor \
-	(tkIntXlibStubsPtr->xParseColor) /* 58 */
+	(tkIntXlibStubsPtr->xParseColor) /* 82 */
 #define XCreateGC \
-	(tkIntXlibStubsPtr->xCreateGC) /* 59 */
+	(tkIntXlibStubsPtr->xCreateGC) /* 83 */
 #define XFreeGC \
-	(tkIntXlibStubsPtr->xFreeGC) /* 60 */
+	(tkIntXlibStubsPtr->xFreeGC) /* 84 */
 #define XInternAtom \
-	(tkIntXlibStubsPtr->xInternAtom) /* 61 */
+	(tkIntXlibStubsPtr->xInternAtom) /* 85 */
 #define XSetBackground \
-	(tkIntXlibStubsPtr->xSetBackground) /* 62 */
+	(tkIntXlibStubsPtr->xSetBackground) /* 86 */
 #define XSetForeground \
-	(tkIntXlibStubsPtr->xSetForeground) /* 63 */
+	(tkIntXlibStubsPtr->xSetForeground) /* 87 */
 #define XSetClipMask \
-	(tkIntXlibStubsPtr->xSetClipMask) /* 64 */
+	(tkIntXlibStubsPtr->xSetClipMask) /* 88 */
 #define XSetClipOrigin \
-	(tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */
+	(tkIntXlibStubsPtr->xSetClipOrigin) /* 89 */
 #define XSetTSOrigin \
-	(tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */
+	(tkIntXlibStubsPtr->xSetTSOrigin) /* 90 */
 #define XChangeGC \
-	(tkIntXlibStubsPtr->xChangeGC) /* 67 */
+	(tkIntXlibStubsPtr->xChangeGC) /* 91 */
 #define XSetFont \
-	(tkIntXlibStubsPtr->xSetFont) /* 68 */
+	(tkIntXlibStubsPtr->xSetFont) /* 92 */
 #define XSetArcMode \
-	(tkIntXlibStubsPtr->xSetArcMode) /* 69 */
+	(tkIntXlibStubsPtr->xSetArcMode) /* 93 */
 #define XSetStipple \
-	(tkIntXlibStubsPtr->xSetStipple) /* 70 */
+	(tkIntXlibStubsPtr->xSetStipple) /* 94 */
 #define XSetFillRule \
-	(tkIntXlibStubsPtr->xSetFillRule) /* 71 */
+	(tkIntXlibStubsPtr->xSetFillRule) /* 95 */
 #define XSetFillStyle \
-	(tkIntXlibStubsPtr->xSetFillStyle) /* 72 */
+	(tkIntXlibStubsPtr->xSetFillStyle) /* 96 */
 #define XSetFunction \
-	(tkIntXlibStubsPtr->xSetFunction) /* 73 */
+	(tkIntXlibStubsPtr->xSetFunction) /* 97 */
 #define XSetLineAttributes \
-	(tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */
+	(tkIntXlibStubsPtr->xSetLineAttributes) /* 98 */
 #define _XInitImageFuncPtrs \
-	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */
+	(tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 99 */
 #define XCreateIC \
-	(tkIntXlibStubsPtr->xCreateIC) /* 76 */
+	(tkIntXlibStubsPtr->xCreateIC) /* 100 */
 #define XGetVisualInfo \
-	(tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */
+	(tkIntXlibStubsPtr->xGetVisualInfo) /* 101 */
 #define XSetWMClientMachine \
-	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */
+	(tkIntXlibStubsPtr->xSetWMClientMachine) /* 102 */
 #define XStringListToTextProperty \
-	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */
-#define XDrawSegments \
-	(tkIntXlibStubsPtr->xDrawSegments) /* 80 */
-#define XForceScreenSaver \
-	(tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */
+	(tkIntXlibStubsPtr->xStringListToTextProperty) /* 103 */
 #define XDrawLine \
-	(tkIntXlibStubsPtr->xDrawLine) /* 82 */
-#define XFillRectangle \
-	(tkIntXlibStubsPtr->xFillRectangle) /* 83 */
-#define XClearWindow \
-	(tkIntXlibStubsPtr->xClearWindow) /* 84 */
-#define XDrawPoint \
-	(tkIntXlibStubsPtr->xDrawPoint) /* 85 */
-#define XDrawPoints \
-	(tkIntXlibStubsPtr->xDrawPoints) /* 86 */
+	(tkIntXlibStubsPtr->xDrawLine) /* 104 */
 #define XWarpPointer \
-	(tkIntXlibStubsPtr->xWarpPointer) /* 87 */
-#define XQueryColor \
-	(tkIntXlibStubsPtr->xQueryColor) /* 88 */
-#define XQueryColors \
-	(tkIntXlibStubsPtr->xQueryColors) /* 89 */
-#define XQueryTree \
-	(tkIntXlibStubsPtr->xQueryTree) /* 90 */
-#define XSync \
-	(tkIntXlibStubsPtr->xSync) /* 91 */
-#define XTranslateCoordinates \
-	(tkIntXlibStubsPtr->xTranslateCoordinates) /* 92 */
-#define XDeleteProperty \
-	(tkIntXlibStubsPtr->xDeleteProperty) /* 93 */
-#define XFreeCursor \
-	(tkIntXlibStubsPtr->xFreeCursor) /* 94 */
-#define XGetInputFocus \
-	(tkIntXlibStubsPtr->xGetInputFocus) /* 95 */
-#define XmbLookupString \
-	(tkIntXlibStubsPtr->xmbLookupString) /* 96 */
-#define XNextEvent \
-	(tkIntXlibStubsPtr->xNextEvent) /* 97 */
-#define XPutBackEvent \
-	(tkIntXlibStubsPtr->xPutBackEvent) /* 98 */
-#define XSetCommand \
-	(tkIntXlibStubsPtr->xSetCommand) /* 99 */
-#define XWindowEvent \
-	(tkIntXlibStubsPtr->xWindowEvent) /* 100 */
-#define XGetWindowAttributes \
-	(tkIntXlibStubsPtr->xGetWindowAttributes) /* 101 */
-#define XGetWMColormapWindows \
-	(tkIntXlibStubsPtr->xGetWMColormapWindows) /* 102 */
-#define XIconifyWindow \
-	(tkIntXlibStubsPtr->xIconifyWindow) /* 103 */
-#define XWithdrawWindow \
-	(tkIntXlibStubsPtr->xWithdrawWindow) /* 104 */
-#define XListHosts \
-	(tkIntXlibStubsPtr->xListHosts) /* 105 */
-#define XSetClipRectangles \
-	(tkIntXlibStubsPtr->xSetClipRectangles) /* 106 */
+	(tkIntXlibStubsPtr->xWarpPointer) /* 105 */
+#define XFillRectangle \
+	(tkIntXlibStubsPtr->xFillRectangle) /* 106 */
 #define XFlush \
 	(tkIntXlibStubsPtr->xFlush) /* 107 */
 #define XGrabServer \
@@ -1773,8 +1770,8 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xNoOp) /* 111 */
 #define XSynchronize \
 	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
-#define XLookupColor \
-	(tkIntXlibStubsPtr->xLookupColor) /* 113 */
+#define XSync \
+	(tkIntXlibStubsPtr->xSync) /* 113 */
 #define XVisualIDFromVisual \
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
 /* Slot 115 is reserved */
@@ -1802,9 +1799,12 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xDrawArcs) /* 131 */
 #define XDrawRectangles \
 	(tkIntXlibStubsPtr->xDrawRectangles) /* 132 */
-/* Slot 133 is reserved */
-/* Slot 134 is reserved */
-/* Slot 135 is reserved */
+#define XDrawSegments \
+	(tkIntXlibStubsPtr->xDrawSegments) /* 133 */
+#define XDrawPoint \
+	(tkIntXlibStubsPtr->xDrawPoint) /* 134 */
+#define XDrawPoints \
+	(tkIntXlibStubsPtr->xDrawPoints) /* 135 */
 #define XReparentWindow \
 	(tkIntXlibStubsPtr->xReparentWindow) /* 136 */
 #define XPutImage \
@@ -1821,12 +1821,9 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr;
 	(tkIntXlibStubsPtr->xGetICValues) /* 142 */
 #define XSetICFocus \
 	(tkIntXlibStubsPtr->xSetICFocus) /* 143 */
-#define XDestroyIC \
-	(tkIntXlibStubsPtr->xDestroyIC) /* 144 */
-#define XCreatePixmapCursor \
-	(tkIntXlibStubsPtr->xCreatePixmapCursor) /* 145 */
-#define XCreateGlyphCursor \
-	(tkIntXlibStubsPtr->xCreateGlyphCursor) /* 146 */
+/* Slot 144 is reserved */
+/* Slot 145 is reserved */
+/* Slot 146 is reserved */
 #define XFreeFontSet \
 	(tkIntXlibStubsPtr->xFreeFontSet) /* 147 */
 #define XCloseIM \