* 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, 243 insertions, 224 deletions

diff --git a/macosx/tkMacOSXCursor.c b/macosx/tkMacOSXCursor.c
index e72bbae..81fe11d 100644
--- a/macosx/tkMacOSXCursor.c
+++ b/macosx/tkMacOSXCursor.c
@@ -1,15 +1,16 @@
-/* 
+/*
  * tkMacOSXCursor.c --
  *
- *        This file contains Macintosh specific cursor related routines.
+ *	This file contains Macintosh specific cursor related routines.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001, Apple Computer, Inc.
+ * Copyright (c) 2006-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: tkMacOSXCursor.c,v 1.4.2.4 2006/07/20 06:26:45 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCursor.c,v 1.4.2.5 2007/04/29 02:26:48 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -20,10 +21,11 @@
  * color resource cursors, & normal cursors.
  */
 
-#define THEME        0        /* Theme cursors */
-#define ANIMATED     1        /* Animated theme cursors */
-#define COLOR        2        /* Cursors of type crsr. */
-#define NORMAL       3        /* Cursors of type CURS. */
+#define NONE		-1	/* Hidden cursor */
+#define THEME		0	/* Theme cursors */
+#define ANIMATED	1	/* Animated theme cursors */
+#define COLOR		2	/* Cursors of type crsr. */
+#define NORMAL		3	/* Cursors of type CURS. */
 
 /*
  * The following data structure contains the system specific data
@@ -31,14 +33,14 @@
  */
 
 typedef struct {
-    TkCursor info;                /* Generic cursor info used by tkCursor.c */
-    Handle macCursor;                /* Resource containing Macintosh cursor. 
-                                      * For theme cursors, this is -1. */
-    int type;                        /* Type of Mac cursor: for theme cursors
-                                      * this is the theme cursor constant,
-                                      * otherwise one of crsr or CURS */
-    int count;                       /* For animating cursors, the count for the
-                                        cursor. */
+    TkCursor info;		/* Generic cursor info used by tkCursor.c */
+    Handle macCursor;		/* Resource containing Macintosh cursor.
+				 * For theme cursors, this is -1. */
+    int type;			/* Type of Mac cursor: for theme cursors
+				 * this is the theme cursor constant,
+				 * otherwise one of crsr or CURS */
+    int count;			/* For animating cursors, the count for the
+				 * cursor. */
 } TkMacOSXCursor;
 
 /*
@@ -47,119 +49,128 @@ typedef struct {
  */
 
 struct CursorName {
-    char *name;
+    const char *name;
     int id;
 };
 
+static struct CursorName noneCursorName = {"none", 0};
+
 static struct CursorName themeCursorNames[] = {
-    {"ibeam",                kThemeIBeamCursor},
-    {"text",                kThemeIBeamCursor},
-    {"xterm",                kThemeIBeamCursor},
-    {"cross",                kThemeCrossCursor},
-    {"crosshair",        kThemeCrossCursor},
-    {"cross-hair",        kThemeCrossCursor},
-    {"plus",                kThemePlusCursor},
-    {"arrow",                kThemeArrowCursor},
-    {"closedhand",	kThemeClosedHandCursor},
-    {"openhand",	kThemeOpenHandCursor},
-    {"pointinghand",	kThemePointingHandCursor},
-    {NULL,                0}
+    {"arrow",			kThemeArrowCursor},
+    {"copyarrow",		kThemeCopyArrowCursor},
+    {"aliasarrow",		kThemeAliasArrowCursor},
+    {"contextualmenuarrow",	kThemeContextualMenuArrowCursor},
+    {"ibeam",			kThemeIBeamCursor},
+    {"text",			kThemeIBeamCursor},
+    {"xterm",			kThemeIBeamCursor},
+    {"cross",			kThemeCrossCursor},
+    {"crosshair",		kThemeCrossCursor},
+    {"cross-hair",		kThemeCrossCursor},
+    {"plus",			kThemePlusCursor},
+    {"closedhand",		kThemeClosedHandCursor},
+    {"openhand",		kThemeOpenHandCursor},
+    {"pointinghand",		kThemePointingHandCursor},
+    {"resizeleft",		kThemeResizeLeftCursor},
+    {"resizeright",		kThemeResizeRightCursor},
+    {"resizeleftright",		kThemeResizeLeftRightCursor},
+    {"resizeup",		kThemeResizeUpCursor},
+    {"resizedown",		kThemeResizeDownCursor},
+    {"resizeupdown",		kThemeResizeUpDownCursor},
+    {"notallowed",		kThemeNotAllowedCursor},
+    {"poof",			kThemePoofCursor},
+    {NULL,			0}
 };
 
 static struct CursorName animatedThemeCursorNames[] = {
-    {"watch",                kThemeWatchCursor},
-    {"countinguphand",	kThemeCountingUpHandCursor},
+    {"watch",			kThemeWatchCursor},
+    {"countinguphand",		kThemeCountingUpHandCursor},
     {"countingdownhand",	kThemeCountingDownHandCursor},
     {"countingupanddownhand",	kThemeCountingUpAndDownHandCursor},
-    {"spinning",	kThemeSpinningCursor},
-    {NULL,                0}
+    {"spinning",		kThemeSpinningCursor},
+    {NULL,			0}
 };
 
 /*
  * Declarations of static variables used in this file.
  */
 
