Changeset 498 for trunk/src

Timestamp:

Feb 1, 2010, 12:24:47 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Implemented delivering of QEvent::NonClientAreaMouse* events to top-level widgets (#122).

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (10 diffs)
• qwidget_pm.cpp (modified) (2 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -146 +146 @@
 //  void        markFrameStrutDirty() { data->fstrut_dirty = 1; }
     bool        translateMouseEvent(const QMSG &qmsg);
+    void        translateNonClientMouseEvent(const QMSG &qmsg);
 #ifndef QT_NO_WHEELEVENT
     bool        translateWheelEvent(const QMSG &qmsg);
@@ -729 +730 @@
 }
 
+// QMSG wrapper that translates message coordinates from PM to Qt
+struct QtQmsg : public QMSG
+{
+    QtQmsg(HWND aHwnd, ULONG aMsg, MPARAM aMp1, MPARAM aMp2)
+    {
+        hwnd = aHwnd;
+        msg = aMsg;
+        mp1 = aMp1;
+        mp2 = aMp2;
+        time = WinQueryMsgTime(0);
+
+        isTranslatableMouseEvent =
+            (msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) ||
+            (msg >= WM_EXTMOUSEFIRST && msg <= WM_EXTMOUSELAST);
+
+        if (isTranslatableMouseEvent || msg == WM_CONTEXTMENU) {
+            ptl.x = (short)SHORT1FROMMP(mp1);
+            ptl.y = (short)SHORT2FROMMP(mp1);
+            WinMapWindowPoints(hwnd, HWND_DESKTOP, &ptl, 1);
+        } else {
+            WinQueryMsgPos(0, &ptl);
+        }
+        // flip y coordinate
+        ptl.y = QApplication::desktop()->height() - (ptl.y + 1);
+    }
+
+    bool isTranslatableMouseEvent;
+};
+
 // QtWndProc() receives all messages from the main event loop
 
@@ -745 +775 @@
         QETWidget *widget = 0;
 
-        bool isTranslatableMouseEvent =
-            (msg >= WM_MOUSEFIRST && msg <= WM_MOUSELAST) ||
-            (msg >= WM_EXTMOUSEFIRST && msg <= WM_EXTMOUSELAST);
-
-        QMSG qmsg; // create QMSG structure
-        qmsg.hwnd = hwnd;
-        qmsg.msg = msg;
-        qmsg.mp1 = mp1;
-        qmsg.mp2 = mp2;
-        qmsg.time = WinQueryMsgTime(0);
-
-        if (isTranslatableMouseEvent || msg == WM_CONTEXTMENU) {
-            qmsg.ptl.x = (short)SHORT1FROMMP(mp1);
-            qmsg.ptl.y = (short)SHORT2FROMMP(mp1);
-            WinMapWindowPoints(qmsg.hwnd, HWND_DESKTOP, &qmsg.ptl, 1);
-        } else {
-            WinQueryMsgPos(0, &qmsg.ptl);
-        }
-        // flip y coordinate
-        qmsg.ptl.y = QApplication::desktop()->height() - (qmsg.ptl.y + 1);
+        QtQmsg qmsg(hwnd, msg, mp1, mp2);
 
 #if defined(QT_DEBUGMSGFLOW)
@@ -904 +915 @@
             return rc;
 
-        if (isTranslatableMouseEvent) {
+        if (qmsg.isTranslatableMouseEvent) {
             if (qApp->activePopupWidget() != 0) { // in popup mode
                 QWidget *w = QApplication::widgetAt(qmsg.ptl.x, qmsg.ptl.y);
@@ -1237 +1248 @@
         Q_ASSERT(widget->isWindow());
 
-        QMSG qmsg; // create QMSG structure
-        qmsg.hwnd = hwnd;
-        qmsg.msg = msg;
-        qmsg.mp1 = mp1;
-        qmsg.mp2 = mp2;
+        QtQmsg qmsg(hwnd, msg, mp1, mp2);
 
 #if defined(QT_DEBUGMSGFLOW)
@@ -1250 +1257 @@
         }
 #endif
+
+        if (qmsg.isTranslatableMouseEvent)
+            widget->translateNonClientMouseEvent(qmsg);
 
         switch(msg) {
@@ -1313 +1323 @@
 }
 
+PFNWP QtOldFrameCtlProcs[FID_HORZSCROLL - FID_SYSMENU + 1] = { 0 };
+
+MRESULT EXPENTRY QtFrameCtlProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+    // sanity: this procedure is only for standard frame controls
+    ULONG id = (ULONG)WinQueryWindowUShort(hwnd, QWS_ID);
+    Q_ASSERT(id >= FID_SYSMENU && id <= FID_HORZSCROLL);
+    Q_ASSERT(QtOldFrameCtlProcs[id - FID_SYSMENU]);
+    if (id < FID_SYSMENU || id > FID_HORZSCROLL ||
+        !QtOldFrameCtlProcs[id - FID_SYSMENU])
+        return FALSE;
+
+    do {
+        if (!qApp) // unstable app state
+            break;
+
+        HWND hwndF = WinQueryWindow(hwnd, QW_PARENT);
+        HWND hwndC = WinWindowFromID(hwndF, FID_CLIENT);
+        QETWidget *widget = (QETWidget*)QWidget::find(hwndC);
+        if (!widget) // don't know this widget
+            break;
+
+        Q_ASSERT(widget->isWindow());
+
+        QtQmsg qmsg(hwnd, msg, mp1, mp2);
+
+#if defined(QT_DEBUGMSGFLOW)
+        {
+            QDbgStr str = qStrQMSG(qmsg);
+            if (!str.isEmpty())
+                qDebug() << "*** [FC]" << str;
+        }
+#endif
+
+        if (qmsg.isTranslatableMouseEvent)
+            widget->translateNonClientMouseEvent(qmsg);
+
+    } while(0);
+
+    // call the original window procedure of this frame control
+    return QtOldFrameCtlProcs[id - FID_SYSMENU](hwnd, msg, mp1, mp2);
+}
+
 /*****************************************************************************
   Modal widgets; We have implemented our own modal widget mechanism
@@ -1602 +1655 @@
 //
 
-static ushort mouseTbl[] = {
+static const ushort mouseTbl[] = {
     WM_MOUSEMOVE,           QEvent::MouseMove,                  0,
     WM_BUTTON1DOWN,         QEvent::MouseButtonPress,       Qt::LeftButton,
@@ -1614 +1667 @@
     WM_BUTTON3DBLCLK,   QEvent::MouseButtonDblClick,    Qt::MidButton,
     WM_CONTEXTMENU,     QEvent::ContextMenu,            0,
+    0,                          0,                                              0
+};
+
+static const ushort mouseTblNC[] = {
+    WM_MOUSEMOVE,           QEvent::NonClientAreaMouseMove,                     0,
+    WM_BUTTON1DOWN,         QEvent::NonClientAreaMouseButtonPress,          Qt::LeftButton,
+    WM_BUTTON1UP,           QEvent::NonClientAreaMouseButtonRelease,    Qt::LeftButton,
+    WM_BUTTON1DBLCLK,   QEvent::NonClientAreaMouseButtonDblClick,       Qt::LeftButton,
+    WM_BUTTON2DOWN,         QEvent::NonClientAreaMouseButtonPress,          Qt::RightButton,
+    WM_BUTTON2UP,           QEvent::NonClientAreaMouseButtonRelease,    Qt::RightButton,
+    WM_BUTTON2DBLCLK,   QEvent::NonClientAreaMouseButtonDblClick,       Qt::RightButton,
+    WM_BUTTON3DOWN,         QEvent::NonClientAreaMouseButtonPress,          Qt::MidButton,
+    WM_BUTTON3UP,           QEvent::NonClientAreaMouseButtonRelease,    Qt::MidButton,
+    WM_BUTTON3DBLCLK,   QEvent::NonClientAreaMouseButtonDblClick,       Qt::MidButton,
     0,                          0,                                              0
 };
@@ -1969 +2036 @@
             res = res && e.isAccepted();
         }
-
-        if (type != QEvent::MouseMove)
-            pos.rx() = pos.ry() = -9999;        // init for move compression
     }
 
     return res;
+}
+
+void QETWidget::translateNonClientMouseEvent(const QMSG &qmsg)
+{
+    // this is a greatly simplified version of translateMouseEvent() that
+    // only sends informational non-client area mouse messages to the top-level
+    // widget
+
+    Q_ASSERT(isWindow());
+    Q_ASSERT(internalWinId() != NULLHANDLE);
+
+#if !defined (QT_NO_SESSIONMANAGER)
+    if (sm_blockUserInput) //block user interaction during session management
+        return;
+#endif
+
+    if (qApp->d_func()->inPopupMode()) {
+        // don't report non-client area events in popup mode
+        // (for compatibility with Windows)
+        return;
+    }
+
+    int i;
+    for (i = 0; mouseTblNC[i] && (ULONG)mouseTblNC[i] != qmsg.msg; i += 3)
+        ;
+    if (!mouseTblNC[i])
+        return;
+
+    QEvent::Type type   = (QEvent::Type)mouseTblNC[++i];    // event type
+    int button          = mouseTblNC[++i];                  // which button
+    int state = translateButtonState(SHORT2FROMMP(qmsg.mp2), type, button); // button state
+
+    const QPoint globalPos(QPoint(qmsg.ptl.x, qmsg.ptl.y));
+    const QPoint widgetPos = mapFromGlobal(globalPos);
+
+    QMouseEvent e(type, widgetPos, globalPos, Qt::MouseButton(button),
+                  Qt::MouseButtons(state & Qt::MouseButtonMask),
+                  Qt::KeyboardModifiers(state & Qt::KeyboardModifierMask));
+
+    QApplication::sendSpontaneousEvent(this, &e);
 }
 

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -71 +71 @@
 extern PFNWP QtOldFrameProc;
 extern MRESULT EXPENTRY QtFrameProc(HWND, ULONG, MPARAM, MPARAM);
+extern PFNWP QtOldFrameCtlProcs[FID_HORZSCROLL - FID_SYSMENU + 1];
+extern MRESULT EXPENTRY QtFrameCtlProc(HWND, ULONG, MPARAM, MPARAM);
 
 #if !defined(QT_NO_SESSIONMANAGER)
@@ -1161 +1163 @@
                 QtOldFrameProc = oldProc;
 
+            // subclass all standard frame controls to get non-client mouse events
+            // (note: the size of the ctls array must match QtOldFrameCtlProcs)
+            HWND ctls[FID_HORZSCROLL - FID_SYSMENU + 1];
+            if (WinMultWindowFromIDs(fId, ctls, FID_SYSMENU, FID_HORZSCROLL) > 0) {
+                for (size_t i = 0; i < sizeof(ctls)/sizeof(ctls[0]); ++i) {
+                    if (ctls[i] != NULLHANDLE) {
+                        oldProc = WinSubclassWindow(ctls[i], QtFrameCtlProc);
+                        // remember the old proc only once: it's the same for
+                        // all standard frame control windows.
+                        if (!QtOldFrameCtlProcs[i])
+                            QtOldFrameCtlProcs[i] = oldProc;
+                    }
+                }
+            }
+
             removeSysMenuAccels(fId);