1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into wip/cmake

Browse Source 
Change-Id: I58395e0c31cfcd08bf799c3e069bbbed32709a3d
This commit is contained in:
Johan Klokkhammer Helsing 2019-10-01 16:39:33 +02:00
commit b23bbe37d4
6 changed files with 151 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/platforms/wayland/qwaylandinputdevice.cpp
View File

@ -1158,7 +1158,18 @@ void QWaylandInputDevice::Keyboard::handleKey(ulong timestamp, QEvent::Type type
}
if (!filtered) {
QWindowSystemInterface::handleExtendedKeyEvent(focusWindow()->window(), timestamp, type, key, modifiers,
auto window = focusWindow()->window();
if (type == QEvent::KeyPress && key == Qt::Key_Menu) {
auto cursor = window->screen()->handle()->cursor();
if (cursor) {
const QPoint globalPos = cursor->pos();
const QPoint pos = window->mapFromGlobal(globalPos);
QWindowSystemInterface::handleContextMenuEvent(window, false, pos, globalPos, modifiers);
}
}
QWindowSystemInterface::handleExtendedKeyEvent(window, timestamp, type, key, modifiers,
nativeScanCode, nativeVirtualKey, nativeModifiers, text, autorepeat, count);
}
}

2
tests/auto/wayland/fullscreenshellv1/fullscreenshellv1.pro
View File

@ -1,4 +1,4 @@
include (../shared_old/shared_old.pri)
TARGET = tst_client_fullscreenshell1
TARGET = tst_client_fullscreenshellv1
SOURCES += tst_fullscreenshellv1.cpp

2
tests/auto/wayland/seatv4/BLACKLIST Normal file
View File

@ -0,0 +1,2 @@
[animatedCursor]
b2qt

123
tests/auto/wayland/seatv5/tst_seatv5.cpp
View File

