* macosx/tkMacOSXCarbonEvents.c: add window event target carbon event

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events; move all
	* macosx/tkMacOSXNotify.c:	 remaining events except for
	* macosx/tkMacOSXWindowEvent.c:	 kEventClassKeyboard from dispatcher to
	application event handler; pass event handler callRef downstream; fix
	debug event tracing; process all tcl event types in carbon event timer;
	delay carbon event timer first fire; add TkMacOSXTrackingLoop() to mark
	enter/exit of event tracking loop during which all tcl events but only
	carbon update events should be processed by the timer (replaces various
	calls to Tcl_SetServiceMode()); rename TkMacOSXReceiveAndProcessEvent()
	to TkMacOSXReceiveAndDispatchEvent(), move it from tkMacOSXEvent.c to
	tkMacOSXCarbonEvents.c and modify it to dequeue only update events
	during a tracking loop; add TkMacOSXRunTclEventLoop() to standardize
	the various ways in use to run the tcl event loop; add handling of
	kEventClassAppearance events (for ScrollBarVariantChanged event).

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXTrackingLoop() around
	* macosx/tkMacOSXEvent.c:	blocking API that puts up modal dialogs
	* macosx/tkMacOSXMenu.c:	or when entering/exiting menu/control
	* macosx/tkMacOSXMouseEvent.c:	tracking, window dragging and other
	* macosx/tkMacOSXScale.c:	mouse tracking loops.
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDialog.c:	use new TkMacOSXRunTclEventLoop()
	* macosx/tkMacOSXScale.c:	instead of Tcl_DoOneEvent(),
	* macosx/tkMacOSXScrlbr.c:	Tcl_ServiceAll(), TclServiceIdle()
	* macosx/tkMacOSXWindowEvent.c:	and Tcl_GlobalEval("update idletasks").

	* macosx/tkMacOSXColor.c: make available as Tk system colors all
	* macosx/tkMacOSXPort.h:  appearance manager brushes, text colors and
	backgrounds with new and legacy names, as well as the fully transparent
	color "systemTransparent"; add TkMacOSXSetColorIn{Port,Context}() to
	directly set an X pixel color value in the current QD port resp. the
	given CG context without requiring passage through rgb representation
	(lossy for most system colors); modernize/remove Classic-era code;
	replace crufty strcmp() elseifs by Tcl_GetIndexFromObjStruct().

	* macosx/tkMacOSXButton.c:	use new TkMacOSXSetColorInPort()
	* macosx/tkMacOSXDraw.c:	instead of setting rgb color directly
	* macosx/tkMacOSXMenubutton.c:	to allow for non-rgb system colors.

	* macosx/tkMacOSXCursor.c: implement "none" cursor as on other
	platforms [Patch 1615427]; add all missing appearance manager cursors.

	* macosx/tkMacOSXDefault.h: set SELECT_FG_COLORs to None to match aqua
	L&F; use standard system color names; use new 'menu' system font;
	correct default scrollbar width.

	* macosx/tkMacOSXDraw.c:	standardize initialization, use and
	* macosx/tkMacOSXInt.h:		emptying of various static temp rgns
	* macosx/tkMacOSXRegion.c:	onto two global RgnHandles; in debug
	* macosx/tkMacOSXSubwindows.c:	builds, verify emptiness of these temp
	* macosx/tkMacOSXWindowEvent.c:	rgns before use.

	* macosx/tkMacOSXDraw.c: add TkMacOSX{Setup,Restore}DrawingContext() to
	* macosx/tkMacOSXInt.h:  abstract common setup & teardown of drawing
	environment (for both CG and QD); save/restore QD theme drawing state;
	handle GC clip region; add TkpClipDrawableToRect() to allow clipped
	drawing into drawable regardless of GC used; use new system color
	"systemWindowHeaderBackground" to setup background in themed toplevels;
	correct implementation of TkMacOSXMakeStippleMap().

	* macosx/tkMacOSXEntry.c: use new TkMacOSXSetupDrawingContext() and
	* macosx/tkMacOSXFont.c:  TkMacOSXRestoreDrawingContext() instead of
	various setup/teardown procs like TkMacOSX{SetUp,Release}CGContext(),
	TkMacOSXQuarz{Start,End}Draw(), TkMacOSXSetUpGraphicsPort() etc.

	* macosx/tkMacOSXEmbed.c: add CG context and drawable clip rgn fields
	* macosx/tkMacOSXInt.h:   to MacDrawable struct.
	* macosx/tkMacOSXSubwindows.c:

	* macosx/tkMacOSXDialog.c: make -parent option of tk_getOpenFile et al.
	use the sheet version of NavServices dialogs; ensure native parent win
	exists before using StandardSheet API for tk_messageBox [Bug 1677611];
	force sheets to behave like app-modal dialogs via WindowModality() API;
	use more modern ColorPicker API.

	* macosx/tkAboutDlg.r: use themed movable modal dialog, fix (c) year.

	* macosx/tkMacOSXEntry.c:  take xOff/yOff of MacDrawable into account
	when computing locations/bounds to ensure correct posititioning when
	not drawing into intermediate pixmap.

	* macosx/tkMacOSXFont.c: use appearance manager API to map system font
	* macosx/tkMacOSXFont.h: names to TkFonts; add "menu" system font for
	menu item text drawing from MDEF; disable broken QD stippling.

	* macosx/tkMacOSXMenu.c:		large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	MDEF and related code that
	* unix/Makefile.in:			restores many longtime-MIA
	features to working order (e.g. images, custom colors & fonts in menus
	etc); implement compound menu items; use Appearance Mgr and ThemeText
	APIs to mimic native MDEF as closely as possible when default "menu"
	system font is used; remove now obsolete SICN drawing code and
	resources.

	* macosx/tkMacOSXCarbonEvents.c: handle additional menu carbon events
	* macosx/tkMacOSXEvent.c:	 in order to support <<MenuSelect>> in
	* macosx/tkMacOSXMenu.c:	 the menubar and in menus that are not
	* macosx/tkMacOSXMenus.c:	 using the custom MDEF [Bug 1620826];
	fix early and missing clearing of current Tk active menu entry; fix
	extraneous sending of <<MenuSelect>> during active menu entry clearing.

	* macosx/tkMacOSXMouseEvent.c: add support for async window dragging by
	the window server; set the corresponding window attribute by default.

	* macosx/tkMacOSXMouseEvent.c: rationalized handling order of
	non-mousedown events; add TkMacOSXModifierState() to retrieve the
	current key modifiers in carbon format.

	* macosx/tkMacOSXScrlbr.c: use appearance manager API to retrieve
	scrollbar component metrics; add awareness of multiple possibilites for
	scrollbar arrow position in aqua and handle user changes to arrow
	position pref; handle difference in metrics of small & large scrollbar
	variants; handle aqua "jump to here" scrollbar behaviour; correct
	computation of scroll view size and position; enforce min scrollbar
	height to avoid scrollbar component overlap; erase scrollbar area
	outside of standard width; remove broken auto-adjust code; account for
	window class when leaving space for grow box; remove code to manually
	draw grow box; use modern API for thumb scroll proc; replace
	HiliteControl() by modern API; replace control mgr constants with
	appearance mgr equivalents.

	* macosx/tkMacOSXSubwindows.c: use SetWindowBounds() API instead of
	SizeWindow(); invalidate clip regions after X{Map,Unmap}Window as fix
	for [Bug 940117] made them dependent on mapping state; remove unneeded
	calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD port;
	use native-endian pixmap on intel; remove obsolete pixmap pix locking.

	* macosx/tkMacOSXWindowEvent.c: handle only the first of a batch of
	kEventAppAvailableWindowBoundsChanged events sent per transaction;
	handle kEventWindowBoundsChanged event to support live window resizing
	and centralized sending of location/size changed ConfigureNotify
	events; ensure HIGrowBox is redrawn after bounds change; constrain
	window after dragging to ensure titlebar is not inacessible
	offscreen or under dock/menubar; handle kEventWindowGetRegion and
	kEventWindowDrawContent for transparent windows to mark resp. paint
	content region as transparent; handle kEventWindowConstrain for
	fullscreen windows to ensure bounds match new screen size; enter/exit
	fullscreen UIMode upon activation/deactivation of fullscreen window.

	* macosx/tkMacOSXWm.c: use live-resize and async-drag carbon window
	* macosx/tkMacOSXWm.h: attributes for toplevels by default; implement
	new [wm attributes] -topmost, -transparent and -fullscreen; refactor
	WmAttributesCmd() parallelling the tkUnixWm.c implementation, use thus
	factored proc to set proxy icon from [wm iconbitmap]; dynamically
	determine default values for toplevel min and max sizes (similar to
	tkWinWm.c impl): min sizes depend on window class & attributes to
	ensure visibility of all titlebar widgets and grow box, max sizes
	depend on maximal window bounds for all active displays; factor out
	code that puts into effect changes to master or override_redirect; use
	RepositionWindow() API to determine staggered initial window bounds;
	correct resize limit calculations, handle gridding and use modern
	resize API in TkMacOSXGrowToplevel(); remove sending of ConfigureNotify
	after resize or zoom (now handled by BoundsChanged handler); correct
	composite carbon window attribute handling, remove currently unusable
	attributes and add new attributes in [tk::unsupported::MacWindowStyle];
	ensure validity of window class and attributes before use; apply
	changes to window class when handling carbon window attribute changes
	(if HIWindowChangeClass() API available); add debug build warning
	message when deprecated window style is used instead of window class;
	use transparent HIGrowBox for resizable windows; avoid unnecessary
	calls to window structure width API; use tcl time API in TkpGetMS();
	add TkMacOSXEnterExitFullscreen() to enter/exit UIMode with dock and
	menubar hidden; restrict wmTracing output to debug builds; remove
	unneeded calls to TkMacOSXInvalClipRgns() and unnecessary setting of QD
	port; workaround GetWindowStructureWidths() Carbon bug (bogus results
	for never-mapped floating windows).

	* macosx/tkMacOSXXStubs.c (TkMacOSXDisplayChanged): add maximal window
	bounds field to Screen record (in ext_data), computed as the union of
	available window positioning bounds of all graphics devices (displays).

	* macosx/tkMacOSXBitmap.c: fix macRoman encoding leak.
	* macosx/tkMacOSXCursor.c:

	* macosx/tkMacOSXDebug.c (TkMacOSXCarbonEventToAscii): use static
	* macosx/tkMacOSXDebug.h: buffer to simplify callers; const fixes.

	* macosx/tkMacOSXBitmap.c: use more efficient QDSwapPort() instead of
	* macosx/tkMacOSXButton.c: GetPort()/SetPort()/GetGWorld()/SetGWorld().
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXColor.c: use kHIToolboxVersionNumber for runtime OS
	* macosx/tkMacOSXEntry.c: version check rather than Gestalt() etc.
	* macosx/tkMacOSXInt.h:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXDraw.c: remove obsolete and now incorrect
	* macosx/tkMacOSXInt.h:  tkMenuCascadeRgn clipping code.
	* macosx/tkMacOSXMenu.c:

	* macosx/tkMacOSXHLEvents.c: replace Tcl_GlobalEval() resp. Tcl_Eval()
	* macosx/tkMacOSXScrlbr.c:   by Tcl_EvalEx().
	* macosx/tkMacOSXInit.c:

	* macosx/tkMacOSXInit.c (TkpInit): reorder initialization steps.

	* macosx/tkMacOSXKeyEvent.c: remove pre-10.2 support.

	* macosx/tkMacOSXMenus.c: remove now useless call to
	TkMacOSXHandleTearoffMenu(); use \x.. quoting for non-latin1 macroman
	literar chars to allow file to be edited as utf-8.

	* macosx/tkMacOSXScale.c: replace TrackControl() by modern
	* macosx/tkMacOSXScrlbr.c: HandleControlClick() API (using new
	TkMacOSXModifierState()).

	* macosx/tkMacOSXInt.h:		move all constant #defines needed to
	* macosx/tkMacOSXColor.c:	support building on older OS X releases
	* macosx/tkMacOSXEvent.h:	to a central location in tkMacOSXInt.h.
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWm.c:

	* macosx/tkMacOSXInt.h:		 add ChkErr() macro to factor out
	* macosx/tkMacOSXButton.c:	 Carbon OSStatus return value checking
	* macosx/tkMacOSXCarbonEvents.c: and TkMacOSXDbgMsg() macro to factour
	* macosx/tkMacOSXClipboard.c:	 out debug message output; use these
	* macosx/tkMacOSXColor.c:	 macros to replace #ifdef TK_MAC_DEBUG
	* macosx/tkMacOSXCursor.c:	 blocks & direct printing to stderr,
	* macosx/tkMacOSXDebug.c:	 and to do additional OSStatus return
	* macosx/tkMacOSXDialog.c:	 checking, and to standardize OSStatus
	* macosx/tkMacOSXDraw.c:	 usage.
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXFont.c:
	* macosx/tkMacOSXHLEvents.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXMenus.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXScrlbr.c:
	* macosx/tkMacOSXSubwindows.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXSend.c:	remove duplicate/unused declarations.
	* macosx/tkMacOSXXStubs.c:

	* macosx/tkMacOSXDebug.c:	const fixes.
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXTest.c:
	* macosx/tkMacOSXWm.c:
	* macosx/tkMacOSXXStubs.c:

	* macosx/Wish-Info.plist.in: add tcl document extensions/mime types and
	LSMinimumSystemVersion, LSRequiresCarbon & NSAppleScriptEnabled keys.

	* macosx/tkMacOSXAETE.r:	fix whitespace.
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/Makefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/tkMacOSX.h:

