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

Integrate kwaylandserver

Browse source 
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.
This commit is contained in:
Vlad Zahorodnii 2022-04-22 12:27:33 +03:00
parent 28ed0ced17
commit b64f95b703
236 changed files with 1021 additions and 1184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.kde-ci.yml
View file

@ -33,4 +33,3 @@ Dependencies:
'plasma/breeze': '@same'
'plasma/kdecoration': '@same'
'plasma/kscreenlocker': '@same'
'plasma/kwayland-server': '@same'

38
CMakeLists.txt
View file

@ -141,12 +141,6 @@ set_package_properties(KF5Kirigami2 PROPERTIES
find_package(KDecoration2 ${PROJECT_VERSION} CONFIG REQUIRED)
find_package(KWaylandServer ${PROJECT_VERSION} CONFIG REQUIRED)
set_package_properties(KWaylandServer PROPERTIES
TYPE REQUIRED
PURPOSE "For Wayland integration"
)
find_package(Breeze 5.9.0 CONFIG)
set_package_properties(Breeze PROPERTIES
TYPE OPTIONAL
@ -196,6 +190,32 @@ if (Wayland_Egl_FOUND)
set(HAVE_WAYLAND_EGL TRUE)
endif()
find_package(Wayland 1.20 REQUIRED COMPONENTS
Server
)
find_package(WaylandProtocols 1.25)
set_package_properties(WaylandProtocols PROPERTIES
TYPE REQUIRED
PURPOSE "Collection of Wayland protocols that add functionality not available in the Wayland core protocol"
URL "https://gitlab.freedesktop.org/wayland/wayland-protocols/"
)
find_package(PlasmaWaylandProtocols CONFIG)
set_package_properties(PlasmaWaylandProtocols PROPERTIES
TYPE REQUIRED
PURPOSE "Collection of Plasma-specific Wayland protocols"
URL "https://invent.kde.org/libraries/plasma-wayland-protocols/"
)
if (QT_MAJOR_VERSION EQUAL "5")
find_package(QtWaylandScanner)
set_package_properties(QtWaylandScanner PROPERTIES
TYPE REQUIRED
PURPOSE "Required for building KWin with Wayland support"
)
endif()
find_package(XKB 0.7.0)
set_package_properties(XKB PROPERTIES
TYPE REQUIRED
@ -387,6 +407,7 @@ endif()
include_directories(BEFORE
${CMAKE_CURRENT_BINARY_DIR}/src/libkwineffects
${CMAKE_CURRENT_BINARY_DIR}/src/wayland
${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}/src/libkwineffects
${CMAKE_CURRENT_SOURCE_DIR}/src/effects
@ -416,12 +437,7 @@ add_subdirectory(kconf_update)
add_subdirectory(src)
if (BUILD_TESTING)
find_package(WaylandProtocols 1.19 REQUIRED)
if (QT_MAJOR_VERSION EQUAL "5")
find_package(QtWaylandScanner ${QT_MIN_VERSION} REQUIRED)
endif()
find_package(Wayland REQUIRED COMPONENTS Client)
find_package(PlasmaWaylandProtocols CONFIG REQUIRED)
add_subdirectory(autotests)
add_subdirectory(tests)

6
autotests/CMakeLists.txt
View file

@ -34,13 +34,14 @@ set(testVirtualDesktops_SRCS
add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
target_link_libraries(testVirtualDesktops
kwin
Qt::Test
Qt::Widgets
KF5::ConfigCore
KF5::GlobalAccel
KF5::I18n
Plasma::KWaylandServer
KF5::WindowSystem
)
add_test(NAME kwin-testVirtualDesktops COMMAND testVirtualDesktops)
@ -221,12 +222,13 @@ set(testXkb_SRCS
)
add_executable(testXkb ${testXkb_SRCS})
target_link_libraries(testXkb
kwin
Qt::Gui
Qt::Test
Qt::Widgets
KF5::ConfigCore
Plasma::KWaylandServer
KF5::WindowSystem
kwineffects

4
autotests/integration/dont_crash_cursor_physical_size_empty.cpp
View file

@ -13,6 +13,8 @@
#include "effectloader.h"
#include "effects.h"
#include "platform.h"
#include "wayland/display.h"
#include "wayland/output_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
@ -22,8 +24,6 @@
#include <KWayland/Client/seat.h>
#include <KWayland/Client/server_decoration.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/display.h>
#include <KWaylandServer/output_interface.h>
using namespace KWin;
using namespace KWayland::Client;

4
autotests/integration/globalshortcuts_test.cpp
View file

@ -14,13 +14,13 @@
#include "keyboard_input.h"
#include "platform.h"
#include "useractions.h"
#include "wayland/keyboard_interface.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include <KWayland/Client/surface.h>
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KGlobalAccel>
#include <linux/input.h>

5
autotests/integration/idle_inhibition_test.cpp
View file

@ -11,14 +11,13 @@
#include "abstract_client.h"
#include "platform.h"
#include "virtualdesktops.h"
#include "wayland/display.h"
#include "wayland/idle_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWayland/Client/surface.h>
#include <KWaylandServer/display.h>
#include <KWaylandServer/idle_interface.h>
using namespace KWin;
using namespace KWayland::Client;
using KWaylandServer::IdleInterface;

3
autotests/integration/input_stacking_order.cpp
View file

@ -13,6 +13,7 @@
#include "deleted.h"
#include "output.h"
#include "platform.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <kwineffects.h>
@ -26,8 +27,6 @@
#include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/seat_interface.h>
namespace KWin
{

8
autotests/integration/inputmethod_test.cpp
View file

@ -18,13 +18,13 @@
#include "qwayland-input-method-unstable-v1.h"
#include "qwayland-text-input-unstable-v3.h"
#include "virtualkeyboard_dbus.h"
#include "wayland/clientconnection.h"
#include "wayland/display.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/clientconnection.h>
#include <KWaylandServer/display.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusPendingReply>

3
autotests/integration/internal_window.cpp
View file

@ -14,6 +14,7 @@
#include "internal_client.h"
#include "output.h"
#include "platform.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
@ -25,8 +26,6 @@
#include <KWayland/Client/surface.h>
#include <KWindowSystem>
#include <KWaylandServer/surface_interface.h>
#include <linux/input.h>
using namespace KWayland::Client;

4
autotests/integration/lockscreen.cpp
View file

@ -15,6 +15,8 @@
#include "platform.h"
#include "renderbackend.h"
#include "screenedge.h"
#include "wayland/keyboard_interface.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <kwineffects.h>
@ -28,8 +30,6 @@
#include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h>
#include <KWayland/Client/touch.h>
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
// screenlocker
#include <KScreenLocker/KsldApp>

2
autotests/integration/plasmawindow_test.cpp
View file

@ -11,6 +11,7 @@
#include "cursor.h"
#include "output.h"
#include "platform.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
@ -19,7 +20,6 @@
#include <KWayland/Client/compositor.h>
#include <KWayland/Client/plasmawindowmanagement.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/seat_interface.h>
// screenlocker
#if KWIN_BUILD_SCREENLOCKER
#include <KScreenLocker/KsldApp>

4
autotests/integration/pointer_constraints_test.cpp
View file

@ -14,6 +14,8 @@
#include "output.h"
#include "platform.h"
#include "pointer_input.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
@ -25,8 +27,6 @@
#include <KWayland/Client/seat.h>
#include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <linux/input.h>

5
autotests/integration/pointer_input.cpp
View file

@ -19,6 +19,8 @@
#include "screenedge.h"
#include "screens.h"
#include "virtualdesktops.h"
#include "wayland/clientconnection.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "xcursortheme.h"
@ -34,9 +36,6 @@
#include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/clientconnection.h>
#include <KWaylandServer/seat_interface.h>
#include <linux/input.h>
namespace KWin

4
autotests/integration/scene_qpainter_test.cpp
View file

@ -13,6 +13,8 @@
#include "effectloader.h"
#include "effects.h"
#include "platform.h"
#include "wayland/shmclientbuffer.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
@ -22,8 +24,6 @@
#include <KWayland/Client/pointer.h>
#include <KWayland/Client/seat.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include <QPainter>

2
autotests/integration/test_helpers.cpp
View file

@ -14,6 +14,7 @@
#include "screenlockerwatcher.h"
#endif
#include "inputmethod.h"
#include "wayland/display.h"
#include "wayland_server.h"
#include "workspace.h"
@ -34,7 +35,6 @@
#include <KWayland/Client/subsurface.h>
#include <KWayland/Client/surface.h>
#include <KWayland/Client/textinput.h>
#include <KWaylandServer/display.h>
// screenlocker
#if KWIN_BUILD_SCREENLOCKER

4
autotests/integration/transient_placement.cpp
View file

@ -13,6 +13,8 @@
#include "output.h"
#include "platform.h"
#include "screens.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <kwineffects.h>
@ -29,8 +31,6 @@
#include <KWayland/Client/shm_pool.h>
#include <KWayland/Client/surface.h>
#include <KWayland/Client/touch.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
struct PopupLayout
{

5
autotests/integration/xdgshellclient_test.cpp
View file

@ -19,6 +19,8 @@
#include "platform.h"
#include "screens.h"
#include "virtualdesktops.h"
#include "wayland/clientconnection.h"
#include "wayland/display.h"
#include "wayland_server.h"
#include "workspace.h"
@ -36,9 +38,6 @@
#include <KWayland/Client/subsurface.h>
#include <KWayland/Client/surface.h>
#include <KWaylandServer/clientconnection.h>
#include <KWaylandServer/display.h>
#include <QDBusConnection>
// system

3
autotests/integration/xwayland_input_test.cpp
View file

@ -12,12 +12,11 @@
#include "deleted.h"
#include "output.h"
#include "platform.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
#include <KWaylandServer/seat_interface.h>
#include <QSocketNotifier>
#include <netwm.h>

3
autotests/integration/xwayland_selections_test.cpp
View file

@ -12,12 +12,11 @@
#include "abstract_client.h"
#include "output.h"
#include "platform.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "xwl/databridge.h"
#include <KWaylandServer/seat_interface.h>
#include <QProcess>
#include <QProcessEnvironment>

5
src/CMakeLists.txt
View file

@ -183,8 +183,6 @@ target_link_libraries(kwin
KDecoration2::KDecoration
KDecoration2::KDecoration2Private
Plasma::KWaylandServer
XCB::COMPOSITE
XCB::CURSOR
XCB::DAMAGE
@ -201,9 +199,11 @@ target_link_libraries(kwin
UDev::UDev
XKB::XKB
EGL::EGL
epoxy::epoxy
Threads::Threads
Wayland::Server
lcms2::lcms2
)
if (QT_MAJOR_VERSION EQUAL "5")
@ -248,6 +248,7 @@ target_sources(kwin PRIVATE
add_subdirectory(backends)
add_subdirectory(scenes)
add_subdirectory(utils)
add_subdirectory(wayland)
if (KWIN_BUILD_ACTIVITIES)
target_sources(kwin PRIVATE activities.cpp)

9
src/abstract_client.cpp
View file

@ -34,14 +34,13 @@
#include "surfaceitem_x11.h"
#include "useractions.h"
#include "virtualdesktops.h"
#include "wayland/output_interface.h"
#include "wayland/plasmawindowmanagement_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "windowitem.h"
#include "workspace.h"
#include "wayland_server.h"
#include <KWaylandServer/output_interface.h>
#include <KWaylandServer/plasmawindowmanagement_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <KDecoration2/DecoratedClient>
#include <KDecoration2/Decoration>

5
src/backends/drm/dmabuf_feedback.cpp
View file

@ -11,9 +11,8 @@
#include "drm_gpu.h"
#include "egl_dmabuf.h"
#include "egl_gbm_backend.h"
#include <KWaylandServer/linuxdmabufv1clientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/surface_interface.h"
namespace KWin
{

5
src/backends/drm/drm_buffer_gbm.cpp
View file

@ -14,6 +14,8 @@
#include "kwineglimagetexture.h"
#include "kwineglutils_p.h"
#include "logging.h"
#include "wayland/clientbuffer.h"
#include "wayland/linuxdmabufv1clientbuffer.h"
// system
#include <sys/mman.h>
@ -24,9 +26,6 @@
#include <gbm.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
// KWaylandServer
#include "KWaylandServer/clientbuffer.h"
#include "KWaylandServer/linuxdmabufv1clientbuffer.h"
namespace KWin
{

3
src/backends/drm/drm_gpu.cpp
View file

@ -25,6 +25,7 @@
#include "main.h"
#include "renderloop_p.h"
#include "session.h"
#include "wayland/drmleasedevice_v1_interface.h"
#include "wayland_server.h"
// system
#include <algorithm>
@ -38,8 +39,6 @@
#include <libdrm/drm_mode.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
// KWaylandServer
#include "KWaylandServer/drmleasedevice_v1_interface.h"
namespace KWin
{

2
src/backends/drm/drm_lease_output.cpp
View file

@ -9,12 +9,12 @@
#include "drm_lease_output.h"
#include "KWaylandServer/drmleasedevice_v1_interface.h"
#include "drm_layer.h"
#include "drm_object_connector.h"
#include "drm_object_crtc.h"
#include "drm_object_plane.h"
#include "drm_pipeline.h"
#include "wayland/drmleasedevice_v1_interface.h"
#include "logging.h"

2
src/backends/drm/drm_lease_output.h
View file

@ -9,7 +9,7 @@
#pragma once
#include <KWaylandServer/drmleasedevice_v1_interface.h>
#include "wayland/drmleasedevice_v1_interface.h"
#include <QObject>
#include <QVector>

7
src/backends/drm/egl_gbm_backend.cpp
View file

@ -31,6 +31,9 @@
#include "shadowbuffer.h"
#include "surfaceitem_wayland.h"
#include "virtual_egl_gbm_layer.h"
#include "wayland/clientconnection.h"
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/surface_interface.h"
// kwin libs
#include <kwineglimagetexture.h>
#include <kwinglplatform.h>
@ -39,10 +42,6 @@
#include <errno.h>
#include <gbm.h>
#include <unistd.h>
// kwayland server
#include "KWaylandServer/clientconnection.h"
#include "KWaylandServer/linuxdmabufv1clientbuffer.h"
#include "KWaylandServer/surface_interface.h"
namespace KWin
{

5
src/backends/drm/egl_gbm_layer.cpp
View file

@ -17,9 +17,8 @@
#include "egl_gbm_backend.h"
#include "logging.h"
#include "surfaceitem_wayland.h"
#include "KWaylandServer/linuxdmabufv1clientbuffer.h"
#include "KWaylandServer/surface_interface.h"
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/surface_interface.h"
#include <QRegion>
#include <drm_fourcc.h>

5
src/backends/drm/egl_gbm_layer_surface.cpp
View file

@ -19,9 +19,8 @@
#include "logging.h"
#include "shadowbuffer.h"
#include "surfaceitem_wayland.h"
#include <KWaylandServer/linuxdmabufv1clientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/surface_interface.h"
#include <drm_fourcc.h>
#include <errno.h>

5
src/backends/drm/virtual_egl_gbm_layer.cpp
View file

@ -22,9 +22,8 @@
#include "logging.h"
#include "shadowbuffer.h"
#include "surfaceitem_wayland.h"
#include "KWaylandServer/linuxdmabufv1clientbuffer.h"
#include "KWaylandServer/surface_interface.h"
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/surface_interface.h"
#include <QRegion>
#include <drm_fourcc.h>

3
src/backends/fakeinput/fakeinputbackend.cpp
View file

@ -6,10 +6,9 @@
#include "fakeinputbackend.h"
#include "fakeinputdevice.h"
#include "wayland/fakeinput_interface.h"
#include "wayland_server.h"
#include <KWaylandServer/fakeinput_interface.h>
namespace KWin
{

3
src/backends/fakeinput/fakeinputdevice.cpp
View file

@ -5,8 +5,7 @@
*/
#include "fakeinputdevice.h"
#include <KWaylandServer/fakeinput_interface.h>
#include "wayland/fakeinput_interface.h"
namespace KWin
{

3
src/composite.cpp
View file

@ -36,6 +36,7 @@
#include "useractions.h"
#include "utils/common.h"
#include "utils/xcbutils.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
@ -44,8 +45,6 @@
#include <kwinglplatform.h>
#include <kwingltexture.h>
#include <KWaylandServer/surface_interface.h>
#include <KGlobalAccel>
#include <KLocalizedString>
#if KWIN_BUILD_NOTIFICATIONS

21
src/debug_console.cpp
View file

@ -16,6 +16,16 @@
#include "scene.h"
#include "unmanaged.h"
#include "utils/subsurfacemonitor.h"
#include "wayland/abstract_data_source.h"
#include "wayland/clientconnection.h"
#include "wayland/datacontrolsource_v1_interface.h"
#include "wayland/datasource_interface.h"
#include "wayland/display.h"
#include "wayland/primaryselectionsource_v1_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/shmclientbuffer.h"
#include "wayland/subcompositor_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "waylandclient.h"
#include "workspace.h"
@ -26,17 +36,6 @@
#include "ui_debug_console.h"
// KWayland
#include <KWaylandServer/abstract_data_source.h>
#include <KWaylandServer/clientconnection.h>
#include <KWaylandServer/datacontrolsource_v1_interface.h>
#include <KWaylandServer/datasource_interface.h>
#include <KWaylandServer/display.h>
#include <KWaylandServer/primaryselectionsource_v1_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/subcompositor_interface.h>
#include <KWaylandServer/surface_interface.h>
// frameworks
#include <KLocalizedString>
#include <NETWM>

4
src/decorations/decorationbridge.cpp
View file

@ -15,6 +15,7 @@
#include "settings.h"
// KWin core
#include "abstract_client.h"
#include "wayland/server_decoration_interface.h"
#include "wayland_server.h"
#include "workspace.h"
@ -23,9 +24,6 @@
#include <KDecoration2/Decoration>
#include <KDecoration2/DecorationSettings>
// KWayland
#include <KWaylandServer/server_decoration_interface.h>
// Frameworks
#include <KPluginFactory>
#include <KPluginMetaData>

3
src/dpmsinputeventfilter.cpp
View file

@ -10,13 +10,12 @@
#include "main.h"
#include "output.h"
#include "platform.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include <QGuiApplication>
#include <QKeyEvent>
#include <KWaylandServer/seat_interface.h>
namespace KWin
{

3
src/effects/backgroundcontrast/CMakeLists.txt
View file

@ -9,8 +9,7 @@ set(contrast_SOURCES
)
kwin4_add_effect_module(kwin4_effect_contrast ${contrast_SOURCES})
target_link_libraries(kwin4_effect_contrast PRIVATE
kwin
kwineffects
kwinglutils
Plasma::KWaylandServer
)

7
src/effects/backgroundcontrast/contrast.cpp
View file

@ -10,14 +10,15 @@
#include "contrastshader.h"
// KConfigSkeleton
#include "wayland/contrast_interface.h"
#include "wayland/display.h"
#include "wayland/surface_interface.h"
#include <QCoreApplication>
#include <QMatrix4x4>
#include <QTimer>
#include <QWindow>
#include <KWaylandServer/display.h>
#include <KWaylandServer/surface_interface.h>
namespace KWin
{

5
src/effects/backgroundcontrast/contrast.h
View file

@ -15,7 +15,10 @@
#include <QVector2D>
#include <QVector>
#include <KWaylandServer/contrast_interface.h>
namespace KWaylandServer
{
class ContrastManagerInterface;
}
namespace KWin
{

3
src/effects/blur/CMakeLists.txt
View file

@ -13,11 +13,10 @@ kconfig_add_kcfg_files(blur_SOURCES
kwin4_add_effect_module(kwin4_effect_blur ${blur_SOURCES})
target_link_libraries(kwin4_effect_blur PRIVATE
kwin
kwineffects
kwinglutils
Plasma::KWaylandServer
KF5::ConfigGui
KDecoration2::KDecoration

7
src/effects/blur/blur.cpp
View file

@ -11,6 +11,10 @@
// KConfigSkeleton
#include "blurconfig.h"
#include "wayland/blur_interface.h"
#include "wayland/display.h"
#include "wayland/surface_interface.h"
#include <QGuiApplication>
#include <QMatrix4x4>
#include <QScreen>
@ -22,9 +26,6 @@
#include <KConfigGroup>
#include <KSharedConfig>
#include <KWaylandServer/display.h>
#include <KWaylandServer/shadow_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <KDecoration2/Decoration>

5
src/effects/blur/blur.h
View file

@ -16,7 +16,10 @@
#include <QVector2D>
#include <QVector>
#include <KWaylandServer/blur_interface.h>
namespace KWaylandServer
{
class BlurManagerInterface;
}
namespace KWin
{

3
src/effects/slidingpopups/CMakeLists.txt
View file

@ -13,9 +13,8 @@ kconfig_add_kcfg_files(slidingpopups_SOURCES
kwin4_add_effect_module(kwin4_effect_slidingpopups ${slidingpopups_SOURCES})
target_link_libraries(kwin4_effect_slidingpopups PRIVATE
kwin
kwineffects
Plasma::KWaylandServer
KF5::ConfigGui
)

7
src/effects/slidingpopups/slidingpopups.cpp
View file

@ -11,14 +11,15 @@
#include "slidingpopups.h"
#include "slidingpopupsconfig.h"
#include "wayland/display.h"
#include "wayland/slide_interface.h"
#include "wayland/surface_interface.h"
#include <QFontMetrics>
#include <QGuiApplication>
#include <QTimer>
#include <QWindow>
#include <KWaylandServer/display.h>
#include <KWaylandServer/surface_interface.h>
#include <KWindowEffects>
Q_DECLARE_METATYPE(KWindowEffects::SlideFromLocation)

5
src/effects/slidingpopups/slidingpopups.h
View file

@ -14,7 +14,10 @@
// Include with base class for effects.
#include <kwineffects.h>
#include <KWaylandServer/slide_interface.h>
namespace KWaylandServer
{
class SlideManagerInterface;
}
namespace KWin
{

5
src/events.cpp
View file

@ -31,6 +31,8 @@
#include "unmanaged.h"
#include "useractions.h"
#include "utils/xcbutils.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include <KDecoration2/Decoration>
@ -53,9 +55,6 @@
#include "composite.h"
#include "x11eventfilter.h"
#include "wayland_server.h"
#include <KWaylandServer/surface_interface.h>
#ifndef XCB_GE_GENERIC
#define XCB_GE_GENERIC 35
typedef struct xcb_ge_generic_event_t

5
src/idle_inhibition.cpp
View file

@ -10,11 +10,10 @@
#include "idle_inhibition.h"
#include "abstract_client.h"
#include "deleted.h"
#include "wayland/idle_interface.h"
#include "wayland/surface_interface.h"
#include "workspace.h"
#include <KWaylandServer/idle_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <algorithm>
#include <functional>

12
src/input.cpp
View file

@ -40,6 +40,12 @@
#include "screens.h"
#include "unmanaged.h"
#include "virtualdesktops.h"
#include "wayland/display.h"
#include "wayland/inputmethod_v1_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/shmclientbuffer.h"
#include "wayland/surface_interface.h"
#include "wayland/tablet_v2_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "xwl/xwayland_interface.h"
@ -47,12 +53,6 @@
#include <KDecoration2/Decoration>
#include <KGlobalAccel>
#include <KLocalizedString>
#include <KWaylandServer/display.h>
#include <KWaylandServer/inputmethod_v1_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include <KWaylandServer/tablet_v2_interface.h>
#include <decorations/decoratedclient.h>
// screenlocker

12
src/inputmethod.cpp
View file

@ -25,15 +25,15 @@
#include "deleted.h"
#include "tablet_input.h"
#include "touch_input.h"
#include "wayland/display.h"
#include "wayland/inputmethod_v1_interface.h"
#include "wayland/keyboard_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland/textinput_v3_interface.h"
#include <KLocalizedString>
#include <KShell>
#include <KWaylandServer/display.h>
#include <KWaylandServer/inputmethod_v1_interface.h>
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <KWaylandServer/textinput_v3_interface.h>
#include <QDBusConnection>
#include <QDBusMessage>

3
src/inputmethod.h
View file

@ -9,6 +9,8 @@
#ifndef KWIN_VIRTUAL_KEYBOARD_H
#define KWIN_VIRTUAL_KEYBOARD_H
#include "wayland/textinput_v2_interface.h"
#include <utility>
#include <vector>
@ -17,7 +19,6 @@
#include <kwin_export.h>
#include <kwinglobals.h>
#include <KWaylandServer/textinput_v2_interface.h>
#include <QPointer>
#include <QTimer>

10
src/inputpanelv1client.cpp
View file

@ -12,13 +12,13 @@
#include "inputmethod.h"
#include "output.h"
#include "platform.h"
#include "wayland/output_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland/textinput_v2_interface.h"
#include "wayland/textinput_v3_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/output_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
#include <KWaylandServer/textinput_v2_interface.h>
#include <KWaylandServer/textinput_v3_interface.h>
using namespace KWaylandServer;

2
src/inputpanelv1client.h
View file

@ -9,8 +9,8 @@
#pragma once
#include "wayland/inputmethod_v1_interface.h"
#include "waylandclient.h"
#include <KWaylandServer/inputmethod_v1_interface.h>
#include <QPointer>
namespace KWin

5
src/inputpanelv1integration.cpp
View file

@ -6,11 +6,10 @@
#include "inputpanelv1integration.h"
#include "inputpanelv1client.h"
#include "wayland/display.h"
#include "wayland/inputmethod_v1_interface.h"
#include "wayland_server.h"
#include <KWaylandServer/display.h>
#include <KWaylandServer/inputmethod_v1_interface.h>
using namespace KWaylandServer;
namespace KWin

8
src/keyboard_input.cpp
View file

@ -17,14 +17,12 @@
#include "keyboard_layout.h"
#include "keyboard_repeat.h"
#include "modifier_only_shortcuts.h"
#include "abstract_client.h"
#include "utils/common.h"
#include "wayland/datadevice_interface.h"
#include "wayland/keyboard_interface.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
// KWayland
#include <KWaylandServer/datadevice_interface.h>
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
// screenlocker
#if KWIN_BUILD_SCREENLOCKER
#include <KScreenLocker/KsldApp>

5
src/keyboard_repeat.cpp
View file

@ -9,11 +9,10 @@
#include "keyboard_repeat.h"
#include "input_event.h"
#include "keyboard_input.h"
#include "wayland/keyboard_interface.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include <KWaylandServer/keyboard_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <QTimer>
namespace KWin

7
src/layershellv1client.cpp
View file

@ -8,13 +8,12 @@
#include "deleted.h"
#include "layershellv1integration.h"
#include "output.h"
#include "wayland/layershell_v1_interface.h"
#include "wayland/output_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/layershell_v1_interface.h>
#include <KWaylandServer/output_interface.h>
#include <KWaylandServer/surface_interface.h>
using namespace KWaylandServer;
namespace KWin

5
src/layershellv1integration.cpp
View file

@ -9,12 +9,11 @@
#include "output.h"
#include "platform.h"
#include "screens.h"
#include "wayland/display.h"
#include "wayland/layershell_v1_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/display.h>
#include <KWaylandServer/layershell_v1_interface.h>
#include <QTimer>
using namespace KWaylandServer;

2
src/linux_dmabuf.h
View file

@ -10,7 +10,7 @@
#include <kwin_export.h>
#include <KWaylandServer/linuxdmabufv1clientbuffer.h>
#include "wayland/linuxdmabufv1clientbuffer.h"
namespace KWin
{

2
src/main.cpp
View file

@ -26,6 +26,7 @@
#endif
#include "sm.h"
#include "utils/xcbutils.h"
#include "wayland/surface_interface.h"
#include "workspace.h"
#include "x11eventfilter.h"
@ -35,7 +36,6 @@
#include <KAboutData>
#include <KLocalizedString>
#include <KPluginMetaData>
#include <KWaylandServer/surface_interface.h>
// Qt
#include <QCommandLineParser>
#include <QLibraryInfo>

6
src/main_wayland.cpp
View file

@ -15,15 +15,13 @@
#include "inputmethod.h"
#include "platform.h"
#include "tabletmodemanager.h"
#include "wayland/display.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "xwl/xwayland.h"
#include "xwl/xwaylandlauncher.h"
// KWayland
#include <KWaylandServer/display.h>
#include <KWaylandServer/seat_interface.h>
// KDE
#include <KCrash>
#include <KDesktopFile>

6
src/platform.cpp
View file

@ -22,11 +22,11 @@
#include "scene.h"
#include "screenedge.h"
#include "screens.h"
#include "wayland/outputchangeset_v2.h"
#include "wayland/outputconfiguration_v2_interface.h"
#include "wayland_server.h"
#include <KCoreAddons>
#include <KWaylandServer/outputchangeset_v2.h>
#include <KWaylandServer/outputconfiguration_v2_interface.h>
#include <KCoreAddons>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <private/qtx11extras_p.h>

2
src/platformsupport/scenes/opengl/abstract_egl_backend.cpp
View file

@ -14,8 +14,8 @@
#include "platform.h"
#include "utils/common.h"
#include "utils/egl_context_attribute_builder.h"
#include "wayland/display.h"
#include "wayland_server.h"
#include <KWaylandServer/display.h>
// kwin libs
#include <kwinglplatform.h>
#include <kwinglutils.h>

7
src/platformsupport/scenes/opengl/basiceglsurfacetexture_wayland.cpp
View file

@ -10,10 +10,9 @@
#include "kwingltexture.h"
#include "surfaceitem_wayland.h"
#include "utils/common.h"
#include <KWaylandServer/drmclientbuffer.h>
#include <KWaylandServer/linuxdmabufv1clientbuffer.h>
#include <KWaylandServer/shmclientbuffer.h>
#include "wayland/drmclientbuffer.h"
#include "wayland/linuxdmabufv1clientbuffer.h"
#include "wayland/shmclientbuffer.h"
namespace KWin
{

5
src/platformsupport/scenes/qpainter/qpaintersurfacetexture_wayland.cpp
View file

@ -7,9 +7,8 @@
#include "qpaintersurfacetexture_wayland.h"
#include "surfaceitem_wayland.h"
#include "utils/common.h"
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include "wayland/shmclientbuffer.h"
#include "wayland/surface_interface.h"
#include <QPainter>

4
src/plugins/idletime/poller.cpp
View file

@ -10,9 +10,9 @@
#include <KIdleTime>
#include "wayland/idle_interface.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include <KWaylandServer/idle_interface.h>
#include <KWaylandServer/seat_interface.h>
namespace KWin
{

5
src/plugins/screencast/screencastmanager.cpp
View file

@ -18,15 +18,14 @@
#include "regionscreencastsource.h"
#include "scene.h"
#include "screencaststream.h"
#include "wayland/display.h"
#include "wayland/output_interface.h"
#include "wayland_server.h"
#include "windowscreencastsource.h"
#include "workspace.h"
#include <KLocalizedString>
#include <KWaylandServer/display.h>
#include <KWaylandServer/output_interface.h>
namespace KWin
{

2
src/plugins/screencast/screencastmanager.h
View file

@ -10,7 +10,7 @@
#include "plugin.h"
#include <KWaylandServer/screencast_v1_interface.h>
#include "wayland/screencast_v1_interface.h"
namespace KWin
{

3
src/plugins/screencast/screencaststream.h
View file

@ -11,8 +11,7 @@
#include "config-kwin.h"
#include "kwinglobals.h"
#include <KWaylandServer/screencast_v1_interface.h>
#include "wayland/screencast_v1_interface.h"
#include <QHash>
#include <QObject>

15
src/pointer_input.cpp
View file

@ -20,19 +20,18 @@
#include "output.h"
#include "platform.h"
#include "screens.h"
#include "wayland/datadevice_interface.h"
#include "wayland/display.h"
#include "wayland/pointer_interface.h"
#include "wayland/pointerconstraints_v1_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/shmclientbuffer.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include "x11client.h"
// KDecoration
#include <KDecoration2/Decoration>
// KWayland
#include <KWaylandServer/datadevice_interface.h>
#include <KWaylandServer/display.h>
#include <KWaylandServer/pointer_interface.h>
#include <KWaylandServer/pointerconstraints_v1_interface.h>
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/surface_interface.h>
// screenlocker
#if KWIN_BUILD_SCREENLOCKER
#include <KScreenLocker/KsldApp>

2
src/popup_input_filter.cpp
View file

@ -8,10 +8,10 @@
#include "abstract_client.h"
#include "deleted.h"
#include "internal_client.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
#include <KWaylandServer/seat_interface.h>
#include <QMouseEvent>
namespace KWin

3
src/scene.cpp
View file

@ -60,6 +60,7 @@
#include "shadowitem.h"
#include "surfaceitem.h"
#include "unmanaged.h"
#include "wayland/surface_interface.h"
#include "waylandclient.h"
#include "windowitem.h"
#include "workspace.h"
@ -77,8 +78,6 @@
#include "x11client.h"
#include <QtMath>
#include <KWaylandServer/surface_interface.h>
namespace KWin
{

8
src/shadow.cpp
View file

@ -14,16 +14,14 @@
#include "composite.h"
#include "internal_client.h"
#include "scene.h"
#include "abstract_client.h"
#include "wayland/shadow_interface.h"
#include "wayland/shmclientbuffer.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include <KDecoration2/Decoration>
#include <KDecoration2/DecorationShadow>
#include <KWaylandServer/shadow_interface.h>
#include <KWaylandServer/shmclientbuffer.h>
#include <KWaylandServer/surface_interface.h>
#include <QWindow>
Q_DECLARE_METATYPE(QMargins)

7
src/surfaceitem_wayland.cpp
View file

@ -7,10 +7,9 @@
#include "surfaceitem_wayland.h"
#include "composite.h"
#include "scene.h"
#include <KWaylandServer/clientbuffer.h>
#include <KWaylandServer/subcompositor_interface.h>
#include <KWaylandServer/surface_interface.h>
#include "wayland/clientbuffer.h"
#include "wayland/subcompositor_interface.h"
#include "wayland/surface_interface.h"
namespace KWin
{

6
src/tablet_input.cpp
View file

@ -12,14 +12,12 @@
#include "input_event.h"
#include "input_event_spy.h"
#include "pointer_input.h"
#include "abstract_client.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
#include "wayland_server.h"
#include "workspace.h"
// KDecoration
#include <KDecoration2/Decoration>
// KWayland
#include <KWaylandServer/seat_interface.h>
#include <KWaylandServer/surface_interface.h>
// Qt
#include <QHoverEvent>
#include <QWindow>

4
src/touch_input.cpp
View file

@ -15,13 +15,11 @@
#include "decorations/decoratedclient.h"
#include "input_event_spy.h"
#include "pointer_input.h"
#include "abstract_client.h"
#include "wayland/seat_interface.h"
#include "wayland_server.h"
#include "workspace.h"
// KDecoration
#include <KDecoration2/Decoration>
// KWayland
#include <KWaylandServer/seat_interface.h>
// screenlocker
#if KWIN_BUILD_SCREENLOCKER
#include <KScreenLocker/KsldApp>

3
src/unmanaged.cpp
View file

@ -14,6 +14,7 @@
#include "platform.h"
#include "surfaceitem_x11.h"
#include "utils/common.h"
#include "wayland/surface_interface.h"
#include "workspace.h"
#include <QDebug>
@ -23,8 +24,6 @@
#include <xcb/shape.h>
#include <KWaylandServer/surface_interface.h>
using namespace KWaylandServer;
namespace KWin

4
src/utils/subsurfacemonitor.cpp
View file

@ -9,8 +9,8 @@
#include "subsurfacemonitor.h"
#include <KWaylandServer/subcompositor_interface.h>
#include <KWaylandServer/surface_interface.h>
#include "wayland/subcompositor_interface.h"
#include "wayland/surface_interface.h"
using namespace KWaylandServer;

2
src/virtualdesktops.cpp
View file

@ -9,13 +9,13 @@
*/
#include "virtualdesktops.h"
#include "input.h"
#include "wayland/plasmavirtualdesktop_interface.h"
// KDE
#include <KConfigGroup>
#include <KGlobalAccel>
#include <KLocalizedString>
#include <NETWM>
#include <KWaylandServer/plasmavirtualdesktop_interface.h>
// Qt
#include <QAction>
#include <QDebug>

516
src/wayland/CMakeLists.txt
View file

@ -1,4 +1,183 @@
set(SERVER_LIB_SRCS
add_subdirectory(tools)
if (BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
endif()
set(WaylandProtocols_xml_SOURCES)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${Wayland_DATADIR}/wayland.xml
BASENAME wayland
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-output-device-v2.xml
BASENAME kde-output-device-v2
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-primary-output-v1.xml
BASENAME kde-primary-output-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-output-management-v2.xml
BASENAME kde-output-management-v2
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-shell.xml
BASENAME plasma-shell
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-virtual-desktop.xml
BASENAME org-kde-plasma-virtual-desktop
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-window-management.xml
BASENAME plasma-window-management
)
ecm_add_wayland_server_protocol(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/surface-extension.xml
BASENAME qt-surface-extension
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/idle.xml
BASENAME idle
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml
BASENAME fake-input
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/shadow.xml
BASENAME shadow
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/dpms.xml
BASENAME dpms
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/blur.xml
BASENAME blur
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/contrast.xml
BASENAME contrast
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
BASENAME relative-pointer-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/slide.xml
BASENAME slide
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration.xml
BASENAME server-decoration
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v1.xml
BASENAME text-input-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/text-input-unstable-v2.xml
BASENAME text-input-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v3.xml
BASENAME text-input-unstable-v3
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
BASENAME pointer-gestures-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
BASENAME pointer-constraints-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
BASENAME xdg-foreign-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
BASENAME idle-inhibit-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml
BASENAME appmenu
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml
BASENAME server-decoration-palette
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-output/xdg-output-unstable-v1.xml
BASENAME xdg-output-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
BASENAME xdg-shell
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
BASENAME xdg-decoration-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/keystate.xml
BASENAME keystate
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
BASENAME linux-dmabuf-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/tablet/tablet-unstable-v2.xml
BASENAME tablet-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PROJECT_SOURCE_DIR}/src/wayland/protocols/wlr-data-control-unstable-v1.xml
BASENAME wlr-data-control-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PROJECT_SOURCE_DIR}/src/wayland/protocols/wlr-layer-shell-unstable-v1.xml
BASENAME wlr-layer-shell-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
BASENAME keyboard-shortcuts-inhibit-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/stable/viewporter/viewporter.xml
BASENAME viewporter
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/primary-selection/primary-selection-unstable-v1.xml
BASENAME wp-primary-selection-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
BASENAME zkde-screencast-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/input-method/input-method-unstable-v1.xml
BASENAME input-method-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
BASENAME xdg-activation-v1
)
ecm_add_qtwayland_server_protocol_kde(WaylandProtocols_xml_SOURCES
PROTOCOL ${WaylandProtocols_DATADIR}/staging/drm-lease/drm-lease-v1.xml
BASENAME drm-lease-v1
)
# CMake has a known bug where target_source() doesn't work as expected with files generated
# in a directory other than the one where the target is defined. It should be fixed in 3.20.
add_library(WaylandProtocols_xml OBJECT ${WaylandProtocols_xml_SOURCES})
target_link_libraries(WaylandProtocols_xml Qt::Core Wayland::Server)
target_link_libraries(kwin WaylandProtocols_xml)
target_sources(kwin PRIVATE
abstract_data_source.cpp
abstract_drop_handler.cpp
appmenu_interface.cpp
@ -71,341 +250,10 @@ set(SERVER_LIB_SRCS
xdgshell_interface.cpp
)
ecm_qt_declare_logging_category(SERVER_LIB_SRCS
HEADER logging.h
IDENTIFIER KWAYLAND_SERVER
CATEGORY_NAME kwayland-server
DEFAULT_SEVERITY Critical
DESCRIPTION "KWayland Server Library"
EXPORT KWAYLANDSERVER
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${Wayland_DATADIR}/wayland.xml
BASENAME wayland
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-output-device-v2.xml
BASENAME kde-output-device-v2
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-primary-output-v1.xml
BASENAME kde-primary-output-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/kde-output-management-v2.xml
BASENAME kde-output-management-v2
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-shell.xml
BASENAME plasma-shell
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-virtual-desktop.xml
BASENAME org-kde-plasma-virtual-desktop
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/plasma-window-management.xml
BASENAME plasma-window-management
)
ecm_add_wayland_server_protocol(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/surface-extension.xml
BASENAME qt-surface-extension
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/idle.xml
BASENAME idle
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/fake-input.xml
BASENAME fake-input
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/shadow.xml
BASENAME shadow
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/dpms.xml
BASENAME dpms
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/blur.xml
BASENAME blur
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/contrast.xml
BASENAME contrast
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
BASENAME relative-pointer-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/slide.xml
BASENAME slide
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration.xml
BASENAME server-decoration
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v1.xml
BASENAME text-input-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/text-input-unstable-v2.xml
BASENAME text-input-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/text-input/text-input-unstable-v3.xml
BASENAME text-input-unstable-v3
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml
BASENAME pointer-gestures-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
BASENAME pointer-constraints-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-foreign/xdg-foreign-unstable-v2.xml
BASENAME xdg-foreign-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml
BASENAME idle-inhibit-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/appmenu.xml
BASENAME appmenu
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/server-decoration-palette.xml
BASENAME server-decoration-palette
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-output/xdg-output-unstable-v1.xml
BASENAME xdg-output-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
BASENAME xdg-shell
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
BASENAME xdg-decoration-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/keystate.xml
BASENAME keystate
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml
BASENAME linux-dmabuf-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/tablet/tablet-unstable-v2.xml
BASENAME tablet-unstable-v2
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PROJECT_SOURCE_DIR}/src/protocols/wlr-data-control-unstable-v1.xml
BASENAME wlr-data-control-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PROJECT_SOURCE_DIR}/src/protocols/wlr-layer-shell-unstable-v1.xml
BASENAME wlr-layer-shell-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
BASENAME keyboard-shortcuts-inhibit-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/stable/viewporter/viewporter.xml
BASENAME viewporter
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/primary-selection/primary-selection-unstable-v1.xml
BASENAME wp-primary-selection-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${PLASMA_WAYLAND_PROTOCOLS_DIR}/screencast.xml
BASENAME zkde-screencast-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/unstable/input-method/input-method-unstable-v1.xml
BASENAME input-method-unstable-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
BASENAME xdg-activation-v1
)
ecm_add_qtwayland_server_protocol_kde(SERVER_LIB_SRCS
PROTOCOL ${WaylandProtocols_DATADIR}/staging/drm-lease/drm-lease-v1.xml
BASENAME drm-lease-v1
)
add_library(KWaylandServer ${SERVER_LIB_SRCS})
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
target_sources(KWaylandServer PRIVATE utils/executable_path_proc.cpp)
target_sources(kwin PRIVATE utils/executable_path_proc.cpp)
elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
target_sources(KWaylandServer PRIVATE utils/executable_path_sysctl.cpp)
target_sources(kwin PRIVATE utils/executable_path_sysctl.cpp)
else()
message(FATAL_ERROR "Unsupported platform ${CMAKE_SYSTEM_NAME}")
endif()
add_library(Plasma::KWaylandServer ALIAS KWaylandServer)
ecm_generate_export_header(KWaylandServer
BASE_NAME
KWaylandServer
EXPORT_FILE_NAME
KWaylandServer/kwaylandserver_export.h
GROUP_BASE_NAME KF
VERSION ${PROJECT_VERSION}
)
target_include_directories(KWaylandServer INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}>")
target_link_libraries(KWaylandServer
PUBLIC
Qt::Gui
Wayland::Server
PRIVATE
EGL::EGL
Qt::Concurrent
)
target_compile_definitions(KWaylandServer PRIVATE
MESA_EGL_NO_X11_HEADERS
EGL_NO_X11
EGL_NO_PLATFORM_SPECIFIC_TYPES
)
set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSION}
SOVERSION ${KWAYLANDSERVER_SOVERSION}
)
install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
set(SERVER_LIB_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h
abstract_data_source.h
abstract_drop_handler.h
appmenu_interface.h
blur_interface.h
clientbuffer.h
clientbufferintegration.h
clientconnection.h
compositor_interface.h
contrast_interface.h
datacontroldevice_v1_interface.h
datacontroldevicemanager_v1_interface.h
datacontroloffer_v1_interface.h
datacontrolsource_v1_interface.h
datadevice_interface.h
datadevicemanager_interface.h
dataoffer_interface.h
datasource_interface.h
display.h
dpms_interface.h
drmclientbuffer.h
drmleasedevice_v1_interface.h
fakeinput_interface.h
filtered_display.h
idle_interface.h
idleinhibit_v1_interface.h
inputmethod_v1_interface.h
keyboard_interface.h
keyboard_shortcuts_inhibit_v1_interface.h
keystate_interface.h
layershell_v1_interface.h
linuxdmabufv1clientbuffer.h
output_interface.h
outputchangeset_v2.h
outputconfiguration_v2_interface.h
outputdevice_v2_interface.h
outputmanagement_v2_interface.h
plasmashell_interface.h
plasmavirtualdesktop_interface.h
plasmawindowmanagement_interface.h
pointer_interface.h
pointerconstraints_v1_interface.h
pointergestures_v1_interface.h
primaryoutput_v1_interface.h
primaryselectiondevice_v1_interface.h
primaryselectiondevicemanager_v1_interface.h
primaryselectionoffer_v1_interface.h
primaryselectionsource_v1_interface.h
relativepointer_v1_interface.h
screencast_v1_interface.h
seat_interface.h
server_decoration_interface.h
server_decoration_palette_interface.h
shadow_interface.h
shmclientbuffer.h
slide_interface.h
subcompositor_interface.h
surface_interface.h
tablet_v2_interface.h
textinput.h
textinput_v2_interface.h
textinput_v3_interface.h
touch_interface.h
utils.h
viewporter_interface.h
xdgactivation_v1_interface.h
xdgdecoration_v1_interface.h
xdgforeign_v2_interface.h
xdgoutput_v1_interface.h
xdgshell_interface.h
)
install(FILES
${SERVER_LIB_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KWaylandServer COMPONENT Devel
)
# make available to ecm_add_qch in parent folder
set(KWaylandServer_APIDOX_SRCS ${SERVER_LIB_HEADERS} PARENT_SCOPE)
set(KWaylandServer_APIDOX_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)

6
src/wayland/abstract_data_source.h
View file

@ -6,11 +6,11 @@
#pragma once
#include "kwin_export.h"
#include "clientconnection.h"
#include "datadevicemanager_interface.h"
#include <KWaylandServer/kwaylandserver_export.h>
struct wl_client;
namespace KWaylandServer
@ -25,7 +25,7 @@ namespace KWaylandServer
// Anything related to selections are pure virtual, content relating
// to drag and drop has a default implementation
class KWAYLANDSERVER_EXPORT AbstractDataSource : public QObject
class KWIN_EXPORT AbstractDataSource : public QObject
{
Q_OBJECT
public:

4
src/wayland/abstract_drop_handler.h
View file

@ -7,7 +7,7 @@
#pragma once
#include <KWaylandServer/kwaylandserver_export.h>
#include "kwin_export.h"
#include <QObject>
@ -15,7 +15,7 @@ namespace KWaylandServer
{
class SurfaceInterface;
class KWAYLANDSERVER_EXPORT AbstractDropHandler : public QObject
class KWIN_EXPORT AbstractDropHandler : public QObject
{
Q_OBJECT
public:

7
src/wayland/appmenu_interface.h
View file

@ -5,7 +5,8 @@
*/
#pragma once
#include <KWaylandServer/kwaylandserver_export.h>
#include "kwin_export.h"
#include <QObject>
struct wl_resource;
@ -25,7 +26,7 @@ class AppMenuInterfacePrivate;
* This global can be used for clients to bind AppmenuInterface instances
* and notifies when a new one is created
*/
class KWAYLANDSERVER_EXPORT AppMenuManagerInterface : public QObject
class KWIN_EXPORT AppMenuManagerInterface : public QObject
{
Q_OBJECT
@ -53,7 +54,7 @@ private:
* This interface is attached to a wl_surface and provides access to where
* the AppMenu DBus interface is registered.
*/
class KWAYLANDSERVER_EXPORT AppMenuInterface : public QObject
class KWIN_EXPORT AppMenuInterface : public QObject
{
Q_OBJECT
public:

2
src/wayland/autotests/CMakeLists.txt
View file

@ -1,7 +1,5 @@
include(ECMMarkAsTest)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED Test)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
remove_definitions(-DQT_NO_CAST_TO_ASCII)

66
src/wayland/autotests/client/CMakeLists.txt
View file

@ -5,7 +5,7 @@ set( testWaylandOutput_SRCS
test_wayland_output.cpp
)
add_executable(testWaylandOutput ${testWaylandOutput_SRCS})
target_link_libraries( testWaylandOutput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandOutput Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandOutput COMMAND testWaylandOutput)
ecm_mark_as_test(testWaylandOutput)
@ -16,7 +16,7 @@ set( testWaylandSurface_SRCS
test_wayland_surface.cpp
)
add_executable(testWaylandSurface ${testWaylandSurface_SRCS})
target_link_libraries( testWaylandSurface Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandSurface Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandSurface COMMAND testWaylandSurface)
ecm_mark_as_test(testWaylandSurface)
@ -37,7 +37,7 @@ else()
${WaylandProtocols_DATADIR}/unstable/pointer-gestures/pointer-gestures-unstable-v1.xml)
endif()
target_sources(testWaylandSeat PRIVATE ${testWaylandSeat_SRCS})
target_link_libraries( testWaylandSeat Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testWaylandSeat Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server)
add_test(NAME kwayland-testWaylandSeat COMMAND testWaylandSeat)
ecm_mark_as_test(testWaylandSeat)
@ -48,7 +48,7 @@ set( testShmPool_SRCS
test_shm_pool.cpp
)
add_executable(testShmPool ${testShmPool_SRCS})
target_link_libraries( testShmPool Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testShmPool Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testShmPool COMMAND testShmPool)
ecm_mark_as_test(testShmPool)
@ -59,7 +59,7 @@ set( testSubSurface_SRCS
test_wayland_subsurface.cpp
)
add_executable(testSubSurface ${testSubSurface_SRCS})
target_link_libraries( testSubSurface Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSubSurface Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testSubSurface COMMAND testSubSurface)
ecm_mark_as_test(testSubSurface)
@ -70,7 +70,7 @@ set( testBlur_SRCS
test_wayland_blur.cpp
)
add_executable(testBlur ${testBlur_SRCS})
target_link_libraries( testBlur Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testBlur Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testBlur COMMAND testBlur)
ecm_mark_as_test(testBlur)
@ -81,7 +81,7 @@ set( testContrast_SRCS
test_wayland_contrast.cpp
)
add_executable(testContrast ${testContrast_SRCS})
target_link_libraries( testContrast Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testContrast Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testContrast COMMAND testContrast)
ecm_mark_as_test(testContrast)
@ -92,7 +92,7 @@ set( testSlide_SRCS
test_wayland_slide.cpp
)
add_executable(testSlide ${testSlide_SRCS})
target_link_libraries( testSlide Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSlide Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testSlide COMMAND testSlide)
ecm_mark_as_test(testSlide)
@ -103,7 +103,7 @@ set( testWindowmanagement_SRCS
test_wayland_windowmanagement.cpp
)
add_executable(testWindowmanagement ${testWindowmanagement_SRCS})
target_link_libraries( testWindowmanagement Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testWindowmanagement Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testWindowmanagement COMMAND testWindowmanagement)
ecm_mark_as_test(testWindowmanagement)
@ -114,7 +114,7 @@ set( testDataSource_SRCS
test_datasource.cpp
)
add_executable(testDataSource ${testDataSource_SRCS})
target_link_libraries( testDataSource Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDataSource Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testDataSource COMMAND testDataSource)
ecm_mark_as_test(testDataSource)
@ -125,7 +125,7 @@ set( testDataDevice_SRCS
test_datadevice.cpp
)
add_executable(testDataDevice ${testDataDevice_SRCS})
target_link_libraries( testDataDevice Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDataDevice Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testDataDevice COMMAND testDataDevice)
ecm_mark_as_test(testDataDevice)
@ -136,7 +136,7 @@ set( testServerSideDecoration_SRCS
test_server_side_decoration.cpp
)
add_executable(testServerSideDecoration ${testServerSideDecoration_SRCS})
target_link_libraries( testServerSideDecoration Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testServerSideDecoration Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testServerSideDecoration COMMAND testServerSideDecoration)
ecm_mark_as_test(testServerSideDecoration)
@ -147,7 +147,7 @@ set( testDragAndDrop_SRCS
test_drag_drop.cpp
)
add_executable(testDragAndDrop ${testDragAndDrop_SRCS})
target_link_libraries( testDragAndDrop Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testDragAndDrop Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testDragAndDrop COMMAND testDragAndDrop)
ecm_mark_as_test(testDragAndDrop)
@ -158,7 +158,7 @@ set( testPlasmaShell_SRCS
test_plasmashell.cpp
)
add_executable(testPlasmaShell ${testPlasmaShell_SRCS})
target_link_libraries( testPlasmaShell Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testPlasmaShell Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testPlasmaShell COMMAND testPlasmaShell)
ecm_mark_as_test(testPlasmaShell)
@ -169,7 +169,7 @@ set( testIdle_SRCS
test_idle.cpp
)
add_executable(testIdle ${testIdle_SRCS})
target_link_libraries( testIdle Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testIdle Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testIdle COMMAND testIdle)
ecm_mark_as_test(testIdle)
@ -180,7 +180,7 @@ set( testShadow_SRCS
test_shadow.cpp
)
add_executable(testShadow ${testShadow_SRCS})
target_link_libraries( testShadow Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testShadow Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testShadow COMMAND testShadow)
ecm_mark_as_test(testShadow)
@ -191,7 +191,7 @@ set( testFakeInput_SRCS
test_fake_input.cpp
)
add_executable(testFakeInput ${testFakeInput_SRCS})
target_link_libraries( testFakeInput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testFakeInput Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testFakeInput COMMAND testFakeInput)
ecm_mark_as_test(testFakeInput)
@ -202,7 +202,7 @@ set( testTextInputV2_SRCS
test_text_input_v2.cpp
)
add_executable(testTextInputV2 ${testTextInputV2_SRCS})
target_link_libraries( testTextInputV2 Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testTextInputV2 Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testTextInputV2 COMMAND testTextInputV2)
ecm_mark_as_test(testTextInputV2)
@ -213,7 +213,7 @@ set( testError_SRCS
test_error.cpp
)
add_executable(testError ${testError_SRCS})
target_link_libraries( testError Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testError Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testError COMMAND testError)
ecm_mark_as_test(testError)
@ -224,7 +224,7 @@ set( testSelection_SRCS
test_selection.cpp
)
add_executable(testSelection ${testSelection_SRCS})
target_link_libraries( testSelection Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client)
target_link_libraries( testSelection Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client)
add_test(NAME kwayland-testSelection COMMAND testSelection)
ecm_mark_as_test(testSelection)
@ -235,7 +235,7 @@ set( testXdgForeign_SRCS
test_xdg_foreign.cpp
)
add_executable(testXdgForeign ${testXdgForeign_SRCS})
target_link_libraries( testXdgForeign Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testXdgForeign Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testXdgForeign COMMAND testXdgForeign)
ecm_mark_as_test(testXdgForeign)
@ -244,17 +244,17 @@ ecm_mark_as_test(testXdgForeign)
########################################################
set(testXdgShell_SRCS test_xdg_shell.cpp)
add_executable(testXdgShell ${testXdgShell_SRCS})
target_link_libraries( testXdgShell Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
target_link_libraries( testXdgShell Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testXdgShell COMMAND testXdgShell)
ecm_mark_as_test(testXdgShell)
########################################################
# Test Pointer Constraints
########################################################
add_executable(testPointerConstraints test_pointer_constraints.cpp)
target_link_libraries( testPointerConstraints Qt::Test Qt::Gui Plasma::KWaylandServer KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testPointerConstraints COMMAND testPointerConstraints)
ecm_mark_as_test(testPointerConstraints)
add_executable(testPointerConstraintsInterface test_pointer_constraints.cpp)
target_link_libraries( testPointerConstraintsInterface Qt::Test Qt::Gui kwin KF5::WaylandClient Wayland::Client)
add_test(NAME kwayland-testPointerConstraintsInterface COMMAND testPointerConstraintsInterface)
ecm_mark_as_test(testPointerConstraintsInterface)
########################################################
@ -264,7 +264,7 @@ set( testFilter_SRCS
test_wayland_filter.cpp
)
add_executable(testFilter ${testFilter_SRCS})
target_link_libraries( testFilter Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Server)
target_link_libraries( testFilter Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Server)
add_test(NAME kwayland-testFilter COMMAND testFilter)
ecm_mark_as_test(testFilter)
@ -275,7 +275,7 @@ set( testAppmenu_SRCS
test_wayland_appmenu.cpp
)
add_executable(testAppmenu ${testAppmenu_SRCS})
target_link_libraries( testAppmenu Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testAppmenu Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testAppmenu COMMAND testAppmenu)
ecm_mark_as_test(testAppmenu)
@ -286,7 +286,7 @@ set( testServerSideDecorationPalette_SRCS
test_server_side_decoration_palette.cpp
)
add_executable(testServerSideDecorationPalette ${testServerSideDecorationPalette_SRCS})
target_link_libraries( testServerSideDecorationPalette Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testServerSideDecorationPalette Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testServerSideDecorationPalette COMMAND testServerSideDecorationPalette)
ecm_mark_as_test(testServerSideDecorationPalette)
@ -297,7 +297,7 @@ set( testPlasmaVirtualDesktop_SRCS
test_plasma_virtual_desktop.cpp
)
add_executable(testPlasmaVirtualDesktop ${testPlasmaVirtualDesktop_SRCS})
target_link_libraries( testPlasmaVirtualDesktop Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testPlasmaVirtualDesktop Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testPlasmaVirtualDesktop COMMAND testPlasmaVirtualDesktop)
ecm_mark_as_test(testPlasmaVirtualDesktop)
@ -308,7 +308,7 @@ set( testPlasmaActivities_SRCS
test_plasma_activities.cpp
)
add_executable(testPlasmaActivities ${testPlasmaActivities_SRCS})
target_link_libraries( testPlasmaActivities Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer)
target_link_libraries( testPlasmaActivities Qt::Test Qt::Gui KF5::WaylandClient kwin)
add_test(NAME kwayland-testPlasmaActivities COMMAND testPlasmaActivities)
ecm_mark_as_test(testPlasmaActivities)
@ -319,7 +319,7 @@ set( testXdgOutput_SRCS
test_xdg_output.cpp
)
add_executable(testXdgOutput ${testXdgOutput_SRCS})
target_link_libraries( testXdgOutput Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testXdgOutput Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server)
add_test(NAME kwayland-testXdgOutput COMMAND testXdgOutput)
ecm_mark_as_test(testXdgOutput)
@ -330,7 +330,7 @@ set( testXdgdecoration_SRCS
test_xdg_decoration.cpp
)
add_executable(testXdgDecoration ${testXdgdecoration_SRCS})
target_link_libraries( testXdgDecoration Qt::Test Qt::Gui KF5::WaylandClient Plasma::KWaylandServer Wayland::Client Wayland::Server)
target_link_libraries( testXdgDecoration Qt::Test Qt::Gui KF5::WaylandClient kwin Wayland::Client Wayland::Server)
add_test(NAME kwayland-testXdgDecoration COMMAND testXdgDecoration)
ecm_mark_as_test(testXdgDecoration)

17
src/wayland/autotests/client/test_datadevice.cpp
View file

@ -5,14 +5,16 @@
*/
// Qt
#include <QtTest>
#include "wayland/compositor_interface.h"
#include "wayland/datadevicemanager_interface.h"
#include "wayland/datasource_interface.h"
#include "wayland/display.h"
#include "wayland/pointer_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
// KWayland
#include "../../src/server/compositor_interface.h"
#include "../../src/server/datadevicemanager_interface.h"
#include "../../src/server/datasource_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/pointer_interface.h"
#include "../../src/server/seat_interface.h"
#include "../../src/server/surface_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/datadevice.h"
@ -24,6 +26,7 @@
#include "KWayland/Client/registry.h"
#include "KWayland/Client/seat.h"
#include "KWayland/Client/surface.h"
// Wayland
#include <wayland-client.h>

9
src/wayland/autotests/client/test_datasource.cpp
View file

@ -6,15 +6,18 @@
// Qt
#include <QMimeDatabase>
#include <QtTest>
#include "wayland/datadevicemanager_interface.h"
#include "wayland/datasource_interface.h"
#include "wayland/display.h"
// KWayland
#include "../../src/server/datadevicemanager_interface.h"
#include "../../src/server/datasource_interface.h"
#include "../../src/server/display.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/datadevicemanager.h"
#include "KWayland/Client/datasource.h"
#include "KWayland/Client/event_queue.h"
#include "KWayland/Client/registry.h"
// Wayland
#include <wayland-client.h>

13
src/wayland/autotests/client/test_drag_drop.cpp
View file

@ -6,12 +6,13 @@
// Qt
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/datadevicemanager_interface.h"
#include "../../src/server/datasource_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/seat_interface.h"
#include "../../src/server/seat_interface_p.h"
#include "wayland/compositor_interface.h"
#include "wayland/datadevicemanager_interface.h"
#include "wayland/datasource_interface.h"
#include "wayland/display.h"
#include "wayland/seat_interface.h"
#include "wayland/seat_interface_p.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/datadevice.h"

10
src/wayland/autotests/client/test_error.cpp
View file

@ -5,6 +5,12 @@
*/
// Qt
#include <QtTest>
// server
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/plasmashell_interface.h"
// client
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
@ -12,10 +18,6 @@
#include "KWayland/Client/plasmashell.h"
#include "KWayland/Client/registry.h"
#include "KWayland/Client/surface.h"
// server
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/plasmashell_interface.h"
#include <wayland-client-protocol.h>

4
src/wayland/autotests/client/test_fake_input.cpp
View file

@ -11,8 +11,8 @@
#include "KWayland/Client/fakeinput.h"
#include "KWayland/Client/registry.h"
// server
#include "../../src/server/display.h"
#include "../../src/server/fakeinput_interface.h"
#include "wayland/display.h"
#include "wayland/fakeinput_interface.h"
#include <linux/input.h>

6
src/wayland/autotests/client/test_idle.cpp
View file

@ -12,9 +12,9 @@
#include "KWayland/Client/registry.h"
#include "KWayland/Client/seat.h"
// server
#include "../../src/server/display.h"
#include "../../src/server/idle_interface.h"
#include "../../src/server/seat_interface.h"
#include "wayland/display.h"
#include "wayland/idle_interface.h"
#include "wayland/seat_interface.h"
using namespace KWayland::Client;
using namespace KWaylandServer;

7
src/wayland/autotests/client/test_plasma_activities.cpp
View file

@ -6,9 +6,10 @@
// Qt
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/plasmawindowmanagement_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/plasmawindowmanagement_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"

9
src/wayland/autotests/client/test_plasma_virtual_desktop.cpp
View file

@ -6,10 +6,11 @@
// Qt
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/plasmavirtualdesktop_interface.h"
#include "../../src/server/plasmawindowmanagement_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/plasmavirtualdesktop_interface.h"
#include "wayland/plasmawindowmanagement_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"

7
src/wayland/autotests/client/test_plasmashell.cpp
View file

@ -6,9 +6,10 @@
// Qt
#include <QtTest>
// KWayland
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/plasmashell_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/plasmashell_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"

10
src/wayland/autotests/client/test_pointer_constraints.cpp
View file

@ -15,11 +15,11 @@
#include "KWayland/Client/seat.h"
#include "KWayland/Client/surface.h"
// server
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/pointerconstraints_v1_interface.h"
#include "../../src/server/seat_interface.h"
#include "../../src/server/surface_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/pointerconstraints_v1_interface.h"
#include "wayland/seat_interface.h"
#include "wayland/surface_interface.h"
using namespace KWayland::Client;
using namespace KWaylandServer;

8
src/wayland/autotests/client/test_selection.cpp
View file

@ -17,10 +17,10 @@
#include "KWayland/Client/seat.h"
#include "KWayland/Client/surface.h"
// server
#include "../../src/server/compositor_interface.h"
#include "../../src/server/datadevicemanager_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/seat_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/datadevicemanager_interface.h"
#include "wayland/display.h"
#include "wayland/seat_interface.h"
using namespace KWayland::Client;
using namespace KWaylandServer;

7
src/wayland/autotests/client/test_server_side_decoration.cpp
View file

@ -6,9 +6,10 @@
// Qt
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/server_decoration_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/server_decoration_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"

7
src/wayland/autotests/client/test_server_side_decoration_palette.cpp
View file

@ -7,9 +7,10 @@
// Qt
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/server_decoration_palette_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/server_decoration_palette_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/event_queue.h"

8
src/wayland/autotests/client/test_shadow.cpp
View file

@ -14,10 +14,10 @@
#include "KWayland/Client/shm_pool.h"
#include "KWayland/Client/surface.h"
// server
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/shadow_interface.h"
#include "../../src/server/shmclientbuffer.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/shadow_interface.h"
#include "wayland/shmclientbuffer.h"
using namespace KWayland::Client;
using namespace KWaylandServer;

7
src/wayland/autotests/client/test_shm_pool.cpp
View file

@ -7,9 +7,10 @@
#include <QImage>
#include <QtTest>
// KWin
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/surface_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/surface_interface.h"
#include "KWayland/Client/compositor.h"
#include "KWayland/Client/connection_thread.h"
#include "KWayland/Client/registry.h"

10
src/wayland/autotests/client/test_text_input_v2.cpp
View file

@ -15,11 +15,11 @@
#include "KWayland/Client/surface.h"
#include "KWayland/Client/textinput.h"
// server
#include "../../src/server/compositor_interface.h"
#include "../../src/server/display.h"
#include "../../src/server/seat_interface.h"
#include "../../src/server/textinput.h"
#include "../../src/server/textinput_v2_interface.h"
#include "wayland/compositor_interface.h"
#include "wayland/display.h"
#include "wayland/seat_interface.h"
#include "wayland/textinput.h"
#include "wayland/textinput_v2_interface.h"
using namespace KWayland::Client;
using namespace KWaylandServer;

Some files were not shown because too many files have changed in this diff Show more