-static TkMacOSXCursor * gCurrentCursor = NULL;  /* A pointer to the current
-                                              * cursor. */
-static int gResizeOverride = false;             /* A boolean indicating whether
-                                              * we should use the resize
-                                              * cursor during installations. */
-static int gTkOwnsCursor = true;             /* A boolean indicating whether
-                                                Tk owns the cursor.  If not (for
-                                                instance, in the case where a Tk 
-                                                window is embedded in another app's
-                                                window, and the cursor is out of
-                                                the tk window, we will not attempt
-                                                to adjust the cursor */
+static TkMacOSXCursor * gCurrentCursor = NULL;	/* A pointer to the current
+						 * cursor. */
+static int gResizeOverride = false;	/* A boolean indicating whether
+					 * we should use the resize
+					 * cursor during installations. */
+static int gTkOwnsCursor = true;	/* A boolean indicating whether
+					 * Tk owns the cursor. If not (for
+					 * instance, in the case where a Tk
+					 * window is embedded in another app's
+					 * window, and the cursor is out of
+					 * the tk window, we will not attempt
+					 * to adjust the cursor */
 
 /*
  * Declarations of procedures local to this file
  */
 
-static  void FindCursorByName _ANSI_ARGS_ ((TkMacOSXCursor *macCursorPtr,
-                    CONST char *string));
+static void FindCursorByName(TkMacOSXCursor *macCursorPtr, const char *string);
+
 
 /*
  *----------------------------------------------------------------------
  *
  * FindCursorByName --
  *
- *        Retrieve a system cursor by name, and fill the macCursorPtr
- *        structure.  If the cursor cannot be found, the macCursor field
- *        will be NULL.  The function first attempts to load a color
- *        cursor.  If that fails it will attempt to load a black & white
- *        cursor.
+ *	Retrieve a system cursor by name, and fill the macCursorPtr
+ *	structure. If the cursor cannot be found, the macCursor field
+ *	will be NULL. The function first attempts to load a color
+ *	cursor. If that fails it will attempt to load a black & white
+ *	cursor.
  *
  * Results:
- *        Fills the macCursorPtr record.  
+ *	Fills the macCursorPtr record.
  *
  * Side effects:
- *        None
+ *	None
  *
  *----------------------------------------------------------------------
  */
