From fb0ecf4500a7e434b90027bbc19f95c8a2d3fb6e Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 29 Mar 2020 15:38:42 +0000 Subject: Add more (dummy) stub entries, as preparation for futher stub simplifications in 8.7 and 9.0 --- generic/tk.decls | 24 +++++++++ generic/tkInt.decls | 26 ++++++++++ generic/tkIntDecls.h | 8 +++ generic/tkIntPlatDecls.h | 123 +++++++++++++++++++++++++++++++++++++++++++++++ generic/tkPlatDecls.h | 43 +++++++++++++++++ generic/tkStubInit.c | 53 ++++++++++++++++++++ 6 files changed, 277 insertions(+) diff --git a/generic/tk.decls b/generic/tk.decls index 9ceb3af..ee1d97b 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -1139,6 +1139,30 @@ declare 9 aqua { declare 10 aqua { int Tk_MacOSXIsAppInFront(void) } +declare 11 aqua { + void Tk_MacOSXSetEmbedHandler_( + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc *getClipProc, + Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc) +} +declare 12 aqua { + void Tk_MacOSXTurnOffMenus_(void) +} +declare 13 aqua { + void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt) +} +declare 14 aqua { + void TkMacOSXInitMenus_(Tcl_Interp *interp) +} +declare 15 aqua { + void TkMacOSXInitAppleEvents_(Tcl_Interp *interp) +} +declare 16 aqua { + void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, int width, + int height, int flags) +} ############################################################################## diff --git a/generic/tkInt.decls b/generic/tkInt.decls index a037cd4..40005ea 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -687,6 +687,32 @@ declare 13 x11 { int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) } +declare 38 x11 { + int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap) +} +declare 39 x11 { + void TkpSync_(Display *display) +} +declare 40 x11 { + Window TkUnixContainerId_(TkWindow *winPtr) +} +declare 41 x11 { + int TkUnixDoOneXEvent_(Tcl_Time *timePtr) +} +declare 42 x11 { + void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar) +} +declare 43 x11 { + void TkWmCleanup_(TkDisplay *dispPtr) +} +declare 44 x11 { + void TkSendCleanup_(TkDisplay *dispPtr) +} +# only needed by tktest: +declare 45 x11 { + int TkpTestsendCmd_(ClientData clientData, Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]) +} ################################ # Windows specific functions diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index eb32c00..fa1833e 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -1160,6 +1160,14 @@ extern const TkIntStubs *tkIntStubsPtr; #undef TkSetRegion #undef TkSubtractRegion #undef TkUnionRectWithRegion +#undef TkpCmapStressed_ +#undef TkpSync_ +#undef TkUnixContainerId_ +#undef TkUnixDoOneXEvent_ +#undef TkUnixSetMenubar_ +#undef TkWmCleanup_ +#undef TkSendCleanup_ +#undef TkpTestsendCmd_ #define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect) #define TkCreateRegion() (TkRegion) XCreateRegion() diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index f496e55..16c18a8 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -291,6 +291,48 @@ EXTERN int TkpWmSetState(TkWindow *winPtr, int state); EXTERN int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); +/* Slot 14 is reserved */ +/* Slot 15 is reserved */ +/* Slot 16 is reserved */ +/* Slot 17 is reserved */ +/* Slot 18 is reserved */ +/* Slot 19 is reserved */ +/* Slot 20 is reserved */ +/* Slot 21 is reserved */ +/* Slot 22 is reserved */ +/* Slot 23 is reserved */ +/* Slot 24 is reserved */ +/* Slot 25 is reserved */ +/* Slot 26 is reserved */ +/* Slot 27 is reserved */ +/* Slot 28 is reserved */ +/* Slot 29 is reserved */ +/* Slot 30 is reserved */ +/* Slot 31 is reserved */ +/* Slot 32 is reserved */ +/* Slot 33 is reserved */ +/* Slot 34 is reserved */ +/* Slot 35 is reserved */ +/* Slot 36 is reserved */ +/* Slot 37 is reserved */ +/* 38 */ +EXTERN int TkpCmapStressed_(Tk_Window tkwin, Colormap colormap); +/* 39 */ +EXTERN void TkpSync_(Display *display); +/* 40 */ +EXTERN Window TkUnixContainerId_(TkWindow *winPtr); +/* 41 */ +EXTERN int TkUnixDoOneXEvent_(Tcl_Time *timePtr); +/* 42 */ +EXTERN void TkUnixSetMenubar_(Tk_Window tkwin, Tk_Window menubar); +/* 43 */ +EXTERN void TkWmCleanup_(TkDisplay *dispPtr); +/* 44 */ +EXTERN void TkSendCleanup_(TkDisplay *dispPtr); +/* 45 */ +EXTERN int TkpTestsendCmd_(ClientData clientData, + Tcl_Interp *interp, int objc, + Tcl_Obj *const objv[]); #endif /* X11 */ typedef struct TkIntPlatStubs { @@ -420,6 +462,38 @@ typedef struct TkIntPlatStubs { void (*reserved11)(void); int (*tkpWmSetState) (TkWindow *winPtr, int state); /* 12 */ int (*tkpTestsendCmd) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 13 */ + void (*reserved14)(void); + void (*reserved15)(void); + void (*reserved16)(void); + void (*reserved17)(void); + void (*reserved18)(void); + void (*reserved19)(void); + void (*reserved20)(void); + void (*reserved21)(void); + void (*reserved22)(void); + void (*reserved23)(void); + void (*reserved24)(void); + void (*reserved25)(void); + void (*reserved26)(void); + void (*reserved27)(void); + void (*reserved28)(void); + void (*reserved29)(void); + void (*reserved30)(void); + void (*reserved31)(void); + void (*reserved32)(void); + void (*reserved33)(void); + void (*reserved34)(void); + void (*reserved35)(void); + void (*reserved36)(void); + void (*reserved37)(void); + int (*tkpCmapStressed_) (Tk_Window tkwin, Colormap colormap); /* 38 */ + void (*tkpSync_) (Display *display); /* 39 */ + Window (*tkUnixContainerId_) (TkWindow *winPtr); /* 40 */ + int (*tkUnixDoOneXEvent_) (Tcl_Time *timePtr); /* 41 */ + void (*tkUnixSetMenubar_) (Tk_Window tkwin, Tk_Window menubar); /* 42 */ + void (*tkWmCleanup_) (TkDisplay *dispPtr); /* 43 */ + void (*tkSendCleanup_) (TkDisplay *dispPtr); /* 44 */ + int (*tkpTestsendCmd_) (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 45 */ #endif /* X11 */ } TkIntPlatStubs; @@ -663,12 +737,61 @@ extern const TkIntPlatStubs *tkIntPlatStubsPtr; (tkIntPlatStubsPtr->tkpWmSetState) /* 12 */ #define TkpTestsendCmd \ (tkIntPlatStubsPtr->tkpTestsendCmd) /* 13 */ +/* Slot 14 is reserved */ +/* Slot 15 is reserved */ +/* Slot 16 is reserved */ +/* Slot 17 is reserved */ +/* Slot 18 is reserved */ +/* Slot 19 is reserved */ +/* Slot 20 is reserved */ +/* Slot 21 is reserved */ +/* Slot 22 is reserved */ +/* Slot 23 is reserved */ +/* Slot 24 is reserved */ +/* Slot 25 is reserved */ +/* Slot 26 is reserved */ +/* Slot 27 is reserved */ +/* Slot 28 is reserved */ +/* Slot 29 is reserved */ +/* Slot 30 is reserved */ +/* Slot 31 is reserved */ +/* Slot 32 is reserved */ +/* Slot 33 is reserved */ +/* Slot 34 is reserved */ +/* Slot 35 is reserved */ +/* Slot 36 is reserved */ +/* Slot 37 is reserved */ +#define TkpCmapStressed_ \ + (tkIntPlatStubsPtr->tkpCmapStressed_) /* 38 */ +#define TkpSync_ \ + (tkIntPlatStubsPtr->tkpSync_) /* 39 */ +#define TkUnixContainerId_ \ + (tkIntPlatStubsPtr->tkUnixContainerId_) /* 40 */ +#define TkUnixDoOneXEvent_ \ + (tkIntPlatStubsPtr->tkUnixDoOneXEvent_) /* 41 */ +#define TkUnixSetMenubar_ \ + (tkIntPlatStubsPtr->tkUnixSetMenubar_) /* 42 */ +#define TkWmCleanup_ \ + (tkIntPlatStubsPtr->tkWmCleanup_) /* 43 */ +#define TkSendCleanup_ \ + (tkIntPlatStubsPtr->tkSendCleanup_) /* 44 */ +#define TkpTestsendCmd_ \ + (tkIntPlatStubsPtr->tkpTestsendCmd_) /* 45 */ #endif /* X11 */ #endif /* defined(USE_TK_STUBS) */ /* !END!: Do not edit above this line. */ +#undef TkpCmapStressed_ +#undef TkpSync_ +#undef TkUnixContainerId_ +#undef TkUnixDoOneXEvent_ +#undef TkUnixSetMenubar_ +#undef TkWmCleanup_ +#undef TkSendCleanup_ +#undef TkpTestsendCmd_ + #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index 1e69c88..db9141c 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -82,6 +82,24 @@ EXTERN void * TkMacOSXGetRootControl(Drawable drawable); EXTERN void Tk_MacOSXSetupTkNotifier(void); /* 10 */ EXTERN int Tk_MacOSXIsAppInFront(void); +/* 11 */ +EXTERN void Tk_MacOSXSetEmbedHandler_( + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc *getClipProc, + Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); +/* 12 */ +EXTERN void Tk_MacOSXTurnOffMenus_(void); +/* 13 */ +EXTERN void Tk_MacOSXTkOwnsCursor_(int tkOwnsIt); +/* 14 */ +EXTERN void TkMacOSXInitMenus_(Tcl_Interp *interp); +/* 15 */ +EXTERN void TkMacOSXInitAppleEvents_(Tcl_Interp *interp); +/* 16 */ +EXTERN void TkGenWMConfigureEvent_(Tk_Window tkwin, int x, int y, + int width, int height, int flags); #endif /* AQUA */ typedef struct TkPlatStubs { @@ -108,6 +126,12 @@ typedef struct TkPlatStubs { void * (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */ void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */ int (*tk_MacOSXIsAppInFront) (void); /* 10 */ + void (*tk_MacOSXSetEmbedHandler_) (Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc); /* 11 */ + void (*tk_MacOSXTurnOffMenus_) (void); /* 12 */ + void (*tk_MacOSXTkOwnsCursor_) (int tkOwnsIt); /* 13 */ + void (*tkMacOSXInitMenus_) (Tcl_Interp *interp); /* 14 */ + void (*tkMacOSXInitAppleEvents_) (Tcl_Interp *interp); /* 15 */ + void (*tkGenWMConfigureEvent_) (Tk_Window tkwin, int x, int y, int width, int height, int flags); /* 16 */ #endif /* AQUA */ } TkPlatStubs; @@ -160,12 +184,31 @@ extern const TkPlatStubs *tkPlatStubsPtr; (tkPlatStubsPtr->tk_MacOSXSetupTkNotifier) /* 9 */ #define Tk_MacOSXIsAppInFront \ (tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */ +#define Tk_MacOSXSetEmbedHandler_ \ + (tkPlatStubsPtr->tk_MacOSXSetEmbedHandler_) /* 11 */ +#define Tk_MacOSXTurnOffMenus_ \ + (tkPlatStubsPtr->tk_MacOSXTurnOffMenus_) /* 12 */ +#define Tk_MacOSXTkOwnsCursor_ \ + (tkPlatStubsPtr->tk_MacOSXTkOwnsCursor_) /* 13 */ +#define TkMacOSXInitMenus_ \ + (tkPlatStubsPtr->tkMacOSXInitMenus_) /* 14 */ +#define TkMacOSXInitAppleEvents_ \ + (tkPlatStubsPtr->tkMacOSXInitAppleEvents_) /* 15 */ +#define TkGenWMConfigureEvent_ \ + (tkPlatStubsPtr->tkGenWMConfigureEvent_) /* 16 */ #endif /* AQUA */ #endif /* defined(USE_TK_STUBS) */ /* !END!: Do not edit above this line. */ +#undef Tk_MacOSXSetEmbedHandler_ +#undef Tk_MacOSXTurnOffMenus_ +#undef Tk_MacOSXTkOwnsCursor_ +#undef TkMacOSXInitMenus_ +#undef TkMacOSXInitAppleEvents_ +#undef TkGenWMConfigureEvent_ + #ifdef __cplusplus } #endif diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 8152dfe..57f64b3 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -47,6 +47,21 @@ MODULE_SCOPE const TkStubs tkStubs; #undef XFlush #define TkUnusedStubEntry 0 +#define TkpCmapStressed_ TkpCmapStressed +#define TkpSync_ TkpSync +#define TkUnixContainerId_ TkUnixContainerId +#define TkUnixDoOneXEvent_ TkUnixDoOneXEvent +#define TkUnixSetMenubar_ TkUnixSetMenubar +#define TkWmCleanup_ TkWmCleanup +#define TkSendCleanup_ TkSendCleanup +#define TkpTestsendCmd_ TkpTestsendCmd +#define Tk_MacOSXSetEmbedHandler_ Tk_MacOSXSetEmbedHandler +#define Tk_MacOSXTurnOffMenus_ Tk_MacOSXTurnOffMenus +#define Tk_MacOSXTkOwnsCursor_ Tk_MacOSXTkOwnsCursor +#define TkMacOSXInitMenus_ TkMacOSXInitMenus +#define TkMacOSXInitAppleEvents_ TkMacOSXInitAppleEvents +#define TkGenWMConfigureEvent_ TkGenWMConfigureEvent + #ifdef _WIN32 int @@ -598,6 +613,38 @@ static const TkIntPlatStubs tkIntPlatStubs = { 0, /* 11 */ TkpWmSetState, /* 12 */ TkpTestsendCmd, /* 13 */ + 0, /* 14 */ + 0, /* 15 */ + 0, /* 16 */ + 0, /* 17 */ + 0, /* 18 */ + 0, /* 19 */ + 0, /* 20 */ + 0, /* 21 */ + 0, /* 22 */ + 0, /* 23 */ + 0, /* 24 */ + 0, /* 25 */ + 0, /* 26 */ + 0, /* 27 */ + 0, /* 28 */ + 0, /* 29 */ + 0, /* 30 */ + 0, /* 31 */ + 0, /* 32 */ + 0, /* 33 */ + 0, /* 34 */ + 0, /* 35 */ + 0, /* 36 */ + 0, /* 37 */ + TkpCmapStressed_, /* 38 */ + TkpSync_, /* 39 */ + TkUnixContainerId_, /* 40 */ + TkUnixDoOneXEvent_, /* 41 */ + TkUnixSetMenubar_, /* 42 */ + TkWmCleanup_, /* 43 */ + TkSendCleanup_, /* 44 */ + TkpTestsendCmd_, /* 45 */ #endif /* X11 */ }; @@ -951,6 +998,12 @@ static const TkPlatStubs tkPlatStubs = { TkMacOSXGetRootControl, /* 8 */ Tk_MacOSXSetupTkNotifier, /* 9 */ Tk_MacOSXIsAppInFront, /* 10 */ + Tk_MacOSXSetEmbedHandler_, /* 11 */ + Tk_MacOSXTurnOffMenus_, /* 12 */ + Tk_MacOSXTkOwnsCursor_, /* 13 */ + TkMacOSXInitMenus_, /* 14 */ + TkMacOSXInitAppleEvents_, /* 15 */ + TkGenWMConfigureEvent_, /* 16 */ #endif /* AQUA */ }; -- cgit v0.12