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

diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
new file mode 100644
index 0000000..7c3474c
--- /dev/null
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -0,0 +1,420 @@
+/*
+ * tkMacOSXKeyEvent.c --
+ *
+ *	This file implements functions that decode & handle keyboard events
+ *      on MacOS X.
+ *
+ *      Copyright 2001, Apple Computer, Inc.
+ *
+ *      The following terms apply to all files originating from Apple
+ *      Computer, Inc. ("Apple") and associated with the software
+ *      unless explicitly disclaimed in individual files.
+ *
+ *
+ *      Apple hereby grants permission to use, copy, modify,
+ *      distribute, and license this software and its documentation
+ *      for any purpose, provided that existing copyright notices are
+ *      retained in all copies and that this notice is included
+ *      verbatim in any distributions. No written agreement, license,
+ *      or royalty fee is required for any of the authorized
+ *      uses. Modifications to this software may be copyrighted by
+ *      their authors and need not follow the licensing terms
+ *      described here, provided that the new terms are clearly
+ *      indicated on the first page of each file where they apply.
+ *
+ *
+ *      IN NO EVENT SHALL APPLE, THE AUTHORS OR DISTRIBUTORS OF THE
+ *      SOFTWARE BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL,
+ *      INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+ *      THIS SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF,
+ *      EVEN IF APPLE OR THE AUTHORS HAVE BEEN ADVISED OF THE
+ *      POSSIBILITY OF SUCH DAMAGE.  APPLE, THE AUTHORS AND
+ *      DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING,
+ *      BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ *      FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS
+ *      SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND APPLE,THE
+ *      AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE
+ *      MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ *      GOVERNMENT USE: If you are acquiring this software on behalf
+ *      of the U.S. government, the Government shall have only
+ *      "Restricted Rights" in the software and related documentation
+ *      as defined in the Federal Acquisition Regulations (FARs) in
+ *      Clause 52.227.19 (c) (2).  If you are acquiring the software
+ *      on behalf of the Department of Defense, the software shall be
+ *      classified as "Commercial Computer Software" and the
+ *      Government shall have only "Restricted Rights" as defined in
+ *      Clause 252.227-7013 (c) (1) of DFARs.  Notwithstanding the
+ *      foregoing, the authors grant the U.S. Government and others
+ *      acting in its behalf permission to use and distribute the
+ *      software in accordance with the terms specified in this
+ *      license.
+ */
+
+#include "tkMacOSXInt.h"
+#include "tkPort.h"
+#include "tkMacOSXEvent.h"
+
+typedef struct {
+    WindowRef   whichWindow;
+    Point       global;
+    Point       local;
+    int         state;
+    char        ch;
+    UInt32      keyCode;
+    UInt32      keyModifiers;
+    UInt32      message;  
+} KeyEventData;
+
+static Tk_Window gGrabWinPtr = NULL;     /* Current grab window, NULL if no grab. */
+static Tk_Window gKeyboardWinPtr = NULL; /* Current keyboard grab window. */
+
+/*
+ * Declarations for functions used only in this file.
+ */
+ 
+static int GenerateKeyEvent _ANSI_ARGS_(( EventKind eKind, 
+        KeyEventData * e, 
+        Window window, 
+        UInt32 savedKeyCode));
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXProcessKeyboardEvent --
+ *
+ *        This routine processes the event in eventPtr, and
+ *        generates the appropriate Tk events from it.
+ *
+ * Results:
+ *        True if event(s) are generated - false otherwise.
+ *
+ * Side effects:
+ *        Additional events may be place on the Tk event queue.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int TkMacOSXProcessKeyboardEvent(
+        TkMacOSXEvent * eventPtr, 
+        MacEventStatus * statusPtr)
+{
+    static UInt32 savedKeyCode = 0;
+    OSStatus     status;
+    KeyEventData keyEventData;
+    Window    window;
+    MenuRef   menuRef;
+    MenuItemIndex menuItemIndex;
+    int eventGenerated;
+    
+    statusPtr->handledByTk = 1;
+    keyEventData.whichWindow = FrontNonFloatingWindow();
+    if (keyEventData.whichWindow == NULL) {
+        return 0;
+    }
+    GetMouse(&keyEventData.local);
+    keyEventData.global = keyEventData.local;
+    LocalToGlobal(&keyEventData.global);
+    keyEventData.state = TkMacOSXButtonKeyState();
+    if (IsMenuKeyEvent(NULL, eventPtr->eventRef, 
+            kNilOptions, &menuRef, &menuItemIndex)) {
+        int    oldMode;
+        MenuID menuID;
+        KeyMap theKeys;
+        int    selection;
+        
+        menuID = GetMenuID(menuRef);
+        selection = (menuID << 16 ) | menuItemIndex;
+    
+        GetKeys(theKeys);
+        oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
+        TkMacOSXClearMenubarActive();
+ 
+        /*
+         * Handle -postcommand
+         */
+         
+         TkMacOSXPreprocessMenu();
+         TkMacOSXHandleMenuSelect(selection, theKeys[1] & 4);
+         Tcl_SetServiceMode(oldMode);
+         return 0; /* TODO: may not be on event on queue. */
+    }
+
+    status = GetEventParameter(eventPtr->eventRef, 
+            kEventParamKeyMacCharCodes,
+            typeChar, NULL,
+            sizeof(keyEventData.ch), NULL,
+            &keyEventData.ch);
+    if (status != noErr) {
+        fprintf(stderr, "Failed to retrieve KeyMacCharCodes\n" );
+        statusPtr->err = 1;
+        return 1;
+    } 
+    status = GetEventParameter(eventPtr->eventRef, 
+            kEventParamKeyCode,
+            typeUInt32, NULL,
+            sizeof(keyEventData.keyCode), NULL,
+            &keyEventData.keyCode);
+    if (status != noErr) {
+        fprintf(stderr, "Failed to retrieve KeyCode\n" );
+        statusPtr->err = 1;
+        return 1;
+    }
+    status = GetEventParameter(eventPtr->eventRef, 
+            kEventParamKeyModifiers,
+            typeUInt32, NULL,
+            sizeof(keyEventData.keyModifiers), NULL,
+            &keyEventData.keyModifiers);
+    if (status != noErr) {
+        fprintf(stderr, "Failed to retrieve KeyModifiers\n" );
+        statusPtr->err = 1;
+        return 1;
+    }
+    keyEventData.message = keyEventData.ch|(keyEventData.keyCode << 8);
+
+    window = TkMacOSXGetXWindow(keyEventData.whichWindow);
+    
+    eventGenerated = GenerateKeyEvent(eventPtr->eKind, &keyEventData,
+				      window, savedKeyCode);
+    
+    if (eventGenerated == 0) {
+	savedKeyCode = keyEventData.message;
+	return false;
+    } else if (eventGenerated == -1) {
+	savedKeyCode = 0;
+	return false;
+    } else {
+	savedKeyCode = 0;
+	return true;
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * GenerateKeyEvent --
+ *
+ *        Given Macintosh keyUp, keyDown & autoKey events this function
+ *        generates the appropiate X key events.  The window that is passed
+ *        should represent the frontmost window - which will recieve the
+ *        event.
+ *
+ * Results:
+ *        1 if an event was generated, 0 if we are waiting for another
+ *        byte of a multi-byte sequence, and -1 for any other error.
+ *
+ * Side effects:
+ *        Additional events may be place on the Tk event queue.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+GenerateKeyEvent( EventKind eKind, 
+        KeyEventData * e, 
+        Window window, 
+        UInt32 savedKeyCode )
+{
+    Tk_Window tkwin;
+    XEvent event;
+    unsigned char byte;
+    char buf[16];
+    TkDisplay *dispPtr;
+    
+    /*
+     * The focus must be in the FrontWindow on the Macintosh.
+     * We then query Tk to determine the exact Tk window
+     * that owns the focus.
+     */
+
+    dispPtr = TkGetDisplayList();
+    tkwin = Tk_IdToWindow(dispPtr->display, window);
+    
+    if (tkwin == NULL) {
+        fprintf(stderr,"tkwin == NULL, %d\n", __LINE__);
+        return -1;
+    }
+    
+    tkwin = (Tk_Window) ((TkWindow *) tkwin)->dispPtr->focusPtr;
+    if (tkwin == NULL) {
+        fprintf(stderr,"tkwin == NULL, %d\n", __LINE__);
+        return -1;
+    }
+    byte = (e->message&charCodeMask);
+    if ((savedKeyCode == 0) && 
+            (Tcl_ExternalToUtf(NULL, TkMacOSXCarbonEncoding, 
+			       (char *) &byte, 1, 0, NULL, 
+                        buf, sizeof(buf), NULL, NULL, NULL) != TCL_OK)) {
+        /*
+         * This event specifies a lead byte.  Wait for the second byte
+         * to come in before sending the XEvent.
+         */
+        fprintf(stderr,"Failed %02x\n", byte);
+        return 0;
+    }   
+
+    event.xany.send_event = False;
+    event.xkey.same_screen = true;
+    event.xkey.subwindow = None;
+    event.xkey.time = TkpGetMS();
+
+    event.xkey.x_root = e->global.h;
+    event.xkey.y_root = e->global.v;
+    Tk_TopCoordsToWindow(tkwin, e->local.h, e->local.v, 
+            &event.xkey.x, &event.xkey.y);
+    
+    event.xkey.keycode = byte |
+        ((savedKeyCode & charCodeMask) << 8) |
+        ((e->message&keyCodeMask) << 8);
+   
+    event.xany.serial = Tk_Display(tkwin)->request;
+    event.xkey.window = Tk_WindowId(tkwin);
+    event.xkey.display = Tk_Display(tkwin);
+    event.xkey.root = XRootWindow(Tk_Display(tkwin), 0);
+    event.xkey.state =  e->state;
+
+    switch(eKind) {
+        case kEventRawKeyDown:
+            event.xany.type = KeyPress;
+            Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+            break;
+        case kEventRawKeyUp:
+            event.xany.type = KeyRelease;
+            Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+            break;
+        case kEventRawKeyRepeat:
+            event.xany.type = KeyRelease;
+            Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+            event.xany.type = KeyPress;
+            Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
+            break;
+        default:
+            break;
+    } 
+    return 1;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XGrabKeyboard --
+ *
+ *        Simulates a keyboard grab by setting the focus.
+ *
+ * Results:
+ *        Always returns GrabSuccess.
+ *
+ * Side effects:
+ *        Sets the keyboard focus to the specified window.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+XGrabKeyboard(
+    Display* display,
+    Window grab_window,
+    Bool owner_events,
+    int pointer_mode,
+    int keyboard_mode,
+    Time time)
+{
+    gKeyboardWinPtr = Tk_IdToWindow(display, grab_window);
+    return GrabSuccess;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XUngrabKeyboard --
+ *
+ *        Releases the simulated keyboard grab.
+ *
+ * Results:
+ *        None.
+ *
+ * Side effects:
+ *        Sets the keyboard focus back to the value before the grab.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+XUngrabKeyboard(
+    Display* display,
+    Time time)
+{
+    gKeyboardWinPtr = NULL;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXGetCapture --
+ *
+ * Results:
+ *      Returns the current grab window
+ * Side effects:
+ *        None.
+ *
+ */
+Tk_Window
+TkMacOSXGetCapture()
+{
+    return gGrabWinPtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpSetCapture --
+ *
+ *        This function captures the mouse so that all future events
+ *        will be reported to this window, even if the mouse is outside
+ *        the window.  If the specified window is NULL, then the mouse
+ *        is released. 
+ *
+ * Results:
+ *        None.
+ *
+ * Side effects:
+ *        Sets the capture flag and captures the mouse.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkpSetCapture(
+    TkWindow *winPtr)                        /* Capture window, or NULL. */
+{
+    while ((winPtr != NULL) && !Tk_IsTopLevel(winPtr)) {
+        winPtr = winPtr->parentPtr;
+    }
+    gGrabWinPtr = (Tk_Window) winPtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tk_SetCaretPos --
+ *
+ *	This enables correct placement of the XIM caret.  This is called
+ *	by widgets to indicate their cursor placement, and the caret
+ *	location is used by TkpGetString to place the XIM caret.
+ *
+ * Results:
+ *	None
+ *
+ * Side effects:
+ *	None
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+Tk_SetCaretPos(tkwin, x, y, height)
+    Tk_Window tkwin;
+    int	      x;
+    int	      y;
+    int	      height;
+{
+}