1 files changed, 185 insertions, 165 deletions

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 85d4aa5..524306e 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -1,17 +1,17 @@
-/* 
+/*
  * tkMacOSXInit.c --
  *
- *        This file contains Mac OS X -specific interpreter initialization
- *        functions.
+ *	This file contains Mac OS X -specific interpreter initialization
+ *	functions.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
- * Copyright (c) 2005-2006 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.20 2006/11/24 19:04:07 hobbs Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.21 2007/04/29 02:26:49 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -40,13 +40,13 @@
 /*
  * The following structures are used to map the script/language codes of a
  * font to the name that should be passed to Tcl_GetEncoding() to obtain
- * the encoding for that font.  The set of numeric constants is fixed and
+ * the encoding for that font. The set of numeric constants is fixed and
  * defined by Apple.
  */
 
 typedef struct Map {
     CFStringEncoding numKey;
-    char *strKey;
+    const char *strKey;
 } Map;
 
 static Map scriptMap[] = {
@@ -82,7 +82,7 @@ static Map scriptMap[] = {
     {smEastEurRoman,	"macCentEuro"},
     {smVietnamese,	"macVietnam"},
     {smExtArabic,	"macSindhi"},
-    {0, 		NULL}
+    {0,			NULL}
 };
 
 Tcl_Encoding TkMacOSXCarbonEncoding = NULL;
@@ -93,79 +93,60 @@ Tcl_Encoding TkMacOSXCarbonEncoding = NULL;
  */
 static char scriptPath[PATH_MAX + 1] = "";
 
+
 /*
  *----------------------------------------------------------------------
  *
  * TkpInit --
  *
- *        Performs Mac-specific interpreter initialization related to the
- *        tk_library variable.
+ *	Performs Mac-specific interpreter initialization related to the
+ *	tk_library variable.
  *
  * Results:
- *        Returns a standard Tcl result.  Leaves an error message or result
- *        in the interp's result.
+ *	Returns a standard Tcl result. Leaves an error message or result
+ *	in the interp's result.
  *
  * Side effects:
- *        Sets "tk_library" Tcl variable, runs "tk.tcl" script.
+ *	Sets "tk_library" Tcl variable, runs "tk.tcl" script.
  *
  *----------------------------------------------------------------------
  */
 
 int
-TkpInit(interp)
-    Tcl_Interp *interp;
+TkpInit(
+    Tcl_Interp *interp)
 {
     static char tkLibPath[PATH_MAX + 1];
-    static int tkMacOSXInitialized = false;
+    static int tkMacOSXInitialized = 0;
 
     Tk_MacOSXSetupTkNotifier();
 
-    /* 
+    /*
      * Since it is possible for TkInit to be called multiple times
-     * and we don't want to do the initialization multiple times
+     * and we don't want to do the following initialization multiple times
      * we protect against doing it more than once.
      */
 
-    if (tkMacOSXInitialized == false) {
+    if (!tkMacOSXInitialized) {
+	int bundledExecutable = 0;
+	CFBundleRef bundleRef;
+	CFURLRef bundleUrl = NULL;
 	CFStringEncoding encoding;
-	char *encodingStr = NULL;
+	const char *encodingStr = NULL;
 	int  i;
 
-	tkMacOSXInitialized = true;
-
-	TkMacOSXInitAppleEvents(interp);
-	TkMacOSXInitCarbonEvents(interp);
-	TkMacOSXInitMenus(interp);
-	TkMacOSXUseAntialiasedText(interp, TRUE);
-	TkMacOSXInitCGDrawing(interp, TRUE, 0);
-	TkMacOSXInitKeyboard(interp);
-
-	encoding = CFStringGetSystemEncoding();
-
-	for (i = 0; scriptMap[i].strKey != NULL; i++) {
-	    if (scriptMap[i].numKey == encoding) {
-		encodingStr = scriptMap[i].strKey;
-		break;
-	    }
-	}
-	if (encodingStr == NULL) {
-	    encodingStr = "macRoman";
-	}
-
-	TkMacOSXCarbonEncoding = Tcl_GetEncoding (NULL, encodingStr);
-	if (TkMacOSXCarbonEncoding == NULL) {
-	    TkMacOSXCarbonEncoding = Tcl_GetEncoding (NULL, NULL);
-	}
+	tkMacOSXInitialized = 1;
 
 	/*
-	 * When Tk is in a framework, force tcl_findLibrary to look in the 
+	 * When Tk is in a framework, force tcl_findLibrary to look in the
 	 * framework scripts directory.
 	 * FIXME: Should we come up with a more generic way of doing this?
 	 */
 
 #ifdef TK_FRAMEWORK
 	if (Tcl_MacOSXOpenVersionedBundleResources(interp,
-		"com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 1, PATH_MAX, tkLibPath) != TCL_OK)
+		"com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 1, PATH_MAX,
+		tkLibPath) != TCL_OK)
 #endif
 	    {
 	    /* Tk.framework not found, check if resource file is open */
@@ -181,12 +162,13 @@ TkpInit(interp)
 		char fileName[L_tmpnam + 15];
 		uint32_t i, n;
 
-		/* Get resource data from __tk_rsrc section of tk library file */
+		/* Get resource data from __tk_rsrc section of tk dylib file*/
 		n = _dyld_image_count();
 		for (i = 0; i < n; i++) {
 		    image = _dyld_get_image_header(i);
 		    if (image) {
-			data = getsectdatafromheader(image, SEG_TEXT, "__tk_rsrc", &size);
+			data = getsectdatafromheader(image, SEG_TEXT,
+					"__tk_rsrc", (void*)&size);
 			if (data) {
 			    data += _dyld_get_image_vmaddr_slide(i);
 			    break;
@@ -194,26 +176,32 @@ TkpInit(interp)
 		    }
 		}
 		while (data) {
-		    OSStatus err;
 		    FSRef ref;
 		    SInt16 refNum;
 
-		    /* Write resource data to temporary file and open it */
+		    /*
+		     * Write resource data to temporary file and open it.
+		     */
+
 		    strcpy(fileName, P_tmpdir);
 		    if (fileName[strlen(fileName) - 1] != '/') {
 			strcat(fileName, "/");
 		    }
 		    strcat(fileName, "tkMacOSX_XXXXXX");
 		    fd = mkstemp(fileName);
-		    if (fd == -1) break;
+		    if (fd == -1) {
+			break;
+		    }
 		    fcntl(fd, F_SETFD, FD_CLOEXEC);
-		    if (write(fd, data, size) == -1) break;
-		    err = FSPathMakeRef((unsigned char*)fileName, &ref, NULL);
-		    if (err != noErr) break;
-		    err = FSOpenResourceFile(&ref, 0, NULL, fsRdPerm, &refNum);
-#ifdef TK_MAC_DEBUG
-		    if (err != noErr) fprintf(stderr,"FSOpenResourceFile error %ld\n",err);
-#endif
+		    if (write(fd, data, size) == -1) {
+			break;
+		    }
+		    if(ChkErr(FSPathMakeRef, (unsigned char*)fileName, &ref,
+			    NULL) != noErr) {
+			break;
+		    }
+		    ChkErr(FSOpenResourceFile, &ref, 0, NULL, fsRdPerm,
+			    &refNum);
 		    break;
 		}
 		if (fd != -1) {
@@ -225,6 +213,100 @@ TkpInit(interp)
 	}
 
 	/*
+	 * If we are loaded into an executable that is not a bundled
+	 * application, the window server does not let us come to the
+	 * foreground. For such an executable, notify the window server that
+	 * we are now a full GUI application.
+	 */
+
+	/* Check whether we are a bundled executable: */
+	bundleRef = CFBundleGetMainBundle();
+	if (bundleRef) {
+	    bundleUrl = CFBundleCopyBundleURL(bundleRef);
+	}
+	if (bundleUrl) {
+	    /*
+	     * A bundled executable is two levels down from its main bundle
+	     * directory (e.g. Wish.app/Contents/MacOS/Wish), whereas an
+	     * unbundled executable's main bundle directory is just the
+	     * directory containing the executable. So to check whether we are
+	     * bundled, we delete the last three path components of the
+	     * executable's url and compare the resulting url with the main
+	     * bundle url.
+	     */
+	    int j = 3;
+	    CFURLRef url = CFBundleCopyExecutableURL(bundleRef);
+	    while (url && j--) {
+		CFURLRef parent = CFURLCreateCopyDeletingLastPathComponent(NULL,
+			url);
+		CFRelease(url);
+		url = parent;
+	    }
+	    if (url) {
+		bundledExecutable = CFEqual(bundleUrl, url);
+		CFRelease(url);
+	    }
+	    CFRelease(bundleUrl);
+	}
+
+	/* If we are not a bundled executable, notify the window server that
+	 * we are a foregroundable app. */
+	if (!bundledExecutable) {
+	    OSStatus err = procNotFound;
+	    ProcessSerialNumber psn = { 0, kCurrentProcess };
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
+	    if (1
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1030
+		    && TransformProcessType != NULL
+#endif
+	    ) {
+		err = ChkErr(TransformProcessType, &psn,
+			kProcessTransformToForegroundApplication);
+	    }
+#endif
+#if MAC_OSX_TK_USE_CPS_SPI
+	    if (err != noErr) {
+		/*
+		 * When building or running on 10.2 or when the above fails,
+		 * attempt to use undocumented CPS SPI to notify the window
+		 * server. Load the SPI symbol dynamically, so that we don't
+		 * break if it ever disappears or changes its name.
+		 */
+		TkMacOSXInitNamedSymbol(CoreGraphics, OSStatus,
+			CPSEnableForegroundOperation, ProcessSerialNumberPtr);
+		if (CPSEnableForegroundOperation) {
+		    ChkErr(CPSEnableForegroundOperation, &psn);
+		}
+	    }
+#endif /* MAC_OSX_TK_USE_CPS_SPI */
+	}
+
+	TkMacOSXInitAppleEvents(interp);
+	TkMacOSXInitCarbonEvents(interp);
+	TkMacOSXInitMenus(interp);
+	TkMacOSXUseAntialiasedText(interp, TRUE);
+	TkMacOSXInitCGDrawing(interp, TRUE, 0);
+	TkMacOSXInitKeyboard(interp);
+
+	encoding = CFStringGetSystemEncoding();
+
+	for (i = 0; scriptMap[i].strKey != NULL; i++) {
+	    if (scriptMap[i].numKey == encoding) {
+		encodingStr = scriptMap[i].strKey;
+		break;
+	    }
+	}
+	if (encodingStr == NULL) {
+	    encodingStr = "macRoman";
+	}
+
+	TkMacOSXCarbonEncoding = Tcl_GetEncoding(NULL, encodingStr);
+	if (TkMacOSXCarbonEncoding == NULL) {
+	    TkMacOSXCarbonEncoding = Tcl_GetEncoding(NULL, NULL);
+	}
+
+	/*
 	 * 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 Tk based console interpreter.
@@ -232,18 +314,22 @@ TkpInit(interp)
 
 	if (!isatty(0)) {
 	    struct stat st;
+
 	    if (fstat(0, &st) || (S_ISCHR(st.st_mode) && st.st_blocks == 0)) {
 		Tk_InitConsoleChannels(interp);
 		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
 		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
 		Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
+
 		/*
 		 * Only show the console if we don't have a startup script
 		 * and tcl_interactive hasn't been set already.
 		 */
+
 		if (TclGetStartupScriptFileName() == NULL) {
-		    CONST char *intvar =
-			Tcl_GetVar(interp, "tcl_interactive", TCL_GLOBAL_ONLY);
+		    const char *intvar = Tcl_GetVar(interp,
+			    "tcl_interactive", TCL_GLOBAL_ONLY);
+
 		    if (intvar == NULL) {
 			Tcl_SetVar(interp, "tcl_interactive", "1",
 				TCL_GLOBAL_ONLY);
@@ -254,74 +340,6 @@ TkpInit(interp)
 		}
 	    }
 	}
-
-	/*
-	 * If we are loaded into an executable that is not a bundled
-	 * application, the window server does not let us come to the
-	 * foreground.  For such an executable, notify the window server that
-	 * we are now a full GUI application.
-	 */
-	{
-	    /* Check whether we are a bundled executable: */
-	    int bundledExecutable = 0;
-	    CFBundleRef bundleRef = CFBundleGetMainBundle();
-	    CFURLRef bundleUrl = NULL;
-	    if (bundleRef) {
-		bundleUrl = CFBundleCopyBundleURL(bundleRef);
-	    }
-	    if (bundleUrl) {
-		/*
-		 * A bundled executable is two levels down from its main bundle
-		 * directory (e.g. Wish.app/Contents/MacOS/Wish), whereas
-		 * an unbundled executable's main bundle directory is just
-		 * the directory containing the executable.
-		 * So to check whether we are bundled, we delete the last three
-		 * path components of the executable's url and compare the
-		 * resulting url with the main bundle url.
-		 */
-		int j = 3;
-		CFURLRef url = CFBundleCopyExecutableURL(bundleRef);
-		while (url && j--) {
-		    CFURLRef parent = CFURLCreateCopyDeletingLastPathComponent(NULL, url);
-		    CFRelease(url);
-		    url = parent;
-		}
-		if (url) {
-		    bundledExecutable = CFEqual(bundleUrl, url);
-		    CFRelease(url);
-		}
-		CFRelease(bundleUrl);
-	    }
-
-	    /* If we are not a bundled executable, notify the window server
-	     * that we are a foregroundable app. */
-	    if (!bundledExecutable) {
-		OSStatus err = procNotFound;
-		ProcessSerialNumber psn = { 0, kCurrentProcess };
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
-		if (TransformProcessType != NULL) {
-		    err = TransformProcessType(&psn,
-			    kProcessTransformToForegroundApplication);
-		}
-#endif
-#if MAC_OSX_TK_USE_CPS_SPI
-		if (err != noErr) {
-		    /*
-		     * When building or running on 10.2 or when the above
-		     * fails, attempt to use undocumented CPS SPI to notify
-		     * the window server. Load the SPI symbol dynamically, so
-		     * that we don't break if it ever disappears or changes
-		     * its name.
-		     */
-		    TkMacOSXInitNamedSymbol(CoreGraphics, OSErr,
-			    CPSEnableForegroundOperation, ProcessSerialNumberPtr);
-		    if (CPSEnableForegroundOperation) {
-			CPSEnableForegroundOperation(&psn);
-		    }
-		}
-#endif /* MAC_OSX_TK_USE_CPS_SPI */
-	    }
-	}
     }
 
     if (tkLibPath[0] != '\0') {
@@ -341,25 +359,25 @@ TkpInit(interp)
  *
  * TkpGetAppName --
  *
- *        Retrieves the name of the current application from a platform
- *        specific location.  For Unix, the application name is the tail
- *        of the path contained in the tcl variable argv0.
+ *	Retrieves the name of the current application from a platform
+ *	specific location. For Unix, the application name is the tail
+ *	of the path contained in the tcl variable argv0.
  *
  * Results:
- *        Returns the application name in the given Tcl_DString.
+ *	Returns the application name in the given Tcl_DString.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkpGetAppName(interp, namePtr)
-    Tcl_Interp *interp;
-    Tcl_DString *namePtr;        /* A previously initialized Tcl_DString. */
+TkpGetAppName(
+    Tcl_Interp *interp,
+    Tcl_DString *namePtr)	/* A previously initialized Tcl_DString. */
 {
-    CONST char *p, *name;
+    const char *p, *name;
 
     name = Tcl_GetVar(interp, "argv0", TCL_GLOBAL_ONLY);
     if ((name == NULL) || (*name == 0)) {
@@ -378,22 +396,22 @@ TkpGetAppName(interp, namePtr)
  *
  * TkpDisplayWarning --
  *
- *        This routines is called from Tk_Main to display warning
- *        messages that occur during startup.
+ *	This routines is called from Tk_Main to display warning
+ *	messages that occur during startup.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Generates messages on stdout.
+ *	Generates messages on stdout.
  *
  *----------------------------------------------------------------------
  */
 
 void
-TkpDisplayWarning(msg, title)
-    CONST char *msg;                  /* Message to be displayed. */
-    CONST char *title;                /* Title of warning. */
+TkpDisplayWarning(
+    CONST char *msg,		/* Message to be displayed. */
+    CONST char *title)		/* Title of warning. */
 {
     Tcl_Channel errChannel = Tcl_GetStdChannel(TCL_STDERR);
     if (errChannel) {
@@ -410,18 +428,18 @@ TkpDisplayWarning(msg, title)
  * TkMacOSXDefaultStartupScript --
  *
  *
- *        On MacOS X, we look for a file in the Resources/Scripts
- *        directory called AppMain.tcl and if found, we set argv[1] to
- *        that, so that the rest of the code will find it, and add the
- *        Scripts folder to the auto_path.  If we don't find the startup
- *        script, we just bag it, assuming the user is starting up some
- *        other way.
+ *	On MacOS X, we look for a file in the Resources/Scripts
+ *	directory called AppMain.tcl and if found, we set argv[1] to
+ *	that, so that the rest of the code will find it, and add the
+ *	Scripts folder to the auto_path. If we don't find the startup
+ *	script, we just bag it, assuming the user is starting up some
+ *	other way.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        TclSetStartupScriptFileName() called when AppMain.tcl found.
+ *	TclSetStartupScriptFileName() called when AppMain.tcl found.
  *
  *----------------------------------------------------------------------
  */
@@ -435,9 +453,9 @@ TkMacOSXDefaultStartupScript(void)
 
     if (bundleRef != NULL) {
 	CFURLRef appMainURL;
-	appMainURL = CFBundleCopyResourceURL(bundleRef, 
-		CFSTR("AppMain"), 
-		CFSTR("tcl"), 
+	appMainURL = CFBundleCopyResourceURL(bundleRef,
+		CFSTR("AppMain"),
+		CFSTR("tcl"),
 		CFSTR("Scripts"));
 
 	if (appMainURL != NULL) {
@@ -450,7 +468,7 @@ TkMacOSXDefaultStartupScript(void)
 		scriptFldrURL = CFURLCreateCopyDeletingLastPathComponent(
 			NULL, appMainURL);
 		if (scriptFldrURL != NULL) {
-		    CFURLGetFileSystemRepresentation(scriptFldrURL, 
+		    CFURLGetFileSystemRepresentation(scriptFldrURL,
 			    true, (unsigned char*) scriptPath, PATH_MAX);
 		    CFRelease(scriptFldrURL);
 		}
@@ -466,23 +484,25 @@ TkMacOSXDefaultStartupScript(void)
  * TkMacOSXGetNamedSymbol --
  *
  *
- *        Dynamically acquire address of a named symbol from a loaded
- *        dynamic library, so that we can use API that may not be
- *        available on all OS versions.
- *        If module is non-NULL and not the empty string, use twolevel
- *        namespace lookup.
+ *	Dynamically acquire address of a named symbol from a loaded
+ *	dynamic library, so that we can use API that may not be
+ *	available on all OS versions.
+ *	If module is non-NULL and not the empty string, use twolevel
+ *	namespace lookup.
  *
  * Results:
- *        Address of given symbol or NULL if unavailable.
+ *	Address of given symbol or NULL if unavailable.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
 MODULE_SCOPE void*
-TkMacOSXGetNamedSymbol(const char* module, const char* symbol)
+TkMacOSXGetNamedSymbol(
+    const char* module,
+    const char* symbol)
 {
     NSSymbol nsSymbol = NULL;
     if (module && *module) {