* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): check if

	process is in front on MouseDown, otherwise request process activation
	from BringWindowForward() via new isFrontProcess param.

	* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents): register our
	event handler on the dispatcher target for all carbon events of interest
	to TkAqua; this replaces event processing directly from the event queue
	and thus allows to capture events that are syntesized by Carbon and sent
	directly to the dispatcher and not to the event queue.

	* macosx/tkMacOSXEvent.c: remove TkMacOSXCountAndProcessMacEvents(),
	rename ReceiveAndProcessEvent() to TkMacOSXReceiveAndProcessEvent().
	(TkMacOSXReceiveAndProcessEvent): remove tk event processing before
	sending events to the dispatcher, all events of interest are now
	processed in our dispatcher target event handler.

	* macosx/tkMacOSXNotify.c (CarbonEventsCheckProc): dispatch events
	directly via TkMacOSXReceiveAndProcessEvent(), but dispatch no more than
	four carbon events at one time to avoid starving other event sources.

	* macosx/tkMacOSXEvent.c: formatting cleanup, move XSync() to XStubs,
	* macosx/tkMacOSXEvent.h: removed obsolete kEventClassWish handling.
	* macosx/tkMacOSXXStubs.c

	* macosx/tkMacOSXEvent.h: declare macosx internal procs as MODULE_SCOPE.
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMouseEvent.c:
	* macosx/tkMacOSXWindowEvent.c:

	* macosx/tkMacOSXButton.c: conditionalize all debug message printing to
	* macosx/tkMacOSXCursor.c: stderr via TK_MAC_DEBUG define.
	* macosx/tkMacOSXDebug.c:
	* macosx/tkMacOSXDebug.h:
	* macosx/tkMacOSXDialog.c:
	* macosx/tkMacOSXEvent.c:
	* macosx/tkMacOSXInit.c:
	* macosx/tkMacOSXKeyEvent.c:
	* macosx/tkMacOSXMenu.c:
	* macosx/tkMacOSXMenubutton.c:
	* macosx/tkMacOSXScale.c:
	* macosx/tkMacOSXWindowEvent.c:
	* macosx/tkMacOSXWm.c:

	* unix/configure.in: define TK_MAC_DEBUG on aqua when symbols enabled.
	* unix/configure: autoconf-2.59
	* unix/tkConfig.h.in: autoheader-2.59

	* library/listbox.tcl: synced aqua MouseWheel bindings with
	* library/scrlbar.tcl: core-8-4-branch.
	* library/text.tcl:

	* xlib/xcolors.c: fixed warning

1 files changed, 33 insertions, 34 deletions

diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 163e232..a8414f3 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -50,7 +50,7 @@
  *      software in accordance with the terms specified in this
  *      license.
  *
- * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.13 2005/08/09 07:39:21 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.14 2005/09/10 14:53:21 das Exp $
  */
 
 #include "tkInt.h"
@@ -82,7 +82,7 @@ static int gEatButtonUp = 0;	   /* 1 if we need to eat the next * up event */
  * Declarations of functions used only in this file.
  */
 
-static void BringWindowForward _ANSI_ARGS_((WindowRef wRef));
+static void BringWindowForward(WindowRef wRef, Boolean isFrontProcess);
 static int GeneratePollingEvents(MouseEventData * medPtr);
 static int GenerateMouseWheelEvent(MouseEventData * medPtr);
 static int GenerateButtonEvent(MouseEventData * medPtr);
@@ -110,7 +110,7 @@ extern void TkMacOSXSetEatButtonUp(int f);
  *----------------------------------------------------------------------
  */
 
-int
+MODULE_SCOPE int
 TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
 {
     Tk_Window	   tkwin;
@@ -201,8 +201,10 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
 		typeLongInteger, NULL,
 		sizeof(long), NULL, &medPtr->delta);
 	if (status != noErr ) {
+#ifdef TK_MAC_DEBUG
 	     fprintf (stderr,
-		 "Failed to retrieve mouse wheel delta, %d\n", (int)status);
+		 "Failed to retrieve mouse wheel delta, %d\n", (int) status);
+#endif
 	     statusPtr->err = 1;
 	     return false;
 	 }
