Ensure sendPostedEvents() can be called independently
If Qt is not running its own event loop (e.g. if Qt is a plugin running in a non-Qt host application with its own event loop, a call to sendPostedEvents() should process all events by default, and not depend on the flags passed to the last call to processEvents() We also modify sendPostedEvents() to call its base implementation instead of directly calling QCoreApplication::sendPostedEvents(). (The behavior of the base implementation is the same, so no behavior change there). This also adds a test for QWindow event handling without Qts event loop is running. This is a black box test, just to ensure that basic functionality is working. It can be extended later. Task-number: QTBUG-45956 Change-Id: I7d688c0c6dec5f133fb495f07526debdde5389af Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
This commit is contained in:
parent
7010da2e62
commit
17aaaad653
@ -67,18 +67,20 @@ QWindowsGuiEventDispatcher::QWindowsGuiEventDispatcher(QObject *parent) :
|
||||
|
||||
bool QWindowsGuiEventDispatcher::processEvents(QEventLoop::ProcessEventsFlags flags)
|
||||
{
|
||||
const QEventLoop::ProcessEventsFlags oldFlags = m_flags;
|
||||
m_flags = flags;
|
||||
if (QWindowsContext::verbose > 2 && lcQpaEvents().isDebugEnabled())
|
||||
qCDebug(lcQpaEvents) << '>' << __FUNCTION__ << objectName() << flags;
|
||||
const bool rc = QEventDispatcherWin32::processEvents(flags);
|
||||
if (QWindowsContext::verbose > 2 && lcQpaEvents().isDebugEnabled())
|
||||
qCDebug(lcQpaEvents) << '<' << __FUNCTION__ << "returns" << rc;
|
||||
m_flags = oldFlags;
|
||||
return rc;
|
||||
}
|
||||
|
||||
void QWindowsGuiEventDispatcher::sendPostedEvents()
|
||||
{
|
||||
QCoreApplication::sendPostedEvents();
|
||||
QEventDispatcherWin32::sendPostedEvents();
|
||||
QWindowSystemInterface::sendWindowSystemEvents(m_flags);
|
||||
}
|
||||
|
||||
|
@ -24,6 +24,8 @@ SUBDIRS=\
|
||||
qopenglwindow \
|
||||
qrasterwindow
|
||||
|
||||
win32:!wince*:!winrt: SUBDIRS += noqteventloop
|
||||
|
||||
!qtHaveModule(widgets): SUBDIRS -= \
|
||||
qmouseevent_modal \
|
||||
qtouchevent
|
||||
|
8
tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
Normal file
8
tests/auto/gui/kernel/noqteventloop/noqteventloop.pro
Normal file
@ -0,0 +1,8 @@
|
||||
CONFIG += testcase
|
||||
TARGET = tst_noqteventloop
|
||||
|
||||
QT += core-private gui-private testlib
|
||||
|
||||
SOURCES += tst_noqteventloop.cpp
|
||||
|
||||
contains(QT_CONFIG,dynamicgl):win32:!wince*:!winrt: LIBS += -luser32
|
271
tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
Normal file
271
tests/auto/gui/kernel/noqteventloop/tst_noqteventloop.cpp
Normal file
@ -0,0 +1,271 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2015 The Qt Company Ltd.
|
||||
** Contact: http://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the test suite of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL21$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see http://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at http://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 or version 3 as published by the Free
|
||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
||||
** following information to ensure the GNU Lesser General Public License
|
||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** As a special exception, The Qt Company gives you certain additional
|
||||
** rights. These rights are described in The Qt Company LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
#include <QEvent>
|
||||
#include <QtCore/qthread.h>
|
||||
#include <QtGui/qguiapplication.h>
|
||||
|
||||
#include <QtCore/qt_windows.h>
|
||||
|
||||
class tst_NoQtEventLoop : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void initTestCase();
|
||||
void cleanup();
|
||||
void consumeMouseEvents();
|
||||
|
||||
};
|
||||
|
||||
void tst_NoQtEventLoop::initTestCase()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_NoQtEventLoop::cleanup()
|
||||
{
|
||||
}
|
||||
|
||||
class Window : public QWindow
|
||||
{
|
||||
public:
|
||||
Window(QWindow *parentWindow = 0) : QWindow(parentWindow)
|
||||
{
|
||||
}
|
||||
|
||||
void reset()
|
||||
{
|
||||
m_received.clear();
|
||||
}
|
||||
|
||||
bool event(QEvent *event)
|
||||
{
|
||||
m_received[event->type()]++;
|
||||
return QWindow::event(event);
|
||||
}
|
||||
|
||||
int received(QEvent::Type type)
|
||||
{
|
||||
return m_received.value(type, 0);
|
||||
}
|
||||
|
||||
|
||||
QHash<QEvent::Type, int> m_received;
|
||||
};
|
||||
|
||||
bool g_exit = false;
|
||||
|
||||
extern "C" LRESULT QT_WIN_CALLBACK wndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
if (message == WM_SHOWWINDOW && wParam == 0)
|
||||
g_exit = true;
|
||||
return DefWindowProc(hwnd, message, wParam, lParam);
|
||||
}
|
||||
|
||||
class TestThread : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
TestThread(HWND parentWnd, Window *childWindow) : QThread(), m_hwnd(parentWnd), m_childWindow(childWindow) {
|
||||
m_screenW = ::GetSystemMetrics(SM_CXSCREEN);
|
||||
m_screenH = ::GetSystemMetrics(SM_CYSCREEN);
|
||||
}
|
||||
|
||||
enum {
|
||||
MouseClick,
|
||||
MouseMove
|
||||
};
|
||||
|
||||
void mouseInput(int command, const QPoint &p = QPoint())
|
||||
{
|
||||
INPUT mouseEvent;
|
||||
mouseEvent.type = INPUT_MOUSE;
|
||||
MOUSEINPUT &mi = mouseEvent.mi;
|
||||
mi.mouseData = 0;
|
||||
mi.time = 0;
|
||||
mi.dwExtraInfo = 0;
|
||||
mi.dx = 0;
|
||||
mi.dy = 0;
|
||||
switch (command) {
|
||||
case MouseClick:
|
||||
mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
|
||||
::SendInput(1, &mouseEvent, sizeof(INPUT));
|
||||
::Sleep(50);
|
||||
mi.dwFlags = MOUSEEVENTF_LEFTUP;
|
||||
::SendInput(1, &mouseEvent, sizeof(INPUT));
|
||||
break;
|
||||
case MouseMove:
|
||||
mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE;
|
||||
mi.dx = p.x() * 65536 / m_screenW;
|
||||
mi.dy = p.y() * 65536 / m_screenH;
|
||||
::SendInput(1, &mouseEvent, sizeof(INPUT));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void mouseClick()
|
||||
{
|
||||
mouseInput(MouseClick);
|
||||
}
|
||||
|
||||
void mouseMove(const QPoint &pt)
|
||||
{
|
||||
mouseInput(MouseMove, pt);
|
||||
}
|
||||
|
||||
|
||||
void run() {
|
||||
struct ScopedCleanup
|
||||
{
|
||||
/* This is in order to ensure that the window is hidden when returning from run(),
|
||||
regardless of the return point (e.g. with QTRY_COMPARE) */
|
||||
ScopedCleanup(HWND hwnd) : m_hwnd(hwnd) { }
|
||||
~ScopedCleanup() {
|
||||
::ShowWindow(m_hwnd, SW_HIDE);
|
||||
}
|
||||
HWND m_hwnd;
|
||||
} cleanup(m_hwnd);
|
||||
|
||||
m_testPassed = false;
|
||||
POINT pt;
|
||||
pt.x = 0;
|
||||
pt.y = 0;
|
||||
if (!::ClientToScreen(m_hwnd, &pt))
|
||||
return;
|
||||
m_windowPos = QPoint(pt.x, pt.y);
|
||||
|
||||
|
||||
// First activate the parent window (which will also activate the child window)
|
||||
m_windowPos += QPoint(5,5);
|
||||
mouseMove(m_windowPos);
|
||||
::Sleep(150);
|
||||
mouseClick();
|
||||
|
||||
|
||||
|
||||
// At this point the windows are activated, no further events will be send to the QWindow
|
||||
// if we click on the native parent HWND
|
||||
m_childWindow->reset();
|
||||
::Sleep(150);
|
||||
mouseClick();
|
||||
::Sleep(150);
|
||||
|
||||
QTRY_COMPARE(m_childWindow->received(QEvent::MouseButtonPress) + m_childWindow->received(QEvent::MouseButtonRelease), 0);
|
||||
|
||||
// Now click in the QWindow. The QWindow should receive those events.
|
||||
m_windowPos.ry() += 50;
|
||||
mouseMove(m_windowPos);
|
||||
::Sleep(150);
|
||||
mouseClick();
|
||||
QTRY_COMPARE(m_childWindow->received(QEvent::MouseButtonPress), 1);
|
||||
QTRY_COMPARE(m_childWindow->received(QEvent::MouseButtonRelease), 1);
|
||||
|
||||
m_testPassed = true;
|
||||
|
||||
// ScopedCleanup will hide the window here
|
||||
// Once the native window is hidden, it will exit the event loop.
|
||||
}
|
||||
|
||||
bool passed() const { return m_testPassed; }
|
||||
|
||||
private:
|
||||
int m_screenW;
|
||||
int m_screenH;
|
||||
bool m_testPassed;
|
||||
HWND m_hwnd;
|
||||
Window *m_childWindow;
|
||||
QPoint m_windowPos;
|
||||
|
||||
};
|
||||
|
||||
|
||||
void tst_NoQtEventLoop::consumeMouseEvents()
|
||||
{
|
||||
int argc = 1;
|
||||
char *argv[] = {const_cast<char*>("test")};
|
||||
QGuiApplication app(argc, argv);
|
||||
QString clsName(QStringLiteral("tst_NoQtEventLoop_WINDOW"));
|
||||
const HINSTANCE appInstance = (HINSTANCE)GetModuleHandle(0);
|
||||
WNDCLASSEX wc;
|
||||
wc.cbSize = sizeof(WNDCLASSEX);
|
||||
wc.style = CS_DBLCLKS | CS_OWNDC; // CS_SAVEBITS
|
||||
wc.lpfnWndProc = wndProc;
|
||||
wc.cbClsExtra = 0;
|
||||
wc.cbWndExtra = 0;
|
||||
wc.hInstance = appInstance;
|
||||
wc.hIcon = 0;
|
||||
wc.hIconSm = 0;
|
||||
wc.hCursor = 0;
|
||||
wc.hbrBackground = ::GetSysColorBrush(COLOR_BTNFACE /*COLOR_WINDOW*/);
|
||||
wc.lpszMenuName = 0;
|
||||
wc.lpszClassName = (wchar_t*)clsName.utf16();
|
||||
|
||||
ATOM atom = ::RegisterClassEx(&wc);
|
||||
QVERIFY2(atom, "RegisterClassEx failed");
|
||||
|
||||
DWORD dwExStyle = WS_EX_APPWINDOW;
|
||||
DWORD dwStyle = WS_CAPTION | WS_HSCROLL | WS_TABSTOP | WS_VISIBLE;
|
||||
|
||||
HWND mainWnd = ::CreateWindowEx(dwExStyle, (wchar_t*)clsName.utf16(), TEXT("tst_NoQtEventLoop"), dwStyle, 100, 100, 300, 300, 0, NULL, appInstance, NULL);
|
||||
QVERIFY2(mainWnd, "CreateWindowEx failed");
|
||||
|
||||
::ShowWindow(mainWnd, SW_SHOW);
|
||||
|
||||
Window *childWindow = new Window;
|
||||
childWindow->setParent(QWindow::fromWinId((WId)mainWnd));
|
||||
childWindow->setGeometry(0, 50, 200, 200);
|
||||
childWindow->show();
|
||||
|
||||
TestThread *testThread = new TestThread(mainWnd, childWindow);
|
||||
connect(testThread, SIGNAL(finished()), testThread, SLOT(deleteLater()));
|
||||
testThread->start();
|
||||
|
||||
// Our own message loop...
|
||||
MSG msg;
|
||||
while (::GetMessage(&msg, NULL, 0, 0) > 0) {
|
||||
::TranslateMessage(&msg);
|
||||
::DispatchMessage(&msg);
|
||||
if (g_exit)
|
||||
break;
|
||||
}
|
||||
|
||||
QCOMPARE(testThread->passed(), true);
|
||||
|
||||
}
|
||||
|
||||
#include <tst_noqteventloop.moc>
|
||||
|
||||
QTEST_APPLESS_MAIN(tst_NoQtEventLoop)
|
||||
|
Loading…
Reference in New Issue
Block a user