diff options
| author | marc_culler <marc.culler@gmail.com> | 2020-09-20 04:30:26 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2020-09-20 04:30:26 (GMT) |
| commit | e1716fd8b1debf155c619ae32316de18418dc25b (patch) | |
| tree | af8c5b2e5398fa4d244b3c36de510e2b2945c40f /macosx | |
| parent | 3d4ce1dd066a78e295cf5ddc7ae6e30ed057d3f6 (diff) | |
| download | tk-e1716fd8b1debf155c619ae32316de18418dc25b.zip tk-e1716fd8b1debf155c619ae32316de18418dc25b.tar.gz tk-e1716fd8b1debf155c619ae32316de18418dc25b.tar.bz2 | |
Don't open a console when running Wish from the command line; further simplification.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index c4ae077..d77da23 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -284,7 +284,6 @@ TkpInit( if (!initialized) { struct stat st; - Bool isBeingLaunched; Bool shouldOpenConsole = NO; /* @@ -296,16 +295,6 @@ TkpInit( #endif initialized = 1; - fstat(0, &st); - - /* - * If we don't have a TTY or stdin is a special character file of - * length 0, (e.g. /dev/null, which is what Finder sets when double - * clicking Wish) then we are being launched as a macOS app. - */ - - isBeingLaunched = (!isatty(0) || - (S_ISCHR(st.st_mode) && st.st_blocks == 0)); #ifdef TK_FRAMEWORK /* @@ -380,12 +369,12 @@ TkpInit( /* * Decide whether to open a console window. If the TK_CONSOLE * environment variable is not defined we only show the console if - * there is no startup script. + * stdin is not a tty and there is no startup script. */ if (getenv("TK_CONSOLE")) { shouldOpenConsole = YES; - } else if (Tcl_GetStartupScript(NULL) == NULL) { + } else if (!isatty(0) && Tcl_GetStartupScript(NULL) == NULL) { const char *intvar = Tcl_GetVar2(interp, "tcl_interactive", NULL, TCL_GLOBAL_ONLY); if (intvar == NULL) { @@ -402,7 +391,7 @@ TkpInit( if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) { return TCL_ERROR; } - } else if (isBeingLaunched) { + } else if (!isatty(0)) { /* * When launched as a macOS application with no console, |