[client] Add support for drag'n'drop
DataDevice exposes new methods to get the DataOffer provided through drag'n'drop and also signals to indicate the various changes on the DataDevice during drag'n'drop. This allows to add a first basic auto test for the drag'n'drop functionality covering both server and client side.
This commit is contained in:
Martin Gräßlin
parent
23a719c8af
commit
fb6256dc48
2 changed files with 373 additions and 0 deletions
|
|
@ -233,3 +233,14 @@ add_executable(testServerSideDecoration ${testServerSideDecoration_SRCS})
|
||||||
target_link_libraries( testServerSideDecoration Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client)
|
target_link_libraries( testServerSideDecoration Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client)
|
||||||
add_test(kwayland-testServerSideDecoration testServerSideDecoration)
|
add_test(kwayland-testServerSideDecoration testServerSideDecoration)
|
||||||
ecm_mark_as_test(testServerSideDecoration)
|
ecm_mark_as_test(testServerSideDecoration)
|
||||||
|
|
||||||
|
########################################################
|
||||||
|
# Test Drag'N'Drop
|
||||||
|
########################################################
|
||||||
|
set( testDragAndDrop_SRCS
|
||||||
|
test_drag_drop.cpp
|
||||||
|
)
|
||||||
|
add_executable(testDragAndDrop ${testDragAndDrop_SRCS})
|
||||||
|
target_link_libraries( testDragAndDrop Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client)
|
||||||
|
add_test(kwayland-testDragAndDrop testDragAndDrop)
|
||||||
|
ecm_mark_as_test(testDragAndDrop)
|
||||||
|
|
|
||||||
362
src/wayland/autotests/client/test_drag_drop.cpp
Normal file
362
src/wayland/autotests/client/test_drag_drop.cpp
Normal file
|
|
@ -0,0 +1,362 @@
|
||||||
|
/********************************************************************
|
||||||
|
Copyright 2016 Martin Gräßlin <mgraesslin@kde.org>
|
||||||
|
|
||||||
|
This library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) version 3, or any
|
||||||
|
later version accepted by the membership of KDE e.V. (or its
|
||||||
|
successor approved by the membership of KDE e.V.), which shall
|
||||||
|
act as a proxy defined in Section 6 of version 3 of the license.
|
||||||
|
|
||||||
|
This library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*********************************************************************/
|
||||||
|
// Qt
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
// KWin
|
||||||
|
#include "../../src/client/compositor.h"
|
||||||
|
#include "../../src/client/connection_thread.h"
|
||||||
|
#include "../../src/client/datadevice.h"
|
||||||
|
#include "../../src/client/datadevicemanager.h"
|
||||||
|
#include "../../src/client/datasource.h"
|
||||||
|
#include "../../src/client/event_queue.h"
|
||||||
|
#include "../../src/client/pointer.h"
|
||||||
|
#include "../../src/client/registry.h"
|
||||||
|
#include "../../src/client/seat.h"
|
||||||
|
#include "../../src/client/shell.h"
|
||||||
|
#include "../../src/client/shm_pool.h"
|
||||||
|
#include "../../src/client/surface.h"
|
||||||
|
#include "../../src/server/display.h"
|
||||||
|
#include "../../src/server/compositor_interface.h"
|
||||||
|
#include "../../src/server/datadevicemanager_interface.h"
|
||||||
|
#include "../../src/server/seat_interface.h"
|
||||||
|
#include "../../src/server/shell_interface.h"
|
||||||
|
|
||||||
|
class TestDragAndDrop : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void init();
|
||||||
|
void cleanup();
|
||||||
|
|
||||||
|
void testDragAndDrop();
|
||||||
|
void testPointerEventsIgnored();
|
||||||
|
|
||||||
|
private:
|
||||||
|
KWayland::Client::Surface *createSurface();
|
||||||
|
KWayland::Server::SurfaceInterface *getServerSurface();
|
||||||
|
|
||||||
|
KWayland::Server::Display *m_display = nullptr;
|
||||||
|
KWayland::Server::CompositorInterface *m_compositorInterface = nullptr;
|
||||||
|
KWayland::Server::DataDeviceManagerInterface *m_dataDeviceManagerInterface = nullptr;
|
||||||
|
KWayland::Server::SeatInterface *m_seatInterface = nullptr;
|
||||||
|
KWayland::Server::ShellInterface *m_shellInterface = nullptr;
|
||||||
|
KWayland::Client::ConnectionThread *m_connection = nullptr;
|
||||||
|
KWayland::Client::Compositor *m_compositor = nullptr;
|
||||||
|
KWayland::Client::EventQueue *m_queue = nullptr;
|
||||||
|
KWayland::Client::DataDevice *m_dataDevice = nullptr;
|
||||||
|
KWayland::Client::DataSource *m_dataSource = nullptr;
|
||||||
|
QThread *m_thread = nullptr;
|
||||||
|
KWayland::Client::Registry *m_registry = nullptr;
|
||||||
|
KWayland::Client::Seat *m_seat = nullptr;
|
||||||
|
KWayland::Client::Pointer *m_pointer = nullptr;
|
||||||
|
KWayland::Client::DataDeviceManager *m_ddm = nullptr;
|
||||||
|
KWayland::Client::ShmPool *m_shm = nullptr;
|
||||||
|
KWayland::Client::Shell *m_shell = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
|
static const QString s_socketName = QStringLiteral("kwayland-test-wayland-drag-n-drop-0");
|
||||||
|
|
||||||
|
void TestDragAndDrop::init()
|
||||||
|
{
|
||||||
|
using namespace KWayland::Server;
|
||||||
|
using namespace KWayland::Client;
|
||||||
|
delete m_display;
|
||||||
|
m_display = new Display(this);
|
||||||
|
m_display->setSocketName(s_socketName);
|
||||||
|
m_display->start();
|
||||||
|
QVERIFY(m_display->isRunning());
|
||||||
|
|
||||||
|
// setup connection
|
||||||
|
m_connection = new KWayland::Client::ConnectionThread;
|
||||||
|
QSignalSpy connectedSpy(m_connection, &ConnectionThread::connected);
|
||||||
|
QVERIFY(connectedSpy.isValid());
|
||||||
|
m_connection->setSocketName(s_socketName);
|
||||||
|
|
||||||
|
m_compositorInterface = m_display->createCompositor(m_display);
|
||||||
|
m_compositorInterface->create();
|
||||||
|
QVERIFY(m_compositorInterface->isValid());
|
||||||
|
m_seatInterface = m_display->createSeat(m_display);
|
||||||
|
m_seatInterface->setHasPointer(true);
|
||||||
|
m_seatInterface->create();
|
||||||
|
QVERIFY(m_seatInterface->isValid());
|
||||||
|
m_dataDeviceManagerInterface = m_display->createDataDeviceManager(m_display);
|
||||||
|
m_dataDeviceManagerInterface->create();
|
||||||
|
QVERIFY(m_dataDeviceManagerInterface->isValid());
|
||||||
|
m_display->createShm();
|
||||||
|
m_shellInterface = m_display->createShell(m_display);
|
||||||
|
m_shellInterface->create();
|
||||||
|
|
||||||
|
m_thread = new QThread(this);
|
||||||
|
m_connection->moveToThread(m_thread);
|
||||||
|
m_thread->start();
|
||||||
|
|
||||||
|
m_connection->initConnection();
|
||||||
|
QVERIFY(connectedSpy.wait());
|
||||||
|
|
||||||
|
m_queue = new EventQueue(this);
|
||||||
|
QVERIFY(!m_queue->isValid());
|
||||||
|
m_queue->setup(m_connection);
|
||||||
|
QVERIFY(m_queue->isValid());
|
||||||
|
|
||||||
|
m_registry = new Registry();
|
||||||
|
QSignalSpy interfacesAnnouncedSpy(m_registry, &Registry::interfaceAnnounced);
|
||||||
|
QVERIFY(interfacesAnnouncedSpy.isValid());
|
||||||
|
|
||||||
|
QVERIFY(!m_registry->eventQueue());
|
||||||
|
m_registry->setEventQueue(m_queue);
|
||||||
|
QCOMPARE(m_registry->eventQueue(), m_queue);
|
||||||
|
m_registry->create(m_connection);
|
||||||
|
QVERIFY(m_registry->isValid());
|
||||||
|
m_registry->setup();
|
||||||
|
|
||||||
|
QVERIFY(interfacesAnnouncedSpy.wait());
|
||||||
|
#define CREATE(variable, factory, iface) \
|
||||||
|
variable = m_registry->create##factory(m_registry->interface(Registry::Interface::iface).name, m_registry->interface(Registry::Interface::iface).version, this); \
|
||||||
|
QVERIFY(variable);
|
||||||
|
|
||||||
|
CREATE(m_compositor, Compositor, Compositor)
|
||||||
|
CREATE(m_seat, Seat, Seat)
|
||||||
|
CREATE(m_ddm, DataDeviceManager, DataDeviceManager)
|
||||||
|
CREATE(m_shm, ShmPool, Shm)
|
||||||
|
CREATE(m_shell, Shell, Shell)
|
||||||
|
|
||||||
|
#undef CREATE
|
||||||
|
|
||||||
|
QSignalSpy pointerSpy(m_seat, &Seat::hasPointerChanged);
|
||||||
|
QVERIFY(pointerSpy.isValid());
|
||||||
|
QVERIFY(pointerSpy.wait());
|
||||||
|
m_pointer = m_seat->createPointer(m_seat);
|
||||||
|
QVERIFY(m_pointer->isValid());
|
||||||
|
m_dataDevice = m_ddm->getDataDevice(m_seat, this);
|
||||||
|
QVERIFY(m_dataDevice->isValid());
|
||||||
|
m_dataSource = m_ddm->createDataSource(this);
|
||||||
|
QVERIFY(m_dataSource->isValid());
|
||||||
|
m_dataSource->offer(QStringLiteral("text/plain"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestDragAndDrop::cleanup()
|
||||||
|
{
|
||||||
|
#define DELETE(name) \
|
||||||
|
if (name) { \
|
||||||
|
delete name; \
|
||||||
|
name = nullptr; \
|
||||||
|
}
|
||||||
|
DELETE(m_dataSource)
|
||||||
|
DELETE(m_dataDevice)
|
||||||
|
DELETE(m_shell)
|
||||||
|
DELETE(m_shm)
|
||||||
|
DELETE(m_compositor)
|
||||||
|
DELETE(m_ddm)
|
||||||
|
DELETE(m_seat)
|
||||||
|
DELETE(m_queue)
|
||||||
|
DELETE(m_registry)
|
||||||
|
#undef DELETE
|
||||||
|
if (m_thread) {
|
||||||
|
m_thread->quit();
|
||||||
|
m_thread->wait();
|
||||||
|
delete m_thread;
|
||||||
|
m_thread = nullptr;
|
||||||
|
}
|
||||||
|
delete m_connection;
|
||||||
|
m_connection = nullptr;
|
||||||
|
|
||||||
|
delete m_display;
|
||||||
|
m_display = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
KWayland::Client::Surface *TestDragAndDrop::createSurface()
|
||||||
|
{
|
||||||
|
using namespace KWayland::Client;
|
||||||
|
auto s = m_compositor->createSurface();
|
||||||
|
|
||||||
|
QImage img(QSize(100, 200), QImage::Format_ARGB32);
|
||||||
|
img.fill(Qt::red);
|
||||||
|
s->attachBuffer(m_shm->createBuffer(img));
|
||||||
|
s->damage(QRect(0, 0, 100, 200));
|
||||||
|
s->commit(Surface::CommitFlag::None);
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
KWayland::Server::SurfaceInterface *TestDragAndDrop::getServerSurface()
|
||||||
|
{
|
||||||
|
using namespace KWayland::Server;
|
||||||
|
QSignalSpy surfaceCreatedSpy(m_compositorInterface, &CompositorInterface::surfaceCreated);
|
||||||
|
if (!surfaceCreatedSpy.isValid()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
if (!surfaceCreatedSpy.wait()) {
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
return surfaceCreatedSpy.first().first().value<SurfaceInterface*>();
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestDragAndDrop::testDragAndDrop()
|
||||||
|
{
|
||||||
|
// this test verifies the very basic drag and drop on one surface, an enter, a move and the drop
|
||||||
|
using namespace KWayland::Server;
|
||||||
|
using namespace KWayland::Client;
|
||||||
|
// first create a window
|
||||||
|
QScopedPointer<Surface> s(createSurface());
|
||||||
|
auto serverSurface = getServerSurface();
|
||||||
|
QVERIFY(serverSurface);
|
||||||
|
|
||||||
|
// now we need to pass pointer focus to the Surface and simulate a button press
|
||||||
|
QSignalSpy buttonPressSpy(m_pointer, &Pointer::buttonStateChanged);
|
||||||
|
QVERIFY(buttonPressSpy.isValid());
|
||||||
|
m_seatInterface->setFocusedPointerSurface(serverSurface);
|
||||||
|
m_seatInterface->setTimestamp(2);
|
||||||
|
m_seatInterface->pointerButtonPressed(1);
|
||||||
|
QVERIFY(buttonPressSpy.wait());
|
||||||
|
QCOMPARE(buttonPressSpy.first().at(1).value<quint32>(), quint32(2));
|
||||||
|
|
||||||
|
// add some signal spies for client side
|
||||||
|
QSignalSpy dragEnteredSpy(m_dataDevice, &DataDevice::dragEntered);
|
||||||
|
QVERIFY(dragEnteredSpy.isValid());
|
||||||
|
QSignalSpy dragMotionSpy(m_dataDevice, &DataDevice::dragMotion);
|
||||||
|
QVERIFY(dragMotionSpy.isValid());
|
||||||
|
QSignalSpy pointerMotionSpy(m_pointer, &Pointer::motion);
|
||||||
|
QVERIFY(pointerMotionSpy.isValid());
|
||||||
|
|
||||||
|
// now we can start the drag and drop
|
||||||
|
QSignalSpy dragStartedSpy(m_seatInterface, &SeatInterface::dragStarted);
|
||||||
|
QVERIFY(dragStartedSpy.isValid());
|
||||||
|
m_dataDevice->startDrag(buttonPressSpy.first().first().value<quint32>(), m_dataSource, s.data());
|
||||||
|
QVERIFY(dragStartedSpy.wait());
|
||||||
|
QCOMPARE(m_seatInterface->dragSurface(), serverSurface);
|
||||||
|
QCOMPARE(m_seatInterface->dragSurfaceTransformation(), QMatrix4x4());
|
||||||
|
QVERIFY(!m_seatInterface->dragSource()->icon());
|
||||||
|
QCOMPARE(m_seatInterface->dragSource()->dragImplicitGrabSerial(), buttonPressSpy.first().first().value<quint32>());
|
||||||
|
QVERIFY(dragEnteredSpy.wait());
|
||||||
|
QCOMPARE(dragEnteredSpy.count(), 1);
|
||||||
|
QCOMPARE(dragEnteredSpy.first().first().value<quint32>(), m_display->serial());
|
||||||
|
QCOMPARE(dragEnteredSpy.first().last().toPointF(), QPointF(0, 0));
|
||||||
|
QCOMPARE(m_dataDevice->dragSurface().data(), s.data());
|
||||||
|
QCOMPARE(m_dataDevice->dragOffer()->offeredMimeTypes().count(), 1);
|
||||||
|
QCOMPARE(m_dataDevice->dragOffer()->offeredMimeTypes().first().name(), QStringLiteral("text/plain"));
|
||||||
|
|
||||||
|
// simulate motion
|
||||||
|
m_seatInterface->setTimestamp(3);
|
||||||
|
m_seatInterface->setPointerPos(QPointF(3, 3));
|
||||||
|
QVERIFY(dragMotionSpy.wait());
|
||||||
|
QCOMPARE(dragMotionSpy.count(), 1);
|
||||||
|
QCOMPARE(dragMotionSpy.first().first().toPointF(), QPointF(3, 3));
|
||||||
|
QCOMPARE(dragMotionSpy.first().last().toUInt(), 3u);
|
||||||
|
|
||||||
|
// simulate drop
|
||||||
|
QSignalSpy leftSpy(m_dataDevice, &DataDevice::dragLeft);
|
||||||
|
QVERIFY(leftSpy.isValid());
|
||||||
|
QSignalSpy serverDragEndedSpy(m_seatInterface, &SeatInterface::dragEnded);
|
||||||
|
QVERIFY(serverDragEndedSpy.isValid());
|
||||||
|
QSignalSpy droppedSpy(m_dataDevice, &DataDevice::dropped);
|
||||||
|
QVERIFY(droppedSpy.isValid());
|
||||||
|
m_seatInterface->setTimestamp(4);
|
||||||
|
m_seatInterface->pointerButtonReleased(1);
|
||||||
|
QVERIFY(droppedSpy.wait());
|
||||||
|
QCOMPARE(leftSpy.count(), 1);
|
||||||
|
QCOMPARE(serverDragEndedSpy.count(), 1);
|
||||||
|
|
||||||
|
// verify that we did not get any further input events
|
||||||
|
QVERIFY(pointerMotionSpy.isEmpty());
|
||||||
|
QCOMPARE(buttonPressSpy.count(), 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void TestDragAndDrop::testPointerEventsIgnored()
|
||||||
|
{
|
||||||
|
// this test verifies that all pointer events are ignored on the focused Pointer device during drag
|
||||||
|
using namespace KWayland::Server;
|
||||||
|
using namespace KWayland::Client;
|
||||||
|
// first create a window
|
||||||
|
QScopedPointer<Surface> s(createSurface());
|
||||||
|
auto serverSurface = getServerSurface();
|
||||||
|
QVERIFY(serverSurface);
|
||||||
|
|
||||||
|
// pass it pointer focus
|
||||||
|
m_seatInterface->setFocusedPointerSurface(serverSurface);
|
||||||
|
|
||||||
|
// create signal spies for all the pointer events
|
||||||
|
QSignalSpy pointerEnteredSpy(m_pointer, &Pointer::entered);
|
||||||
|
QVERIFY(pointerEnteredSpy.isValid());
|
||||||
|
QSignalSpy pointerLeftSpy(m_pointer, &Pointer::left);
|
||||||
|
QVERIFY(pointerLeftSpy.isValid());
|
||||||
|
QSignalSpy pointerMotionSpy(m_pointer, &Pointer::motion);
|
||||||
|
QVERIFY(pointerMotionSpy.isValid());
|
||||||
|
QSignalSpy axisSpy(m_pointer, &Pointer::axisChanged);
|
||||||
|
QVERIFY(axisSpy.isValid());
|
||||||
|
QSignalSpy buttonSpy(m_pointer, &Pointer::buttonStateChanged);
|
||||||
|
QVERIFY(buttonSpy.isValid());
|
||||||
|
QSignalSpy dragEnteredSpy(m_dataDevice, &DataDevice::dragEntered);
|
||||||
|
QVERIFY(dragEnteredSpy.isValid());
|
||||||
|
|
||||||
|
// first simulate a few things
|
||||||
|
quint32 timestamp = 1;
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->setPointerPos(QPointF(10, 10));
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerAxis(Qt::Vertical, 5);
|
||||||
|
// verify that we have those
|
||||||
|
QVERIFY(axisSpy.wait());
|
||||||
|
QCOMPARE(axisSpy.count(), 1);
|
||||||
|
QCOMPARE(pointerMotionSpy.count(), 1);
|
||||||
|
QCOMPARE(pointerEnteredSpy.count(), 1);
|
||||||
|
QVERIFY(buttonSpy.isEmpty());
|
||||||
|
QVERIFY(pointerLeftSpy.isEmpty());
|
||||||
|
|
||||||
|
// let's start the drag
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerButtonPressed(1);
|
||||||
|
QVERIFY(buttonSpy.wait());
|
||||||
|
QCOMPARE(buttonSpy.count(), 1);
|
||||||
|
m_dataDevice->startDrag(buttonSpy.first().first().value<quint32>(), m_dataSource, s.data());
|
||||||
|
QVERIFY(dragEnteredSpy.wait());
|
||||||
|
|
||||||
|
// now simulate all the possible pointer interactions
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerButtonPressed(2);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerButtonReleased(2);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerAxis(Qt::Vertical, 5);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerAxis(Qt::Horizontal, 5);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->setFocusedPointerSurface(nullptr);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->setFocusedPointerSurface(serverSurface);
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->setPointerPos(QPointF(50, 50));
|
||||||
|
|
||||||
|
// last but not least, simulate the drop
|
||||||
|
QSignalSpy droppedSpy(m_dataDevice, &DataDevice::dropped);
|
||||||
|
QVERIFY(droppedSpy.isValid());
|
||||||
|
m_seatInterface->setTimestamp(timestamp++);
|
||||||
|
m_seatInterface->pointerButtonReleased(1);
|
||||||
|
QVERIFY(droppedSpy.wait());
|
||||||
|
|
||||||
|
// all the changes should have been ignored
|
||||||
|
QCOMPARE(axisSpy.count(), 1);
|
||||||
|
QCOMPARE(pointerMotionSpy.count(), 1);
|
||||||
|
QCOMPARE(pointerEnteredSpy.count(), 1);
|
||||||
|
QCOMPARE(buttonSpy.count(), 1);
|
||||||
|
QVERIFY(pointerLeftSpy.isEmpty());
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_GUILESS_MAIN(TestDragAndDrop)
|
||||||
|
#include "test_drag_drop.moc"
|
||||||
Loading…
Reference in a new issue