Changeset 85 for trunk/src/corelib/kernel

Timestamp:

Jul 27, 2009, 7:39:55 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Implemented message queue, finished QEventDispatcherPM (#24).

File:

• trunk/src/corelib/kernel/qeventdispatcher_pm.cpp (modified) (13 diffs)

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -985 +985 @@
     {
     public:
-        AuxWnd() : QPMObjectWindow(true /* deferred */), dispatcher(0) {}
-        void setDispatcher(QEventDispatcherPMPrivate *d) { dispatcher = d; }
+        AuxWnd() : QPMObjectWindow(true /* deferred */) {}
         MRESULT message(ULONG msg, MPARAM mp1, MPARAM mp2);
-        QEventDispatcherPMPrivate *dispatcher;
     private:
         QSet<int> timersInSend;
@@ -998 +996 @@
     bool interrupt;
 
-// @todo later
-//
-//  QList<QMSG> queuedUserInputEvents;
-//  QList<QMSG> queuedSocketEvents;
+    QList<QMSG> queuedUserInputEvents;
+    QList<QMSG> queuedSocketEvents;
 };
 
@@ -1011 +1007 @@
 QEventDispatcherPMPrivate::~QEventDispatcherPMPrivate()
 {
-    auxWnd.setDispatcher(0);
     auxWnd.destroy();
     if (hmq != NULLHANDLE) {
@@ -1045 +1040 @@
     if (auxWnd.hwnd() == NULLHANDLE) {
         createMsgQueue();
-        auxWnd.setDispatcher(this);
         auxWnd.create();
     }
@@ -1102 +1096 @@
 bool QEventDispatcherPM::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
-// @todo later
-#if 0
     Q_D(QEventDispatcherPM);
 
-    if (!d->internalHwnd)
-        createInternalHwnd();
+    if ()
+        ();
 
     d->interrupt = false;
@@ -1114 +1106 @@
     bool canWait;
     bool retVal = false;
+
+
+
+
     do {
         QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);
 
-        DWORD waitRet = 0;
-        HANDLE pHandles[MAXIMUM_WAIT_OBJECTS - 1];
-        QVarLengthArray<MSG> processedTimers;
         while (!d->interrupt) {
-            MSG msg;
+            MSG msg;
             bool haveMessage;
 
@@ -1133 +1126 @@
                 msg = d->queuedSocketEvents.takeFirst();
             } else {
-                haveMessage = winPeekMessage(&msg, 0, 0, 0, PM_REMOVE);
-                if (haveMessage && (flags & QEventLoop::ExcludeUserInputEvents)
-                    && ((msg.message >= WM_KEYFIRST
-                         && msg.message <= WM_KEYLAST)
-                        || (msg.message >= WM_MOUSEFIRST
-                            && msg.message <= WM_MOUSELAST)
-                        || msg.message == WM_MOUSEWHEEL)) {
+                if (haveWaitMsg) {
+                    haveMessage = true;
+                    msg = waitMsg;
+                    haveWaitMsg = false;
+                } else {
+                    haveMessage = WinPeekMsg(d->hab, &msg, 0, 0, 0, PM_REMOVE) == TRUE;
+                }
+                if (haveMessage && (flags & QEventLoop::ExcludeUserInputEvents) &&
+                    (msg.msg == WM_CHAR ||
+                     (msg.msg >= WM_MOUSEFIRST &&
+                      msg.msg <= WM_MOUSELAST) ||
+                     (msg.msg >= WM_EXTMOUSEFIRST &&
+                      msg.msg <= WM_EXTMOUSELAST) ||
+                     msg.msg == WM_HSCROLL ||
+                     msg.msg == WM_VSCROLL)) {
                     // queue user input events for later processing
                     haveMessage = false;
@@ -1145 +1146 @@
                 }
                 if (haveMessage && (flags & QEventLoop::ExcludeSocketNotifiers)
-                    && (msg.message == WM_USER && msg.hwnd == d->internalHwnd)) {
+                    && (msg.m)) {
                     // queue socket events for later processing
                     haveMessage = false;
@@ -1152 +1153 @@
             }
             if (haveMessage) {
-                if (msg.message == WM_TIMER) {
-                    // avoid live-lock by keeping track of the timers we've already sent
-                    bool found = false;
-                    for (int i = 0; !found && i < processedTimers.count(); ++i) {
-                        const MSG processed = processedTimers.constData()[i];
-                        found = (processed.wParam == msg.wParam && processed.hwnd == msg.hwnd && processed.lParam == msg.lParam);
-                    }
-                    if (found)
-                        continue;
-                    processedTimers.append(msg);
-                } else if (msg.message == WM_QUIT) {
+                if (msg.msg == WM_QUIT) {
                     if (QCoreApplication::instance())
                         QCoreApplication::instance()->quit();
@@ -1169 +1160 @@
 
                 if (!filterEvent(&msg)) {
-                    TranslateMessage(&msg);
-                    QT_WA({
-                        DispatchMessage(&msg);
-                    } , {
-                        DispatchMessageA(&msg);
-                    });
+                    WinDispatchMsg(d->hab, &msg);
                 }
             } else {
@@ -1183 +1169 @@
         }
 
-        // still nothing - wait for message or signalled objects
+        // still nothing - wait for message
         QThreadData *data = d->threadData;
         canWait = (!retVal
@@ -1191 +1177 @@
         if (canWait) {
             emit aboutToBlock();
-            waitRet = WinGetMsg(nCount, pHandles, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE);
+            WinGetMsg(d->hab, &waitMsg, 0, 0, 0);
+            haveWaitMsg = true;
             emit awake();
         }
@@ -1197 +1184 @@
 
     return retVal;
-#else
-    return false;
-#endif
 }