Changeset 498

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);
+
 #ifndef QT_NO_WHEELEVENT
     bool        translateWheelEvent(const QMSG &qmsg);
@@ -729 +730 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // 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 (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
+
+
+
 
         switch(msg) {
@@ -1313 +1323 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*****************************************************************************
   Modal widgets; We have implemented our own modal widget mechanism
@@ -1602 +1655 @@
 //
 
-static ushort mouseTbl[] = {
+static 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
 };
@@ -1969 +2036 @@
             res = res && e.isAccepted();
         }
-
-        if (type != QEvent::MouseMove)
-            pos.rx() = pos.ry() = -9999;        // init for move compression
     }
 
     return res;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/gui/kernel/qwidget_pm.cpp

@@ -71 +71 @@
 extern PFNWP QtOldFrameProc;
 extern MRESULT EXPENTRY QtFrameProc(HWND, ULONG, MPARAM, MPARAM);
+
+
 
 #if !defined(QT_NO_SESSIONMANAGER)
@@ -1161 +1163 @@
                 QtOldFrameProc = oldProc;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             removeSysMenuAccels(fId);