diff options
| author | stanton <stanton> | 1999-03-12 03:12:42 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-03-12 03:12:42 (GMT) |
| commit | 865dc228cf63e3459f77010f1ce2f825ef4f0824 (patch) | |
| tree | f5cd078411a4e7eb1308618aa9f7cb682125c8c1 | |
| parent | 0a7a8518738c1513066d96b085b7ebaf4efea750 (diff) | |
| download | tk-865dc228cf63e3459f77010f1ce2f825ef4f0824.zip tk-865dc228cf63e3459f77010f1ce2f825ef4f0824.tar.gz tk-865dc228cf63e3459f77010f1ce2f825ef4f0824.tar.bz2 | |
updated changes, added reserved slot for dash patch
| -rw-r--r-- | ChangeLog | 27 | ||||
| -rw-r--r-- | changes | 60 | ||||
| -rw-r--r-- | generic/tkInt.decls | 285 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 830 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 278 |
5 files changed, 780 insertions, 700 deletions
@@ -1,3 +1,8 @@ +1999-03-11 <stanton@GASPODE> + + * generic/tkInt.decls: Added reserved slot for XSetDashes for use + by the dash patch. + 1999-03-10 <redman@scriptics.com> * xlib/xdraw.c: @@ -65,22 +70,22 @@ 1999-03-08 <lfb@scriptics.com> - * win/tkWinWm.c: Toplevel class no longer shared between + * win/tkWinWm.c: Toplevel class no longer shared between threads. - + * win/tkWinX.c: Multiple threads no longer share the same TkDisplay structure. Required because TkDisplay stores much thread-specific data for a given thread. - * win/tkWinSend.c: Moved application instance handle out + * win/tkWinSend.c: Moved application instance handle out out thread-local storage. DDE was failing to initialize when the instance handles were different between threads. - + * win/makefile.vc: Added THREADDEFINES for building with threads enabled. * generic/tkMenu.c: - * win/tkWinMenu.c: + * win/tkWinMenu.c: * unix/tkUnixMenu.c: Added TkpMenuThreadInit for initializing thread-specific Menu state. @@ -114,7 +119,7 @@ adding code to disable the call to Tk_ConsoleInit(). * generic/tkConsole.c: Check the standard handles before creating the - new standard channels. This allows a windows app that has stdin, + new standard channels. This allows a windows app that has stdin, stdout, or stderr to correctly connect to them. * generic/tkMain.c: Add a proper check for the interactive mode, since @@ -128,8 +133,8 @@ 1999-02-12 <lfb@scriptics.com> - * generic/tkMenuButton.h: - * generic/tkMenuButton.c: + * generic/tkMenuButton.h: + * generic/tkMenuButton.c: * mac/tkMacMenubutton.c: * mac/tkMacDefault.h * unix/tkUnixMenubu.c: Eliminated Tk_Uids used by -state option. @@ -141,7 +146,7 @@ * generic/tkScale.h: * generic/tkScale.c: * generic/tkWindow.c: - * unix/tkUnixScale.c: + * unix/tkUnixScale.c: * unix/tkUnixDefault.h: * unix/tkWinDefault.h: * mac/tkMacDefault.h: Objectified scale widget. @@ -182,7 +187,7 @@ mask changed but ended up with the same XID, the GC failed to be updated and so the new mask was not used. [Bug: 970] - * generic/tkFocus.c (SetFocus): Changed o focus window is always + * generic/tkFocus.c (SetFocus): Changed so focus window is always set if -force is specified. This fixes the problem on Windows where Tk does not activate the window if it already has focus. @@ -308,7 +313,7 @@ * tkMenu.c: Backed out the previous fix for bug 620 and eliminated a bunch of code that created unnecessary objects. Changed back to using internal types instead of objects for many - configuration options. There are many more fixes like this that + configuration options. There are many more fixes like this that could be made, but some require a little restructuring of the code. In any case the leaks are fixed and there is a lot less allocation happening. [Bug: 620] @@ -2,7 +2,7 @@ This file summarizes all changes made to Tk since version 1.0 was released on March 13, 1991. Changes that aren't backward compatible are marked specially. -RCS: @(#) $Id: changes,v 1.1.4.7 1999/02/11 04:13:44 stanton Exp $ +RCS: @(#) $Id: changes,v 1.1.4.8 1999/03/12 03:12:43 stanton Exp $ 3/16/91 (bug fix) Modified tkWindow.c to remove Tk's Tcl commands from the interpreter when the main window is deleted (otherwise there will @@ -4456,3 +4456,61 @@ configuration options in buttons. [Bug: 619] (stanton) 12/8/98 (bug fix) The Windows clipboard was not correctly traslating multibyte characters. [Bug: 935] (stanton) +----------------- Released 8.1b1, Dec 11 1998 ----------------------- + +1/29/99 (bug fix) Fixed bug in "grid forget" that failed to cancel +pending idle handlers, resulting in a crash in a few odd +cases. (stanton) + +2/4/99 (bug fix): Fixed uninitialized memory access in +Tk_SetAppName. [Bug: 919] (stanton) + +2/4/99 (bug fix): Added a workaround for a bug in GetTextExtentExPoint +on Win NT 4.0/Japanese. [Bug: 1006] (stanton) + +2/4/99 (bug fix): Changed so keyboard shortcuts for menus will only be +found in the current toplevel. Previously, they might be found in +menus attached to other toplevels that might not even be mapped. +[Bug: 924] (stanton) + +2/4/99 (bug fix): Changed to treat zero width lines in the canvas like +they have width 1 for purposes of selection. [Bug: 925] (stanton) + +2/4/99 (bug fix): TK_LD_SEARCH_FLAGS was set incorrectly if +SHLIB_LD_LIBS='${LIBS}', and shared linking is performed through the C +compiler. Systems affected are Linux, MP-RAS and NEXTSTEP, but also +with gcc on many more systems. [Bug: 908] (stanton) + +2/4/99 (feature enhancement): Changed so windows that aren't resizable +don't have resize handles and the zoom box is disabled on +Windows. (stanton) + +2/4/99 (bug fix): Fixed so errors in console eval are reported +properly. Eliminated duplicate result messages. [Bug: 973] (stanton) + +2/4/99 (bug fix): Changed so focus window is always set if -force is +specified. This fixes the problem on Windows where Tk does not +activate the window if it already has focus. (stanton) + +2/4/99 (bug fix): If an image mask changed but ended up with the same +XID, the GC failed to be updated and so the new mask was not +used. [Bug: 970] (stanton) + +2/12/99 (new feature): Tk is now thread safe. You enable this by +configuring with --enable-threads. Tcl must also be compiled with +--enable-threads. See Tcl for more information about the threading +interfaces. (lfb) + +2/25/99 (bug fix) Under Windows, wish can now inherit pipe handles on +stdio so it is possible to use the wish executable in a command +pipeline to capture the output of puts or read from the pipe with +gets. (redman) + +3/1/99 (bug fix) Under Windows, Tk was not properly handling focus and +activation changes in some cases. (redman) + +3/10/99 (new feature) Tk now uses the new stub library feature in Tcl. +The Tk library now contains no direct references to any symbols in +Tcl. In addition, there is a new Tk_MainEx() function that takes an +interpreter as an argument. See the Tcl documentation for more +information about the stubs mechanism. (redman) diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 16ab995..d681a6e 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.2.2.1 1999/03/10 07:13:40 stanton Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.2.2.2 1999/03/12 03:12:44 stanton Exp $ library tk @@ -1051,358 +1051,362 @@ interface tkIntXlib # X functions for Windows -declare 0 win { +# This slot is reserved for use by the dash patch: +# declare 0 win { +# XSetDashes +# } +declare 1 win { XModifierKeymap* XGetModifierMapping (Display* d) } -declare 1 win { +declare 2 win { XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ int i4) } -declare 2 win { +declare 3 win { XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } -declare 3 win { +declare 4 win { char *XGetAtomName (Display* d,Atom a) } -declare 4 win { +declare 5 win { char *XKeysymToString (KeySym k) } -declare 5 win { +declare 6 win { Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) } -declare 6 win { +declare 7 win { Cursor XCreatePixmapCursor (Display* d, Pixmap p1, Pixmap p2, \ XColor* x1, XColor* x2, \ unsigned int ui1, unsigned int ui2) } -declare 7 win { +declare 8 win { Cursor XCreateGlyphCursor (Display* d, Font f1, Font f2, \ unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2) } -declare 8 win { +declare 9 win { GContext XGContextFromGC (GC g) } -declare 9 win { +declare 10 win { XHostAddress *XListHosts (Display* d, int* i, Bool* b) } # second parameter was of type KeyCode -declare 10 win { +declare 11 win { KeySym XKeycodeToKeysym (Display* d, unsigned int k, int i) } -declare 11 win { +declare 12 win { KeySym XStringToKeysym (_Xconst char* c) } -declare 12 win { +declare 13 win { Window XRootWindow (Display* d, int i) } -declare 13 win { +declare 14 win { XErrorHandler XSetErrorHandler (XErrorHandler x) } -declare 14 win { +declare 15 win { Status XIconifyWindow (Display* d, Window w, int i) } -declare 15 win { +declare 16 win { Status XWithdrawWindow (Display* d, Window w, int i) } -declare 16 win { +declare 17 win { Status XGetWMColormapWindows (Display* d, Window w, Window** wpp, int* ip) } -declare 17 win { +declare 18 win { Status XAllocColor (Display* d, Colormap c, XColor* xp) } -declare 18 win { +declare 19 win { void XBell (Display* d, int i) } -declare 19 win { +declare 20 win { void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ int i2, _Xconst unsigned char* c, int i3) } -declare 20 win { +declare 21 win { void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ XSetWindowAttributes* x) } -declare 21 win { +declare 22 win { void XClearWindow (Display* d, Window w) } -declare 22 win { +declare 23 win { void XConfigureWindow (Display* d, Window w, unsigned int i, \ XWindowChanges* x) } -declare 23 win { +declare 24 win { void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ int i2, unsigned int ui1, \ unsigned int ui2, int i3, int i4) } -declare 24 win { +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) } -declare 25 win { +declare 26 win { Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ _Xconst char* data, unsigned int width,unsigned int height) } -declare 26 win { +declare 27 win { void XDefineCursor (Display* d, Window w, Cursor c) } -declare 27 win { +declare 28 win { void XDeleteProperty (Display* d, Window w, Atom a) } -declare 28 win { +declare 29 win { void XDestroyWindow (Display* d, Window w) } -declare 29 win { +declare 30 win { void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 30 win { +declare 31 win { void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) } -declare 31 win { +declare 32 win { void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ unsigned int ui1, unsigned int ui2) } -declare 32 win { +declare 33 win { void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 33 win { +declare 34 win { void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ int i1, int i2, int i3) } -declare 34 win { +declare 35 win { void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) } -declare 35 win { +declare 36 win { void XForceScreenSaver (Display* d, int i) } -declare 36 win { +declare 37 win { void XFreeColormap (Display* d, Colormap c) } -declare 37 win { +declare 38 win { void XFreeColors (Display* d, Colormap c, \ unsigned long* ulp, int i, unsigned long ul) } -declare 38 win { +declare 39 win { void XFreeCursor (Display* d, Cursor c) } -declare 39 win { +declare 40 win { void XFreeModifiermap (XModifierKeymap* x) } -declare 40 win { +declare 41 win { Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ unsigned int* ui4) } -declare 41 win { +declare 42 win { void XGetInputFocus (Display* d, Window* w, int* i) } -declare 42 win { +declare 43 win { int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ unsigned long* ulp2, unsigned char** cpp) } -declare 43 win { +declare 44 win { Status XGetWindowAttributes (Display* d, Window w, XWindowAttributes* x) } -declare 44 win { +declare 45 win { int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) } -declare 45 win { +declare 46 win { int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ int i1, int i2, Window w2, Cursor c, Time t) } -declare 46 win { +declare 47 win { KeyCode XKeysymToKeycode (Display* d, KeySym k) } -declare 47 win { +declare 48 win { Status XLookupColor (Display* d, Colormap c1, _Xconst char* c2, \ XColor* x1, XColor* x2) } -declare 48 win { +declare 49 win { void XMapWindow (Display* d, Window w) } -declare 49 win { +declare 50 win { void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ unsigned int ui1, unsigned int ui2) } -declare 50 win { +declare 51 win { void XMoveWindow (Display* d, Window w, int i1, int i2) } -declare 51 win { +declare 52 win { void XNextEvent (Display* d, XEvent* x) } -declare 52 win { +declare 53 win { void XPutBackEvent (Display* d, XEvent* x) } -declare 53 win { +declare 54 win { void XQueryColors (Display* d, Colormap c, XColor* x, int i) } -declare 54 win { +declare 55 win { Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ int* i1, int* i2, int* i3, int* i4, unsigned int* ui) } -declare 55 win { +declare 56 win { Status XQueryTree (Display* d, Window w1, Window* w2, Window* w3, \ Window** w4, unsigned int* ui) } -declare 56 win { +declare 57 win { void XRaiseWindow (Display* d, Window w) } -declare 57 win { +declare 58 win { void XRefreshKeyboardMapping (XMappingEvent* x) } -declare 58 win { +declare 59 win { void XResizeWindow (Display* d, Window w, unsigned int ui1, \ unsigned int ui2) } -declare 59 win { +declare 60 win { void XSelectInput (Display* d, Window w, long l) } -declare 60 win { +declare 61 win { Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) } -declare 61 win { +declare 62 win { void XSetCommand (Display* d, Window w, char** c, int i) } -declare 62 win { +declare 63 win { void XSetIconName (Display* d, Window w, _Xconst char* c) } -declare 63 win { +declare 64 win { void XSetInputFocus (Display* d, Window w, int i, Time t) } -declare 64 win { +declare 65 win { void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) } -declare 65 win { +declare 66 win { void XSetWindowBackground (Display* d, Window w, unsigned long ul) } -declare 66 win { +declare 67 win { void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) } -declare 67 win { +declare 68 win { void XSetWindowBorder (Display* d, Window w, unsigned long ul) } -declare 68 win { +declare 69 win { void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) } -declare 69 win { +declare 70 win { void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) } -declare 70 win { +declare 71 win { void XSetWindowColormap (Display* d, Window w, Colormap c) } -declare 71 win { +declare 72 win { Bool XTranslateCoordinates (Display* d, Window w1, Window w2, int i1,\ int i2, int* i3, int* i4, Window* w3) } -declare 72 win { +declare 73 win { void XUngrabKeyboard (Display* d, Time t) } -declare 73 win { +declare 74 win { void XUngrabPointer (Display* d, Time t) } -declare 74 win { +declare 75 win { void XUnmapWindow (Display* d, Window w) } -declare 75 win { +declare 76 win { void XWindowEvent (Display* d, Window w, long l, XEvent* x) } -declare 76 win { +declare 77 win { void XDestroyIC (XIC x) } -declare 77 win { +declare 78 win { Bool XFilterEvent (XEvent* x, Window w) } -declare 78 win { +declare 79 win { int XmbLookupString (XIC xi, XKeyPressedEvent* xk, \ char* c, int i, KeySym* k, Status* s) } -declare 79 win { +declare 80 win { void TkPutImage (unsigned long *colors, \ int ncolors, Display* display, Drawable d, \ GC gc, XImage* image, int src_x, int src_y, \ @@ -1412,258 +1416,263 @@ declare 79 win { # X functions for Mac -declare 0 mac { +# This slot is reserved for use by the dash patch: +# declare 0 win { +# XSetDashes +# } + +declare 1 mac { XModifierKeymap* XGetModifierMapping (Display* d) } -declare 1 mac { +declare 2 mac { XImage * XCreateImage (Display* d, Visual* v, unsigned int ui1, int i1, \ int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, \ int i4) } -declare 2 mac { +declare 3 mac { XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } -declare 3 mac { +declare 4 mac { char *XGetAtomName (Display* d,Atom a) } -declare 4 mac { +declare 5 mac { char *XKeysymToString (KeySym k) } -declare 5 mac { +declare 6 mac { Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) } -declare 6 mac { +declare 7 mac { GContext XGContextFromGC (GC g) } -declare 7 mac { +declare 8 mac { KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i) } -declare 8 mac { +declare 9 mac { KeySym XStringToKeysym (_Xconst char* c) } -declare 9 mac { +declare 10 mac { Window XRootWindow (Display* d, int i) } -declare 10 mac { +declare 11 mac { XErrorHandler XSetErrorHandler (XErrorHandler x) } -declare 11 mac { +declare 12 mac { Status XAllocColor (Display* d, Colormap c, XColor* xp) } -declare 12 mac { +declare 13 mac { void XBell (Display* d, int i) } -declare 13 mac { +declare 14 mac { void XChangeProperty (Display* d, Window w, Atom a, Atom a, int i1, \ int i2, _Xconst unsigned char* c, int i3) } -declare 14 mac { +declare 15 mac { void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ XSetWindowAttributes* x) } -declare 15 mac { +declare 16 mac { void XConfigureWindow (Display* d, Window w, unsigned int i, \ XWindowChanges* x) } -declare 16 mac { +declare 17 mac { void XCopyArea (Display* d, Drawable dr1, Drawable dr2, GC g, int i1, \ int i2, unsigned int ui1, \ unsigned int ui2, int i3, int i4) } -declare 17 mac { +declare 18 mac { 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) } -declare 18 mac { +declare 19 mac { Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ _Xconst char* data, unsigned int width,unsigned int height) } -declare 19 mac { +declare 20 mac { void XDefineCursor (Display* d, Window w, Cursor c) } -declare 20 mac { +declare 21 mac { void XDestroyWindow (Display* d, Window w) } -declare 21 mac { +declare 22 mac { void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 22 mac { +declare 23 mac { void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) } -declare 23 mac { +declare 24 mac { void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ unsigned int ui1, unsigned int ui2) } -declare 24 mac { +declare 25 mac { void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 25 mac { +declare 26 mac { void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ int i1, int i2, int i3) } -declare 26 mac { +declare 27 mac { void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) } -declare 27 mac { +declare 28 mac { void XFreeColormap (Display* d, Colormap c) } -declare 28 mac { +declare 29 mac { void XFreeColors (Display* d, Colormap c, \ unsigned long* ulp, int i, unsigned long ul) } -declare 29 mac { +declare 30 mac { void XFreeModifiermap (XModifierKeymap* x) } -declare 30 mac { +declare 31 mac { Status XGetGeometry (Display* d, Drawable dr, Window* w, int* i1, \ int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, \ unsigned int* ui4) } -declare 31 mac { +declare 32 mac { int XGetWindowProperty (Display* d, Window w, Atom a1, long l1, long l2, \ Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, \ unsigned long* ulp2, unsigned char** cpp) } -declare 32 mac { +declare 33 mac { int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) } -declare 33 mac { +declare 34 mac { int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ int i1, int i2, Window w2, Cursor c, Time t) } -declare 34 mac { +declare 35 mac { KeyCode XKeysymToKeycode (Display* d, KeySym k) } -declare 35 mac { +declare 36 mac { void XMapWindow (Display* d, Window w) } -declare 36 mac { +declare 37 mac { void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ unsigned int ui1, unsigned int ui2) } -declare 37 mac { +declare 38 mac { void XMoveWindow (Display* d, Window w, int i1, int i2) } -declare 38 mac { +declare 39 mac { Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ int* i1, int* i2, int* i3, int* i4, unsigned int* ui) } -declare 39 mac { +declare 40 mac { void XRaiseWindow (Display* d, Window w) } -declare 40 mac { +declare 41 mac { void XRefreshKeyboardMapping (XMappingEvent* x) } -declare 41 mac { +declare 42 mac { void XResizeWindow (Display* d, Window w, unsigned int ui1, \ unsigned int ui2) } -declare 42 mac { +declare 43 mac { void XSelectInput (Display* d, Window w, long l) } -declare 43 mac { +declare 44 mac { Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) } -declare 44 mac { +declare 45 mac { void XSetIconName (Display* d, Window w, _Xconst char* c) } -declare 45 mac { +declare 46 mac { void XSetInputFocus (Display* d, Window w, int i, Time t) } -declare 46 mac { +declare 47 mac { void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) } -declare 47 mac { +declare 48 mac { void XSetWindowBackground (Display* d, Window w, unsigned long ul) } -declare 48 mac { +declare 49 mac { void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) } -declare 49 mac { +declare 50 mac { void XSetWindowBorder (Display* d, Window w, unsigned long ul) } -declare 50 mac { +declare 51 mac { void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) } -declare 51 mac { +declare 52 mac { void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) } -declare 52 mac { +declare 53 mac { void XSetWindowColormap (Display* d, Window w, Colormap c) } -declare 53 mac { +declare 54 mac { void XUngrabKeyboard (Display* d, Time t) } -declare 54 mac { +declare 55 mac { void XUngrabPointer (Display* d, Time t) } -declare 55 mac { +declare 56 mac { void XUnmapWindow (Display* d, Window w) } -declare 56 mac { +declare 57 mac { void TkPutImage (unsigned long *colors, \ int ncolors, Display* display, Drawable d, \ GC gc, XImage* image, int src_x, int src_y, \ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index faaa3c1..a0a9166 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.2.2.1 1999/03/10 07:13:43 stanton Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.2.2.2 1999/03/12 03:12:45 stanton Exp $ */ #ifndef _TKINTXLIBDECLS @@ -33,244 +33,245 @@ */ #ifdef __WIN32__ -/* 0 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +/* Slot 0 is reserved */ /* 1 */ +EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +/* 2 */ EXTERN XImage * XCreateImage _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); -/* 2 */ +/* 3 */ EXTERN XImage * XGetImage _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); -/* 3 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ -EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); /* 5 */ +EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); +/* 6 */ EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); -/* 6 */ +/* 7 */ EXTERN Cursor XCreatePixmapCursor _ANSI_ARGS_((Display* d, Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, unsigned int ui1, unsigned int ui2)); -/* 7 */ +/* 8 */ EXTERN Cursor XCreateGlyphCursor _ANSI_ARGS_((Display* d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)); -/* 8 */ -EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 9 */ -EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display* d, int* i, Bool* b)); +EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 10 */ +EXTERN XHostAddress * XListHosts _ANSI_ARGS_((Display* d, int* i, Bool* b)); +/* 11 */ EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, unsigned int k, int i)); -/* 11 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); /* 12 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); /* 13 */ -EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); /* 14 */ +EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); +/* 15 */ EXTERN Status XIconifyWindow _ANSI_ARGS_((Display* d, Window w, int i)); -/* 15 */ +/* 16 */ EXTERN Status XWithdrawWindow _ANSI_ARGS_((Display* d, Window w, int i)); -/* 16 */ +/* 17 */ EXTERN Status XGetWMColormapWindows _ANSI_ARGS_((Display* d, Window w, Window** wpp, int* ip)); -/* 17 */ +/* 18 */ EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); -/* 18 */ -EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); /* 19 */ +EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +/* 20 */ EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); -/* 20 */ +/* 21 */ EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); -/* 21 */ -EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); /* 22 */ +EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); +/* 23 */ EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); -/* 23 */ +/* 24 */ EXTERN void XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 24 */ +/* 25 */ EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); -/* 25 */ +/* 26 */ EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); -/* 26 */ +/* 27 */ EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, Cursor c)); -/* 27 */ +/* 28 */ EXTERN void XDeleteProperty _ANSI_ARGS_((Display* d, Window w, Atom a)); -/* 28 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); /* 29 */ +EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); +/* 30 */ EXTERN void XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 30 */ +/* 31 */ EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); -/* 31 */ +/* 32 */ EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); -/* 32 */ +/* 33 */ EXTERN void XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 33 */ +/* 34 */ EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); -/* 34 */ +/* 35 */ EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); -/* 35 */ -EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* d, int i)); /* 36 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* d, int i)); /* 37 */ +EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +/* 38 */ EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); -/* 38 */ -EXTERN void XFreeCursor _ANSI_ARGS_((Display* d, Cursor c)); /* 39 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +EXTERN void XFreeCursor _ANSI_ARGS_((Display* d, Cursor c)); /* 40 */ +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +/* 41 */ EXTERN Status XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); -/* 41 */ +/* 42 */ EXTERN void XGetInputFocus _ANSI_ARGS_((Display* d, Window* w, int* i)); -/* 42 */ +/* 43 */ EXTERN int XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); -/* 43 */ +/* 44 */ EXTERN Status XGetWindowAttributes _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); -/* 44 */ +/* 45 */ EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); -/* 45 */ +/* 46 */ EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); -/* 46 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); /* 47 */ +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); +/* 48 */ EXTERN Status XLookupColor _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); -/* 48 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); /* 49 */ +EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +/* 50 */ EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); -/* 50 */ +/* 51 */ EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); -/* 51 */ -EXTERN void XNextEvent _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */ -EXTERN void XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x)); +EXTERN void XNextEvent _ANSI_ARGS_((Display* d, XEvent* x)); /* 53 */ +EXTERN void XPutBackEvent _ANSI_ARGS_((Display* d, XEvent* x)); +/* 54 */ EXTERN void XQueryColors _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); -/* 54 */ +/* 55 */ EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); -/* 55 */ +/* 56 */ EXTERN Status XQueryTree _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); -/* 56 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); /* 57 */ +EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +/* 58 */ EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( XMappingEvent* x)); -/* 58 */ +/* 59 */ EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); -/* 59 */ +/* 60 */ EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, long l)); -/* 60 */ +/* 61 */ EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); -/* 61 */ +/* 62 */ EXTERN void XSetCommand _ANSI_ARGS_((Display* d, Window w, char** c, int i)); -/* 62 */ +/* 63 */ EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); -/* 63 */ +/* 64 */ EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, int i, Time t)); -/* 64 */ +/* 65 */ EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); -/* 65 */ +/* 66 */ EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); -/* 66 */ +/* 67 */ EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, Window w, Pixmap p)); -/* 67 */ +/* 68 */ EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); -/* 68 */ +/* 69 */ EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, Window w, Pixmap p)); -/* 69 */ +/* 70 */ EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); -/* 70 */ +/* 71 */ EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, Colormap c)); -/* 71 */ +/* 72 */ EXTERN Bool XTranslateCoordinates _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); -/* 72 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); /* 73 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); /* 74 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); /* 75 */ +EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +/* 76 */ EXTERN void XWindowEvent _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); -/* 76 */ -EXTERN void XDestroyIC _ANSI_ARGS_((XIC x)); /* 77 */ -EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent* x, Window w)); +EXTERN void XDestroyIC _ANSI_ARGS_((XIC x)); /* 78 */ +EXTERN Bool XFilterEvent _ANSI_ARGS_((XEvent* x, Window w)); +/* 79 */ EXTERN int XmbLookupString _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); -/* 79 */ +/* 80 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, @@ -278,178 +279,179 @@ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, unsigned int height)); #endif /* __WIN32__ */ #ifdef MAC_TCL -/* 0 */ -EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +/* Slot 0 is reserved */ /* 1 */ +EXTERN XModifierKeymap* XGetModifierMapping _ANSI_ARGS_((Display* d)); +/* 2 */ EXTERN XImage * XCreateImage _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); -/* 2 */ +/* 3 */ EXTERN XImage * XGetImage _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); -/* 3 */ -EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ -EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); +EXTERN char * XGetAtomName _ANSI_ARGS_((Display* d, Atom a)); /* 5 */ +EXTERN char * XKeysymToString _ANSI_ARGS_((KeySym k)); +/* 6 */ EXTERN Colormap XCreateColormap _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); -/* 6 */ -EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); /* 7 */ +EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); +/* 8 */ EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, int i)); -/* 8 */ -EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); /* 9 */ -EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); /* 10 */ -EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); +EXTERN Window XRootWindow _ANSI_ARGS_((Display* d, int i)); /* 11 */ +EXTERN XErrorHandler XSetErrorHandler _ANSI_ARGS_((XErrorHandler x)); +/* 12 */ EXTERN Status XAllocColor _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); -/* 12 */ -EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); /* 13 */ +EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +/* 14 */ EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); -/* 14 */ +/* 15 */ EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); -/* 15 */ +/* 16 */ EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); -/* 16 */ +/* 17 */ EXTERN void XCopyArea _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 17 */ +/* 18 */ EXTERN void XCopyPlane _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); -/* 18 */ +/* 19 */ EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); -/* 19 */ +/* 20 */ EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, Cursor c)); -/* 20 */ -EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); /* 21 */ +EXTERN void XDestroyWindow _ANSI_ARGS_((Display* d, Window w)); +/* 22 */ EXTERN void XDrawArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 22 */ +/* 23 */ EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); -/* 23 */ +/* 24 */ EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); -/* 24 */ +/* 25 */ EXTERN void XFillArc _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); -/* 25 */ +/* 26 */ EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); -/* 26 */ +/* 27 */ EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); -/* 27 */ -EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */ +EXTERN void XFreeColormap _ANSI_ARGS_((Display* d, Colormap c)); +/* 29 */ EXTERN void XFreeColors _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); -/* 29 */ -EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */ +EXTERN void XFreeModifiermap _ANSI_ARGS_((XModifierKeymap* x)); +/* 31 */ EXTERN Status XGetGeometry _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); -/* 31 */ +/* 32 */ EXTERN int XGetWindowProperty _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); -/* 32 */ +/* 33 */ EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); -/* 33 */ +/* 34 */ EXTERN int XGrabPointer _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); -/* 34 */ -EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */ -EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN KeyCode XKeysymToKeycode _ANSI_ARGS_((Display* d, KeySym k)); /* 36 */ +EXTERN void XMapWindow _ANSI_ARGS_((Display* d, Window w)); +/* 37 */ EXTERN void XMoveResizeWindow _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); -/* 37 */ +/* 38 */ EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); -/* 38 */ +/* 39 */ EXTERN Bool XQueryPointer _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); -/* 39 */ -EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); /* 40 */ +EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +/* 41 */ EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( XMappingEvent* x)); -/* 41 */ +/* 42 */ EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); -/* 42 */ +/* 43 */ EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, long l)); -/* 43 */ +/* 44 */ EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); -/* 44 */ +/* 45 */ EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); -/* 45 */ +/* 46 */ EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, int i, Time t)); -/* 46 */ +/* 47 */ EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); -/* 47 */ +/* 48 */ EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); -/* 48 */ +/* 49 */ EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, Window w, Pixmap p)); -/* 49 */ +/* 50 */ EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); -/* 50 */ +/* 51 */ EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, Window w, Pixmap p)); -/* 51 */ +/* 52 */ EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); -/* 52 */ +/* 53 */ EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, Colormap c)); -/* 53 */ -EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); /* 54 */ -EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); /* 55 */ -EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +EXTERN void XUngrabPointer _ANSI_ARGS_((Display* d, Time t)); /* 56 */ +EXTERN void XUnmapWindow _ANSI_ARGS_((Display* d, Window w)); +/* 57 */ EXTERN void TkPutImage _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, @@ -462,145 +464,147 @@ typedef struct TkIntXlibStubs { struct TkIntXlibStubHooks *hooks; #ifdef __WIN32__ - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 0 */ - 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)); /* 1 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 2 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 3 */ - char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 4 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 5 */ - Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display* d, Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, unsigned int ui1, unsigned int ui2)); /* 6 */ - Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display* d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)); /* 7 */ - GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 8 */ - XHostAddress * (*xListHosts) _ANSI_ARGS_((Display* d, int* i, Bool* b)); /* 9 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, unsigned int k, int i)); /* 10 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 11 */ - Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 12 */ - XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 13 */ - Status (*xIconifyWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 14 */ - Status (*xWithdrawWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 15 */ - Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display* d, Window w, Window** wpp, int* ip)); /* 16 */ - Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 17 */ - void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 18 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 19 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 20 */ - void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 22 */ - void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 23 */ - void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 24 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 25 */ - void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 26 */ - void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 27 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 28 */ - void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 29 */ - void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 30 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 31 */ - void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 32 */ - void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 33 */ - void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 34 */ - void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 35 */ - void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 36 */ - void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 37 */ - void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 38 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 39 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 40 */ - void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 41 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 42 */ - Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 43 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 44 */ - int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 45 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 46 */ - Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 47 */ - void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 48 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 49 */ - void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 50 */ - void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 51 */ - void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */ - void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 53 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 54 */ - Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 55 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 57 */ - void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 58 */ - void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 59 */ - Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 60 */ - void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, char** c, int i)); /* 61 */ - void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 62 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 63 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 64 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 65 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 66 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 67 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 68 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 69 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 70 */ - Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 71 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 72 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 73 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 74 */ - void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 75 */ - void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 76 */ - Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 77 */ - int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 78 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 79 */ + void *reserved0; + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ + char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */ + Cursor (*xCreatePixmapCursor) _ANSI_ARGS_((Display* d, Pixmap p1, Pixmap p2, XColor* x1, XColor* x2, unsigned int ui1, unsigned int ui2)); /* 7 */ + Cursor (*xCreateGlyphCursor) _ANSI_ARGS_((Display* d, Font f1, Font f2, unsigned int ui1, unsigned int ui2, XColor* x1, XColor* x2)); /* 8 */ + GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 9 */ + XHostAddress * (*xListHosts) _ANSI_ARGS_((Display* d, int* i, Bool* b)); /* 10 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, unsigned int k, int i)); /* 11 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 12 */ + Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 13 */ + XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 14 */ + Status (*xIconifyWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 15 */ + Status (*xWithdrawWindow) _ANSI_ARGS_((Display* d, Window w, int i)); /* 16 */ + Status (*xGetWMColormapWindows) _ANSI_ARGS_((Display* d, Window w, Window** wpp, int* ip)); /* 17 */ + Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 18 */ + void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 19 */ + void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 20 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 21 */ + void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 22 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 23 */ + void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ + void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 25 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 26 */ + void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 27 */ + void (*xDeleteProperty) _ANSI_ARGS_((Display* d, Window w, Atom a)); /* 28 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 29 */ + void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 30 */ + void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 31 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 32 */ + void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 33 */ + void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 34 */ + void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 35 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display* d, int i)); /* 36 */ + void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 37 */ + void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 38 */ + void (*xFreeCursor) _ANSI_ARGS_((Display* d, Cursor c)); /* 39 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 40 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 41 */ + void (*xGetInputFocus) _ANSI_ARGS_((Display* d, Window* w, int* i)); /* 42 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 43 */ + Status (*xGetWindowAttributes) _ANSI_ARGS_((Display* d, Window w, XWindowAttributes* x)); /* 44 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 45 */ + int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 46 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 47 */ + Status (*xLookupColor) _ANSI_ARGS_((Display* d, Colormap c1, _Xconst char* c2, XColor* x1, XColor* x2)); /* 48 */ + void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 49 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 50 */ + void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 51 */ + void (*xNextEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 52 */ + void (*xPutBackEvent) _ANSI_ARGS_((Display* d, XEvent* x)); /* 53 */ + void (*xQueryColors) _ANSI_ARGS_((Display* d, Colormap c, XColor* x, int i)); /* 54 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 55 */ + Status (*xQueryTree) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, Window** w4, unsigned int* ui)); /* 56 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 57 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 58 */ + void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 59 */ + void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 60 */ + Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 61 */ + void (*xSetCommand) _ANSI_ARGS_((Display* d, Window w, char** c, int i)); /* 62 */ + void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 63 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 64 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 65 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 66 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 67 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 68 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 69 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 70 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 71 */ + Bool (*xTranslateCoordinates) _ANSI_ARGS_((Display* d, Window w1, Window w2, int i1, int i2, int* i3, int* i4, Window* w3)); /* 72 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 73 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 74 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 75 */ + void (*xWindowEvent) _ANSI_ARGS_((Display* d, Window w, long l, XEvent* x)); /* 76 */ + void (*xDestroyIC) _ANSI_ARGS_((XIC x)); /* 77 */ + Bool (*xFilterEvent) _ANSI_ARGS_((XEvent* x, Window w)); /* 78 */ + int (*xmbLookupString) _ANSI_ARGS_((XIC xi, XKeyPressedEvent* xk, char* c, int i, KeySym* k, Status* s)); /* 79 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 80 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 0 */ - 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)); /* 1 */ - XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 2 */ - char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 3 */ - char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 4 */ - Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 5 */ - GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 6 */ - KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 7 */ - KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 8 */ - Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 9 */ - XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 10 */ - Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 11 */ - void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 12 */ - void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 13 */ - void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 14 */ - void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 15 */ - void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 16 */ - void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 17 */ - Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 18 */ - void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 19 */ - void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 20 */ - void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 21 */ - void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 22 */ - void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 23 */ - void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 24 */ - void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 25 */ - void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 26 */ - void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 27 */ - void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 28 */ - void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 29 */ - Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 30 */ - int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 31 */ - int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 32 */ - int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 33 */ - KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 34 */ - void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 35 */ - void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 36 */ - void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 37 */ - Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 38 */ - void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 39 */ - void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 40 */ - void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 41 */ - void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 42 */ - Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 43 */ - void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 44 */ - void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 45 */ - void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 46 */ - void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 47 */ - void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 48 */ - void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 49 */ - void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 50 */ - void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 51 */ - void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 52 */ - void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 53 */ - void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 54 */ - void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 55 */ - void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 56 */ + void *reserved0; + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + XImage * (*xGetImage) _ANSI_ARGS_((Display* d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3)); /* 3 */ + char * (*xGetAtomName) _ANSI_ARGS_((Display* d, Atom a)); /* 4 */ + char * (*xKeysymToString) _ANSI_ARGS_((KeySym k)); /* 5 */ + Colormap (*xCreateColormap) _ANSI_ARGS_((Display* d, Window w, Visual* v, int i)); /* 6 */ + GContext (*xGContextFromGC) _ANSI_ARGS_((GC g)); /* 7 */ + KeySym (*xKeycodeToKeysym) _ANSI_ARGS_((Display* d, KeyCode k, int i)); /* 8 */ + KeySym (*xStringToKeysym) _ANSI_ARGS_((_Xconst char* c)); /* 9 */ + Window (*xRootWindow) _ANSI_ARGS_((Display* d, int i)); /* 10 */ + XErrorHandler (*xSetErrorHandler) _ANSI_ARGS_((XErrorHandler x)); /* 11 */ + Status (*xAllocColor) _ANSI_ARGS_((Display* d, Colormap c, XColor* xp)); /* 12 */ + void (*xBell) _ANSI_ARGS_((Display* d, int i)); /* 13 */ + void (*xChangeProperty) _ANSI_ARGS_((Display* d, Window w, Atom a, Atom a, int i1, int i2, _Xconst unsigned char* c, int i3)); /* 14 */ + void (*xChangeWindowAttributes) _ANSI_ARGS_((Display* d, Window w, unsigned long ul, XSetWindowAttributes* x)); /* 15 */ + void (*xConfigureWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int i, XWindowChanges* x)); /* 16 */ + void (*xCopyArea) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 17 */ + void (*xCopyPlane) _ANSI_ARGS_((Display* d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul)); /* 18 */ + Pixmap (*xCreateBitmapFromData) _ANSI_ARGS_((Display* display, Drawable d, _Xconst char* data, unsigned int width, unsigned int height)); /* 19 */ + void (*xDefineCursor) _ANSI_ARGS_((Display* d, Window w, Cursor c)); /* 20 */ + void (*xDestroyWindow) _ANSI_ARGS_((Display* d, Window w)); /* 21 */ + void (*xDrawArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 22 */ + void (*xDrawLines) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2)); /* 23 */ + void (*xDrawRectangle) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 24 */ + void (*xFillArc) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4)); /* 25 */ + void (*xFillPolygon) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2, int i3)); /* 26 */ + void (*xFillRectangles) _ANSI_ARGS_((Display* d, Drawable dr, GC g, XRectangle* x, int i)); /* 27 */ + void (*xFreeColormap) _ANSI_ARGS_((Display* d, Colormap c)); /* 28 */ + void (*xFreeColors) _ANSI_ARGS_((Display* d, Colormap c, unsigned long* ulp, int i, unsigned long ul)); /* 29 */ + void (*xFreeModifiermap) _ANSI_ARGS_((XModifierKeymap* x)); /* 30 */ + Status (*xGetGeometry) _ANSI_ARGS_((Display* d, Drawable dr, Window* w, int* i1, int* i2, unsigned int* ui1, unsigned int* ui2, unsigned int* ui3, unsigned int* ui4)); /* 31 */ + int (*xGetWindowProperty) _ANSI_ARGS_((Display* d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom* ap, int* ip, unsigned long* ulp1, unsigned long* ulp2, unsigned char** cpp)); /* 32 */ + int (*xGrabKeyboard) _ANSI_ARGS_((Display* d, Window w, Bool b, int i1, int i2, Time t)); /* 33 */ + int (*xGrabPointer) _ANSI_ARGS_((Display* d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t)); /* 34 */ + KeyCode (*xKeysymToKeycode) _ANSI_ARGS_((Display* d, KeySym k)); /* 35 */ + void (*xMapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 36 */ + void (*xMoveResizeWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2)); /* 37 */ + void (*xMoveWindow) _ANSI_ARGS_((Display* d, Window w, int i1, int i2)); /* 38 */ + Bool (*xQueryPointer) _ANSI_ARGS_((Display* d, Window w1, Window* w2, Window* w3, int* i1, int* i2, int* i3, int* i4, unsigned int* ui)); /* 39 */ + void (*xRaiseWindow) _ANSI_ARGS_((Display* d, Window w)); /* 40 */ + void (*xRefreshKeyboardMapping) _ANSI_ARGS_((XMappingEvent* x)); /* 41 */ + void (*xResizeWindow) _ANSI_ARGS_((Display* d, Window w, unsigned int ui1, unsigned int ui2)); /* 42 */ + void (*xSelectInput) _ANSI_ARGS_((Display* d, Window w, long l)); /* 43 */ + Status (*xSendEvent) _ANSI_ARGS_((Display* d, Window w, Bool b, long l, XEvent* x)); /* 44 */ + void (*xSetIconName) _ANSI_ARGS_((Display* d, Window w, _Xconst char* c)); /* 45 */ + void (*xSetInputFocus) _ANSI_ARGS_((Display* d, Window w, int i, Time t)); /* 46 */ + void (*xSetSelectionOwner) _ANSI_ARGS_((Display* d, Atom a, Window w, Time t)); /* 47 */ + void (*xSetWindowBackground) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 48 */ + void (*xSetWindowBackgroundPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 49 */ + void (*xSetWindowBorder) _ANSI_ARGS_((Display* d, Window w, unsigned long ul)); /* 50 */ + void (*xSetWindowBorderPixmap) _ANSI_ARGS_((Display* d, Window w, Pixmap p)); /* 51 */ + void (*xSetWindowBorderWidth) _ANSI_ARGS_((Display* d, Window w, unsigned int ui)); /* 52 */ + void (*xSetWindowColormap) _ANSI_ARGS_((Display* d, Window w, Colormap c)); /* 53 */ + void (*xUngrabKeyboard) _ANSI_ARGS_((Display* d, Time t)); /* 54 */ + void (*xUngrabPointer) _ANSI_ARGS_((Display* d, Time t)); /* 55 */ + void (*xUnmapWindow) _ANSI_ARGS_((Display* d, Window w)); /* 56 */ + void (*tkPutImage) _ANSI_ARGS_((unsigned long * colors, int ncolors, Display* display, Drawable d, GC gc, XImage* image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height)); /* 57 */ #endif /* MAC_TCL */ } TkIntXlibStubs; @@ -613,555 +617,557 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; */ #ifdef __WIN32__ +/* Slot 0 is reserved */ #ifndef XGetModifierMapping #define XGetModifierMapping(d) \ - (tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 0 */ + (tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 1 */ #endif #ifndef XCreateImage #define XCreateImage(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) \ - (tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 1 */ + (tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 2 */ #endif #ifndef XGetImage #define XGetImage(d, dr, i1, i2, ui1, ui2, ul, i3) \ - (tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 2 */ + (tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 3 */ #endif #ifndef XGetAtomName #define XGetAtomName(d, a) \ - (tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 3 */ + (tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 4 */ #endif #ifndef XKeysymToString #define XKeysymToString(k) \ - (tkIntXlibStubsPtr->xKeysymToString)(k) /* 4 */ + (tkIntXlibStubsPtr->xKeysymToString)(k) /* 5 */ #endif #ifndef XCreateColormap #define XCreateColormap(d, w, v, i) \ - (tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 5 */ + (tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 6 */ #endif #ifndef XCreatePixmapCursor #define XCreatePixmapCursor(d, p1, p2, x1, x2, ui1, ui2) \ - (tkIntXlibStubsPtr->xCreatePixmapCursor)(d, p1, p2, x1, x2, ui1, ui2) /* 6 */ + (tkIntXlibStubsPtr->xCreatePixmapCursor)(d, p1, p2, x1, x2, ui1, ui2) /* 7 */ #endif #ifndef XCreateGlyphCursor #define XCreateGlyphCursor(d, f1, f2, ui1, ui2, x1, x2) \ - (tkIntXlibStubsPtr->xCreateGlyphCursor)(d, f1, f2, ui1, ui2, x1, x2) /* 7 */ + (tkIntXlibStubsPtr->xCreateGlyphCursor)(d, f1, f2, ui1, ui2, x1, x2) /* 8 */ #endif #ifndef XGContextFromGC #define XGContextFromGC(g) \ - (tkIntXlibStubsPtr->xGContextFromGC)(g) /* 8 */ + (tkIntXlibStubsPtr->xGContextFromGC)(g) /* 9 */ #endif #ifndef XListHosts #define XListHosts(d, i, b) \ - (tkIntXlibStubsPtr->xListHosts)(d, i, b) /* 9 */ + (tkIntXlibStubsPtr->xListHosts)(d, i, b) /* 10 */ #endif #ifndef XKeycodeToKeysym #define XKeycodeToKeysym(d, k, i) \ - (tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 10 */ + (tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 11 */ #endif #ifndef XStringToKeysym #define XStringToKeysym(c) \ - (tkIntXlibStubsPtr->xStringToKeysym)(c) /* 11 */ + (tkIntXlibStubsPtr->xStringToKeysym)(c) /* 12 */ #endif #ifndef XRootWindow #define XRootWindow(d, i) \ - (tkIntXlibStubsPtr->xRootWindow)(d, i) /* 12 */ + (tkIntXlibStubsPtr->xRootWindow)(d, i) /* 13 */ #endif #ifndef XSetErrorHandler #define XSetErrorHandler(x) \ - (tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 13 */ + (tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 14 */ #endif #ifndef XIconifyWindow #define XIconifyWindow(d, w, i) \ - (tkIntXlibStubsPtr->xIconifyWindow)(d, w, i) /* 14 */ + (tkIntXlibStubsPtr->xIconifyWindow)(d, w, i) /* 15 */ #endif #ifndef XWithdrawWindow #define XWithdrawWindow(d, w, i) \ - (tkIntXlibStubsPtr->xWithdrawWindow)(d, w, i) /* 15 */ + (tkIntXlibStubsPtr->xWithdrawWindow)(d, w, i) /* 16 */ #endif #ifndef XGetWMColormapWindows #define XGetWMColormapWindows(d, w, wpp, ip) \ - (tkIntXlibStubsPtr->xGetWMColormapWindows)(d, w, wpp, ip) /* 16 */ + (tkIntXlibStubsPtr->xGetWMColormapWindows)(d, w, wpp, ip) /* 17 */ #endif #ifndef XAllocColor #define XAllocColor(d, c, xp) \ - (tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 17 */ + (tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 18 */ #endif #ifndef XBell #define XBell(d, i) \ - (tkIntXlibStubsPtr->xBell)(d, i) /* 18 */ + (tkIntXlibStubsPtr->xBell)(d, i) /* 19 */ #endif #ifndef XChangeProperty #define XChangeProperty(d, w, a1, a2, i1, i2, c, i3) \ - (tkIntXlibStubsPtr->xChangeProperty)(d, w, a1, a2, i1, i2, c, i3) /* 19 */ + (tkIntXlibStubsPtr->xChangeProperty)(d, w, a1, a2, i1, i2, c, i3) /* 20 */ #endif #ifndef XChangeWindowAttributes #define XChangeWindowAttributes(d, w, ul, x) \ - (tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 20 */ + (tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 21 */ #endif #ifndef XClearWindow #define XClearWindow(d, w) \ - (tkIntXlibStubsPtr->xClearWindow)(d, w) /* 21 */ + (tkIntXlibStubsPtr->xClearWindow)(d, w) /* 22 */ #endif #ifndef XConfigureWindow #define XConfigureWindow(d, w, i, x) \ - (tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 22 */ + (tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 23 */ #endif #ifndef XCopyArea #define XCopyArea(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 23 */ + (tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 24 */ #endif #ifndef XCopyPlane #define XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) \ - (tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 24 */ + (tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 25 */ #endif #ifndef XCreateBitmapFromData #define XCreateBitmapFromData(display, d, data, width, height) \ - (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 25 */ + (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 26 */ #endif #ifndef XDefineCursor #define XDefineCursor(d, w, c) \ - (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 26 */ + (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 27 */ #endif #ifndef XDeleteProperty #define XDeleteProperty(d, w, a) \ - (tkIntXlibStubsPtr->xDeleteProperty)(d, w, a) /* 27 */ + (tkIntXlibStubsPtr->xDeleteProperty)(d, w, a) /* 28 */ #endif #ifndef XDestroyWindow #define XDestroyWindow(d, w) \ - (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 28 */ + (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 29 */ #endif #ifndef XDrawArc #define XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 29 */ + (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 30 */ #endif #ifndef XDrawLines #define XDrawLines(d, dr, g, x, i1, i2) \ - (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 30 */ + (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 31 */ #endif #ifndef XDrawRectangle #define XDrawRectangle(d, dr, g, i1, i2, ui1, ui2) \ - (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 31 */ + (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 32 */ #endif #ifndef XFillArc #define XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 32 */ + (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 33 */ #endif #ifndef XFillPolygon #define XFillPolygon(d, dr, g, x, i1, i2, i3) \ - (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 33 */ + (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 34 */ #endif #ifndef XFillRectangles #define XFillRectangles(d, dr, g, x, i) \ - (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 34 */ + (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 35 */ #endif #ifndef XForceScreenSaver #define XForceScreenSaver(d, i) \ - (tkIntXlibStubsPtr->xForceScreenSaver)(d, i) /* 35 */ + (tkIntXlibStubsPtr->xForceScreenSaver)(d, i) /* 36 */ #endif #ifndef XFreeColormap #define XFreeColormap(d, c) \ - (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 36 */ + (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 37 */ #endif #ifndef XFreeColors #define XFreeColors(d, c, ulp, i, ul) \ - (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 37 */ + (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 38 */ #endif #ifndef XFreeCursor #define XFreeCursor(d, c) \ - (tkIntXlibStubsPtr->xFreeCursor)(d, c) /* 38 */ + (tkIntXlibStubsPtr->xFreeCursor)(d, c) /* 39 */ #endif #ifndef XFreeModifiermap #define XFreeModifiermap(x) \ - (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 39 */ + (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 40 */ #endif #ifndef XGetGeometry #define XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) \ - (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 40 */ + (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 41 */ #endif #ifndef XGetInputFocus #define XGetInputFocus(d, w, i) \ - (tkIntXlibStubsPtr->xGetInputFocus)(d, w, i) /* 41 */ + (tkIntXlibStubsPtr->xGetInputFocus)(d, w, i) /* 42 */ #endif #ifndef XGetWindowProperty #define XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) \ - (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 42 */ + (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 43 */ #endif #ifndef XGetWindowAttributes #define XGetWindowAttributes(d, w, x) \ - (tkIntXlibStubsPtr->xGetWindowAttributes)(d, w, x) /* 43 */ + (tkIntXlibStubsPtr->xGetWindowAttributes)(d, w, x) /* 44 */ #endif #ifndef XGrabKeyboard #define XGrabKeyboard(d, w, b, i1, i2, t) \ - (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 44 */ + (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 45 */ #endif #ifndef XGrabPointer #define XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t) \ - (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 45 */ + (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 46 */ #endif #ifndef XKeysymToKeycode #define XKeysymToKeycode(d, k) \ - (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 46 */ + (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 47 */ #endif #ifndef XLookupColor #define XLookupColor(d, c1, c2, x1, x2) \ - (tkIntXlibStubsPtr->xLookupColor)(d, c1, c2, x1, x2) /* 47 */ + (tkIntXlibStubsPtr->xLookupColor)(d, c1, c2, x1, x2) /* 48 */ #endif #ifndef XMapWindow #define XMapWindow(d, w) \ - (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 48 */ + (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 49 */ #endif #ifndef XMoveResizeWindow #define XMoveResizeWindow(d, w, i1, i2, ui1, ui2) \ - (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 49 */ + (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 50 */ #endif #ifndef XMoveWindow #define XMoveWindow(d, w, i1, i2) \ - (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 50 */ + (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 51 */ #endif #ifndef XNextEvent #define XNextEvent(d, x) \ - (tkIntXlibStubsPtr->xNextEvent)(d, x) /* 51 */ + (tkIntXlibStubsPtr->xNextEvent)(d, x) /* 52 */ #endif #ifndef XPutBackEvent #define XPutBackEvent(d, x) \ - (tkIntXlibStubsPtr->xPutBackEvent)(d, x) /* 52 */ + (tkIntXlibStubsPtr->xPutBackEvent)(d, x) /* 53 */ #endif #ifndef XQueryColors #define XQueryColors(d, c, x, i) \ - (tkIntXlibStubsPtr->xQueryColors)(d, c, x, i) /* 53 */ + (tkIntXlibStubsPtr->xQueryColors)(d, c, x, i) /* 54 */ #endif #ifndef XQueryPointer #define XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui) \ - (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 54 */ + (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 55 */ #endif #ifndef XQueryTree #define XQueryTree(d, w1, w2, w3, w4, ui) \ - (tkIntXlibStubsPtr->xQueryTree)(d, w1, w2, w3, w4, ui) /* 55 */ + (tkIntXlibStubsPtr->xQueryTree)(d, w1, w2, w3, w4, ui) /* 56 */ #endif #ifndef XRaiseWindow #define XRaiseWindow(d, w) \ - (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 56 */ + (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 57 */ #endif #ifndef XRefreshKeyboardMapping #define XRefreshKeyboardMapping(x) \ - (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 57 */ + (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 58 */ #endif #ifndef XResizeWindow #define XResizeWindow(d, w, ui1, ui2) \ - (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 58 */ + (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 59 */ #endif #ifndef XSelectInput #define XSelectInput(d, w, l) \ - (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 59 */ + (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 60 */ #endif #ifndef XSendEvent #define XSendEvent(d, w, b, l, x) \ - (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 60 */ + (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 61 */ #endif #ifndef XSetCommand #define XSetCommand(d, w, c, i) \ - (tkIntXlibStubsPtr->xSetCommand)(d, w, c, i) /* 61 */ + (tkIntXlibStubsPtr->xSetCommand)(d, w, c, i) /* 62 */ #endif #ifndef XSetIconName #define XSetIconName(d, w, c) \ - (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 62 */ + (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 63 */ #endif #ifndef XSetInputFocus #define XSetInputFocus(d, w, i, t) \ - (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 63 */ + (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 64 */ #endif #ifndef XSetSelectionOwner #define XSetSelectionOwner(d, a, w, t) \ - (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 64 */ + (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 65 */ #endif #ifndef XSetWindowBackground #define XSetWindowBackground(d, w, ul) \ - (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 65 */ + (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 66 */ #endif #ifndef XSetWindowBackgroundPixmap #define XSetWindowBackgroundPixmap(d, w, p) \ - (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 66 */ + (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 67 */ #endif #ifndef XSetWindowBorder #define XSetWindowBorder(d, w, ul) \ - (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 67 */ + (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 68 */ #endif #ifndef XSetWindowBorderPixmap #define XSetWindowBorderPixmap(d, w, p) \ - (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 68 */ + (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 69 */ #endif #ifndef XSetWindowBorderWidth #define XSetWindowBorderWidth(d, w, ui) \ - (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 69 */ + (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 70 */ #endif #ifndef XSetWindowColormap #define XSetWindowColormap(d, w, c) \ - (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 70 */ + (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 71 */ #endif #ifndef XTranslateCoordinates #define XTranslateCoordinates(d, w1, w2, i1, i2, i3, i4, w3) \ - (tkIntXlibStubsPtr->xTranslateCoordinates)(d, w1, w2, i1, i2, i3, i4, w3) /* 71 */ + (tkIntXlibStubsPtr->xTranslateCoordinates)(d, w1, w2, i1, i2, i3, i4, w3) /* 72 */ #endif #ifndef XUngrabKeyboard #define XUngrabKeyboard(d, t) \ - (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 72 */ + (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 73 */ #endif #ifndef XUngrabPointer #define XUngrabPointer(d, t) \ - (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 73 */ + (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 74 */ #endif #ifndef XUnmapWindow #define XUnmapWindow(d, w) \ - (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 74 */ + (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 75 */ #endif #ifndef XWindowEvent #define XWindowEvent(d, w, l, x) \ - (tkIntXlibStubsPtr->xWindowEvent)(d, w, l, x) /* 75 */ + (tkIntXlibStubsPtr->xWindowEvent)(d, w, l, x) /* 76 */ #endif #ifndef XDestroyIC #define XDestroyIC(x) \ - (tkIntXlibStubsPtr->xDestroyIC)(x) /* 76 */ + (tkIntXlibStubsPtr->xDestroyIC)(x) /* 77 */ #endif #ifndef XFilterEvent #define XFilterEvent(x, w) \ - (tkIntXlibStubsPtr->xFilterEvent)(x, w) /* 77 */ + (tkIntXlibStubsPtr->xFilterEvent)(x, w) /* 78 */ #endif #ifndef XmbLookupString #define XmbLookupString(xi, xk, c, i, k, s) \ - (tkIntXlibStubsPtr->xmbLookupString)(xi, xk, c, i, k, s) /* 78 */ + (tkIntXlibStubsPtr->xmbLookupString)(xi, xk, c, i, k, s) /* 79 */ #endif #ifndef TkPutImage #define TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) \ - (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 79 */ + (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 80 */ #endif #endif /* __WIN32__ */ #ifdef MAC_TCL +/* Slot 0 is reserved */ #ifndef XGetModifierMapping #define XGetModifierMapping(d) \ - (tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 0 */ + (tkIntXlibStubsPtr->xGetModifierMapping)(d) /* 1 */ #endif #ifndef XCreateImage #define XCreateImage(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) \ - (tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 1 */ + (tkIntXlibStubsPtr->xCreateImage)(d, v, ui1, i1, i2, cp, ui2, ui3, i3, i4) /* 2 */ #endif #ifndef XGetImage #define XGetImage(d, dr, i1, i2, ui1, ui2, ul, i3) \ - (tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 2 */ + (tkIntXlibStubsPtr->xGetImage)(d, dr, i1, i2, ui1, ui2, ul, i3) /* 3 */ #endif #ifndef XGetAtomName #define XGetAtomName(d, a) \ - (tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 3 */ + (tkIntXlibStubsPtr->xGetAtomName)(d, a) /* 4 */ #endif #ifndef XKeysymToString #define XKeysymToString(k) \ - (tkIntXlibStubsPtr->xKeysymToString)(k) /* 4 */ + (tkIntXlibStubsPtr->xKeysymToString)(k) /* 5 */ #endif #ifndef XCreateColormap #define XCreateColormap(d, w, v, i) \ - (tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 5 */ + (tkIntXlibStubsPtr->xCreateColormap)(d, w, v, i) /* 6 */ #endif #ifndef XGContextFromGC #define XGContextFromGC(g) \ - (tkIntXlibStubsPtr->xGContextFromGC)(g) /* 6 */ + (tkIntXlibStubsPtr->xGContextFromGC)(g) /* 7 */ #endif #ifndef XKeycodeToKeysym #define XKeycodeToKeysym(d, k, i) \ - (tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 7 */ + (tkIntXlibStubsPtr->xKeycodeToKeysym)(d, k, i) /* 8 */ #endif #ifndef XStringToKeysym #define XStringToKeysym(c) \ - (tkIntXlibStubsPtr->xStringToKeysym)(c) /* 8 */ + (tkIntXlibStubsPtr->xStringToKeysym)(c) /* 9 */ #endif #ifndef XRootWindow #define XRootWindow(d, i) \ - (tkIntXlibStubsPtr->xRootWindow)(d, i) /* 9 */ + (tkIntXlibStubsPtr->xRootWindow)(d, i) /* 10 */ #endif #ifndef XSetErrorHandler #define XSetErrorHandler(x) \ - (tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 10 */ + (tkIntXlibStubsPtr->xSetErrorHandler)(x) /* 11 */ #endif #ifndef XAllocColor #define XAllocColor(d, c, xp) \ - (tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 11 */ + (tkIntXlibStubsPtr->xAllocColor)(d, c, xp) /* 12 */ #endif #ifndef XBell #define XBell(d, i) \ - (tkIntXlibStubsPtr->xBell)(d, i) /* 12 */ + (tkIntXlibStubsPtr->xBell)(d, i) /* 13 */ #endif #ifndef XChangeProperty #define XChangeProperty(d, w, a, a, i1, i2, c, i3) \ - (tkIntXlibStubsPtr->xChangeProperty)(d, w, a, a, i1, i2, c, i3) /* 13 */ + (tkIntXlibStubsPtr->xChangeProperty)(d, w, a, a, i1, i2, c, i3) /* 14 */ #endif #ifndef XChangeWindowAttributes #define XChangeWindowAttributes(d, w, ul, x) \ - (tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 14 */ + (tkIntXlibStubsPtr->xChangeWindowAttributes)(d, w, ul, x) /* 15 */ #endif #ifndef XConfigureWindow #define XConfigureWindow(d, w, i, x) \ - (tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 15 */ + (tkIntXlibStubsPtr->xConfigureWindow)(d, w, i, x) /* 16 */ #endif #ifndef XCopyArea #define XCopyArea(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 16 */ + (tkIntXlibStubsPtr->xCopyArea)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4) /* 17 */ #endif #ifndef XCopyPlane #define XCopyPlane(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) \ - (tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 17 */ + (tkIntXlibStubsPtr->xCopyPlane)(d, dr1, dr2, g, i1, i2, ui1, ui2, i3, i4, ul) /* 18 */ #endif #ifndef XCreateBitmapFromData #define XCreateBitmapFromData(display, d, data, width, height) \ - (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 18 */ + (tkIntXlibStubsPtr->xCreateBitmapFromData)(display, d, data, width, height) /* 19 */ #endif #ifndef XDefineCursor #define XDefineCursor(d, w, c) \ - (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 19 */ + (tkIntXlibStubsPtr->xDefineCursor)(d, w, c) /* 20 */ #endif #ifndef XDestroyWindow #define XDestroyWindow(d, w) \ - (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 20 */ + (tkIntXlibStubsPtr->xDestroyWindow)(d, w) /* 21 */ #endif #ifndef XDrawArc #define XDrawArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 21 */ + (tkIntXlibStubsPtr->xDrawArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 22 */ #endif #ifndef XDrawLines #define XDrawLines(d, dr, g, x, i1, i2) \ - (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 22 */ + (tkIntXlibStubsPtr->xDrawLines)(d, dr, g, x, i1, i2) /* 23 */ #endif #ifndef XDrawRectangle #define XDrawRectangle(d, dr, g, i1, i2, ui1, ui2) \ - (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 23 */ + (tkIntXlibStubsPtr->xDrawRectangle)(d, dr, g, i1, i2, ui1, ui2) /* 24 */ #endif #ifndef XFillArc #define XFillArc(d, dr, g, i1, i2, ui1, ui2, i3, i4) \ - (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 24 */ + (tkIntXlibStubsPtr->xFillArc)(d, dr, g, i1, i2, ui1, ui2, i3, i4) /* 25 */ #endif #ifndef XFillPolygon #define XFillPolygon(d, dr, g, x, i1, i2, i3) \ - (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 25 */ + (tkIntXlibStubsPtr->xFillPolygon)(d, dr, g, x, i1, i2, i3) /* 26 */ #endif #ifndef XFillRectangles #define XFillRectangles(d, dr, g, x, i) \ - (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 26 */ + (tkIntXlibStubsPtr->xFillRectangles)(d, dr, g, x, i) /* 27 */ #endif #ifndef XFreeColormap #define XFreeColormap(d, c) \ - (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 27 */ + (tkIntXlibStubsPtr->xFreeColormap)(d, c) /* 28 */ #endif #ifndef XFreeColors #define XFreeColors(d, c, ulp, i, ul) \ - (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 28 */ + (tkIntXlibStubsPtr->xFreeColors)(d, c, ulp, i, ul) /* 29 */ #endif #ifndef XFreeModifiermap #define XFreeModifiermap(x) \ - (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 29 */ + (tkIntXlibStubsPtr->xFreeModifiermap)(x) /* 30 */ #endif #ifndef XGetGeometry #define XGetGeometry(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) \ - (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 30 */ + (tkIntXlibStubsPtr->xGetGeometry)(d, dr, w, i1, i2, ui1, ui2, ui3, ui4) /* 31 */ #endif #ifndef XGetWindowProperty #define XGetWindowProperty(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) \ - (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 31 */ + (tkIntXlibStubsPtr->xGetWindowProperty)(d, w, a1, l1, l2, b, a2, ap, ip, ulp1, ulp2, cpp) /* 32 */ #endif #ifndef XGrabKeyboard #define XGrabKeyboard(d, w, b, i1, i2, t) \ - (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 32 */ + (tkIntXlibStubsPtr->xGrabKeyboard)(d, w, b, i1, i2, t) /* 33 */ #endif #ifndef XGrabPointer #define XGrabPointer(d, w1, b, ui, i1, i2, w2, c, t) \ - (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 33 */ + (tkIntXlibStubsPtr->xGrabPointer)(d, w1, b, ui, i1, i2, w2, c, t) /* 34 */ #endif #ifndef XKeysymToKeycode #define XKeysymToKeycode(d, k) \ - (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 34 */ + (tkIntXlibStubsPtr->xKeysymToKeycode)(d, k) /* 35 */ #endif #ifndef XMapWindow #define XMapWindow(d, w) \ - (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 35 */ + (tkIntXlibStubsPtr->xMapWindow)(d, w) /* 36 */ #endif #ifndef XMoveResizeWindow #define XMoveResizeWindow(d, w, i1, i2, ui1, ui2) \ - (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 36 */ + (tkIntXlibStubsPtr->xMoveResizeWindow)(d, w, i1, i2, ui1, ui2) /* 37 */ #endif #ifndef XMoveWindow #define XMoveWindow(d, w, i1, i2) \ - (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 37 */ + (tkIntXlibStubsPtr->xMoveWindow)(d, w, i1, i2) /* 38 */ #endif #ifndef XQueryPointer #define XQueryPointer(d, w1, w2, w3, i1, i2, i3, i4, ui) \ - (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 38 */ + (tkIntXlibStubsPtr->xQueryPointer)(d, w1, w2, w3, i1, i2, i3, i4, ui) /* 39 */ #endif #ifndef XRaiseWindow #define XRaiseWindow(d, w) \ - (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 39 */ + (tkIntXlibStubsPtr->xRaiseWindow)(d, w) /* 40 */ #endif #ifndef XRefreshKeyboardMapping #define XRefreshKeyboardMapping(x) \ - (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 40 */ + (tkIntXlibStubsPtr->xRefreshKeyboardMapping)(x) /* 41 */ #endif #ifndef XResizeWindow #define XResizeWindow(d, w, ui1, ui2) \ - (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 41 */ + (tkIntXlibStubsPtr->xResizeWindow)(d, w, ui1, ui2) /* 42 */ #endif #ifndef XSelectInput #define XSelectInput(d, w, l) \ - (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 42 */ + (tkIntXlibStubsPtr->xSelectInput)(d, w, l) /* 43 */ #endif #ifndef XSendEvent #define XSendEvent(d, w, b, l, x) \ - (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 43 */ + (tkIntXlibStubsPtr->xSendEvent)(d, w, b, l, x) /* 44 */ #endif #ifndef XSetIconName #define XSetIconName(d, w, c) \ - (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 44 */ + (tkIntXlibStubsPtr->xSetIconName)(d, w, c) /* 45 */ #endif #ifndef XSetInputFocus #define XSetInputFocus(d, w, i, t) \ - (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 45 */ + (tkIntXlibStubsPtr->xSetInputFocus)(d, w, i, t) /* 46 */ #endif #ifndef XSetSelectionOwner #define XSetSelectionOwner(d, a, w, t) \ - (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 46 */ + (tkIntXlibStubsPtr->xSetSelectionOwner)(d, a, w, t) /* 47 */ #endif #ifndef XSetWindowBackground #define XSetWindowBackground(d, w, ul) \ - (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 47 */ + (tkIntXlibStubsPtr->xSetWindowBackground)(d, w, ul) /* 48 */ #endif #ifndef XSetWindowBackgroundPixmap #define XSetWindowBackgroundPixmap(d, w, p) \ - (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 48 */ + (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap)(d, w, p) /* 49 */ #endif #ifndef XSetWindowBorder #define XSetWindowBorder(d, w, ul) \ - (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 49 */ + (tkIntXlibStubsPtr->xSetWindowBorder)(d, w, ul) /* 50 */ #endif #ifndef XSetWindowBorderPixmap #define XSetWindowBorderPixmap(d, w, p) \ - (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 50 */ + (tkIntXlibStubsPtr->xSetWindowBorderPixmap)(d, w, p) /* 51 */ #endif #ifndef XSetWindowBorderWidth #define XSetWindowBorderWidth(d, w, ui) \ - (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 51 */ + (tkIntXlibStubsPtr->xSetWindowBorderWidth)(d, w, ui) /* 52 */ #endif #ifndef XSetWindowColormap #define XSetWindowColormap(d, w, c) \ - (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 52 */ + (tkIntXlibStubsPtr->xSetWindowColormap)(d, w, c) /* 53 */ #endif #ifndef XUngrabKeyboard #define XUngrabKeyboard(d, t) \ - (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 53 */ + (tkIntXlibStubsPtr->xUngrabKeyboard)(d, t) /* 54 */ #endif #ifndef XUngrabPointer #define XUngrabPointer(d, t) \ - (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 54 */ + (tkIntXlibStubsPtr->xUngrabPointer)(d, t) /* 55 */ #endif #ifndef XUnmapWindow #define XUnmapWindow(d, w) \ - (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 55 */ + (tkIntXlibStubsPtr->xUnmapWindow)(d, w) /* 56 */ #endif #ifndef TkPutImage #define TkPutImage(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) \ - (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 56 */ + (tkIntXlibStubsPtr->tkPutImage)(colors, ncolors, display, d, gc, image, src_x, src_y, dest_x, dest_y, width, height) /* 57 */ #endif #endif /* MAC_TCL */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index a1b228b..c833b75 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.2.2.1 1999/03/10 07:13:45 stanton Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.2.2.2 1999/03/12 03:12:47 stanton Exp $ */ #include "tkInt.h" @@ -517,145 +517,147 @@ TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, NULL, #ifdef __WIN32__ - XGetModifierMapping, /* 0 */ - XCreateImage, /* 1 */ - XGetImage, /* 2 */ - XGetAtomName, /* 3 */ - XKeysymToString, /* 4 */ - XCreateColormap, /* 5 */ - XCreatePixmapCursor, /* 6 */ - XCreateGlyphCursor, /* 7 */ - XGContextFromGC, /* 8 */ - XListHosts, /* 9 */ - XKeycodeToKeysym, /* 10 */ - XStringToKeysym, /* 11 */ - XRootWindow, /* 12 */ - XSetErrorHandler, /* 13 */ - XIconifyWindow, /* 14 */ - XWithdrawWindow, /* 15 */ - XGetWMColormapWindows, /* 16 */ - XAllocColor, /* 17 */ - XBell, /* 18 */ - XChangeProperty, /* 19 */ - XChangeWindowAttributes, /* 20 */ - XClearWindow, /* 21 */ - XConfigureWindow, /* 22 */ - XCopyArea, /* 23 */ - XCopyPlane, /* 24 */ - XCreateBitmapFromData, /* 25 */ - XDefineCursor, /* 26 */ - XDeleteProperty, /* 27 */ - XDestroyWindow, /* 28 */ - XDrawArc, /* 29 */ - XDrawLines, /* 30 */ - XDrawRectangle, /* 31 */ - XFillArc, /* 32 */ - XFillPolygon, /* 33 */ - XFillRectangles, /* 34 */ - XForceScreenSaver, /* 35 */ - XFreeColormap, /* 36 */ - XFreeColors, /* 37 */ - XFreeCursor, /* 38 */ - XFreeModifiermap, /* 39 */ - XGetGeometry, /* 40 */ - XGetInputFocus, /* 41 */ - XGetWindowProperty, /* 42 */ - XGetWindowAttributes, /* 43 */ - XGrabKeyboard, /* 44 */ - XGrabPointer, /* 45 */ - XKeysymToKeycode, /* 46 */ - XLookupColor, /* 47 */ - XMapWindow, /* 48 */ - XMoveResizeWindow, /* 49 */ - XMoveWindow, /* 50 */ - XNextEvent, /* 51 */ - XPutBackEvent, /* 52 */ - XQueryColors, /* 53 */ - XQueryPointer, /* 54 */ - XQueryTree, /* 55 */ - XRaiseWindow, /* 56 */ - XRefreshKeyboardMapping, /* 57 */ - XResizeWindow, /* 58 */ - XSelectInput, /* 59 */ - XSendEvent, /* 60 */ - XSetCommand, /* 61 */ - XSetIconName, /* 62 */ - XSetInputFocus, /* 63 */ - XSetSelectionOwner, /* 64 */ - XSetWindowBackground, /* 65 */ - XSetWindowBackgroundPixmap, /* 66 */ - XSetWindowBorder, /* 67 */ - XSetWindowBorderPixmap, /* 68 */ - XSetWindowBorderWidth, /* 69 */ - XSetWindowColormap, /* 70 */ - XTranslateCoordinates, /* 71 */ - XUngrabKeyboard, /* 72 */ - XUngrabPointer, /* 73 */ - XUnmapWindow, /* 74 */ - XWindowEvent, /* 75 */ - XDestroyIC, /* 76 */ - XFilterEvent, /* 77 */ - XmbLookupString, /* 78 */ - TkPutImage, /* 79 */ + NULL, /* 0 */ + XGetModifierMapping, /* 1 */ + XCreateImage, /* 2 */ + XGetImage, /* 3 */ + XGetAtomName, /* 4 */ + XKeysymToString, /* 5 */ + XCreateColormap, /* 6 */ + XCreatePixmapCursor, /* 7 */ + XCreateGlyphCursor, /* 8 */ + XGContextFromGC, /* 9 */ + XListHosts, /* 10 */ + XKeycodeToKeysym, /* 11 */ + XStringToKeysym, /* 12 */ + XRootWindow, /* 13 */ + XSetErrorHandler, /* 14 */ + XIconifyWindow, /* 15 */ + XWithdrawWindow, /* 16 */ + XGetWMColormapWindows, /* 17 */ + XAllocColor, /* 18 */ + XBell, /* 19 */ + XChangeProperty, /* 20 */ + XChangeWindowAttributes, /* 21 */ + XClearWindow, /* 22 */ + XConfigureWindow, /* 23 */ + XCopyArea, /* 24 */ + XCopyPlane, /* 25 */ + XCreateBitmapFromData, /* 26 */ + XDefineCursor, /* 27 */ + XDeleteProperty, /* 28 */ + XDestroyWindow, /* 29 */ + XDrawArc, /* 30 */ + XDrawLines, /* 31 */ + XDrawRectangle, /* 32 */ + XFillArc, /* 33 */ + XFillPolygon, /* 34 */ + XFillRectangles, /* 35 */ + XForceScreenSaver, /* 36 */ + XFreeColormap, /* 37 */ + XFreeColors, /* 38 */ + XFreeCursor, /* 39 */ + XFreeModifiermap, /* 40 */ + XGetGeometry, /* 41 */ + XGetInputFocus, /* 42 */ + XGetWindowProperty, /* 43 */ + XGetWindowAttributes, /* 44 */ + XGrabKeyboard, /* 45 */ + XGrabPointer, /* 46 */ + XKeysymToKeycode, /* 47 */ + XLookupColor, /* 48 */ + XMapWindow, /* 49 */ + XMoveResizeWindow, /* 50 */ + XMoveWindow, /* 51 */ + XNextEvent, /* 52 */ + XPutBackEvent, /* 53 */ + XQueryColors, /* 54 */ + XQueryPointer, /* 55 */ + XQueryTree, /* 56 */ + XRaiseWindow, /* 57 */ + XRefreshKeyboardMapping, /* 58 */ + XResizeWindow, /* 59 */ + XSelectInput, /* 60 */ + XSendEvent, /* 61 */ + XSetCommand, /* 62 */ + XSetIconName, /* 63 */ + XSetInputFocus, /* 64 */ + XSetSelectionOwner, /* 65 */ + XSetWindowBackground, /* 66 */ + XSetWindowBackgroundPixmap, /* 67 */ + XSetWindowBorder, /* 68 */ + XSetWindowBorderPixmap, /* 69 */ + XSetWindowBorderWidth, /* 70 */ + XSetWindowColormap, /* 71 */ + XTranslateCoordinates, /* 72 */ + XUngrabKeyboard, /* 73 */ + XUngrabPointer, /* 74 */ + XUnmapWindow, /* 75 */ + XWindowEvent, /* 76 */ + XDestroyIC, /* 77 */ + XFilterEvent, /* 78 */ + XmbLookupString, /* 79 */ + TkPutImage, /* 80 */ #endif /* __WIN32__ */ #ifdef MAC_TCL - XGetModifierMapping, /* 0 */ - XCreateImage, /* 1 */ - XGetImage, /* 2 */ - XGetAtomName, /* 3 */ - XKeysymToString, /* 4 */ - XCreateColormap, /* 5 */ - XGContextFromGC, /* 6 */ - XKeycodeToKeysym, /* 7 */ - XStringToKeysym, /* 8 */ - XRootWindow, /* 9 */ - XSetErrorHandler, /* 10 */ - XAllocColor, /* 11 */ - XBell, /* 12 */ - XChangeProperty, /* 13 */ - XChangeWindowAttributes, /* 14 */ - XConfigureWindow, /* 15 */ - XCopyArea, /* 16 */ - XCopyPlane, /* 17 */ - XCreateBitmapFromData, /* 18 */ - XDefineCursor, /* 19 */ - XDestroyWindow, /* 20 */ - XDrawArc, /* 21 */ - XDrawLines, /* 22 */ - XDrawRectangle, /* 23 */ - XFillArc, /* 24 */ - XFillPolygon, /* 25 */ - XFillRectangles, /* 26 */ - XFreeColormap, /* 27 */ - XFreeColors, /* 28 */ - XFreeModifiermap, /* 29 */ - XGetGeometry, /* 30 */ - XGetWindowProperty, /* 31 */ - XGrabKeyboard, /* 32 */ - XGrabPointer, /* 33 */ - XKeysymToKeycode, /* 34 */ - XMapWindow, /* 35 */ - XMoveResizeWindow, /* 36 */ - XMoveWindow, /* 37 */ - XQueryPointer, /* 38 */ - XRaiseWindow, /* 39 */ - XRefreshKeyboardMapping, /* 40 */ - XResizeWindow, /* 41 */ - XSelectInput, /* 42 */ - XSendEvent, /* 43 */ - XSetIconName, /* 44 */ - XSetInputFocus, /* 45 */ - XSetSelectionOwner, /* 46 */ - XSetWindowBackground, /* 47 */ - XSetWindowBackgroundPixmap, /* 48 */ - XSetWindowBorder, /* 49 */ - XSetWindowBorderPixmap, /* 50 */ - XSetWindowBorderWidth, /* 51 */ - XSetWindowColormap, /* 52 */ - XUngrabKeyboard, /* 53 */ - XUngrabPointer, /* 54 */ - XUnmapWindow, /* 55 */ - TkPutImage, /* 56 */ + NULL, /* 0 */ + XGetModifierMapping, /* 1 */ + XCreateImage, /* 2 */ + XGetImage, /* 3 */ + XGetAtomName, /* 4 */ + XKeysymToString, /* 5 */ + XCreateColormap, /* 6 */ + XGContextFromGC, /* 7 */ + XKeycodeToKeysym, /* 8 */ + XStringToKeysym, /* 9 */ + XRootWindow, /* 10 */ + XSetErrorHandler, /* 11 */ + XAllocColor, /* 12 */ + XBell, /* 13 */ + XChangeProperty, /* 14 */ + XChangeWindowAttributes, /* 15 */ + XConfigureWindow, /* 16 */ + XCopyArea, /* 17 */ + XCopyPlane, /* 18 */ + XCreateBitmapFromData, /* 19 */ + XDefineCursor, /* 20 */ + XDestroyWindow, /* 21 */ + XDrawArc, /* 22 */ + XDrawLines, /* 23 */ + XDrawRectangle, /* 24 */ + XFillArc, /* 25 */ + XFillPolygon, /* 26 */ + XFillRectangles, /* 27 */ + XFreeColormap, /* 28 */ + XFreeColors, /* 29 */ + XFreeModifiermap, /* 30 */ + XGetGeometry, /* 31 */ + XGetWindowProperty, /* 32 */ + XGrabKeyboard, /* 33 */ + XGrabPointer, /* 34 */ + XKeysymToKeycode, /* 35 */ + XMapWindow, /* 36 */ + XMoveResizeWindow, /* 37 */ + XMoveWindow, /* 38 */ + XQueryPointer, /* 39 */ + XRaiseWindow, /* 40 */ + XRefreshKeyboardMapping, /* 41 */ + XResizeWindow, /* 42 */ + XSelectInput, /* 43 */ + XSendEvent, /* 44 */ + XSetIconName, /* 45 */ + XSetInputFocus, /* 46 */ + XSetSelectionOwner, /* 47 */ + XSetWindowBackground, /* 48 */ + XSetWindowBackgroundPixmap, /* 49 */ + XSetWindowBorder, /* 50 */ + XSetWindowBorderPixmap, /* 51 */ + XSetWindowBorderWidth, /* 52 */ + XSetWindowColormap, /* 53 */ + XUngrabKeyboard, /* 54 */ + XUngrabPointer, /* 55 */ + XUnmapWindow, /* 56 */ + TkPutImage, /* 57 */ #endif /* MAC_TCL */ }; |