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

	* 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, 283 insertions, 0 deletions

diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
new file mode 100644
index 0000000..9f930aa
--- /dev/null
+++ b/macosx/tkMacOSXBitmap.c
@@ -0,0 +1,283 @@
+/* 
+ * tkMacOSXBitmap.c --
+ *
+ *        This file handles the implementation of native bitmaps.
+ *
+ * Copyright (c) 1996-1997 Sun Microsystems, Inc.
+ * Copyright 2001, Apple Computer, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tkMacOSXBitmap.c,v 1.2 2002/08/31 06:12:29 das Exp $
+ */
+
+#include "tkPort.h"
+#include "tk.h"
+#include "tkMacOSXInt.h"
+
+#include <Carbon/Carbon.h>
+/*
+#include <Icons.h>
+#include <Dialogs.h>
+#include <Resources.h>
+#include <Strings.h>
+*/
+
+/*
+ * Depending on the resource type there are different ways to
+ * draw native icons.
+ */
+#define TYPE1        0        /* Family icon suite. */
+#define TYPE2        1        /* ICON resource. */
+#define TYPE3        2        /* cicn resource. */
+
+/*
+ * This data structure describes the id and type of a given icon.
+ * It is used as the source for native icons.
+ */
+typedef struct {
+    int id;                /* Resource Id for Icon. */
+    long int type;        /* Type of icon. */
+} NativeIcon;
+
+/*
+ * This structure holds information about native bitmaps.
+ */
+
+typedef struct {
+    char *name;                        /* Name of icon. */
+    long int type;                /* Type of icon. */
+    int id;                        /* Id of icon. */
+    int size;                        /* Size of icon. */
+} BuiltInIcon;
+
+/*
+ * This array mapps a string name to the supported builtin icons
+ * on the Macintosh.
+ */
+
+static BuiltInIcon builtInIcons[] = {
+    {"document",        TYPE1,        kGenericDocumentIconResource,           32},
+    {"stationery",      TYPE1,        kGenericStationeryIconResource,         32},
+    {"edition",         TYPE1,        kGenericEditionFileIconResource,        32},
+    {"application",     TYPE1,        kGenericApplicationIconResource,        32},
+    {"accessory",       TYPE1,        kGenericDeskAccessoryIconResource,      32},
+    {"folder",          TYPE1,        kGenericFolderIconResource,             32},
+    {"pfolder",         TYPE1,        kPrivateFolderIconResource,             32},
+    {"trash",           TYPE1,        kTrashIconResource,                     32},
+    {"floppy",          TYPE1,        kFloppyIconResource,                    32},
+    {"ramdisk",         TYPE1,        kGenericRAMDiskIconResource,            32},
+    {"cdrom",           TYPE1,        kGenericCDROMIconResource,              32},
+    {"preferences",     TYPE1,        kGenericPreferencesIconResource,        32},
+    {"querydoc",        TYPE1,        kGenericQueryDocumentIconResource,      32},
+    {"stop",            TYPE2,        kStopIcon,                              32},
+    {"note",            TYPE2,        kNoteIcon,                              32},
+    {"caution",         TYPE2,        kCautionIcon,                           32},
+    {(char *) NULL,        0,        0,                                        0}
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpDefineNativeBitmaps --
+ *
+ *        Add native bitmaps.
+ *
+ * Results:
+ *        A standard Tcl result.  If an error occurs then TCL_ERROR is
+ *        returned and a message is left in the interp's result.
+ *
+ * Side effects:
+ *        "Name" is entered into the bitmap table and may be used from
+ *        here on to refer to the given bitmap.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkpDefineNativeBitmaps()
+{
+    int new;
+    Tcl_HashEntry *predefHashPtr;
+    TkPredefBitmap *predefPtr;
+    CONST char * name;
+    BuiltInIcon *builtInPtr;
+    NativeIcon *nativeIconPtr;
+    Tcl_HashTable *tablePtr;
+    
+    for (builtInPtr = builtInIcons; builtInPtr->name != NULL; builtInPtr++) {
+        name = Tk_GetUid(builtInPtr->name);
+        tablePtr = TkGetBitmapPredefTable();
+        predefHashPtr = Tcl_CreateHashEntry(tablePtr, name, &new);
+        if (!new) {
+            continue;
+        }
+        predefPtr = (TkPredefBitmap *) ckalloc(sizeof(TkPredefBitmap));
+        nativeIconPtr = (NativeIcon *) ckalloc(sizeof(NativeIcon));
+        nativeIconPtr->id = builtInPtr->id;
+        nativeIconPtr->type = builtInPtr->type;
+        predefPtr->source = (char *) nativeIconPtr;
+        predefPtr->width = builtInPtr->size;
+        predefPtr->height = builtInPtr->size;
+        predefPtr->native = 1;
+        Tcl_SetHashValue(predefHashPtr, predefPtr);
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpCreateNativeBitmap --
+ *
+ *        Add native bitmaps.
+ *
+ * Results:
+ *        A standard Tcl result.  If an error occurs then TCL_ERROR is
+ *        returned and a message is left in the interp's result.
+ *
+ * Side effects:
+ *        "Name" is entered into the bitmap table and may be used from
+ *        here on to refer to the given bitmap.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Pixmap
+TkpCreateNativeBitmap(
+    Display *display,
+    CONST char * source)                /* Info about the icon to build. */
+{
+    Pixmap pix;
+    GWorldPtr destPort;
+    Rect destRect;
+    Handle icon;
+    CGrafPtr saveWorld;
+    GDHandle saveDevice;
+    NativeIcon *nativeIconPtr;
+    
+    pix = Tk_GetPixmap(display, None, 32, 32, 0);
+    destPort = TkMacOSXGetDrawablePort(pix);
+
+    GetGWorld(&saveWorld, &saveDevice);
+    SetGWorld(destPort, NULL);
+
+    nativeIconPtr = (NativeIcon *) source;
+    SetRect(&destRect, 0, 0, 32, 32);
+    if (nativeIconPtr->type == TYPE1) {
+        RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
+
+        RGBForeColor(&white);
+        PaintRect(&destRect);
+        PlotIconID(&destRect, atAbsoluteCenter, ttNone, nativeIconPtr->id);
+    } else if (nativeIconPtr->type == TYPE2) {
+        icon = GetIcon(nativeIconPtr->id);
+        if (icon != NULL) {
+            RGBColor black = {0, 0, 0};
+        
+            RGBForeColor(&black);
+            PlotIcon(&destRect, icon);
+            ReleaseResource(icon);
+        }
+    }
+
+    SetGWorld(saveWorld, saveDevice);
+    return pix;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpGetNativeAppBitmap --
+ *
+ *        Add native bitmaps.
+ *
+ * Results:
+ *        A standard Tcl result.  If an error occurs then TCL_ERROR is
+ *        returned and a message is left in the interp's result.
+ *
+ * Side effects:
+ *        "Name" is entered into the bitmap table and may be used from
+ *        here on to refer to the given bitmap.
+ *
+ *----------------------------------------------------------------------
+ */
+
+Pixmap
+TkpGetNativeAppBitmap(
+    Display *display,        /* The display. */
+    CONST char *name,        /* The name of the bitmap. */
+    int *width,                /* The width & height of the bitmap. */
+    int *height)
+{
+    Pixmap pix;
+    CGrafPtr saveWorld;
+    GDHandle saveDevice;
+    GWorldPtr destPort;
+    Rect destRect;
+    Handle resource;
+    int type = -1, destWrote;
+    Str255 nativeName;
+    
+    /*
+     * macRoman is the encoding that the resource fork uses.
+     */
+
+    Tcl_UtfToExternal(NULL, Tcl_GetEncoding(NULL, "macRoman"), name,
+            strlen(name), 0, NULL, 
+            (char *) &nativeName[1],
+            255, NULL, &destWrote, NULL); /* Internalize native */
+    nativeName[0] = destWrote;
+
+    resource = GetNamedResource('cicn', nativeName);
+    if (resource != NULL) {
+        type = TYPE3;
+    } else {
+        resource = GetNamedResource('ICON', nativeName);
+        if (resource != NULL) {
+            type = TYPE2;
+        }
+    }
+    
+    if (resource == NULL) {
+        return NULL;
+    }
+    
+    pix = Tk_GetPixmap(display, None, 32, 32, 0);
+    destPort = TkMacOSXGetDrawablePort(pix);
+
+    GetGWorld(&saveWorld, &saveDevice);
+    SetGWorld(destPort, NULL);
+    
+    SetRect(&destRect, 0, 0, 32, 32);
+    if (type == TYPE2) {
+        RGBColor black = {0, 0, 0};
+        
+        RGBForeColor(&black);
+        PlotIcon(&destRect, resource);
+        ReleaseResource(resource);
+    } else if (type == TYPE3) {
+        RGBColor white = {0xFFFF, 0xFFFF, 0xFFFF};
+        short id;
+        ResType theType;
+        Str255 dummy;
+        
+        /*
+         * We need to first paint the background white.  Also, for
+         * some reason we *must* use GetCIcon instead of GetNamedResource
+         * for PlotCIcon to work - so we use GetResInfo to get the id.
+         */
+        RGBForeColor(&white);
+        PaintRect(&destRect);
+        GetResInfo(resource, &id, &theType, dummy);
+        ReleaseResource(resource);
+        resource = (Handle) GetCIcon(id);
+        PlotCIcon(&destRect, (CIconHandle) resource);
+        DisposeCIcon((CIconHandle) resource);
+    }
+    
+    *width = 32;
+    *height = 32;
+    SetGWorld(saveWorld, saveDevice);
+    return pix;
+}