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

	* macosx/tkMacOSXEvent.c:	 handler for all kEventClassWindow and
	* macosx/tkMacOSXEvent.h:	 kEventClassMouse events;
	* macosx/tkMacOSXNotify.c:	 move all 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
	* macosx/ttkMacOSXTheme.c: 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
	* macosx/ttkMacOSXTheme.c: 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; always draw with CG; remove QD
	dependent stippling algorithm; move most header declarations into the
	source file (as they were not used anywhere else).

	* macosx/tkMacOSXMenu.c:		 large-scale rewrite of custom
	* macosx/tkMacOSXMenu.r (removed):	 MDEF and related code that
	* macosx/Wish.xcode/project.pbxproj:	 restores many longtime-MIA
	* macosx/Wish.xcodeproj/project.pbxproj: features to working order
	* unix/Makefile.in:			 (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/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/ttkMacOSXTheme.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/Wish-Common.xcconfig: add Wish's Info.plist as __info_plist
	section to tktest; enable more warnings.

	* macosx/Wish.xcodeproj/project.pbxproj: add 'DebugMemCompile' build
	configuration that calls configure with --enable-symbols=all; disable
	configure check for __attribute__((__visibility__("hidden"))) in Debug
	configuration to restore availability of ZeroLink.

	* macosx/Wish-Common.xcconfig:	fix whitespace.
	* macosx/Wish-Debug.xcconfig:
	* macosx/Wish-Release.xcconfig:
	* macosx/tkMacOSXAETE.r:
	* macosx/tkMacOSXConfig.c:
	* macosx/tkMacOSXCursors.r:
	* macosx/tkMacOSXKeyboard.c:
	* macosx/tkMacOSXSend.c:
	* macosx/ttkMacOSXTheme.c:
	* macosx/tkMacOSXXCursors.r:
	* macosx/README:

	* macosx/GNUmakefile:		fix/add copyright and license refs.
	* macosx/Tk-Info.plist.in:
	* macosx/Wish-Info.plist.in:
	* macosx/Wish.xcode/project.pbxproj:
	* macosx/Wish.xcodeproj/project.pbxproj:
	* macosx/tkMacOSX.h:

1 files changed, 297 insertions, 214 deletions

diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 4355316..850d80f 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -1,8 +1,8 @@
-/* 
+/*
  * tkMacOSXHLEvents.c --
  *
- *        Implements high level event support for the Macintosh.  Currently, 
- *        the only event that really does anything is the Quit event.
+ *	Implements high level event support for the Macintosh. Currently,
+ *	the only event that really does anything is the Quit event.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.12 2006/05/12 18:18:36 das Exp $
+ * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.13 2007/04/23 21:24:33 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -20,12 +20,12 @@
  * This is a Tcl_Event structure that the Quit AppleEvent handler
  * uses to schedule the ReallyKillMe function.
  */
- 
+
 typedef struct KillEvent {
-    Tcl_Event header;           /* Information that is standard for
-                                 * all events. */
-    Tcl_Interp *interp;         /* Interp that was passed to the
-                                 * Quit AppleEvent */
+    Tcl_Event header;		/* Information that is standard for
+				 * all events. */
+    Tcl_Interp *interp;		/* Interp that was passed to the
+				 * Quit AppleEvent */
 } KillEvent;
 
 /*
@@ -49,68 +49,66 @@ static OSErr PrefsHandler(const AppleEvent * event, AppleEvent * reply,
 
 static int MissedAnyParameters(const AppleEvent *theEvent);
 static int ReallyKillMe(Tcl_Event *eventPtr, int flags);
-static OSErr FSRefToDString(const FSRef *fsref, Tcl_DString *ds);
+static OSStatus FSRefToDString(const FSRef *fsref, Tcl_DString *ds);
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXInitAppleEvents --
  *
- *        Initilize the Apple Events on the Macintosh.  This registers the
- *        core event handlers.
+ *	Initilize the Apple Events on the Macintosh. This registers the
+ *	core event handlers.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
-void 
+void
 TkMacOSXInitAppleEvents(
-    Tcl_Interp *interp)                /* Interp to handle basic events. */
+    Tcl_Interp *interp)		       /* Interp to handle basic events. */
 {
-    OSErr err;
-    AEEventHandlerUPP        OappHandlerUPP, RappHandlerUPP, OdocHandlerUPP,
-        PrintHandlerUPP, QuitHandlerUPP, ScriptHandlerUPP,
-        PrefsHandlerUPP;
+    AEEventHandlerUPP	     OappHandlerUPP, RappHandlerUPP, OdocHandlerUPP,
+	    PrintHandlerUPP, QuitHandlerUPP, ScriptHandlerUPP, PrefsHandlerUPP;
     static Boolean initialized = FALSE;
 
     if (!initialized) {
-        initialized = TRUE;
+	initialized = TRUE;
 
 	/*
 	 * Install event handlers for the core apple events.
 	 */
 	QuitHandlerUPP = NewAEEventHandlerUPP(QuitHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEQuitApplication,
 		QuitHandlerUPP, (long) interp, false);
 
 	OappHandlerUPP = NewAEEventHandlerUPP(OappHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEOpenApplication,
 		OappHandlerUPP, (long) interp, false);
 
 	RappHandlerUPP = NewAEEventHandlerUPP(RappHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEReopenApplication,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEReopenApplication,
 		RappHandlerUPP, (long) interp, false);
 
 	OdocHandlerUPP = NewAEEventHandlerUPP(OdocHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEOpenDocuments,
 		OdocHandlerUPP, (long) interp, false);
 
 	PrintHandlerUPP = NewAEEventHandlerUPP(PrintHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEPrintDocuments,
 		PrintHandlerUPP, (long) interp, false);
 
 	PrefsHandlerUPP = NewAEEventHandlerUPP(PrefsHandler);
-	err = AEInstallEventHandler(kCoreEventClass, kAEShowPreferences,
+	ChkErr(AEInstallEventHandler, kCoreEventClass, kAEShowPreferences,
 		PrefsHandlerUPP, (long) interp, false);
 
 	if (interp) {
 	    ScriptHandlerUPP = NewAEEventHandlerUPP(ScriptHandler);
-	    err = AEInstallEventHandler(kAEMiscStandards, kAEDoScript,
+	    ChkErr(AEInstallEventHandler, kAEMiscStandards, kAEDoScript,
 		ScriptHandlerUPP, (long) interp, false);
 	}
     }
@@ -121,13 +119,13 @@ TkMacOSXInitAppleEvents(
  *
  * TkMacOSXDoHLEvent --
  *
- *        Dispatch incomming highlevel events.
+ *	Dispatch incomming highlevel events.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Depends on the incoming event.
+ *	Depends on the incoming event.
  *
  *----------------------------------------------------------------------
  */
@@ -142,46 +140,63 @@ TkMacOSXDoHLEvent(
 /*
  *----------------------------------------------------------------------
  *
- * QuitHandler, OappHandler, etc. --
+ * QuitHandler --
  *
- *        These are the core Apple event handlers.
+ *	This is the 'quit' core Apple event handler.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
-static OSErr
-QuitHandler (
+
+OSErr
+QuitHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
 {
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
     KillEvent *eventPtr;
-    
+
     if (interp) {
 	/*
 	 * Call the exit command from the event loop, since you are not supposed
-	 * to call ExitToShell in an Apple Event Handler.  We put this at the head
+	 * to call ExitToShell in an Apple Event Handler. We put this at the head
 	 * of Tcl's event queue because this message usually comes when the Mac is
 	 * shutting down, and we want to kill the shell as quickly as possible.
 	 */
-	
+
 	eventPtr = (KillEvent *) ckalloc(sizeof(KillEvent));
 	eventPtr->header.proc = ReallyKillMe;
 	eventPtr->interp = interp;
-	 
+
 	Tcl_QueueEvent((Tcl_Event *) eventPtr, TCL_QUEUE_HEAD);
     }
     return noErr;
 }
 
-static OSErr 
-OappHandler (
+/*
+ *----------------------------------------------------------------------
+ *
+ * OappHandler --
+ *
+ *	This is the 'oapp' core Apple event handler.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+OappHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
@@ -196,8 +211,24 @@ OappHandler (
     return noErr;
 }
 
-static OSErr 
-RappHandler (
+/*
+ *----------------------------------------------------------------------
+ *
+ * RappHandler --
+ *
+ *	This is the 'rapp' core Apple event handler.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+RappHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
@@ -205,18 +236,34 @@ RappHandler (
     Tcl_CmdInfo dummy;
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
     ProcessSerialNumber thePSN = {0, kCurrentProcess};
-    OSStatus status = SetFrontProcess(&thePSN);
-    
+    OSStatus err = ChkErr(SetFrontProcess, &thePSN);
+
     if (interp &&
 	    Tcl_GetCommandInfo(interp, "::tk::mac::ReopenApplication", &dummy)) {
 	Tcl_GlobalEval(interp, "::tk::mac::ReopenApplication");
     }
-    return status;
+    return err;
 }
 
-/* Called when the user selects 'Preferences...' in MacOS X */
-static OSErr 
-PrefsHandler (
+/*
+ *----------------------------------------------------------------------
+ *
+ * PrefsHandler --
+ *
+ *	This is the 'pref' core Apple event handler.
+ *	Called when the user selects 'Preferences...' in MacOS X
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+PrefsHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
@@ -231,8 +278,24 @@ PrefsHandler (
     return noErr;
 }
 
-static OSErr 
-OdocHandler (
+/*
+ *----------------------------------------------------------------------
+ *
+ * OdocHandler --
+ *
+ *	This is the 'odoc' core Apple event handler.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+OdocHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
@@ -240,7 +303,7 @@ OdocHandler (
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
     AEDescList fileSpecList;
     FSRef file;
-    OSErr err;
+    OSStatus err;
     DescType type;
     Size actual;
     long count;
@@ -255,56 +318,73 @@ OdocHandler (
      * the open document procedure doesn't exist.
      */
 
-    if ((interp == NULL) || 
-            (Tcl_GetCommandInfo(interp, "::tk::mac::OpenDocument", &dummy)) == 0) {
-            return noErr;
+    if ((interp == NULL) ||
+	    (Tcl_GetCommandInfo(interp, "::tk::mac::OpenDocument", &dummy)) == 0) {
+	    return noErr;
     }
-    
+
     /*
      * If we get any errors wil retrieving our parameters
      * we just return with no error.
      */
 
-    err = AEGetParamDesc(event, keyDirectObject,
-            typeAEList, &fileSpecList);
+    err = ChkErr(AEGetParamDesc, event, keyDirectObject, typeAEList,
+	    &fileSpecList);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
     err = MissedAnyParameters(event);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
-    err = AECountItems(&fileSpecList, &count);
+    err = ChkErr(AECountItems, &fileSpecList, &count);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
     Tcl_DStringInit(&command);
     Tcl_DStringAppend(&command, "::tk::mac::OpenDocument", -1);
     for (index = 1; index <= count; index++) {
-        err = AEGetNthPtr(&fileSpecList, index, typeFSRef,
-                &keyword, &type, (Ptr) &file, sizeof(FSRef), &actual);
-        if ( err != noErr ) {
-            continue;
-        }
-
-        err = FSRefToDString(&file, &pathName);
-        if (err == noErr) {
-            Tcl_DStringAppendElement(&command, Tcl_DStringValue(&pathName));
-            Tcl_DStringFree(&pathName);
-        }
+	err = ChkErr(AEGetNthPtr, &fileSpecList, index, typeFSRef,
+		&keyword, &type, (Ptr) &file, sizeof(FSRef), &actual);
+	if ( err != noErr ) {
+	    continue;
+	}
+
+	err = ChkErr(FSRefToDString, &file, &pathName);
+	if (err == noErr) {
+	    Tcl_DStringAppendElement(&command, Tcl_DStringValue(&pathName));
+	    Tcl_DStringFree(&pathName);
+	}
     }
-    
-    Tcl_GlobalEval(interp, Tcl_DStringValue(&command));
+
+    Tcl_EvalEx(interp, Tcl_DStringValue(&command), Tcl_DStringLength(&command),
+	    TCL_EVAL_GLOBAL);
 
     Tcl_DStringFree(&command);
     return noErr;
 }
 
-static OSErr 
-PrintHandler (
+/*
+ *----------------------------------------------------------------------
+ *
+ * PrintHandler --
+ *
+ *	This is the 'pdoc' core Apple event handler.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+PrintHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
@@ -312,7 +392,7 @@ PrintHandler (
     Tcl_Interp *interp = (Tcl_Interp *) handlerRefcon;
     AEDescList fileSpecList;
     FSRef file;
-    OSErr err;
+    OSStatus err;
     DescType type;
     Size actual;
     long count;
@@ -327,49 +407,50 @@ PrintHandler (
      * the print document procedure doesn't exist.
      */
 
-    if ((interp == NULL) || 
-            (Tcl_GetCommandInfo(interp, "::tk::mac::PrintDocument", &dummy)) == 0) {
-            return noErr;
+    if ((interp == NULL) ||
+	    (Tcl_GetCommandInfo(interp, "::tk::mac::PrintDocument", &dummy)) == 0) {
+	    return noErr;
     }
-    
+
     /*
      * If we get any errors wil retrieving our parameters
      * we just return with no error.
      */
 
-    err = AEGetParamDesc(event, keyDirectObject,
-            typeAEList, &fileSpecList);
+    err = ChkErr(AEGetParamDesc, event, keyDirectObject, typeAEList,
+	    &fileSpecList);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
-    err = MissedAnyParameters(event);
+    err = ChkErr(MissedAnyParameters, event);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
-    err = AECountItems(&fileSpecList, &count);
+    err = ChkErr(AECountItems, &fileSpecList, &count);
     if (err != noErr) {
-        return noErr;
+	return noErr;
     }
 
     Tcl_DStringInit(&command);
     Tcl_DStringAppend(&command, "::tk::mac::PrintDocument", -1);
     for (index = 1; index <= count; index++) {
-        err = AEGetNthPtr(&fileSpecList, index, typeFSRef,
-                &keyword, &type, (Ptr) &file, sizeof(FSRef), &actual);
-        if ( err != noErr ) {
-            continue;
-        }
-
-        err = FSRefToDString(&file, &pathName);
-        if (err == noErr) {
-            Tcl_DStringAppendElement(&command, Tcl_DStringValue(&pathName));
-            Tcl_DStringFree(&pathName);
-        }
+	err = ChkErr(AEGetNthPtr, &fileSpecList, index, typeFSRef, &keyword,
+		&type, (Ptr) &file, sizeof(FSRef), &actual);
+	if ( err != noErr ) {
+	    continue;
+	}
+
+	err = ChkErr(FSRefToDString, &file, &pathName);
+	if (err == noErr) {
+	    Tcl_DStringAppendElement(&command, Tcl_DStringValue(&pathName));
+	    Tcl_DStringFree(&pathName);
+	}
     }
-    
-    Tcl_GlobalEval(interp, Tcl_DStringValue(&command));
+
+    Tcl_EvalEx(interp, Tcl_DStringValue(&command), Tcl_DStringLength(&command),
+	    TCL_EVAL_GLOBAL);
 
     Tcl_DStringFree(&command);
     return noErr;
@@ -380,24 +461,24 @@ PrintHandler (
  *
  * ScriptHandler --
  *
- *        This handler process the script event.  
+ *	This handler process the script event.
  *
  * Results:
- *        Schedules the given event to be processed.
+ *	Schedules the given event to be processed.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
-static OSErr 
-ScriptHandler (
+OSErr
+ScriptHandler(
     const AppleEvent * event,
     AppleEvent * reply,
     long handlerRefcon)
 {
-    OSErr theErr;
+    OSStatus theErr;
     AEDescList theDesc;
     int tclErr = -1;
     Tcl_Interp *interp;
@@ -409,98 +490,100 @@ ScriptHandler (
      * The do script event receives one parameter that should be data or a file.
      */
     theErr = AEGetParamDesc(event, keyDirectObject, typeWildCard,
-            &theDesc);
+	    &theDesc);
     if (theErr != noErr) {
-        sprintf(errString, "AEDoScriptHandler: GetParamDesc error %d", theErr);
-        theErr = AEPutParamPtr(reply, keyErrorString, typeChar, errString,
-                strlen(errString));
+	sprintf(errString, "AEDoScriptHandler: GetParamDesc error %ld",
+		theErr);
+	theErr = AEPutParamPtr(reply, keyErrorString, typeChar, errString,
+		strlen(errString));
     } else if (MissedAnyParameters(event)) {
-        sprintf(errString, "AEDoScriptHandler: extra parameters");
-        AEPutParamPtr(reply, keyErrorString, typeChar, errString,
-                strlen(errString));
-        theErr = -1771;
+	sprintf(errString, "AEDoScriptHandler: extra parameters");
+	AEPutParamPtr(reply, keyErrorString, typeChar, errString,
+		strlen(errString));
+	theErr = -1771;
     } else {
-        if (theDesc.descriptorType == (DescType)typeChar) {
-            Tcl_DString encodedText;
-            short i;
-            Size  size;
-            char  * data;
-            
-            size = AEGetDescDataSize(&theDesc);
-            
-            data = (char *)ckalloc(size + 1);
-            if ( !data ) {
-                theErr = -1771;
-            }
-            else {
-                   AEGetDescData(&theDesc,data,size);
-                   data [ size ] = 0;
-                   for (i = 0; i < size; i++)
-                    if (data[i] == '\r')
-                     data[i] = '\n';
-                   AEReplaceDescData(theDesc.descriptorType, data, 
-		           size + 1, &theDesc);
-            }
-            Tcl_ExternalToUtfDString(NULL, data, size,
-                    &encodedText);
-            tclErr = Tcl_GlobalEval(interp, Tcl_DStringValue(&encodedText));
-            Tcl_DStringFree(&encodedText);
-        } else if (theDesc.descriptorType == (DescType)typeAlias) {
-            Boolean dummy;
-            FSRef file;
-            AliasPtr    alias;
-            Size        theSize;
-
-            theSize = AEGetDescDataSize(&theDesc);
-            alias = (AliasPtr) ckalloc(theSize);
-            if (alias) {
-                AEGetDescData (&theDesc, alias, theSize);
-            
-                theErr = FSResolveAlias(NULL, &alias,
-                        &file, &dummy);
-                ckfree((char*)alias);
-            } else {
-                theErr = memFullErr;
-            }
-            if (theErr == noErr) {
-                Tcl_DString scriptName;
-                theErr = FSRefToDString(&file, &scriptName);
-                if (theErr == noErr) {
-                    Tcl_EvalFile(interp, Tcl_DStringValue(&scriptName));
-                    Tcl_DStringFree(&scriptName);
-                }
-            } else {
-                sprintf(errString, "AEDoScriptHandler: file not found");
-                AEPutParamPtr(reply, keyErrorString, typeChar,
-                        errString, strlen(errString));
-            }
-        } else {
-            sprintf(errString,
-                    "AEDoScriptHandler: invalid script type '%-4.4s', must be 'alis' or 'TEXT'",
-                    (char *)(&theDesc.descriptorType));
-            AEPutParamPtr(reply, keyErrorString, typeChar,
-                    errString, strlen(errString));
-            theErr = -1770;
-        }
+	if (theDesc.descriptorType == (DescType)typeChar) {
+	    Tcl_DString encodedText;
+	    short i;
+	    Size  size;
+	    char  * data;
+
+	    size = AEGetDescDataSize(&theDesc);
+
+	    data = (char *)ckalloc(size + 1);
+	    if ( !data ) {
+		theErr = -1771;
+	    }
+	    else {
+		   AEGetDescData(&theDesc,data,size);
+		   data [ size ] = 0;
+		   for (i = 0; i < size; i++)
+		    if (data[i] == '\r')
+		     data[i] = '\n';
+		   AEReplaceDescData(theDesc.descriptorType, data,
+			   size + 1, &theDesc);
+	    }
+	    Tcl_ExternalToUtfDString(NULL, data, size,
+		    &encodedText);
+	    tclErr = Tcl_EvalEx(interp, Tcl_DStringValue(&encodedText),
+		    Tcl_DStringLength(&encodedText), TCL_EVAL_GLOBAL);
+	    Tcl_DStringFree(&encodedText);
+	} else if (theDesc.descriptorType == (DescType)typeAlias) {
+	    Boolean dummy;
+	    FSRef file;
+	    AliasPtr	alias;
+	    Size	theSize;
+
+	    theSize = AEGetDescDataSize(&theDesc);
+	    alias = (AliasPtr) ckalloc(theSize);
+	    if (alias) {
+		AEGetDescData (&theDesc, alias, theSize);
+
+		theErr = FSResolveAlias(NULL, &alias,
+			&file, &dummy);
+		ckfree((char*)alias);
+	    } else {
+		theErr = memFullErr;
+	    }
+	    if (theErr == noErr) {
+		Tcl_DString scriptName;
+		theErr = FSRefToDString(&file, &scriptName);
+		if (theErr == noErr) {
+		    Tcl_EvalFile(interp, Tcl_DStringValue(&scriptName));
+		    Tcl_DStringFree(&scriptName);
+		}
+	    } else {
+		sprintf(errString, "AEDoScriptHandler: file not found");
+		AEPutParamPtr(reply, keyErrorString, typeChar,
+			errString, strlen(errString));
+	    }
+	} else {
+	    sprintf(errString,
+		    "AEDoScriptHandler: invalid script type '%-4.4s', must be 'alis' or 'TEXT'",
+		    (char *)(&theDesc.descriptorType));
+	    AEPutParamPtr(reply, keyErrorString, typeChar,
+		    errString, strlen(errString));
+	    theErr = -1770;
+	}
     }
 
     /*
      * If we actually go to run Tcl code - put the result in the reply.
      */
     if (tclErr >= 0) {
-        if (tclErr == TCL_OK)  {
-            AEPutParamPtr(reply, keyDirectObject, typeChar,
-                Tcl_GetStringResult(interp),
-                strlen(Tcl_GetStringResult(interp)));
-        } else {
-            AEPutParamPtr(reply, keyErrorString, typeChar,
-                Tcl_GetStringResult(interp),
-                strlen(Tcl_GetStringResult(interp)));
-            AEPutParamPtr(reply, keyErrorNumber, typeInteger,
-                (Ptr) &tclErr, sizeof(int));
-        }
+	if (tclErr == TCL_OK)  {
+	    AEPutParamPtr(reply, keyDirectObject, typeChar,
+		Tcl_GetStringResult(interp),
+		strlen(Tcl_GetStringResult(interp)));
+	} else {
+	    AEPutParamPtr(reply, keyErrorString, typeChar,
+		Tcl_GetStringResult(interp),
+		strlen(Tcl_GetStringResult(interp)));
+	    AEPutParamPtr(reply, keyErrorNumber, typeInteger,
+		(Ptr) &tclErr, sizeof(int));
+	}
     }
-        
+
     AEDisposeDesc(&theDesc);
 
     return theErr;
@@ -511,22 +594,22 @@ ScriptHandler (
  *
  * ReallyKillMe --
  *
- *      This proc tries to kill the shell by running exit,
- *      called from an event scheduled by the "Quit" AppleEvent handler.
+ *	This proc tries to kill the shell by running exit,
+ *	called from an event scheduled by the "Quit" AppleEvent handler.
  *
  * Results:
- *        Runs the "exit" command which might kill the shell.
+ *	Runs the "exit" command which might kill the shell.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
-static int 
+static int
 ReallyKillMe(
     Tcl_Event *eventPtr,
-    int flags) 
+    int flags)
 {
     Tcl_Interp *interp = ((KillEvent *) eventPtr)->interp;
     Tcl_CmdInfo dummy;
@@ -543,28 +626,28 @@ ReallyKillMe(
  *
  * MissedAnyParameters --
  *
- *        Checks to see if parameters are still left in the event.  
+ *	Checks to see if parameters are still left in the event.
  *
  * Results:
- *        True or false.
+ *	True or false.
  *
  * Side effects:
- *        None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
- 
-static int 
+
+int
 MissedAnyParameters(
     const AppleEvent *theEvent)
 {
    DescType returnedType;
    Size actualSize;
-   OSErr err;
+   OSStatus err;
+
+   err = ChkErr(AEGetAttributePtr, theEvent, keyMissedKeywordAttr,
+	   typeWildCard, &returnedType, NULL, 0, &actualSize);
 
-   err = AEGetAttributePtr(theEvent, keyMissedKeywordAttr, typeWildCard, 
-                   &returnedType, NULL, 0, &actualSize);
-   
    return (err != errAEDescNotFound);
 }
 
@@ -573,28 +656,28 @@ MissedAnyParameters(
  *
  * FSRefToDString --
  *
- *      Get a POSIX path from an FSRef.
+ *	Get a POSIX path from an FSRef.
  *
  * Results:
- *      In the parameter ds.
+ *	In the parameter ds.
  *
  * Side effects:
- *      None.
+ *	None.
  *
  *----------------------------------------------------------------------
  */
 
-static OSErr
+OSStatus
 FSRefToDString(
     const FSRef *fsref,
     Tcl_DString *ds)
 {
     UInt8 fileName[PATH_MAX+1];
-    OSErr err;
+    OSStatus err;
 
-    err = FSRefMakePath(fsref, fileName, sizeof(fileName));
+    err = ChkErr(FSRefMakePath, fsref, fileName, sizeof(fileName));
     if (err == noErr) {
-        Tcl_ExternalToUtfDString(NULL, (char*) fileName, -1, ds);
+	Tcl_ExternalToUtfDString(NULL, (char*) fileName, -1, ds);
     }
     return err;
 }