mirror of
https://github.com/python/cpython.git
synced 2026-10-29 10:55:16 +08:00
Serhiy Storchaka
159a3604b9
Tk on macOS replaces the SIGINT, SIGHUP and SIGTERM handlers with its
own, which exits the process, so Ctrl-C terminated a tkinter program
instead of raising KeyboardInterrupt. Save the handlers installed by
Python before Tk_Init() and restore them after it.
This affects Tk 8.6.11 to 8.6.18 and 9.0 to 9.0.4. Tk itself is fixed
in 8.6.19 and 9.0.5.
(cherry picked from commit 4532b36db5)
On 3.13 there was no Tkinter_TkInit(), and tkappinit.c, which is used
when Python is built with WITH_APPINIT (as on macOS), called Tk_Init()
directly, bypassing the fix.
93 lines
2.5 KiB
C
93 lines
2.5 KiB
C
/* appinit.c -- Tcl and Tk application initialization.
|
|
|
|
The function Tcl_AppInit() below initializes various Tcl packages.
|
|
It is called for each Tcl interpreter created by _tkinter.create().
|
|
It needs to be compiled with -DWITH_<package> flags for each package
|
|
that you are statically linking with. You may have to add sections
|
|
for packages not yet listed below.
|
|
|
|
Note that those packages for which Tcl_StaticPackage() is called with
|
|
a NULL first argument are known as "static loadable" packages to
|
|
Tcl but not actually initialized. To use these, you have to load
|
|
it explicitly, e.g. tkapp.eval("load {} Blt").
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <tcl.h>
|
|
#include <tk.h>
|
|
|
|
#include "tkinter.h"
|
|
|
|
int
|
|
Tcl_AppInit(Tcl_Interp *interp)
|
|
{
|
|
const char *_tkinter_skip_tk_init;
|
|
|
|
if (Tcl_Init (interp) == TCL_ERROR)
|
|
return TCL_ERROR;
|
|
|
|
#ifdef WITH_XXX
|
|
/* Initialize modules that don't require Tk */
|
|
#endif
|
|
|
|
_tkinter_skip_tk_init = Tcl_GetVar(interp,
|
|
"_tkinter_skip_tk_init", TCL_GLOBAL_ONLY);
|
|
if (_tkinter_skip_tk_init != NULL &&
|
|
strcmp(_tkinter_skip_tk_init, "1") == 0) {
|
|
return TCL_OK;
|
|
}
|
|
|
|
if (Tkinter_TkInit(interp) == TCL_ERROR) {
|
|
return TCL_ERROR;
|
|
}
|
|
|
|
Tk_MainWindow(interp);
|
|
|
|
#ifdef WITH_PIL /* 0.2b5 and later -- not yet released as of May 14 */
|
|
{
|
|
extern void TkImaging_Init(Tcl_Interp *);
|
|
TkImaging_Init(interp);
|
|
/* XXX TkImaging_Init() doesn't have the right return type */
|
|
/*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
|
|
}
|
|
#endif
|
|
|
|
#ifdef WITH_PIL_OLD /* 0.2b4 and earlier */
|
|
{
|
|
extern void TkImaging_Init(void);
|
|
/* XXX TkImaging_Init() doesn't have the right prototype */
|
|
/*Tcl_StaticPackage(interp, "Imaging", TkImaging_Init, NULL);*/
|
|
}
|
|
#endif
|
|
|
|
#ifdef WITH_TIX
|
|
{
|
|
extern int Tix_Init(Tcl_Interp *interp);
|
|
extern int Tix_SafeInit(Tcl_Interp *interp);
|
|
Tcl_StaticPackage(NULL, "Tix", Tix_Init, Tix_SafeInit);
|
|
}
|
|
#endif
|
|
|
|
#ifdef WITH_BLT
|
|
{
|
|
extern int Blt_Init(Tcl_Interp *);
|
|
extern int Blt_SafeInit(Tcl_Interp *);
|
|
Tcl_StaticPackage(NULL, "Blt", Blt_Init, Blt_SafeInit);
|
|
}
|
|
#endif
|
|
|
|
#ifdef WITH_TOGL
|
|
{
|
|
/* XXX I've heard rumors that this doesn't work */
|
|
extern int Togl_Init(Tcl_Interp *);
|
|
/* XXX Is there no Togl_SafeInit? */
|
|
Tcl_StaticPackage(NULL, "Togl", Togl_Init, NULL);
|
|
}
|
|
#endif
|
|
|
|
#ifdef WITH_XXX
|
|
|
|
#endif
|
|
return TCL_OK;
|
|
}
|