*** macosx-8-4-branch merged into the mainline [tcl patch #602770] ***

	* generic/tk.decls:
	* generic/tkInt.decls: added new "aqua" specific entries to the
	stubs tables. Changed all "unix" entries to "x11" to allow us to
	distinguish and build both "aqua" on MacOSX and "x11" on MacOSX.

	* generic/tk.h: added a #ifnded RESOURCE_INCLUDED so that tk.h can
	be passed to the resource compiler.

	* generic/tkCmds.c (Tk_TkObjCmd): added [tk windowingsystem]
	subcommand: returns "x11" when running on X11, "win32" on Windows,
	"classic" on MacOS9 and "aqua" on MacOSX Aqua (i.e. Carbon)

	* generic/tkFont.c (TkFontGetFirstTextLayout): new private function
	returning the first chunk of a Tk_TextLayout, i.e. until the first
	font change on the first line (or the whole first line if there is
	no such font change).

	* generic/tkMain.c: made Tcl_ThreadDataKey static

	* library/demos/puzzle.tcl: fixed button metrics for aqua

	* tests/cursor.test: check for presence of arrow cursor instead of
	heart cursor

	* xlib/xcolors.c: changed xColors static initialization to more
	standard C

	* macosx/Wish.pbproj/jingham.pbxuser (new):
	* macosx/Wish.pbproj/project.pbxproj (new): project for Apple's
	ProjectBuilder IDE.

	* macosx/Makefile (new): simple makefile for building the project
	from the command line via the ProjectBuilder tool 'pbxbuild'.

	* macosx/tkMacOSXAppInit.c (new): macosx specific AppInit looking
	for a AppMain.tcl file in its bundled Resources/Scripts folder. If
	present, argv[1] is set to that file and the Scripts folder is
	added to the auto_path. This allows tk apps to embed scripts within
	their bundle directory structure.

	* macosx/tkMacOSXInit.c (new): macosx adapted version of
	tkUnixInit.c: we initialize & cache the Carbon native encoding
	(e.g. 'macRoman') and try to find the tk script library files
	inside Tk packaged as a framework.

	* macosx/tkMacOSXNotify.c (new): new macosx specific merged
	Carbon/select-based notifier.

	* macosx/tkMacOSXEvent.c (new):
	* macosx/tkMacOSXEvent.h (new):
	* macosx/tkMacOSXKeyEvent.c (new):
	* macosx/tkMacOSXMouseEvent.c (new):
	* macosx/tkMacOSXWindowEvent.c (new): new macosx specific event
	handling functionality.

	* macosx/tkMacOSX.h (new):
	* macosx/tkMacOSXBitmap.c (new):
	* macosx/tkMacOSXButton.c (new):
	* macosx/tkMacOSXClipboard.c (new):
	* macosx/tkMacOSXColor.c (new):
	* macosx/tkMacOSXConfig.c (new):
	* macosx/tkMacOSXCursor.c (new):
	* macosx/tkMacOSXDefault.h (new):
	* macosx/tkMacOSXDialog.c (new):
	* macosx/tkMacOSXDraw.c (new):
	* macosx/tkMacOSXEmbed.c (new):
	* macosx/tkMacOSXFont.c (new):
	* macosx/tkMacOSXHLEvents.c (new):
	* macosx/tkMacOSXInt.h (new):
	* macosx/tkMacOSXKeyboard.c (new):
	* macosx/tkMacOSXMenu.c (new):
	* macosx/tkMacOSXMenubutton.c (new):
	* macosx/tkMacOSXMenus.c (new):
	* macosx/tkMacOSXPort.h (new):
	* macosx/tkMacOSXRegion.c (new):
	* macosx/tkMacOSXScale.c (new):
	* macosx/tkMacOSXScrlbr.c (new):
	* macosx/tkMacOSXSubwindows.c (new):
	* macosx/tkMacOSXTest.c (new):
	* macosx/tkMacOSXUtil.c (new):
	* macosx/tkMacOSXUtil.h (new):
	* macosx/tkMacOSXWm.c (new):
	* macosx/tkMacOSXWm.h (new):
	* macosx/tkMacOSXXStubs.c (new): macosx ports of classic mac Tk
	implementation in tk/mac.

	* macosx/tkMacOSXSend.c (new): only send to local interp
	implemented currently.

	* macosx/tkMacOSXDebug.h (new):
	* macosx/tkMacOSXDebug.c (new): new macosx specific functions for
	debugging MacOS events, regions, etc.

	* macosx/tkAboutDlg.r (new):
	* macosx/tkMacOSXApplication.r (new):
	* macosx/tkMacOSXCursors.r (new):
	* macosx/tkMacOSXLibrary.r (new):
	* macosx/tkMacOSXMenu.r (new):
	* macosx/tkMacOSXResource.r (new):
	* macosx/tkMacOSXXCursors.r (new):
	* macosx/tclets.r (new): sources for Rez resource compiler.

	* macosx/Wish.icns (new): Wish application icon.

	* generic/tk.h:
	* generic/default.h:
	* generic/tkBind.c:
	* generic/tkCmds.c:
	* generic/tkGrab.c:
	* generic/tkPointer.c:
	* generic/tkPort.h:
	* generic/tkSelect.c:
	* generic/tkStubLib.c:
	* generic/tkTest.c:
	* generic/tkText.c:
	* generic/tkWindow.c:
	* unix/tkUnix3d.c:
	* xlib/xgc.c:
	* xlib/X11/X.h:
	* xlib/X11/Xlib.h:
	* xlib/X11/Xutil.h: added #includes and #ifdefs for macosx

	* library/bgerror.tcl:
	* library/button.tcl:
	* library/console.tcl:
	* library/dialog.tcl:
	* library/entry.tcl:
	* library/listbox.tcl:
	* library/menu.tcl:
	* library/msgbox.tcl:
	* library/scrlbar.tcl:
	* library/spinbox.tcl:
	* library/text.tcl:
	* library/tk.tcl:
	* library/demos/menu.tcl:
	* library/demos/menubu.tcl:
	* library/demos/widget: check [tk windowingsystem] instead of
	and/or in addition to $tcl_platform(platform).

	* generic/tkInt.h:
	* mac/tkMacBitmap.c:
	* mac/tkMacWm.c: added missing CONSTification

	* generic/tkIntDecls.h:
	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkPlatDecls.h:
	* generic/tkStubInit.c: regen

1 files changed, 330 insertions, 0 deletions

diff --git a/macosx/tkMacOSXUtil.c b/macosx/tkMacOSXUtil.c
new file mode 100644
index 0000000..1e4e856
--- /dev/null
+++ b/macosx/tkMacOSXUtil.c
@@ -0,0 +1,330 @@
+#include <Carbon/Carbon.h>
+
+#include "tkMacOSXUtil.h"
+
+#define DIR_SEP_CHAR ':'
+
+/*****************************************************************************/
+pascal  OSErr   FSMakeFSSpecCompat(short vRefNum,
+                                                                   long dirID, 
+                                                                   ConstStr255Param fileName,
+                                                                   FSSpec *spec)
+{
+        OSErr   result;
+  
+        {
+                /* Let the file system create the FSSpec if it can since it does the job */
+                /* much more efficiently than I can. */
+                result = FSMakeFSSpec(vRefNum, dirID, fileName, spec);
+                /* Fix a bug in Macintosh PC Exchange's MakeFSSpec code where 0 is */
+                /* returned in the parID field when making an FSSpec to the volume's */
+                /* root directory by passing a full pathname in MakeFSSpec's */
+                /* fileName parameter. Fixed in Mac OS 8.1 */
+                if ( (result == noErr) && (spec->parID == 0) )
+                        spec->parID = fsRtParID;
+        }
+        return ( result );
+}
+
+
+/*****************************************************************************/
+pascal  OSErr GetCatInfoNoName(short vRefNum,
+                                                           long dirID,
+                                                           ConstStr255Param name,
+                                                           CInfoPBPtr pb)
+{                                                        
+        Str31 tempName; 
+        OSErr error;            
+                                        
+        /* Protection against File Sharing problem */           
+        if ( (name == NULL) || (name[0] == 0) )
+        {
+                tempName[0] = 0;
+                pb->dirInfo.ioNamePtr = tempName;
+                pb->dirInfo.ioFDirIndex = -1;   /* use ioDirID */
+        }
+        else
+        {
+                pb->dirInfo.ioNamePtr = (StringPtr)name;
+                pb->dirInfo.ioFDirIndex = 0;    /* use ioNamePtr and ioDirID */
+        }
+        pb->dirInfo.ioVRefNum = vRefNum;
+        pb->dirInfo.ioDrDirID = dirID;
+        error = PBGetCatInfoSync(pb);
+        pb->dirInfo.ioNamePtr = NULL;
+        return ( error );
+}
+/*****************************************************************************/
+pascal  OSErr   GetDirectoryID(short vRefNum,
+                                                           long dirID,
+                                                           ConstStr255Param name,
+                                                           long *theDirID,
+                                                           Boolean *isDirectory)
+{                       
+        CInfoPBRec pb;  
+        OSErr error;    
+        error = GetCatInfoNoName(vRefNum, dirID, name, &pb);
+        if ( error == noErr )   
+        {           
+                *isDirectory = (pb.hFileInfo.ioFlAttrib & kioFlAttribDirMask) != 0;
+                if ( *isDirectory )
+                {               
+                        *theDirID = pb.dirInfo.ioDrDirID;
+                }       
+                else            
+                {                       
+                        *theDirID = pb.hFileInfo.ioFlParID;
+                }
+        }
+
+        return ( error );
+}
+
+/*****************************************************************************/
+pascal  OSErr   FSpGetDirectoryID(const FSSpec *spec,
+                                                                  long *theDirID,
+                                                                  Boolean *isDirectory)
+{       
+        return ( GetDirectoryID(spec->vRefNum, spec->parID, spec->name,
+                         theDirID, isDirectory) );
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * FSpPathFromLocation --
+ *
+ *	This function obtains a full path name for a given macintosh
+ *	FSSpec.  Unlike the More Files function FSpGetFullPath, this
+ *	function will return a C string in the Handle.  It also will
+ *	create paths for FSSpec that do not yet exist.
+ *
+ * Results:
+ *	OSErr code.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+FSpPathFromLocation(
+    FSSpec *spec,		/* The location we want a path for. */
+    int *length,		/* Length of the resulting path. */
+    Handle *fullPath)		/* Handle to path. */
+{
+    OSErr err;
+    FSSpec tempSpec;
+    CInfoPBRec pb;
+	
+    *fullPath = NULL;
+	
+    /* 
+     * Make a copy of the input FSSpec that can be modified.
+     */
+    BlockMoveData(spec, &tempSpec, sizeof(FSSpec));
+	
+    if (tempSpec.parID == fsRtParID) {
+	/* 
+	 * The object is a volume.  Add a colon to make it a full 
+	 * pathname.  Allocate a handle for it and we are done.
+	 */
+	tempSpec.name[0] += 2;
+	tempSpec.name[tempSpec.name[0] - 1] = DIR_SEP_CHAR;
+	tempSpec.name[tempSpec.name[0]] = '\0';
+		
+	err = PtrToHand(&tempSpec.name[1], fullPath, tempSpec.name[0]);
+    } else {
+	/* 
+	 * The object isn't a volume.  Is the object a file or a directory? 
+	 */
+	pb.dirInfo.ioNamePtr = tempSpec.name;
+	pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
+	pb.dirInfo.ioDrDirID = tempSpec.parID;
+	pb.dirInfo.ioFDirIndex = 0;
+	err = PBGetCatInfoSync(&pb);
+
+	if ((err == noErr) || (err == fnfErr)) {
+	    /* 
+	     * If the file doesn't currently exist we start over.  If the
+	     * directory exists everything will work just fine.  Otherwise we
+	     * will just fail later.  If the object is a directory, append a
+	     * colon so full pathname ends with colon, but only if the name is
+	     * not empty.  NavServices returns FSSpec's with the parent ID set,
+	     * but the name empty...
+	     */
+	    if (err == fnfErr) {
+		BlockMoveData(spec, &tempSpec, sizeof(FSSpec));
+	    } else if ( (pb.hFileInfo.ioFlAttrib & ioDirMask) != 0 ) {
+	        if (tempSpec.name[0] > 0) {
+		    tempSpec.name[0] += 1;
+		    tempSpec.name[tempSpec.name[0]] = DIR_SEP_CHAR;
+		}
+	    }
+			
+	    /* 
+	     * Create a new Handle for the object - make it a C string.
+	     */
+	    tempSpec.name[0] += 1;
+	    tempSpec.name[tempSpec.name[0]] = '\0';
+	    err = PtrToHand(&tempSpec.name[1], fullPath, tempSpec.name[0]);
+	    if (err == noErr) {
+		/* 
+		 * Get the ancestor directory names - loop until we have an 
+		 * error or find the root directory.
+		 */
+		pb.dirInfo.ioNamePtr = tempSpec.name;
+		pb.dirInfo.ioVRefNum = tempSpec.vRefNum;
+		pb.dirInfo.ioDrParID = tempSpec.parID;
+		do {
+		    pb.dirInfo.ioFDirIndex = -1;
+		    pb.dirInfo.ioDrDirID = pb.dirInfo.ioDrParID;
+		    err = PBGetCatInfoSync(&pb);
+		    if (err == noErr) {
+			/* 
+			 * Append colon to directory name and add 
+			 * directory name to beginning of fullPath.
+			 */
+			++tempSpec.name[0];
+			tempSpec.name[tempSpec.name[0]] = DIR_SEP_CHAR;
+						
+			(void) Munger(*fullPath, 0, NULL, 0, &tempSpec.name[1],
+				tempSpec.name[0]);
+                        fprintf(stderr,"mem\n");
+			err = MemError();
+		    }
+		} while ( (err == noErr) &&
+			(pb.dirInfo.ioDrDirID != fsRtDirID) );
+	    }
+	}
+    }
+    
+    /*
+     * On error Dispose the handle, set it to NULL & return the err.
+     * Otherwise, set the length & return.
+     */
+    if (err == noErr) {
+	*length = GetHandleSize(*fullPath) - 1;
+    } else {
+	if ( *fullPath != NULL ) {
+	    DisposeHandle(*fullPath);
+	}
+	*fullPath = NULL;
+	*length = 0;
+    }
+
+    return err;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * FSpLocationFromPath --
+ *
+ *	This function obtains an FSSpec for a given macintosh path.
+ *	Unlike the More Files function FSpLocationFromFullPath, this
+ *	function will also accept partial paths and resolve any aliases
+ *	along the path.  
+ *
+ * Results:
+ *	OSErr code.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+OSErr
+FSpLocationFromPath(
+    int length,			/* Length of path. */
+    const char *path,		/* The path to convert. */
+    FSSpecPtr fileSpecPtr)	/* On return the spec for the path. */
+{
+    Str255 fileName;
+    OSErr err;
+    short vRefNum;
+    long dirID;
+    int pos, cur;
+    Boolean isDirectory;
+    Boolean wasAlias;
+
+    /*
+     * Check to see if this is a full path.  If partial
+     * we assume that path starts with the current working
+     * directory.  (Ie. volume & dir = 0)
+     */
+    vRefNum = 0;
+    dirID = 0;
+    cur = 0;
+    if (length == 0) {
+        return fnfErr;
+    }
+    if (path[cur] == DIR_SEP_CHAR) {
+	cur++;
+	if (cur >= length) {
+	    /*
+	     * If path = ":", just return current directory.
+	     */
+	    FSMakeFSSpecCompat(0, 0, NULL, fileSpecPtr);
+	    return noErr;
+	}
+    } else {
+	while (path[cur] != DIR_SEP_CHAR && cur < length) {
+	    cur++;
+	}
+	if (cur > 255) {
+	    return bdNamErr;
+	}
+	if (cur < length) {
+	    /*
+	     * This is a full path
+	     */
+	    cur++;
+	    strncpy((char *) fileName + 1, path, cur);
+	    fileName[0] = cur;
+	    err = FSMakeFSSpecCompat(0, 0, fileName, fileSpecPtr);
+	    if (err != noErr) return err;
+	    FSpGetDirectoryID(fileSpecPtr, &dirID, &isDirectory);
+	    vRefNum = fileSpecPtr->vRefNum;
+	} else {
+	    cur = 0;
+	}
+    }
+    
+    isDirectory = 1;
+    while (cur < length) {
+	if (!isDirectory) {
+	    return dirNFErr;
+	}
+	pos = cur;
+	while (path[pos] != DIR_SEP_CHAR && pos < length) {
+	    pos++;
+	}
+	if (pos == cur) {
+	    /* Move up one dir */
+	    /* cur++; */
+            fileName[1] = DIR_SEP_CHAR;
+            fileName[2] = DIR_SEP_CHAR;
+	    fileName[0] = 2;
+	} else if (pos - cur > 255) {
+	    return bdNamErr;
+	} else {
+	    strncpy((char *) fileName + 1, &path[cur], pos - cur);
+	    fileName[0] = pos - cur;
+	}
+	err = FSMakeFSSpecCompat(vRefNum, dirID, fileName, fileSpecPtr);
+	if (err != noErr) return err;
+	err = ResolveAliasFile(fileSpecPtr, true, &isDirectory, &wasAlias);
+	if (err != noErr) return err;
+	FSpGetDirectoryID(fileSpecPtr, &dirID, &isDirectory);
+	vRefNum = fileSpecPtr->vRefNum;
+	cur = pos;
+	if (path[cur] == DIR_SEP_CHAR) {
+	    cur++;
+	}
+    }
+    
+    return noErr;
+}