diff options
| author | das <das> | 2007-03-07 23:48:08 (GMT) |
|---|---|---|
| committer | das <das> | 2007-03-07 23:48:08 (GMT) |
| commit | 7614214a0526527a62f6cc88b6560f003397c1a3 (patch) | |
| tree | badb4612c17d0114c5c4597e380a51c05a0867ab /generic/tkMain.c | |
| parent | 71343a18cb63f16e62500a7a3f17942ccd841684 (diff) | |
| download | tk-7614214a0526527a62f6cc88b6560f003397c1a3.zip tk-7614214a0526527a62f6cc88b6560f003397c1a3.tar.gz tk-7614214a0526527a62f6cc88b6560f003397c1a3.tar.bz2 | |
* generic/tkMain.c (Tk_MainEx): replicate macosx-specific code from
TkpInit() that ensures the console window appears when wish is started
from the OS X Finder (i.e. with stdin == /dev/null), jeffh's 2006-11-24
change rendered the corresponding code in TkpInit() ineffective in wish
because Tk_MainEx() sets tcl_interactive before calling TkpInit().
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol): add fix for
libraries loaded with a DYLD_IMAGE_SUFFIX.
* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check.
* unix/configure: autoconf-2.13
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 0e87228..41603d7 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.15.2.5 2006/09/25 17:28:20 andreas_kupries Exp $ + * RCS: @(#) $Id: tkMain.c,v 1.15.2.6 2007/03/07 23:48:13 das Exp $ */ #include <ctype.h> @@ -103,7 +103,7 @@ Tk_MainEx(argc, argv, appInitProc, interp) Tcl_Interp *interp; { Tcl_Obj *argvPtr; - int code; + int code, nullStdin = 0; size_t length; Tcl_Channel inChannel, outChannel; Tcl_DString appName; @@ -196,6 +196,7 @@ Tk_MainEx(argc, argv, appInitProc, interp) * Set the "tcl_interactive" variable. */ +#ifdef __WIN32__ /* * For now, under Windows, we assume we are not running as a console mode * app, so we need to use the GUI console. In order to enable this, we @@ -203,7 +204,6 @@ Tk_MainEx(argc, argv, appInitProc, interp) * way to do it. */ -#ifdef __WIN32__ handle = GetStdHandle(STD_INPUT_HANDLE); if ((handle == INVALID_HANDLE_VALUE) || (handle == 0) @@ -227,9 +227,22 @@ Tk_MainEx(argc, argv, appInitProc, interp) #else tsdPtr->tty = isatty(0); #endif +#if defined(MAC_OSX_TK) + /* + * On TkAqua, if we don't have a TTY and stdin is a special character file + * of length 0, (e.g. /dev/null, which is what Finder sets when double + * clicking Wish) then use the GUI console. + */ + + if (!tsdPtr->tty) { + struct stat st; + + nullStdin = fstat(0, &st) || (S_ISCHR(st.st_mode) && !st.st_blocks); + } +#endif Tcl_SetVar(interp, "tcl_interactive", - ((TclGetStartupScriptFileName() == NULL) - && tsdPtr->tty) ? "1" : "0", TCL_GLOBAL_ONLY); + ((TclGetStartupScriptFileName() == NULL) && (tsdPtr->tty + || nullStdin)) ? "1" : "0", TCL_GLOBAL_ONLY); /* * Invoke application-specific initialization. |