yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

autotests: Make PointerInputTest more robust

Browse source 
According to the spec, when the pointer enters a surface, the contents
of the cursor becomes undefined. The client should call set_cursor() to
make sure that the cursor image is correct.
This commit is contained in:
Vlad Zahorodnii 2021-02-22 15:41:31 +02:00
parent 4061cbc97d
commit ea4acb5763
1 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
autotests/integration/pointer_input.cpp
View file

@ -1496,6 +1496,19 @@ void PointerInputTest::testResizeCursor()
QCOMPARE(options->commandAllModifier(), Qt::MetaModifier); QCOMPARE(options->commandAllModifier(), Qt::MetaModifier);
QCOMPARE(options->commandAll3(), Options::MouseUnrestrictedResize); QCOMPARE(options->commandAll3(), Options::MouseUnrestrictedResize);
// load the fallback cursor (arrow cursor)
const PlatformCursorImage arrowCursor = loadReferenceThemeCursor(Qt::ArrowCursor);
QVERIFY(!arrowCursor.isNull());
QCOMPARE(kwinApp()->platform()->cursorImage().image(), arrowCursor.image());
QCOMPARE(kwinApp()->platform()->cursorImage().hotSpot(), arrowCursor.hotSpot());
// we need a pointer to get the enter event
auto pointer = m_seat->createPointer(m_seat);
QVERIFY(pointer);
QVERIFY(pointer->isValid());
QSignalSpy enteredSpy(pointer, &KWayland::Client::Pointer::entered);
QVERIFY(enteredSpy.isValid());
// create a test client // create a test client
using namespace KWayland::Client; using namespace KWayland::Client;
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
@ -1527,10 +1540,17 @@ void PointerInputTest::testResizeCursor()
Cursors::self()->mouse()->setPos(cursorPos); Cursors::self()->mouse()->setPos(cursorPos);
const PlatformCursorImage arrowCursor = loadReferenceThemeCursor(Qt::ArrowCursor); // wait for the enter event and set the cursor
QVERIFY(!arrowCursor.isNull()); QVERIFY(enteredSpy.wait());
QCOMPARE(kwinApp()->platform()->cursorImage().image(), arrowCursor.image()); QScopedPointer<Surface> cursorSurface(Test::createSurface(m_compositor));
QCOMPARE(kwinApp()->platform()->cursorImage().hotSpot(), arrowCursor.hotSpot()); QVERIFY(cursorSurface);
QSignalSpy cursorRenderedSpy(cursorSurface.data(), &Surface::frameRendered);
QVERIFY(cursorRenderedSpy.isValid());
cursorSurface->attachBuffer(Test::waylandShmPool()->createBuffer(arrowCursor.image()));
cursorSurface->damage(arrowCursor.image().rect());
cursorSurface->commit();
pointer->setCursor(cursorSurface.data(), arrowCursor.hotSpot());
QVERIFY(cursorRenderedSpy.wait());
// start resizing the client // start resizing the client
int timestamp = 1; int timestamp = 1;
@ -1566,6 +1586,19 @@ void PointerInputTest::testMoveCursor()
QCOMPARE(options->commandAllModifier(), Qt::MetaModifier); QCOMPARE(options->commandAllModifier(), Qt::MetaModifier);
QCOMPARE(options->commandAll1(), Options::MouseUnrestrictedMove); QCOMPARE(options->commandAll1(), Options::MouseUnrestrictedMove);
// load the fallback cursor (arrow cursor)
const PlatformCursorImage arrowCursor = loadReferenceThemeCursor(Qt::ArrowCursor);
QVERIFY(!arrowCursor.isNull());
QCOMPARE(kwinApp()->platform()->cursorImage().image(), arrowCursor.image());
QCOMPARE(kwinApp()->platform()->cursorImage().hotSpot(), arrowCursor.hotSpot());
// we need a pointer to get the enter event
auto pointer = m_seat->createPointer(m_seat);
QVERIFY(pointer);
QVERIFY(pointer->isValid());
QSignalSpy enteredSpy(pointer, &KWayland::Client::Pointer::entered);
QVERIFY(enteredSpy.isValid());
// create a test client // create a test client
using namespace KWayland::Client; using namespace KWayland::Client;
QScopedPointer<Surface> surface(Test::createSurface()); QScopedPointer<Surface> surface(Test::createSurface());
@ -1578,10 +1611,17 @@ void PointerInputTest::testMoveCursor()
// move cursor to the test position // move cursor to the test position
Cursors::self()->mouse()->setPos(c->frameGeometry().center()); Cursors::self()->mouse()->setPos(c->frameGeometry().center());
const PlatformCursorImage arrowCursor = loadReferenceThemeCursor(Qt::ArrowCursor); // wait for the enter event and set the cursor
QVERIFY(!arrowCursor.isNull()); QVERIFY(enteredSpy.wait());
QCOMPARE(kwinApp()->platform()->cursorImage().image(), arrowCursor.image()); QScopedPointer<Surface> cursorSurface(Test::createSurface(m_compositor));
QCOMPARE(kwinApp()->platform()->cursorImage().hotSpot(), arrowCursor.hotSpot()); QVERIFY(cursorSurface);
QSignalSpy cursorRenderedSpy(cursorSurface.data(), &Surface::frameRendered);
QVERIFY(cursorRenderedSpy.isValid());
cursorSurface->attachBuffer(Test::waylandShmPool()->createBuffer(arrowCursor.image()));
cursorSurface->damage(arrowCursor.image().rect());
cursorSurface->commit();
pointer->setCursor(cursorSurface.data(), arrowCursor.hotSpot());
QVERIFY(cursorRenderedSpy.wait());
// start moving the client // start moving the client
int timestamp = 1; int timestamp = 1;