diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/default.h | 6 | ||||
| -rw-r--r-- | generic/tk.decls | 53 | ||||
| -rw-r--r-- | generic/tk.h | 19 | ||||
| -rw-r--r-- | generic/tkBind.c | 4 | ||||
| -rw-r--r-- | generic/tkCmds.c | 28 | ||||
| -rw-r--r-- | generic/tkFont.c | 46 | ||||
| -rw-r--r-- | generic/tkGrab.c | 4 | ||||
| -rw-r--r-- | generic/tkInt.decls | 459 | ||||
| -rw-r--r-- | generic/tkInt.h | 4 | ||||
| -rw-r--r-- | generic/tkIntDecls.h | 158 | ||||
| -rw-r--r-- | generic/tkIntPlatDecls.h | 584 | ||||
| -rw-r--r-- | generic/tkIntXlibDecls.h | 742 | ||||
| -rw-r--r-- | generic/tkMain.c | 4 | ||||
| -rw-r--r-- | generic/tkPlatDecls.h | 95 | ||||
| -rw-r--r-- | generic/tkPointer.c | 9 | ||||
| -rw-r--r-- | generic/tkPort.h | 4 | ||||
| -rw-r--r-- | generic/tkSelect.c | 4 | ||||
| -rw-r--r-- | generic/tkStubInit.c | 244 | ||||
| -rw-r--r-- | generic/tkStubLib.c | 6 | ||||
| -rw-r--r-- | generic/tkTest.c | 18 | ||||
| -rw-r--r-- | generic/tkText.c | 4 | ||||
| -rw-r--r-- | generic/tkWindow.c | 14 |
22 files changed, 2224 insertions, 285 deletions
diff --git a/generic/default.h b/generic/default.h index f87c197..2ec68a3 100644 --- a/generic/default.h +++ b/generic/default.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: default.h,v 1.3 2001/07/24 22:54:55 mdejong Exp $ + * RCS: @(#) $Id: default.h,v 1.4 2002/08/31 06:12:19 das Exp $ */ #ifndef _DEFAULT @@ -20,7 +20,9 @@ defined(__CYGWIN__) || defined(__MINGW32__) # include "tkWinDefault.h" #else -# if defined(MAC_TCL) +# if defined(MAC_OSX_TK) +# include "tkMacOSXDefault.h" +# elif defined(MAC_TCL) # include "tkMacDefault.h" # else # include "tkUnixDefault.h" diff --git a/generic/tk.decls b/generic/tk.decls index 3328b6a..deece6d 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tk.decls,v 1.23 2002/08/05 04:30:38 dgp Exp $ +# RCS: @(#) $Id: tk.decls,v 1.24 2002/08/31 06:12:19 das Exp $ library tk @@ -1331,3 +1331,54 @@ declare 10 mac { GWorldPtr TkMacGetDrawablePort (Drawable drawable) } +# Mac OS X specific functions + +declare 0 aqua { + void Tk_MacOSXSetEmbedHandler ( \ + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, \ + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, \ + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, \ + Tk_MacOSXEmbedGetClipProc *getClipProc, \ + Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc) +} + +declare 1 aqua { + void Tk_MacOSXTurnOffMenus (void) +} + +declare 2 aqua { + void Tk_MacOSXTkOwnsCursor (int tkOwnsIt) +} + +declare 3 aqua { + void TkMacOSXInitMenus (Tcl_Interp *interp) +} + +declare 4 aqua { + void TkMacOSXInitAppleEvents (Tcl_Interp *interp) +} + +declare 5 aqua { + void TkGenWMConfigureEvent (Tk_Window tkwin, \ + int x, int y, int width, int height, int flags) +} + +declare 6 aqua { + void TkMacOSXInvalClipRgns (TkWindow *winPtr) +} + +declare 7 aqua { + GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) +} + +declare 8 aqua { + ControlRef TkMacOSXGetRootControl (Drawable drawable) +} + +declare 9 aqua { + void Tk_MacOSXSetupTkNotifier (void) +} + +declare 10 aqua { + int Tk_MacOSXIsAppInFront (void) +} diff --git a/generic/tk.h b/generic/tk.h index 1d8a0cd..00f105d 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.67 2002/08/20 15:39:13 dgp Exp $ + * RCS: @(#) $Id: tk.h,v 1.68 2002/08/31 06:12:20 das Exp $ */ #ifndef _TK @@ -54,11 +54,19 @@ extern "C" { #define TK_PATCH_LEVEL "8.4b3" /* + * A special define for MacOS & MacOS X, allows us to use the header + * in the resource compiler without having it choke on the more complex + * C preprocessor constructs. + */ + +#ifndef RESOURCE_INCLUDED + +/* * The following definitions set up the proper options for Macintosh * compilers. We use this method because there is no autoconf equivalent. */ -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # ifndef REDO_KEYSYM_LOOKUP # define REDO_KEYSYM_LOOKUP # endif @@ -79,9 +87,12 @@ extern "C" { #ifndef RC_INVOKED #ifndef _XLIB_H -# ifdef MAC_TCL +# if defined (MAC_TCL) # include <Xlib.h> # include <X.h> +# elif defined(MAC_OSX_TK) +# include <X11/Xlib.h> +# include <X11/X.h> # else # include <X11/Xlib.h> # endif @@ -1595,6 +1606,8 @@ typedef int (Tk_SelectionProc) _ANSI_ARGS_((ClientData clientData, #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#endif /* RESOURCE_INCLUDED */ + /* * end block for C++ */ diff --git a/generic/tkBind.c b/generic/tkBind.c index a71ac44..12dbe33 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkBind.c,v 1.26 2002/08/05 04:30:38 dgp Exp $ + * RCS: @(#) $Id: tkBind.c,v 1.27 2002/08/31 06:12:20 das Exp $ */ #include "tkPort.h" @@ -21,7 +21,7 @@ #include "tkWinInt.h" #endif -#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* UNIX */ #include "tkUnixInt.h" #endif diff --git a/generic/tkCmds.c b/generic/tkCmds.c index e1cac65..28da6e4 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCmds.c,v 1.29 2002/08/05 04:30:38 dgp Exp $ + * RCS: @(#) $Id: tkCmds.c,v 1.30 2002/08/31 06:12:20 das Exp $ */ #include "tkPort.h" @@ -22,6 +22,8 @@ #include "tkWinInt.h" #elif defined(MAC_TCL) #include "tkMacInt.h" +#elif defined(MAC_OSX_TK) +#include "tkMacOSXInt.h" #else #include "tkUnixInt.h" #endif @@ -619,10 +621,11 @@ Tk_TkObjCmd(clientData, interp, objc, objv) Tk_Window tkwin; static CONST char *optionStrings[] = { "appname", "caret", "scaling", "useinputmethods", - NULL + "windowingsystem", NULL }; enum options { - TK_APPNAME, TK_CARET, TK_SCALING, TK_USE_IM + TK_APPNAME, TK_CARET, TK_SCALING, TK_USE_IM, + TK_WINDOWINGSYSTEM }; tkwin = (Tk_Window) clientData; @@ -809,6 +812,25 @@ Tk_TkObjCmd(clientData, interp, objc, objv) (int) (dispPtr->flags & TK_DISPLAY_USE_IM)); break; } + case TK_WINDOWINGSYSTEM: { + CONST char *windowingsystem; + + if (objc != 2) { + Tcl_WrongNumArgs(interp, 2, objv, NULL); + return TCL_ERROR; + } + #if defined(__WIN32__) || defined(_WIN32) + windowingsystem = "win32"; + #elif defined(MAC_TCL) + windowingsystem = "classic"; + #elif defined(MAC_OSX_TK) + windowingsystem = "aqua"; + #else + windowingsystem = "x11"; + #endif + Tcl_SetStringObj(Tcl_GetObjResult(interp), windowingsystem, -1); + break; + } } return TCL_OK; } diff --git a/generic/tkFont.c b/generic/tkFont.c index 31d94e5..5c7341c 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.19 2002/08/05 04:30:38 dgp Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.20 2002/08/31 06:12:20 das Exp $ */ #include "tkPort.h" @@ -3713,3 +3713,47 @@ TkDebugFont(tkwin, name) } return resultPtr; } + +/* + *---------------------------------------------------------------------- + * + * TkFontGetFirstTextLayout -- + * + * This procedure returns the first chunk of a Tk_TextLayout, + * i.e. until the first font change on the first line (or the + * whole first line if there is no such font change). + * + * Results: + * The return value is the byte length of the chunk, the chunk + * itself is copied into dst and its Tk_Font into font. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + +int +TkFontGetFirstTextLayout( + Tk_TextLayout layout, /* Layout information, from a previous call + * to Tk_ComputeTextLayout(). */ + Tk_Font * font, + char * dst) +{ + TextLayout *layoutPtr; + LayoutChunk *chunkPtr; + int numBytesInChunk; + + layoutPtr = (TextLayout *)layout; + if ((layoutPtr==NULL) + || (layoutPtr->numChunks==0) + || (layoutPtr->chunks->numDisplayChars <= 0)) { + dst[0] = '\0'; + return 0; + } + chunkPtr = layoutPtr->chunks; + numBytesInChunk = chunkPtr->numBytes; + strncpy(dst, chunkPtr->start, numBytesInChunk); + *font = layoutPtr->tkfont; + return numBytesInChunk; +} diff --git a/generic/tkGrab.c b/generic/tkGrab.c index fb32642..4bf826f 100644 --- a/generic/tkGrab.c +++ b/generic/tkGrab.c @@ -9,13 +9,13 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkGrab.c,v 1.8 2002/06/14 22:25:12 jenglish Exp $ + * RCS: @(#) $Id: tkGrab.c,v 1.9 2002/08/31 06:12:20 das Exp $ */ #include "tkPort.h" #include "tkInt.h" -#if !defined(__WIN32__) && !defined(MAC_TCL) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 5b3ca57..52673ea 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.29 2002/08/05 04:30:39 dgp Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.30 2002/08/31 06:12:20 das Exp $ library tk @@ -527,32 +527,32 @@ declare 112 generic { void TkpMenuThreadInit (void) } -declare 113 {mac win} { +declare 113 {mac aqua win} { void TkClipBox (TkRegion rgn, XRectangle* rect_return) } -declare 114 {mac win} { +declare 114 {mac aqua win} { TkRegion TkCreateRegion (void) } -declare 115 {mac win} { +declare 115 {mac aqua win} { void TkDestroyRegion (TkRegion rgn) } -declare 116 {mac win} { +declare 116 {mac aqua win} { void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) } -declare 117 {mac win} { +declare 117 {mac aqua win} { int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, \ unsigned int height) } -declare 118 {mac win} { +declare 118 {mac aqua win} { void TkSetRegion (Display* display, GC gc, TkRegion rgn) } -declare 119 {mac win} { +declare 119 {mac aqua win} { void TkUnionRectWithRegion (XRectangle* rect, \ TkRegion src, TkRegion dr_return) } @@ -562,11 +562,11 @@ declare 119 {mac win} { # void TkGenerateActivateEvents (TkWindow *winPtr, int active) #} -declare 121 mac { - Pixmap TkpCreateNativeBitmap (Display *display, char * source) +declare 121 {mac aqua} { + Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) } -declare 122 mac { +declare 122 {mac aqua} { void TkpDefineNativeBitmaps (void) } @@ -575,7 +575,7 @@ declare 122 mac { # unsigned long TkpGetMS (void) #} -declare 124 mac { +declare 124 {mac aqua} { Pixmap TkpGetNativeAppBitmap (Display *display, \ CONST char *name, int *width, int *height) } @@ -657,7 +657,7 @@ declare 144 generic { void TkGCCleanup(TkDisplay *dispPtr) } -declare 145 {mac win} { +declare 145 {mac win aqua} { void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return) } @@ -678,55 +678,55 @@ interface tkIntPlat ######################### # Unix specific functions -declare 0 unix { +declare 0 x11 { void TkCreateXEventSource (void) } -declare 1 unix { +declare 1 x11 { void TkFreeWindowId (TkDisplay *dispPtr, Window w) } -declare 2 unix { +declare 2 x11 { void TkInitXId (TkDisplay *dispPtr) } -declare 3 unix { +declare 3 x11 { int TkpCmapStressed (Tk_Window tkwin, Colormap colormap) } -declare 4 unix { +declare 4 x11 { void TkpSync (Display *display) } -declare 5 unix { +declare 5 x11 { Window TkUnixContainerId (TkWindow *winPtr) } -declare 6 unix { +declare 6 x11 { int TkUnixDoOneXEvent (Tcl_Time *timePtr) } -declare 7 unix { +declare 7 x11 { void TkUnixSetMenubar (Tk_Window tkwin, Tk_Window menubar) } -declare 8 unix { +declare 8 x11 { int TkpScanWindowId (Tcl_Interp *interp, CONST char *string, Window *idPtr) } -declare 9 unix { +declare 9 x11 { void TkWmCleanup (TkDisplay *dispPtr) } -declare 10 unix { +declare 10 x11 { void TkSendCleanup (TkDisplay *dispPtr) } -declare 11 unix { +declare 11 x11 { void TkFreeXId (TkDisplay *dispPtr) } -declare 12 unix { +declare 12 x11 { int TkpWmSetState (TkWindow *winPtr, int state) } @@ -882,7 +882,7 @@ declare 0 mac { # removed duplicates from tkInt table #declare 1 mac { -# Pixmap TkpCreateNativeBitmap (Display *display, char * source) +# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) #} # #declare 2 mac { @@ -1114,6 +1114,229 @@ declare 66 mac { int TkpIsWindowFloating (WindowRef window) } +######################## +# Mac OS X specific functions + +declare 0 aqua { + void TkGenerateActivateEvents (TkWindow *winPtr, int active) +} + +# removed duplicates from tkInt table +#declare 1 aqua { +# Pixmap TkpCreateNativeBitmap (Display *display, CONST char * source) +#} +# +#declare 2 aqua { +# void TkpDefineNativeBitmaps (void) +#} + +declare 3 aqua { + void TkPointerDeadWindow (TkWindow *winPtr) +} + +declare 4 aqua { + void TkpSetCapture (TkWindow *winPtr) +} + +declare 5 aqua { + void TkpSetCursor (TkpCursor cursor) +} + +declare 6 aqua { + void TkpWmSetState (TkWindow *winPtr, int state) +} + +declare 7 aqua { + void TkAboutDlg (void) +} + +declare 8 aqua { + unsigned int TkMacOSXButtonKeyState (void) +} + +declare 9 aqua { + void TkMacOSXClearMenubarActive (void) +} + +declare 10 aqua { + int TkMacOSXDispatchMenuEvent (int menuID, int index) +} + +declare 11 aqua { + void TkMacOSXInstallCursor (int resizeOverride) +} + +declare 12 aqua { + void TkMacOSXHandleTearoffMenu (void) +} + +# removed duplicate from tkPlat table (tk.decls) +#declare 13 aqua { +# void TkMacOSXInvalClipRgns (TkWindow *winPtr) +#} + +declare 14 aqua { + int TkMacOSXDoHLEvent (EventRecord *theEvent) +} + +# removed duplicate from tkPlat table (tk.decls) +#declare 15 aqua { +# GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) +#} + +declare 16 aqua { + Window TkMacOSXGetXWindow (WindowRef macWinPtr) +} + +declare 17 aqua { + int TkMacOSXGrowToplevel (WindowRef whichWindow, Point start) +} + +declare 18 aqua { + void TkMacOSXHandleMenuSelect (long mResult, int optionKeyPressed) +} + +# removed duplicates from tkPlat table (tk.decls) +#declare 19 aqua { +# void TkMacOSXInitAppleEvents (Tcl_Interp *interp) +#} +# +#declare 20 aqua { +# void TkMacOSXInitMenus (Tcl_Interp *interp) +#} + +declare 21 aqua { + void TkMacOSXInvalidateWindow (MacDrawable *macWin, int flag) +} + +declare 22 aqua { + int TkMacOSXIsCharacterMissing (Tk_Font tkfont, unsigned int searchChar) +} + +declare 23 aqua { + void TkMacOSXMakeRealWindowExist (TkWindow *winPtr) +} + +declare 24 aqua { + BitMapPtr TkMacOSXMakeStippleMap(Drawable d1, Drawable d2) +} + +declare 25 aqua { + void TkMacOSXMenuClick (void) +} + +declare 26 aqua { + void TkMacOSXRegisterOffScreenWindow (Window window, GWorldPtr portPtr) +} + +declare 27 aqua { + int TkMacOSXResizable (TkWindow *winPtr) +} + +declare 28 aqua { + void TkMacOSXSetHelpMenuItemCount (void) +} + +declare 29 aqua { + void TkMacOSXSetScrollbarGrow (TkWindow *winPtr, int flag) +} + +declare 30 aqua { + void TkMacOSXSetUpClippingRgn (Drawable drawable) +} + +declare 31 aqua { + void TkMacOSXSetUpGraphicsPort (GC gc, GWorldPtr destPort) +} + +declare 32 aqua { + void TkMacOSXUpdateClipRgn (TkWindow *winPtr) +} + +declare 33 aqua { + void TkMacOSXUnregisterMacWindow (WindowRef portPtr) +} + +declare 34 aqua { + int TkMacOSXUseMenuID (short macID) +} + +declare 35 aqua { + RgnHandle TkMacOSXVisableClipRgn (TkWindow *winPtr) +} + +declare 36 aqua { + void TkMacOSXWinBounds (TkWindow *winPtr, Rect *geometry) +} + +declare 37 aqua { + void TkMacOSXWindowOffset (WindowRef wRef, int *xOffset, int *yOffset) +} + +declare 38 aqua { + int TkSetMacColor (unsigned long pixel, RGBColor *macColor) +} + +declare 39 aqua { + void TkSetWMName (TkWindow *winPtr, Tk_Uid titleUid) +} + +declare 40 aqua { + void TkSuspendClipboard (void) +} + +declare 41 aqua { + int TkMacOSXZoomToplevel (WindowPtr whichWindow, Point where, short zoomPart) +} + +declare 42 aqua { + Tk_Window Tk_TopCoordsToWindow (Tk_Window tkwin, \ + int rootX, int rootY, int *newX, int *newY) +} + +declare 43 aqua { + MacDrawable * TkMacOSXContainerId (TkWindow *winPtr) +} + +declare 44 aqua { + MacDrawable * TkMacOSXGetHostToplevel (TkWindow *winPtr) +} + +declare 45 aqua { + void TkMacOSXPreprocessMenu (void) +} + +declare 46 aqua { + int TkpIsWindowFloating (WindowRef window) +} + +declare 47 aqua { + Tk_Window TkMacOSXGetCapture (void) +} + +declare 49 aqua { + Window TkGetTransientMaster (TkWindow *winPtr) +} + +declare 50 aqua { + int TkGenerateButtonEvent (int x, int y, \ + Window window, unsigned int state) +} + +declare 51 aqua { + void TkGenWMDestroyEvent (Tk_Window tkwin) +} + +# removed duplicate from tkPlat table (tk.decls) +#declare 52 aqua { +# void TkGenWMConfigureEvent (Tk_Window tkwin, int x, int y, \ +# int width, int height, int flags) +#} + +declare 53 aqua { + unsigned long TkpGetMS (void) +} + ############################################################################## # Define the platform specific internal Xlib interfaces. These functions are @@ -1603,409 +1826,409 @@ declare 105 win { unsigned int sw, unsigned int sh, int dx, int dy) } -# X functions for Mac +# X functions for Mac and Aqua -declare 0 mac { +declare 0 {mac aqua} { void XSetDashes (Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n) } -declare 1 mac { +declare 1 {mac aqua} { XModifierKeymap* XGetModifierMapping (Display* d) } -declare 2 mac { +declare 2 {mac aqua} { 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 3 mac { +declare 3 {mac aqua} { XImage *XGetImage (Display* d, Drawable dr, int i1, int i2, \ unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } -declare 4 mac { +declare 4 {mac aqua} { char *XGetAtomName (Display* d,Atom a) } -declare 5 mac { +declare 5 {mac aqua} { char *XKeysymToString (KeySym k) } -declare 6 mac { +declare 6 {mac aqua} { Colormap XCreateColormap (Display* d, Window w, Visual* v, int i) } -declare 7 mac { +declare 7 {mac aqua} { GContext XGContextFromGC (GC g) } -declare 8 mac { +declare 8 {mac aqua} { KeySym XKeycodeToKeysym (Display* d, KeyCode k, int i) } -declare 9 mac { +declare 9 {mac aqua} { KeySym XStringToKeysym (_Xconst char* c) } -declare 10 mac { +declare 10 {mac aqua} { Window XRootWindow (Display* d, int i) } -declare 11 mac { +declare 11 {mac aqua} { XErrorHandler XSetErrorHandler (XErrorHandler x) } -declare 12 mac { +declare 12 {mac aqua} { Status XAllocColor (Display* d, Colormap c, XColor* xp) } -declare 13 mac { +declare 13 {mac aqua} { void XBell (Display* d, int i) } -declare 14 mac { +declare 14 {mac aqua} { void XChangeProperty (Display* d, Window w, Atom a1, Atom a2, int i1, \ int i2, _Xconst unsigned char* c, int i3) } -declare 15 mac { +declare 15 {mac aqua} { void XChangeWindowAttributes (Display* d, Window w, unsigned long ul, \ XSetWindowAttributes* x) } -declare 16 mac { +declare 16 {mac aqua} { void XConfigureWindow (Display* d, Window w, unsigned int i, \ XWindowChanges* x) } -declare 17 mac { +declare 17 {mac aqua} { 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 18 mac { +declare 18 {mac aqua} { 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 19 mac { +declare 19 {mac aqua} { Pixmap XCreateBitmapFromData(Display* display, Drawable d, \ _Xconst char* data, unsigned int width,unsigned int height) } -declare 20 mac { +declare 20 {mac aqua} { void XDefineCursor (Display* d, Window w, Cursor c) } -declare 21 mac { +declare 21 {mac aqua} { void XDestroyWindow (Display* d, Window w) } -declare 22 mac { +declare 22 {mac aqua} { void XDrawArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 23 mac { +declare 23 {mac aqua} { void XDrawLines (Display* d, Drawable dr, GC g, XPoint* x, int i1, int i2) } -declare 24 mac { +declare 24 {mac aqua} { void XDrawRectangle (Display* d, Drawable dr, GC g, int i1, int i2,\ unsigned int ui1, unsigned int ui2) } -declare 25 mac { +declare 25 {mac aqua} { void XFillArc (Display* d, Drawable dr, GC g, int i1, int i2, \ unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 26 mac { +declare 26 {mac aqua} { void XFillPolygon (Display* d, Drawable dr, GC g, XPoint* x, \ int i1, int i2, int i3) } -declare 27 mac { +declare 27 {mac aqua} { void XFillRectangles (Display* d, Drawable dr, GC g, XRectangle* x, int i) } -declare 28 mac { +declare 28 {mac aqua} { void XFreeColormap (Display* d, Colormap c) } -declare 29 mac { +declare 29 {mac aqua} { void XFreeColors (Display* d, Colormap c, \ unsigned long* ulp, int i, unsigned long ul) } -declare 30 mac { +declare 30 {mac aqua} { void XFreeModifiermap (XModifierKeymap* x) } -declare 31 mac { +declare 31 {mac aqua} { 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 32 mac { +declare 32 {mac aqua} { 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 33 mac { +declare 33 {mac aqua} { int XGrabKeyboard (Display* d, Window w, Bool b, int i1, int i2, Time t) } -declare 34 mac { +declare 34 {mac aqua} { int XGrabPointer (Display* d, Window w1, Bool b, unsigned int ui, \ int i1, int i2, Window w2, Cursor c, Time t) } -declare 35 mac { +declare 35 {mac aqua} { KeyCode XKeysymToKeycode (Display* d, KeySym k) } -declare 36 mac { +declare 36 {mac aqua} { void XMapWindow (Display* d, Window w) } -declare 37 mac { +declare 37 {mac aqua} { void XMoveResizeWindow (Display* d, Window w, int i1, int i2, \ unsigned int ui1, unsigned int ui2) } -declare 38 mac { +declare 38 {mac aqua} { void XMoveWindow (Display* d, Window w, int i1, int i2) } -declare 39 mac { +declare 39 {mac aqua} { Bool XQueryPointer (Display* d, Window w1, Window* w2, Window* w3, \ int* i1, int* i2, int* i3, int* i4, unsigned int* ui) } -declare 40 mac { +declare 40 {mac aqua} { void XRaiseWindow (Display* d, Window w) } -declare 41 mac { +declare 41 {mac aqua} { void XRefreshKeyboardMapping (XMappingEvent* x) } -declare 42 mac { +declare 42 {mac aqua} { void XResizeWindow (Display* d, Window w, unsigned int ui1, \ unsigned int ui2) } -declare 43 mac { +declare 43 {mac aqua} { void XSelectInput (Display* d, Window w, long l) } -declare 44 mac { +declare 44 {mac aqua} { Status XSendEvent (Display* d, Window w, Bool b, long l, XEvent* x) } -declare 45 mac { +declare 45 {mac aqua} { void XSetIconName (Display* d, Window w, _Xconst char* c) } -declare 46 mac { +declare 46 {mac aqua} { void XSetInputFocus (Display* d, Window w, int i, Time t) } -declare 47 mac { +declare 47 {mac aqua} { void XSetSelectionOwner (Display* d, Atom a, Window w, Time t) } -declare 48 mac { +declare 48 {mac aqua} { void XSetWindowBackground (Display* d, Window w, unsigned long ul) } -declare 49 mac { +declare 49 {mac aqua} { void XSetWindowBackgroundPixmap (Display* d, Window w, Pixmap p) } -declare 50 mac { +declare 50 {mac aqua} { void XSetWindowBorder (Display* d, Window w, unsigned long ul) } -declare 51 mac { +declare 51 {mac aqua} { void XSetWindowBorderPixmap (Display* d, Window w, Pixmap p) } -declare 52 mac { +declare 52 {mac aqua} { void XSetWindowBorderWidth (Display* d, Window w, unsigned int ui) } -declare 53 mac { +declare 53 {mac aqua} { void XSetWindowColormap (Display* d, Window w, Colormap c) } -declare 54 mac { +declare 54 {mac aqua} { void XUngrabKeyboard (Display* d, Time t) } -declare 55 mac { +declare 55 {mac aqua} { void XUngrabPointer (Display* d, Time t) } -declare 56 mac { +declare 56 {mac aqua} { void XUnmapWindow (Display* d, Window w) } -declare 57 mac { +declare 57 {mac aqua} { void TkPutImage (unsigned long *colors, \ int ncolors, Display* display, Drawable d, \ GC gc, XImage* image, int src_x, int src_y, \ int dest_x, int dest_y, unsigned int width, \ unsigned int height) } -declare 58 mac { +declare 58 {mac aqua} { Status XParseColor (Display *display, Colormap map, \ _Xconst char* spec, XColor *colorPtr) } -declare 59 mac { +declare 59 {mac aqua} { GC XCreateGC(Display* display, Drawable d, \ unsigned long valuemask, XGCValues* values) } -declare 60 mac { +declare 60 {mac aqua} { void XFreeGC(Display* display, GC gc) } -declare 61 mac { +declare 61 {mac aqua} { Atom XInternAtom(Display* display,_Xconst char* atom_name, \ Bool only_if_exists) } -declare 62 mac { +declare 62 {mac aqua} { void XSetBackground(Display* display, GC gc, \ unsigned long foreground) } -declare 63 mac { +declare 63 {mac aqua} { void XSetForeground(Display* display, GC gc, \ unsigned long foreground) } -declare 64 mac { +declare 64 {mac aqua} { void XSetClipMask(Display* display, GC gc, Pixmap pixmap) } -declare 65 mac { +declare 65 {mac aqua} { void XSetClipOrigin(Display* display, GC gc, \ int clip_x_origin, int clip_y_origin) } -declare 66 mac { +declare 66 {mac aqua} { void XSetTSOrigin(Display* display, GC gc, \ int ts_x_origin, int ts_y_origin) } -declare 67 mac { +declare 67 {mac aqua} { void XChangeGC(Display * d, GC gc, unsigned long mask, XGCValues *values) } -declare 68 mac { +declare 68 {mac aqua} { void XSetFont(Display *display, GC gc, Font font) } -declare 69 mac { +declare 69 {mac aqua} { void XSetArcMode(Display *display, GC gc, int arc_mode) } -declare 70 mac { +declare 70 {mac aqua} { void XSetStipple(Display *display, GC gc, Pixmap stipple) } -declare 71 mac { +declare 71 {mac aqua} { void XSetFillRule(Display *display, GC gc, int fill_rule) } -declare 72 mac { +declare 72 {mac aqua} { void XSetFillStyle(Display *display, GC gc, int fill_style) } -declare 73 mac { +declare 73 {mac aqua} { void XSetFunction(Display *display, GC gc, int function) } -declare 74 mac { +declare 74 {mac aqua} { void XSetLineAttributes(Display *display, GC gc, \ unsigned int line_width, int line_style, \ int cap_style, int join_style) } -declare 75 mac { +declare 75 {mac aqua} { int _XInitImageFuncPtrs(XImage *image) } -declare 76 mac { +declare 76 {mac aqua} { XIC XCreateIC(void) } -declare 77 mac { +declare 77 {mac aqua} { XVisualInfo *XGetVisualInfo(Display* display, long vinfo_mask, \ XVisualInfo* vinfo_template, int* nitems_return) } -declare 78 mac { +declare 78 {mac aqua} { void XSetWMClientMachine(Display* display, Window w, \ XTextProperty* text_prop) } -declare 79 mac { +declare 79 {mac aqua} { Status XStringListToTextProperty(char** list, int count, \ XTextProperty* text_prop_return) } -declare 80 mac { +declare 80 {mac aqua} { void XDrawSegments(Display *display, Drawable d, GC gc, \ XSegment *segments, int nsegments) } -declare 81 mac { +declare 81 {mac aqua} { void XForceScreenSaver(Display* display, int mode) } -declare 82 mac { +declare 82 {mac aqua} { void XDrawLine (Display* d, Drawable dr, GC g, int x1, int y1, \ int x2, int y2) } -declare 83 mac { +declare 83 {mac aqua} { void XFillRectangle (Display* display, Drawable d, GC gc, \ int x, int y, unsigned int width, unsigned int height) } -declare 84 mac { +declare 84 {mac aqua} { void XClearWindow (Display* d, Window w) } -declare 85 mac { +declare 85 {mac aqua} { void XDrawPoint (Display* display, Drawable d, GC gc, int x, int y) } -declare 86 mac { +declare 86 {mac aqua} { void XDrawPoints (Display* display, Drawable d, GC gc, XPoint *points, \ int npoints, int mode) } -declare 87 mac { +declare 87 {mac aqua} { void XWarpPointer (Display* display, Window src_w, Window dest_w, \ int src_x, int src_y, unsigned int src_width, \ unsigned int src_height, int dest_x, int dest_y) } -declare 88 mac { +declare 88 {mac aqua} { void XQueryColor (Display *display, Colormap colormap, XColor *def_in_out) } -declare 89 mac { +declare 89 {mac aqua} { void XQueryColors (Display *display, Colormap colormap, \ XColor *defs_in_out, int ncolors) } diff --git a/generic/tkInt.h b/generic/tkInt.h index c497d96..f94c3ec 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,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.h,v 1.53 2002/08/05 04:30:39 dgp Exp $ + * RCS: $Id: tkInt.h,v 1.54 2002/08/31 06:12:20 das Exp $ */ #ifndef _TKINT @@ -1169,7 +1169,7 @@ EXTERN char * TkTilePrintProc _ANSI_ARGS_(( * Unsupported commands. */ EXTERN int TkUnsupported1Cmd _ANSI_ARGS_((ClientData clientData, - Tcl_Interp *interp, int argc, char **argv)); + Tcl_Interp *interp, int argc, CONST char **argv)); # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLIMPORT diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index c72ca15..88ca960 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkIntDecls.h,v 1.20 2002/08/05 04:30:39 dgp Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.21 2002/08/31 06:12:20 das Exp $ */ #ifndef _TKINTDECLS @@ -378,6 +378,11 @@ EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 113 */ +EXTERN void TkClipBox _ANSI_ARGS_((TkRegion rgn, + XRectangle* rect_return)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 114 */ EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); @@ -386,6 +391,10 @@ EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); /* 114 */ EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 114 */ +EXTERN TkRegion TkCreateRegion _ANSI_ARGS_((void)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 115 */ EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); @@ -394,6 +403,10 @@ EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); /* 115 */ EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 115 */ +EXTERN void TkDestroyRegion _ANSI_ARGS_((TkRegion rgn)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 116 */ EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, @@ -404,6 +417,11 @@ EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 116 */ +EXTERN void TkIntersectRegion _ANSI_ARGS_((TkRegion sra, + TkRegion srcb, TkRegion dr_return)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 117 */ EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, @@ -416,6 +434,12 @@ EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 117 */ +EXTERN int TkRectInRegion _ANSI_ARGS_((TkRegion rgn, int x, + int y, unsigned int width, + unsigned int height)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 118 */ EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, @@ -426,6 +450,11 @@ EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 118 */ +EXTERN void TkSetRegion _ANSI_ARGS_((Display* display, GC gc, + TkRegion rgn)); +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ /* 119 */ EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, @@ -436,22 +465,41 @@ EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 119 */ +EXTERN void TkUnionRectWithRegion _ANSI_ARGS_((XRectangle* rect, + TkRegion src, TkRegion dr_return)); +#endif /* MAC_OSX_TK */ /* Slot 120 is reserved */ #ifdef MAC_TCL /* 121 */ EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, - char * source)); + CONST char * source)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 121 */ +EXTERN Pixmap TkpCreateNativeBitmap _ANSI_ARGS_((Display * display, + CONST char * source)); +#endif /* MAC_OSX_TK */ #ifdef MAC_TCL /* 122 */ EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 122 */ +EXTERN void TkpDefineNativeBitmaps _ANSI_ARGS_((void)); +#endif /* MAC_OSX_TK */ /* Slot 123 is reserved */ #ifdef MAC_TCL /* 124 */ EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 124 */ +EXTERN Pixmap TkpGetNativeAppBitmap _ANSI_ARGS_((Display * display, + CONST char * name, int * width, int * height)); +#endif /* MAC_OSX_TK */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ @@ -499,6 +547,11 @@ EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 145 */ +EXTERN void TkSubtractRegion _ANSI_ARGS_((TkRegion sra, + TkRegion srcb, TkRegion dr_return)); +#endif /* MAC_OSX_TK */ /* 146 */ EXTERN void TkStylePkgInit _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */ @@ -630,6 +683,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkClipBox) _ANSI_ARGS_((TkRegion rgn, XRectangle* rect_return)); /* 113 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved114; #endif /* UNIX */ @@ -639,6 +695,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkRegion (*tkCreateRegion) _ANSI_ARGS_((void)); /* 114 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved115; #endif /* UNIX */ @@ -648,6 +707,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkDestroyRegion) _ANSI_ARGS_((TkRegion rgn)); /* 115 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved116; #endif /* UNIX */ @@ -657,6 +719,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkIntersectRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 116 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved117; #endif /* UNIX */ @@ -666,6 +731,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + int (*tkRectInRegion) _ANSI_ARGS_((TkRegion rgn, int x, int y, unsigned int width, unsigned int height)); /* 117 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved118; #endif /* UNIX */ @@ -675,6 +743,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkSetRegion) _ANSI_ARGS_((Display* display, GC gc, TkRegion rgn)); /* 118 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved119; #endif /* UNIX */ @@ -684,6 +755,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkUnionRectWithRegion) _ANSI_ARGS_((XRectangle* rect, TkRegion src, TkRegion dr_return)); /* 119 */ +#endif /* MAC_OSX_TK */ void *reserved120; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved121; @@ -692,8 +766,11 @@ typedef struct TkIntStubs { void *reserved121; #endif /* __WIN32__ */ #ifdef MAC_TCL - Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, char * source)); /* 121 */ + Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + Pixmap (*tkpCreateNativeBitmap) _ANSI_ARGS_((Display * display, CONST char * source)); /* 121 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved122; #endif /* UNIX */ @@ -703,6 +780,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkpDefineNativeBitmaps) _ANSI_ARGS_((void)); /* 122 */ +#endif /* MAC_OSX_TK */ void *reserved123; #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ void *reserved124; @@ -713,6 +793,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + Pixmap (*tkpGetNativeAppBitmap) _ANSI_ARGS_((Display * display, CONST char * name, int * width, int * height)); /* 124 */ +#endif /* MAC_OSX_TK */ void *reserved125; void *reserved126; void *reserved127; @@ -742,6 +825,9 @@ typedef struct TkIntStubs { #ifdef MAC_TCL void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkSubtractRegion) _ANSI_ARGS_((TkRegion sra, TkRegion srcb, TkRegion dr_return)); /* 145 */ +#endif /* MAC_OSX_TK */ void (*tkStylePkgInit) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 146 */ void (*tkStylePkgFree) _ANSI_ARGS_((TkMainInfo * mainPtr)); /* 147 */ } TkIntStubs; @@ -1221,6 +1307,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkClipBox) /* 113 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkClipBox +#define TkClipBox \ + (tkIntStubsPtr->tkClipBox) /* 113 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkCreateRegion #define TkCreateRegion \ @@ -1233,6 +1325,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkCreateRegion) /* 114 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkCreateRegion +#define TkCreateRegion \ + (tkIntStubsPtr->tkCreateRegion) /* 114 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkDestroyRegion #define TkDestroyRegion \ @@ -1245,6 +1343,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkDestroyRegion) /* 115 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkDestroyRegion +#define TkDestroyRegion \ + (tkIntStubsPtr->tkDestroyRegion) /* 115 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkIntersectRegion #define TkIntersectRegion \ @@ -1257,6 +1361,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkIntersectRegion) /* 116 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkIntersectRegion +#define TkIntersectRegion \ + (tkIntStubsPtr->tkIntersectRegion) /* 116 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkRectInRegion #define TkRectInRegion \ @@ -1269,6 +1379,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkRectInRegion) /* 117 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkRectInRegion +#define TkRectInRegion \ + (tkIntStubsPtr->tkRectInRegion) /* 117 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkSetRegion #define TkSetRegion \ @@ -1281,6 +1397,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkSetRegion) /* 118 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkSetRegion +#define TkSetRegion \ + (tkIntStubsPtr->tkSetRegion) /* 118 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef __WIN32__ #ifndef TkUnionRectWithRegion #define TkUnionRectWithRegion \ @@ -1293,6 +1415,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkUnionRectWithRegion +#define TkUnionRectWithRegion \ + (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ +#endif +#endif /* MAC_OSX_TK */ /* Slot 120 is reserved */ #ifdef MAC_TCL #ifndef TkpCreateNativeBitmap @@ -1300,12 +1428,24 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkpCreateNativeBitmap +#define TkpCreateNativeBitmap \ + (tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */ +#endif +#endif /* MAC_OSX_TK */ #ifdef MAC_TCL #ifndef TkpDefineNativeBitmaps #define TkpDefineNativeBitmaps \ (tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkpDefineNativeBitmaps +#define TkpDefineNativeBitmaps \ + (tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */ +#endif +#endif /* MAC_OSX_TK */ /* Slot 123 is reserved */ #ifdef MAC_TCL #ifndef TkpGetNativeAppBitmap @@ -1313,6 +1453,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkpGetNativeAppBitmap +#define TkpGetNativeAppBitmap \ + (tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */ +#endif +#endif /* MAC_OSX_TK */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ @@ -1375,6 +1521,12 @@ extern TkIntStubs *tkIntStubsPtr; (tkIntStubsPtr->tkSubtractRegion) /* 145 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkSubtractRegion +#define TkSubtractRegion \ + (tkIntStubsPtr->tkSubtractRegion) /* 145 */ +#endif +#endif /* MAC_OSX_TK */ #ifndef TkStylePkgInit #define TkStylePkgInit \ (tkIntStubsPtr->tkStylePkgInit) /* 146 */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 765372e..8b54b75 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.13 2002/08/05 04:30:39 dgp Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.14 2002/08/31 06:12:20 das Exp $ */ #ifndef _TKINTPLATDECLS @@ -32,39 +32,6 @@ * Exported function declarations: */ -#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ -/* 0 */ -EXTERN void TkCreateXEventSource _ANSI_ARGS_((void)); -/* 1 */ -EXTERN void TkFreeWindowId _ANSI_ARGS_((TkDisplay * dispPtr, - Window w)); -/* 2 */ -EXTERN void TkInitXId _ANSI_ARGS_((TkDisplay * dispPtr)); -/* 3 */ -EXTERN int TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, - Colormap colormap)); -/* 4 */ -EXTERN void TkpSync _ANSI_ARGS_((Display * display)); -/* 5 */ -EXTERN Window TkUnixContainerId _ANSI_ARGS_((TkWindow * winPtr)); -/* 6 */ -EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr)); -/* 7 */ -EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, - Tk_Window menubar)); -/* 8 */ -EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, - CONST char * string, Window * idPtr)); -/* 9 */ -EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); -/* 10 */ -EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); -/* 11 */ -EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr)); -/* 12 */ -EXTERN int TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, - int state)); -#endif /* UNIX */ #ifdef __WIN32__ /* 0 */ EXTERN char * TkAlignImageData _ANSI_ARGS_((XImage * image, @@ -291,26 +258,172 @@ EXTERN void TkMacPreprocessMenu _ANSI_ARGS_((void)); /* 66 */ EXTERN int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 0 */ +EXTERN void TkGenerateActivateEvents _ANSI_ARGS_(( + TkWindow * winPtr, int active)); +/* Slot 1 is reserved */ +/* Slot 2 is reserved */ +/* 3 */ +EXTERN void TkPointerDeadWindow _ANSI_ARGS_((TkWindow * winPtr)); +/* 4 */ +EXTERN void TkpSetCapture _ANSI_ARGS_((TkWindow * winPtr)); +/* 5 */ +EXTERN void TkpSetCursor _ANSI_ARGS_((TkpCursor cursor)); +/* 6 */ +EXTERN void TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, + int state)); +/* 7 */ +EXTERN void TkAboutDlg _ANSI_ARGS_((void)); +/* 8 */ +EXTERN unsigned int TkMacOSXButtonKeyState _ANSI_ARGS_((void)); +/* 9 */ +EXTERN void TkMacOSXClearMenubarActive _ANSI_ARGS_((void)); +/* 10 */ +EXTERN int TkMacOSXDispatchMenuEvent _ANSI_ARGS_((int menuID, + int index)); +/* 11 */ +EXTERN void TkMacOSXInstallCursor _ANSI_ARGS_(( + int resizeOverride)); +/* 12 */ +EXTERN void TkMacOSXHandleTearoffMenu _ANSI_ARGS_((void)); +/* Slot 13 is reserved */ +/* 14 */ +EXTERN int TkMacOSXDoHLEvent _ANSI_ARGS_(( + EventRecord * theEvent)); +/* Slot 15 is reserved */ +/* 16 */ +EXTERN Window TkMacOSXGetXWindow _ANSI_ARGS_((WindowRef macWinPtr)); +/* 17 */ +EXTERN int TkMacOSXGrowToplevel _ANSI_ARGS_(( + WindowRef whichWindow, Point start)); +/* 18 */ +EXTERN void TkMacOSXHandleMenuSelect _ANSI_ARGS_((long mResult, + int optionKeyPressed)); +/* Slot 19 is reserved */ +/* Slot 20 is reserved */ +/* 21 */ +EXTERN void TkMacOSXInvalidateWindow _ANSI_ARGS_(( + MacDrawable * macWin, int flag)); +/* 22 */ +EXTERN int TkMacOSXIsCharacterMissing _ANSI_ARGS_(( + Tk_Font tkfont, unsigned int searchChar)); +/* 23 */ +EXTERN void TkMacOSXMakeRealWindowExist _ANSI_ARGS_(( + TkWindow * winPtr)); +/* 24 */ +EXTERN BitMapPtr TkMacOSXMakeStippleMap _ANSI_ARGS_((Drawable d1, + Drawable d2)); +/* 25 */ +EXTERN void TkMacOSXMenuClick _ANSI_ARGS_((void)); +/* 26 */ +EXTERN void TkMacOSXRegisterOffScreenWindow _ANSI_ARGS_(( + Window window, GWorldPtr portPtr)); +/* 27 */ +EXTERN int TkMacOSXResizable _ANSI_ARGS_((TkWindow * winPtr)); +/* 28 */ +EXTERN void TkMacOSXSetHelpMenuItemCount _ANSI_ARGS_((void)); +/* 29 */ +EXTERN void TkMacOSXSetScrollbarGrow _ANSI_ARGS_(( + TkWindow * winPtr, int flag)); +/* 30 */ +EXTERN void TkMacOSXSetUpClippingRgn _ANSI_ARGS_(( + Drawable drawable)); +/* 31 */ +EXTERN void TkMacOSXSetUpGraphicsPort _ANSI_ARGS_((GC gc, + GWorldPtr destPort)); +/* 32 */ +EXTERN void TkMacOSXUpdateClipRgn _ANSI_ARGS_((TkWindow * winPtr)); +/* 33 */ +EXTERN void TkMacOSXUnregisterMacWindow _ANSI_ARGS_(( + WindowRef portPtr)); +/* 34 */ +EXTERN int TkMacOSXUseMenuID _ANSI_ARGS_((short macID)); +/* 35 */ +EXTERN RgnHandle TkMacOSXVisableClipRgn _ANSI_ARGS_(( + TkWindow * winPtr)); +/* 36 */ +EXTERN void TkMacOSXWinBounds _ANSI_ARGS_((TkWindow * winPtr, + Rect * geometry)); +/* 37 */ +EXTERN void TkMacOSXWindowOffset _ANSI_ARGS_((WindowRef wRef, + int * xOffset, int * yOffset)); +/* 38 */ +EXTERN int TkSetMacColor _ANSI_ARGS_((unsigned long pixel, + RGBColor * macColor)); +/* 39 */ +EXTERN void TkSetWMName _ANSI_ARGS_((TkWindow * winPtr, + Tk_Uid titleUid)); +/* 40 */ +EXTERN void TkSuspendClipboard _ANSI_ARGS_((void)); +/* 41 */ +EXTERN int TkMacOSXZoomToplevel _ANSI_ARGS_(( + WindowPtr whichWindow, Point where, + short zoomPart)); +/* 42 */ +EXTERN Tk_Window Tk_TopCoordsToWindow _ANSI_ARGS_((Tk_Window tkwin, + int rootX, int rootY, int * newX, int * newY)); +/* 43 */ +EXTERN MacDrawable * TkMacOSXContainerId _ANSI_ARGS_((TkWindow * winPtr)); +/* 44 */ +EXTERN MacDrawable * TkMacOSXGetHostToplevel _ANSI_ARGS_(( + TkWindow * winPtr)); +/* 45 */ +EXTERN void TkMacOSXPreprocessMenu _ANSI_ARGS_((void)); +/* 46 */ +EXTERN int TkpIsWindowFloating _ANSI_ARGS_((WindowRef window)); +/* 47 */ +EXTERN Tk_Window TkMacOSXGetCapture _ANSI_ARGS_((void)); +/* Slot 48 is reserved */ +/* 49 */ +EXTERN Window TkGetTransientMaster _ANSI_ARGS_((TkWindow * winPtr)); +/* 50 */ +EXTERN int TkGenerateButtonEvent _ANSI_ARGS_((int x, int y, + Window window, unsigned int state)); +/* 51 */ +EXTERN void TkGenWMDestroyEvent _ANSI_ARGS_((Tk_Window tkwin)); +/* Slot 52 is reserved */ +/* 53 */ +EXTERN unsigned long TkpGetMS _ANSI_ARGS_((void)); +#endif /* MAC_OSX_TK */ +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */ +/* 0 */ +EXTERN void TkCreateXEventSource _ANSI_ARGS_((void)); +/* 1 */ +EXTERN void TkFreeWindowId _ANSI_ARGS_((TkDisplay * dispPtr, + Window w)); +/* 2 */ +EXTERN void TkInitXId _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 3 */ +EXTERN int TkpCmapStressed _ANSI_ARGS_((Tk_Window tkwin, + Colormap colormap)); +/* 4 */ +EXTERN void TkpSync _ANSI_ARGS_((Display * display)); +/* 5 */ +EXTERN Window TkUnixContainerId _ANSI_ARGS_((TkWindow * winPtr)); +/* 6 */ +EXTERN int TkUnixDoOneXEvent _ANSI_ARGS_((Tcl_Time * timePtr)); +/* 7 */ +EXTERN void TkUnixSetMenubar _ANSI_ARGS_((Tk_Window tkwin, + Tk_Window menubar)); +/* 8 */ +EXTERN int TkpScanWindowId _ANSI_ARGS_((Tcl_Interp * interp, + CONST char * string, Window * idPtr)); +/* 9 */ +EXTERN void TkWmCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 10 */ +EXTERN void TkSendCleanup _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 11 */ +EXTERN void TkFreeXId _ANSI_ARGS_((TkDisplay * dispPtr)); +/* 12 */ +EXTERN int TkpWmSetState _ANSI_ARGS_((TkWindow * winPtr, + int state)); +#endif /* X11 */ typedef struct TkIntPlatStubs { int magic; struct TkIntPlatStubHooks *hooks; -#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */ - void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */ - void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */ - int (*tkpCmapStressed) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 3 */ - void (*tkpSync) _ANSI_ARGS_((Display * display)); /* 4 */ - Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ - int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 6 */ - void (*tkUnixSetMenubar) _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 7 */ - int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 8 */ - void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 9 */ - void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 10 */ - void (*tkFreeXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ - int (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ -#endif /* UNIX */ #ifdef __WIN32__ char * (*tkAlignImageData) _ANSI_ARGS_((XImage * image, int alignment, int bitOrder)); /* 0 */ void *reserved1; @@ -416,6 +529,77 @@ typedef struct TkIntPlatStubs { void (*tkMacPreprocessMenu) _ANSI_ARGS_((void)); /* 65 */ int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 66 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tkGenerateActivateEvents) _ANSI_ARGS_((TkWindow * winPtr, int active)); /* 0 */ + void *reserved1; + void *reserved2; + void (*tkPointerDeadWindow) _ANSI_ARGS_((TkWindow * winPtr)); /* 3 */ + void (*tkpSetCapture) _ANSI_ARGS_((TkWindow * winPtr)); /* 4 */ + void (*tkpSetCursor) _ANSI_ARGS_((TkpCursor cursor)); /* 5 */ + void (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 6 */ + void (*tkAboutDlg) _ANSI_ARGS_((void)); /* 7 */ + unsigned int (*tkMacOSXButtonKeyState) _ANSI_ARGS_((void)); /* 8 */ + void (*tkMacOSXClearMenubarActive) _ANSI_ARGS_((void)); /* 9 */ + int (*tkMacOSXDispatchMenuEvent) _ANSI_ARGS_((int menuID, int index)); /* 10 */ + void (*tkMacOSXInstallCursor) _ANSI_ARGS_((int resizeOverride)); /* 11 */ + void (*tkMacOSXHandleTearoffMenu) _ANSI_ARGS_((void)); /* 12 */ + void *reserved13; + int (*tkMacOSXDoHLEvent) _ANSI_ARGS_((EventRecord * theEvent)); /* 14 */ + void *reserved15; + Window (*tkMacOSXGetXWindow) _ANSI_ARGS_((WindowRef macWinPtr)); /* 16 */ + int (*tkMacOSXGrowToplevel) _ANSI_ARGS_((WindowRef whichWindow, Point start)); /* 17 */ + void (*tkMacOSXHandleMenuSelect) _ANSI_ARGS_((long mResult, int optionKeyPressed)); /* 18 */ + void *reserved19; + void *reserved20; + void (*tkMacOSXInvalidateWindow) _ANSI_ARGS_((MacDrawable * macWin, int flag)); /* 21 */ + int (*tkMacOSXIsCharacterMissing) _ANSI_ARGS_((Tk_Font tkfont, unsigned int searchChar)); /* 22 */ + void (*tkMacOSXMakeRealWindowExist) _ANSI_ARGS_((TkWindow * winPtr)); /* 23 */ + BitMapPtr (*tkMacOSXMakeStippleMap) _ANSI_ARGS_((Drawable d1, Drawable d2)); /* 24 */ + void (*tkMacOSXMenuClick) _ANSI_ARGS_((void)); /* 25 */ + void (*tkMacOSXRegisterOffScreenWindow) _ANSI_ARGS_((Window window, GWorldPtr portPtr)); /* 26 */ + int (*tkMacOSXResizable) _ANSI_ARGS_((TkWindow * winPtr)); /* 27 */ + void (*tkMacOSXSetHelpMenuItemCount) _ANSI_ARGS_((void)); /* 28 */ + void (*tkMacOSXSetScrollbarGrow) _ANSI_ARGS_((TkWindow * winPtr, int flag)); /* 29 */ + void (*tkMacOSXSetUpClippingRgn) _ANSI_ARGS_((Drawable drawable)); /* 30 */ + void (*tkMacOSXSetUpGraphicsPort) _ANSI_ARGS_((GC gc, GWorldPtr destPort)); /* 31 */ + void (*tkMacOSXUpdateClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 32 */ + void (*tkMacOSXUnregisterMacWindow) _ANSI_ARGS_((WindowRef portPtr)); /* 33 */ + int (*tkMacOSXUseMenuID) _ANSI_ARGS_((short macID)); /* 34 */ + RgnHandle (*tkMacOSXVisableClipRgn) _ANSI_ARGS_((TkWindow * winPtr)); /* 35 */ + void (*tkMacOSXWinBounds) _ANSI_ARGS_((TkWindow * winPtr, Rect * geometry)); /* 36 */ + void (*tkMacOSXWindowOffset) _ANSI_ARGS_((WindowRef wRef, int * xOffset, int * yOffset)); /* 37 */ + int (*tkSetMacColor) _ANSI_ARGS_((unsigned long pixel, RGBColor * macColor)); /* 38 */ + void (*tkSetWMName) _ANSI_ARGS_((TkWindow * winPtr, Tk_Uid titleUid)); /* 39 */ + void (*tkSuspendClipboard) _ANSI_ARGS_((void)); /* 40 */ + int (*tkMacOSXZoomToplevel) _ANSI_ARGS_((WindowPtr whichWindow, Point where, short zoomPart)); /* 41 */ + Tk_Window (*tk_TopCoordsToWindow) _ANSI_ARGS_((Tk_Window tkwin, int rootX, int rootY, int * newX, int * newY)); /* 42 */ + MacDrawable * (*tkMacOSXContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 43 */ + MacDrawable * (*tkMacOSXGetHostToplevel) _ANSI_ARGS_((TkWindow * winPtr)); /* 44 */ + void (*tkMacOSXPreprocessMenu) _ANSI_ARGS_((void)); /* 45 */ + int (*tkpIsWindowFloating) _ANSI_ARGS_((WindowRef window)); /* 46 */ + Tk_Window (*tkMacOSXGetCapture) _ANSI_ARGS_((void)); /* 47 */ + void *reserved48; + Window (*tkGetTransientMaster) _ANSI_ARGS_((TkWindow * winPtr)); /* 49 */ + int (*tkGenerateButtonEvent) _ANSI_ARGS_((int x, int y, Window window, unsigned int state)); /* 50 */ + void (*tkGenWMDestroyEvent) _ANSI_ARGS_((Tk_Window tkwin)); /* 51 */ + void *reserved52; + unsigned long (*tkpGetMS) _ANSI_ARGS_((void)); /* 53 */ +#endif /* MAC_OSX_TK */ +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */ + void (*tkCreateXEventSource) _ANSI_ARGS_((void)); /* 0 */ + void (*tkFreeWindowId) _ANSI_ARGS_((TkDisplay * dispPtr, Window w)); /* 1 */ + void (*tkInitXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 2 */ + int (*tkpCmapStressed) _ANSI_ARGS_((Tk_Window tkwin, Colormap colormap)); /* 3 */ + void (*tkpSync) _ANSI_ARGS_((Display * display)); /* 4 */ + Window (*tkUnixContainerId) _ANSI_ARGS_((TkWindow * winPtr)); /* 5 */ + int (*tkUnixDoOneXEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 6 */ + void (*tkUnixSetMenubar) _ANSI_ARGS_((Tk_Window tkwin, Tk_Window menubar)); /* 7 */ + int (*tkpScanWindowId) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * string, Window * idPtr)); /* 8 */ + void (*tkWmCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 9 */ + void (*tkSendCleanup) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 10 */ + void (*tkFreeXId) _ANSI_ARGS_((TkDisplay * dispPtr)); /* 11 */ + int (*tkpWmSetState) _ANSI_ARGS_((TkWindow * winPtr, int state)); /* 12 */ +#endif /* X11 */ } TkIntPlatStubs; #ifdef __cplusplus @@ -432,60 +616,6 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; * Inline function declarations: */ -#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ -#ifndef TkCreateXEventSource -#define TkCreateXEventSource \ - (tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */ -#endif -#ifndef TkFreeWindowId -#define TkFreeWindowId \ - (tkIntPlatStubsPtr->tkFreeWindowId) /* 1 */ -#endif -#ifndef TkInitXId -#define TkInitXId \ - (tkIntPlatStubsPtr->tkInitXId) /* 2 */ -#endif -#ifndef TkpCmapStressed -#define TkpCmapStressed \ - (tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */ -#endif -#ifndef TkpSync -#define TkpSync \ - (tkIntPlatStubsPtr->tkpSync) /* 4 */ -#endif -#ifndef TkUnixContainerId -#define TkUnixContainerId \ - (tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */ -#endif -#ifndef TkUnixDoOneXEvent -#define TkUnixDoOneXEvent \ - (tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */ -#endif -#ifndef TkUnixSetMenubar -#define TkUnixSetMenubar \ - (tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */ -#endif -#ifndef TkpScanWindowId -#define TkpScanWindowId \ - (tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */ -#endif -#ifndef TkWmCleanup -#define TkWmCleanup \ - (tkIntPlatStubsPtr->tkWmCleanup) /* 9 */ -#endif -#ifndef TkSendCleanup -#define TkSendCleanup \ - (tkIntPlatStubsPtr->tkSendCleanup) /* 10 */ -#endif -#ifndef TkFreeXId -#define TkFreeXId \ - (tkIntPlatStubsPtr->tkFreeXId) /* 11 */ -#endif -#ifndef TkpWmSetState -#define TkpWmSetState \ - (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ -#endif -#endif /* UNIX */ #ifdef __WIN32__ #ifndef TkAlignImageData #define TkAlignImageData \ @@ -831,6 +961,254 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; (tkIntPlatStubsPtr->tkpIsWindowFloating) /* 66 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef TkGenerateActivateEvents +#define TkGenerateActivateEvents \ + (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */ +#endif +/* Slot 1 is reserved */ +/* Slot 2 is reserved */ +#ifndef TkPointerDeadWindow +#define TkPointerDeadWindow \ + (tkIntPlatStubsPtr->tkPointerDeadWindow) /* 3 */ +#endif +#ifndef TkpSetCapture +#define TkpSetCapture \ + (tkIntPlatStubsPtr->tkpSetCapture) /* 4 */ +#endif +#ifndef TkpSetCursor +#define TkpSetCursor \ + (tkIntPlatStubsPtr->tkpSetCursor) /* 5 */ +#endif +#ifndef TkpWmSetState +#define TkpWmSetState \ + (tkIntPlatStubsPtr->tkpWmSetState) /* 6 */ +#endif +#ifndef TkAboutDlg +#define TkAboutDlg \ + (tkIntPlatStubsPtr->tkAboutDlg) /* 7 */ +#endif +#ifndef TkMacOSXButtonKeyState +#define TkMacOSXButtonKeyState \ + (tkIntPlatStubsPtr->tkMacOSXButtonKeyState) /* 8 */ +#endif +#ifndef TkMacOSXClearMenubarActive +#define TkMacOSXClearMenubarActive \ + (tkIntPlatStubsPtr->tkMacOSXClearMenubarActive) /* 9 */ +#endif +#ifndef TkMacOSXDispatchMenuEvent +#define TkMacOSXDispatchMenuEvent \ + (tkIntPlatStubsPtr->tkMacOSXDispatchMenuEvent) /* 10 */ +#endif +#ifndef TkMacOSXInstallCursor +#define TkMacOSXInstallCursor \ + (tkIntPlatStubsPtr->tkMacOSXInstallCursor) /* 11 */ +#endif +#ifndef TkMacOSXHandleTearoffMenu +#define TkMacOSXHandleTearoffMenu \ + (tkIntPlatStubsPtr->tkMacOSXHandleTearoffMenu) /* 12 */ +#endif +/* Slot 13 is reserved */ +#ifndef TkMacOSXDoHLEvent +#define TkMacOSXDoHLEvent \ + (tkIntPlatStubsPtr->tkMacOSXDoHLEvent) /* 14 */ +#endif +/* Slot 15 is reserved */ +#ifndef TkMacOSXGetXWindow +#define TkMacOSXGetXWindow \ + (tkIntPlatStubsPtr->tkMacOSXGetXWindow) /* 16 */ +#endif +#ifndef TkMacOSXGrowToplevel +#define TkMacOSXGrowToplevel \ + (tkIntPlatStubsPtr->tkMacOSXGrowToplevel) /* 17 */ +#endif +#ifndef TkMacOSXHandleMenuSelect +#define TkMacOSXHandleMenuSelect \ + (tkIntPlatStubsPtr->tkMacOSXHandleMenuSelect) /* 18 */ +#endif +/* Slot 19 is reserved */ +/* Slot 20 is reserved */ +#ifndef TkMacOSXInvalidateWindow +#define TkMacOSXInvalidateWindow \ + (tkIntPlatStubsPtr->tkMacOSXInvalidateWindow) /* 21 */ +#endif +#ifndef TkMacOSXIsCharacterMissing +#define TkMacOSXIsCharacterMissing \ + (tkIntPlatStubsPtr->tkMacOSXIsCharacterMissing) /* 22 */ +#endif +#ifndef TkMacOSXMakeRealWindowExist +#define TkMacOSXMakeRealWindowExist \ + (tkIntPlatStubsPtr->tkMacOSXMakeRealWindowExist) /* 23 */ +#endif +#ifndef TkMacOSXMakeStippleMap +#define TkMacOSXMakeStippleMap \ + (tkIntPlatStubsPtr->tkMacOSXMakeStippleMap) /* 24 */ +#endif +#ifndef TkMacOSXMenuClick +#define TkMacOSXMenuClick \ + (tkIntPlatStubsPtr->tkMacOSXMenuClick) /* 25 */ +#endif +#ifndef TkMacOSXRegisterOffScreenWindow +#define TkMacOSXRegisterOffScreenWindow \ + (tkIntPlatStubsPtr->tkMacOSXRegisterOffScreenWindow) /* 26 */ +#endif +#ifndef TkMacOSXResizable +#define TkMacOSXResizable \ + (tkIntPlatStubsPtr->tkMacOSXResizable) /* 27 */ +#endif +#ifndef TkMacOSXSetHelpMenuItemCount +#define TkMacOSXSetHelpMenuItemCount \ + (tkIntPlatStubsPtr->tkMacOSXSetHelpMenuItemCount) /* 28 */ +#endif +#ifndef TkMacOSXSetScrollbarGrow +#define TkMacOSXSetScrollbarGrow \ + (tkIntPlatStubsPtr->tkMacOSXSetScrollbarGrow) /* 29 */ +#endif +#ifndef TkMacOSXSetUpClippingRgn +#define TkMacOSXSetUpClippingRgn \ + (tkIntPlatStubsPtr->tkMacOSXSetUpClippingRgn) /* 30 */ +#endif +#ifndef TkMacOSXSetUpGraphicsPort +#define TkMacOSXSetUpGraphicsPort \ + (tkIntPlatStubsPtr->tkMacOSXSetUpGraphicsPort) /* 31 */ +#endif +#ifndef TkMacOSXUpdateClipRgn +#define TkMacOSXUpdateClipRgn \ + (tkIntPlatStubsPtr->tkMacOSXUpdateClipRgn) /* 32 */ +#endif +#ifndef TkMacOSXUnregisterMacWindow +#define TkMacOSXUnregisterMacWindow \ + (tkIntPlatStubsPtr->tkMacOSXUnregisterMacWindow) /* 33 */ +#endif +#ifndef TkMacOSXUseMenuID +#define TkMacOSXUseMenuID \ + (tkIntPlatStubsPtr->tkMacOSXUseMenuID) /* 34 */ +#endif +#ifndef TkMacOSXVisableClipRgn +#define TkMacOSXVisableClipRgn \ + (tkIntPlatStubsPtr->tkMacOSXVisableClipRgn) /* 35 */ +#endif +#ifndef TkMacOSXWinBounds +#define TkMacOSXWinBounds \ + (tkIntPlatStubsPtr->tkMacOSXWinBounds) /* 36 */ +#endif +#ifndef TkMacOSXWindowOffset +#define TkMacOSXWindowOffset \ + (tkIntPlatStubsPtr->tkMacOSXWindowOffset) /* 37 */ +#endif +#ifndef TkSetMacColor +#define TkSetMacColor \ + (tkIntPlatStubsPtr->tkSetMacColor) /* 38 */ +#endif +#ifndef TkSetWMName +#define TkSetWMName \ + (tkIntPlatStubsPtr->tkSetWMName) /* 39 */ +#endif +#ifndef TkSuspendClipboard +#define TkSuspendClipboard \ + (tkIntPlatStubsPtr->tkSuspendClipboard) /* 40 */ +#endif +#ifndef TkMacOSXZoomToplevel +#define TkMacOSXZoomToplevel \ + (tkIntPlatStubsPtr->tkMacOSXZoomToplevel) /* 41 */ +#endif +#ifndef Tk_TopCoordsToWindow +#define Tk_TopCoordsToWindow \ + (tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 42 */ +#endif +#ifndef TkMacOSXContainerId +#define TkMacOSXContainerId \ + (tkIntPlatStubsPtr->tkMacOSXContainerId) /* 43 */ +#endif +#ifndef TkMacOSXGetHostToplevel +#define TkMacOSXGetHostToplevel \ + (tkIntPlatStubsPtr->tkMacOSXGetHostToplevel) /* 44 */ +#endif +#ifndef TkMacOSXPreprocessMenu +#define TkMacOSXPreprocessMenu \ + (tkIntPlatStubsPtr->tkMacOSXPreprocessMenu) /* 45 */ +#endif +#ifndef TkpIsWindowFloating +#define TkpIsWindowFloating \ + (tkIntPlatStubsPtr->tkpIsWindowFloating) /* 46 */ +#endif +#ifndef TkMacOSXGetCapture +#define TkMacOSXGetCapture \ + (tkIntPlatStubsPtr->tkMacOSXGetCapture) /* 47 */ +#endif +/* Slot 48 is reserved */ +#ifndef TkGetTransientMaster +#define TkGetTransientMaster \ + (tkIntPlatStubsPtr->tkGetTransientMaster) /* 49 */ +#endif +#ifndef TkGenerateButtonEvent +#define TkGenerateButtonEvent \ + (tkIntPlatStubsPtr->tkGenerateButtonEvent) /* 50 */ +#endif +#ifndef TkGenWMDestroyEvent +#define TkGenWMDestroyEvent \ + (tkIntPlatStubsPtr->tkGenWMDestroyEvent) /* 51 */ +#endif +/* Slot 52 is reserved */ +#ifndef TkpGetMS +#define TkpGetMS \ + (tkIntPlatStubsPtr->tkpGetMS) /* 53 */ +#endif +#endif /* MAC_OSX_TK */ +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */ +#ifndef TkCreateXEventSource +#define TkCreateXEventSource \ + (tkIntPlatStubsPtr->tkCreateXEventSource) /* 0 */ +#endif +#ifndef TkFreeWindowId +#define TkFreeWindowId \ + (tkIntPlatStubsPtr->tkFreeWindowId) /* 1 */ +#endif +#ifndef TkInitXId +#define TkInitXId \ + (tkIntPlatStubsPtr->tkInitXId) /* 2 */ +#endif +#ifndef TkpCmapStressed +#define TkpCmapStressed \ + (tkIntPlatStubsPtr->tkpCmapStressed) /* 3 */ +#endif +#ifndef TkpSync +#define TkpSync \ + (tkIntPlatStubsPtr->tkpSync) /* 4 */ +#endif +#ifndef TkUnixContainerId +#define TkUnixContainerId \ + (tkIntPlatStubsPtr->tkUnixContainerId) /* 5 */ +#endif +#ifndef TkUnixDoOneXEvent +#define TkUnixDoOneXEvent \ + (tkIntPlatStubsPtr->tkUnixDoOneXEvent) /* 6 */ +#endif +#ifndef TkUnixSetMenubar +#define TkUnixSetMenubar \ + (tkIntPlatStubsPtr->tkUnixSetMenubar) /* 7 */ +#endif +#ifndef TkpScanWindowId +#define TkpScanWindowId \ + (tkIntPlatStubsPtr->tkpScanWindowId) /* 8 */ +#endif +#ifndef TkWmCleanup +#define TkWmCleanup \ + (tkIntPlatStubsPtr->tkWmCleanup) /* 9 */ +#endif +#ifndef TkSendCleanup +#define TkSendCleanup \ + (tkIntPlatStubsPtr->tkSendCleanup) /* 10 */ +#endif +#ifndef TkFreeXId +#define TkFreeXId \ + (tkIntPlatStubsPtr->tkFreeXId) /* 11 */ +#endif +#ifndef TkpWmSetState +#define TkpWmSetState \ + (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ +#endif +#endif /* X11 */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 8597d98..54f4fa1 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.14 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.15 2002/08/31 06:12:20 das Exp $ */ #ifndef _TKINTXLIBDECLS @@ -652,6 +652,292 @@ EXTERN void XQueryColors _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 0 */ +EXTERN void XSetDashes _ANSI_ARGS_((Display* display, GC gc, + int dash_offset, _Xconst char* dash_list, + int n)); +/* 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)); +/* 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)); +/* 4 */ +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)); +/* 7 */ +EXTERN GContext XGContextFromGC _ANSI_ARGS_((GC g)); +/* 8 */ +EXTERN KeySym XKeycodeToKeysym _ANSI_ARGS_((Display* d, KeyCode k, + int i)); +/* 9 */ +EXTERN KeySym XStringToKeysym _ANSI_ARGS_((_Xconst char* c)); +/* 10 */ +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)); +/* 13 */ +EXTERN void XBell _ANSI_ARGS_((Display* d, int i)); +/* 14 */ +EXTERN void XChangeProperty _ANSI_ARGS_((Display* d, Window w, + Atom a1, Atom a2, int i1, int i2, + _Xconst unsigned char* c, int i3)); +/* 15 */ +EXTERN void XChangeWindowAttributes _ANSI_ARGS_((Display* d, + Window w, unsigned long ul, + XSetWindowAttributes* x)); +/* 16 */ +EXTERN void XConfigureWindow _ANSI_ARGS_((Display* d, Window w, + unsigned int i, XWindowChanges* x)); +/* 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)); +/* 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)); +/* 19 */ +EXTERN Pixmap XCreateBitmapFromData _ANSI_ARGS_((Display* display, + Drawable d, _Xconst char* data, + unsigned int width, unsigned int height)); +/* 20 */ +EXTERN void XDefineCursor _ANSI_ARGS_((Display* d, Window w, + Cursor c)); +/* 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)); +/* 23 */ +EXTERN void XDrawLines _ANSI_ARGS_((Display* d, Drawable dr, + GC g, XPoint* x, int i1, int i2)); +/* 24 */ +EXTERN void XDrawRectangle _ANSI_ARGS_((Display* d, Drawable dr, + GC g, int i1, int i2, unsigned int ui1, + unsigned int ui2)); +/* 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)); +/* 26 */ +EXTERN void XFillPolygon _ANSI_ARGS_((Display* d, Drawable dr, + GC g, XPoint* x, int i1, int i2, int i3)); +/* 27 */ +EXTERN void XFillRectangles _ANSI_ARGS_((Display* d, Drawable dr, + GC g, XRectangle* x, int i)); +/* 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)); +/* 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)); +/* 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)); +/* 33 */ +EXTERN int XGrabKeyboard _ANSI_ARGS_((Display* d, Window w, + Bool b, int i1, int i2, Time t)); +/* 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)); +/* 35 */ +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)); +/* 38 */ +EXTERN void XMoveWindow _ANSI_ARGS_((Display* d, Window w, + int i1, int i2)); +/* 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)); +/* 40 */ +EXTERN void XRaiseWindow _ANSI_ARGS_((Display* d, Window w)); +/* 41 */ +EXTERN void XRefreshKeyboardMapping _ANSI_ARGS_(( + XMappingEvent* x)); +/* 42 */ +EXTERN void XResizeWindow _ANSI_ARGS_((Display* d, Window w, + unsigned int ui1, unsigned int ui2)); +/* 43 */ +EXTERN void XSelectInput _ANSI_ARGS_((Display* d, Window w, + long l)); +/* 44 */ +EXTERN Status XSendEvent _ANSI_ARGS_((Display* d, Window w, Bool b, + long l, XEvent* x)); +/* 45 */ +EXTERN void XSetIconName _ANSI_ARGS_((Display* d, Window w, + _Xconst char* c)); +/* 46 */ +EXTERN void XSetInputFocus _ANSI_ARGS_((Display* d, Window w, + int i, Time t)); +/* 47 */ +EXTERN void XSetSelectionOwner _ANSI_ARGS_((Display* d, Atom a, + Window w, Time t)); +/* 48 */ +EXTERN void XSetWindowBackground _ANSI_ARGS_((Display* d, + Window w, unsigned long ul)); +/* 49 */ +EXTERN void XSetWindowBackgroundPixmap _ANSI_ARGS_((Display* d, + Window w, Pixmap p)); +/* 50 */ +EXTERN void XSetWindowBorder _ANSI_ARGS_((Display* d, Window w, + unsigned long ul)); +/* 51 */ +EXTERN void XSetWindowBorderPixmap _ANSI_ARGS_((Display* d, + Window w, Pixmap p)); +/* 52 */ +EXTERN void XSetWindowBorderWidth _ANSI_ARGS_((Display* d, + Window w, unsigned int ui)); +/* 53 */ +EXTERN void XSetWindowColormap _ANSI_ARGS_((Display* d, Window w, + Colormap c)); +/* 54 */ +EXTERN void XUngrabKeyboard _ANSI_ARGS_((Display* d, Time t)); +/* 55 */ +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, + int dest_x, int dest_y, unsigned int width, + unsigned int height)); +/* 58 */ +EXTERN Status XParseColor _ANSI_ARGS_((Display * display, + Colormap map, _Xconst char* spec, + XColor * colorPtr)); +/* 59 */ +EXTERN GC XCreateGC _ANSI_ARGS_((Display* display, Drawable d, + unsigned long valuemask, XGCValues* values)); +/* 60 */ +EXTERN void XFreeGC _ANSI_ARGS_((Display* display, GC gc)); +/* 61 */ +EXTERN Atom XInternAtom _ANSI_ARGS_((Display* display, + _Xconst char* atom_name, Bool only_if_exists)); +/* 62 */ +EXTERN void XSetBackground _ANSI_ARGS_((Display* display, GC gc, + unsigned long foreground)); +/* 63 */ +EXTERN void XSetForeground _ANSI_ARGS_((Display* display, GC gc, + unsigned long foreground)); +/* 64 */ +EXTERN void XSetClipMask _ANSI_ARGS_((Display* display, GC gc, + Pixmap pixmap)); +/* 65 */ +EXTERN void XSetClipOrigin _ANSI_ARGS_((Display* display, GC gc, + int clip_x_origin, int clip_y_origin)); +/* 66 */ +EXTERN void XSetTSOrigin _ANSI_ARGS_((Display* display, GC gc, + int ts_x_origin, int ts_y_origin)); +/* 67 */ +EXTERN void XChangeGC _ANSI_ARGS_((Display * d, GC gc, + unsigned long mask, XGCValues * values)); +/* 68 */ +EXTERN void XSetFont _ANSI_ARGS_((Display * display, GC gc, + Font font)); +/* 69 */ +EXTERN void XSetArcMode _ANSI_ARGS_((Display * display, GC gc, + int arc_mode)); +/* 70 */ +EXTERN void XSetStipple _ANSI_ARGS_((Display * display, GC gc, + Pixmap stipple)); +/* 71 */ +EXTERN void XSetFillRule _ANSI_ARGS_((Display * display, GC gc, + int fill_rule)); +/* 72 */ +EXTERN void XSetFillStyle _ANSI_ARGS_((Display * display, GC gc, + int fill_style)); +/* 73 */ +EXTERN void XSetFunction _ANSI_ARGS_((Display * display, GC gc, + int function)); +/* 74 */ +EXTERN void XSetLineAttributes _ANSI_ARGS_((Display * display, + GC gc, unsigned int line_width, + int line_style, int cap_style, + int join_style)); +/* 75 */ +EXTERN int _XInitImageFuncPtrs _ANSI_ARGS_((XImage * image)); +/* 76 */ +EXTERN XIC XCreateIC _ANSI_ARGS_((void)); +/* 77 */ +EXTERN XVisualInfo * XGetVisualInfo _ANSI_ARGS_((Display* display, + long vinfo_mask, XVisualInfo* vinfo_template, + int* nitems_return)); +/* 78 */ +EXTERN void XSetWMClientMachine _ANSI_ARGS_((Display* display, + Window w, XTextProperty* text_prop)); +/* 79 */ +EXTERN Status XStringListToTextProperty _ANSI_ARGS_((char** list, + int count, XTextProperty* text_prop_return)); +/* 80 */ +EXTERN void XDrawSegments _ANSI_ARGS_((Display * display, + Drawable d, GC gc, XSegment * segments, + int nsegments)); +/* 81 */ +EXTERN void XForceScreenSaver _ANSI_ARGS_((Display* display, + int mode)); +/* 82 */ +EXTERN void XDrawLine _ANSI_ARGS_((Display* d, Drawable dr, GC g, + int x1, int y1, int x2, int y2)); +/* 83 */ +EXTERN void XFillRectangle _ANSI_ARGS_((Display* display, + Drawable d, GC gc, int x, int y, + unsigned int width, unsigned int height)); +/* 84 */ +EXTERN void XClearWindow _ANSI_ARGS_((Display* d, Window w)); +/* 85 */ +EXTERN void XDrawPoint _ANSI_ARGS_((Display* display, Drawable d, + GC gc, int x, int y)); +/* 86 */ +EXTERN void XDrawPoints _ANSI_ARGS_((Display* display, + Drawable d, GC gc, XPoint * points, + int npoints, int mode)); +/* 87 */ +EXTERN void XWarpPointer _ANSI_ARGS_((Display* display, + Window src_w, Window dest_w, int src_x, + int src_y, unsigned int src_width, + unsigned int src_height, int dest_x, + int dest_y)); +/* 88 */ +EXTERN void XQueryColor _ANSI_ARGS_((Display * display, + Colormap colormap, XColor * def_in_out)); +/* 89 */ +EXTERN void XQueryColors _ANSI_ARGS_((Display * display, + Colormap colormap, XColor * defs_in_out, + int ncolors)); +#endif /* MAC_OSX_TK */ typedef struct TkIntXlibStubs { int magic; @@ -858,6 +1144,98 @@ typedef struct TkIntXlibStubs { void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */ void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*xSetDashes) _ANSI_ARGS_((Display* display, GC gc, int dash_offset, _Xconst char* dash_list, int n)); /* 0 */ + XModifierKeymap* (*xGetModifierMapping) _ANSI_ARGS_((Display* d)); /* 1 */ + XImage * (*xCreateImage) _ANSI_ARGS_((Display* d, Visual* v, unsigned int ui1, int i1, int i2, char* cp, unsigned int ui2, unsigned int ui3, int i3, int i4)); /* 2 */ + 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 a1, Atom a2, 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 */ + Status (*xParseColor) _ANSI_ARGS_((Display * display, Colormap map, _Xconst char* spec, XColor * colorPtr)); /* 58 */ + GC (*xCreateGC) _ANSI_ARGS_((Display* display, Drawable d, unsigned long valuemask, XGCValues* values)); /* 59 */ + void (*xFreeGC) _ANSI_ARGS_((Display* display, GC gc)); /* 60 */ + Atom (*xInternAtom) _ANSI_ARGS_((Display* display, _Xconst char* atom_name, Bool only_if_exists)); /* 61 */ + void (*xSetBackground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 62 */ + void (*xSetForeground) _ANSI_ARGS_((Display* display, GC gc, unsigned long foreground)); /* 63 */ + void (*xSetClipMask) _ANSI_ARGS_((Display* display, GC gc, Pixmap pixmap)); /* 64 */ + void (*xSetClipOrigin) _ANSI_ARGS_((Display* display, GC gc, int clip_x_origin, int clip_y_origin)); /* 65 */ + void (*xSetTSOrigin) _ANSI_ARGS_((Display* display, GC gc, int ts_x_origin, int ts_y_origin)); /* 66 */ + void (*xChangeGC) _ANSI_ARGS_((Display * d, GC gc, unsigned long mask, XGCValues * values)); /* 67 */ + void (*xSetFont) _ANSI_ARGS_((Display * display, GC gc, Font font)); /* 68 */ + void (*xSetArcMode) _ANSI_ARGS_((Display * display, GC gc, int arc_mode)); /* 69 */ + void (*xSetStipple) _ANSI_ARGS_((Display * display, GC gc, Pixmap stipple)); /* 70 */ + void (*xSetFillRule) _ANSI_ARGS_((Display * display, GC gc, int fill_rule)); /* 71 */ + void (*xSetFillStyle) _ANSI_ARGS_((Display * display, GC gc, int fill_style)); /* 72 */ + void (*xSetFunction) _ANSI_ARGS_((Display * display, GC gc, int function)); /* 73 */ + void (*xSetLineAttributes) _ANSI_ARGS_((Display * display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style)); /* 74 */ + int (*_XInitImageFuncPtrs) _ANSI_ARGS_((XImage * image)); /* 75 */ + XIC (*xCreateIC) _ANSI_ARGS_((void)); /* 76 */ + XVisualInfo * (*xGetVisualInfo) _ANSI_ARGS_((Display* display, long vinfo_mask, XVisualInfo* vinfo_template, int* nitems_return)); /* 77 */ + void (*xSetWMClientMachine) _ANSI_ARGS_((Display* display, Window w, XTextProperty* text_prop)); /* 78 */ + Status (*xStringListToTextProperty) _ANSI_ARGS_((char** list, int count, XTextProperty* text_prop_return)); /* 79 */ + void (*xDrawSegments) _ANSI_ARGS_((Display * display, Drawable d, GC gc, XSegment * segments, int nsegments)); /* 80 */ + void (*xForceScreenSaver) _ANSI_ARGS_((Display* display, int mode)); /* 81 */ + void (*xDrawLine) _ANSI_ARGS_((Display* d, Drawable dr, GC g, int x1, int y1, int x2, int y2)); /* 82 */ + void (*xFillRectangle) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height)); /* 83 */ + void (*xClearWindow) _ANSI_ARGS_((Display* d, Window w)); /* 84 */ + void (*xDrawPoint) _ANSI_ARGS_((Display* display, Drawable d, GC gc, int x, int y)); /* 85 */ + void (*xDrawPoints) _ANSI_ARGS_((Display* display, Drawable d, GC gc, XPoint * points, int npoints, int mode)); /* 86 */ + void (*xWarpPointer) _ANSI_ARGS_((Display* display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y)); /* 87 */ + void (*xQueryColor) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * def_in_out)); /* 88 */ + void (*xQueryColors) _ANSI_ARGS_((Display * display, Colormap colormap, XColor * defs_in_out, int ncolors)); /* 89 */ +#endif /* MAC_OSX_TK */ } TkIntXlibStubs; #ifdef __cplusplus @@ -1663,6 +2041,368 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; (tkIntXlibStubsPtr->xQueryColors) /* 89 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef XSetDashes +#define XSetDashes \ + (tkIntXlibStubsPtr->xSetDashes) /* 0 */ +#endif +#ifndef XGetModifierMapping +#define XGetModifierMapping \ + (tkIntXlibStubsPtr->xGetModifierMapping) /* 1 */ +#endif +#ifndef XCreateImage +#define XCreateImage \ + (tkIntXlibStubsPtr->xCreateImage) /* 2 */ +#endif +#ifndef XGetImage +#define XGetImage \ + (tkIntXlibStubsPtr->xGetImage) /* 3 */ +#endif +#ifndef XGetAtomName +#define XGetAtomName \ + (tkIntXlibStubsPtr->xGetAtomName) /* 4 */ +#endif +#ifndef XKeysymToString +#define XKeysymToString \ + (tkIntXlibStubsPtr->xKeysymToString) /* 5 */ +#endif +#ifndef XCreateColormap +#define XCreateColormap \ + (tkIntXlibStubsPtr->xCreateColormap) /* 6 */ +#endif +#ifndef XGContextFromGC +#define XGContextFromGC \ + (tkIntXlibStubsPtr->xGContextFromGC) /* 7 */ +#endif +#ifndef XKeycodeToKeysym +#define XKeycodeToKeysym \ + (tkIntXlibStubsPtr->xKeycodeToKeysym) /* 8 */ +#endif +#ifndef XStringToKeysym +#define XStringToKeysym \ + (tkIntXlibStubsPtr->xStringToKeysym) /* 9 */ +#endif +#ifndef XRootWindow +#define XRootWindow \ + (tkIntXlibStubsPtr->xRootWindow) /* 10 */ +#endif +#ifndef XSetErrorHandler +#define XSetErrorHandler \ + (tkIntXlibStubsPtr->xSetErrorHandler) /* 11 */ +#endif +#ifndef XAllocColor +#define XAllocColor \ + (tkIntXlibStubsPtr->xAllocColor) /* 12 */ +#endif +#ifndef XBell +#define XBell \ + (tkIntXlibStubsPtr->xBell) /* 13 */ +#endif +#ifndef XChangeProperty +#define XChangeProperty \ + (tkIntXlibStubsPtr->xChangeProperty) /* 14 */ +#endif +#ifndef XChangeWindowAttributes +#define XChangeWindowAttributes \ + (tkIntXlibStubsPtr->xChangeWindowAttributes) /* 15 */ +#endif +#ifndef XConfigureWindow +#define XConfigureWindow \ + (tkIntXlibStubsPtr->xConfigureWindow) /* 16 */ +#endif +#ifndef XCopyArea +#define XCopyArea \ + (tkIntXlibStubsPtr->xCopyArea) /* 17 */ +#endif +#ifndef XCopyPlane +#define XCopyPlane \ + (tkIntXlibStubsPtr->xCopyPlane) /* 18 */ +#endif +#ifndef XCreateBitmapFromData +#define XCreateBitmapFromData \ + (tkIntXlibStubsPtr->xCreateBitmapFromData) /* 19 */ +#endif +#ifndef XDefineCursor +#define XDefineCursor \ + (tkIntXlibStubsPtr->xDefineCursor) /* 20 */ +#endif +#ifndef XDestroyWindow +#define XDestroyWindow \ + (tkIntXlibStubsPtr->xDestroyWindow) /* 21 */ +#endif +#ifndef XDrawArc +#define XDrawArc \ + (tkIntXlibStubsPtr->xDrawArc) /* 22 */ +#endif +#ifndef XDrawLines +#define XDrawLines \ + (tkIntXlibStubsPtr->xDrawLines) /* 23 */ +#endif +#ifndef XDrawRectangle +#define XDrawRectangle \ + (tkIntXlibStubsPtr->xDrawRectangle) /* 24 */ +#endif +#ifndef XFillArc +#define XFillArc \ + (tkIntXlibStubsPtr->xFillArc) /* 25 */ +#endif +#ifndef XFillPolygon +#define XFillPolygon \ + (tkIntXlibStubsPtr->xFillPolygon) /* 26 */ +#endif +#ifndef XFillRectangles +#define XFillRectangles \ + (tkIntXlibStubsPtr->xFillRectangles) /* 27 */ +#endif +#ifndef XFreeColormap +#define XFreeColormap \ + (tkIntXlibStubsPtr->xFreeColormap) /* 28 */ +#endif +#ifndef XFreeColors +#define XFreeColors \ + (tkIntXlibStubsPtr->xFreeColors) /* 29 */ +#endif +#ifndef XFreeModifiermap +#define XFreeModifiermap \ + (tkIntXlibStubsPtr->xFreeModifiermap) /* 30 */ +#endif +#ifndef XGetGeometry +#define XGetGeometry \ + (tkIntXlibStubsPtr->xGetGeometry) /* 31 */ +#endif +#ifndef XGetWindowProperty +#define XGetWindowProperty \ + (tkIntXlibStubsPtr->xGetWindowProperty) /* 32 */ +#endif +#ifndef XGrabKeyboard +#define XGrabKeyboard \ + (tkIntXlibStubsPtr->xGrabKeyboard) /* 33 */ +#endif +#ifndef XGrabPointer +#define XGrabPointer \ + (tkIntXlibStubsPtr->xGrabPointer) /* 34 */ +#endif +#ifndef XKeysymToKeycode +#define XKeysymToKeycode \ + (tkIntXlibStubsPtr->xKeysymToKeycode) /* 35 */ +#endif +#ifndef XMapWindow +#define XMapWindow \ + (tkIntXlibStubsPtr->xMapWindow) /* 36 */ +#endif +#ifndef XMoveResizeWindow +#define XMoveResizeWindow \ + (tkIntXlibStubsPtr->xMoveResizeWindow) /* 37 */ +#endif +#ifndef XMoveWindow +#define XMoveWindow \ + (tkIntXlibStubsPtr->xMoveWindow) /* 38 */ +#endif +#ifndef XQueryPointer +#define XQueryPointer \ + (tkIntXlibStubsPtr->xQueryPointer) /* 39 */ +#endif +#ifndef XRaiseWindow +#define XRaiseWindow \ + (tkIntXlibStubsPtr->xRaiseWindow) /* 40 */ +#endif +#ifndef XRefreshKeyboardMapping +#define XRefreshKeyboardMapping \ + (tkIntXlibStubsPtr->xRefreshKeyboardMapping) /* 41 */ +#endif +#ifndef XResizeWindow +#define XResizeWindow \ + (tkIntXlibStubsPtr->xResizeWindow) /* 42 */ +#endif +#ifndef XSelectInput +#define XSelectInput \ + (tkIntXlibStubsPtr->xSelectInput) /* 43 */ +#endif +#ifndef XSendEvent +#define XSendEvent \ + (tkIntXlibStubsPtr->xSendEvent) /* 44 */ +#endif +#ifndef XSetIconName +#define XSetIconName \ + (tkIntXlibStubsPtr->xSetIconName) /* 45 */ +#endif +#ifndef XSetInputFocus +#define XSetInputFocus \ + (tkIntXlibStubsPtr->xSetInputFocus) /* 46 */ +#endif +#ifndef XSetSelectionOwner +#define XSetSelectionOwner \ + (tkIntXlibStubsPtr->xSetSelectionOwner) /* 47 */ +#endif +#ifndef XSetWindowBackground +#define XSetWindowBackground \ + (tkIntXlibStubsPtr->xSetWindowBackground) /* 48 */ +#endif +#ifndef XSetWindowBackgroundPixmap +#define XSetWindowBackgroundPixmap \ + (tkIntXlibStubsPtr->xSetWindowBackgroundPixmap) /* 49 */ +#endif +#ifndef XSetWindowBorder +#define XSetWindowBorder \ + (tkIntXlibStubsPtr->xSetWindowBorder) /* 50 */ +#endif +#ifndef XSetWindowBorderPixmap +#define XSetWindowBorderPixmap \ + (tkIntXlibStubsPtr->xSetWindowBorderPixmap) /* 51 */ +#endif +#ifndef XSetWindowBorderWidth +#define XSetWindowBorderWidth \ + (tkIntXlibStubsPtr->xSetWindowBorderWidth) /* 52 */ +#endif +#ifndef XSetWindowColormap +#define XSetWindowColormap \ + (tkIntXlibStubsPtr->xSetWindowColormap) /* 53 */ +#endif +#ifndef XUngrabKeyboard +#define XUngrabKeyboard \ + (tkIntXlibStubsPtr->xUngrabKeyboard) /* 54 */ +#endif +#ifndef XUngrabPointer +#define XUngrabPointer \ + (tkIntXlibStubsPtr->xUngrabPointer) /* 55 */ +#endif +#ifndef XUnmapWindow +#define XUnmapWindow \ + (tkIntXlibStubsPtr->xUnmapWindow) /* 56 */ +#endif +#ifndef TkPutImage +#define TkPutImage \ + (tkIntXlibStubsPtr->tkPutImage) /* 57 */ +#endif +#ifndef XParseColor +#define XParseColor \ + (tkIntXlibStubsPtr->xParseColor) /* 58 */ +#endif +#ifndef XCreateGC +#define XCreateGC \ + (tkIntXlibStubsPtr->xCreateGC) /* 59 */ +#endif +#ifndef XFreeGC +#define XFreeGC \ + (tkIntXlibStubsPtr->xFreeGC) /* 60 */ +#endif +#ifndef XInternAtom +#define XInternAtom \ + (tkIntXlibStubsPtr->xInternAtom) /* 61 */ +#endif +#ifndef XSetBackground +#define XSetBackground \ + (tkIntXlibStubsPtr->xSetBackground) /* 62 */ +#endif +#ifndef XSetForeground +#define XSetForeground \ + (tkIntXlibStubsPtr->xSetForeground) /* 63 */ +#endif +#ifndef XSetClipMask +#define XSetClipMask \ + (tkIntXlibStubsPtr->xSetClipMask) /* 64 */ +#endif +#ifndef XSetClipOrigin +#define XSetClipOrigin \ + (tkIntXlibStubsPtr->xSetClipOrigin) /* 65 */ +#endif +#ifndef XSetTSOrigin +#define XSetTSOrigin \ + (tkIntXlibStubsPtr->xSetTSOrigin) /* 66 */ +#endif +#ifndef XChangeGC +#define XChangeGC \ + (tkIntXlibStubsPtr->xChangeGC) /* 67 */ +#endif +#ifndef XSetFont +#define XSetFont \ + (tkIntXlibStubsPtr->xSetFont) /* 68 */ +#endif +#ifndef XSetArcMode +#define XSetArcMode \ + (tkIntXlibStubsPtr->xSetArcMode) /* 69 */ +#endif +#ifndef XSetStipple +#define XSetStipple \ + (tkIntXlibStubsPtr->xSetStipple) /* 70 */ +#endif +#ifndef XSetFillRule +#define XSetFillRule \ + (tkIntXlibStubsPtr->xSetFillRule) /* 71 */ +#endif +#ifndef XSetFillStyle +#define XSetFillStyle \ + (tkIntXlibStubsPtr->xSetFillStyle) /* 72 */ +#endif +#ifndef XSetFunction +#define XSetFunction \ + (tkIntXlibStubsPtr->xSetFunction) /* 73 */ +#endif +#ifndef XSetLineAttributes +#define XSetLineAttributes \ + (tkIntXlibStubsPtr->xSetLineAttributes) /* 74 */ +#endif +#ifndef _XInitImageFuncPtrs +#define _XInitImageFuncPtrs \ + (tkIntXlibStubsPtr->_XInitImageFuncPtrs) /* 75 */ +#endif +#ifndef XCreateIC +#define XCreateIC \ + (tkIntXlibStubsPtr->xCreateIC) /* 76 */ +#endif +#ifndef XGetVisualInfo +#define XGetVisualInfo \ + (tkIntXlibStubsPtr->xGetVisualInfo) /* 77 */ +#endif +#ifndef XSetWMClientMachine +#define XSetWMClientMachine \ + (tkIntXlibStubsPtr->xSetWMClientMachine) /* 78 */ +#endif +#ifndef XStringListToTextProperty +#define XStringListToTextProperty \ + (tkIntXlibStubsPtr->xStringListToTextProperty) /* 79 */ +#endif +#ifndef XDrawSegments +#define XDrawSegments \ + (tkIntXlibStubsPtr->xDrawSegments) /* 80 */ +#endif +#ifndef XForceScreenSaver +#define XForceScreenSaver \ + (tkIntXlibStubsPtr->xForceScreenSaver) /* 81 */ +#endif +#ifndef XDrawLine +#define XDrawLine \ + (tkIntXlibStubsPtr->xDrawLine) /* 82 */ +#endif +#ifndef XFillRectangle +#define XFillRectangle \ + (tkIntXlibStubsPtr->xFillRectangle) /* 83 */ +#endif +#ifndef XClearWindow +#define XClearWindow \ + (tkIntXlibStubsPtr->xClearWindow) /* 84 */ +#endif +#ifndef XDrawPoint +#define XDrawPoint \ + (tkIntXlibStubsPtr->xDrawPoint) /* 85 */ +#endif +#ifndef XDrawPoints +#define XDrawPoints \ + (tkIntXlibStubsPtr->xDrawPoints) /* 86 */ +#endif +#ifndef XWarpPointer +#define XWarpPointer \ + (tkIntXlibStubsPtr->xWarpPointer) /* 87 */ +#endif +#ifndef XQueryColor +#define XQueryColor \ + (tkIntXlibStubsPtr->xQueryColor) /* 88 */ +#endif +#ifndef XQueryColors +#define XQueryColors \ + (tkIntXlibStubsPtr->xQueryColors) /* 89 */ +#endif +#endif /* MAC_OSX_TK */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkMain.c b/generic/tkMain.c index 34fa5b3..f9d39a1 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMain.c,v 1.13 2002/02/08 02:57:11 dgp Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.14 2002/08/31 06:12:22 das Exp $ */ #include <ctype.h> @@ -43,7 +43,7 @@ typedef struct ThreadSpecificData { * terminal-like device. Zero means it's * a file. */ } ThreadSpecificData; -Tcl_ThreadDataKey dataKey; +static Tcl_ThreadDataKey dataKey; /* * Declarations for various library procedures and variables (don't want diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index 61ac7b7..00cad28 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -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: tkPlatDecls.h,v 1.6 2000/09/07 00:28:39 ericm Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.7 2002/08/31 06:12:23 das Exp $ */ #ifndef _TKPLATDECLS @@ -82,6 +82,40 @@ EXTERN int TkMacHaveAppearance _ANSI_ARGS_((void)); /* 10 */ EXTERN GWorldPtr TkMacGetDrawablePort _ANSI_ARGS_((Drawable drawable)); #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +/* 0 */ +EXTERN void Tk_MacOSXSetEmbedHandler _ANSI_ARGS_(( + Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc * getClipProc, + Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); +/* 1 */ +EXTERN void Tk_MacOSXTurnOffMenus _ANSI_ARGS_((void)); +/* 2 */ +EXTERN void Tk_MacOSXTkOwnsCursor _ANSI_ARGS_((int tkOwnsIt)); +/* 3 */ +EXTERN void TkMacOSXInitMenus _ANSI_ARGS_((Tcl_Interp * interp)); +/* 4 */ +EXTERN void TkMacOSXInitAppleEvents _ANSI_ARGS_(( + Tcl_Interp * interp)); +/* 5 */ +EXTERN void TkGenWMConfigureEvent _ANSI_ARGS_((Tk_Window tkwin, + int x, int y, int width, int height, + int flags)); +/* 6 */ +EXTERN void TkMacOSXInvalClipRgns _ANSI_ARGS_((TkWindow * winPtr)); +/* 7 */ +EXTERN GWorldPtr TkMacOSXGetDrawablePort _ANSI_ARGS_(( + Drawable drawable)); +/* 8 */ +EXTERN ControlRef TkMacOSXGetRootControl _ANSI_ARGS_(( + Drawable drawable)); +/* 9 */ +EXTERN void Tk_MacOSXSetupTkNotifier _ANSI_ARGS_((void)); +/* 10 */ +EXTERN int Tk_MacOSXIsAppInFront _ANSI_ARGS_((void)); +#endif /* MAC_OSX_TK */ typedef struct TkPlatStubs { int magic; @@ -108,6 +142,19 @@ typedef struct TkPlatStubs { int (*tkMacHaveAppearance) _ANSI_ARGS_((void)); /* 9 */ GWorldPtr (*tkMacGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 10 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + void (*tk_MacOSXSetEmbedHandler) _ANSI_ARGS_((Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc)); /* 0 */ + void (*tk_MacOSXTurnOffMenus) _ANSI_ARGS_((void)); /* 1 */ + void (*tk_MacOSXTkOwnsCursor) _ANSI_ARGS_((int tkOwnsIt)); /* 2 */ + void (*tkMacOSXInitMenus) _ANSI_ARGS_((Tcl_Interp * interp)); /* 3 */ + void (*tkMacOSXInitAppleEvents) _ANSI_ARGS_((Tcl_Interp * interp)); /* 4 */ + void (*tkGenWMConfigureEvent) _ANSI_ARGS_((Tk_Window tkwin, int x, int y, int width, int height, int flags)); /* 5 */ + void (*tkMacOSXInvalClipRgns) _ANSI_ARGS_((TkWindow * winPtr)); /* 6 */ + GWorldPtr (*tkMacOSXGetDrawablePort) _ANSI_ARGS_((Drawable drawable)); /* 7 */ + ControlRef (*tkMacOSXGetRootControl) _ANSI_ARGS_((Drawable drawable)); /* 8 */ + void (*tk_MacOSXSetupTkNotifier) _ANSI_ARGS_((void)); /* 9 */ + int (*tk_MacOSXIsAppInFront) _ANSI_ARGS_((void)); /* 10 */ +#endif /* MAC_OSX_TK */ } TkPlatStubs; #ifdef __cplusplus @@ -196,6 +243,52 @@ extern TkPlatStubs *tkPlatStubsPtr; (tkPlatStubsPtr->tkMacGetDrawablePort) /* 10 */ #endif #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK +#ifndef Tk_MacOSXSetEmbedHandler +#define Tk_MacOSXSetEmbedHandler \ + (tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */ +#endif +#ifndef Tk_MacOSXTurnOffMenus +#define Tk_MacOSXTurnOffMenus \ + (tkPlatStubsPtr->tk_MacOSXTurnOffMenus) /* 1 */ +#endif +#ifndef Tk_MacOSXTkOwnsCursor +#define Tk_MacOSXTkOwnsCursor \ + (tkPlatStubsPtr->tk_MacOSXTkOwnsCursor) /* 2 */ +#endif +#ifndef TkMacOSXInitMenus +#define TkMacOSXInitMenus \ + (tkPlatStubsPtr->tkMacOSXInitMenus) /* 3 */ +#endif +#ifndef TkMacOSXInitAppleEvents +#define TkMacOSXInitAppleEvents \ + (tkPlatStubsPtr->tkMacOSXInitAppleEvents) /* 4 */ +#endif +#ifndef TkGenWMConfigureEvent +#define TkGenWMConfigureEvent \ + (tkPlatStubsPtr->tkGenWMConfigureEvent) /* 5 */ +#endif +#ifndef TkMacOSXInvalClipRgns +#define TkMacOSXInvalClipRgns \ + (tkPlatStubsPtr->tkMacOSXInvalClipRgns) /* 6 */ +#endif +#ifndef TkMacOSXGetDrawablePort +#define TkMacOSXGetDrawablePort \ + (tkPlatStubsPtr->tkMacOSXGetDrawablePort) /* 7 */ +#endif +#ifndef TkMacOSXGetRootControl +#define TkMacOSXGetRootControl \ + (tkPlatStubsPtr->tkMacOSXGetRootControl) /* 8 */ +#endif +#ifndef Tk_MacOSXSetupTkNotifier +#define Tk_MacOSXSetupTkNotifier \ + (tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */ +#endif +#ifndef Tk_MacOSXIsAppInFront +#define Tk_MacOSXIsAppInFront \ + (tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */ +#endif +#endif /* MAC_OSX_TK */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkPointer.c b/generic/tkPointer.c index 0e4edf4..06e54ff 100644 --- a/generic/tkPointer.c +++ b/generic/tkPointer.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPointer.c,v 1.6 2002/06/14 22:25:12 jenglish Exp $ + * RCS: @(#) $Id: tkPointer.c,v 1.7 2002/08/31 06:12:25 das Exp $ */ #include "tkInt.h" @@ -20,11 +20,16 @@ #include "tkWinInt.h" #endif -#ifdef MAC_TCL +#if defined(MAC_TCL) #include "tkMacInt.h" #define Cursor XCursor #endif +#if defined(MAC_OSX_TK) +#include "tkMacOSXInt.h" +#define Cursor XCursor +#endif + /* * Mask that selects any of the state bits corresponding to buttons, * plus masks that select individual buttons' bits: diff --git a/generic/tkPort.h b/generic/tkPort.h index 04e1dab..b07e22d 100644 --- a/generic/tkPort.h +++ b/generic/tkPort.h @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPort.h,v 1.2 1998/09/14 18:23:16 stanton Exp $ + * RCS: @(#) $Id: tkPort.h,v 1.3 2002/08/31 06:12:26 das Exp $ */ #ifndef _TKPORT @@ -28,6 +28,8 @@ #else # if defined(MAC_TCL) # include "tkMacPort.h" +# elif defined(MAC_OSX_TK) +# include "../macosx/tkMacOSXPort.h" # else # include "../unix/tkUnixPort.h" # endif diff --git a/generic/tkSelect.c b/generic/tkSelect.c index 6aad314..af98ccd 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkSelect.c,v 1.11 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkSelect.c,v 1.12 2002/08/31 06:12:26 das Exp $ */ #include "tkInt.h" @@ -1199,7 +1199,7 @@ TkSelInit(tkwin) * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ -#if !defined(__WIN32__) && !defined(MAC_TCL) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING"); #else dispPtr->utf8Atom = (Atom) NULL; diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index e92d4f5..bf3e770 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,19 +8,31 @@ * 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.37 2002/06/18 23:51:46 dkf Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.38 2002/08/31 06:12:27 das Exp $ */ #include "tkInt.h" #include "tkPort.h" +#if !(defined(__WIN32__) && defined(MAC_TCL) || defined(MAC_OSX_TK)) +/* UNIX */ +#define UNIX_TK +#endif + #ifdef __WIN32__ #include "tkWinInt.h" #endif -#ifdef MAC_TCL +#if defined(MAC_TCL) +/* set this locally .. we could have used _TKMACINT */ +#define MAC_TK #include "tkMacInt.h" #endif +#if defined(MAC_OSX_TK) +/* set this locally .. we could have used _TKMACINT */ +#include "tkMacOSXInt.h" +#endif + #include "tkDecls.h" #include "tkPlatDecls.h" #include "tkIntDecls.h" @@ -169,6 +181,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkClipBox, /* 113 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkClipBox, /* 113 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 114 */ #endif /* UNIX */ @@ -178,6 +193,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkCreateRegion, /* 114 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkCreateRegion, /* 114 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 115 */ #endif /* UNIX */ @@ -187,6 +205,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkDestroyRegion, /* 115 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkDestroyRegion, /* 115 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 116 */ #endif /* UNIX */ @@ -196,6 +217,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkIntersectRegion, /* 116 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkIntersectRegion, /* 116 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 117 */ #endif /* UNIX */ @@ -205,6 +229,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkRectInRegion, /* 117 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkRectInRegion, /* 117 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 118 */ #endif /* UNIX */ @@ -214,6 +241,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkSetRegion, /* 118 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkSetRegion, /* 118 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 119 */ #endif /* UNIX */ @@ -223,6 +253,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkUnionRectWithRegion, /* 119 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkUnionRectWithRegion, /* 119 */ +#endif /* MAC_OSX_TK */ NULL, /* 120 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 121 */ @@ -233,6 +266,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkpCreateNativeBitmap, /* 121 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkpCreateNativeBitmap, /* 121 */ +#endif /* MAC_OSX_TK */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 122 */ #endif /* UNIX */ @@ -242,6 +278,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkpDefineNativeBitmaps, /* 122 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkpDefineNativeBitmaps, /* 122 */ +#endif /* MAC_OSX_TK */ NULL, /* 123 */ #if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ NULL, /* 124 */ @@ -252,6 +291,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkpGetNativeAppBitmap, /* 124 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkpGetNativeAppBitmap, /* 124 */ +#endif /* MAC_OSX_TK */ NULL, /* 125 */ NULL, /* 126 */ NULL, /* 127 */ @@ -281,6 +323,9 @@ TkIntStubs tkIntStubs = { #ifdef MAC_TCL TkSubtractRegion, /* 145 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkSubtractRegion, /* 145 */ +#endif /* MAC_OSX_TK */ TkStylePkgInit, /* 146 */ TkStylePkgFree, /* 147 */ }; @@ -288,21 +333,6 @@ TkIntStubs tkIntStubs = { TkIntPlatStubs tkIntPlatStubs = { TCL_STUB_MAGIC, NULL, -#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */ - TkCreateXEventSource, /* 0 */ - TkFreeWindowId, /* 1 */ - TkInitXId, /* 2 */ - TkpCmapStressed, /* 3 */ - TkpSync, /* 4 */ - TkUnixContainerId, /* 5 */ - TkUnixDoOneXEvent, /* 6 */ - TkUnixSetMenubar, /* 7 */ - TkpScanWindowId, /* 8 */ - TkWmCleanup, /* 9 */ - TkSendCleanup, /* 10 */ - TkFreeXId, /* 11 */ - TkpWmSetState, /* 12 */ -#endif /* UNIX */ #ifdef __WIN32__ TkAlignImageData, /* 0 */ NULL, /* 1 */ @@ -408,6 +438,77 @@ TkIntPlatStubs tkIntPlatStubs = { TkMacPreprocessMenu, /* 65 */ TkpIsWindowFloating, /* 66 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + TkGenerateActivateEvents, /* 0 */ + NULL, /* 1 */ + NULL, /* 2 */ + TkPointerDeadWindow, /* 3 */ + TkpSetCapture, /* 4 */ + TkpSetCursor, /* 5 */ + TkpWmSetState, /* 6 */ + TkAboutDlg, /* 7 */ + TkMacOSXButtonKeyState, /* 8 */ + TkMacOSXClearMenubarActive, /* 9 */ + TkMacOSXDispatchMenuEvent, /* 10 */ + TkMacOSXInstallCursor, /* 11 */ + TkMacOSXHandleTearoffMenu, /* 12 */ + NULL, /* 13 */ + TkMacOSXDoHLEvent, /* 14 */ + NULL, /* 15 */ + TkMacOSXGetXWindow, /* 16 */ + TkMacOSXGrowToplevel, /* 17 */ + TkMacOSXHandleMenuSelect, /* 18 */ + NULL, /* 19 */ + NULL, /* 20 */ + TkMacOSXInvalidateWindow, /* 21 */ + TkMacOSXIsCharacterMissing, /* 22 */ + TkMacOSXMakeRealWindowExist, /* 23 */ + TkMacOSXMakeStippleMap, /* 24 */ + TkMacOSXMenuClick, /* 25 */ + TkMacOSXRegisterOffScreenWindow, /* 26 */ + TkMacOSXResizable, /* 27 */ + TkMacOSXSetHelpMenuItemCount, /* 28 */ + TkMacOSXSetScrollbarGrow, /* 29 */ + TkMacOSXSetUpClippingRgn, /* 30 */ + TkMacOSXSetUpGraphicsPort, /* 31 */ + TkMacOSXUpdateClipRgn, /* 32 */ + TkMacOSXUnregisterMacWindow, /* 33 */ + TkMacOSXUseMenuID, /* 34 */ + TkMacOSXVisableClipRgn, /* 35 */ + TkMacOSXWinBounds, /* 36 */ + TkMacOSXWindowOffset, /* 37 */ + TkSetMacColor, /* 38 */ + TkSetWMName, /* 39 */ + TkSuspendClipboard, /* 40 */ + TkMacOSXZoomToplevel, /* 41 */ + Tk_TopCoordsToWindow, /* 42 */ + TkMacOSXContainerId, /* 43 */ + TkMacOSXGetHostToplevel, /* 44 */ + TkMacOSXPreprocessMenu, /* 45 */ + TkpIsWindowFloating, /* 46 */ + TkMacOSXGetCapture, /* 47 */ + NULL, /* 48 */ + TkGetTransientMaster, /* 49 */ + TkGenerateButtonEvent, /* 50 */ + TkGenWMDestroyEvent, /* 51 */ + NULL, /* 52 */ + TkpGetMS, /* 53 */ +#endif /* MAC_OSX_TK */ +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* X11 */ + TkCreateXEventSource, /* 0 */ + TkFreeWindowId, /* 1 */ + TkInitXId, /* 2 */ + TkpCmapStressed, /* 3 */ + TkpSync, /* 4 */ + TkUnixContainerId, /* 5 */ + TkUnixDoOneXEvent, /* 6 */ + TkUnixSetMenubar, /* 7 */ + TkpScanWindowId, /* 8 */ + TkWmCleanup, /* 9 */ + TkSendCleanup, /* 10 */ + TkFreeXId, /* 11 */ + TkpWmSetState, /* 12 */ +#endif /* X11 */ }; TkIntXlibStubs tkIntXlibStubs = { @@ -614,6 +715,98 @@ TkIntXlibStubs tkIntXlibStubs = { XQueryColor, /* 88 */ XQueryColors, /* 89 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + XSetDashes, /* 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 */ + XParseColor, /* 58 */ + XCreateGC, /* 59 */ + XFreeGC, /* 60 */ + XInternAtom, /* 61 */ + XSetBackground, /* 62 */ + XSetForeground, /* 63 */ + XSetClipMask, /* 64 */ + XSetClipOrigin, /* 65 */ + XSetTSOrigin, /* 66 */ + XChangeGC, /* 67 */ + XSetFont, /* 68 */ + XSetArcMode, /* 69 */ + XSetStipple, /* 70 */ + XSetFillRule, /* 71 */ + XSetFillStyle, /* 72 */ + XSetFunction, /* 73 */ + XSetLineAttributes, /* 74 */ + _XInitImageFuncPtrs, /* 75 */ + XCreateIC, /* 76 */ + XGetVisualInfo, /* 77 */ + XSetWMClientMachine, /* 78 */ + XStringListToTextProperty, /* 79 */ + XDrawSegments, /* 80 */ + XForceScreenSaver, /* 81 */ + XDrawLine, /* 82 */ + XFillRectangle, /* 83 */ + XClearWindow, /* 84 */ + XDrawPoint, /* 85 */ + XDrawPoints, /* 86 */ + XWarpPointer, /* 87 */ + XQueryColor, /* 88 */ + XQueryColors, /* 89 */ +#endif /* MAC_OSX_TK */ }; TkPlatStubs tkPlatStubs = { @@ -640,6 +833,19 @@ TkPlatStubs tkPlatStubs = { TkMacHaveAppearance, /* 9 */ TkMacGetDrawablePort, /* 10 */ #endif /* MAC_TCL */ +#ifdef MAC_OSX_TK + Tk_MacOSXSetEmbedHandler, /* 0 */ + Tk_MacOSXTurnOffMenus, /* 1 */ + Tk_MacOSXTkOwnsCursor, /* 2 */ + TkMacOSXInitMenus, /* 3 */ + TkMacOSXInitAppleEvents, /* 4 */ + TkGenWMConfigureEvent, /* 5 */ + TkMacOSXInvalClipRgns, /* 6 */ + TkMacOSXGetDrawablePort, /* 7 */ + TkMacOSXGetRootControl, /* 8 */ + Tk_MacOSXSetupTkNotifier, /* 9 */ + Tk_MacOSXIsAppInFront, /* 10 */ +#endif /* MAC_OSX_TK */ }; static TkStubHooks tkStubHooks = { @@ -920,3 +1126,7 @@ TkStubs tkStubs = { }; /* !END!: Do not edit above this line. */ + +#undef UNIX_TK +#undef MAC_TK +#undef MAC_OSX_TK diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c index d8e3f05..c86c2c5 100644 --- a/generic/tkStubLib.c +++ b/generic/tkStubLib.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubLib.c,v 1.7 2001/11/23 02:07:11 das Exp $ + * RCS: @(#) $Id: tkStubLib.c,v 1.8 2002/08/31 06:12:27 das Exp $ */ @@ -42,6 +42,10 @@ #include "tkMacInt.h" #endif +#ifdef MAC_OSX_TK +#include "tkMacOSXInt.h" +#endif + #include "tkDecls.h" #include "tkIntDecls.h" #include "tkPlatDecls.h" diff --git a/generic/tkTest.c b/generic/tkTest.c index 8104f2e..29ed408 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTest.c,v 1.19 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkTest.c,v 1.20 2002/08/31 06:12:27 das Exp $ */ #include "tkInt.h" @@ -24,7 +24,7 @@ #include "tkWinInt.h" #endif -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) #include "tkScrollbar.h" #endif @@ -181,7 +181,7 @@ static int TestmakeexistCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); static int TestmenubarCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); -#if defined(__WIN32__) || defined(MAC_TCL) +#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK) static int TestmetricsCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif @@ -205,7 +205,7 @@ static int TestsendCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); static int TesttextCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); -#if !(defined(__WIN32__) || defined(MAC_TCL)) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) static int TestwrapperCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif @@ -223,7 +223,7 @@ static void TrivialEventProc _ANSI_ARGS_((ClientData clientData, extern int TkplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp)); -#if !(defined(__WIN32__) || defined(MAC_TCL)) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) #define TkplatformtestInit(x) TCL_OK #endif @@ -285,7 +285,7 @@ Tktest_Init(interp) Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif -#if defined(__WIN32__) || defined(MAC_TCL) +#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK) Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif @@ -297,7 +297,7 @@ Tktest_Init(interp) #endif Tcl_CreateCommand(interp, "testtext", TesttextCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); -#if !(defined(__WIN32__) || defined(MAC_TCL)) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) Tcl_CreateCommand(interp, "testwrapper", TestwrapperCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif @@ -2056,7 +2056,7 @@ TestmetricsCmd(clientData, interp, argc, argv) return TCL_OK; } #endif -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) static int TestmetricsCmd(clientData, interp, argc, argv) ClientData clientData; /* Main window for application. */ @@ -2364,7 +2364,7 @@ TesttextCmd(clientData, interp, argc, argv) return TCL_OK; } -#if !(defined(__WIN32__) || defined(MAC_TCL)) +#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) /* *---------------------------------------------------------------------- * diff --git a/generic/tkText.c b/generic/tkText.c index d78738b..95e20c7 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -14,7 +14,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkText.c,v 1.30 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkText.c,v 1.31 2002/08/31 06:12:27 das Exp $ */ #include "default.h" @@ -22,7 +22,7 @@ #include "tkInt.h" #include "tkUndo.h" -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) #define Style TkStyle #define DInfo TkDInfo #endif diff --git a/generic/tkWindow.c b/generic/tkWindow.c index a237953..a69c681 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -12,13 +12,13 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWindow.c,v 1.52 2002/08/05 04:30:40 dgp Exp $ + * RCS: @(#) $Id: tkWindow.c,v 1.53 2002/08/31 06:12:28 das Exp $ */ #include "tkPort.h" #include "tkInt.h" -#if !defined(__WIN32__) && !defined(MAC_TCL) +#if !( defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif @@ -116,7 +116,7 @@ static TkCmd commands[] = { {"selection", NULL, Tk_SelectionObjCmd, 0, 1}, {"tk", NULL, Tk_TkObjCmd, 0, 1}, {"tkwait", NULL, Tk_TkwaitObjCmd, 1, 1}, -#if defined(__WIN32__) || defined(MAC_TCL) +#if defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK) {"tk_chooseColor", NULL, Tk_ChooseColorObjCmd, 0, 1}, {"tk_chooseDirectory", NULL, Tk_ChooseDirectoryObjCmd, 0, 1}, {"tk_getOpenFile", NULL, Tk_GetOpenFileObjCmd, 0, 1}, @@ -155,7 +155,7 @@ static TkCmd commands[] = { * Misc. */ -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) {"::tk::unsupported::MacWindowStyle", TkUnsupported1Cmd, NULL, 1, 1}, #endif @@ -1366,7 +1366,7 @@ Tk_DestroyWindow(tkwin) TkWmRemoveFromColormapWindows(winPtr); } if (winPtr->window != None) { -#if defined(MAC_TCL) || defined(__WIN32__) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) || defined(__WIN32__) XDestroyWindow(winPtr->display, winPtr->window); #else if ((winPtr->flags & TK_TOP_HIERARCHY) @@ -1551,7 +1551,7 @@ void Tk_MapWindow(tkwin) Tk_Window tkwin; /* Token for window to map. */ { - register TkWindow *winPtr = (TkWindow *) tkwin; + TkWindow *winPtr = (TkWindow *) tkwin; XEvent event; if (winPtr->flags & TK_MAPPED) { @@ -2009,7 +2009,7 @@ Tk_DefineCursor(tkwin, cursor) { register TkWindow *winPtr = (TkWindow *) tkwin; -#ifdef MAC_TCL +#if defined(MAC_TCL) || defined(MAC_OSX_TK) winPtr->atts.cursor = (XCursor) cursor; #else winPtr->atts.cursor = (Cursor) cursor; |