- 
-void 
+
+void
 FindCursorByName(
     TkMacOSXCursor *macCursorPtr,
-    CONST char *string)
+    const char *string)
 {
     Handle resource;
     Str255 curName;
     int destWrote, inCurLen;
+    Tcl_Encoding encoding;
 
     inCurLen = strlen(string);
     if (inCurLen > 255) {
-        return;
+	return;
     }
 
     /*
      * macRoman is the encoding that the resource fork uses.
      */
 
-    Tcl_UtfToExternal(NULL, Tcl_GetEncoding(NULL, "macRoman"), string,
-            inCurLen, 0, NULL, 
-            (char *) &curName[1],
-            255, NULL, &destWrote, NULL); /* Internalize native */
+    encoding = Tcl_GetEncoding(NULL, "macRoman");
+    Tcl_UtfToExternal(NULL, encoding, string, inCurLen, 0, NULL,
+	    (char *) &curName[1], 255, NULL, &destWrote, NULL);
     curName[0] = destWrote;
+    Tcl_FreeEncoding(encoding);
 
     resource = GetNamedResource('crsr', curName);
-
-    if (resource != NULL) {
-        short id;
-        Str255 theName;
-        ResType        theType;
-
-        HLock(resource);
-        GetResInfo(resource, &id, &theType, theName);
-        HUnlock(resource);
-        macCursorPtr->macCursor = (Handle) GetCCursor(id);
-        macCursorPtr->type = COLOR;
-    }
-
-    if (resource == NULL) {
-        macCursorPtr->macCursor = GetNamedResource('CURS', curName);
-        macCursorPtr->type = NORMAL;
+    if (resource) {
+	short id;
+	Str255 theName;
+	ResType theType;
+
+	GetResInfo(resource, &id, &theType, theName);
+	macCursorPtr->macCursor = (Handle) GetCCursor(id);
+	macCursorPtr->type = COLOR;
+    } else {
+	macCursorPtr->macCursor = GetNamedResource('CURS', curName);
+	macCursorPtr->type = NORMAL;
     }
 }
 
@@ -168,28 +179,28 @@ FindCursorByName(
  *
  * TkGetCursorByName --
  *
- *        Retrieve a system cursor by name.  
+ *	Retrieve a system cursor by name.
  *
  * Results:
- *        Returns a new cursor, or NULL on errors.  
+ *	Returns a new cursor, or NULL on errors.
  *
  * Side effects:
- *        Allocates a new cursor.
+ *	Allocates a new cursor.
  *
  *----------------------------------------------------------------------
  */
 
 TkCursor *
 TkGetCursorByName(
-    Tcl_Interp *interp,      /* Interpreter to use for error reporting. */
-    Tk_Window tkwin,         /* Window in which cursor will be used. */
-    Tk_Uid string)           /* Description of cursor.  See manual entry
-                              * for details on legal syntax. */
+    Tcl_Interp *interp,		/* Interpreter to use for error reporting. */
+    Tk_Window tkwin,		/* Window in which cursor will be used. */
+    Tk_Uid string)		/* Description of cursor. See manual entry
+				 * for details on legal syntax. */
 {
     struct CursorName *namePtr;
     TkMacOSXCursor *macCursorPtr;
     int count = -1;
-    
+
     macCursorPtr = (TkMacOSXCursor *) ckalloc(sizeof(TkMacOSXCursor));
     macCursorPtr->info.cursor = (Tk_Cursor) macCursorPtr;
 
@@ -199,71 +210,67 @@ TkGetCursorByName(
      * attempt to load the cursor as a named Mac resource.
      */
 
-    for (namePtr = themeCursorNames; namePtr->name != NULL; namePtr++) {
-        if (strcmp(namePtr->name, string) == 0) {
-            macCursorPtr->count = -1;
-            macCursorPtr->macCursor = (Handle) namePtr;
-            macCursorPtr->type = THEME;
-            break;
-        }
+    if (strcmp(noneCursorName.name, string) == 0) {
+	namePtr = &noneCursorName;
+	macCursorPtr->type = NONE;
+    } else {
+	for (namePtr = themeCursorNames; namePtr->name != NULL; namePtr++) {
+	    if (strcmp(namePtr->name, string) == 0) {
+		macCursorPtr->type = THEME;
+		break;
+	    }
+	}
     }
 
     if (namePtr->name == NULL) {
-        for (namePtr = animatedThemeCursorNames;
-                namePtr->name != NULL; namePtr++) {
-            int namelen = strlen (namePtr->name);
-            if (strncmp(namePtr->name, string, namelen) == 0) {
-                const char *numPtr = string + namelen;
-                if (*numPtr == '\0') {
-                    count = -1;
-                } else {
-                    int result;
-                    result = Tcl_GetInt(NULL, numPtr, &count);
-                    if (result != TCL_OK) {
-                        continue;
-                    }
-                }
-                macCursorPtr->macCursor = (Handle) namePtr;
-                macCursorPtr->type = ANIMATED;
-                macCursorPtr->count = count;
-                break;
-            }
-        }
+	for (namePtr = animatedThemeCursorNames;
+		namePtr->name != NULL; namePtr++) {
+	    int namelen = strlen (namePtr->name);
+	    if (strncmp(namePtr->name, string, namelen) == 0) {
+		const char *numPtr = string + namelen;
+		if (*numPtr) {
+		    int result = Tcl_GetInt(NULL, numPtr, &count);
+		    if (result != TCL_OK) {
+			continue;
+		    }
+		}
+		macCursorPtr->type = ANIMATED;
+		break;
+	    }
+	}
     }
-        
-
 
-    if (namePtr->name == NULL) {
-        FindCursorByName(macCursorPtr, string);
-
-        if (macCursorPtr->macCursor == NULL) {
-            CONST char **argv;
-            int argc, err;
-            
-            /*
-             * The user may be trying to specify an XCursor with fore
-             * & back colors. We don't want this to be an error, so pick 
-             * off the first word, and try again. 
-             */
-             
-            err = Tcl_SplitList(interp, string, &argc, &argv);
-            if (err == TCL_OK ) {
-                if (argc > 1) {
-                    FindCursorByName(macCursorPtr, argv[0]);
-                }
-
-                ckfree((char *) argv);
-            }
-        }
+    if (namePtr->name != NULL) {
+	macCursorPtr->macCursor = (Handle) namePtr;
+	macCursorPtr->count = count;
+    } else {
+	FindCursorByName(macCursorPtr, string);
+
+	if (macCursorPtr->macCursor == NULL) {
+	    const char **argv;
+	    int argc;
+
+	    /*
+	     * The user may be trying to specify an XCursor with fore
+	     * & back colors. We don't want this to be an error, so pick
+	     * off the first word, and try again.
+	     */
+
+	    if (Tcl_SplitList(interp, string, &argc, &argv) == TCL_OK ) {
+		if (argc > 1) {
+		    FindCursorByName(macCursorPtr, argv[0]);
+		}
+		ckfree((char *) argv);
+	    }
+	}
     }
 
     if (macCursorPtr->macCursor == NULL) {
-        ckfree((char *)macCursorPtr);
-        Tcl_AppendResult(interp, "bad cursor spec \"", string, "\"",
-                (char *) NULL);
-        return NULL;
+	ckfree((char *)macCursorPtr);
+	Tcl_AppendResult(interp, "bad cursor spec \"", string, "\"", NULL);
+	return NULL;
     } else {
-        return (TkCursor *) macCursorPtr;
+	return (TkCursor *) macCursorPtr;
     }
 }
 
@@ -272,26 +279,26 @@ TkGetCursorByName(
  *
  * TkCreateCursorFromData --
  *
- *        Creates a cursor from the source and mask bits.
+ *	Creates a cursor from the source and mask bits.
  *
  * Results:
- *        Returns a new cursor, or NULL on errors.
+ *	Returns a new cursor, or NULL on errors.
  *
  * Side effects:
- *        Allocates a new cursor.
+ *	Allocates a new cursor.
  *
  *----------------------------------------------------------------------
  */
 
 TkCursor *
 TkCreateCursorFromData(
-    Tk_Window tkwin,                /* Window in which cursor will be used. */
-    CONST char *source,                /* Bitmap data for cursor shape. */
-    CONST char *mask,                        /* Bitmap data for cursor mask. */
-    int width, int height,        /* Dimensions of cursor. */
-    int xHot, int yHot,                /* Location of hot-spot in cursor. */
-    XColor fgColor,                /* Foreground color for cursor. */
-    XColor bgColor)                /* Background color for cursor. */
+    Tk_Window tkwin,		/* Window in which cursor will be used. */
+    CONST char *source,		/* Bitmap data for cursor shape. */
+    CONST char *mask,		/* Bitmap data for cursor mask. */
+    int width, int height,	/* Dimensions of cursor. */
+    int xHot, int yHot,		/* Location of hot-spot in cursor. */
+    XColor fgColor,		/* Foreground color for cursor. */
+    XColor bgColor)		/* Background color for cursor. */
 {
     return NULL;
 }
@@ -301,14 +308,14 @@ TkCreateCursorFromData(
  *
  * TkpFreeCursor --
  *
- *        This procedure is called to release a cursor allocated by
- *        TkGetCursorByName.
+ *	This procedure is called to release a cursor allocated by
+ *	TkGetCursorByName.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        The cursor data structure is deallocated.
+ *	The cursor data structure is deallocated.
  *
  *----------------------------------------------------------------------
  */
@@ -320,32 +327,33 @@ TkpFreeCursor(
     TkMacOSXCursor *macCursorPtr = (TkMacOSXCursor *) cursorPtr;
 
     switch (macCursorPtr->type) {
-        case COLOR:
-            DisposeCCursor((CCrsrHandle) macCursorPtr->macCursor);
-            break;
-        case NORMAL:
-            ReleaseResource(macCursorPtr->macCursor);
-            break;
+	case COLOR:
+	    DisposeCCursor((CCrsrHandle) macCursorPtr->macCursor);
+	    break;
+	case NORMAL:
+	    ReleaseResource(macCursorPtr->macCursor);
+	    break;
     }
 
     if (macCursorPtr == gCurrentCursor) {
-        gCurrentCursor = NULL;
+	gCurrentCursor = NULL;
     }
 }
+
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXInstallCursor --
  *
- *        Installs either the current cursor as defined by TkpSetCursor
- *        or a resize cursor as the cursor the Macintosh should currently
- *        display.
+ *	Installs either the current cursor as defined by TkpSetCursor
+ *	or a resize cursor as the cursor the Macintosh should currently
+ *	display.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Changes the Macintosh mouse cursor.
+ *	Changes the Macintosh mouse cursor.
  *
  *----------------------------------------------------------------------
  */
@@ -358,45 +366,56 @@ TkMacOSXInstallCursor(
     CCrsrHandle ccursor;
     CursHandle cursor;
     static unsigned int cursorStep = 0;
-    
+    static int cursorHidden = 0;
+    int cursorNone = 0;
+
     gResizeOverride = resizeOverride;
 
     if (resizeOverride) {
-        cursor = (CursHandle) GetNamedResource('CURS', "\presize");
-        if (cursor) {
-            SetCursor(*cursor);
-        } else {
-#ifdef TK_MAC_DEBUG
-            fprintf(stderr,"Resize cursor failed, %d\n", ResError());
-#endif
-        }
+	cursor = (CursHandle) GetNamedResource('CURS', "\presize");
+	if (cursor) {
+	    SetCursor(*cursor);
+	} else {
+	    TkMacOSXDbgMsg("Resize cursor failed: %d", ResError());
+	}
     } else if (macCursorPtr == NULL) {
-        SetThemeCursor(kThemeArrowCursor);
+	SetThemeCursor(kThemeArrowCursor);
     } else {
-        struct CursorName *namePtr;
-        switch (macCursorPtr->type) {
-            case THEME:
-                namePtr = (struct CursorName *) macCursorPtr->macCursor;
-                SetThemeCursor(
-                        namePtr->id);
-                break;
-            case ANIMATED:
-                namePtr = (struct CursorName *) macCursorPtr->macCursor;
-                if (macCursorPtr->count == -1) {
-                    SetAnimatedThemeCursor(namePtr->id, cursorStep++);
-                } else {
-                    SetAnimatedThemeCursor(namePtr->id, macCursorPtr->count);
-                }
-                break;
-            case COLOR:
-                ccursor = (CCrsrHandle) macCursorPtr->macCursor;
-                SetCCursor(ccursor);
-                break;
-            case NORMAL:
-                cursor = (CursHandle) macCursorPtr->macCursor;
-                SetCursor(*cursor);
-                break;
-        }
+	struct CursorName *namePtr;
+	switch (macCursorPtr->type) {
+	    case NONE:
+		if (!cursorHidden) {
+		    cursorHidden = 1;
+		    HideCursor();
+		}
+		cursorNone = 1;
+		break;
+	    case THEME:
+		namePtr = (struct CursorName *) macCursorPtr->macCursor;
+		SetThemeCursor(
+			namePtr->id);
+		break;
+	    case ANIMATED:
+		namePtr = (struct CursorName *) macCursorPtr->macCursor;
+		if (macCursorPtr->count == -1) {
+		    SetAnimatedThemeCursor(namePtr->id, cursorStep++);
+		} else {
+		    SetAnimatedThemeCursor(namePtr->id, macCursorPtr->count);
+		}
+		break;
+	    case COLOR:
+		ccursor = (CCrsrHandle) macCursorPtr->macCursor;
+		SetCCursor(ccursor);
+		break;
+	    case NORMAL:
+		cursor = (CursHandle) macCursorPtr->macCursor;
+		SetCursor(*cursor);
+		break;
+	}
+    }
+    if (cursorHidden && !cursorNone) {
+	cursorHidden = 0;
+	ShowCursor();
     }
 }
 
@@ -405,13 +424,13 @@ TkMacOSXInstallCursor(
  *
  * TkpSetCursor --
  *
- *        Set the current cursor and install it.
+ *	Set the current cursor and install it.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        Changes the current cursor.
+ *	Changes the current cursor.
  *
  *----------------------------------------------------------------------
  */
@@ -421,30 +440,30 @@ TkpSetCursor(
     TkpCursor cursor)
 {
     int cursorChanged = 1;
-    
+
     if (!gTkOwnsCursor) {
-        return;
+	return;
     }
-    
+
     if (cursor == None) {
-        /*  
-         * This is a little tricky.  We can't really tell whether
-         * gCurrentCursor is NULL because it was NULL last time around
-         * or because we just freed the current cursor.  So if the input
-         * cursor is NULL, we always need to reset it, we can't trust the
-         * cursorChanged logic.
-         */
-         
-        gCurrentCursor = NULL;
+	/*
+	 * This is a little tricky. We can't really tell whether
+	 * gCurrentCursor is NULL because it was NULL last time around
+	 * or because we just freed the current cursor. So if the input
+	 * cursor is NULL, we always need to reset it, we can't trust the
+	 * cursorChanged logic.
+	 */
+
+	gCurrentCursor = NULL;
     } else {
-        if (gCurrentCursor == (TkMacOSXCursor *) cursor) {
-            cursorChanged = 0;
-        }
-        gCurrentCursor = (TkMacOSXCursor *) cursor;
+	if (gCurrentCursor == (TkMacOSXCursor *) cursor) {
+	    cursorChanged = 0;
+	}
+	gCurrentCursor = (TkMacOSXCursor *) cursor;
     }
 
     if (Tk_MacOSXIsAppInFront() && cursorChanged) {
-        TkMacOSXInstallCursor(gResizeOverride);
+	TkMacOSXInstallCursor(gResizeOverride);
     }
 }
 
@@ -453,13 +472,13 @@ TkpSetCursor(
  *
  * Tk_MacOSXTkOwnsCursor --
  *
- *        Sets whether Tk has the right to adjust the cursor.
+ *	Sets whether Tk has the right to adjust the cursor.
  *
  * Results:
- *        None.
+ *	None.
  *
  * Side effects:
- *        May keep Tk from changing the cursor.
+ *	May keep Tk from changing the cursor.
  *
  *----------------------------------------------------------------------
  */