@ -69,6 +69,8 @@ private slots:
void createsTouch();
void singleTap();
void singleTapFloat();
void multiTouch();
void multiTouchUpAndMotionFrame();
};
void tst_seatv5::bindsToSeat()
@ -463,5 +465,126 @@ void tst_seatv5::singleTapFloat()
}
}
void tst_seatv5::multiTouch()
{
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
exec([=] {
auto *t = touch();
auto *c = client();
t->sendDown(xdgToplevel()->surface(), {32, 32}, 0);
t->sendDown(xdgToplevel()->surface(), {48, 48}, 1);
t->sendFrame(c);
// Compositor event order should not change the order of the QTouchEvent::touchPoints()
// See QTBUG-77014
t->sendMotion(c, {49, 48}, 1);
t->sendMotion(c, {33, 32}, 0);
t->sendFrame(c);
t->sendUp(c, 0);
t->sendFrame(c);
t->sendUp(c, 1);
t->sendFrame(c);
});
QTRY_VERIFY(!window.m_events.empty());
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchBegin);
QCOMPARE(e.touchPointStates, Qt::TouchPointState::TouchPointPressed);
QCOMPARE(e.touchPoints.length(), 2);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointPressed);
QCOMPARE(e.touchPoints[0].pos(), QPointF(32-window.frameMargins().left(), 32-window.frameMargins().top()));
QCOMPARE(e.touchPoints[1].state(), Qt::TouchPointState::TouchPointPressed);
QCOMPARE(e.touchPoints[1].pos(), QPointF(48-window.frameMargins().left(), 48-window.frameMargins().top()));
}
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchUpdate);
QCOMPARE(e.touchPoints.length(), 2);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointMoved);
QCOMPARE(e.touchPoints[0].pos(), QPointF(33-window.frameMargins().left(), 32-window.frameMargins().top()));
QCOMPARE(e.touchPoints[1].state(), Qt::TouchPointState::TouchPointMoved);
QCOMPARE(e.touchPoints[1].pos(), QPointF(49-window.frameMargins().left(), 48-window.frameMargins().top()));
}
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchUpdate);
QCOMPARE(e.touchPointStates, Qt::TouchPointState::TouchPointReleased | Qt::TouchPointState::TouchPointStationary);
QCOMPARE(e.touchPoints.length(), 2);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointReleased);
QCOMPARE(e.touchPoints[0].pos(), QPointF(33-window.frameMargins().left(), 32-window.frameMargins().top()));
QCOMPARE(e.touchPoints[1].state(), Qt::TouchPointState::TouchPointStationary);
QCOMPARE(e.touchPoints[1].pos(), QPointF(49-window.frameMargins().left(), 48-window.frameMargins().top()));
}
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchEnd);
QCOMPARE(e.touchPointStates, Qt::TouchPointState::TouchPointReleased);
QCOMPARE(e.touchPoints.length(), 1);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointReleased);
QCOMPARE(e.touchPoints[0].pos(), QPointF(49-window.frameMargins().left(), 48-window.frameMargins().top()));
}
}
void tst_seatv5::multiTouchUpAndMotionFrame()
{
TouchWindow window;
QCOMPOSITOR_TRY_VERIFY(xdgSurface() && xdgSurface()->m_committedConfigureSerial);
exec([=] {
auto *t = touch();
auto *c = client();
t->sendDown(xdgToplevel()->surface(), {32, 32}, 0);
t->sendDown(xdgToplevel()->surface(), {48, 48}, 1);
t->sendFrame(c);
// Sending an up event after a frame event, before any motion or down events used to
// unnecessarily trigger a workaround for a bug in an old version of Weston. The workaround
// would prematurely insert a fake frame event splitting the touch event up into two events.
// However, this should only be needed on the up event for the very last touch point. So in
// this test we verify that it doesn't unncecessarily break up the events.
t->sendUp(c, 0);
t->sendMotion(c, {49, 48}, 1);
t->sendFrame(c);
t->sendUp(c, 1);
t->sendFrame(c);
});
QTRY_VERIFY(!window.m_events.empty());
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchBegin);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointPressed);
QCOMPARE(e.touchPoints[1].state(), Qt::TouchPointState::TouchPointPressed);
}
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchUpdate);
QCOMPARE(e.touchPoints.length(), 2);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointReleased);
QCOMPARE(e.touchPoints[1].state(), Qt::TouchPointState::TouchPointMoved);
}
{
auto e = window.m_events.takeFirst();
QCOMPARE(e.type, QEvent::TouchEnd);
QCOMPARE(e.touchPoints.length(), 1);
QCOMPARE(e.touchPoints[0].state(), Qt::TouchPointState::TouchPointReleased);
}
QVERIFY(window.m_events.empty());
}
QCOMPOSITOR_TEST_MAIN(tst_seatv5)
#include "tst_seatv5.moc"

12
tests/auto/wayland/shared/coreprotocol.cpp
View File

@ -424,6 +424,18 @@ uint Touch::sendUp(wl_client *client, int id)
return serial;
}
void Touch::sendMotion(wl_client *client, const QPointF &position, int id)
{
wl_fixed_t x = wl_fixed_from_double(position.x());
wl_fixed_t y = wl_fixed_from_double(position.y());
auto time = m_seat->m_compositor->currentTimeMilliseconds();
const auto touchResources = resourceMap().values(client);
for (auto *r : touchResources)
wl_touch::send_motion(r->handle, time, id, x, y);
}
void Touch::sendFrame(wl_client *client)
{
const auto touchResources = resourceMap().values(client);

1
tests/auto/wayland/shared/coreprotocol.h
View File

@ -318,6 +318,7 @@ public:
explicit Touch(Seat *seat) : m_seat(seat) {}
uint sendDown(Surface *surface, const QPointF &position, int id);
uint sendUp(wl_client *client, int id);
void sendMotion(wl_client *client, const QPointF &position, int id);
void sendFrame(wl_client *client);
Seat *m_seat = nullptr;