yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/autotests/wayland/client/test_wayland_output.cpp

331 lines
12 KiB
C++
Raw Normal View History

KWayland: Convert license headers to SPDX Summary: Convert license headers to SPDX expressions and add license files as required by REUSE specification. Reviewers: zzag Reviewed By: zzag Subscribers: kde-frameworks-devel Tags: #frameworks Maniphest Tasks: T11550 Differential Revision: https://phabricator.kde.org/D28058
2020-03-15 15:19:28 +00:00
/*
SPDX-FileCopyrightText: 2014 Martin Gräßlin <mgraesslin@kde.org>
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
KWayland: Convert license headers to SPDX Summary: Convert license headers to SPDX expressions and add license files as required by REUSE specification. Reviewers: zzag Reviewed By: zzag Subscribers: kde-frameworks-devel Tags: #frameworks Maniphest Tasks: T11550 Differential Revision: https://phabricator.kde.org/D28058
2020-03-15 15:19:28 +00:00
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// Qt
Don't use QtTest => use QTest + missing include
2023-07-03 19:28:19 +00:00
#include <QSignalSpy>
#include <QTest>
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// KWin
Integrate kwaylandserver This makes KWin switch to in-tree copy of KWaylandServer codebase. KWaylandServer namespace has been left as is. It will be addressed later by renaming classes in order to fit in the KWin namespace.
2022-04-22 09:27:33 +00:00
#include "wayland/display.h"
wayland: Drop "_interface" from filenames The cpp files in the wayland directory are named after protocol names. "_interface" does not contribute anything new.
2023-09-13 05:52:59 +00:00
#include "wayland/output.h"
Integrate kwaylandserver This makes KWin switch to in-tree copy of KWaylandServer codebase. KWaylandServer namespace has been left as is. It will be addressed later by renaming classes in order to fit in the KWin namespace.
2022-04-22 09:27:33 +00:00
Fix build
2020-04-29 13:59:23 +00:00
#include "KWayland/Client/connection_thread.h"
Run clang-format If you want git blame to ignore formatting revisions run: git config blame.ignoreRevsFile .git-blame-ignore-revs
2021-08-29 05:11:06 +00:00
#include "KWayland/Client/event_queue.h"
Fix build
2020-04-29 13:59:23 +00:00
#include "KWayland/Client/output.h"
#include "KWayland/Client/registry.h"
Integrate kwaylandserver This makes KWin switch to in-tree copy of KWaylandServer codebase. KWaylandServer namespace has been left as is. It will be addressed later by renaming classes in order to fit in the KWin namespace.
2022-04-22 09:27:33 +00:00
Merge libkwineffects into libkwin libkwineffects was introduced when kwin used to be an executable. It provided an api to implement effects and shielded from the technical quirks in kwin. Over the time, kwin internals had been split and abstractions were refactored so they can be consumed in scripts or plugins. Besides that, new ways to implement extensions have been introduced, which use kwin's internal abstractions. On the other hand, effects continue using libkwineffects specific apis. This has a few issues: qtquick effects use both apis and it bites us, duplicating same apis. The best solution so far is to merge libkwineffects with libkwin, and replace libkwineffects abstractions with libkwin abstractions, e.g. EffectScreen -> Output, etc. This change takes care of adjusting libs. Obviously, the main disadvantage of doing so is that binary effects have to be recompiled every time new libkwin is released. But it's already the case with libkwineffects too.
2023-10-24 17:23:33 +00:00
#include "../../../tests/fakeoutput.h"
Add KWin::Output handle to OutputInterface That's a necessary change for further output related refactorings. It also allows us to simplify some OutputInterface to Output mapping code.
2022-08-25 08:02:48 +00:00
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// Wayland
#include <wayland-client-protocol.h>
class TestWaylandOutput : public QObject
{
Q_OBJECT
public:
explicit TestWaylandOutput(QObject *parent = nullptr);
private Q_SLOTS:
void init();
void cleanup();
void testRegistry();
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
void testModeChange();
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
void testScaleChange();
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
void testSubPixel_data();
void testSubPixel();
void testTransform_data();
void testTransform();
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
private:
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
KWin::Display *m_display;
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::ConnectionThread *m_connection;
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
KWayland::Client::EventQueue *m_queue;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QThread *m_thread;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
};
static const QString s_socketName = QStringLiteral("kwin-test-wayland-output-0");
TestWaylandOutput::TestWaylandOutput(QObject *parent)
: QObject(parent)
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
, m_display(nullptr)
, m_connection(nullptr)
, m_thread(nullptr)
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
{
}
void TestWaylandOutput::init()
{
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
delete m_display;
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
m_display = new KWin::Display(this);
Allow accepting client connections on multiple sockets libwayland-server allows the wl_display accept client connections on more than one socket. We currently don't listen on multiple sockets, but it would be nice if Display supported such operation mode.
2020-10-19 15:52:56 +00:00
m_display->addSocketName(s_socketName);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_display->start();
QVERIFY(m_display->isRunning());
// setup connection
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
m_connection = new KWayland::Client::ConnectionThread;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy connectedSpy(m_connection, &KWayland::Client::ConnectionThread::connected);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
m_connection->setSocketName(s_socketName);
m_thread = new QThread(this);
m_connection->moveToThread(m_thread);
m_thread->start();
m_connection->initConnection();
QVERIFY(connectedSpy.wait());
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
m_queue = new KWayland::Client::EventQueue(this);
QVERIFY(!m_queue->isValid());
m_queue->setup(m_connection);
QVERIFY(m_queue->isValid());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
void TestWaylandOutput::cleanup()
{
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
if (m_queue) {
delete m_queue;
m_queue = nullptr;
}
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
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;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
void TestWaylandOutput::testRegistry()
{
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
auto outputHandle = std::make_unique<FakeOutput>();
outputHandle->setMode(QSize(1024, 768), 60000);
outputHandle->moveTo(QPoint(100, 50));
outputHandle->setPhysicalSize(QSize(200, 100));
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
auto outputInterface = std::make_unique<KWin::OutputInterface>(m_display, outputHandle.get());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy announced(&registry, &KWayland::Client::Registry::outputAnnounced);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(registry.isValid());
registry.setup();
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
wl_display_flush(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(!output.isValid());
QCOMPARE(output.geometry(), QRect());
QCOMPARE(output.globalPosition(), QPoint());
QCOMPARE(output.manufacturer(), QString());
QCOMPARE(output.model(), QString());
QCOMPARE(output.physicalSize(), QSize());
QCOMPARE(output.pixelSize(), QSize());
QCOMPARE(output.refreshRate(), 0);
QCOMPARE(output.scale(), 1);
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.subPixel(), KWayland::Client::Output::SubPixel::Unknown);
QCOMPARE(output.transform(), KWayland::Client::Output::Transform::Normal);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy outputChanged(&output, &KWayland::Client::Output::changed);
[client] Track all created Outputs and add static get method Summary: This change starts to track all Outputs and introduces a static method to get an Output* for a wl_output* in case the wl_output* is known to Output. This is needed for the enter and leave events on wl_surface. Reviewers: #plasma_on_wayland Subscribers: plasma-devel Tags: #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D2526
2016-08-22 08:02:28 +00:00
auto o = registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>());
QVERIFY(!KWayland::Client::Output::get(o));
output.setup(o);
QCOMPARE(KWayland::Client::Output::get(o), &output);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
wl_display_flush(m_connection->display());
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QVERIFY(outputChanged.wait());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.geometry(), QRect(100, 50, 1024, 768));
QCOMPARE(output.globalPosition(), QPoint(100, 50));
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
QCOMPARE(output.manufacturer(), QString());
QCOMPARE(output.model(), QString());
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.physicalSize(), QSize(200, 100));
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
QCOMPARE(output.pixelSize(), QSize(1024, 768));
QCOMPARE(output.refreshRate(), 60000);
QCOMPARE(output.scale(), 1);
// for xwayland output it's unknown
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.subPixel(), KWayland::Client::Output::SubPixel::Unknown);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
// for xwayland transform is normal
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QCOMPARE(output.transform(), KWayland::Client::Output::Transform::Normal);
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
}
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
void TestWaylandOutput::testModeChange()
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
{
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
auto outputHandle = std::make_unique<FakeOutput>();
outputHandle->setMode(QSize(1024, 768), 60000);
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
auto outputInterface = std::make_unique<KWin::OutputInterface>(m_display, outputHandle.get());
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy announced(&registry, &KWayland::Client::Registry::outputAnnounced);
[autotest] Make TestWaylandOutput more robust If we use a thread for the connection we should also have an EventQueue.
2015-05-12 11:16:57 +00:00
registry.setEventQueue(m_queue);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy outputChanged(&output, &KWayland::Client::Output::changed);
QSignalSpy modeAddedSpy(&output, &KWayland::Client::Output::modeAdded);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
QVERIFY(outputChanged.wait());
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
QCOMPARE(modeAddedSpy.count(), 1);
autotests: Fix remaining "using namespace KWayland::Client"
2022-11-08 21:15:17 +00:00
QCOMPARE(modeAddedSpy.at(0).first().value<KWayland::Client::Output::Mode>().size, QSize(1024, 768));
QCOMPARE(modeAddedSpy.at(0).first().value<KWayland::Client::Output::Mode>().refreshRate, 60000);
QCOMPARE(modeAddedSpy.at(0).first().value<KWayland::Client::Output::Mode>().flags, KWayland::Client::Output::Mode::Flags(KWayland::Client::Output::Mode::Flag::Current));
QCOMPARE(modeAddedSpy.at(0).first().value<KWayland::Client::Output::Mode>().output, QPointer<KWayland::Client::Output>(&output));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.pixelSize(), QSize(1024, 768));
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
QCOMPARE(output.refreshRate(), 60000);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change once more
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
outputHandle->setMode(QSize(1280, 1024), 90000);
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
QVERIFY(outputChanged.wait());
QCOMPARE(modeAddedSpy.count(), 2);
autotests: Fix remaining "using namespace KWayland::Client"
2022-11-08 21:15:17 +00:00
QCOMPARE(modeAddedSpy.at(1).first().value<KWayland::Client::Output::Mode>().size, QSize(1280, 1024));
QCOMPARE(modeAddedSpy.at(1).first().value<KWayland::Client::Output::Mode>().refreshRate, 90000);
QCOMPARE(modeAddedSpy.at(1).first().value<KWayland::Client::Output::Mode>().flags, KWayland::Client::Output::Mode::Flags(KWayland::Client::Output::Mode::Flag::Current));
QCOMPARE(modeAddedSpy.at(1).first().value<KWayland::Client::Output::Mode>().output, QPointer<KWayland::Client::Output>(&output));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QCOMPARE(output.pixelSize(), QSize(1280, 1024));
Send only current wl_output mode Non-current output modes were deprecated due to various reasons, e.g. it's not possible to remove some nodes; two modes can have the same resolution and the refresh rate but different flags, but wl_output.mode fails to communicate that properly; the usefulness of non-current modes is questionable. For more details, please refer to [1]. [1] https://gitlab.freedesktop.org/wayland/wayland/-/issues/92
2021-04-04 17:05:10 +00:00
QCOMPARE(output.refreshRate(), 90000);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
}
void TestWaylandOutput::testScaleChange()
{
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
auto outputHandle = std::make_unique<FakeOutput>();
outputHandle->setMode(QSize(1024, 768), 60000);
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
auto outputInterface = std::make_unique<KWin::OutputInterface>(m_display, outputHandle.get());
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy announced(&registry, &KWayland::Client::Registry::outputAnnounced);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy outputChanged(&output, &KWayland::Client::Output::changed);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 1);
// change the scale
outputChanged.clear();
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
outputHandle->setScale(2);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 2);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
// changing to same value should not trigger
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
outputHandle->setScale(2);
[autotests] Extend test for OutputInterface Just adds more test conditions to the already existing test.
2016-06-13 17:19:06 +00:00
QVERIFY(!outputChanged.wait(100));
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change once more
outputChanged.clear();
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
outputHandle->setScale(4);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
QVERIFY(outputChanged.wait());
QCOMPARE(output.scale(), 4);
}
void TestWaylandOutput::testSubPixel_data()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QTest::addColumn<KWayland::Client::Output::SubPixel>("expected");
wayland/outputinterface: use the same enums as core KWin
2022-05-17 13:33:03 +00:00
QTest::addColumn<KWin::Output::SubPixel>("actual");
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
autotests: Fix remaining "using namespace KWayland::Client"
2022-11-08 21:15:17 +00:00
QTest::newRow("none") << KWayland::Client::Output::SubPixel::None << KWin::Output::SubPixel::None;
QTest::newRow("horizontal/rgb") << KWayland::Client::Output::SubPixel::HorizontalRGB << KWin::Output::SubPixel::Horizontal_RGB;
QTest::newRow("horizontal/bgr") << KWayland::Client::Output::SubPixel::HorizontalBGR << KWin::Output::SubPixel::Horizontal_BGR;
QTest::newRow("vertical/rgb") << KWayland::Client::Output::SubPixel::VerticalRGB << KWin::Output::SubPixel::Vertical_RGB;
QTest::newRow("vertical/bgr") << KWayland::Client::Output::SubPixel::VerticalBGR << KWin::Output::SubPixel::Vertical_BGR;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
}
void TestWaylandOutput::testSubPixel()
{
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
QFETCH(KWin::Output::SubPixel, actual);
auto outputHandle = std::make_unique<FakeOutput>();
outputHandle->setMode(QSize(1024, 768), 60000);
outputHandle->setSubPixel(actual);
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
auto outputInterface = std::make_unique<KWin::OutputInterface>(m_display, outputHandle.get());
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy announced(&registry, &KWayland::Client::Registry::outputAnnounced);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Output output;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy outputChanged(&output, &KWayland::Client::Output::changed);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
output.setup(registry.bindOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>()));
wl_display_flush(m_connection->display());
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
QTEST(output.subPixel(), "expected");
}
void TestWaylandOutput::testTransform_data()
{
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
QTest::addColumn<KWayland::Client::Output::Transform>("expected");
core: Rework OutputTransform type In some cases, it's desired to know what the inverse transform of a given output transform is. It's possible to make it work by providing helper functions, but we tend to avoid doing so. This change converts the OutputTransform from an enum to a class so it's possible to have both data + methods in the same type. Unfortunately, unlike Rust, C++ provides no way to attach methods to enums, classes and structs is the only way to go.
2023-07-10 10:57:57 +00:00
QTest::addColumn<KWin::OutputTransform::Kind>("actual");
core: Move Output::Transform enum to KWin namespace Being in the KWin namespace has a couple of advantages: the enum can be forward declared, and the transform can be replaced with a slightly more complex but useful type.
2023-07-10 10:33:09 +00:00
QTest::newRow("90") << KWayland::Client::Output::Transform::Rotated90 << KWin::OutputTransform::Rotated90;
QTest::newRow("180") << KWayland::Client::Output::Transform::Rotated180 << KWin::OutputTransform::Rotated180;
QTest::newRow("270") << KWayland::Client::Output::Transform::Rotated270 << KWin::OutputTransform::Rotated270;
QTest::newRow("Flipped") << KWayland::Client::Output::Transform::Flipped << KWin::OutputTransform::Flipped;
QTest::newRow("Flipped 90") << KWayland::Client::Output::Transform::Flipped90 << KWin::OutputTransform::Flipped90;
QTest::newRow("Flipped 180") << KWayland::Client::Output::Transform::Flipped180 << KWin::OutputTransform::Flipped180;
QTest::newRow("Flipped 280") << KWayland::Client::Output::Transform::Flipped270 << KWin::OutputTransform::Flipped270;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
}
void TestWaylandOutput::testTransform()
{
core: Rework OutputTransform type In some cases, it's desired to know what the inverse transform of a given output transform is. It's possible to make it work by providing helper functions, but we tend to avoid doing so. This change converts the OutputTransform from an enum to a class so it's possible to have both data + methods in the same type. Unfortunately, unlike Rust, C++ provides no way to attach methods to enums, classes and structs is the only way to go.
2023-07-10 10:57:57 +00:00
QFETCH(KWin::OutputTransform::Kind, actual);
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
auto outputHandle = std::make_unique<FakeOutput>();
outputHandle->setMode(QSize(1024, 768), 60000);
outputHandle->setTransform(actual);
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
auto outputInterface = std::make_unique<KWin::OutputInterface>(m_display, outputHandle.get());
wayland: Make OutputInterface pull information from Output It's a necessary step towards killing src/waylandoutput.{h,cpp}. Besides that, it makes OutputInterface more reusable and less error prone.
2022-10-15 11:52:22 +00:00
wayland: Integrate KWaylandServer classes into KWin namespace
2023-09-13 17:59:29 +00:00
using namespace KWin;
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
Use namespace KWayland::Client instead of KWin::WaylandServer It's no longer part of KWin.
2014-09-17 14:17:26 +00:00
KWayland::Client::Registry registry;
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy announced(&registry, &KWayland::Client::Registry::outputAnnounced);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
registry.create(m_connection->display());
QVERIFY(registry.isValid());
registry.setup();
wl_display_flush(m_connection->display());
QVERIFY(announced.wait());
Add convenient create methods to Registry These methods allow to create the Interface objects and set them up directly.
2014-09-19 08:42:44 +00:00
KWayland::Client::Output *output = registry.createOutput(announced.first().first().value<quint32>(), announced.first().last().value<quint32>(), &registry);
Port all connects This is mostly all automatic from clazy, though it got confused by a few namespace issues.
2021-02-25 13:48:11 +00:00
QSignalSpy outputChanged(output, &KWayland::Client::Output::changed);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
wl_display_flush(m_connection->display());
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
Add convenient create methods to Registry These methods allow to create the Interface objects and set them up directly.
2014-09-19 08:42:44 +00:00
QTEST(output->transform(), "expected");
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
// change back to normal
outputChanged.clear();
core: Move Output::Transform enum to KWin namespace Being in the KWin namespace has a couple of advantages: the enum can be forward declared, and the transform can be replaced with a slightly more complex but useful type.
2023-07-10 10:33:09 +00:00
outputHandle->setTransform(KWin::OutputTransform::Normal);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
if (outputChanged.isEmpty()) {
QVERIFY(outputChanged.wait());
}
autotests: Fix remaining "using namespace KWayland::Client"
2022-11-08 21:15:17 +00:00
QCOMPARE(output->transform(), KWayland::Client::Output::Transform::Normal);
[kwin_wayland] Initial addition of the WaylandServer module So far this new module contains: * Display * OutputInterface Display manages the server socket and server event loop. In general it's the entry point to any part of the server. OutputInterface is the abstraction for the wl_output interface on server side. An OutputInterface is created through the Display. The auto tests for ConnectionThread and Output are adjusted to use the internal server instead of starting Weston. Especially the Output test could be extended to test much more as we have absolute control over the server now.
2014-08-26 14:07:39 +00:00
}
Switch all auto tests to QTEST_GUILESS_MAIN We don't need a QGuiApplication in the tests.
2014-09-23 10:00:17 +00:00
QTEST_GUILESS_MAIN(TestWaylandOutput)
[kwin_wayland] Move Wayland::Output into dedicated source files At the same time adding an autotest for the Output, moving the listener into the Output class and providing enums for Subpixel and Transform. KWin now requires wl_ouput interface version 2 as that allows us to emit the changed signal in a better way. The unit test is not yet capable of testing everything, we need a mock Wayland server which is more flexible.
2014-08-19 14:08:02 +00:00
#include "test_wayland_output.moc"
Reference in a new issue Copy permalink