Changeset 52

Timestamp:

Jan 15, 2006, 10:51:59 PM (20 years ago)

Author:

dmik

Message:

Fixed [PM misbehavior]: MouseButtonDblClick messages were delivered to a widget even if it didn't receive the preceeding MouseButtonRelease; as a result, QWorkplace and QTitleBar sysmenu handlers didn't allow to click an MDI widget using a double click on a sysmenu icon.

File:

• trunk/src/kernel/qapplication_pm.cpp (modified) (9 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -1186 +1186 @@
         if ( qApp->activePopupWidget() != 0 ) { // in popup mode
             QWidget* w = QApplication::widgetAt( qmsg.ptl.x, qmsg.ptl.y, TRUE );
-            if ( w )
+            if ( w ) {
+                POINTL ptl = { SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1) };
+                WinMapWindowPoints( qmsg.hwnd, w->winId(), &ptl, 1 );
+                qmsg.mp1 = MPFROM2SHORT( ptl.x, ptl.y );
                 widget = (QETWidget*)w;
+            }
         }
         result = widget->translateMouseEvent( qmsg );
@@ -2454 +2458 @@
 bool QETWidget::translateMouseEvent( const QMSG &qmsg )
 {
+#if 0
+    static const char *msgNames[] = { // 11 items
+        "WM_MOUSEMOVE",
+        "WM_BUTTON1DOWN", "WM_BUTTON1UP", "WM_BUTTON1DBLCLK",
+        "WM_BUTTON2DOWN", "WM_BUTTON2UP", "WM_BUTTON2DBLCLK",
+        "WM_BUTTON3DOWN", "WM_BUTTON3UP", "WM_BUTTON3DBLCLK",
+        "WM_???"
+    };
+    int msgIdx = qmsg.msg - WM_MOUSEMOVE;
+    if (msgIdx < 0 || msgIdx > 9)
+        msgIdx = 10;
+    qDebug( "%s (%04lX): [%08lX/%p:%s/%s] %04hd,%04hd hit=%04hX fl=%04hX",
+            msgNames[msgIdx], qmsg.msg, qmsg.hwnd, this, name(), className(),
+            SHORT1FROMMP(qmsg.mp1), SHORT2FROMMP(qmsg.mp1),
+            SHORT1FROMMP(qmsg.mp2), SHORT2FROMMP(qmsg.mp2) );
+#endif
+    
     static QPoint pos;                          // window pos (y flipped)
     static POINTL gpos = { -1, -1 };            // global pos (y flipped)
@@ -2461 +2482 @@
     int    i;
 
+    // candidate for a double click event
+    static HWND dblClickCandidateWin = 0;
+    
 //@@TODO (dmik): later
 //    if ( sm_blockUserInput ) //block user interaction during session management
@@ -2515 +2539 @@
     state  = translateButtonState( SHORT2FROMMP(qmsg.mp2), type, button ); // button state
 
+    // It seems, that PM remembers only the WM_BUTTONxDOWN message (instead of
+    // the WM_BUTTONxDOWN + WM_BUTTONxUP pair) to detect whether the next button
+    // press should be converted to WM_BUTTONxDBLCLK or not. As a result, the
+    // window gets WM_BUTTONxDBLCLK even if it didn't receive the preceeding
+    // WM_BUTTONxUP (this happens if we issue WinSetCapture() on the first
+    // WM_BUTTONxDOWN), which is obviously wrong and makes problems for QWorkspace
+    // and QTitleBar system menu handlers that don't expect a double click after
+    // they opened a popup menu. dblClickCandidateWin is reset to 0 (see a ***
+    // remmark below) when WinSetCapture is issued that directs messages
+    // to a window other than one received the first WM_BUTTONxDOWN,
+    // so we can fix it here.  Note that if there is more than one popup window,
+    // WinSetCapture is issued only for the first of them, so this code doesn't
+    // prevent MouseButtonDblClick from being delivered to a popup when another
+    // popup gets closed on the first WM_BUTTONxDOWN (Qt/Win32 behaves in the
+    // same way, so it's left for compatibility).
+    if ( type == QEvent::MouseButtonPress ) {
+        dblClickCandidateWin = qmsg.hwnd;
+    } else if ( type == QEvent::MouseButtonDblClick ) {
+        if ( dblClickCandidateWin != qmsg.hwnd )
+            type = QEvent::MouseButtonPress;
+        dblClickCandidateWin = 0;
+    }
+    
     if ( type == QEvent::ContextMenu ) {
         QPoint g = QPoint( qmsg.ptl.x, qmsg.ptl.y );
@@ -2551 +2598 @@
         }
 
-        // PM sends WM_MOUSEMOVE on every WM_BUTTONxDOWN/WM_BUTTONxUP even if
-        // the pointer hasn't actually changed its position, to give us a chance
-        // to update the pointer shape. Here we already did it, but there's no
-        // need to send the duplicate mouse move events across Qt.
-        if ( qmsg.ptl.x == gpos.x && qmsg.ptl.y == gpos.y )
+        // *** PM posts a dummy WM_MOUSEMOVE message (with the same, uncahnged
+        // pointer coordinates) after every WinSetCapture that actually changes
+        // the capture target. I.e., if the argument of WinSetCapture is
+        // NULLHANDLE, a window under the mouse pointer gets this message,
+        // otherwise the specified window gets it unless it is already under the
+        // pointer. We use this info to check whether the window can be a double
+        // click candidate (see above). 
+        if ( qmsg.ptl.x == gpos.x && qmsg.ptl.y == gpos.y ) {
+            if ( dblClickCandidateWin != qmsg.hwnd )
+                dblClickCandidateWin = 0;
             return TRUE;
+        }
 
         gpos = qmsg.ptl;
@@ -2641 +2694 @@
                 popupButtonFocus = 0;
             }
