Changeset 98 for trunk/src

Timestamp:

Aug 3, 2009, 11:30:38 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added deferred window size/move request processing.

Location:

trunk/src

Files:

• corelib/kernel/qeventdispatcher_pm.cpp (modified) (1 diff)
• corelib/kernel/qeventdispatcher_pm_p.h (modified) (1 diff)
• gui/kernel/qapplication_pm.cpp (modified) (2 diffs)

trunk/src/corelib/kernel/qeventdispatcher_pm.cpp

@@ -1325 +1325 @@
 }
 
+void QEventDispatcherPM::createMsgQueue()
+{
+    Q_D(QEventDispatcherPM);
+    if (d->hmq == NULLHANDLE)
+        d->createMsgQueue();
+}
+
 QT_END_NAMESPACE

trunk/src/corelib/kernel/qeventdispatcher_pm_p.h

@@ -90 +90 @@
     void startingUp();
     void closingDown();
+
+    void createMsgQueue();
 };
 

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -53 +53 @@
 
 #include "qset.h"
+
+#include "private/qeventdispatcher_pm_p.h"
 
 #include "qwidget_p.h"
@@ -270 +272 @@
  *****************************************************************************/
 
+struct QPMConfigRequest {
+    WId         id; // widget to be configured
+    int         req; // 0=move, 1=resize, 2=setGeo
+    int         x, y, w, h; // request parameters
+};
+
+Q_GLOBAL_STATIC(QList<QPMConfigRequest*>, configRequests);
+
+void qPMRequestConfig(WId id, int req, int x, int y, int w, int h)
+{
+    QPMConfigRequest *r = new QPMConfigRequest;
+    r->id = id;
+    r->req = req;
+    r->x = x;
+    r->y = y;
+    r->w = w;
+    r->h = h;
+    configRequests()->append(r);
+}
+
 /*****************************************************************************
     GUI event dispatcher
  *****************************************************************************/
 
+class QGuiEventDispatcherPM : public QEventDispatcherPM
+{
+    Q_DECLARE_PRIVATE(QEventDispatcherPM)
+public:
+    QGuiEventDispatcherPM(QObject *parent = 0);
+    bool processEvents(QEventLoop::ProcessEventsFlags flags);
+};
+
+QGuiEventDispatcherPM::QGuiEventDispatcherPM(QObject *parent)
+    : QEventDispatcherPM(parent)
+{
+    // pre-create the message queue early as we'll need it anyway in GUI mode
+    createMsgQueue();
+}
+
+bool QGuiEventDispatcherPM::processEvents(QEventLoop::ProcessEventsFlags flags)
+{
+    if (!QEventDispatcherPM::processEvents(flags))
+        return false;
+
+    QPMConfigRequest *r;
+    for (;;) {
+        if (configRequests()->isEmpty())
+            break;
+        r = configRequests()->takeLast();
+        QWidget *w = QWidget::find(r->id);
+        QRect rect(r->x, r->y, r->w, r->h);
+        int req = r->req;
+        delete r;
+
+        if (w) { // widget exists
+            if (w->testAttribute(Qt::WA_WState_ConfigPending))
+                break; // biting our tail
+            if (req == 0)
+                w->move(rect.topLeft());
+            else if (req == 1)
+                w->resize(rect.size());
+            else
+                w->setGeometry(rect);
+        }
+    }
+
+    return true;
+}
+
 void QApplicationPrivate::createEventDispatcher()
 {
-    // @todo implement
+    Q_Q(QApplication);
+    if (q->type() != QApplication::Tty)
+        eventDispatcher = new QGuiEventDispatcherPM(q);
+    else
+        eventDispatcher = new QEventDispatcherPM(q);
 }