Add QGuiEventDispatcherWin32.

Dispatches Gui events after
DispatchMessage().

Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
Reviewed-by: Morten Sørvig <morten.sorvig@nokia.com>

diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index fc66e9b..d8fc208 100644 (file)
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -643,6 +643,11 @@ QEventDispatcherWin32::~QEventDispatcherWin32()
 {
 }
 
+bool QEventDispatcherWin32::dispatchGuiEvents()
+{
+    return false;
+}
+
 bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
 {
     Q_D(QEventDispatcherWin32);
@@ -745,6 +750,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
                 if (!filterEvent(&msg)) {
                     TranslateMessage(&msg);
                     DispatchMessage(&msg);
+                    dispatchGuiEvents();
                 }
             } else if (waitRet >= WAIT_OBJECT_0 && waitRet < WAIT_OBJECT_0 + nCount) {
                 d->activateEventNotifier(d->winEventNotifierList.at(waitRet - WAIT_OBJECT_0));

diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index 4a7aac0..8d9de7e 100644 (file)
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -104,6 +104,7 @@ public:
 
 protected:
     QEventDispatcherWin32(QEventDispatcherWin32Private &dd, QObject *parent = 0);
+    virtual bool dispatchGuiEvents();
 
 private:
     friend LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp);

diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri
index 1b207b7..cffbf4b 100644 (file)
--- a/src/platformsupport/eventdispatchers/eventdispatchers.pri
+++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri
@@ -8,9 +8,17 @@ HEADERS +=\
     $$PWD/qgenericunixeventdispatcher_p.h\
 }
 
+win32 {
+SOURCES +=\
+    $$PWD/qguieventdispatcherwin32.cpp
+
+HEADERS +=\
+    $$PWD/qguieventdispatcherwin32_p.h
+}
+
 contains(QT_CONFIG, glib) {
     SOURCES +=$$PWD/qeventdispatcher_glib.cpp
     HEADERS +=$$PWD/qeventdispatcher_glib_p.h
     QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
     LIBS_PRIVATE += $$QT_LIBS_GLIB
-}
\ No newline at end of file
+}

diff --git a/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp b/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp
new file mode 100644 (file)
index 0000000..ae44a94
--- /dev/null
+++ b/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qguieventdispatcherwin32_p.h"
+
+#include <QtGui/QWindowSystemInterface>
+#include <private/qguiapplication_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QGuiEventDispatcherWin32::QGuiEventDispatcherWin32(QObject *parent) :
+    QEventDispatcherWin32(parent)
+{
+}
+
+bool QGuiEventDispatcherWin32::dispatchGuiEvents()
+{
+    bool result = false;
+    while (QWindowSystemInterfacePrivate::windowSystemEventsQueued()) {
+        QWindowSystemInterfacePrivate::WindowSystemEvent * event =
+            QWindowSystemInterfacePrivate::getWindowSystemEvent();
+        if (!event)
+            break;
+
+        // send through event filter
+        result = true;
+        if (filterEvent(event)) {
+            delete event;
+            continue;
+        }
+        QGuiApplicationPrivate::processWindowSystemEvent(event);
+        delete event;
+    }
+
+    return result;
+}
+
+QT_END_NAMESPACE

diff --git a/src/platformsupport/eventdispatchers/qguieventdispatcherwin32_p.h b/src/platformsupport/eventdispatchers/qguieventdispatcherwin32_p.h
new file mode 100644 (file)
index 0000000..0fd7008
--- /dev/null
+++ b/src/platformsupport/eventdispatchers/qguieventdispatcherwin32_p.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QGUIEVENTDISPATCHERWIN32_H
+#define QGUIEVENTDISPATCHERWIN32_H
+
+#include <QtCore/private/qeventdispatcher_win_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QGuiEventDispatcherWin32 : public QEventDispatcherWin32
+{
+public:
+    explicit QGuiEventDispatcherWin32(QObject *parent = 0);
+
+protected:
+    virtual bool dispatchGuiEvents();
+};
+
+QT_END_NAMESPACE
+
+#endif // QGUIEVENTDISPATCHERWIN32_H