-        } else if ( popupChild ){
+        } else if ( popupChild ) {
             QMouseEvent e( type,
                 popupChild->mapFromGlobal(QPoint(gpos.x,gpos.y)),
@@ -2648 +2701 @@
         } else {
             QMouseEvent e( type, pos, QPoint(gpos.x,gpos.y), button, state );
-            QApplication::sendSpontaneousEvent( popupChild ? popupChild : popup, &e );
+            QApplication::sendSpontaneousEvent( popup, &e );
         }
 
@@ -2659 +2712 @@
             // the popup dissappeared. Replay the event
             QWidget* w = QApplication::widgetAt( gpos.x, gpos.y, TRUE );
-            if (w && !qt_blocked_modal( w ) ) {
-//@@TODO (dmik): do we need this? guess not
-//              if ( QWidget::mouseGrabber() == 0 )
-//                  setAutoCapture( w->winId() );
-
+            if ( w && !qt_blocked_modal( w ) ) {
                 QPoint wpos = w->mapFromGlobal(QPoint(gpos.x, gpos.y));
                 // flip y coordinate
                 wpos.ry() = w->height() - (wpos.y() + 1);
-                MPARAM mp1 = MPFROM2SHORT( wpos.x(), wpos.y() );
-                WinPostMsg( w->winId(), qmsg.msg, mp1, qmsg.mp2 );
+                QMSG newQmsg = qmsg;
+                newQmsg.hwnd = w->winId();
+                newQmsg.mp1 = MPFROM2SHORT( wpos.x(), wpos.y() );
+                ((QETWidget *) w)->translateMouseEvent( newQmsg );
             }
         }
@@ -2693 +2744 @@
         QMouseEvent e( type, pos, QPoint(gpos.x,gpos.y), button, state );
         QApplication::sendSpontaneousEvent( widget, &e );
-//@@TODO (dmik): remove, context menu events are sent through WM_CONTEXTMENU
-//      if ( type == QEvent::MouseButtonRelease && button == RightButton ) {
-//          QContextMenuEvent e2( QContextMenuEvent::Mouse, pos, QPoint(gpos.x,gpos.y), state );
-//          QApplication::sendSpontaneousEvent( widget, &e2 );
-//      }
-
+        
         if ( type != QEvent::MouseMove )
             pos.rx() = pos.ry() = -9999;        // init for move compression