* unix/tcl.m4 (Darwin): add 64bit support, check for Tiger copyfile(),

	add CFLAGS to SHLIB_LD to support passing -isysroot in env(CFLAGS) to
	configure (flag can't be present twice, so can't be in both CFLAGS and
	LDFLAGS during configure), don't use -prebind when deploying on 10.4,
	define TCL_IO_TRACK_OS_FOR_DRIVER_WITH_BAD_BLOCKING (rdar://3171542).
	(SC_ENABLE_LANGINFO, SC_TIME_HANDLER): add/fix caching, fix obsolete
	autoconf macros. Sync with tk/unix/tcl.m4, sync whitespace with HEAD.

	* unix/configure.in: fix obsolete autoconf macros, sync gratuitous
	formatting/ordering differences with tcl/unix/configure.in.

	* unix/Makefile.in: add CFLAGS to wish/tktest link to make executable
	linking the same as during configure (needed to avoid loosing any linker
	relevant flags in CFLAGS, in particular flags that can't be in LDFLAGS).
	Avoid concurrent linking of wish and compiling of tkTestInit.o during
	parallel make, fix dependencies and flags for building tkMacOSXInit.o
	(checkstubs, checkexports): dependency and Darwin fixes

	* macosx/tkMacOSXEvent.c (TkMacOSXProcessEvent):
	* macosx/tkMacOSXEvent.h:
	* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent):
	* macosx/tkMacOSXCarbonEvents.c: install standard application event
	handler, add & call functions to start and stop carbon even timer that
	runs the tcl event loop periodically during a nested carbon event loop
	in the toolbox (e.g. during menutracking) to ensure tcl timers etc
	continue to fire, register app event handler for menu tracking and HI
	command carbon events, move menu event handling to new handlers for
	those carbon events, no longer register for/handle appleevent carbon
	event (now dealt with by standard application event handler), event
	debugging code dynamically acquires carbon event debugging functions to
	allow use on Tiger where they are no longer exported from HIToolbox.

	* macosx/tkMacOSXFont.c (TkMacOSXUseAntialiasedText):
	* macosx/tkMacOSXKeyEvent.c (GetKeyboardLayout):
	* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents):
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXInt.h: abstract common code to dynamically acquire
	address of a named symbol (from a loaded dynamic library) into new
	function TkMacOSXGetNamedSymbol() and macro TkMacOSXInitNamedSymbol.

	* macosx/tkMacOSXMenu.c (TkpNewMenu):
	* macosx/tkMacOSXMenubutton.c (MenuButtonInitControl):
	* macosx/tkMacOSXMenus.c (TkMacOSXHandleMenuSelect): switch to  modern
	utf8 aware menu manager API, remove obsolete code, add error handling.

	* macosx/tkMacOSXMouseEvent.c: define OSX 10.3 or later only constants
	if necessary to allow compilation on OSX 10.2

	* macosx/tkMacOSXWm.c (UpdateSizeHints): remove code that is never
	executed.

	* generic/tk.h: add/correct location of version numbers in macosx files.

	* generic/tkInt.h: clarify fat compile comment.

	* macosx/Wish.pbproj/default.pbxuser (new file):
	* macosx/Wish.pbproj/jingham.pbxuser:
	* macosx/Wish.pbproj/project.pbxproj: sync with HEAD.

	* macosx/buildTkConfig.tcl (removed): remove obsolete build files.

	* macosx/README: clarification/cleanup, sync with HEAD, document
	universal (fat) builds via CFLAGS (i.e. ppc and i386 at the same time).

	* macosx/Makefile: add support for reusing configure cache, build target
	fixes.

	* generic/tkMenu.c:
	* macosx/tkMacOSXButton.c:
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXDraw.c:
	* macosx/tkMacOSXEntry.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXXStubs.c:
	* macosx/tkMacOSXSubwindows.c:
	* xlib/xgc.c: declare functions and globals used only in own file as
	static, #ifdef out a few Xlib and aqua functions that are never called
	(sync with HEAD).

	* macosx/tkMacOSXPort.h:
	* generic/tkInt.decls: correct signature of TkMacOSXHandleMenuSelect,
	add XSync to aqua Xlib stubs.

	* generic/tkTest.c: #ifdef unix only declarations.
	(TestmetricsCmd): unify win and mac implementation.

	* generic/tkTextDisp.c:
	* generic/tkTextBTree.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXXStubs.c: fix gcc 4 warnings.

	* macosx/tkMacOSXNotify.c:
	* macosx/tkMacOSXTest.c: sync with HEAD.

	* generic/tkIntPlatDecls.h:
	* generic/tkIntXlibDecls.h:
	* generic/tkStubInit.c:
	* unix/configure: regen.


FossilOrigin-Name: e15439740934613543af9b3024f2456fd10812eb

1 files changed, 11 insertions, 59 deletions

diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 10b430e..1da09ba 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -50,7 +50,7 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.6.2.5 2005/09/10 14:54:17 das Exp $
+ * RCS: @(#) $Id: tkMacOSXKeyEvent.c,v 1.6.2.6 2005/11/27 02:36:46 das Exp $
  */
 
 #include "tkMacOSXInt.h"
@@ -61,7 +61,7 @@ typedef struct {
     WindowRef   whichWindow;
     Point       global;
     Point       local;
-    int         state;
+    unsigned int state;
     unsigned char ch;
     UInt32      keyCode;
     UInt32      keyModifiers;
@@ -97,8 +97,6 @@ static int GenerateKeyEvent (
         UInt32 savedModifiers,
         const UniChar * chars, int numChars);
 
-static void KLSInit(void);
-
 static int GetKeyboardLayout (
         Ptr * resourcePtr, TextEncoding * encodingPtr);
 static TextEncoding GetKCHREncoding(
@@ -558,23 +556,6 @@ InitKeyEvent(
 
 
 /*
- *----------------------------------------------------------------------
- *
- * KLSInit --
- *
- *      Dynamically initialize Keyboard Layout Services bindings.
- *
- * Side effects:
- *      Sets some function pointers (hopefully).
- *
- *----------------------------------------------------------------------
- */
-
-#include <mach-o/dyld.h>
-
-static int KLSIsInitialized = false;
-
-/*
  * If we have old headers, we need to define these types and constants
  * ourself.  We use preprocessor macros instead of enums and typedefs,
  * because macros work even in case of version misunderstandings, while
@@ -590,35 +571,6 @@ static int KLSIsInitialized = false;
 #define kKLIdentifier 2
 #endif
 
-static OSStatus (*KLGetCurrentKeyboardLayoutPtr)(
-    KeyboardLayoutRef *         oKeyboardLayout)    = NULL;
-static OSStatus (*KLGetKeyboardLayoutPropertyPtr)(
-    KeyboardLayoutRef           iKeyboardLayout,
-    KeyboardLayoutPropertyTag   iPropertyTag,
-    const void **               oValue)             = NULL;
-
-static void
-KLSInit(void)
-{
-    static const char MODULE[] = "HIToolbox";
-    static const char GET_LAYOUT[] = "_KLGetCurrentKeyboardLayout";
-    static const char GET_PROP[] = "_KLGetKeyboardLayoutProperty";
-
-    NSSymbol symbol;
-
-    if (NSIsSymbolNameDefinedWithHint(GET_LAYOUT, MODULE)) {
-        symbol = NSLookupAndBindSymbolWithHint(GET_LAYOUT, MODULE);
-        KLGetCurrentKeyboardLayoutPtr = NSAddressOfSymbol(symbol);
-    }
-    if (NSIsSymbolNameDefinedWithHint(GET_PROP, MODULE)) {
-        symbol = NSLookupAndBindSymbolWithHint(GET_PROP, MODULE);
-        KLGetKeyboardLayoutPropertyPtr = NSAddressOfSymbol(symbol);
-    }
-
-    KLSIsInitialized = true;
-}
-
-
 /*
  *----------------------------------------------------------------------
  *
@@ -662,18 +614,18 @@ GetKeyboardLayout (Ptr * resourcePtr, TextEncoding * encodingPtr)
 
     currentKeyScript = GetScriptManagerVariable(smKeyScript);
 
-    if (!KLSIsInitialized) {
-        KLSInit();
-    }
-
-    if (KLGetCurrentKeyboardLayoutPtr != NULL) {
+    TkMacOSXInitNamedSymbol(HIToolbox, OSStatus, KLGetCurrentKeyboardLayout,
+            KeyboardLayoutRef*);
+    TkMacOSXInitNamedSymbol(HIToolbox, OSStatus, KLGetKeyboardLayoutProperty,
+            KeyboardLayoutRef, KeyboardLayoutPropertyTag, const void**);
+    if (KLGetCurrentKeyboardLayout && KLGetKeyboardLayoutProperty) {
 
         /*
          * Use the Keyboard Layout Services (these functions only exist since
          * 10.2).
          */
 
-        (*KLGetCurrentKeyboardLayoutPtr)(&currentLayout);
+        KLGetCurrentKeyboardLayout(&currentLayout);
 
         if (currentLayout != NULL) {
 
@@ -684,7 +636,7 @@ GetKeyboardLayout (Ptr * resourcePtr, TextEncoding * encodingPtr)
              * also change and it could still be the same layoutid.
              */
 
-            (*KLGetKeyboardLayoutPropertyPtr)(currentLayout, kKLIdentifier,
+            KLGetKeyboardLayoutProperty(currentLayout, kKLIdentifier,
                     (const void**)&currentLayoutId);
 
             if ((lastLayout != currentLayout)
@@ -705,12 +657,12 @@ GetKeyboardLayout (Ptr * resourcePtr, TextEncoding * encodingPtr)
                 uchr = NULL;
                 KCHR = NULL;
 
-                if (((*KLGetKeyboardLayoutPropertyPtr)(currentLayout,
+                if ((KLGetKeyboardLayoutProperty(currentLayout,
                                         kKLuchrData, (const void**)&uchr)
                                 == noErr)
                         && (uchr != NULL)) {
                     /* done */
-                } else if (((*KLGetKeyboardLayoutPropertyPtr)(currentLayout,
+                } else if ((KLGetKeyboardLayoutProperty(currentLayout,
                                         kKLKCHRData, (const void**)&KCHR)
                                 == noErr)
                         && (KCHR != NULL)) {