summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkInt.decls192
-rw-r--r--generic/tkIntXlibDecls.h568
-rw-r--r--generic/tkIntXlibStubs.c206
-rw-r--r--generic/tkStubInit.c188
-rw-r--r--xlib/X11/Xlib.h11
5 files changed, 604 insertions, 561 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index b3b50a4..050fe16 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -9,7 +9,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tkInt.decls,v 1.2 1999/03/10 07:04:40 stanton Exp $
+# RCS: @(#) $Id: tkInt.decls,v 1.3 1999/03/10 18:56:08 redman Exp $
library tk
@@ -1083,235 +1083,240 @@ declare 24 win {
}
declare 25 win {
+ Pixmap XCreateBitmapFromData(Display* display, Drawable d, \
+ _Xconst char* data, unsigned int width,unsigned int height)
+}
+
+declare 26 win {
void XDefineCursor (Display* d, Window w, Cursor c)
}
-declare 26 win {
+declare 27 win {
void XDeleteProperty (Display* d, Window w, Atom a)
}
-declare 27 win {
+declare 28 win {
void XDestroyWindow (Display* d, Window w)
}
-declare 28 win {
+declare 29 win {
void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
-declare 29 win {
+declare 30 win {
void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
}
-declare 30 win {
+declare 31 win {
void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
unsigned int ui1, unsigned int ui2)
}
-declare 31 win {
+declare 32 win {
void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
-declare 32 win {
+declare 33 win {
void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
int i1, int i2, int i3)
}
-declare 33 win {
+declare 34 win {
void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
}
-declare 34 win {
+declare 35 win {
void XForceScreenSaver (Display* d, int i)
}
-declare 35 win {
+declare 36 win {
void XFreeColormap (Display* d, Colormap c)
}
-declare 36 win {
+declare 37 win {
void XFreeColors (Display* d, Colormap c, \
unsigned long* ulp, int i, unsigned long ul)
}
-declare 37 win {
+declare 38 win {
void XFreeCursor (Display* d, Cursor c)
}
-declare 38 win {
+declare 39 win {
void XFreeModifiermap (XModifierKeymap* x)
}
-declare 39 win {
+declare 40 win {
Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \
int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \
unsigned int* ui4)
}
-declare 40 win {
+declare 41 win {
void XGetInputFocus (Display* d, Window* w, int* i)
}
-declare 41 win {
+declare 42 win {
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)
}
-declare 42 win {
+declare 43 win {
Status XGetWindowAttributes (Display* d, Window w, XWindowAttributes* x)
}
-declare 43 win {
+declare 44 win {
int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
}
-declare 44 win {
+declare 45 win {
int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \
int i1, int i2, Window w2, Cursor c, Time t)
}
-declare 45 win {
+declare 46 win {
KeyCode XKeysymToKeycode (Display* d, KeySym k)
}
-declare 46 win {
+declare 47 win {
Status XLookupColor (Display* d, Colormap c1, _Xconst char* c2, \
XColor* x1, XColor* x2)
}
-declare 47 win {
+declare 48 win {
void XMapWindow (Display* d, Window w)
}
-declare 48 win {
+declare 49 win {
void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
unsigned int ui1, unsigned int ui2)
}
-declare 49 win {
+declare 50 win {
void XMoveWindow (Display* d, Window w, int i1, int i2)
}
-declare 50 win {
+declare 51 win {
void XNextEvent (Display* d, XEvent* x)
}
-declare 51 win {
+declare 52 win {
void XPutBackEvent (Display* d, XEvent* x)
}
-declare 52 win {
+declare 53 win {
void XQueryColors (Display* d, Colormap c, XColor* x, int i)
}
-declare 53 win {
+declare 54 win {
Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \
int* i1, int* i2, int* i3, int* i4, unsigned int* ui)
}
-declare 54 win {
+declare 55 win {
Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \
Window** w4, unsigned int* ui)
}
-declare 55 win {
+declare 56 win {
void XRaiseWindow (Display* d, Window w)
}
-declare 56 win {
+declare 57 win {
void XRefreshKeyboardMapping (XMappingEvent* x)
}
-declare 57 win {
+declare 58 win {
void XResizeWindow (Display* d, Window w, unsigned int ui1, \
unsigned int ui2)
}
-declare 58 win {
+declare 59 win {
void XSelectInput (Display* d, Window w, long l)
}
-declare 59 win {
+declare 60 win {
Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
}
-declare 60 win {
+declare 61 win {
void XSetCommand (Display* d, Window w, char** c, int i)
}
-declare 61 win {
+declare 62 win {
void XSetIconName (Display* d, Window w, _Xconst char* c)
}
-declare 62 win {
+declare 63 win {
void XSetInputFocus (Display* d, Window w, int i, Time t)
}
-declare 63 win {
+declare 64 win {
void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
}
-declare 64 win {
+declare 65 win {
void XSetWindowBackground (Display* d, Window w, unsigned long ul)
}
-declare 65 win {
+declare 66 win {
void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
}
-declare 66 win {
+declare 67 win {
void XSetWindowBorder (Display* d, Window w, unsigned long ul)
}
-declare 67 win {
+declare 68 win {
void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
}
-declare 68 win {
+declare 69 win {
void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
}
-declare 69 win {
+declare 70 win {
void XSetWindowColormap (Display* d, Window w, Colormap c)
}
-declare 70 win {
+declare 71 win {
Bool XTranslateCoordinates (Display* d, Window w1, Window w2, int i1,\
int i2, int* i3, int* i4, Window* w3)
}
-declare 71 win {
+declare 72 win {
void XUngrabKeyboard (Display* d, Time t)
}
-declare 72 win {
+declare 73 win {
void XUngrabPointer (Display* d, Time t)
}
-declare 73 win {
+declare 74 win {
void XUnmapWindow (Display* d, Window w)
}
-declare 74 win {
+declare 75 win {
void XWindowEvent (Display* d, Window w, long l, XEvent* x)
}
-declare 75 win {
+declare 76 win {
void XDestroyIC (XIC x)
}
-declare 76 win {
+declare 77 win {
Bool XFilterEvent (XEvent* x, Window w)
}
-declare 77 win {
+declare 78 win {
int XmbLookupString (XIC xi, XKeyPressedEvent* xk, \
char* c, int i, KeySym* k, Status* s)
}
-declare 78 win {
+declare 79 win {
void TkPutImage (unsigned long *colors, \
int ncolors, Display* display, Drawable d, \
GC gc, XImage* image, int src_x, int src_y, \
@@ -1407,167 +1412,172 @@ declare 17 mac {
}
declare 18 mac {
+ Pixmap XCreateBitmapFromData(Display* display, Drawable d, \
+ _Xconst char* data, unsigned int width,unsigned int height)
+}
+
+declare 19 mac {
void XDefineCursor (Display* d, Window w, Cursor c)
}
-declare 19 mac {
+declare 20 mac {
void XDestroyWindow (Display* d, Window w)
}
-declare 20 mac {
+declare 21 mac {
void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
-declare 21 mac {
+declare 22 mac {
void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)
}
-declare 22 mac {
+declare 23 mac {
void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\
unsigned int ui1, unsigned int ui2)
}
-declare 23 mac {
+declare 24 mac {
void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
-declare 24 mac {
+declare 25 mac {
void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \
int i1, int i2, int i3)
}
-declare 25 mac {
+declare 26 mac {
void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i)
}
-declare 26 mac {
+declare 27 mac {
void XFreeColormap (Display* d, Colormap c)
}
-declare 27 mac {
+declare 28 mac {
void XFreeColors (Display* d, Colormap c, \
unsigned long* ulp, int i, unsigned long ul)
}
-declare 28 mac {
+declare 29 mac {
void XFreeModifiermap (XModifierKeymap* x)
}
-declare 29 mac {
+declare 30 mac {
Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \
int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \
unsigned int* ui4)
}
-declare 30 mac {
+declare 31 mac {
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)
}
-declare 31 mac {
+declare 32 mac {
int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t)
}
-declare 32 mac {
+declare 33 mac {
int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \
int i1, int i2, Window w2, Cursor c, Time t)
}
-declare 33 mac {
+declare 34 mac {
KeyCode XKeysymToKeycode (Display* d, KeySym k)
}
-declare 34 mac {
+declare 35 mac {
void XMapWindow (Display* d, Window w)
}
-declare 35 mac {
+declare 36 mac {
void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \
unsigned int ui1, unsigned int ui2)
}
-declare 36 mac {
+declare 37 mac {
void XMoveWindow (Display* d, Window w, int i1, int i2)
}
-declare 37 mac {
+declare 38 mac {
Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \
int* i1, int* i2, int* i3, int* i4, unsigned int* ui)
}
-declare 38 mac {
+declare 39 mac {
void XRaiseWindow (Display* d, Window w)
}
-declare 39 mac {
+declare 40 mac {
void XRefreshKeyboardMapping (XMappingEvent* x)
}
-declare 40 mac {
+declare 41 mac {
void XResizeWindow (Display* d, Window w, unsigned int ui1, \
unsigned int ui2)
}
-declare 41 mac {
+declare 42 mac {
void XSelectInput (Display* d, Window w, long l)
}
-declare 42 mac {
+declare 43 mac {
Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x)
}
-declare 43 mac {
+declare 44 mac {
void XSetIconName (Display* d, Window w, _Xconst char* c)
}
-declare 44 mac {
+declare 45 mac {
void XSetInputFocus (Display* d, Window w, int i, Time t)
}
-declare 45 mac {
+declare 46 mac {
void XSetSelectionOwner (Display* d, Atom a, Window w, Time t)
}
-declare 46 mac {
+declare 47 mac {
void XSetWindowBackground (Display* d, Window w, unsigned long ul)
}
-declare 47 mac {
+declare 48 mac {
void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p)
}
-declare 48 mac {
+declare 49 mac {
void XSetWindowBorder (Display* d, Window w, unsigned long ul)
}
-declare 49 mac {
+declare 50 mac {
void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p)
}
-declare 50 mac {
+declare 51 mac {
void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui)
}
-declare 51 mac {
+declare 52 mac {
void XSetWindowColormap (Display* d, Window w, Colormap c)
}
-declare 52 mac {
+declare 53 mac {
void XUngrabKeyboard (Display* d, Time t)
}
-declare 53 mac {
+declare 54 mac {
void XUngrabPointer (Display* d, Time t)
}
-declare 54 mac {
+declare 55 mac {
void XUnmapWindow (Display* d, Window w)
}
-declare 55 mac {
+declare 56 mac {
void TkPutImage (unsigned long *colors, \
int ncolors, Display* display, Drawable d, \
GC gc, XImage* image, int src_x, int src_y, \
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index 1ffa197..47ba980 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.2 1999/03/10 07:04:41 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.3 1999/03/10 18:56:08 redman Exp $
*/
#ifndef _TKINTXLIBDECLS
@@ -110,163 +110,167 @@ EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1,
unsigned int ui1, unsigned int ui2, int i3,
int i4, unsigned long ul));
/* 25 */
+EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display,
+ Drawable d, _Xconst char* data,
+ unsigned int width, unsigned int height));
+/* 26 */
EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w,
Cursor c));
-/* 26 */
+/* 27 */
EXTERN void XDeleteProperty _ANSI_ARGS_((Display* d, Window w,
Atom a));
-/* 27 */
-EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
/* 28 */
+EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
+/* 29 */
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));
-/* 29 */
+/* 30 */
EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XPoint* x, int i1, int i2));
-/* 30 */
+/* 31 */
EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr,
GC g, int i1, int i2, unsigned int ui1,
unsigned int ui2));
-/* 31 */
+/* 32 */
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));
-/* 32 */
+/* 33 */
EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XPoint* x, int i1, int i2, int i3));
-/* 33 */
+/* 34 */
EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XRectangle* x, int i));
-/* 34 */
-EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* d, int i));
/* 35 */
-EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
+EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* d, int i));
/* 36 */
+EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
+/* 37 */
EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c,
unsigned long* ulp, int i, unsigned long ul));
-/* 37 */
-EXTERN void XFreeCursor _ANSI_ARGS_((Display* d, Cursor c));
/* 38 */
-EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
+EXTERN void XFreeCursor _ANSI_ARGS_((Display* d, Cursor c));
/* 39 */
+EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
+/* 40 */
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));
-/* 40 */
+/* 41 */
EXTERN void XGetInputFocus _ANSI_ARGS_((Display* d, Window* w,
int* i));
-/* 41 */
+/* 42 */
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));
-/* 42 */
+/* 43 */
EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display* d,
Window w, XWindowAttributes* x));
-/* 43 */
+/* 44 */
EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w,
Bool b, int i1, int i2, Time t));
-/* 44 */
+/* 45 */
EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1,
Bool b, unsigned int ui, int i1, int i2,
Window w2, Cursor c, Time t));
-/* 45 */
-EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
/* 46 */
+EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
+/* 47 */
EXTERN Status XLookupColor _ANSI_ARGS_((Display* d, Colormap c1,
_Xconst char* c2, XColor* x1, XColor* x2));
-/* 47 */
-EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w));
/* 48 */
+EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w));
+/* 49 */
EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w,
int i1, int i2, unsigned int ui1,
unsigned int ui2));
-/* 49 */
+/* 50 */
EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w,
int i1, int i2));
-/* 50 */
-EXTERN void XNextEvent _ANSI_ARGS_((Display* d, XEvent* x));
/* 51 */
-EXTERN void XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x));
+EXTERN void XNextEvent _ANSI_ARGS_((Display* d, XEvent* x));
/* 52 */
+EXTERN void XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x));
+/* 53 */
EXTERN void XQueryColors _ANSI_ARGS_((Display* d, Colormap c,
XColor* x, int i));
-/* 53 */
+/* 54 */
EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1,
Window* w2, Window* w3, int* i1, int* i2,
int* i3, int* i4, unsigned int* ui));
-/* 54 */
+/* 55 */
EXTERN Status XQueryTree _ANSI_ARGS_((Display* d, Window w1,
Window* w2, Window* w3, Window** w4,
unsigned int* ui));
-/* 55 */
-EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
/* 56 */
+EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
+/* 57 */
EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((
XMappingEvent* x));
-/* 57 */
+/* 58 */
EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w,
unsigned int ui1, unsigned int ui2));
-/* 58 */
+/* 59 */
EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w,
long l));
-/* 59 */
+/* 60 */
EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b,
long l, XEvent* x));
-/* 60 */
+/* 61 */
EXTERN void XSetCommand _ANSI_ARGS_((Display* d, Window w,
char** c, int i));
-/* 61 */
+/* 62 */
EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w,
_Xconst char* c));
-/* 62 */
+/* 63 */
EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w,
int i, Time t));
-/* 63 */
+/* 64 */
EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a,
Window w, Time t));
-/* 64 */
+/* 65 */
EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d,
Window w, unsigned long ul));
-/* 65 */
+/* 66 */
EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d,
Window w, Pixmap p));
-/* 66 */
+/* 67 */
EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w,
unsigned long ul));
-/* 67 */
+/* 68 */
EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d,
Window w, Pixmap p));
-/* 68 */
+/* 69 */
EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d,
Window w, unsigned int ui));
-/* 69 */
+/* 70 */
EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w,
Colormap c));
-/* 70 */
+/* 71 */
EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display* d,
Window w1, Window w2, int i1, int i2,
int* i3, int* i4, Window* w3));
-/* 71 */
-EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
/* 72 */
-EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
+EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
/* 73 */
-EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
/* 74 */
+EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+/* 75 */
EXTERN void XWindowEvent _ANSI_ARGS_((Display* d, Window w,
long l, XEvent* x));
-/* 75 */
-EXTERN void XDestroyIC _ANSI_ARGS_((XIC x));
/* 76 */
-EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent* x, Window w));
+EXTERN void XDestroyIC _ANSI_ARGS_((XIC x));
/* 77 */
+EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent* x, Window w));
+/* 78 */
EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi,
XKeyPressedEvent* xk, char* c, int i,
KeySym* k, Status* s));
-/* 78 */
+/* 79 */
EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors,
int ncolors, Display* display, Drawable d,
GC gc, XImage* image, int src_x, int src_y,
@@ -330,118 +334,122 @@ EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1,
unsigned int ui1, unsigned int ui2, int i3,
int i4, unsigned long ul));
/* 18 */
+EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display,
+ Drawable d, _Xconst char* data,
+ unsigned int width, unsigned int height));
+/* 19 */
EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w,
Cursor c));
-/* 19 */
-EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
/* 20 */
+EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w));
+/* 21 */
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));
-/* 21 */
+/* 22 */
EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XPoint* x, int i1, int i2));
-/* 22 */
+/* 23 */
EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr,
GC g, int i1, int i2, unsigned int ui1,
unsigned int ui2));
-/* 23 */
+/* 24 */
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));
-/* 24 */
+/* 25 */
EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XPoint* x, int i1, int i2, int i3));
-/* 25 */
+/* 26 */
EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr,
GC g, XRectangle* x, int i));
-/* 26 */
-EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
/* 27 */
+EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c));
+/* 28 */
EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c,
unsigned long* ulp, int i, unsigned long ul));
-/* 28 */
-EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
/* 29 */
+EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x));
+/* 30 */
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));
-/* 30 */
+/* 31 */
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));
-/* 31 */
+/* 32 */
EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w,
Bool b, int i1, int i2, Time t));
-/* 32 */
+/* 33 */
EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1,
Bool b, unsigned int ui, int i1, int i2,
Window w2, Cursor c, Time t));
-/* 33 */
-EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
/* 34 */
-EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k));
/* 35 */
+EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w));
+/* 36 */
EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w,
int i1, int i2, unsigned int ui1,
unsigned int ui2));
-/* 36 */
+/* 37 */
EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w,
int i1, int i2));
-/* 37 */
+/* 38 */
EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1,
Window* w2, Window* w3, int* i1, int* i2,
int* i3, int* i4, unsigned int* ui));
-/* 38 */
-EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
/* 39 */
+EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w));
+/* 40 */
EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((
XMappingEvent* x));
-/* 40 */
+/* 41 */
EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w,
unsigned int ui1, unsigned int ui2));
-/* 41 */
+/* 42 */
EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w,
long l));
-/* 42 */
+/* 43 */
EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b,
long l, XEvent* x));
-/* 43 */
+/* 44 */
EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w,
_Xconst char* c));
-/* 44 */
+/* 45 */
EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w,
int i, Time t));
-/* 45 */
+/* 46 */
EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a,
Window w, Time t));
-/* 46 */
+/* 47 */
EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d,
Window w, unsigned long ul));
-/* 47 */
+/* 48 */
EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d,
Window w, Pixmap p));
-/* 48 */
+/* 49 */
EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w,
unsigned long ul));
-/* 49 */
+/* 50 */
EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d,
Window w, Pixmap p));
-/* 50 */
+/* 51 */
EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d,
Window w, unsigned int ui));
-/* 51 */
+/* 52 */
EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w,
Colormap c));
-/* 52 */
-EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
/* 53 */
-EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
+EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t));
/* 54 */
-EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t));
/* 55 */
+EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w));
+/* 56 */
EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors,
int ncolors, Display* display, Drawable d,
GC gc, XImage* image, int src_x, int src_y,
@@ -479,60 +487,61 @@ typedef struct TkIntXlibStubs {
void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 22 */
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)); /* 23 */
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)); /* 24 */
- void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 25 */
- void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 26 */
- void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 27 */
- void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 28 */
- void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 29 */
- void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 30 */
- void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 31 */
- void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 32 */
- void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 33 */
- void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 34 */
- void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 35 */
- void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 36 */
- void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 37 */
- void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 38 */
- 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)); /* 39 */
- void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 40 */
- 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)); /* 41 */
- Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 42 */
- int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 43 */
- int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 44 */
- KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 45 */
- Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 46 */
- void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 47 */
- void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 48 */
- void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 49 */
- void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 50 */
- void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 51 */
- void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 52 */
- Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 53 */
- Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 54 */
- void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 55 */
- void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 56 */
- void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 57 */
- void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 58 */
- Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 59 */
- void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, char** c, int i)); /* 60 */
- void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 61 */
- void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 62 */
- void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 63 */
- void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 64 */
- void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 65 */
- void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 66 */
- void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 67 */
- void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 68 */
- void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 69 */
- Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 70 */
- void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 71 */
- void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 72 */
- void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 73 */
- void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 74 */
- void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 75 */
- Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 76 */
- int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 77 */
- 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)); /* 78 */
+ Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 25 */
+ void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 26 */
+ void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 27 */
+ void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 28 */
+ void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 29 */
+ void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 30 */
+ void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 31 */
+ void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 32 */
+ void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 33 */
+ void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 34 */
+ void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 35 */
+ void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 36 */
+ void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 37 */
+ void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 38 */
+ void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 39 */
+ 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)); /* 40 */
+ void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 41 */
+ 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)); /* 42 */
+ Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 43 */
+ int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 44 */
+ int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 45 */
+ KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 46 */
+ Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 47 */
+ void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 48 */
+ void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 49 */
+ void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 50 */
+ void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 51 */
+ void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */
+ void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 53 */
+ Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 54 */
+ Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 55 */
+ void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */
+ void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 57 */
+ void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 58 */
+ void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 59 */
+ Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 60 */
+ void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, char** c, int i)); /* 61 */
+ void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 62 */
+ void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 63 */
+ void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 64 */
+ void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 65 */
+ void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 66 */
+ void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 67 */
+ void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 68 */
+ void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 69 */
+ void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 70 */
+ Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 71 */
+ void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 72 */
+ void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 73 */
+ void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 74 */
+ void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 75 */
+ void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 76 */
+ Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 77 */
+ int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 78 */
+ 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)); /* 79 */
#endif /* __WIN32__ */
#ifdef MAC_TCL
XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 0 */
@@ -553,44 +562,45 @@ typedef struct TkIntXlibStubs {
void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 15 */
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)); /* 16 */
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)); /* 17 */
- void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 18 */
- void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 19 */
- void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 20 */
- void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 21 */
- void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 22 */
- void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */
- void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 24 */
- void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 25 */
- void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 26 */
- void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 27 */
- void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 28 */
- 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)); /* 29 */
- 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)); /* 30 */
- int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 31 */
- int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 32 */
- KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 33 */
- void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 34 */
- void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 35 */
- void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 36 */
- Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 37 */
- void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 38 */
- void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 39 */
- void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 40 */
- void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 41 */
- Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 42 */
- void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 43 */
- void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 44 */
- void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 45 */
- void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 46 */
- void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 47 */
- void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */
- void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */
- void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 50 */
- void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 51 */
- void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 52 */
- void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 53 */
- void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 54 */
- 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)); /* 55 */
+ Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 18 */
+ void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 19 */
+ void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 20 */
+ void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 21 */
+ void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 22 */
+ void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 23 */
+ void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */
+ void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 25 */
+ void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 26 */
+ void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 27 */
+ void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 28 */
+ void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 29 */
+ 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)); /* 30 */
+ 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)); /* 31 */
+ int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 32 */
+ int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 33 */
+ KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 34 */
+ void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 35 */
+ void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 36 */
+ void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 37 */
+ Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 38 */
+ void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 39 */
+ void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 40 */
+ void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 41 */
+ void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 42 */
+ Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 43 */
+ void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 44 */
+ void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 45 */
+ void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 46 */
+ void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 47 */
+ void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 48 */
+ void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 49 */
+ void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 50 */
+ void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 51 */
+ void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 52 */
+ void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 53 */
+ void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 54 */
+ void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 55 */
+ 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)); /* 56 */
#endif /* MAC_TCL */
} TkIntXlibStubs;
@@ -703,221 +713,225 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
#define XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) \
(tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 24 */
#endif
+#ifndef XCreateBitmapFromData
+#define XCreateBitmapFromData(display, d, data, width, height) \
+ (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 25 */
+#endif
#ifndef XDefineCursor
#define XDefineCursor(d, w, c) \
- (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 25 */
+ (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 26 */
#endif
#ifndef XDeleteProperty
#define XDeleteProperty(d, w, a) \
- (tkIntXlibStubsPtr->xDeleteProperty)(d, w, a) /* 26 */
+ (tkIntXlibStubsPtr->xDeleteProperty)(d, w, a) /* 27 */
#endif
#ifndef XDestroyWindow
#define XDestroyWindow(d, w) \
- (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 27 */
+ (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 28 */
#endif
#ifndef XDrawArc
#define XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
- (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 28 */
+ (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 29 */
#endif
#ifndef XDrawLines
#define XDrawLines(d, dr, g, x, i1, i2) \
- (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 29 */
+ (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 30 */
#endif
#ifndef XDrawRectangle
#define XDrawRectangle(d, dr, g, i1, i2, ui1, ui2) \
- (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 30 */
+ (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 31 */
#endif
#ifndef XFillArc
#define XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
- (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 31 */
+ (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 32 */
#endif
#ifndef XFillPolygon
#define XFillPolygon(d, dr, g, x, i1, i2, i3) \
- (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 32 */
+ (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 33 */
#endif
#ifndef XFillRectangles
#define XFillRectangles(d, dr, g, x, i) \
- (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 33 */
+ (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 34 */
#endif
#ifndef XForceScreenSaver
#define XForceScreenSaver(d, i) \
- (tkIntXlibStubsPtr->xForceScreenSaver)(d, i) /* 34 */
+ (tkIntXlibStubsPtr->xForceScreenSaver)(d, i) /* 35 */
#endif
#ifndef XFreeColormap
#define XFreeColormap(d, c) \
- (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 35 */
+ (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 36 */
#endif
#ifndef XFreeColors
#define XFreeColors(d, c, ulp, i, ul) \
- (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 36 */
+ (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 37 */
#endif
#ifndef XFreeCursor
#define XFreeCursor(d, c) \
- (tkIntXlibStubsPtr->xFreeCursor)(d, c) /* 37 */
+ (tkIntXlibStubsPtr->xFreeCursor)(d, c) /* 38 */
#endif
#ifndef XFreeModifiermap
#define XFreeModifiermap(x) \
- (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 38 */
+ (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 39 */
#endif
#ifndef XGetGeometry
#define XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) \
- (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 39 */
+ (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 40 */
#endif
#ifndef XGetInputFocus
#define XGetInputFocus(d, w, i) \
- (tkIntXlibStubsPtr->xGetInputFocus)(d, w, i) /* 40 */
+ (tkIntXlibStubsPtr->xGetInputFocus)(d, w, i) /* 41 */
#endif
#ifndef XGetWindowProperty
#define XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) \
- (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 41 */
+ (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 42 */
#endif
#ifndef XGetWindowAttributes
#define XGetWindowAttributes(d, w, x) \
- (tkIntXlibStubsPtr->xGetWindowAttributes)(d, w, x) /* 42 */
+ (tkIntXlibStubsPtr->xGetWindowAttributes)(d, w, x) /* 43 */
#endif
#ifndef XGrabKeyboard
#define XGrabKeyboard(d, w, b, i1, i2, t) \
- (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 43 */
+ (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 44 */
#endif
#ifndef XGrabPointer
#define XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t) \
- (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 44 */
+ (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 45 */
#endif
#ifndef XKeysymToKeycode
#define XKeysymToKeycode(d, k) \
- (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 45 */
+ (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 46 */
#endif
#ifndef XLookupColor
#define XLookupColor(d, c1, c2, x1, x2) \
- (tkIntXlibStubsPtr->xLookupColor)(d, c1, c2, x1, x2) /* 46 */
+ (tkIntXlibStubsPtr->xLookupColor)(d, c1, c2, x1, x2) /* 47 */
#endif
#ifndef XMapWindow
#define XMapWindow(d, w) \
- (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 47 */
+ (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 48 */
#endif
#ifndef XMoveResizeWindow
#define XMoveResizeWindow(d, w, i1, i2, ui1, ui2) \
- (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 48 */
+ (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 49 */
#endif
#ifndef XMoveWindow
#define XMoveWindow(d, w, i1, i2) \
- (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 49 */
+ (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 50 */
#endif
#ifndef XNextEvent
#define XNextEvent(d, x) \
- (tkIntXlibStubsPtr->xNextEvent)(d, x) /* 50 */
+ (tkIntXlibStubsPtr->xNextEvent)(d, x) /* 51 */
#endif
#ifndef XPutBackEvent
#define XPutBackEvent(d, x) \
- (tkIntXlibStubsPtr->xPutBackEvent)(d, x) /* 51 */
+ (tkIntXlibStubsPtr->xPutBackEvent)(d, x) /* 52 */
#endif
#ifndef XQueryColors
#define XQueryColors(d, c, x, i) \
- (tkIntXlibStubsPtr->xQueryColors)(d, c, x, i) /* 52 */
+ (tkIntXlibStubsPtr->xQueryColors)(d, c, x, i) /* 53 */
#endif
#ifndef XQueryPointer
#define XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui) \
- (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 53 */
+ (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 54 */
#endif
#ifndef XQueryTree
#define XQueryTree(d, w1, w2, w3, w4, ui) \
- (tkIntXlibStubsPtr->xQueryTree)(d, w1, w2, w3, w4, ui) /* 54 */
+ (tkIntXlibStubsPtr->xQueryTree)(d, w1, w2, w3, w4, ui) /* 55 */
#endif
#ifndef XRaiseWindow
#define XRaiseWindow(d, w) \
- (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 55 */
+ (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 56 */
#endif
#ifndef XRefreshKeyboardMapping
#define XRefreshKeyboardMapping(x) \
- (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 56 */
+ (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 57 */
#endif
#ifndef XResizeWindow
#define XResizeWindow(d, w, ui1, ui2) \
- (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 57 */
+ (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 58 */
#endif
#ifndef XSelectInput
#define XSelectInput(d, w, l) \
- (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 58 */
+ (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 59 */
#endif
#ifndef XSendEvent
#define XSendEvent(d, w, b, l, x) \
- (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 59 */
+ (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 60 */
#endif
#ifndef XSetCommand
#define XSetCommand(d, w, c, i) \
- (tkIntXlibStubsPtr->xSetCommand)(d, w, c, i) /* 60 */
+ (tkIntXlibStubsPtr->xSetCommand)(d, w, c, i) /* 61 */
#endif
#ifndef XSetIconName
#define XSetIconName(d, w, c) \
- (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 61 */
+ (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 62 */
#endif
#ifndef XSetInputFocus
#define XSetInputFocus(d, w, i, t) \
- (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 62 */
+ (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 63 */
#endif
#ifndef XSetSelectionOwner
#define XSetSelectionOwner(d, a, w, t) \
- (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 63 */
+ (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 64 */
#endif
#ifndef XSetWindowBackground
#define XSetWindowBackground(d, w, ul) \
- (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 64 */
+ (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 65 */
#endif
#ifndef XSetWindowBackgroundPixmap
#define XSetWindowBackgroundPixmap(d, w, p) \
- (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 65 */
+ (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 66 */
#endif
#ifndef XSetWindowBorder
#define XSetWindowBorder(d, w, ul) \
- (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 66 */
+ (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 67 */
#endif
#ifndef XSetWindowBorderPixmap
#define XSetWindowBorderPixmap(d, w, p) \
- (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 67 */
+ (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 68 */
#endif
#ifndef XSetWindowBorderWidth
#define XSetWindowBorderWidth(d, w, ui) \
- (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 68 */
+ (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 69 */
#endif
#ifndef XSetWindowColormap
#define XSetWindowColormap(d, w, c) \
- (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 69 */
+ (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 70 */
#endif
#ifndef XTranslateCoordinates
#define XTranslateCoordinates(d, w1, w2, i1, i2, i3, i4, w3) \
- (tkIntXlibStubsPtr->xTranslateCoordinates)(d, w1, w2, i1, i2, i3, i4, w3) /* 70 */
+ (tkIntXlibStubsPtr->xTranslateCoordinates)(d, w1, w2, i1, i2, i3, i4, w3) /* 71 */
#endif
#ifndef XUngrabKeyboard
#define XUngrabKeyboard(d, t) \
- (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 71 */
+ (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 72 */
#endif
#ifndef XUngrabPointer
#define XUngrabPointer(d, t) \
- (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 72 */
+ (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 73 */
#endif
#ifndef XUnmapWindow
#define XUnmapWindow(d, w) \
- (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 73 */
+ (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 74 */
#endif
#ifndef XWindowEvent
#define XWindowEvent(d, w, l, x) \
- (tkIntXlibStubsPtr->xWindowEvent)(d, w, l, x) /* 74 */
+ (tkIntXlibStubsPtr->xWindowEvent)(d, w, l, x) /* 75 */
#endif
#ifndef XDestroyIC
#define XDestroyIC(x) \
- (tkIntXlibStubsPtr->xDestroyIC)(x) /* 75 */
+ (tkIntXlibStubsPtr->xDestroyIC)(x) /* 76 */
#endif
#ifndef XFilterEvent
#define XFilterEvent(x, w) \
- (tkIntXlibStubsPtr->xFilterEvent)(x, w) /* 76 */
+ (tkIntXlibStubsPtr->xFilterEvent)(x, w) /* 77 */
#endif
#ifndef XmbLookupString
#define XmbLookupString(xi, xk, c, i, k, s) \
- (tkIntXlibStubsPtr->xmbLookupString)(xi, xk, c, i, k, s) /* 77 */
+ (tkIntXlibStubsPtr->xmbLookupString)(xi, xk, c, i, k, s) /* 78 */
#endif
#ifndef TkPutImage
#define TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) \
- (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 78 */
+ (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 79 */
#endif
#endif /* __WIN32__ */
#ifdef MAC_TCL
@@ -993,157 +1007,161 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
#define XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) \
(tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 17 */
#endif
+#ifndef XCreateBitmapFromData
+#define XCreateBitmapFromData(display, d, data, width, height) \
+ (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 18 */
+#endif
#ifndef XDefineCursor
#define XDefineCursor(d, w, c) \
- (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 18 */
+ (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 19 */
#endif
#ifndef XDestroyWindow
#define XDestroyWindow(d, w) \
- (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 19 */
+ (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 20 */
#endif
#ifndef XDrawArc
#define XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
- (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 20 */
+ (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 21 */
#endif
#ifndef XDrawLines
#define XDrawLines(d, dr, g, x, i1, i2) \
- (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 21 */
+ (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 22 */
#endif
#ifndef XDrawRectangle
#define XDrawRectangle(d, dr, g, i1, i2, ui1, ui2) \
- (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 22 */
+ (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 23 */
#endif
#ifndef XFillArc
#define XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \
- (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 23 */
+ (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 24 */
#endif
#ifndef XFillPolygon
#define XFillPolygon(d, dr, g, x, i1, i2, i3) \
- (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 24 */
+ (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 25 */
#endif
#ifndef XFillRectangles
#define XFillRectangles(d, dr, g, x, i) \
- (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 25 */
+ (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 26 */
#endif
#ifndef XFreeColormap
#define XFreeColormap(d, c) \
- (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 26 */
+ (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 27 */
#endif
#ifndef XFreeColors
#define XFreeColors(d, c, ulp, i, ul) \
- (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 27 */
+ (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 28 */
#endif
#ifndef XFreeModifiermap
#define XFreeModifiermap(x) \
- (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 28 */
+ (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 29 */
#endif
#ifndef XGetGeometry
#define XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) \
- (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 29 */
+ (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 30 */
#endif
#ifndef XGetWindowProperty
#define XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) \
- (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 30 */
+ (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 31 */
#endif
#ifndef XGrabKeyboard
#define XGrabKeyboard(d, w, b, i1, i2, t) \
- (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 31 */
+ (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 32 */
#endif
#ifndef XGrabPointer
#define XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t) \
- (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 32 */
+ (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 33 */
#endif
#ifndef XKeysymToKeycode
#define XKeysymToKeycode(d, k) \
- (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 33 */
+ (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 34 */
#endif
#ifndef XMapWindow
#define XMapWindow(d, w) \
- (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 34 */
+ (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 35 */
#endif
#ifndef XMoveResizeWindow
#define XMoveResizeWindow(d, w, i1, i2, ui1, ui2) \
- (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 35 */
+ (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 36 */
#endif
#ifndef XMoveWindow
#define XMoveWindow(d, w, i1, i2) \
- (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 36 */
+ (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 37 */
#endif
#ifndef XQueryPointer
#define XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui) \
- (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 37 */
+ (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 38 */
#endif
#ifndef XRaiseWindow
#define XRaiseWindow(d, w) \
- (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 38 */
+ (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 39 */
#endif
#ifndef XRefreshKeyboardMapping
#define XRefreshKeyboardMapping(x) \
- (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 39 */
+ (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 40 */
#endif
#ifndef XResizeWindow
#define XResizeWindow(d, w, ui1, ui2) \
- (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 40 */
+ (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 41 */
#endif
#ifndef XSelectInput
#define XSelectInput(d, w, l) \
- (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 41 */
+ (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 42 */
#endif
#ifndef XSendEvent
#define XSendEvent(d, w, b, l, x) \
- (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 42 */
+ (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 43 */
#endif
#ifndef XSetIconName
#define XSetIconName(d, w, c) \
- (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 43 */
+ (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 44 */
#endif
#ifndef XSetInputFocus
#define XSetInputFocus(d, w, i, t) \
- (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 44 */
+ (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 45 */
#endif
#ifndef XSetSelectionOwner
#define XSetSelectionOwner(d, a, w, t) \
- (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 45 */
+ (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 46 */
#endif
#ifndef XSetWindowBackground
#define XSetWindowBackground(d, w, ul) \
- (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 46 */
+ (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 47 */
#endif
#ifndef XSetWindowBackgroundPixmap
#define XSetWindowBackgroundPixmap(d, w, p) \
- (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 47 */
+ (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 48 */
#endif
#ifndef XSetWindowBorder
#define XSetWindowBorder(d, w, ul) \
- (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 48 */
+ (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 49 */
#endif
#ifndef XSetWindowBorderPixmap
#define XSetWindowBorderPixmap(d, w, p) \
- (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 49 */
+ (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 50 */
#endif
#ifndef XSetWindowBorderWidth
#define XSetWindowBorderWidth(d, w, ui) \
- (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 50 */
+ (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 51 */
#endif
#ifndef XSetWindowColormap
#define XSetWindowColormap(d, w, c) \
- (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 51 */
+ (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 52 */
#endif
#ifndef XUngrabKeyboard
#define XUngrabKeyboard(d, t) \
- (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 52 */
+ (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 53 */
#endif
#ifndef XUngrabPointer
#define XUngrabPointer(d, t) \
- (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 53 */
+ (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 54 */
#endif
#ifndef XUnmapWindow
#define XUnmapWindow(d, w) \
- (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 54 */
+ (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 55 */
#endif
#ifndef TkPutImage
#define TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) \
- (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 55 */
+ (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 56 */
#endif
#endif /* MAC_TCL */
diff --git a/generic/tkIntXlibStubs.c b/generic/tkIntXlibStubs.c
index cbcec19..5cd6c54 100644
--- a/generic/tkIntXlibStubs.c
+++ b/generic/tkIntXlibStubs.c
@@ -7,7 +7,7 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tkIntXlibStubs.c,v 1.2 1999/03/10 07:04:42 stanton Exp $
+ * RCS: @(#) $Id: tkIntXlibStubs.c,v 1.3 1999/03/10 18:56:08 redman Exp $
*/
#include "tkInt.h"
@@ -307,6 +307,18 @@ XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul)
}
/* Slot 25 */
+Pixmap
+XCreateBitmapFromData(display, d, data, width, height)
+ Display* display;
+ Drawable d;
+ _Xconst char* data;
+ unsigned int width;
+ unsigned int height;
+{
+ return (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height);
+}
+
+/* Slot 26 */
void
XDefineCursor(d, w, c)
Display* d;
@@ -316,7 +328,7 @@ XDefineCursor(d, w, c)
(tkIntXlibStubsPtr->xDefineCursor)(d, w, c);
}
-/* Slot 26 */
+/* Slot 27 */
void
XDeleteProperty(d, w, a)
Display* d;
@@ -326,7 +338,7 @@ XDeleteProperty(d, w, a)
(tkIntXlibStubsPtr->xDeleteProperty)(d, w, a);
}
-/* Slot 27 */
+/* Slot 28 */
void
XDestroyWindow(d, w)
Display* d;
@@ -335,7 +347,7 @@ XDestroyWindow(d, w)
(tkIntXlibStubsPtr->xDestroyWindow)(d, w);
}
-/* Slot 28 */
+/* Slot 29 */
void
XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
Display* d;
@@ -351,7 +363,7 @@ XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
(tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
}
-/* Slot 29 */
+/* Slot 30 */
void
XDrawLines(d, dr, g, x, i1, i2)
Display* d;
@@ -364,7 +376,7 @@ XDrawLines(d, dr, g, x, i1, i2)
(tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2);
}
-/* Slot 30 */
+/* Slot 31 */
void
XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
Display* d;
@@ -378,7 +390,7 @@ XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
(tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2);
}
-/* Slot 31 */
+/* Slot 32 */
void
XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
Display* d;
@@ -394,7 +406,7 @@ XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
(tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
}
-/* Slot 32 */
+/* Slot 33 */
void
XFillPolygon(d, dr, g, x, i1, i2, i3)
Display* d;
@@ -408,7 +420,7 @@ XFillPolygon(d, dr, g, x, i1, i2, i3)
(tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3);
}
-/* Slot 33 */
+/* Slot 34 */
void
XFillRectangles(d, dr, g, x, i)
Display* d;
@@ -420,7 +432,7 @@ XFillRectangles(d, dr, g, x, i)
(tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i);
}
-/* Slot 34 */
+/* Slot 35 */
void
XForceScreenSaver(d, i)
Display* d;
@@ -429,7 +441,7 @@ XForceScreenSaver(d, i)
(tkIntXlibStubsPtr->xForceScreenSaver)(d, i);
}
-/* Slot 35 */
+/* Slot 36 */
void
XFreeColormap(d, c)
Display* d;
@@ -438,7 +450,7 @@ XFreeColormap(d, c)
(tkIntXlibStubsPtr->xFreeColormap)(d, c);
}
-/* Slot 36 */
+/* Slot 37 */
void
XFreeColors(d, c, ulp, i, ul)
Display* d;
@@ -450,7 +462,7 @@ XFreeColors(d, c, ulp, i, ul)
(tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul);
}
-/* Slot 37 */
+/* Slot 38 */
void
XFreeCursor(d, c)
Display* d;
@@ -459,7 +471,7 @@ XFreeCursor(d, c)
(tkIntXlibStubsPtr->xFreeCursor)(d, c);
}
-/* Slot 38 */
+/* Slot 39 */
void
XFreeModifiermap(x)
XModifierKeymap* x;
@@ -467,7 +479,7 @@ XFreeModifiermap(x)
(tkIntXlibStubsPtr->xFreeModifiermap)(x);
}
-/* Slot 39 */
+/* Slot 40 */
Status
XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
Display* d;
@@ -483,7 +495,7 @@ XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
return (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4);
}
-/* Slot 40 */
+/* Slot 41 */
void
XGetInputFocus(d, w, i)
Display* d;
@@ -493,7 +505,7 @@ XGetInputFocus(d, w, i)
(tkIntXlibStubsPtr->xGetInputFocus)(d, w, i);
}
-/* Slot 41 */
+/* Slot 42 */
int
XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
Display* d;
@@ -512,7 +524,7 @@ XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
return (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp);
}
-/* Slot 42 */
+/* Slot 43 */
Status
XGetWindowAttributes(d, w, x)
Display* d;
@@ -522,7 +534,7 @@ XGetWindowAttributes(d, w, x)
return (tkIntXlibStubsPtr->xGetWindowAttributes)(d, w, x);
}
-/* Slot 43 */
+/* Slot 44 */
int
XGrabKeyboard(d, w, b, i1, i2, t)
Display* d;
@@ -535,7 +547,7 @@ XGrabKeyboard(d, w, b, i1, i2, t)
return (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t);
}
-/* Slot 44 */
+/* Slot 45 */
int
XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
Display* d;
@@ -551,7 +563,7 @@ XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
return (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t);
}
-/* Slot 45 */
+/* Slot 46 */
KeyCode
XKeysymToKeycode(d, k)
Display* d;
@@ -560,7 +572,7 @@ XKeysymToKeycode(d, k)
return (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k);
}
-/* Slot 46 */
+/* Slot 47 */
Status
XLookupColor(d, c1, c2, x1, x2)
Display* d;
@@ -572,7 +584,7 @@ XLookupColor(d, c1, c2, x1, x2)
return (tkIntXlibStubsPtr->xLookupColor)(d, c1, c2, x1, x2);
}
-/* Slot 47 */
+/* Slot 48 */
void
XMapWindow(d, w)
Display* d;
@@ -581,7 +593,7 @@ XMapWindow(d, w)
(tkIntXlibStubsPtr->xMapWindow)(d, w);
}
-/* Slot 48 */
+/* Slot 49 */
void
XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
Display* d;
@@ -594,7 +606,7 @@ XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
(tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2);
}
-/* Slot 49 */
+/* Slot 50 */
void
XMoveWindow(d, w, i1, i2)
Display* d;
@@ -605,7 +617,7 @@ XMoveWindow(d, w, i1, i2)
(tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2);
}
-/* Slot 50 */
+/* Slot 51 */
void
XNextEvent(d, x)
Display* d;
@@ -614,7 +626,7 @@ XNextEvent(d, x)
(tkIntXlibStubsPtr->xNextEvent)(d, x);
}
-/* Slot 51 */
+/* Slot 52 */
void
XPutBackEvent(d, x)
Display* d;
@@ -623,7 +635,7 @@ XPutBackEvent(d, x)
(tkIntXlibStubsPtr->xPutBackEvent)(d, x);
}
-/* Slot 52 */
+/* Slot 53 */
void
XQueryColors(d, c, x, i)
Display* d;
@@ -634,7 +646,7 @@ XQueryColors(d, c, x, i)
(tkIntXlibStubsPtr->xQueryColors)(d, c, x, i);
}
-/* Slot 53 */
+/* Slot 54 */
Bool
XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
Display* d;
@@ -650,7 +662,7 @@ XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
return (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui);
}
-/* Slot 54 */
+/* Slot 55 */
Status
XQueryTree(d, w1, w2, w3, w4, ui)
Display* d;
@@ -663,7 +675,7 @@ XQueryTree(d, w1, w2, w3, w4, ui)
return (tkIntXlibStubsPtr->xQueryTree)(d, w1, w2, w3, w4, ui);
}
-/* Slot 55 */
+/* Slot 56 */
void
XRaiseWindow(d, w)
Display* d;
@@ -672,7 +684,7 @@ XRaiseWindow(d, w)
(tkIntXlibStubsPtr->xRaiseWindow)(d, w);
}
-/* Slot 56 */
+/* Slot 57 */
void
XRefreshKeyboardMapping(x)
XMappingEvent* x;
@@ -680,7 +692,7 @@ XRefreshKeyboardMapping(x)
(tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x);
}
-/* Slot 57 */
+/* Slot 58 */
void
XResizeWindow(d, w, ui1, ui2)
Display* d;
@@ -691,7 +703,7 @@ XResizeWindow(d, w, ui1, ui2)
(tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2);
}
-/* Slot 58 */
+/* Slot 59 */
void
XSelectInput(d, w, l)
Display* d;
@@ -701,7 +713,7 @@ XSelectInput(d, w, l)
(tkIntXlibStubsPtr->xSelectInput)(d, w, l);
}
-/* Slot 59 */
+/* Slot 60 */
Status
XSendEvent(d, w, b, l, x)
Display* d;
@@ -713,7 +725,7 @@ XSendEvent(d, w, b, l, x)
return (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x);
}
-/* Slot 60 */
+/* Slot 61 */
void
XSetCommand(d, w, c, i)
Display* d;
@@ -724,7 +736,7 @@ XSetCommand(d, w, c, i)
(tkIntXlibStubsPtr->xSetCommand)(d, w, c, i);
}
-/* Slot 61 */
+/* Slot 62 */
void
XSetIconName(d, w, c)
Display* d;
@@ -734,7 +746,7 @@ XSetIconName(d, w, c)
(tkIntXlibStubsPtr->xSetIconName)(d, w, c);
}
-/* Slot 62 */
+/* Slot 63 */
void
XSetInputFocus(d, w, i, t)
Display* d;
@@ -745,7 +757,7 @@ XSetInputFocus(d, w, i, t)
(tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t);
}
-/* Slot 63 */
+/* Slot 64 */
void
XSetSelectionOwner(d, a, w, t)
Display* d;
@@ -756,7 +768,7 @@ XSetSelectionOwner(d, a, w, t)
(tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t);
}
-/* Slot 64 */
+/* Slot 65 */
void
XSetWindowBackground(d, w, ul)
Display* d;
@@ -766,7 +778,7 @@ XSetWindowBackground(d, w, ul)
(tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul);
}
-/* Slot 65 */
+/* Slot 66 */
void
XSetWindowBackgroundPixmap(d, w, p)
Display* d;
@@ -776,7 +788,7 @@ XSetWindowBackgroundPixmap(d, w, p)
(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p);
}
-/* Slot 66 */
+/* Slot 67 */
void
XSetWindowBorder(d, w, ul)
Display* d;
@@ -786,7 +798,7 @@ XSetWindowBorder(d, w, ul)
(tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul);
}
-/* Slot 67 */
+/* Slot 68 */
void
XSetWindowBorderPixmap(d, w, p)
Display* d;
@@ -796,7 +808,7 @@ XSetWindowBorderPixmap(d, w, p)
(tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p);
}
-/* Slot 68 */
+/* Slot 69 */
void
XSetWindowBorderWidth(d, w, ui)
Display* d;
@@ -806,7 +818,7 @@ XSetWindowBorderWidth(d, w, ui)
(tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui);
}
-/* Slot 69 */
+/* Slot 70 */
void
XSetWindowColormap(d, w, c)
Display* d;
@@ -816,7 +828,7 @@ XSetWindowColormap(d, w, c)
(tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c);
}
-/* Slot 70 */
+/* Slot 71 */
Bool
XTranslateCoordinates(d, w1, w2, i1, i2, i3, i4, w3)
Display* d;
@@ -831,7 +843,7 @@ XTranslateCoordinates(d, w1, w2, i1, i2, i3, i4, w3)
return (tkIntXlibStubsPtr->xTranslateCoordinates)(d, w1, w2, i1, i2, i3, i4, w3);
}
-/* Slot 71 */
+/* Slot 72 */
void
XUngrabKeyboard(d, t)
Display* d;
@@ -840,7 +852,7 @@ XUngrabKeyboard(d, t)
(tkIntXlibStubsPtr->xUngrabKeyboard)(d, t);
}
-/* Slot 72 */
+/* Slot 73 */
void
XUngrabPointer(d, t)
Display* d;
@@ -849,7 +861,7 @@ XUngrabPointer(d, t)
(tkIntXlibStubsPtr->xUngrabPointer)(d, t);
}
-/* Slot 73 */
+/* Slot 74 */
void
XUnmapWindow(d, w)
Display* d;
@@ -858,7 +870,7 @@ XUnmapWindow(d, w)
(tkIntXlibStubsPtr->xUnmapWindow)(d, w);
}
-/* Slot 74 */
+/* Slot 75 */
void
XWindowEvent(d, w, l, x)
Display* d;
@@ -869,7 +881,7 @@ XWindowEvent(d, w, l, x)
(tkIntXlibStubsPtr->xWindowEvent)(d, w, l, x);
}
-/* Slot 75 */
+/* Slot 76 */
void
XDestroyIC(x)
XIC x;
@@ -877,7 +889,7 @@ XDestroyIC(x)
(tkIntXlibStubsPtr->xDestroyIC)(x);
}
-/* Slot 76 */
+/* Slot 77 */
Bool
XFilterEvent(x, w)
XEvent* x;
@@ -886,7 +898,7 @@ XFilterEvent(x, w)
return (tkIntXlibStubsPtr->xFilterEvent)(x, w);
}
-/* Slot 77 */
+/* Slot 78 */
int
XmbLookupString(xi, xk, c, i, k, s)
XIC xi;
@@ -899,7 +911,7 @@ XmbLookupString(xi, xk, c, i, k, s)
return (tkIntXlibStubsPtr->xmbLookupString)(xi, xk, c, i, k, s);
}
-/* Slot 78 */
+/* Slot 79 */
void
TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height)
unsigned long * colors;
@@ -1123,6 +1135,18 @@ XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul)
}
/* Slot 18 */
+Pixmap
+XCreateBitmapFromData(display, d, data, width, height)
+ Display* display;
+ Drawable d;
+ _Xconst char* data;
+ unsigned int width;
+ unsigned int height;
+{
+ return (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height);
+}
+
+/* Slot 19 */
void
XDefineCursor(d, w, c)
Display* d;
@@ -1132,7 +1156,7 @@ XDefineCursor(d, w, c)
(tkIntXlibStubsPtr->xDefineCursor)(d, w, c);
}
-/* Slot 19 */
+/* Slot 20 */
void
XDestroyWindow(d, w)
Display* d;
@@ -1141,7 +1165,7 @@ XDestroyWindow(d, w)
(tkIntXlibStubsPtr->xDestroyWindow)(d, w);
}
-/* Slot 20 */
+/* Slot 21 */
void
XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
Display* d;
@@ -1157,7 +1181,7 @@ XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
(tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
}
-/* Slot 21 */
+/* Slot 22 */
void
XDrawLines(d, dr, g, x, i1, i2)
Display* d;
@@ -1170,7 +1194,7 @@ XDrawLines(d, dr, g, x, i1, i2)
(tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2);
}
-/* Slot 22 */
+/* Slot 23 */
void
XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
Display* d;
@@ -1184,7 +1208,7 @@ XDrawRectangle(d, dr, g, i1, i2, ui1, ui2)
(tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2);
}
-/* Slot 23 */
+/* Slot 24 */
void
XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
Display* d;
@@ -1200,7 +1224,7 @@ XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4)
(tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4);
}
-/* Slot 24 */
+/* Slot 25 */
void
XFillPolygon(d, dr, g, x, i1, i2, i3)
Display* d;
@@ -1214,7 +1238,7 @@ XFillPolygon(d, dr, g, x, i1, i2, i3)
(tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3);
}
-/* Slot 25 */
+/* Slot 26 */
void
XFillRectangles(d, dr, g, x, i)
Display* d;
@@ -1226,7 +1250,7 @@ XFillRectangles(d, dr, g, x, i)
(tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i);
}
-/* Slot 26 */
+/* Slot 27 */
void
XFreeColormap(d, c)
Display* d;
@@ -1235,7 +1259,7 @@ XFreeColormap(d, c)
(tkIntXlibStubsPtr->xFreeColormap)(d, c);
}
-/* Slot 27 */
+/* Slot 28 */
void
XFreeColors(d, c, ulp, i, ul)
Display* d;
@@ -1247,7 +1271,7 @@ XFreeColors(d, c, ulp, i, ul)
(tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul);
}
-/* Slot 28 */
+/* Slot 29 */
void
XFreeModifiermap(x)
XModifierKeymap* x;
@@ -1255,7 +1279,7 @@ XFreeModifiermap(x)
(tkIntXlibStubsPtr->xFreeModifiermap)(x);
}
-/* Slot 29 */
+/* Slot 30 */
Status
XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
Display* d;
@@ -1271,7 +1295,7 @@ XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4)
return (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4);
}
-/* Slot 30 */
+/* Slot 31 */
int
XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
Display* d;
@@ -1290,7 +1314,7 @@ XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp)
return (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp);
}
-/* Slot 31 */
+/* Slot 32 */
int
XGrabKeyboard(d, w, b, i1, i2, t)
Display* d;
@@ -1303,7 +1327,7 @@ XGrabKeyboard(d, w, b, i1, i2, t)
return (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t);
}
-/* Slot 32 */
+/* Slot 33 */
int
XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
Display* d;
@@ -1319,7 +1343,7 @@ XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t)
return (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t);
}
-/* Slot 33 */
+/* Slot 34 */
KeyCode
XKeysymToKeycode(d, k)
Display* d;
@@ -1328,7 +1352,7 @@ XKeysymToKeycode(d, k)
return (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k);
}
-/* Slot 34 */
+/* Slot 35 */
void
XMapWindow(d, w)
Display* d;
@@ -1337,7 +1361,7 @@ XMapWindow(d, w)
(tkIntXlibStubsPtr->xMapWindow)(d, w);
}
-/* Slot 35 */
+/* Slot 36 */
void
XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
Display* d;
@@ -1350,7 +1374,7 @@ XMoveResizeWindow(d, w, i1, i2, ui1, ui2)
(tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2);
}
-/* Slot 36 */
+/* Slot 37 */
void
XMoveWindow(d, w, i1, i2)
Display* d;
@@ -1361,7 +1385,7 @@ XMoveWindow(d, w, i1, i2)
(tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2);
}
-/* Slot 37 */
+/* Slot 38 */
Bool
XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
Display* d;
@@ -1377,7 +1401,7 @@ XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui)
return (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui);
}
-/* Slot 38 */
+/* Slot 39 */
void
XRaiseWindow(d, w)
Display* d;
@@ -1386,7 +1410,7 @@ XRaiseWindow(d, w)
(tkIntXlibStubsPtr->xRaiseWindow)(d, w);
}
-/* Slot 39 */
+/* Slot 40 */
void
XRefreshKeyboardMapping(x)
XMappingEvent* x;
@@ -1394,7 +1418,7 @@ XRefreshKeyboardMapping(x)
(tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x);
}
-/* Slot 40 */
+/* Slot 41 */
void
XResizeWindow(d, w, ui1, ui2)
Display* d;
@@ -1405,7 +1429,7 @@ XResizeWindow(d, w, ui1, ui2)
(tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2);
}
-/* Slot 41 */
+/* Slot 42 */
void
XSelectInput(d, w, l)
Display* d;
@@ -1415,7 +1439,7 @@ XSelectInput(d, w, l)
(tkIntXlibStubsPtr->xSelectInput)(d, w, l);
}
-/* Slot 42 */
+/* Slot 43 */
Status
XSendEvent(d, w, b, l, x)
Display* d;
@@ -1427,7 +1451,7 @@ XSendEvent(d, w, b, l, x)
return (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x);
}
-/* Slot 43 */
+/* Slot 44 */
void
XSetIconName(d, w, c)
Display* d;
@@ -1437,7 +1461,7 @@ XSetIconName(d, w, c)
(tkIntXlibStubsPtr->xSetIconName)(d, w, c);
}
-/* Slot 44 */
+/* Slot 45 */
void
XSetInputFocus(d, w, i, t)
Display* d;
@@ -1448,7 +1472,7 @@ XSetInputFocus(d, w, i, t)
(tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t);
}
-/* Slot 45 */
+/* Slot 46 */
void
XSetSelectionOwner(d, a, w, t)
Display* d;
@@ -1459,7 +1483,7 @@ XSetSelectionOwner(d, a, w, t)
(tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t);
}
-/* Slot 46 */
+/* Slot 47 */
void
XSetWindowBackground(d, w, ul)
Display* d;
@@ -1469,7 +1493,7 @@ XSetWindowBackground(d, w, ul)
(tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul);
}
-/* Slot 47 */
+/* Slot 48 */
void
XSetWindowBackgroundPixmap(d, w, p)
Display* d;
@@ -1479,7 +1503,7 @@ XSetWindowBackgroundPixmap(d, w, p)
(tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p);
}
-/* Slot 48 */
+/* Slot 49 */
void
XSetWindowBorder(d, w, ul)
Display* d;
@@ -1489,7 +1513,7 @@ XSetWindowBorder(d, w, ul)
(tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul);
}
-/* Slot 49 */
+/* Slot 50 */
void
XSetWindowBorderPixmap(d, w, p)
Display* d;
@@ -1499,7 +1523,7 @@ XSetWindowBorderPixmap(d, w, p)
(tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p);
}
-/* Slot 50 */
+/* Slot 51 */
void
XSetWindowBorderWidth(d, w, ui)
Display* d;
@@ -1509,7 +1533,7 @@ XSetWindowBorderWidth(d, w, ui)
(tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui);
}
-/* Slot 51 */
+/* Slot 52 */
void
XSetWindowColormap(d, w, c)
Display* d;
@@ -1519,7 +1543,7 @@ XSetWindowColormap(d, w, c)
(tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c);
}
-/* Slot 52 */
+/* Slot 53 */
void
XUngrabKeyboard(d, t)
Display* d;
@@ -1528,7 +1552,7 @@ XUngrabKeyboard(d, t)
(tkIntXlibStubsPtr->xUngrabKeyboard)(d, t);
}
-/* Slot 53 */
+/* Slot 54 */
void
XUngrabPointer(d, t)
Display* d;
@@ -1537,7 +1561,7 @@ XUngrabPointer(d, t)
(tkIntXlibStubsPtr->xUngrabPointer)(d, t);
}
-/* Slot 54 */
+/* Slot 55 */
void
XUnmapWindow(d, w)
Display* d;
@@ -1546,7 +1570,7 @@ XUnmapWindow(d, w)
(tkIntXlibStubsPtr->xUnmapWindow)(d, w);
}
-/* Slot 55 */
+/* Slot 56 */
void
TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height)
unsigned long * colors;
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 6aa0457..d8cc481 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.2 1999/03/10 07:04:43 stanton Exp $
+ * RCS: @(#) $Id: tkStubInit.c,v 1.3 1999/03/10 18:56:09 redman Exp $
*/
#include "tkInt.h"
@@ -493,60 +493,61 @@ TkIntXlibStubs tkIntXlibStubs = {
XConfigureWindow, /* 22 */
XCopyArea, /* 23 */
XCopyPlane, /* 24 */
- XDefineCursor, /* 25 */
- XDeleteProperty, /* 26 */
- XDestroyWindow, /* 27 */
- XDrawArc, /* 28 */
- XDrawLines, /* 29 */
- XDrawRectangle, /* 30 */
- XFillArc, /* 31 */
- XFillPolygon, /* 32 */
- XFillRectangles, /* 33 */
- XForceScreenSaver, /* 34 */
- XFreeColormap, /* 35 */
- XFreeColors, /* 36 */
- XFreeCursor, /* 37 */
- XFreeModifiermap, /* 38 */
- XGetGeometry, /* 39 */
- XGetInputFocus, /* 40 */
- XGetWindowProperty, /* 41 */
- XGetWindowAttributes, /* 42 */
- XGrabKeyboard, /* 43 */
- XGrabPointer, /* 44 */
- XKeysymToKeycode, /* 45 */
- XLookupColor, /* 46 */
- XMapWindow, /* 47 */
- XMoveResizeWindow, /* 48 */
- XMoveWindow, /* 49 */
- XNextEvent, /* 50 */
- XPutBackEvent, /* 51 */
- XQueryColors, /* 52 */
- XQueryPointer, /* 53 */
- XQueryTree, /* 54 */
- XRaiseWindow, /* 55 */
- XRefreshKeyboardMapping, /* 56 */
- XResizeWindow, /* 57 */
- XSelectInput, /* 58 */
- XSendEvent, /* 59 */
- XSetCommand, /* 60 */
- XSetIconName, /* 61 */
- XSetInputFocus, /* 62 */
- XSetSelectionOwner, /* 63 */
- XSetWindowBackground, /* 64 */
- XSetWindowBackgroundPixmap, /* 65 */
- XSetWindowBorder, /* 66 */
- XSetWindowBorderPixmap, /* 67 */
- XSetWindowBorderWidth, /* 68 */
- XSetWindowColormap, /* 69 */
- XTranslateCoordinates, /* 70 */
- XUngrabKeyboard, /* 71 */
- XUngrabPointer, /* 72 */
- XUnmapWindow, /* 73 */
- XWindowEvent, /* 74 */
- XDestroyIC, /* 75 */
- XFilterEvent, /* 76 */
- XmbLookupString, /* 77 */
- TkPutImage, /* 78 */
+ XCreateBitmapFromData, /* 25 */
+ XDefineCursor, /* 26 */
+ XDeleteProperty, /* 27 */
+ XDestroyWindow, /* 28 */
+ XDrawArc, /* 29 */
+ XDrawLines, /* 30 */
+ XDrawRectangle, /* 31 */
+ XFillArc, /* 32 */
+ XFillPolygon, /* 33 */
+ XFillRectangles, /* 34 */
+ XForceScreenSaver, /* 35 */
+ XFreeColormap, /* 36 */
+ XFreeColors, /* 37 */
+ XFreeCursor, /* 38 */
+ XFreeModifiermap, /* 39 */
+ XGetGeometry, /* 40 */
+ XGetInputFocus, /* 41 */
+ XGetWindowProperty, /* 42 */
+ XGetWindowAttributes, /* 43 */
+ XGrabKeyboard, /* 44 */
+ XGrabPointer, /* 45 */
+ XKeysymToKeycode, /* 46 */
+ XLookupColor, /* 47 */
+ XMapWindow, /* 48 */
+ XMoveResizeWindow, /* 49 */
+ XMoveWindow, /* 50 */
+ XNextEvent, /* 51 */
+ XPutBackEvent, /* 52 */
+ XQueryColors, /* 53 */
+ XQueryPointer, /* 54 */
+ XQueryTree, /* 55 */
+ XRaiseWindow, /* 56 */
+ XRefreshKeyboardMapping, /* 57 */
+ XResizeWindow, /* 58 */
+ XSelectInput, /* 59 */
+ XSendEvent, /* 60 */
+ XSetCommand, /* 61 */
+ XSetIconName, /* 62 */
+ XSetInputFocus, /* 63 */
+ XSetSelectionOwner, /* 64 */
+ XSetWindowBackground, /* 65 */
+ XSetWindowBackgroundPixmap, /* 66 */
+ XSetWindowBorder, /* 67 */
+ XSetWindowBorderPixmap, /* 68 */
+ XSetWindowBorderWidth, /* 69 */
+ XSetWindowColormap, /* 70 */
+ XTranslateCoordinates, /* 71 */
+ XUngrabKeyboard, /* 72 */
+ XUngrabPointer, /* 73 */
+ XUnmapWindow, /* 74 */
+ XWindowEvent, /* 75 */
+ XDestroyIC, /* 76 */
+ XFilterEvent, /* 77 */
+ XmbLookupString, /* 78 */
+ TkPutImage, /* 79 */
#endif /* __WIN32__ */
#ifdef MAC_TCL
XGetModifierMapping, /* 0 */
@@ -567,44 +568,45 @@ TkIntXlibStubs tkIntXlibStubs = {
XConfigureWindow, /* 15 */
XCopyArea, /* 16 */
XCopyPlane, /* 17 */
- XDefineCursor, /* 18 */
- XDestroyWindow, /* 19 */
- XDrawArc, /* 20 */
- XDrawLines, /* 21 */
- XDrawRectangle, /* 22 */
- XFillArc, /* 23 */
- XFillPolygon, /* 24 */
- XFillRectangles, /* 25 */
- XFreeColormap, /* 26 */
- XFreeColors, /* 27 */
- XFreeModifiermap, /* 28 */
- XGetGeometry, /* 29 */
- XGetWindowProperty, /* 30 */
- XGrabKeyboard, /* 31 */
- XGrabPointer, /* 32 */
- XKeysymToKeycode, /* 33 */
- XMapWindow, /* 34 */
- XMoveResizeWindow, /* 35 */
- XMoveWindow, /* 36 */
- XQueryPointer, /* 37 */
- XRaiseWindow, /* 38 */
- XRefreshKeyboardMapping, /* 39 */
- XResizeWindow, /* 40 */
- XSelectInput, /* 41 */
- XSendEvent, /* 42 */
- XSetIconName, /* 43 */
- XSetInputFocus, /* 44 */
- XSetSelectionOwner, /* 45 */
- XSetWindowBackground, /* 46 */
- XSetWindowBackgroundPixmap, /* 47 */
- XSetWindowBorder, /* 48 */
- XSetWindowBorderPixmap, /* 49 */
- XSetWindowBorderWidth, /* 50 */
- XSetWindowColormap, /* 51 */
- XUngrabKeyboard, /* 52 */
- XUngrabPointer, /* 53 */
- XUnmapWindow, /* 54 */
- TkPutImage, /* 55 */
+ XCreateBitmapFromData, /* 18 */
+ XDefineCursor, /* 19 */
+ XDestroyWindow, /* 20 */
+ XDrawArc, /* 21 */
+ XDrawLines, /* 22 */
+ XDrawRectangle, /* 23 */
+ XFillArc, /* 24 */
+ XFillPolygon, /* 25 */
+ XFillRectangles, /* 26 */
+ XFreeColormap, /* 27 */
+ XFreeColors, /* 28 */
+ XFreeModifiermap, /* 29 */
+ XGetGeometry, /* 30 */
+ XGetWindowProperty, /* 31 */
+ XGrabKeyboard, /* 32 */
+ XGrabPointer, /* 33 */
+ XKeysymToKeycode, /* 34 */
+ XMapWindow, /* 35 */
+ XMoveResizeWindow, /* 36 */
+ XMoveWindow, /* 37 */
+ XQueryPointer, /* 38 */
+ XRaiseWindow, /* 39 */
+ XRefreshKeyboardMapping, /* 40 */
+ XResizeWindow, /* 41 */
+ XSelectInput, /* 42 */
+ XSendEvent, /* 43 */
+ XSetIconName, /* 44 */
+ XSetInputFocus, /* 45 */
+ XSetSelectionOwner, /* 46 */
+ XSetWindowBackground, /* 47 */
+ XSetWindowBackgroundPixmap, /* 48 */
+ XSetWindowBorder, /* 49 */
+ XSetWindowBorderPixmap, /* 50 */
+ XSetWindowBorderWidth, /* 51 */
+ XSetWindowColormap, /* 52 */
+ XUngrabKeyboard, /* 53 */
+ XUngrabPointer, /* 54 */
+ XUnmapWindow, /* 55 */
+ TkPutImage, /* 56 */
#endif /* MAC_TCL */
};
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index ef96f35..44358bd 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -1209,17 +1209,6 @@ extern GC XCreateGC(
);
-extern Pixmap XCreateBitmapFromData(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- _Xconst char* /* data */,
- unsigned int /* width */,
- unsigned int /* height */
-#endif
-);
-
-
extern void XDrawLine(
#if NeedFunctionPrototypes
Display* /* display */,