Summary: If the surface passed in the transient request is to the surface of the shell surface, KWin aborts. It's an obvious invalid request, so handle it properly by sending an error. Reviewers: #plasma Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D1755
171 lines
5.8 KiB
C++
171 lines
5.8 KiB
C++
/********************************************************************
|
|
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>
|
|
// client
|
|
#include "../../src/client/compositor.h"
|
|
#include "../../src/client/connection_thread.h"
|
|
#include "../../src/client/event_queue.h"
|
|
#include "../../src/client/registry.h"
|
|
#include "../../src/client/shell.h"
|
|
#include "../../src/client/surface.h"
|
|
// server
|
|
#include "../../src/server/display.h"
|
|
#include "../../src/server/compositor_interface.h"
|
|
#include "../../src/server/shell_interface.h"
|
|
|
|
using namespace KWayland::Client;
|
|
using namespace KWayland::Server;
|
|
|
|
class ErrorTest : public QObject
|
|
{
|
|
Q_OBJECT
|
|
private Q_SLOTS:
|
|
void init();
|
|
void cleanup();
|
|
|
|
void testMultipleShellSurfacesForSurface();
|
|
void testTransientForSameSurface_data();
|
|
void testTransientForSameSurface();
|
|
|
|
private:
|
|
Display *m_display = nullptr;
|
|
CompositorInterface *m_ci = nullptr;
|
|
ShellInterface *m_si = nullptr;
|
|
ConnectionThread *m_connection = nullptr;
|
|
QThread *m_thread = nullptr;
|
|
EventQueue *m_queue = nullptr;
|
|
Compositor *m_compositor = nullptr;
|
|
Shell *m_shell = nullptr;
|
|
};
|
|
|
|
static const QString s_socketName = QStringLiteral("kwayland-test-error-0");
|
|
|
|
void ErrorTest::init()
|
|
{
|
|
delete m_display;
|
|
m_display = new Display(this);
|
|
m_display->setSocketName(s_socketName);
|
|
m_display->start();
|
|
QVERIFY(m_display->isRunning());
|
|
m_display->createShm();
|
|
m_ci = m_display->createCompositor(m_display);
|
|
m_ci->create();
|
|
m_si = m_display->createShell(m_display);
|
|
m_si->create();
|
|
|
|
// setup connection
|
|
m_connection = new KWayland::Client::ConnectionThread;
|
|
QSignalSpy connectedSpy(m_connection, &ConnectionThread::connected);
|
|
QVERIFY(connectedSpy.isValid());
|
|
m_connection->setSocketName(s_socketName);
|
|
|
|
m_thread = new QThread(this);
|
|
m_connection->moveToThread(m_thread);
|
|
m_thread->start();
|
|
|
|
m_connection->initConnection();
|
|
QVERIFY(connectedSpy.wait());
|
|
|
|
m_queue = new EventQueue(this);
|
|
m_queue->setup(m_connection);
|
|
|
|
Registry registry;
|
|
QSignalSpy interfacesAnnouncedSpy(®istry, &Registry::interfacesAnnounced);
|
|
QVERIFY(interfacesAnnouncedSpy.isValid());
|
|
registry.setEventQueue(m_queue);
|
|
registry.create(m_connection);
|
|
QVERIFY(registry.isValid());
|
|
registry.setup();
|
|
QVERIFY(interfacesAnnouncedSpy.wait());
|
|
|
|
m_compositor = registry.createCompositor(registry.interface(Registry::Interface::Compositor).name,
|
|
registry.interface(Registry::Interface::Compositor).version,
|
|
this);
|
|
QVERIFY(m_compositor);
|
|
m_shell = registry.createShell(registry.interface(Registry::Interface::Shell).name,
|
|
registry.interface(Registry::Interface::Shell).version,
|
|
this);
|
|
QVERIFY(m_shell);
|
|
}
|
|
|
|
void ErrorTest::cleanup()
|
|
{
|
|
#define CLEANUP(variable) \
|
|
if (variable) { \
|
|
delete variable; \
|
|
variable = nullptr; \
|
|
}
|
|
CLEANUP(m_shell)
|
|
CLEANUP(m_compositor)
|
|
CLEANUP(m_queue)
|
|
if (m_connection) {
|
|
m_connection->deleteLater();
|
|
m_connection = nullptr;
|
|
}
|
|
if (m_thread) {
|
|
m_thread->quit();
|
|
m_thread->wait();
|
|
delete m_thread;
|
|
m_thread = nullptr;
|
|
}
|
|
CLEANUP(m_si)
|
|
CLEANUP(m_ci)
|
|
CLEANUP(m_display)
|
|
#undef CLEANUP
|
|
}
|
|
|
|
void ErrorTest::testMultipleShellSurfacesForSurface()
|
|
{
|
|
// this test verifies that creating two ShellSurfaces for the same Surface triggers a protocol error
|
|
QSignalSpy errorSpy(m_connection, &ConnectionThread::errorOccurred);
|
|
QVERIFY(errorSpy.isValid());
|
|
QScopedPointer<Surface> surface(m_compositor->createSurface());
|
|
QScopedPointer<ShellSurface> shellSurface1(m_shell->createSurface(surface.data()));
|
|
QScopedPointer<ShellSurface> shellSurface2(m_shell->createSurface(surface.data()));
|
|
QVERIFY(errorSpy.wait());
|
|
QVERIFY(m_connection->hasError());
|
|
QCOMPARE(m_connection->errorCode(), EPROTO);
|
|
}
|
|
|
|
void ErrorTest::testTransientForSameSurface_data()
|
|
{
|
|
QTest::addColumn<ShellSurface::TransientFlag>("flag");
|
|
|
|
QTest::newRow("transient") << ShellSurface::TransientFlag::Default;
|
|
QTest::newRow("transient no focus") << ShellSurface::TransientFlag::NoFocus;
|
|
}
|
|
|
|
void ErrorTest::testTransientForSameSurface()
|
|
{
|
|
// this test verifies that creating a transient shell surface for itself triggers a protocol error
|
|
QSignalSpy errorSpy(m_connection, &ConnectionThread::errorOccurred);
|
|
QVERIFY(errorSpy.isValid());
|
|
QScopedPointer<Surface> surface(m_compositor->createSurface());
|
|
QScopedPointer<ShellSurface> shellSurface(m_shell->createSurface(surface.data()));
|
|
QFETCH(ShellSurface::TransientFlag, flag);
|
|
shellSurface->setTransient(surface.data(), QPoint(), flag);
|
|
QVERIFY(errorSpy.wait());
|
|
QVERIFY(m_connection->hasError());
|
|
QCOMPARE(m_connection->errorCode(), EPROTO);
|
|
}
|
|
|
|
QTEST_GUILESS_MAIN(ErrorTest)
|
|
#include "test_error.moc"
|