348398 Double-clicking deselected tree item in background window opens previously selected item. Kill double-clicks when activating or deactivating a window, or on keypresses or text input. r=josh sr=pink

widget/src/mac/nsMacEventHandler.cpp

@@ -359,6 +359,8 @@ nsMacEventHandler::nsMacEventHandler(nsMacWindow* aTopLevelWidget,
 
   mMouseInWidgetHit = PR_FALSE;
 
+  ClearLastMouseUp();
+
   if (aEventDispatchHandler) {
     mEventDispatchHandler = aEventDispatchHandler;
     mOwnEventDispatchHandler = PR_FALSE;
@@ -367,11 +369,6 @@ nsMacEventHandler::nsMacEventHandler(nsMacWindow* aTopLevelWidget,
     mEventDispatchHandler = new nsMacEventDispatchHandler();
     mOwnEventDispatchHandler = PR_TRUE;
   }
-
-  if (sLastActive == this) {
-    // This shouldn't happen
-    sLastActive = nsnull;
-  }
 }
 
 
@@ -386,6 +383,11 @@ nsMacEventHandler::~nsMacEventHandler()
 
 	if (mOwnEventDispatchHandler)
 		delete mEventDispatchHandler;
+
+  if (sLastActive == this) {
+    // This shouldn't happen
+    sLastActive = nsnull;
+  }
 }
 
 
@@ -1078,6 +1080,8 @@ IsContextMenuKey(const nsKeyEvent& inKeyEvent)
 //-------------------------------------------------------------------------
 PRBool nsMacEventHandler::HandleUKeyEvent(const PRUnichar* text, long charCount, EventRecord& aOSEvent)
 {
+  ClearLastMouseUp();
+
   // The focused widget changed in HandleKeyUpDownEvent, so no NS_KEY_PRESS
   // events should be generated.
   if (mKeyIgnore)
@@ -1155,6 +1159,8 @@ PRBool nsMacEventHandler::HandleUKeyEvent(const PRUnichar* text, long charCount,
 //-------------------------------------------------------------------------
 void nsMacEventHandler::HandleActivateEvent(EventRef aEvent)
 {
+  ClearLastMouseUp();
+
   OSErr err;
   PRUint32 eventKind = ::GetEventKind(aEvent);
   PRBool isActive = (eventKind == kEventWindowActivated) ? PR_TRUE : PR_FALSE;
@@ -1721,18 +1727,14 @@ void nsMacEventHandler::ConvertOSEventToMouseEvent(
 														nsMouseEvent&		aMouseEvent,
 														PRUint32				aMessage)
 {
-	static UInt32	sLastMouseUp = 0;
-	static Point	sLastWhere = {0};
-	static SInt16	sLastClickCount = 0;
-	
 	// we're going to time double-clicks from mouse *up* to next mouse *down*
 	if (aMessage == NS_MOUSE_LEFT_BUTTON_UP  ||
       aMessage == NS_MOUSE_RIGHT_BUTTON_UP ||
       aMessage == NS_MOUSE_MIDDLE_BUTTON_UP)
 	{
 		// remember when this happened for the next mouse down
-		sLastMouseUp = aOSEvent.when;
-		sLastWhere = aOSEvent.where;
+		mLastMouseUpWhen = aOSEvent.when;
+		mLastMouseUpWhere = aOSEvent.where;
 	}
 	else if (aMessage == NS_MOUSE_LEFT_BUTTON_DOWN  ||
            aMessage == NS_MOUSE_RIGHT_BUTTON_DOWN ||
@@ -1741,19 +1743,19 @@ void nsMacEventHandler::ConvertOSEventToMouseEvent(
 		// now look to see if we want to convert this to a double- or triple-click
 		const short kDoubleClickMoveThreshold	= 5;
 		
-		if (((aOSEvent.when - sLastMouseUp) < ::GetDblTime()) &&
-				(((abs(aOSEvent.where.h - sLastWhere.h) < kDoubleClickMoveThreshold) &&
-				 	(abs(aOSEvent.where.v - sLastWhere.v) < kDoubleClickMoveThreshold))))
+		if (((aOSEvent.when - mLastMouseUpWhen) < ::GetDblTime()) &&
+				(((abs(aOSEvent.where.h - mLastMouseUpWhere.h) < kDoubleClickMoveThreshold) &&
+				 	(abs(aOSEvent.where.v - mLastMouseUpWhere.v) < kDoubleClickMoveThreshold))))
 		{		
-			sLastClickCount ++;
+			mClickCount ++;
 			
-//			if (sLastClickCount == 2)
+//			if (mClickCount == 2)
 //				aMessage = NS_MOUSE_LEFT_DOUBLECLICK;
 		}
 		else
 		{
 			// reset the click count, to count *this* click
-			sLastClickCount = 1;
+			mClickCount = 1;
 		}
 	}
 
@@ -1825,7 +1827,7 @@ void nsMacEventHandler::ConvertOSEventToMouseEvent(
         widgetHit = mTopLevelWidget;
 
     InitializeMouseEvent(aMouseEvent, widgetHitPoint, aOSEvent.modifiers,
-                         sLastClickCount);
+                         mClickCount);
 
     // nsEvent
     aMouseEvent.message     = aMessage;
@@ -2249,6 +2251,8 @@ PRBool
 nsMacEventHandler::HandleKeyUpDownEvent(EventHandlerCallRef aHandlerCallRef,
                                         EventRef aEvent)
 {
+  ClearLastMouseUp();
+
   PRUint32 eventKind = ::GetEventKind(aEvent);
   NS_ASSERTION(eventKind == kEventRawKeyDown ||
                eventKind == kEventRawKeyUp,
@@ -2347,6 +2351,8 @@ PRBool
 nsMacEventHandler::HandleKeyModifierEvent(EventHandlerCallRef aHandlerCallRef,
                                           EventRef aEvent)
 {
+  ClearLastMouseUp();
+
   PRBool handled = PR_FALSE;
   nsWindow* focusedWidget = mEventDispatchHandler->GetActive();
   if (!focusedWidget)
@@ -2412,3 +2418,12 @@ nsMacEventHandler::HandleKeyModifierEvent(EventHandlerCallRef aHandlerCallRef,
   mLastModifierState = modifiers;
   return handled;
 }
+
+void
+nsMacEventHandler::ClearLastMouseUp()
+{
+  mLastMouseUpWhere.h = 0;
+  mLastMouseUpWhere.v = 0;
+  mLastMouseUpWhen = 0;
+  mClickCount = 0;
+}

widget/src/mac/nsMacEventHandler.h

@@ -167,6 +167,7 @@ protected:
 		                           const Point& aMouseLoc,
 		                           nsWindow* aWindow,
 		                           PRUint32 aModifiers);
+		void ClearLastMouseUp();
 
 protected:
 	nsMacEventDispatchHandler* mEventDispatchHandler;
@@ -175,6 +176,9 @@ protected:
 	TSMDocumentID	mTSMDocument;
 	nsPoint 		mIMEPos;
 	nsAutoString		*mIMECompositionStr;
+	Point				mLastMouseUpWhere;
+	UInt32				mLastMouseUpWhen;
+	PRUint32			mClickCount;
 	PRUint32			mLastModifierState;
 	PRPackedBool			mIMEIsComposing;
 	PRPackedBool			mKeyIgnore;