summaryrefslogtreecommitdiffstats
path: root/xlib
diff options
context:
space:
mode:
authorstanton <stanton>1999-03-10 07:04:38 (GMT)
committerstanton <stanton>1999-03-10 07:04:38 (GMT)
commit50950accea8a4e877651105374865cb6f3f48d6e (patch)
treeb83515b886272ee3c61631f31cfe3fad937dc0a7 /xlib
parentd6904011d50a34d15964b94db8d5e7010e081ffd (diff)
downloadtk-50950accea8a4e877651105374865cb6f3f48d6e.zip
tk-50950accea8a4e877651105374865cb6f3f48d6e.tar.gz
tk-50950accea8a4e877651105374865cb6f3f48d6e.tar.bz2
integrated stubs into 8.0 main branch
Diffstat (limited to 'xlib')
-rw-r--r--xlib/X11/Xlib.h3020
-rw-r--r--xlib/xdraw.c4
2 files changed, 11 insertions, 3013 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h
index 397bb03..ef96f35 100644
--- a/xlib/X11/Xlib.h
+++ b/xlib/X11/Xlib.h
@@ -1180,179 +1180,16 @@ typedef struct _XIMStatusDrawCallbackStruct {
} data;
} XIMStatusDrawCallbackStruct;
-_XFUNCPROTOBEGIN
-
-extern XFontStruct *XLoadQueryFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* name */
-#endif
-);
-
-extern XFontStruct *XQueryFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XID /* font_ID */
-#endif
-);
-
-
-extern XTimeCoord *XGetMotionEvents(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Time /* start */,
- Time /* stop */,
- int* /* nevents_return */
-#endif
-);
-
-extern XModifierKeymap *XDeleteModifiermapEntry(
-#if NeedFunctionPrototypes
- XModifierKeymap* /* modmap */,
-#if NeedWidePrototypes
- unsigned int /* keycode_entry */,
-#else
- KeyCode /* keycode_entry */,
-#endif
- int /* modifier */
-#endif
-);
-
-extern XModifierKeymap *XGetModifierMapping(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern XModifierKeymap *XInsertModifiermapEntry(
-#if NeedFunctionPrototypes
- XModifierKeymap* /* modmap */,
-#if NeedWidePrototypes
- unsigned int /* keycode_entry */,
-#else
- KeyCode /* keycode_entry */,
-#endif
- int /* modifier */
-#endif
-);
-
-extern XModifierKeymap *XNewModifiermap(
-#if NeedFunctionPrototypes
- int /* max_keys_per_mod */
-#endif
-);
-
-extern XImage *XCreateImage(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Visual* /* visual */,
- unsigned int /* depth */,
- int /* format */,
- int /* offset */,
- char* /* data */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* bitmap_pad */,
- int /* bytes_per_line */
-#endif
-);
-extern XImage *XGetImage(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned long /* plane_mask */,
- int /* format */
-#endif
-);
-extern XImage *XGetSubImage(
+typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
#if NeedFunctionPrototypes
Display* /* display */,
- Drawable /* d */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned long /* plane_mask */,
- int /* format */,
- XImage* /* dest_image */,
- int /* dest_x */,
- int /* dest_y */
-#endif
-);
-
-/*
- * X function declarations.
- */
-extern Display *XOpenDisplay(
-#if NeedFunctionPrototypes
- _Xconst char* /* display_name */
+ XErrorEvent* /* error_event */
#endif
);
-extern void XrmInitialize(
-#if NeedFunctionPrototypes
- void
-#endif
-);
+_XFUNCPROTOBEGIN
-extern char *XFetchBytes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* nbytes_return */
-#endif
-);
-extern char *XFetchBuffer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* nbytes_return */,
- int /* buffer */
-#endif
-);
-extern char *XGetAtomName(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Atom /* atom */
-#endif
-);
-extern char *XGetDefault(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* program */,
- _Xconst char* /* option */
-#endif
-);
-extern char *XDisplayName(
-#if NeedFunctionPrototypes
- _Xconst char* /* string */
-#endif
-);
-extern char *XKeysymToString(
-#if NeedFunctionPrototypes
- KeySym /* keysym */
-#endif
-);
-extern int (*XSynchronize(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Bool /* onoff */
-#endif
-))();
-extern int (*XSetAfterFunction(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int (*) (
-#if NeedNestedPrototypes
- Display* /* display */
-#endif
- ) /* procedure */
-#endif
-))();
extern Atom XInternAtom(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -1360,54 +1197,8 @@ extern Atom XInternAtom(
Bool /* only_if_exists */
#endif
);
-extern Colormap XCopyColormapAndFree(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */
-#endif
-);
-extern Colormap XCreateColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Visual* /* visual */,
- int /* alloc */
-#endif
-);
-extern Cursor XCreatePixmapCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Pixmap /* source */,
- Pixmap /* mask */,
- XColor* /* foreground_color */,
- XColor* /* background_color */,
- unsigned int /* x */,
- unsigned int /* y */
-#endif
-);
-extern Cursor XCreateGlyphCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Font /* source_font */,
- Font /* mask_font */,
- unsigned int /* source_char */,
- unsigned int /* mask_char */,
- XColor* /* foreground_color */,
- XColor* /* background_color */
-#endif
-);
-extern Cursor XCreateFontCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned int /* shape */
-#endif
-);
-extern Font XLoadFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* name */
-#endif
-);
+
+
extern GC XCreateGC(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -1416,26 +1207,8 @@ extern GC XCreateGC(
XGCValues* /* values */
#endif
);
-extern GContext XGContextFromGC(
-#if NeedFunctionPrototypes
- GC /* gc */
-#endif
-);
-extern void XFlushGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */
-#endif
-);
-extern Pixmap XCreatePixmap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* depth */
-#endif
-);
+
+
extern Pixmap XCreateBitmapFromData(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -1445,977 +1218,7 @@ extern Pixmap XCreateBitmapFromData(
unsigned int /* height */
#endif
);
-extern Pixmap XCreatePixmapFromBitmapData(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- char* /* data */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned long /* fg */,
- unsigned long /* bg */,
- unsigned int /* depth */
-#endif
-);
-extern Window XCreateSimpleWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* parent */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* border_width */,
- unsigned long /* border */,
- unsigned long /* background */
-#endif
-);
-extern Window XGetSelectionOwner(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Atom /* selection */
-#endif
-);
-extern Window XCreateWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* parent */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* border_width */,
- int /* depth */,
- unsigned int /* class */,
- Visual* /* visual */,
- unsigned long /* valuemask */,
- XSetWindowAttributes* /* attributes */
-#endif
-);
-extern Colormap *XListInstalledColormaps(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int* /* num_return */
-#endif
-);
-extern char **XListFonts(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* pattern */,
- int /* maxnames */,
- int* /* actual_count_return */
-#endif
-);
-extern char **XListFontsWithInfo(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* pattern */,
- int /* maxnames */,
- int* /* count_return */,
- XFontStruct** /* info_return */
-#endif
-);
-extern char **XGetFontPath(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* npaths_return */
-#endif
-);
-extern char **XListExtensions(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* nextensions_return */
-#endif
-);
-extern Atom *XListProperties(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int* /* num_prop_return */
-#endif
-);
-extern XHostAddress *XListHosts(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* nhosts_return */,
- Bool* /* state_return */
-#endif
-);
-extern KeySym XKeycodeToKeysym(
-#if NeedFunctionPrototypes
- Display* /* display */,
-#if NeedWidePrototypes
- unsigned int /* keycode */,
-#else
- KeyCode /* keycode */,
-#endif
- int /* index */
-#endif
-);
-extern KeySym XLookupKeysym(
-#if NeedFunctionPrototypes
- XKeyEvent* /* key_event */,
- int /* index */
-#endif
-);
-extern KeySym *XGetKeyboardMapping(
-#if NeedFunctionPrototypes
- Display* /* display */,
-#if NeedWidePrototypes
- unsigned int /* first_keycode */,
-#else
- KeyCode /* first_keycode */,
-#endif
- int /* keycode_count */,
- int* /* keysyms_per_keycode_return */
-#endif
-);
-extern KeySym XStringToKeysym(
-#if NeedFunctionPrototypes
- _Xconst char* /* string */
-#endif
-);
-extern long XMaxRequestSize(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern long XExtendedMaxRequestSize(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern char *XResourceManagerString(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern char *XScreenResourceString(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern unsigned long XDisplayMotionBufferSize(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern VisualID XVisualIDFromVisual(
-#if NeedFunctionPrototypes
- Visual* /* visual */
-#endif
-);
-
-/* routines for dealing with extensions */
-
-extern XExtCodes *XInitExtension(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* name */
-#endif
-);
-
-extern XExtCodes *XAddExtension(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern XExtData *XFindOnExtensionList(
-#if NeedFunctionPrototypes
- XExtData** /* structure */,
- int /* number */
-#endif
-);
-extern XExtData **XEHeadOfExtensionList(
-#if NeedFunctionPrototypes
- XEDataObject /* object */
-#endif
-);
-
-/* these are routines for which there are also macros */
-extern Window XRootWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern Window XDefaultRootWindow(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern Window XRootWindowOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern Visual *XDefaultVisual(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern Visual *XDefaultVisualOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern GC XDefaultGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern GC XDefaultGCOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern unsigned long XBlackPixel(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern unsigned long XWhitePixel(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern unsigned long XAllPlanes(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-extern unsigned long XBlackPixelOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern unsigned long XWhitePixelOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern unsigned long XNextRequest(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern unsigned long XLastKnownRequestProcessed(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern char *XServerVendor(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern char *XDisplayString(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern Colormap XDefaultColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern Colormap XDefaultColormapOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern Display *XDisplayOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-extern Screen *XScreenOfDisplay(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-extern Screen *XDefaultScreenOfDisplay(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-extern long XEventMaskOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern int XScreenNumberOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-typedef int (*XErrorHandler) ( /* WARNING, this type not in Xlib spec */
-#if NeedFunctionPrototypes
- Display* /* display */,
- XErrorEvent* /* error_event */
-#endif
-);
-
-extern XErrorHandler XSetErrorHandler (
-#if NeedFunctionPrototypes
- XErrorHandler /* handler */
-#endif
-);
-
-
-typedef int (*XIOErrorHandler) ( /* WARNING, this type not in Xlib spec */
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern XIOErrorHandler XSetIOErrorHandler (
-#if NeedFunctionPrototypes
- XIOErrorHandler /* handler */
-#endif
-);
-
-
-extern XPixmapFormatValues *XListPixmapFormats(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* count_return */
-#endif
-);
-extern int *XListDepths(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */,
- int* /* count_return */
-#endif
-);
-
-/* ICCCM routines for things that don't require special include files; */
-/* other declarations are given in Xutil.h */
-extern Status XReconfigureWMWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* screen_number */,
- unsigned int /* mask */,
- XWindowChanges* /* changes */
-#endif
-);
-
-extern Status XGetWMProtocols(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom** /* protocols_return */,
- int* /* count_return */
-#endif
-);
-extern Status XSetWMProtocols(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom* /* protocols */,
- int /* count */
-#endif
-);
-extern Status XIconifyWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* screen_number */
-#endif
-);
-extern Status XWithdrawWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* screen_number */
-#endif
-);
-extern Status XGetCommand(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- char*** /* argv_return */,
- int* /* argc_return */
-#endif
-);
-extern Status XGetWMColormapWindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window** /* windows_return */,
- int* /* count_return */
-#endif
-);
-extern Status XSetWMColormapWindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window* /* colormap_windows */,
- int /* count */
-#endif
-);
-extern void XFreeStringList(
-#if NeedFunctionPrototypes
- char** /* list */
-#endif
-);
-extern void XSetTransientForHint(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window /* prop_window */
-#endif
-);
-
-/* The following are given in alphabetical order */
-
-extern void XActivateScreenSaver(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XAddHost(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XHostAddress* /* host */
-#endif
-);
-
-extern void XAddHosts(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XHostAddress* /* hosts */,
- int /* num_hosts */
-#endif
-);
-
-extern void XAddToExtensionList(
-#if NeedFunctionPrototypes
- struct _XExtData** /* structure */,
- XExtData* /* ext_data */
-#endif
-);
-
-extern void XAddToSaveSet(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern Status XAllocColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- XColor* /* screen_in_out */
-#endif
-);
-
-extern Status XAllocColorCells(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- Bool /* contig */,
- unsigned long* /* plane_masks_return */,
- unsigned int /* nplanes */,
- unsigned long* /* pixels_return */,
- unsigned int /* npixels */
-#endif
-);
-
-extern Status XAllocColorPlanes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- Bool /* contig */,
- unsigned long* /* pixels_return */,
- int /* ncolors */,
- int /* nreds */,
- int /* ngreens */,
- int /* nblues */,
- unsigned long* /* rmask_return */,
- unsigned long* /* gmask_return */,
- unsigned long* /* bmask_return */
-#endif
-);
-
-extern Status XAllocNamedColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- _Xconst char* /* color_name */,
- XColor* /* screen_def_return */,
- XColor* /* exact_def_return */
-#endif
-);
-
-extern void XAllowEvents(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* event_mode */,
- Time /* time */
-#endif
-);
-
-extern void XAutoRepeatOff(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XAutoRepeatOn(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XBell(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* percent */
-#endif
-);
-
-extern int XBitmapBitOrder(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XBitmapPad(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XBitmapUnit(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XCellsOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern void XChangeActivePointerGrab(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned int /* event_mask */,
- Cursor /* cursor */,
- Time /* time */
-#endif
-);
-
-extern void XChangeGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* valuemask */,
- XGCValues* /* values */
-#endif
-);
-
-extern void XChangeKeyboardControl(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned long /* value_mask */,
- XKeyboardControl* /* values */
-#endif
-);
-
-extern void XChangeKeyboardMapping(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* first_keycode */,
- int /* keysyms_per_keycode */,
- KeySym* /* keysyms */,
- int /* num_codes */
-#endif
-);
-
-extern void XChangePointerControl(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Bool /* do_accel */,
- Bool /* do_threshold */,
- int /* accel_numerator */,
- int /* accel_denominator */,
- int /* threshold */
-#endif
-);
-
-extern void XChangeProperty(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom /* property */,
- Atom /* type */,
- int /* format */,
- int /* mode */,
- _Xconst unsigned char* /* data */,
- int /* nelements */
-#endif
-);
-
-extern void XChangeSaveSet(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* change_mode */
-#endif
-);
-
-extern void XChangeWindowAttributes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned long /* valuemask */,
- XSetWindowAttributes* /* attributes */
-#endif
-);
-
-extern Bool XCheckIfEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event_return */,
- Bool (*) (
-#if NeedNestedPrototypes
- Display* /* display */,
- XEvent* /* event */,
- XPointer /* arg */
-#endif
- ) /* predicate */,
- XPointer /* arg */
-#endif
-);
-
-extern Bool XCheckMaskEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- long /* event_mask */,
- XEvent* /* event_return */
-#endif
-);
-
-extern Bool XCheckTypedEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* event_type */,
- XEvent* /* event_return */
-#endif
-);
-
-extern Bool XCheckTypedWindowEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* event_type */,
- XEvent* /* event_return */
-#endif
-);
-
-extern Bool XCheckWindowEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- long /* event_mask */,
- XEvent* /* event_return */
-#endif
-);
-
-extern void XCirculateSubwindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* direction */
-#endif
-);
-
-extern void XCirculateSubwindowsDown(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XCirculateSubwindowsUp(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XClearArea(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- Bool /* exposures */
-#endif
-);
-extern void XClearWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XCloseDisplay(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XConfigureWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned int /* value_mask */,
- XWindowChanges* /* values */
-#endif
-);
-
-extern int XConnectionNumber(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XConvertSelection(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Atom /* selection */,
- Atom /* target */,
- Atom /* property */,
- Window /* requestor */,
- Time /* time */
-#endif
-);
-
-extern void XCopyArea(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* src */,
- Drawable /* dest */,
- GC /* gc */,
- int /* src_x */,
- int /* src_y */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* dest_x */,
- int /* dest_y */
-#endif
-);
-
-extern void XCopyGC(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* src */,
- unsigned long /* valuemask */,
- GC /* dest */
-#endif
-);
-
-extern void XCopyPlane(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* src */,
- Drawable /* dest */,
- GC /* gc */,
- int /* src_x */,
- int /* src_y */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* dest_x */,
- int /* dest_y */,
- unsigned long /* plane */
-#endif
-);
-
-extern int XDefaultDepth(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern int XDefaultDepthOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern int XDefaultScreen(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XDefineCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Cursor /* cursor */
-#endif
-);
-
-extern void XDeleteProperty(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom /* property */
-#endif
-);
-
-extern void XDestroyWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XDestroySubwindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern int XDoesBackingStore(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern Bool XDoesSaveUnders(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern void XDisableAccessControl(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-
-extern int XDisplayCells(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern int XDisplayHeight(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern int XDisplayHeightMM(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern void XDisplayKeycodes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* min_keycodes_return */,
- int* /* max_keycodes_return */
-#endif
-);
-
-extern int XDisplayPlanes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern int XDisplayWidth(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern int XDisplayWidthMM(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen_number */
-#endif
-);
-
-extern void XDrawArc(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* angle1 */,
- int /* angle2 */
-#endif
-);
-
-extern void XDrawArcs(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XArc* /* arcs */,
- int /* narcs */
-#endif
-);
-
-extern void XDrawImageString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst char* /* string */,
- int /* length */
-#endif
-);
-
-extern void XDrawImageString16(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst XChar2b* /* string */,
- int /* length */
-#endif
-);
extern void XDrawLine(
#if NeedFunctionPrototypes
@@ -2429,174 +1232,6 @@ extern void XDrawLine(
#endif
);
-extern void XDrawLines(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XPoint* /* points */,
- int /* npoints */,
- int /* mode */
-#endif
-);
-
-extern void XDrawPoint(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */
-#endif
-);
-
-extern void XDrawPoints(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XPoint* /* points */,
- int /* npoints */,
- int /* mode */
-#endif
-);
-
-extern void XDrawRectangle(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */
-#endif
-);
-
-extern void XDrawRectangles(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XRectangle* /* rectangles */,
- int /* nrectangles */
-#endif
-);
-
-extern void XDrawSegments(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XSegment* /* segments */,
- int /* nsegments */
-#endif
-);
-
-extern void XDrawString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst char* /* string */,
- int /* length */
-#endif
-);
-
-extern void XDrawString16(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst XChar2b* /* string */,
- int /* length */
-#endif
-);
-
-extern void XDrawText(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- XTextItem* /* items */,
- int /* nitems */
-#endif
-);
-
-extern void XDrawText16(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- XTextItem16* /* items */,
- int /* nitems */
-#endif
-);
-
-extern void XEnableAccessControl(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XEventsQueued(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* mode */
-#endif
-);
-
-extern Status XFetchName(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- char** /* window_name_return */
-#endif
-);
-
-extern void XFillArc(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* angle1 */,
- int /* angle2 */
-#endif
-);
-
-extern void XFillArcs(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XArc* /* arcs */,
- int /* narcs */
-#endif
-);
-
-extern void XFillPolygon(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XPoint* /* points */,
- int /* npoints */,
- int /* shape */,
- int /* mode */
-#endif
-);
extern void XFillRectangle(
#if NeedFunctionPrototypes
@@ -2610,92 +1245,6 @@ extern void XFillRectangle(
#endif
);
-extern void XFillRectangles(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XRectangle* /* rectangles */,
- int /* nrectangles */
-#endif
-);
-
-extern void XFlush(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XForceScreenSaver(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* mode */
-#endif
-);
-
-extern void XFree(
-#if NeedFunctionPrototypes
- void* /* data */
-#endif
-);
-
-extern void XFreeColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */
-#endif
-);
-
-extern void XFreeColors(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- unsigned long* /* pixels */,
- int /* npixels */,
- unsigned long /* planes */
-#endif
-);
-
-extern void XFreeCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Cursor /* cursor */
-#endif
-);
-
-extern void XFreeExtensionList(
-#if NeedFunctionPrototypes
- char** /* list */
-#endif
-);
-
-extern void XFreeFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XFontStruct* /* font_struct */
-#endif
-);
-
-extern void XFreeFontInfo(
-#if NeedFunctionPrototypes
- char** /* names */,
- XFontStruct* /* free_info */,
- int /* actual_count */
-#endif
-);
-
-extern void XFreeFontNames(
-#if NeedFunctionPrototypes
- char** /* list */
-#endif
-);
-
-extern void XFreeFontPath(
-#if NeedFunctionPrototypes
- char** /* list */
-#endif
-);
-
extern void XFreeGC(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -2703,380 +1252,6 @@ extern void XFreeGC(
#endif
);
-extern void XFreeModifiermap(
-#if NeedFunctionPrototypes
- XModifierKeymap* /* modmap */
-#endif
-);
-
-extern void XFreePixmap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Pixmap /* pixmap */
-#endif
-);
-
-extern int XGeometry(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* screen */,
- _Xconst char* /* position */,
- _Xconst char* /* default_position */,
- unsigned int /* bwidth */,
- unsigned int /* fwidth */,
- unsigned int /* fheight */,
- int /* xadder */,
- int /* yadder */,
- int* /* x_return */,
- int* /* y_return */,
- int* /* width_return */,
- int* /* height_return */
-#endif
-);
-
-extern void XGetErrorDatabaseText(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* name */,
- _Xconst char* /* message */,
- _Xconst char* /* default_string */,
- char* /* buffer_return */,
- int /* length */
-#endif
-);
-
-extern void XGetErrorText(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* code */,
- char* /* buffer_return */,
- int /* length */
-#endif
-);
-
-extern Bool XGetFontProperty(
-#if NeedFunctionPrototypes
- XFontStruct* /* font_struct */,
- Atom /* atom */,
- unsigned long* /* value_return */
-#endif
-);
-
-extern Status XGetGCValues(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* valuemask */,
- XGCValues* /* values_return */
-#endif
-);
-
-extern Status XGetGeometry(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- Window* /* root_return */,
- int* /* x_return */,
- int* /* y_return */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */,
- unsigned int* /* border_width_return */,
- unsigned int* /* depth_return */
-#endif
-);
-
-extern Status XGetIconName(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- char** /* icon_name_return */
-#endif
-);
-
-extern void XGetInputFocus(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window* /* focus_return */,
- int* /* revert_to_return */
-#endif
-);
-
-extern void XGetKeyboardControl(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XKeyboardState* /* values_return */
-#endif
-);
-
-extern void XGetPointerControl(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* accel_numerator_return */,
- int* /* accel_denominator_return */,
- int* /* threshold_return */
-#endif
-);
-
-extern int XGetPointerMapping(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned char* /* map_return */,
- int /* nmap */
-#endif
-);
-
-extern void XGetScreenSaver(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int* /* timeout_return */,
- int* /* interval_return */,
- int* /* prefer_blanking_return */,
- int* /* allow_exposures_return */
-#endif
-);
-
-extern Status XGetTransientForHint(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window* /* prop_window_return */
-#endif
-);
-
-extern int XGetWindowProperty(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom /* property */,
- long /* long_offset */,
- long /* long_length */,
- Bool /* delete */,
- Atom /* req_type */,
- Atom* /* actual_type_return */,
- int* /* actual_format_return */,
- unsigned long* /* nitems_return */,
- unsigned long* /* bytes_after_return */,
- unsigned char** /* prop_return */
-#endif
-);
-
-extern Status XGetWindowAttributes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- XWindowAttributes* /* window_attributes_return */
-#endif
-);
-
-extern void XGrabButton(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned int /* button */,
- unsigned int /* modifiers */,
- Window /* grab_window */,
- Bool /* owner_events */,
- unsigned int /* event_mask */,
- int /* pointer_mode */,
- int /* keyboard_mode */,
- Window /* confine_to */,
- Cursor /* cursor */
-#endif
-);
-
-extern void XGrabKey(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* keycode */,
- unsigned int /* modifiers */,
- Window /* grab_window */,
- Bool /* owner_events */,
- int /* pointer_mode */,
- int /* keyboard_mode */
-#endif
-);
-
-extern int XGrabKeyboard(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* grab_window */,
- Bool /* owner_events */,
- int /* pointer_mode */,
- int /* keyboard_mode */,
- Time /* time */
-#endif
-);
-
-extern int XGrabPointer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* grab_window */,
- Bool /* owner_events */,
- unsigned int /* event_mask */,
- int /* pointer_mode */,
- int /* keyboard_mode */,
- Window /* confine_to */,
- Cursor /* cursor */,
- Time /* time */
-#endif
-);
-
-extern void XGrabServer(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XHeightMMOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern int XHeightOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern void XIfEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event_return */,
- Bool (*) (
-#if NeedNestedPrototypes
- Display* /* display */,
- XEvent* /* event */,
- XPointer /* arg */
-#endif
- ) /* predicate */,
- XPointer /* arg */
-#endif
-);
-
-extern int XImageByteOrder(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XInstallColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */
-#endif
-);
-
-extern KeyCode XKeysymToKeycode(
-#if NeedFunctionPrototypes
- Display* /* display */,
- KeySym /* keysym */
-#endif
-);
-
-extern void XKillClient(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XID /* resource */
-#endif
-);
-
-extern unsigned long XLastKnownRequestProcessed(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern Status XLookupColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- _Xconst char* /* color_name */,
- XColor* /* exact_def_return */,
- XColor* /* screen_def_return */
-#endif
-);
-
-extern void XLowerWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XMapRaised(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XMapSubwindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XMapWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XMaskEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- long /* event_mask */,
- XEvent* /* event_return */
-#endif
-);
-
-extern int XMaxCmapsOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern int XMinCmapsOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern void XMoveResizeWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */
-#endif
-);
-
-extern void XMoveWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- int /* x */,
- int /* y */
-#endif
-);
-
-extern void XNextEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event_return */
-#endif
-);
-
-extern void XNoOp(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
extern Status XParseColor(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -3086,387 +1261,6 @@ extern Status XParseColor(
#endif
);
-extern int XParseGeometry(
-#if NeedFunctionPrototypes
- _Xconst char* /* parsestring */,
- int* /* x_return */,
- int* /* y_return */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */
-#endif
-);
-
-extern void XPeekEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event_return */
-#endif
-);
-
-extern void XPeekIfEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event_return */,
- Bool (*) (
-#if NeedNestedPrototypes
- Display* /* display */,
- XEvent* /* event */,
- XPointer /* arg */
-#endif
- ) /* predicate */,
- XPointer /* arg */
-#endif
-);
-
-extern int XPending(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XPlanesOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-
-#endif
-);
-
-extern int XProtocolRevision(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern int XProtocolVersion(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-
-extern void XPutBackEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XEvent* /* event */
-#endif
-);
-
-extern void XPutImage(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- XImage* /* image */,
- int /* src_x */,
- int /* src_y */,
- int /* dest_x */,
- int /* dest_y */,
- unsigned int /* width */,
- unsigned int /* height */
-#endif
-);
-
-extern int XQLength(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern Status XQueryBestCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */
-#endif
-);
-
-extern Status XQueryBestSize(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* class */,
- Drawable /* which_screen */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */
-#endif
-);
-
-extern Status XQueryBestStipple(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* which_screen */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */
-#endif
-);
-
-extern Status XQueryBestTile(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* which_screen */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */
-#endif
-);
-
-extern void XQueryColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- XColor* /* def_in_out */
-#endif
-);
-
-extern void XQueryColors(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- XColor* /* defs_in_out */,
- int /* ncolors */
-#endif
-);
-
-extern Bool XQueryExtension(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* name */,
- int* /* major_opcode_return */,
- int* /* first_event_return */,
- int* /* first_error_return */
-#endif
-);
-
-extern void XQueryKeymap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- char [32] /* keys_return */
-#endif
-);
-
-extern Bool XQueryPointer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window* /* root_return */,
- Window* /* child_return */,
- int* /* root_x_return */,
- int* /* root_y_return */,
- int* /* win_x_return */,
- int* /* win_y_return */,
- unsigned int* /* mask_return */
-#endif
-);
-
-extern void XQueryTextExtents(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XID /* font_ID */,
- _Xconst char* /* string */,
- int /* nchars */,
- int* /* direction_return */,
- int* /* font_ascent_return */,
- int* /* font_descent_return */,
- XCharStruct* /* overall_return */
-#endif
-);
-
-extern void XQueryTextExtents16(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XID /* font_ID */,
- _Xconst XChar2b* /* string */,
- int /* nchars */,
- int* /* direction_return */,
- int* /* font_ascent_return */,
- int* /* font_descent_return */,
- XCharStruct* /* overall_return */
-#endif
-);
-
-extern Status XQueryTree(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window* /* root_return */,
- Window* /* parent_return */,
- Window** /* children_return */,
- unsigned int* /* nchildren_return */
-#endif
-);
-
-extern void XRaiseWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern int XReadBitmapFile(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- _Xconst char* /* filename */,
- unsigned int* /* width_return */,
- unsigned int* /* height_return */,
- Pixmap* /* bitmap_return */,
- int* /* x_hot_return */,
- int* /* y_hot_return */
-#endif
-);
-
-extern void XRebindKeysym(
-#if NeedFunctionPrototypes
- Display* /* display */,
- KeySym /* keysym */,
- KeySym* /* list */,
- int /* mod_count */,
- _Xconst unsigned char* /* string */,
- int /* bytes_string */
-#endif
-);
-
-extern void XRecolorCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Cursor /* cursor */,
- XColor* /* foreground_color */,
- XColor* /* background_color */
-#endif
-);
-
-extern void XRefreshKeyboardMapping(
-#if NeedFunctionPrototypes
- XMappingEvent* /* event_map */
-#endif
-);
-
-extern void XRemoveFromSaveSet(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XRemoveHost(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XHostAddress* /* host */
-#endif
-);
-
-extern void XRemoveHosts(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XHostAddress* /* hosts */,
- int /* num_hosts */
-#endif
-);
-
-extern void XReparentWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Window /* parent */,
- int /* x */,
- int /* y */
-#endif
-);
-
-extern void XResetScreenSaver(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XResizeWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned int /* width */,
- unsigned int /* height */
-#endif
-);
-
-extern void XRestackWindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window* /* windows */,
- int /* nwindows */
-#endif
-);
-
-extern void XRotateBuffers(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* rotate */
-#endif
-);
-
-extern void XRotateWindowProperties(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Atom* /* properties */,
- int /* num_prop */,
- int /* npositions */
-#endif
-);
-
-extern int XScreenCount(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XSelectInput(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- long /* event_mask */
-#endif
-);
-
-extern Status XSendEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Bool /* propagate */,
- long /* event_mask */,
- XEvent* /* event_send */
-#endif
-);
-
-extern void XSetAccessControl(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* mode */
-#endif
-);
-
-extern void XSetArcMode(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* arc_mode */
-#endif
-);
-
-extern void XSetBackground(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* background */
-#endif
-);
-
extern void XSetClipMask(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -3475,6 +1269,7 @@ extern void XSetClipMask(
#endif
);
+
extern void XSetClipOrigin(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -3484,76 +1279,6 @@ extern void XSetClipOrigin(
#endif
);
-extern void XSetClipRectangles(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* clip_x_origin */,
- int /* clip_y_origin */,
- XRectangle* /* rectangles */,
- int /* n */,
- int /* ordering */
-#endif
-);
-
-extern void XSetCloseDownMode(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* close_mode */
-#endif
-);
-
-extern void XSetCommand(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- char** /* argv */,
- int /* argc */
-#endif
-);
-
-extern void XSetDashes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* dash_offset */,
- _Xconst char* /* dash_list */,
- int /* n */
-#endif
-);
-
-extern void XSetFillRule(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* fill_rule */
-#endif
-);
-
-extern void XSetFillStyle(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* fill_style */
-#endif
-);
-
-extern void XSetFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Font /* font */
-#endif
-);
-
-extern void XSetFontPath(
-#if NeedFunctionPrototypes
- Display* /* display */,
- char** /* directories */,
- int /* ndirs */
-#endif
-);
-
extern void XSetForeground(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -3562,119 +1287,6 @@ extern void XSetForeground(
#endif
);
-extern void XSetFunction(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* function */
-#endif
-);
-
-extern void XSetGraphicsExposures(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Bool /* graphics_exposures */
-#endif
-);
-
-extern void XSetIconName(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- _Xconst char* /* icon_name */
-#endif
-);
-
-extern void XSetInputFocus(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* focus */,
- int /* revert_to */,
- Time /* time */
-#endif
-);
-
-extern void XSetLineAttributes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned int /* line_width */,
- int /* line_style */,
- int /* cap_style */,
- int /* join_style */
-#endif
-);
-
-extern int XSetModifierMapping(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XModifierKeymap* /* modmap */
-#endif
-);
-
-extern void XSetPlaneMask(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* plane_mask */
-#endif
-);
-
-extern int XSetPointerMapping(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst unsigned char* /* map */,
- int /* nmap */
-#endif
-);
-
-extern void XSetScreenSaver(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* timeout */,
- int /* interval */,
- int /* prefer_blanking */,
- int /* allow_exposures */
-#endif
-);
-
-extern void XSetSelectionOwner(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Atom /* selection */,
- Window /* owner */,
- Time /* time */
-#endif
-);
-
-extern void XSetState(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- unsigned long /* foreground */,
- unsigned long /* background */,
- int /* function */,
- unsigned long /* plane_mask */
-#endif
-);
-
-extern void XSetStipple(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Pixmap /* stipple */
-#endif
-);
-
-extern void XSetSubwindowMode(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- int /* subwindow_mode */
-#endif
-);
-
extern void XSetTSOrigin(
#if NeedFunctionPrototypes
Display* /* display */,
@@ -3684,622 +1296,8 @@ extern void XSetTSOrigin(
#endif
);
-extern void XSetTile(
-#if NeedFunctionPrototypes
- Display* /* display */,
- GC /* gc */,
- Pixmap /* tile */
-#endif
-);
-
-extern void XSetWindowBackground(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned long /* background_pixel */
-#endif
-);
-
-extern void XSetWindowBackgroundPixmap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Pixmap /* background_pixmap */
-#endif
-);
-
-extern void XSetWindowBorder(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned long /* border_pixel */
-#endif
-);
-
-extern void XSetWindowBorderPixmap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Pixmap /* border_pixmap */
-#endif
-);
-
-extern void XSetWindowBorderWidth(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- unsigned int /* width */
-#endif
-);
-
-extern void XSetWindowColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- Colormap /* colormap */
-#endif
-);
-
-extern void XStoreBuffer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* bytes */,
- int /* nbytes */,
- int /* buffer */
-#endif
-);
-
-extern void XStoreBytes(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* bytes */,
- int /* nbytes */
-#endif
-);
-
-extern void XStoreColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- XColor* /* color */
-#endif
-);
-
-extern void XStoreColors(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- XColor* /* color */,
- int /* ncolors */
-#endif
-);
-
-extern void XStoreName(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- _Xconst char* /* window_name */
-#endif
-);
-
-extern void XStoreNamedColor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */,
- _Xconst char* /* color */,
- unsigned long /* pixel */,
- int /* flags */
-#endif
-);
-
-extern void XSync(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Bool /* discard */
-#endif
-);
-
-extern void XTextExtents(
-#if NeedFunctionPrototypes
- XFontStruct* /* font_struct */,
- _Xconst char* /* string */,
- int /* nchars */,
- int* /* direction_return */,
- int* /* font_ascent_return */,
- int* /* font_descent_return */,
- XCharStruct* /* overall_return */
-#endif
-);
-
-extern void XTextExtents16(
-#if NeedFunctionPrototypes
- XFontStruct* /* font_struct */,
- _Xconst XChar2b* /* string */,
- int /* nchars */,
- int* /* direction_return */,
- int* /* font_ascent_return */,
- int* /* font_descent_return */,
- XCharStruct* /* overall_return */
-#endif
-);
-
-extern int XTextWidth(
-#if NeedFunctionPrototypes
- XFontStruct* /* font_struct */,
- _Xconst char* /* string */,
- int /* count */
-#endif
-);
-
-extern int XTextWidth16(
-#if NeedFunctionPrototypes
- XFontStruct* /* font_struct */,
- _Xconst XChar2b* /* string */,
- int /* count */
-#endif
-);
-
-extern Bool XTranslateCoordinates(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* src_w */,
- Window /* dest_w */,
- int /* src_x */,
- int /* src_y */,
- int* /* dest_x_return */,
- int* /* dest_y_return */,
- Window* /* child_return */
-#endif
-);
-
-extern void XUndefineCursor(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XUngrabButton(
-#if NeedFunctionPrototypes
- Display* /* display */,
- unsigned int /* button */,
- unsigned int /* modifiers */,
- Window /* grab_window */
-#endif
-);
-
-extern void XUngrabKey(
-#if NeedFunctionPrototypes
- Display* /* display */,
- int /* keycode */,
- unsigned int /* modifiers */,
- Window /* grab_window */
-#endif
-);
-
-extern void XUngrabKeyboard(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Time /* time */
-#endif
-);
-
-extern void XUngrabPointer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Time /* time */
-#endif
-);
-
-extern void XUngrabServer(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XUninstallColormap(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Colormap /* colormap */
-#endif
-);
-extern void XUnloadFont(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Font /* font */
-#endif
-);
-
-extern void XUnmapSubwindows(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern void XUnmapWindow(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */
-#endif
-);
-
-extern int XVendorRelease(
-#if NeedFunctionPrototypes
- Display* /* display */
-#endif
-);
-
-extern void XWarpPointer(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* src_w */,
- Window /* dest_w */,
- int /* src_x */,
- int /* src_y */,
- unsigned int /* src_width */,
- unsigned int /* src_height */,
- int /* dest_x */,
- int /* dest_y */
-#endif
-);
-
-extern int XWidthMMOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern int XWidthOfScreen(
-#if NeedFunctionPrototypes
- Screen* /* screen */
-#endif
-);
-
-extern void XWindowEvent(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Window /* w */,
- long /* event_mask */,
- XEvent* /* event_return */
-#endif
-);
-
-extern int XWriteBitmapFile(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* filename */,
- Pixmap /* bitmap */,
- unsigned int /* width */,
- unsigned int /* height */,
- int /* x_hot */,
- int /* y_hot */
-#endif
-);
-
-extern Bool XSupportsLocale(
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-extern char *XSetLocaleModifiers(
-#if NeedFunctionPrototypes
- _Xconst char* /* modifier_list */
-#endif
-);
-
-extern XFontSet XCreateFontSet(
-#if NeedFunctionPrototypes
- Display* /* display */,
- _Xconst char* /* base_font_name_list */,
- char*** /* missing_charset_list */,
- int* /* missing_charset_count */,
- char** /* def_string */
-#endif
-);
-
-extern void XFreeFontSet(
-#if NeedFunctionPrototypes
- Display* /* display */,
- XFontSet /* font_set */
-#endif
-);
-
-extern int XFontsOfFontSet(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- XFontStruct*** /* font_struct_list */,
- char*** /* font_name_list */
-#endif
-);
-
-extern char *XBaseFontNameListOfFontSet(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */
-#endif
-);
-
-extern char *XLocaleOfFontSet(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */
-#endif
-);
-
-extern Bool XContextDependentDrawing(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */
-#endif
-);
-
-extern XFontSetExtents *XExtentsOfFontSet(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */
-#endif
-);
-
-extern int XmbTextEscapement(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- _Xconst char* /* text */,
- int /* bytes_text */
-#endif
-);
-
-extern int XwcTextEscapement(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- wchar_t* /* text */,
- int /* num_wchars */
-#endif
-);
-
-extern int XmbTextExtents(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- _Xconst char* /* text */,
- int /* bytes_text */,
- XRectangle* /* overall_ink_return */,
- XRectangle* /* overall_logical_return */
-#endif
-);
-
-extern int XwcTextExtents(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- wchar_t* /* text */,
- int /* num_wchars */,
- XRectangle* /* overall_ink_return */,
- XRectangle* /* overall_logical_return */
-#endif
-);
-
-extern Status XmbTextPerCharExtents(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- _Xconst char* /* text */,
- int /* bytes_text */,
- XRectangle* /* ink_extents_buffer */,
- XRectangle* /* logical_extents_buffer */,
- int /* buffer_size */,
- int* /* num_chars */,
- XRectangle* /* overall_ink_return */,
- XRectangle* /* overall_logical_return */
-#endif
-);
-
-extern Status XwcTextPerCharExtents(
-#if NeedFunctionPrototypes
- XFontSet /* font_set */,
- wchar_t* /* text */,
- int /* num_wchars */,
- XRectangle* /* ink_extents_buffer */,
- XRectangle* /* logical_extents_buffer */,
- int /* buffer_size */,
- int* /* num_chars */,
- XRectangle* /* overall_ink_return */,
- XRectangle* /* overall_logical_return */
-#endif
-);
-
-extern void XmbDrawText(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- XmbTextItem* /* text_items */,
- int /* nitems */
-#endif
-);
-
-extern void XwcDrawText(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- XwcTextItem* /* text_items */,
- int /* nitems */
-#endif
-);
-
-extern void XmbDrawString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- XFontSet /* font_set */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst char* /* text */,
- int /* bytes_text */
-#endif
-);
-
-extern void XwcDrawString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- XFontSet /* font_set */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- wchar_t* /* text */,
- int /* num_wchars */
-#endif
-);
-
-extern void XmbDrawImageString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- XFontSet /* font_set */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- _Xconst char* /* text */,
- int /* bytes_text */
-#endif
-);
-
-extern void XwcDrawImageString(
-#if NeedFunctionPrototypes
- Display* /* display */,
- Drawable /* d */,
- XFontSet /* font_set */,
- GC /* gc */,
- int /* x */,
- int /* y */,
- wchar_t* /* text */,
- int /* num_wchars */
-#endif
-);
-
-extern XIM XOpenIM(
-#if NeedFunctionPrototypes
- Display* /* dpy */,
- struct _XrmHashBucketRec* /* rdb */,
- char* /* res_name */,
- char* /* res_class */
-#endif
-);
-
-extern Status XCloseIM(
-#if NeedFunctionPrototypes
- XIM /* im */
-#endif
-);
-
-extern char *XGetIMValues(
-#if NeedVarargsPrototypes
- XIM /* im */, ...
-#endif
-);
-
-extern Display *XDisplayOfIM(
-#if NeedFunctionPrototypes
- XIM /* im */
-#endif
-);
-
-extern char *XLocaleOfIM(
-#if NeedFunctionPrototypes
- XIM /* im*/
-#endif
-);
-
-extern XIC XCreateIC(
-#if NeedVarargsPrototypes
- XIM /* im */, ...
-#endif
-);
-
-extern void XDestroyIC(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern void XSetICFocus(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern void XUnsetICFocus(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern wchar_t *XwcResetIC(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern char *XmbResetIC(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern char *XSetICValues(
-#if NeedVarargsPrototypes
- XIC /* ic */, ...
-#endif
-);
-
-extern char *XGetICValues(
-#if NeedVarargsPrototypes
- XIC /* ic */, ...
-#endif
-);
-
-extern XIM XIMOfIC(
-#if NeedFunctionPrototypes
- XIC /* ic */
-#endif
-);
-
-extern Bool XFilterEvent(
-#if NeedFunctionPrototypes
- XEvent* /* event */,
- Window /* window */
-#endif
-);
-
-extern int XmbLookupString(
-#if NeedFunctionPrototypes
- XIC /* ic */,
- XKeyPressedEvent* /* event */,
- char* /* buffer_return */,
- int /* bytes_buffer */,
- KeySym* /* keysym_return */,
- Status* /* status_return */
-#endif
-);
-
-extern int XwcLookupString(
-#if NeedFunctionPrototypes
- XIC /* ic */,
- XKeyPressedEvent* /* event */,
- wchar_t* /* buffer_return */,
- int /* wchars_buffer */,
- KeySym* /* keysym_return */,
- Status* /* status_return */
-#endif
-);
-
-extern XVaNestedList XVaCreateNestedList(
-#if NeedVarargsPrototypes
- int /*unused*/, ...
-#endif
-);
+#include "tkIntXlibDecls.h"
_XFUNCPROTOEND
diff --git a/xlib/xdraw.c b/xlib/xdraw.c
index 93b2181..e62f90b 100644
--- a/xlib/xdraw.c
+++ b/xlib/xdraw.c
@@ -9,10 +9,10 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: xdraw.c,v 1.2 1998/09/14 18:24:03 stanton Exp $
+ * RCS: @(#) $Id: xdraw.c,v 1.3 1999/03/10 07:04:47 stanton Exp $
*/
-#include "tk.h"
+#include "tkInt.h"
/*
*----------------------------------------------------------------------