@@ -231,9 +233,18 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
 	 * the corresponding mouse-up to be reported to the application
 	 * or else it will mess up some Tk scripts.
 	 */
-	 
+
+	ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess};
+	Boolean		    isFrontProcess = true;
+
+	status = GetFrontProcess(&frontPsn);
+	if (status == noErr) {
+	    SameProcess(&frontPsn, &ourPsn, &isFrontProcess);
+	}
+
 	if (!(TkpIsWindowFloating(medPtr->whichWin))
-		&& (medPtr->whichWin != medPtr->activeNonFloating)) {
+		&& (medPtr->whichWin != medPtr->activeNonFloating
+		|| !isFrontProcess)) {
 	    Tk_Window grabWin = TkMacOSXGetCapture();
 	    if ((grabWin == NULL)) {
 		int grabState = TkGrabState((TkWindow*)tkwin);
@@ -241,7 +252,9 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
 		    /* Now we want to set the focus to the local grabWin */
 		    TkMacOSXSetEatButtonUp(true);
 		    grabWin = (Tk_Window) (((TkWindow*)tkwin)->dispPtr->grabWinPtr);
-		    BringWindowForward(GetWindowFromPort(TkMacOSXGetDrawablePort(((TkWindow*)grabWin)->window)));
+		    BringWindowForward(GetWindowFromPort(
+		            TkMacOSXGetDrawablePort(((TkWindow*)grabWin)->window)),
+		            isFrontProcess);
 		    statusPtr->stopProcessing = 1;
 		    return false;
 		}
@@ -252,7 +265,9 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
 		grb = (TkWindow *)grabWin;
 		/* Now we want to set the focus to the global grabWin */
 		TkMacOSXSetEatButtonUp(true);
-		BringWindowForward(GetWindowFromPort(TkMacOSXGetDrawablePort(((TkWindow*)grabWin)->window)));
+		BringWindowForward(GetWindowFromPort(
+			TkMacOSXGetDrawablePort(((TkWindow*)grabWin)->window)),
+			isFrontProcess);
 		statusPtr->stopProcessing = 1;
 		return false;
 	    }
@@ -265,13 +280,12 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr)
                 return result;
             } else {
                 TkMacOSXSetEatButtonUp(true);
-                BringWindowForward(medPtr->whichWin);
+                BringWindowForward(medPtr->whichWin, isFrontProcess);
                 return false;
             }
 	}
     }
 
-    
     if ((result = HandleWindowTitlebarMouseDown(medPtr, tkwin)) != -1) {
         return result;
     }
@@ -488,32 +502,17 @@ GeneratePollingEvents(MouseEventData * medPtr)
  */
 
 static void
-BringWindowForward(WindowRef wRef)
+BringWindowForward(WindowRef wRef, Boolean isFrontProcess)
 {
-    do {
-	ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess};
-	Boolean		    flag;
-	int		    err;
-	
-	err = GetFrontProcess(&frontPsn);
-	if (err != noErr) {
-	    fprintf(stderr, "GetFrontProcess failed, %d\n", err);
-	    break;
+    if (!isFrontProcess) {
+	ProcessSerialNumber ourPsn = {0, kCurrentProcess};
+	OSStatus status = SetFrontProcess(&ourPsn);
+	if (status != noErr) {
+#ifdef TK_MAC_DEBUG
+	    fprintf(stderr,"SetFrontProcess failed, %d\n", (int) status);
+#endif
 	}
-	err = SameProcess(&frontPsn, &ourPsn, &flag);
-	if (err != noErr) {
-	    fprintf(stderr, "SameProcess failed, %d\n", err);
-	    break;
-	} else {
-	    if (!flag) {
-		err = SetFrontProcess(&ourPsn);
-		if (err != noErr) {
-		    fprintf(stderr,"SetFrontProcess failed,%d\n", err);
-		    break;
-		}
-	    }
-	}
-    } while (0);
+    }
     
     if (!TkpIsWindowFloating(wRef)) {
 	if (IsValidWindowPtr(wRef))