summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 04:30:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-07 04:30:52 (GMT)
commite05c1d71ec11cc892731a999a9d521781ea8567e (patch)
tree9e4ba40f867e41451c5cf5bc10bd1871191d2cad
parente35d614587b25a1a03ededdf2d04bcbfca86be70 (diff)
parent0f3a2fcdd9d1f4c2d5659ae50ce1a5cba322f62c (diff)
downloadtk-e05c1d71ec11cc892731a999a9d521781ea8567e.zip
tk-e05c1d71ec11cc892731a999a9d521781ea8567e.tar.gz
tk-e05c1d71ec11cc892731a999a9d521781ea8567e.tar.bz2
Change XChangeWindowAttributes signature and many others to match Xorg, needed for Cygwin
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--generic/tkInt.decls139
-rw-r--r--generic/tkIntXlibDecls.h330
-rw-r--r--generic/tkStubInit.c2
-rw-r--r--win/stubs.c53
-rwxr-xr-xwin/tkWinDraw.c31
-rw-r--r--win/tkWinPointer.c9
-rw-r--r--win/tkWinWindow.c32
-rw-r--r--xlib/xgc.c42
9 files changed, 348 insertions, 295 deletions
diff --git a/ChangeLog b/ChangeLog
index d90693a..c2d7e85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-07 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tkInt.decls: Change XChangeWindowAttributes signature and
+ * generic/tkIntXlibDeclsDecls.h: many others to match Xorg, needed for Cygwin.
+
2012-06-02 Jan Nijtmans <nijtmans@users.sf.net>
* generic/tkInt.decls: Change XSetDashes signature and many others
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index b20a46e..091bb50 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -1133,28 +1133,28 @@ declare 19 win {
int XBell(Display *d, int i)
}
declare 20 win {
- void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
+ int XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1,
int i2, _Xconst unsigned char *c, int i3)
}
declare 21 win {
- void XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
+ int XChangeWindowAttributes(Display *d, Window w, unsigned long ul,
XSetWindowAttributes *x)
}
declare 22 win {
- void XClearWindow(Display *d, Window w)
+ int XClearWindow(Display *d, Window w)
}
declare 23 win {
- void XConfigureWindow(Display *d, Window w, unsigned int i,
+ int XConfigureWindow(Display *d, Window w, unsigned int i,
XWindowChanges *x)
}
declare 24 win {
- void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
+ int XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)
}
declare 25 win {
- void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1,
- int i2, unsigned int ui1,
- unsigned int ui2, int i3, int i4, unsigned long ul)
+ 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)
}
declare 26 win {
Pixmap XCreateBitmapFromData(Display *display, Drawable d,
@@ -1164,35 +1164,35 @@ declare 27 win {
int XDefineCursor(Display *d, Window w, Cursor c)
}
declare 28 win {
- void XDeleteProperty(Display *d, Window w, Atom a)
+ int XDeleteProperty(Display *d, Window w, Atom a)
}
declare 29 win {
- void XDestroyWindow(Display *d, Window w)
+ int XDestroyWindow(Display *d, Window w)
}
declare 30 win {
- void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
+ int XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2,
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
declare 31 win {
int XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)
}
declare 32 win {
- void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
+ int XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2,
unsigned int ui1, unsigned int ui2)
}
declare 33 win {
- void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
+ int XFillArc(Display *d, Drawable dr, GC g, int i1, int i2,
unsigned int ui1, unsigned int ui2, int i3, int i4)
}
declare 34 win {
- void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
+ int XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x,
int i1, int i2, int i3)
}
declare 35 win {
int XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i)
}
declare 36 win {
- void XForceScreenSaver(Display *d, int i)
+ int XForceScreenSaver(Display *d, int i)
}
declare 37 win {
int XFreeColormap(Display *d, Colormap c)
@@ -1202,7 +1202,7 @@ declare 38 win {
unsigned long *ulp, int i, unsigned long ul)
}
declare 39 win {
- void XFreeCursor(Display *d, Cursor c)
+ int XFreeCursor(Display *d, Cursor c)
}
declare 40 win {
int XFreeModifiermap(XModifierKeymap *x)
@@ -1213,7 +1213,7 @@ declare 41 win {
unsigned int *ui4)
}
declare 42 win {
- void XGetInputFocus(Display *d, Window *w, int *i)
+ int XGetInputFocus(Display *d, Window *w, int *i)
}
declare 43 win {
int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2,
@@ -1238,23 +1238,23 @@ declare 48 win {
XColor *x1, XColor *x2)
}
declare 49 win {
- void XMapWindow(Display *d, Window w)
+ int XMapWindow(Display *d, Window w)
}
declare 50 win {
- void XMoveResizeWindow(Display *d, Window w, int i1, int i2,
+ int XMoveResizeWindow(Display *d, Window w, int i1, int i2,
unsigned int ui1, unsigned int ui2)
}
declare 51 win {
- void XMoveWindow(Display *d, Window w, int i1, int i2)
+ int XMoveWindow(Display *d, Window w, int i1, int i2)
}
declare 52 win {
- void XNextEvent(Display *d, XEvent *x)
+ int XNextEvent(Display *d, XEvent *x)
}
declare 53 win {
- void XPutBackEvent(Display *d, XEvent *x)
+ int XPutBackEvent(Display *d, XEvent *x)
}
declare 54 win {
- void XQueryColors(Display *d, Colormap c, XColor *x, int i)
+ int XQueryColors(Display *d, Colormap c, XColor *x, int i)
}
declare 55 win {
Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3,
@@ -1265,17 +1265,17 @@ declare 56 win {
Window **w4, unsigned int *ui)
}
declare 57 win {
- void XRaiseWindow(Display *d, Window w)
+ int XRaiseWindow(Display *d, Window w)
}
declare 58 win {
- void XRefreshKeyboardMapping(XMappingEvent *x)
+ int XRefreshKeyboardMapping(XMappingEvent *x)
}
declare 59 win {
- void XResizeWindow(Display *d, Window w, unsigned int ui1,
+ int XResizeWindow(Display *d, Window w, unsigned int ui1,
unsigned int ui2)
}
declare 60 win {
- void XSelectInput(Display *d, Window w, long l)
+ int XSelectInput(Display *d, Window w, long l)
}
declare 61 win {
Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x)
@@ -1284,47 +1284,47 @@ declare 62 win {
int XSetCommand(Display *d, Window w, char **c, int i)
}
declare 63 win {
- void XSetIconName(Display *d, Window w, _Xconst char *c)
+ int XSetIconName(Display *d, Window w, _Xconst char *c)
}
declare 64 win {
- void XSetInputFocus(Display *d, Window w, int i, Time t)
+ int XSetInputFocus(Display *d, Window w, int i, Time t)
}
declare 65 win {
int XSetSelectionOwner(Display *d, Atom a, Window w, Time t)
}
declare 66 win {
- void XSetWindowBackground(Display *d, Window w, unsigned long ul)
+ int XSetWindowBackground(Display *d, Window w, unsigned long ul)
}
declare 67 win {
- void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
+ int XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p)
}
declare 68 win {
- void XSetWindowBorder(Display *d, Window w, unsigned long ul)
+ int XSetWindowBorder(Display *d, Window w, unsigned long ul)
}
declare 69 win {
- void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
+ int XSetWindowBorderPixmap(Display *d, Window w, Pixmap p)
}
declare 70 win {
- void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
+ int XSetWindowBorderWidth(Display *d, Window w, unsigned int ui)
}
declare 71 win {
- void XSetWindowColormap(Display *d, Window w, Colormap c)
+ int XSetWindowColormap(Display *d, Window w, Colormap c)
}
declare 72 win {
Bool XTranslateCoordinates(Display *d, Window w1, Window w2, int i1,
int i2, int *i3, int *i4, Window *w3)
}
declare 73 win {
- void XUngrabKeyboard(Display *d, Time t)
+ int XUngrabKeyboard(Display *d, Time t)
}
declare 74 win {
int XUngrabPointer(Display *d, Time t)
}
declare 75 win {
- void XUnmapWindow(Display *d, Window w)
+ int XUnmapWindow(Display *d, Window w)
}
declare 76 win {
- void XWindowEvent(Display *d, Window w, long l, XEvent *x)
+ int XWindowEvent(Display *d, Window w, long l, XEvent *x)
}
declare 77 win {
void XDestroyIC(XIC x)
@@ -1356,59 +1356,59 @@ declare 83 win {
unsigned long valuemask, XGCValues *values)
}
declare 84 win {
- void XFreeGC(Display *display, GC gc)
+ int XFreeGC(Display *display, GC gc)
}
declare 85 win {
Atom XInternAtom(Display *display, _Xconst char *atom_name,
Bool only_if_exists)
}
declare 86 win {
- void XSetBackground(Display *display, GC gc, unsigned long foreground)
+ int XSetBackground(Display *display, GC gc, unsigned long foreground)
}
declare 87 win {
- void XSetForeground(Display *display, GC gc, unsigned long foreground)
+ int XSetForeground(Display *display, GC gc, unsigned long foreground)
}
declare 88 win {
- void XSetClipMask(Display *display, GC gc, Pixmap pixmap)
+ int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
}
declare 89 win {
- void XSetClipOrigin(Display *display, GC gc,
+ int XSetClipOrigin(Display *display, GC gc,
int clip_x_origin, int clip_y_origin)
}
declare 90 win {
- void XSetTSOrigin(Display *display, GC gc,
+ int XSetTSOrigin(Display *display, GC gc,
int ts_x_origin, int ts_y_origin)
}
declare 91 win {
- void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
+ int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
}
declare 92 win {
- void XSetFont(Display *display, GC gc, Font font)
+ int XSetFont(Display *display, GC gc, Font font)
}
declare 93 win {
- void XSetArcMode(Display *display, GC gc, int arc_mode)
+ int XSetArcMode(Display *display, GC gc, int arc_mode)
}
declare 94 win {
- void XSetStipple(Display *display, GC gc, Pixmap stipple)
+ int XSetStipple(Display *display, GC gc, Pixmap stipple)
}
declare 95 win {
- void XSetFillRule(Display *display, GC gc, int fill_rule)
+ int XSetFillRule(Display *display, GC gc, int fill_rule)
}
declare 96 win {
- void XSetFillStyle(Display *display, GC gc, int fill_style)
+ int XSetFillStyle(Display *display, GC gc, int fill_style)
}
declare 97 win {
- void XSetFunction(Display *display, GC gc, int function)
+ int XSetFunction(Display *display, GC gc, int function)
}
declare 98 win {
- void XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
+ int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
int line_style, int cap_style, int join_style)
}
declare 99 win {
int _XInitImageFuncPtrs(XImage *image)
}
declare 100 win {
- XIC XCreateIC(void)
+ XIC XCreateIC(XIM xim, ...)
}
declare 101 win {
XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask,
@@ -1647,54 +1647,53 @@ declare 59 {mac aqua} {
unsigned long valuemask, XGCValues *values)
}
declare 60 {mac aqua} {
- void XFreeGC(Display *display, GC gc)
+ int XFreeGC(Display *display, GC gc)
}
declare 61 {mac aqua} {
Atom XInternAtom(Display *display, _Xconst char *atom_name,
Bool only_if_exists)
}
declare 62 {mac aqua} {
- void XSetBackground(Display *display, GC gc, unsigned long foreground)
+ int XSetBackground(Display *display, GC gc, unsigned long foreground)
}
declare 63 {mac aqua} {
- void XSetForeground(Display *display, GC gc, unsigned long foreground)
+ int XSetForeground(Display *display, GC gc, unsigned long foreground)
}
declare 64 {mac aqua} {
- void XSetClipMask(Display *display, GC gc, Pixmap pixmap)
+ int XSetClipMask(Display *display, GC gc, Pixmap pixmap)
}
declare 65 {mac aqua} {
- void XSetClipOrigin(Display *display, GC gc,
+ int XSetClipOrigin(Display *display, GC gc,
int clip_x_origin, int clip_y_origin)
}
declare 66 {mac aqua} {
- void XSetTSOrigin(Display *display, GC gc,
+ int XSetTSOrigin(Display *display, GC gc,
int ts_x_origin, int ts_y_origin)
}
declare 67 {mac aqua} {
- void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
+ int XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values)
}
declare 68 {mac aqua} {
- void XSetFont(Display *display, GC gc, Font font)
+ int XSetFont(Display *display, GC gc, Font font)
}
declare 69 {mac aqua} {
- void XSetArcMode(Display *display, GC gc, int arc_mode)
+ int XSetArcMode(Display *display, GC gc, int arc_mode)
}
declare 70 {mac aqua} {
- void XSetStipple(Display *display, GC gc, Pixmap stipple)
+ int XSetStipple(Display *display, GC gc, Pixmap stipple)
}
declare 71 {mac aqua} {
- void XSetFillRule(Display *display, GC gc, int fill_rule)
+ int XSetFillRule(Display *display, GC gc, int fill_rule)
}
declare 72 {mac aqua} {
- void XSetFillStyle(Display *display, GC gc, int fill_style)
+ int XSetFillStyle(Display *display, GC gc, int fill_style)
}
declare 73 {mac aqua} {
- void XSetFunction(Display *display, GC gc, int function)
+ int XSetFunction(Display *display, GC gc, int function)
}
declare 74 {mac aqua} {
- void XSetLineAttributes(Display *display, GC gc,
- unsigned int line_width, int line_style,
- int cap_style, int join_style)
+ int XSetLineAttributes(Display *display, GC gc, unsigned int line_width,
+ int line_style, int cap_style, int join_style)
}
declare 75 {mac aqua} {
int _XInitImageFuncPtrs(XImage *image)
@@ -1719,7 +1718,7 @@ declare 80 {mac aqua} {
XSegment *segments, int nsegments)
}
declare 81 {mac aqua} {
- void XForceScreenSaver(Display *display, int mode)
+ int XForceScreenSaver(Display *display, int mode)
}
declare 82 {mac aqua} {
int XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1,
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h
index cdb88f0..fb3153d 100644
--- a/generic/tkIntXlibDecls.h
+++ b/generic/tkIntXlibDecls.h
@@ -36,7 +36,7 @@
* Exported function declarations:
*/
-#if defined(__WIN32__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
/* 0 */
EXTERN int XSetDashes _ANSI_ARGS_((Display *display, GC gc,
int dash_offset, _Xconst char *dash_list,
@@ -95,25 +95,25 @@ EXTERN Status XAllocColor _ANSI_ARGS_((Display *d, Colormap c,
/* 19 */
EXTERN int XBell _ANSI_ARGS_((Display *d, int i));
/* 20 */
-EXTERN void XChangeProperty _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XChangeProperty _ANSI_ARGS_((Display *d, Window w,
Atom a1, Atom a2, int i1, int i2,
_Xconst unsigned char *c, int i3));
/* 21 */
-EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display *d,
+EXTERN int XChangeWindowAttributes _ANSI_ARGS_((Display *d,
Window w, unsigned long ul,
XSetWindowAttributes *x));
/* 22 */
-EXTERN void XClearWindow _ANSI_ARGS_((Display *d, Window w));
+EXTERN int XClearWindow _ANSI_ARGS_((Display *d, Window w));
/* 23 */
-EXTERN void XConfigureWindow _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XConfigureWindow _ANSI_ARGS_((Display *d, Window w,
unsigned int i, XWindowChanges *x));
/* 24 */
-EXTERN void XCopyArea _ANSI_ARGS_((Display *d, Drawable dr1,
+EXTERN int 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));
/* 25 */
-EXTERN void XCopyPlane _ANSI_ARGS_((Display *d, Drawable dr1,
+EXTERN int 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));
@@ -125,40 +125,40 @@ EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display *display,
EXTERN int XDefineCursor _ANSI_ARGS_((Display *d, Window w,
Cursor c));
/* 28 */
-EXTERN void XDeleteProperty _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XDeleteProperty _ANSI_ARGS_((Display *d, Window w,
Atom a));
/* 29 */
-EXTERN void XDestroyWindow _ANSI_ARGS_((Display *d, Window w));
+EXTERN int XDestroyWindow _ANSI_ARGS_((Display *d, Window w));
/* 30 */
-EXTERN void XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g,
+EXTERN int XDrawArc _ANSI_ARGS_((Display *d, Drawable dr, GC g,
int i1, int i2, unsigned int ui1,
unsigned int ui2, int i3, int i4));
/* 31 */
EXTERN int XDrawLines _ANSI_ARGS_((Display *d, Drawable dr,
GC g, XPoint *x, int i1, int i2));
/* 32 */
-EXTERN void XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr,
+EXTERN int XDrawRectangle _ANSI_ARGS_((Display *d, Drawable dr,
GC g, int i1, int i2, unsigned int ui1,
unsigned int ui2));
/* 33 */
-EXTERN void XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g,
+EXTERN int XFillArc _ANSI_ARGS_((Display *d, Drawable dr, GC g,
int i1, int i2, unsigned int ui1,
unsigned int ui2, int i3, int i4));
/* 34 */
-EXTERN void XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr,
+EXTERN int XFillPolygon _ANSI_ARGS_((Display *d, Drawable dr,
GC g, XPoint *x, int i1, int i2, int i3));
/* 35 */
EXTERN int XFillRectangles _ANSI_ARGS_((Display *d, Drawable dr,
GC g, XRectangle *x, int i));
/* 36 */
-EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *d, int i));
+EXTERN int XForceScreenSaver _ANSI_ARGS_((Display *d, int i));
/* 37 */
EXTERN int XFreeColormap _ANSI_ARGS_((Display *d, Colormap c));
/* 38 */
EXTERN int XFreeColors _ANSI_ARGS_((Display *d, Colormap c,
unsigned long *ulp, int i, unsigned long ul));
/* 39 */
-EXTERN void XFreeCursor _ANSI_ARGS_((Display *d, Cursor c));
+EXTERN int XFreeCursor _ANSI_ARGS_((Display *d, Cursor c));
/* 40 */
EXTERN int XFreeModifiermap _ANSI_ARGS_((XModifierKeymap *x));
/* 41 */
@@ -167,7 +167,7 @@ EXTERN Status XGetGeometry _ANSI_ARGS_((Display *d, Drawable dr,
unsigned int *ui1, unsigned int *ui2,
unsigned int *ui3, unsigned int *ui4));
/* 42 */
-EXTERN void XGetInputFocus _ANSI_ARGS_((Display *d, Window *w,
+EXTERN int XGetInputFocus _ANSI_ARGS_((Display *d, Window *w,
int *i));
/* 43 */
EXTERN int XGetWindowProperty _ANSI_ARGS_((Display *d, Window w,
@@ -190,20 +190,20 @@ EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display *d, KeySym k));
EXTERN Status XLookupColor _ANSI_ARGS_((Display *d, Colormap c1,
_Xconst char *c2, XColor *x1, XColor *x2));
/* 49 */
-EXTERN void XMapWindow _ANSI_ARGS_((Display *d, Window w));
+EXTERN int XMapWindow _ANSI_ARGS_((Display *d, Window w));
/* 50 */
-EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XMoveResizeWindow _ANSI_ARGS_((Display *d, Window w,
int i1, int i2, unsigned int ui1,
unsigned int ui2));
/* 51 */
-EXTERN void XMoveWindow _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XMoveWindow _ANSI_ARGS_((Display *d, Window w,
int i1, int i2));
/* 52 */
-EXTERN void XNextEvent _ANSI_ARGS_((Display *d, XEvent *x));
+EXTERN int XNextEvent _ANSI_ARGS_((Display *d, XEvent *x));
/* 53 */
-EXTERN void XPutBackEvent _ANSI_ARGS_((Display *d, XEvent *x));
+EXTERN int XPutBackEvent _ANSI_ARGS_((Display *d, XEvent *x));
/* 54 */
-EXTERN void XQueryColors _ANSI_ARGS_((Display *d, Colormap c,
+EXTERN int XQueryColors _ANSI_ARGS_((Display *d, Colormap c,
XColor *x, int i));
/* 55 */
EXTERN Bool XQueryPointer _ANSI_ARGS_((Display *d, Window w1,
@@ -214,15 +214,15 @@ EXTERN Status XQueryTree _ANSI_ARGS_((Display *d, Window w1,
Window *w2, Window *w3, Window **w4,
unsigned int *ui));
/* 57 */
-EXTERN void XRaiseWindow _ANSI_ARGS_((Display *d, Window w));
+EXTERN int XRaiseWindow _ANSI_ARGS_((Display *d, Window w));
/* 58 */
-EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_((
+EXTERN int XRefreshKeyboardMapping _ANSI_ARGS_((
XMappingEvent *x));
/* 59 */
-EXTERN void XResizeWindow _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XResizeWindow _ANSI_ARGS_((Display *d, Window w,
unsigned int ui1, unsigned int ui2));
/* 60 */
-EXTERN void XSelectInput _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XSelectInput _ANSI_ARGS_((Display *d, Window w,
long l));
/* 61 */
EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b,
@@ -231,44 +231,44 @@ EXTERN Status XSendEvent _ANSI_ARGS_((Display *d, Window w, Bool b,
EXTERN int XSetCommand _ANSI_ARGS_((Display *d, Window w,
char **c, int i));
/* 63 */
-EXTERN void XSetIconName _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XSetIconName _ANSI_ARGS_((Display *d, Window w,
_Xconst char *c));
/* 64 */
-EXTERN void XSetInputFocus _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XSetInputFocus _ANSI_ARGS_((Display *d, Window w,
int i, Time t));
/* 65 */
EXTERN int XSetSelectionOwner _ANSI_ARGS_((Display *d, Atom a,
Window w, Time t));
/* 66 */
-EXTERN void XSetWindowBackground _ANSI_ARGS_((Display *d,
+EXTERN int XSetWindowBackground _ANSI_ARGS_((Display *d,
Window w, unsigned long ul));
/* 67 */
-EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d,
+EXTERN int XSetWindowBackgroundPixmap _ANSI_ARGS_((Display *d,
Window w, Pixmap p));
/* 68 */
-EXTERN void XSetWindowBorder _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XSetWindowBorder _ANSI_ARGS_((Display *d, Window w,
unsigned long ul));
/* 69 */
-EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display *d,
+EXTERN int XSetWindowBorderPixmap _ANSI_ARGS_((Display *d,
Window w, Pixmap p));
/* 70 */
-EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display *d,
+EXTERN int XSetWindowBorderWidth _ANSI_ARGS_((Display *d,
Window w, unsigned int ui));
/* 71 */
-EXTERN void XSetWindowColormap _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XSetWindowColormap _ANSI_ARGS_((Display *d, Window w,
Colormap c));
/* 72 */
EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display *d,
Window w1, Window w2, int i1, int i2,
int *i3, int *i4, Window *w3));
/* 73 */
-EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t));
+EXTERN int XUngrabKeyboard _ANSI_ARGS_((Display *d, Time t));
/* 74 */
EXTERN int XUngrabPointer _ANSI_ARGS_((Display *d, Time t));
/* 75 */
-EXTERN void XUnmapWindow _ANSI_ARGS_((Display *d, Window w));
+EXTERN int XUnmapWindow _ANSI_ARGS_((Display *d, Window w));
/* 76 */
-EXTERN void XWindowEvent _ANSI_ARGS_((Display *d, Window w,
+EXTERN int XWindowEvent _ANSI_ARGS_((Display *d, Window w,
long l, XEvent *x));
/* 77 */
EXTERN void XDestroyIC _ANSI_ARGS_((XIC x));
@@ -293,55 +293,55 @@ EXTERN Status XParseColor _ANSI_ARGS_((Display *display,
EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d,
unsigned long valuemask, XGCValues *values));
/* 84 */
-EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc));
+EXTERN int XFreeGC _ANSI_ARGS_((Display *display, GC gc));
/* 85 */
EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display,
_Xconst char *atom_name, Bool only_if_exists));
/* 86 */
-EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetBackground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 87 */
-EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetForeground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 88 */
-EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
Pixmap pixmap));
/* 89 */
-EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
int clip_x_origin, int clip_y_origin));
/* 90 */
-EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
int ts_x_origin, int ts_y_origin));
/* 91 */
-EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc,
+EXTERN int XChangeGC _ANSI_ARGS_((Display *d, GC gc,
unsigned long mask, XGCValues *values));
/* 92 */
-EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFont _ANSI_ARGS_((Display *display, GC gc,
Font font));
/* 93 */
-EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
int arc_mode));
/* 94 */
-EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetStipple _ANSI_ARGS_((Display *display, GC gc,
Pixmap stipple));
/* 95 */
-EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
int fill_rule));
/* 96 */
-EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
int fill_style));
/* 97 */
-EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFunction _ANSI_ARGS_((Display *display, GC gc,
int function));
/* 98 */
-EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display,
+EXTERN int XSetLineAttributes _ANSI_ARGS_((Display *display,
GC gc, unsigned int line_width,
int line_style, int cap_style,
int join_style));
/* 99 */
EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
/* 100 */
-EXTERN XIC XCreateIC _ANSI_ARGS_((void));
+EXTERN XIC XCreateIC _ANSI_ARGS_(TCL_VARARGS(XIM,xim));
/* 101 */
EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display *display,
long vinfo_mask, XVisualInfo *vinfo_template,
@@ -554,48 +554,48 @@ EXTERN Status XParseColor _ANSI_ARGS_((Display *display,
EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d,
unsigned long valuemask, XGCValues *values));
/* 60 */
-EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc));
+EXTERN int XFreeGC _ANSI_ARGS_((Display *display, GC gc));
/* 61 */
EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display,
_Xconst char *atom_name, Bool only_if_exists));
/* 62 */
-EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetBackground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 63 */
-EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetForeground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 64 */
-EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
Pixmap pixmap));
/* 65 */
-EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
int clip_x_origin, int clip_y_origin));
/* 66 */
-EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
int ts_x_origin, int ts_y_origin));
/* 67 */
-EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc,
+EXTERN int XChangeGC _ANSI_ARGS_((Display *d, GC gc,
unsigned long mask, XGCValues *values));
/* 68 */
-EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFont _ANSI_ARGS_((Display *display, GC gc,
Font font));
/* 69 */
-EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
int arc_mode));
/* 70 */
-EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetStipple _ANSI_ARGS_((Display *display, GC gc,
Pixmap stipple));
/* 71 */
-EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
int fill_rule));
/* 72 */
-EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
int fill_style));
/* 73 */
-EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFunction _ANSI_ARGS_((Display *display, GC gc,
int function));
/* 74 */
-EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display,
+EXTERN int XSetLineAttributes _ANSI_ARGS_((Display *display,
GC gc, unsigned int line_width,
int line_style, int cap_style,
int join_style));
@@ -618,7 +618,7 @@ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display,
Drawable d, GC gc, XSegment *segments,
int nsegments));
/* 81 */
-EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display,
+EXTERN int XForceScreenSaver _ANSI_ARGS_((Display *display,
int mode));
/* 82 */
EXTERN int XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g,
@@ -844,48 +844,48 @@ EXTERN Status XParseColor _ANSI_ARGS_((Display *display,
EXTERN GC XCreateGC _ANSI_ARGS_((Display *display, Drawable d,
unsigned long valuemask, XGCValues *values));
/* 60 */
-EXTERN void XFreeGC _ANSI_ARGS_((Display *display, GC gc));
+EXTERN int XFreeGC _ANSI_ARGS_((Display *display, GC gc));
/* 61 */
EXTERN Atom XInternAtom _ANSI_ARGS_((Display *display,
_Xconst char *atom_name, Bool only_if_exists));
/* 62 */
-EXTERN void XSetBackground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetBackground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 63 */
-EXTERN void XSetForeground _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetForeground _ANSI_ARGS_((Display *display, GC gc,
unsigned long foreground));
/* 64 */
-EXTERN void XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipMask _ANSI_ARGS_((Display *display, GC gc,
Pixmap pixmap));
/* 65 */
-EXTERN void XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetClipOrigin _ANSI_ARGS_((Display *display, GC gc,
int clip_x_origin, int clip_y_origin));
/* 66 */
-EXTERN void XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetTSOrigin _ANSI_ARGS_((Display *display, GC gc,
int ts_x_origin, int ts_y_origin));
/* 67 */
-EXTERN void XChangeGC _ANSI_ARGS_((Display *d, GC gc,
+EXTERN int XChangeGC _ANSI_ARGS_((Display *d, GC gc,
unsigned long mask, XGCValues *values));
/* 68 */
-EXTERN void XSetFont _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFont _ANSI_ARGS_((Display *display, GC gc,
Font font));
/* 69 */
-EXTERN void XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetArcMode _ANSI_ARGS_((Display *display, GC gc,
int arc_mode));
/* 70 */
-EXTERN void XSetStipple _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetStipple _ANSI_ARGS_((Display *display, GC gc,
Pixmap stipple));
/* 71 */
-EXTERN void XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillRule _ANSI_ARGS_((Display *display, GC gc,
int fill_rule));
/* 72 */
-EXTERN void XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFillStyle _ANSI_ARGS_((Display *display, GC gc,
int fill_style));
/* 73 */
-EXTERN void XSetFunction _ANSI_ARGS_((Display *display, GC gc,
+EXTERN int XSetFunction _ANSI_ARGS_((Display *display, GC gc,
int function));
/* 74 */
-EXTERN void XSetLineAttributes _ANSI_ARGS_((Display *display,
+EXTERN int XSetLineAttributes _ANSI_ARGS_((Display *display,
GC gc, unsigned int line_width,
int line_style, int cap_style,
int join_style));
@@ -908,7 +908,7 @@ EXTERN void XDrawSegments _ANSI_ARGS_((Display *display,
Drawable d, GC gc, XSegment *segments,
int nsegments));
/* 81 */
-EXTERN void XForceScreenSaver _ANSI_ARGS_((Display *display,
+EXTERN int XForceScreenSaver _ANSI_ARGS_((Display *display,
int mode));
/* 82 */
EXTERN int XDrawLine _ANSI_ARGS_((Display *d, Drawable dr, GC g,
@@ -951,7 +951,7 @@ typedef struct TkIntXlibStubs {
int magic;
struct TkIntXlibStubHooks *hooks;
-#if defined(__WIN32__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
int (*xSetDashes) _ANSI_ARGS_((Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n)); /* 0 */
XModifierKeymap * (*xGetModifierMapping) _ANSI_ARGS_((Display *d)); /* 1 */
XImage * (*xCreateImage) _ANSI_ARGS_((Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */
@@ -972,63 +972,63 @@ typedef struct TkIntXlibStubs {
Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display *d, Window w, Window **wpp, int *ip)); /* 17 */
Status (*xAllocColor) _ANSI_ARGS_((Display *d, Colormap c, XColor *xp)); /* 18 */
int (*xBell) _ANSI_ARGS_((Display *d, int i)); /* 19 */
- void (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 20 */
- void (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 21 */
- void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 22 */
- void (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 23 */
- void (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */
- void (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */
+ int (*xChangeProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3)); /* 20 */
+ int (*xChangeWindowAttributes) _ANSI_ARGS_((Display *d, Window w, unsigned long ul, XSetWindowAttributes *x)); /* 21 */
+ int (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 22 */
+ int (*xConfigureWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int i, XWindowChanges *x)); /* 23 */
+ int (*xCopyArea) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */
+ int (*xCopyPlane) _ANSI_ARGS_((Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */
Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height)); /* 26 */
int (*xDefineCursor) _ANSI_ARGS_((Display *d, Window w, Cursor c)); /* 27 */
- void (*xDeleteProperty) _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 28 */
- void (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 29 */
- void (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */
+ int (*xDeleteProperty) _ANSI_ARGS_((Display *d, Window w, Atom a)); /* 28 */
+ int (*xDestroyWindow) _ANSI_ARGS_((Display *d, Window w)); /* 29 */
+ int (*xDrawArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */
int (*xDrawLines) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2)); /* 31 */
- void (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */
- void (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */
- void (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 34 */
+ int (*xDrawRectangle) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */
+ int (*xFillArc) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */
+ int (*xFillPolygon) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3)); /* 34 */
int (*xFillRectangles) _ANSI_ARGS_((Display *d, Drawable dr, GC g, XRectangle *x, int i)); /* 35 */
- void (*xForceScreenSaver) _ANSI_ARGS_((Display *d, int i)); /* 36 */
+ int (*xForceScreenSaver) _ANSI_ARGS_((Display *d, int i)); /* 36 */
int (*xFreeColormap) _ANSI_ARGS_((Display *d, Colormap c)); /* 37 */
int (*xFreeColors) _ANSI_ARGS_((Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul)); /* 38 */
- void (*xFreeCursor) _ANSI_ARGS_((Display *d, Cursor c)); /* 39 */
+ int (*xFreeCursor) _ANSI_ARGS_((Display *d, Cursor c)); /* 39 */
int (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap *x)); /* 40 */
Status (*xGetGeometry) _ANSI_ARGS_((Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4)); /* 41 */
- void (*xGetInputFocus) _ANSI_ARGS_((Display *d, Window *w, int *i)); /* 42 */
+ int (*xGetInputFocus) _ANSI_ARGS_((Display *d, Window *w, int *i)); /* 42 */
int (*xGetWindowProperty) _ANSI_ARGS_((Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp)); /* 43 */
Status (*xGetWindowAttributes) _ANSI_ARGS_((Display *d, Window w, XWindowAttributes *x)); /* 44 */
int (*xGrabKeyboard) _ANSI_ARGS_((Display *d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */
int (*xGrabPointer) _ANSI_ARGS_((Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */
KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display *d, KeySym k)); /* 47 */
Status (*xLookupColor) _ANSI_ARGS_((Display *d, Colormap c1, _Xconst char *c2, XColor *x1, XColor *x2)); /* 48 */
- void (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 49 */
- void (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */
- void (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 51 */
- void (*xNextEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 52 */
- void (*xPutBackEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */
- void (*xQueryColors) _ANSI_ARGS_((Display *d, Colormap c, XColor *x, int i)); /* 54 */
+ int (*xMapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 49 */
+ int (*xMoveResizeWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */
+ int (*xMoveWindow) _ANSI_ARGS_((Display *d, Window w, int i1, int i2)); /* 51 */
+ int (*xNextEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 52 */
+ int (*xPutBackEvent) _ANSI_ARGS_((Display *d, XEvent *x)); /* 53 */
+ int (*xQueryColors) _ANSI_ARGS_((Display *d, Colormap c, XColor *x, int i)); /* 54 */
Bool (*xQueryPointer) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui)); /* 55 */
Status (*xQueryTree) _ANSI_ARGS_((Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui)); /* 56 */
- void (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 57 */
- void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 58 */
- void (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */
- void (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 60 */
+ int (*xRaiseWindow) _ANSI_ARGS_((Display *d, Window w)); /* 57 */
+ int (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent *x)); /* 58 */
+ int (*xResizeWindow) _ANSI_ARGS_((Display *d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */
+ int (*xSelectInput) _ANSI_ARGS_((Display *d, Window w, long l)); /* 60 */
Status (*xSendEvent) _ANSI_ARGS_((Display *d, Window w, Bool b, long l, XEvent *x)); /* 61 */
int (*xSetCommand) _ANSI_ARGS_((Display *d, Window w, char **c, int i)); /* 62 */
- void (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 63 */
- void (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 64 */
+ int (*xSetIconName) _ANSI_ARGS_((Display *d, Window w, _Xconst char *c)); /* 63 */
+ int (*xSetInputFocus) _ANSI_ARGS_((Display *d, Window w, int i, Time t)); /* 64 */
int (*xSetSelectionOwner) _ANSI_ARGS_((Display *d, Atom a, Window w, Time t)); /* 65 */
- void (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 66 */
- void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 67 */
- void (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 68 */
- void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 69 */
- void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 70 */
- void (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 71 */
+ int (*xSetWindowBackground) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 66 */
+ int (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 67 */
+ int (*xSetWindowBorder) _ANSI_ARGS_((Display *d, Window w, unsigned long ul)); /* 68 */
+ int (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display *d, Window w, Pixmap p)); /* 69 */
+ int (*xSetWindowBorderWidth) _ANSI_ARGS_((Display *d, Window w, unsigned int ui)); /* 70 */
+ int (*xSetWindowColormap) _ANSI_ARGS_((Display *d, Window w, Colormap c)); /* 71 */
Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display *d, Window w1, Window w2, int i1, int i2, int *i3, int *i4, Window *w3)); /* 72 */
- void (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 73 */
+ int (*xUngrabKeyboard) _ANSI_ARGS_((Display *d, Time t)); /* 73 */
int (*xUngrabPointer) _ANSI_ARGS_((Display *d, Time t)); /* 74 */
- void (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 75 */
- void (*xWindowEvent) _ANSI_ARGS_((Display *d, Window w, long l, XEvent *x)); /* 76 */
+ int (*xUnmapWindow) _ANSI_ARGS_((Display *d, Window w)); /* 75 */
+ int (*xWindowEvent) _ANSI_ARGS_((Display *d, Window w, long l, XEvent *x)); /* 76 */
void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */
Bool (*xFilterEvent) _ANSI_ARGS_((XEvent *x, Window w)); /* 78 */
int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent *xk, char *c, int i, KeySym *k, Status *s)); /* 79 */
@@ -1036,23 +1036,23 @@ typedef struct TkIntXlibStubs {
VOID *reserved81;
Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 82 */
GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 83 */
- void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 84 */
+ int (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 84 */
Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 85 */
- void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 86 */
- void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */
- void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 88 */
- void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */
- void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */
- void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 91 */
- void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 92 */
- void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 93 */
- void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 94 */
- void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 95 */
- void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 96 */
- void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 97 */
- void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */
+ int (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 86 */
+ int (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 87 */
+ int (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 88 */
+ int (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 89 */
+ int (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 90 */
+ int (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 91 */
+ int (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 92 */
+ int (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 93 */
+ int (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 94 */
+ int (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 95 */
+ int (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 96 */
+ int (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 97 */
+ int (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 98 */
int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 99 */
- XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 100 */
+ XIC (*xCreateIC) _ANSI_ARGS_((XIM xim, ...)); /* 100 */
XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 101 */
void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 102 */
Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 103 */
@@ -1121,28 +1121,28 @@ typedef struct TkIntXlibStubs {
int (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */
Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */
GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */
- void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */
+ int (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */
Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */
- void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */
- void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */
- void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */
- void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
- void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
- void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */
- void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */
- void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */
- void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */
- void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */
- void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */
- void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */
- void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
+ int (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */
+ int (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */
+ int (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */
+ int (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
+ int (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
+ int (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */
+ int (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */
+ int (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */
+ int (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */
+ int (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */
+ int (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */
+ int (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */
+ int (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */
XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */
void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */
Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */
void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */
- void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */
+ int (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */
int (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
int (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */
@@ -1214,28 +1214,28 @@ typedef struct TkIntXlibStubs {
int (*tkPutImage) _ANSI_ARGS_((unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */
Status (*xParseColor) _ANSI_ARGS_((Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr)); /* 58 */
GC (*xCreateGC) _ANSI_ARGS_((Display *display, Drawable d, unsigned long valuemask, XGCValues *values)); /* 59 */
- void (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */
+ int (*xFreeGC) _ANSI_ARGS_((Display *display, GC gc)); /* 60 */
Atom (*xInternAtom) _ANSI_ARGS_((Display *display, _Xconst char *atom_name, Bool only_if_exists)); /* 61 */
- void (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */
- void (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */
- void (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */
- void (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
- void (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
- void (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */
- void (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */
- void (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */
- void (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */
- void (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */
- void (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */
- void (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */
- void (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
+ int (*xSetBackground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 62 */
+ int (*xSetForeground) _ANSI_ARGS_((Display *display, GC gc, unsigned long foreground)); /* 63 */
+ int (*xSetClipMask) _ANSI_ARGS_((Display *display, GC gc, Pixmap pixmap)); /* 64 */
+ int (*xSetClipOrigin) _ANSI_ARGS_((Display *display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */
+ int (*xSetTSOrigin) _ANSI_ARGS_((Display *display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */
+ int (*xChangeGC) _ANSI_ARGS_((Display *d, GC gc, unsigned long mask, XGCValues *values)); /* 67 */
+ int (*xSetFont) _ANSI_ARGS_((Display *display, GC gc, Font font)); /* 68 */
+ int (*xSetArcMode) _ANSI_ARGS_((Display *display, GC gc, int arc_mode)); /* 69 */
+ int (*xSetStipple) _ANSI_ARGS_((Display *display, GC gc, Pixmap stipple)); /* 70 */
+ int (*xSetFillRule) _ANSI_ARGS_((Display *display, GC gc, int fill_rule)); /* 71 */
+ int (*xSetFillStyle) _ANSI_ARGS_((Display *display, GC gc, int fill_style)); /* 72 */
+ int (*xSetFunction) _ANSI_ARGS_((Display *display, GC gc, int function)); /* 73 */
+ int (*xSetLineAttributes) _ANSI_ARGS_((Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */
int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage *image)); /* 75 */
XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */
XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)); /* 77 */
void (*xSetWMClientMachine) _ANSI_ARGS_((Display *display, Window w, XTextProperty *text_prop)); /* 78 */
Status (*xStringListToTextProperty) _ANSI_ARGS_((char **list, int count, XTextProperty *text_prop_return)); /* 79 */
void (*xDrawSegments) _ANSI_ARGS_((Display *display, Drawable d, GC gc, XSegment *segments, int nsegments)); /* 80 */
- void (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */
+ int (*xForceScreenSaver) _ANSI_ARGS_((Display *display, int mode)); /* 81 */
int (*xDrawLine) _ANSI_ARGS_((Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */
int (*xFillRectangle) _ANSI_ARGS_((Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */
void (*xClearWindow) _ANSI_ARGS_((Display *d, Window w)); /* 84 */
@@ -1263,7 +1263,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr;
* Inline function declarations:
*/
-#if defined(__WIN32__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
#ifndef XSetDashes
#define XSetDashes \
(tkIntXlibStubsPtr->xSetDashes) /* 0 */
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 02ab98b..24478e4 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -624,7 +624,7 @@ TkIntPlatStubs tkIntPlatStubs = {
TkIntXlibStubs tkIntXlibStubs = {
TCL_STUB_MAGIC,
NULL,
-#if defined(__WIN32__) /* WIN */
+#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
XSetDashes, /* 0 */
XGetModifierMapping, /* 1 */
XCreateImage, /* 2 */
diff --git a/win/stubs.c b/win/stubs.c
index 5977a2b..8f70da6 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -34,7 +34,7 @@ XStringListToTextProperty(list, count, text_prop_return)
* From Xlib.h
*/
-void
+int
XChangeProperty(display, w, property, type, format, mode, data, nelements)
Display* display;
Window w;
@@ -45,6 +45,7 @@ XChangeProperty(display, w, property, type, format, mode, data, nelements)
_Xconst unsigned char* data;
int nelements;
{
+ return Success;
}
Cursor
@@ -62,7 +63,7 @@ XCreateGlyphCursor(display, source_font, mask_font, source_char, mask_char,
}
XIC
-XCreateIC()
+XCreateIC TCL_VARARGS_DEF(XIM,xim)
{
return NULL;
}
@@ -81,12 +82,13 @@ XCreatePixmapCursor(display, source, mask, foreground_color,
return (Cursor) NULL;
}
-void
+int
XDeleteProperty(display, w, property)
Display* display;
Window w;
Atom property;
{
+ return Success;
}
void
@@ -103,17 +105,19 @@ XFilterEvent(event, window)
return 0;
}
-extern void XForceScreenSaver(display, mode)
+int XForceScreenSaver(display, mode)
Display* display;
int mode;
{
+ return Success;
}
-void
+int
XFreeCursor(display, cursor)
Display* display;
Cursor cursor;
{
+ return Success;
}
GContext
@@ -180,27 +184,30 @@ XLookupColor(display, colormap, color_name, exact_def_return,
return Success;
}
-void
+int
XNextEvent(display, event_return)
Display* display;
XEvent* event_return;
{
+ return Success;
}
-void
+int
XPutBackEvent(display, event)
Display* display;
XEvent* event;
{
+ return Success;
}
-void
+int
XQueryColors(display, colormap, defs_in_out, ncolors)
Display* display;
Colormap colormap;
XColor* defs_in_out;
int ncolors;
{
+ return Success;
}
int
@@ -216,10 +223,11 @@ XQueryTree(display, w, root_return, parent_return, children_return,
return Success;
}
-void
+int
XRefreshKeyboardMapping(event_map)
XMappingEvent* event_map;
{
+ return Success;
}
Window
@@ -230,12 +238,13 @@ XRootWindow(display, screen_number)
return (Window) NULL;
}
-void
+int
XSelectInput(display, w, event_mask)
Display* display;
Window w;
long event_mask;
{
+ return Success;
}
int
@@ -266,60 +275,67 @@ XSetErrorHandler (handler)
return NULL;
}
-void
+int
XSetIconName(display, w, icon_name)
Display* display;
Window w;
_Xconst char* icon_name;
{
+ return Success;
}
-void
+int
XSetWindowBackground(display, w, background_pixel)
Display* display;
Window w;
unsigned long background_pixel;
{
+ return Success;
}
-void
+int
XSetWindowBackgroundPixmap(display, w, background_pixmap)
Display* display;
Window w;
Pixmap background_pixmap;
{
+ return Success;
}
-void
+int
XSetWindowBorder(display, w, border_pixel)
Display* display;
Window w;
unsigned long border_pixel;
{
+ return Success;
}
-void
+int
XSetWindowBorderPixmap(display, w, border_pixmap)
Display* display;
Window w;
Pixmap border_pixmap;
{
+ return Success;
}
-void
+int
XSetWindowBorderWidth(display, w, width)
Display* display;
Window w;
unsigned int width;
{
+ return Success;
}
-void
+int
XSetWindowColormap(display, w, colormap)
Display* display;
Window w;
Colormap colormap;
{
+ return Success;
}
Bool
@@ -337,13 +353,14 @@ XTranslateCoordinates(display, src_w, dest_w, src_x, src_y, dest_x_return,
return 0;
}
-void
+int
XWindowEvent(display, w, event_mask, event_return)
Display* display;
Window w;
long event_mask;
XEvent* event_return;
{
+ return Success;
}
int
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index 26d73e8..04a27c4 100755
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -117,7 +117,7 @@ static Tcl_ThreadDataKey dataKey;
static POINT * ConvertPoints _ANSI_ARGS_((XPoint *points, int npoints,
int mode, RECT *bbox));
-static void DrawOrFillArc _ANSI_ARGS_((Display *display,
+static int DrawOrFillArc _ANSI_ARGS_((Display *display,
Drawable d, GC gc, int x, int y,
unsigned int width, unsigned int height,
int start, int extent, int fill));
@@ -299,7 +299,7 @@ ConvertPoints(points, npoints, mode, bbox)
*----------------------------------------------------------------------
*/
-void
+int
XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y)
Display* display;
Drawable src;
@@ -335,6 +335,7 @@ XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y)
TkWinReleaseDrawableDC(dest, destDC, &destState);
}
TkWinReleaseDrawableDC(src, srcDC, &srcState);
+ return Success;
}
/*
@@ -356,7 +357,7 @@ XCopyArea(display, src, dest, gc, src_x, src_y, width, height, dest_x, dest_y)
*----------------------------------------------------------------------
*/
-void
+int
XCopyPlane(display, src, dest, gc, src_x, src_y, width, height, dest_x,
dest_y, plane)
Display* display;
@@ -486,6 +487,7 @@ XCopyPlane(display, src, dest, gc, src_x, src_y, width, height, dest_x,
TkWinReleaseDrawableDC(dest, destDC, &destState);
}
TkWinReleaseDrawableDC(src, srcDC, &srcState);
+ return Success;
}
/*
@@ -917,7 +919,7 @@ XDrawLines(display, d, gc, points, npoints, mode)
*----------------------------------------------------------------------
*/
-void
+int
XFillPolygon(display, d, gc, points, npoints, shape, mode)
Display* display;
Drawable d;
@@ -932,7 +934,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode)
HDC dc;
if (d == None) {
- return;
+ return BadDrawable;
}
dc = TkWinGetDrawableDC(display, d, &state);
@@ -941,6 +943,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode)
RenderObject(dc, gc, points, npoints, mode, pen, Polygon);
TkWinReleaseDrawableDC(d, dc, &state);
+ return Success;
}
/*
@@ -959,7 +962,7 @@ XFillPolygon(display, d, gc, points, npoints, shape, mode)
*----------------------------------------------------------------------
*/
-void
+int
XDrawRectangle(display, d, gc, x, y, width, height)
Display* display;
Drawable d;
@@ -975,7 +978,7 @@ XDrawRectangle(display, d, gc, x, y, width, height)
HDC dc;
if (d == None) {
- return;
+ return BadDrawable;
}
dc = TkWinGetDrawableDC(display, d, &state);
@@ -991,6 +994,7 @@ XDrawRectangle(display, d, gc, x, y, width, height)
DeleteObject(SelectObject(dc, oldPen));
SelectObject(dc, oldBrush);
TkWinReleaseDrawableDC(d, dc, &state);
+ return Success;
}
/*
@@ -1009,7 +1013,7 @@ XDrawRectangle(display, d, gc, x, y, width, height)
*----------------------------------------------------------------------
*/
-void
+int
XDrawArc(display, d, gc, x, y, width, height, start, extent)
Display* display;
Drawable d;
@@ -1023,7 +1027,7 @@ XDrawArc(display, d, gc, x, y, width, height, start, extent)
{
display->request++;
- DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0);
+ return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0);
}
/*
@@ -1042,7 +1046,7 @@ XDrawArc(display, d, gc, x, y, width, height, start, extent)
*----------------------------------------------------------------------
*/
-void
+int
XFillArc(display, d, gc, x, y, width, height, start, extent)
Display* display;
Drawable d;
@@ -1056,7 +1060,7 @@ XFillArc(display, d, gc, x, y, width, height, start, extent)
{
display->request++;
- DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1);
+ return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1);
}
/*
@@ -1076,7 +1080,7 @@ XFillArc(display, d, gc, x, y, width, height, start, extent)
*----------------------------------------------------------------------
*/
-static void
+static int
DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill)
Display *display;
Drawable d;
@@ -1096,7 +1100,7 @@ DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill)
double radian_start, radian_end, xr, yr;
if (d == None) {
- return;
+ return BadDrawable;
}
dc = TkWinGetDrawableDC(display, d, &state);
@@ -1166,6 +1170,7 @@ DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, fill)
}
DeleteObject(SelectObject(dc, oldPen));
TkWinReleaseDrawableDC(d, dc, &state);
+ return Success;
}
/*
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 42e6e49..bac6e18 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -195,12 +195,13 @@ XGrabKeyboard(display, grab_window, owner_events, pointer_mode,
*----------------------------------------------------------------------
*/
-void
+int
XUngrabKeyboard(display, time)
Display* display;
Time time;
{
keyboardWinPtr = NULL;
+ return Success;
}
/*
@@ -383,7 +384,7 @@ XWarpPointer(display, src_w, dest_w, src_x, src_y, src_width,
*----------------------------------------------------------------------
*/
-void
+int
XGetInputFocus(display, focus_return, revert_to_return)
Display *display;
Window *focus_return;
@@ -393,6 +394,7 @@ XGetInputFocus(display, focus_return, revert_to_return)
*focus_return = tkwin ? Tk_WindowId(tkwin) : None;
*revert_to_return = RevertToParent;
display->request++;
+ return Success;
}
/*
@@ -412,7 +414,7 @@ XGetInputFocus(display, focus_return, revert_to_return)
*----------------------------------------------------------------------
*/
-void
+int
XSetInputFocus(display, focus, revert_to, time)
Display* display;
Window focus;
@@ -423,6 +425,7 @@ XSetInputFocus(display, focus, revert_to, time)
if (focus != None) {
SetFocus(Tk_GetHWND(focus));
}
+ return Success;
}
/*
diff --git a/win/tkWinWindow.c b/win/tkWinWindow.c
index 8d76289..ef14604 100644
--- a/win/tkWinWindow.c
+++ b/win/tkWinWindow.c
@@ -294,7 +294,7 @@ TkpMakeWindow(winPtr, parent)
*----------------------------------------------------------------------
*/
-void
+int
XDestroyWindow(display, w)
Display* display;
Window w;
@@ -330,6 +330,7 @@ XDestroyWindow(display, w)
if (hwnd != NULL && !(winPtr->flags & TK_DONT_DESTROY_WINDOW)) {
DestroyWindow(hwnd);
}
+ return Success;
}
/*
@@ -349,7 +350,7 @@ XDestroyWindow(display, w)
*----------------------------------------------------------------------
*/
-void
+int
XMapWindow(display, w)
Display* display;
Window w;
@@ -373,7 +374,7 @@ XMapWindow(display, w)
for (parentPtr = winPtr->parentPtr; ;
parentPtr = parentPtr->parentPtr) {
if ((parentPtr == NULL) || !(parentPtr->flags & TK_MAPPED)) {
- return;
+ return Success;
}
if (parentPtr->flags & TK_TOP_HIERARCHY) {
break;
@@ -402,6 +403,7 @@ XMapWindow(display, w)
event.xvisibility.window = winPtr->window;
event.xvisibility.state = VisibilityUnobscured;
NotifyVisibility(&event, winPtr);
+ return Success;
}
/*
@@ -458,7 +460,7 @@ NotifyVisibility(eventPtr, winPtr)
*----------------------------------------------------------------------
*/
-void
+int
XUnmapWindow(display, w)
Display* display;
Window w;
@@ -486,6 +488,7 @@ XUnmapWindow(display, w)
event.xunmap.from_configure = False;
Tk_HandleEvent(&event);
}
+ return Success;
}
/*
@@ -504,7 +507,7 @@ XUnmapWindow(display, w)
*----------------------------------------------------------------------
*/
-void
+int
XMoveResizeWindow(display, w, x, y, width, height)
Display* display;
Window w;
@@ -515,6 +518,7 @@ XMoveResizeWindow(display, w, x, y, width, height)
{
display->request++;
MoveWindow(Tk_GetHWND(w), x, y, width, height, TRUE);
+ return Success;
}
/*
@@ -533,7 +537,7 @@ XMoveResizeWindow(display, w, x, y, width, height)
*----------------------------------------------------------------------
*/
-void
+int
XMoveWindow(display, w, x, y)
Display* display;
Window w;
@@ -546,6 +550,7 @@ XMoveWindow(display, w, x, y)
MoveWindow(Tk_GetHWND(w), x, y, winPtr->changes.width,
winPtr->changes.height, TRUE);
+ return Success;
}
/*
@@ -564,7 +569,7 @@ XMoveWindow(display, w, x, y)
*----------------------------------------------------------------------
*/
-void
+int
XResizeWindow(display, w, width, height)
Display* display;
Window w;
@@ -577,6 +582,7 @@ XResizeWindow(display, w, width, height)
MoveWindow(Tk_GetHWND(w), winPtr->changes.x, winPtr->changes.y, width,
height, TRUE);
+ return Success;
}
/*
@@ -595,7 +601,7 @@ XResizeWindow(display, w, width, height)
*----------------------------------------------------------------------
*/
-void
+int
XRaiseWindow(display, w)
Display* display;
Window w;
@@ -605,6 +611,7 @@ XRaiseWindow(display, w)
display->request++;
SetWindowPos(window, HWND_TOPMOST, 0, 0, 0, 0,
SWP_NOMOVE | SWP_NOSIZE);
+ return Success;
}
/*
@@ -626,7 +633,7 @@ XRaiseWindow(display, w)
*----------------------------------------------------------------------
*/
-void
+int
XConfigureWindow(display, w, value_mask, values)
Display* display;
Window w;
@@ -660,6 +667,7 @@ XConfigureWindow(display, w, value_mask, values)
}
TkWinSetWindowPos(hwnd, sibling, values->stack_mode);
}
+ return Success;
}
/*
@@ -678,7 +686,7 @@ XConfigureWindow(display, w, value_mask, values)
*----------------------------------------------------------------------
*/
-void
+int
XClearWindow(display, w)
Display* display;
Window w;
@@ -706,6 +714,7 @@ XClearWindow(display, w)
DeleteObject(brush);
SelectPalette(dc, oldPalette, TRUE);
ReleaseDC(hwnd, dc);
+ return Success;
}
/*
@@ -726,7 +735,7 @@ XClearWindow(display, w)
*----------------------------------------------------------------------
*/
-void
+int
XChangeWindowAttributes(display, w, valueMask, attributes)
Display* display;
Window w;
@@ -736,6 +745,7 @@ XChangeWindowAttributes(display, w, valueMask, attributes)
if (valueMask & CWCursor) {
XDefineCursor(display, w, attributes->cursor);
}
+ return Success;
}
/*
diff --git a/xlib/xgc.c b/xlib/xgc.c
index a741b76..083731a 100644
--- a/xlib/xgc.c
+++ b/xlib/xgc.c
@@ -181,7 +181,7 @@ XCreateGC(display, d, mask, values)
*----------------------------------------------------------------------
*/
-void
+int
XChangeGC(d, gc, mask, values)
Display * d;
GC gc;
@@ -211,6 +211,7 @@ XChangeGC(d, gc, mask, values)
if (mask & GCClipMask) { XSetClipMask(d, gc, values->clip_mask); }
if (mask & GCDashOffset) { gc->dash_offset = values->dash_offset; }
if (mask & GCDashList) { gc->dashes = values->dashes; (&(gc->dashes))[1] = 0;}
+ return Success;
}
/*
@@ -229,7 +230,7 @@ XChangeGC(d, gc, mask, values)
*----------------------------------------------------------------------
*/
-void XFreeGC(d, gc)
+int XFreeGC(d, gc)
Display * d;
GC gc;
{
@@ -237,6 +238,7 @@ void XFreeGC(d, gc)
FreeClipMask(gc);
ckfree((char *) gc);
}
+ return Success;
}
/*
@@ -256,22 +258,24 @@ void XFreeGC(d, gc)
*----------------------------------------------------------------------
*/
-void
+int
XSetForeground(display, gc, foreground)
Display *display;
GC gc;
unsigned long foreground;
{
gc->foreground = foreground;
+ return Success;
}
-void
+int
XSetBackground(display, gc, background)
Display *display;
GC gc;
unsigned long background;
{
gc->background = background;
+ return Success;
}
int
@@ -299,34 +303,37 @@ XSetDashes(display, gc, dash_offset, dash_list, n)
return Success;
}
-void
+int
XSetFunction(display, gc, function)
Display *display;
GC gc;
int function;
{
gc->function = function;
+ return Success;
}
-void
+int
XSetFillRule(display, gc, fill_rule)
Display *display;
GC gc;
int fill_rule;
{
gc->fill_rule = fill_rule;
+ return Success;
}
-void
+int
XSetFillStyle(display, gc, fill_style)
Display *display;
GC gc;
int fill_style;
{
gc->fill_style = fill_style;
+ return Success;
}
-void
+int
XSetTSOrigin(display, gc, x, y)
Display *display;
GC gc;
@@ -334,36 +341,40 @@ XSetTSOrigin(display, gc, x, y)
{
gc->ts_x_origin = x;
gc->ts_y_origin = y;
+ return Success;
}
-void
+int
XSetFont(display, gc, font)
Display *display;
GC gc;
Font font;
{
gc->font = font;
+ return Success;
}
-void
+int
XSetArcMode(display, gc, arc_mode)
Display *display;
GC gc;
int arc_mode;
{
gc->arc_mode = arc_mode;
+ return Success;
}
-void
+int
XSetStipple(display, gc, stipple)
Display *display;
GC gc;
Pixmap stipple;
{
gc->stipple = stipple;
+ return Success;
}
-void
+int
XSetLineAttributes(display, gc, line_width, line_style, cap_style,
join_style)
Display *display;
@@ -377,9 +388,10 @@ XSetLineAttributes(display, gc, line_width, line_style, cap_style,
gc->line_style = line_style;
gc->cap_style = cap_style;
gc->join_style = join_style;
+ return Success;
}
-void
+int
XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
Display* display;
GC gc;
@@ -388,6 +400,7 @@ XSetClipOrigin(display, gc, clip_x_origin, clip_y_origin)
{
gc->clip_x_origin = clip_x_origin;
gc->clip_y_origin = clip_y_origin;
+ return Success;
}
/*
@@ -430,7 +443,7 @@ TkSetRegion(display, gc, r)
}
}
-void
+int
XSetClipMask(display, gc, pixmap)
Display* display;
GC gc;
@@ -444,6 +457,7 @@ XSetClipMask(display, gc, pixmap)
clip_mask->type = TKP_CLIP_PIXMAP;
clip_mask->value.pixmap = pixmap;
}
+ return Success;
}
/*
generated by cgit v0.12 at 2024-11-10 06:00:34 (GMT)