From d2fb4147fc609cfb454a2803007fc06d1e400398 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 29 Aug 2022 10:55:49 +0300 Subject: [PATCH] Move multi-purpose code in its own directory Things such as Output, InputDevice and so on are made to be multi-purpose. In order to make this separation more clear, this change moves that code in the core directory. Some things still link to the abstraction level above (kwin), they can be tackled in future refactors. Ideally code in core/ should depend either on other code in core/ or system libs. --- autotests/integration/activation_test.cpp | 4 +- autotests/integration/activities_test.cpp | 4 +- autotests/integration/dbus_interface_test.cpp | 2 +- autotests/integration/debug_console_test.cpp | 4 +- .../integration/decoration_input_test.cpp | 4 +- .../integration/desktop_window_x11_test.cpp | 4 +- .../dont_crash_aurorae_destroy_deco.cpp | 6 +-- .../dont_crash_cancel_animation.cpp | 2 +- .../dont_crash_cursor_physical_size_empty.cpp | 2 +- .../integration/dont_crash_empty_deco.cpp | 6 +-- autotests/integration/dont_crash_glxgears.cpp | 2 +- .../integration/dont_crash_no_border.cpp | 6 +-- .../dont_crash_reinitialize_compositor.cpp | 6 +-- .../dont_crash_useractions_menu.cpp | 4 +- .../desktop_switching_animation_test.cpp | 4 +- .../effects/maximize_animation_test.cpp | 2 +- .../effects/minimize_animation_test.cpp | 4 +- .../popup_open_close_animation_test.cpp | 2 +- .../effects/scripted_effects_test.cpp | 4 +- .../effects/slidingpopups_test.cpp | 4 +- .../toplevel_open_close_animation_test.cpp | 4 +- .../integration/effects/translucency_test.cpp | 2 +- .../integration/effects/wobbly_shade_test.cpp | 4 +- .../integration/generic_scene_opengl_test.cpp | 4 +- .../integration/globalshortcuts_test.cpp | 2 +- .../integration/idle_inhibition_test.cpp | 2 +- .../integration/input_stacking_order.cpp | 4 +- autotests/integration/inputmethod_test.cpp | 4 +- autotests/integration/internal_window.cpp | 4 +- .../integration/keyboard_layout_test.cpp | 2 +- .../keymap_creation_failure_test.cpp | 2 +- autotests/integration/kwin_wayland_test.cpp | 4 +- autotests/integration/kwin_wayland_test.h | 2 +- autotests/integration/kwinbindings_test.cpp | 2 +- .../integration/layershellv1window_test.cpp | 4 +- autotests/integration/lockscreen.cpp | 6 +-- autotests/integration/maximize_test.cpp | 4 +- .../modifier_only_shortcut_test.cpp | 2 +- .../integration/move_resize_window_test.cpp | 4 +- autotests/integration/nightcolor_test.cpp | 2 +- .../integration/no_global_shortcuts_test.cpp | 2 +- autotests/integration/outputchanges_test.cpp | 6 +-- autotests/integration/placement_test.cpp | 4 +- autotests/integration/plasma_surface_test.cpp | 4 +- autotests/integration/plasmawindow_test.cpp | 4 +- autotests/integration/platformcursor.cpp | 2 +- .../integration/pointer_constraints_test.cpp | 4 +- autotests/integration/pointer_input.cpp | 4 +- autotests/integration/quick_tiling_test.cpp | 4 +- autotests/integration/scene_qpainter_test.cpp | 2 +- autotests/integration/screen_changes_test.cpp | 4 +- .../screenedge_client_show_test.cpp | 4 +- autotests/integration/screenedges_test.cpp | 2 +- autotests/integration/screens_test.cpp | 4 +- .../scripting/minimizeall_test.cpp | 4 +- .../integration/scripting/screenedge_test.cpp | 2 +- autotests/integration/shade_test.cpp | 4 +- .../integration/showing_desktop_test.cpp | 2 +- autotests/integration/stacking_order_test.cpp | 2 +- autotests/integration/struts_test.cpp | 4 +- autotests/integration/tabbox_test.cpp | 2 +- .../integration/test_virtualkeyboard_dbus.cpp | 2 +- autotests/integration/touch_input_test.cpp | 4 +- autotests/integration/transient_placement.cpp | 4 +- .../integration/virtual_desktop_test.cpp | 2 +- autotests/integration/window_rules_test.cpp | 4 +- .../integration/window_selection_test.cpp | 4 +- autotests/integration/x11_window_test.cpp | 2 +- .../integration/xdgshellwindow_rules_test.cpp | 6 +-- autotests/integration/xdgshellwindow_test.cpp | 4 +- autotests/integration/xwayland_input_test.cpp | 4 +- .../integration/xwayland_selections_test.cpp | 4 +- .../integration/xwaylandserver_crash_test.cpp | 4 +- .../xwaylandserver_restart_test.cpp | 2 +- autotests/libinput/CMakeLists.txt | 2 +- src/CMakeLists.txt | 48 +++++++++---------- src/activation.cpp | 2 +- src/backends/drm/drm_abstract_output.cpp | 2 +- src/backends/drm/drm_abstract_output.h | 2 +- src/backends/drm/drm_backend.cpp | 6 +-- src/backends/drm/drm_backend.h | 2 +- src/backends/drm/drm_egl_backend.cpp | 2 +- src/backends/drm/drm_egl_layer_surface.h | 2 +- src/backends/drm/drm_gpu.cpp | 4 +- src/backends/drm/drm_layer.h | 2 +- src/backends/drm/drm_object_connector.h | 2 +- src/backends/drm/drm_output.cpp | 8 ++-- src/backends/drm/drm_pipeline.cpp | 2 +- src/backends/drm/drm_pipeline.h | 6 +-- src/backends/drm/drm_qpainter_backend.cpp | 2 +- src/backends/drm/drm_virtual_output.cpp | 2 +- src/backends/drm/drm_virtual_output.h | 2 +- src/backends/fakeinput/fakeinputbackend.h | 2 +- src/backends/fakeinput/fakeinputdevice.h | 2 +- src/backends/libinput/connection.cpp | 6 +-- src/backends/libinput/context.cpp | 2 +- src/backends/libinput/device.cpp | 4 +- src/backends/libinput/device.h | 2 +- src/backends/libinput/libinputbackend.h | 2 +- src/backends/virtual/virtual_backend.h | 2 +- src/backends/virtual/virtual_egl_backend.h | 2 +- src/backends/virtual/virtual_output.cpp | 2 +- src/backends/virtual/virtual_output.h | 2 +- .../virtual/virtual_qpainter_backend.h | 2 +- src/backends/wayland/wayland_backend.cpp | 2 +- src/backends/wayland/wayland_backend.h | 6 +-- src/backends/wayland/wayland_egl_backend.h | 2 +- src/backends/wayland/wayland_output.cpp | 2 +- src/backends/wayland/wayland_output.h | 2 +- .../wayland/wayland_qpainter_backend.h | 2 +- .../x11/common/x11_common_egl_backend.cpp | 4 +- .../standalone/x11_standalone_egl_backend.cpp | 6 +-- .../standalone/x11_standalone_egl_backend.h | 2 +- .../standalone/x11_standalone_glx_backend.cpp | 6 +-- .../standalone/x11_standalone_glx_backend.h | 2 +- .../x11/standalone/x11_standalone_output.cpp | 2 +- .../x11/standalone/x11_standalone_output.h | 2 +- .../standalone/x11_standalone_overlaywindow.h | 2 +- .../x11_standalone_placeholderoutput.h | 2 +- .../standalone/x11_standalone_platform.cpp | 4 +- .../x11/standalone/x11_standalone_platform.h | 2 +- .../x11_standalone_xinputintegration.cpp | 2 +- .../x11/windowed/x11_windowed_backend.h | 6 +-- .../x11/windowed/x11_windowed_egl_backend.h | 2 +- .../x11/windowed/x11_windowed_output.cpp | 2 +- .../x11/windowed/x11_windowed_output.h | 2 +- .../windowed/x11_windowed_qpainter_backend.h | 2 +- src/colors/colordevice.cpp | 6 +-- src/colors/colormanager.cpp | 4 +- src/composite.cpp | 12 ++--- src/{colors => core}/colorlut.cpp | 0 src/{colors => core}/colorlut.h | 0 src/{colors => core}/colorpipelinestage.cpp | 0 src/{colors => core}/colorpipelinestage.h | 0 src/{colors => core}/colortransformation.cpp | 2 +- src/{colors => core}/colortransformation.h | 0 src/{ => core}/inputbackend.cpp | 0 src/{ => core}/inputbackend.h | 0 src/{ => core}/inputdevice.cpp | 0 src/{ => core}/inputdevice.h | 0 src/{ => core}/output.cpp | 0 src/{ => core}/output.h | 0 src/{ => core}/outputconfiguration.cpp | 0 src/{ => core}/outputconfiguration.h | 7 +-- src/{ => core}/outputlayer.cpp | 0 src/{ => core}/outputlayer.h | 0 src/{ => core}/overlaywindow.cpp | 0 src/{ => core}/overlaywindow.h | 0 src/{ => core}/platform.cpp | 0 src/{ => core}/platform.h | 0 src/{ => core}/renderbackend.cpp | 0 src/{ => core}/renderbackend.h | 0 src/{ => core}/renderjournal.cpp | 0 src/{ => core}/renderjournal.h | 0 src/{ => core}/renderlayer.cpp | 0 src/{ => core}/renderlayer.h | 0 src/{ => core}/renderlayerdelegate.cpp | 0 src/{ => core}/renderlayerdelegate.h | 0 src/{ => core}/renderloop.cpp | 0 src/{ => core}/renderloop.h | 0 src/{ => core}/renderloop_p.h | 0 src/{ => core}/rendertarget.cpp | 0 src/{ => core}/rendertarget.h | 0 src/{ => core}/session.cpp | 0 src/{ => core}/session.h | 0 src/{ => core}/session_consolekit.cpp | 0 src/{ => core}/session_consolekit.h | 0 src/{ => core}/session_logind.cpp | 0 src/{ => core}/session_logind.h | 0 src/{ => core}/session_noop.cpp | 0 src/{ => core}/session_noop.h | 0 src/cursor.cpp | 4 +- src/cursordelegate_opengl.cpp | 4 +- src/cursordelegate_opengl.h | 2 +- src/cursordelegate_qpainter.cpp | 4 +- src/cursordelegate_qpainter.h | 2 +- src/dbusinterface.cpp | 6 +-- src/debug_console.cpp | 2 +- src/decorationitem.cpp | 2 +- src/dpmsinputeventfilter.cpp | 4 +- src/effects.cpp | 8 ++-- src/hide_cursor_spy.cpp | 2 +- src/input.cpp | 8 ++-- src/inputpanelv1window.cpp | 4 +- src/internalwindow.cpp | 2 +- src/item.cpp | 6 +-- src/keyboard_layout.cpp | 2 +- src/killwindow.cpp | 2 +- src/layershellv1integration.cpp | 4 +- src/layershellv1window.cpp | 2 +- src/main.cpp | 4 +- src/main_wayland.cpp | 4 +- src/main_x11.cpp | 4 +- src/options.cpp | 2 +- src/outline.cpp | 2 +- .../scenes/opengl/abstract_egl_backend.cpp | 6 +-- .../scenes/opengl/openglbackend.h | 2 +- .../scenes/qpainter/qpainterbackend.h | 2 +- .../buttonrebinds/buttonrebindsfilter.h | 2 +- .../colord-integration/colorddevice.cpp | 2 +- .../colord-integration/colordintegration.cpp | 2 +- src/plugins/nightcolor/nightcolormanager.cpp | 4 +- src/plugins/qpa/eglplatformcontext.cpp | 2 +- src/plugins/qpa/integration.cpp | 4 +- src/plugins/qpa/offscreensurface.cpp | 2 +- src/plugins/qpa/screen.cpp | 2 +- src/plugins/qpa/window.cpp | 2 +- .../screencast/outputscreencastsource.cpp | 4 +- .../screencast/regionscreencastsource.cpp | 2 +- src/plugins/screencast/screencastmanager.cpp | 4 +- src/plugins/screencast/screencaststream.cpp | 2 +- .../screencast/windowscreencastsource.cpp | 4 +- src/pointer_input.cpp | 4 +- src/rules.cpp | 2 +- src/scene.cpp | 8 ++-- src/scene.h | 2 +- src/scenes/opengl/scene_opengl.cpp | 2 +- src/scenes/qpainter/scene_qpainter.cpp | 2 +- src/screenedge.cpp | 4 +- src/screens.cpp | 4 +- src/scripting/desktopbackgrounditem.cpp | 4 +- src/scripting/v2/clientmodel.cpp | 2 +- src/scripting/v3/clientmodel.cpp | 4 +- src/scripting/windowthumbnailitem.cpp | 2 +- src/scripting/workspace_wrapper.cpp | 4 +- src/tabbox/switcheritem.cpp | 2 +- src/tabbox/tabbox.cpp | 2 +- src/tabletmodemanager.cpp | 4 +- src/unmanaged.cpp | 2 +- src/useractions.cpp | 6 +-- src/utils/common.cpp | 2 +- src/wayland/output_interface.cpp | 2 +- src/wayland/output_interface.h | 2 +- src/wayland/outputdevice_v2_interface.cpp | 2 +- src/wayland/outputmanagement_v2_interface.cpp | 4 +- src/wayland/tests/fakeoutput.h | 2 +- src/wayland_server.cpp | 4 +- src/waylandoutput.h | 2 +- src/waylandwindow.cpp | 2 +- src/window.cpp | 4 +- src/workspace.cpp | 6 +-- src/x11syncmanager.cpp | 4 +- src/x11window.cpp | 4 +- src/xdgshellwindow.cpp | 3 +- src/xwayland/xwayland.cpp | 4 +- 245 files changed, 361 insertions(+), 361 deletions(-) rename src/{colors => core}/colorlut.cpp (100%) rename src/{colors => core}/colorlut.h (100%) rename src/{colors => core}/colorpipelinestage.cpp (100%) rename src/{colors => core}/colorpipelinestage.h (100%) rename src/{colors => core}/colortransformation.cpp (100%) rename src/{colors => core}/colortransformation.h (100%) rename src/{ => core}/inputbackend.cpp (100%) rename src/{ => core}/inputbackend.h (100%) rename src/{ => core}/inputdevice.cpp (100%) rename src/{ => core}/inputdevice.h (100%) rename src/{ => core}/output.cpp (100%) rename src/{ => core}/output.h (100%) rename src/{ => core}/outputconfiguration.cpp (100%) rename src/{ => core}/outputconfiguration.h (99%) rename src/{ => core}/outputlayer.cpp (100%) rename src/{ => core}/outputlayer.h (100%) rename src/{ => core}/overlaywindow.cpp (100%) rename src/{ => core}/overlaywindow.h (100%) rename src/{ => core}/platform.cpp (100%) rename src/{ => core}/platform.h (100%) rename src/{ => core}/renderbackend.cpp (100%) rename src/{ => core}/renderbackend.h (100%) rename src/{ => core}/renderjournal.cpp (100%) rename src/{ => core}/renderjournal.h (100%) rename src/{ => core}/renderlayer.cpp (100%) rename src/{ => core}/renderlayer.h (100%) rename src/{ => core}/renderlayerdelegate.cpp (100%) rename src/{ => core}/renderlayerdelegate.h (100%) rename src/{ => core}/renderloop.cpp (100%) rename src/{ => core}/renderloop.h (100%) rename src/{ => core}/renderloop_p.h (100%) rename src/{ => core}/rendertarget.cpp (100%) rename src/{ => core}/rendertarget.h (100%) rename src/{ => core}/session.cpp (100%) rename src/{ => core}/session.h (100%) rename src/{ => core}/session_consolekit.cpp (100%) rename src/{ => core}/session_consolekit.h (100%) rename src/{ => core}/session_logind.cpp (100%) rename src/{ => core}/session_logind.h (100%) rename src/{ => core}/session_noop.cpp (100%) rename src/{ => core}/session_noop.h (100%) diff --git a/autotests/integration/activation_test.cpp b/autotests/integration/activation_test.cpp index a51697bff3..dc9cdba835 100644 --- a/autotests/integration/activation_test.cpp +++ b/autotests/integration/activation_test.cpp @@ -9,9 +9,9 @@ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/activities_test.cpp b/autotests/integration/activities_test.cpp index 2305f98b0b..52c57df6fe 100644 --- a/autotests/integration/activities_test.cpp +++ b/autotests/integration/activities_test.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "activities.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/dbus_interface_test.cpp b/autotests/integration/dbus_interface_test.cpp index 55ab957c29..637661ecf3 100644 --- a/autotests/integration/dbus_interface_test.cpp +++ b/autotests/integration/dbus_interface_test.cpp @@ -11,8 +11,8 @@ #include "kwin_wayland_test.h" #include "atoms.h" +#include "core/platform.h" #include "deleted.h" -#include "platform.h" #include "rules.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/debug_console_test.cpp b/autotests/integration/debug_console_test.cpp index 5aedafb68d..b3caebc2fd 100644 --- a/autotests/integration/debug_console_test.cpp +++ b/autotests/integration/debug_console_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "debug_console.h" #include "internalwindow.h" -#include "output.h" -#include "platform.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/decoration_input_test.cpp b/autotests/integration/decoration_input_test.cpp index 46e8892b0b..bf019172bb 100644 --- a/autotests/integration/decoration_input_test.cpp +++ b/autotests/integration/decoration_input_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "internalwindow.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include "touch_input.h" #include "wayland_server.h" diff --git a/autotests/integration/desktop_window_x11_test.cpp b/autotests/integration/desktop_window_x11_test.cpp index 77bfa634cf..9ceff8beb1 100644 --- a/autotests/integration/desktop_window_x11_test.cpp +++ b/autotests/integration/desktop_window_x11_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp index 71821a0144..18bd680e94 100644 --- a/autotests/integration/dont_crash_aurorae_destroy_deco.cpp +++ b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" -#include "output.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp index 1911fb251d..22b08d6c64 100644 --- a/autotests/integration/dont_crash_cancel_animation.cpp +++ b/autotests/integration/dont_crash_cancel_animation.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "scripting/scriptedeffect.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp index 0fb7bcbfcc..5291785703 100644 --- a/autotests/integration/dont_crash_cursor_physical_size_empty.cpp +++ b/autotests/integration/dont_crash_cursor_physical_size_empty.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "wayland/display.h" #include "wayland/output_interface.h" #include "wayland_server.h" diff --git a/autotests/integration/dont_crash_empty_deco.cpp b/autotests/integration/dont_crash_empty_deco.cpp index edcf171280..d877bef5ce 100644 --- a/autotests/integration/dont_crash_empty_deco.cpp +++ b/autotests/integration/dont_crash_empty_deco.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" -#include "output.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/dont_crash_glxgears.cpp b/autotests/integration/dont_crash_glxgears.cpp index b0f5649787..2cf34477a0 100644 --- a/autotests/integration/dont_crash_glxgears.cpp +++ b/autotests/integration/dont_crash_glxgears.cpp @@ -8,8 +8,8 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "deleted.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/dont_crash_no_border.cpp b/autotests/integration/dont_crash_no_border.cpp index 1a0fc242d5..28f3d044d1 100644 --- a/autotests/integration/dont_crash_no_border.cpp +++ b/autotests/integration/dont_crash_no_border.cpp @@ -10,10 +10,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" -#include "output.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/dont_crash_reinitialize_compositor.cpp b/autotests/integration/dont_crash_reinitialize_compositor.cpp index 76b9d8166e..3798a4e623 100644 --- a/autotests/integration/dont_crash_reinitialize_compositor.cpp +++ b/autotests/integration/dont_crash_reinitialize_compositor.cpp @@ -10,12 +10,12 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" -#include "output.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/dont_crash_useractions_menu.cpp b/autotests/integration/dont_crash_useractions_menu.cpp index 4af9ebb51b..d2ef251951 100644 --- a/autotests/integration/dont_crash_useractions_menu.cpp +++ b/autotests/integration/dont_crash_useractions_menu.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "keyboard_input.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include "useractions.h" #include "wayland_server.h" diff --git a/autotests/integration/effects/desktop_switching_animation_test.cpp b/autotests/integration/effects/desktop_switching_animation_test.cpp index 6f174268f0..e0b371d647 100644 --- a/autotests/integration/effects/desktop_switching_animation_test.cpp +++ b/autotests/integration/effects/desktop_switching_animation_test.cpp @@ -10,10 +10,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" -#include "renderbackend.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/maximize_animation_test.cpp b/autotests/integration/effects/maximize_animation_test.cpp index 473b1255a3..b8daa4990e 100644 --- a/autotests/integration/effects/maximize_animation_test.cpp +++ b/autotests/integration/effects/maximize_animation_test.cpp @@ -10,9 +10,9 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "scene.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/minimize_animation_test.cpp b/autotests/integration/effects/minimize_animation_test.cpp index 09f7cd1f3c..b0e613c1f8 100644 --- a/autotests/integration/effects/minimize_animation_test.cpp +++ b/autotests/integration/effects/minimize_animation_test.cpp @@ -10,10 +10,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/effects/popup_open_close_animation_test.cpp b/autotests/integration/effects/popup_open_close_animation_test.cpp index 7aaef9c2b0..9ba6759eb4 100644 --- a/autotests/integration/effects/popup_open_close_animation_test.cpp +++ b/autotests/integration/effects/popup_open_close_animation_test.cpp @@ -9,11 +9,11 @@ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" #include "internalwindow.h" -#include "platform.h" #include "useractions.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/effects/scripted_effects_test.cpp b/autotests/integration/effects/scripted_effects_test.cpp index cf71cbefdd..89366bc546 100644 --- a/autotests/integration/effects/scripted_effects_test.cpp +++ b/autotests/integration/effects/scripted_effects_test.cpp @@ -10,13 +10,13 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" #include "libkwineffects/anidata_p.h" -#include "platform.h" -#include "renderbackend.h" #include "scripting/scriptedeffect.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/effects/slidingpopups_test.cpp b/autotests/integration/effects/slidingpopups_test.cpp index d700b167b0..12812b50d6 100644 --- a/autotests/integration/effects/slidingpopups_test.cpp +++ b/autotests/integration/effects/slidingpopups_test.cpp @@ -7,13 +7,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" #include "kwin_wayland_test.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/effects/toplevel_open_close_animation_test.cpp b/autotests/integration/effects/toplevel_open_close_animation_test.cpp index 10d450b4af..54b28e1820 100644 --- a/autotests/integration/effects/toplevel_open_close_animation_test.cpp +++ b/autotests/integration/effects/toplevel_open_close_animation_test.cpp @@ -10,11 +10,11 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index b8868bb50f..f728c10537 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/effects/wobbly_shade_test.cpp b/autotests/integration/effects/wobbly_shade_test.cpp index 0f71bf7aa4..15efe27129 100644 --- a/autotests/integration/effects/wobbly_shade_test.cpp +++ b/autotests/integration/effects/wobbly_shade_test.cpp @@ -9,11 +9,11 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" -#include "renderbackend.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/generic_scene_opengl_test.cpp b/autotests/integration/generic_scene_opengl_test.cpp index 2ad8f179bb..1163e7438f 100644 --- a/autotests/integration/generic_scene_opengl_test.cpp +++ b/autotests/integration/generic_scene_opengl_test.cpp @@ -8,10 +8,10 @@ */ #include "generic_scene_opengl_test.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" #include "effectloader.h" -#include "platform.h" -#include "renderbackend.h" #include "scene.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/globalshortcuts_test.cpp b/autotests/integration/globalshortcuts_test.cpp index efb79f5756..14f9cc1068 100644 --- a/autotests/integration/globalshortcuts_test.cpp +++ b/autotests/integration/globalshortcuts_test.cpp @@ -8,11 +8,11 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" #include "internalwindow.h" #include "keyboard_input.h" -#include "platform.h" #include "useractions.h" #include "wayland/keyboard_interface.h" #include "wayland/seat_interface.h" diff --git a/autotests/integration/idle_inhibition_test.cpp b/autotests/integration/idle_inhibition_test.cpp index 53cad7729d..0302a8a234 100644 --- a/autotests/integration/idle_inhibition_test.cpp +++ b/autotests/integration/idle_inhibition_test.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "platform.h" +#include "core/platform.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/input_stacking_order.cpp b/autotests/integration/input_stacking_order.cpp index d050e40610..df615a852c 100644 --- a/autotests/integration/input_stacking_order.cpp +++ b/autotests/integration/input_stacking_order.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/inputmethod_test.cpp b/autotests/integration/inputmethod_test.cpp index 30ed2838fc..e629af03e8 100644 --- a/autotests/integration/inputmethod_test.cpp +++ b/autotests/integration/inputmethod_test.cpp @@ -8,13 +8,13 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" #include "effects.h" #include "inputmethod.h" #include "keyboard_input.h" -#include "output.h" -#include "platform.h" #include "qwayland-input-method-unstable-v1.h" #include "qwayland-text-input-unstable-v3.h" #include "virtualkeyboard_dbus.h" diff --git a/autotests/integration/internal_window.cpp b/autotests/integration/internal_window.cpp index d63e06d0ea..393b75e4bc 100644 --- a/autotests/integration/internal_window.cpp +++ b/autotests/integration/internal_window.cpp @@ -8,12 +8,12 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" #include "effects.h" #include "internalwindow.h" -#include "output.h" -#include "platform.h" #include "wayland/surface_interface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/keyboard_layout_test.cpp b/autotests/integration/keyboard_layout_test.cpp index 8e5f740773..c83a275f82 100644 --- a/autotests/integration/keyboard_layout_test.cpp +++ b/autotests/integration/keyboard_layout_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "keyboard_input.h" #include "keyboard_layout.h" -#include "platform.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/keymap_creation_failure_test.cpp b/autotests/integration/keymap_creation_failure_test.cpp index a68484ff4d..3c84a124b1 100644 --- a/autotests/integration/keymap_creation_failure_test.cpp +++ b/autotests/integration/keymap_creation_failure_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "keyboard_input.h" #include "keyboard_layout.h" -#include "platform.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp index 7886fd9c8d..10fb69d601 100644 --- a/autotests/integration/kwin_wayland_test.cpp +++ b/autotests/integration/kwin_wayland_test.cpp @@ -10,12 +10,12 @@ #include "backends/virtual/virtual_backend.h" #include "composite.h" +#include "core/platform.h" +#include "core/session.h" #include "effects.h" #include "inputmethod.h" #include "placement.h" -#include "platform.h" #include "pluginmanager.h" -#include "session.h" #include "utils/xcbutils.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h index 65b602001b..9b4e50b07b 100644 --- a/autotests/integration/kwin_wayland_test.h +++ b/autotests/integration/kwin_wayland_test.h @@ -9,7 +9,7 @@ #ifndef KWIN_WAYLAND_TEST_H #define KWIN_WAYLAND_TEST_H -#include "inputdevice.h" +#include "core/inputdevice.h" #include "main.h" #include "window.h" diff --git a/autotests/integration/kwinbindings_test.cpp b/autotests/integration/kwinbindings_test.cpp index bb38718682..f34f14519e 100644 --- a/autotests/integration/kwinbindings_test.cpp +++ b/autotests/integration/kwinbindings_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" -#include "platform.h" #include "scripting/scripting.h" #include "useractions.h" #include "virtualdesktops.h" diff --git a/autotests/integration/layershellv1window_test.cpp b/autotests/integration/layershellv1window_test.cpp index 95c8ae3d3d..297d3b68d2 100644 --- a/autotests/integration/layershellv1window_test.cpp +++ b/autotests/integration/layershellv1window_test.cpp @@ -6,9 +6,9 @@ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp index 5888eb1289..c1eaa2cbba 100644 --- a/autotests/integration/lockscreen.cpp +++ b/autotests/integration/lockscreen.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "cursor.h" -#include "output.h" -#include "platform.h" -#include "renderbackend.h" #include "screenedge.h" #include "wayland/keyboard_interface.h" #include "wayland/seat_interface.h" diff --git a/autotests/integration/maximize_test.cpp b/autotests/integration/maximize_test.cpp index 5d3f9647f0..99a412924c 100644 --- a/autotests/integration/maximize_test.cpp +++ b/autotests/integration/maximize_test.cpp @@ -8,11 +8,11 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "decorations/decorationbridge.h" #include "decorations/settings.h" -#include "output.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/modifier_only_shortcut_test.cpp b/autotests/integration/modifier_only_shortcut_test.cpp index 580e0ceb4e..1e7ad4cdcb 100644 --- a/autotests/integration/modifier_only_shortcut_test.cpp +++ b/autotests/integration/modifier_only_shortcut_test.cpp @@ -10,10 +10,10 @@ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" #include "keyboard_input.h" -#include "platform.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/move_resize_window_test.cpp b/autotests/integration/move_resize_window_test.cpp index 99e3095f36..4508334605 100644 --- a/autotests/integration/move_resize_window_test.cpp +++ b/autotests/integration/move_resize_window_test.cpp @@ -10,12 +10,12 @@ #include "kwin_wayland_test.h" #include "atoms.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" #include "effects.h" -#include "output.h" #include "placement.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/nightcolor_test.cpp b/autotests/integration/nightcolor_test.cpp index afcc9a479c..d01c94aa2a 100644 --- a/autotests/integration/nightcolor_test.cpp +++ b/autotests/integration/nightcolor_test.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "platform.h" +#include "core/platform.h" #include "plugins/nightcolor/constants.h" #include "plugins/nightcolor/nightcolormanager.h" #include "wayland_server.h" diff --git a/autotests/integration/no_global_shortcuts_test.cpp b/autotests/integration/no_global_shortcuts_test.cpp index 0f5743f1e4..dbc82e5bc2 100644 --- a/autotests/integration/no_global_shortcuts_test.cpp +++ b/autotests/integration/no_global_shortcuts_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" #include "keyboard_input.h" -#include "platform.h" #include "screenedge.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/outputchanges_test.cpp b/autotests/integration/outputchanges_test.cpp index 05f0faaf83..dd558822c3 100644 --- a/autotests/integration/outputchanges_test.cpp +++ b/autotests/integration/outputchanges_test.cpp @@ -6,10 +6,10 @@ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/outputconfiguration.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "outputconfiguration.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/placement_test.cpp b/autotests/integration/placement_test.cpp index 018a411f11..6be425a0b2 100644 --- a/autotests/integration/placement_test.cpp +++ b/autotests/integration/placement_test.cpp @@ -9,10 +9,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" #include "placement.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/plasma_surface_test.cpp b/autotests/integration/plasma_surface_test.cpp index be8bea1ff5..0e816c7645 100644 --- a/autotests/integration/plasma_surface_test.cpp +++ b/autotests/integration/plasma_surface_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/plasmawindow_test.cpp b/autotests/integration/plasmawindow_test.cpp index d8cac8aa04..b82f2f4f7c 100644 --- a/autotests/integration/plasmawindow_test.cpp +++ b/autotests/integration/plasmawindow_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/platformcursor.cpp b/autotests/integration/platformcursor.cpp index 9499648424..da84c29d9f 100644 --- a/autotests/integration/platformcursor.cpp +++ b/autotests/integration/platformcursor.cpp @@ -8,8 +8,8 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" -#include "platform.h" #include "wayland_server.h" namespace KWin diff --git a/autotests/integration/pointer_constraints_test.cpp b/autotests/integration/pointer_constraints_test.cpp index 817981c216..89c7718cd6 100644 --- a/autotests/integration/pointer_constraints_test.cpp +++ b/autotests/integration/pointer_constraints_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "keyboard_input.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include "wayland/seat_interface.h" #include "wayland/surface_interface.h" diff --git a/autotests/integration/pointer_input.cpp b/autotests/integration/pointer_input.cpp index f5f2f0c3dc..0d23f45f3d 100644 --- a/autotests/integration/pointer_input.cpp +++ b/autotests/integration/pointer_input.cpp @@ -8,12 +8,12 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" #include "effects.h" #include "options.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include "screenedge.h" #include "screens.h" diff --git a/autotests/integration/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp index 1225daa3e4..7d53b04578 100644 --- a/autotests/integration/quick_tiling_test.cpp +++ b/autotests/integration/quick_tiling_test.cpp @@ -8,11 +8,11 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "decorations/decorationbridge.h" #include "decorations/settings.h" -#include "output.h" -#include "platform.h" #include "scripting/scripting.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/scene_qpainter_test.cpp b/autotests/integration/scene_qpainter_test.cpp index 4bc51e0ef0..14a18bac32 100644 --- a/autotests/integration/scene_qpainter_test.cpp +++ b/autotests/integration/scene_qpainter_test.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "wayland/shmclientbuffer.h" #include "wayland/surface_interface.h" #include "wayland_server.h" diff --git a/autotests/integration/screen_changes_test.cpp b/autotests/integration/screen_changes_test.cpp index 7e6d62e4ed..f0335fff18 100644 --- a/autotests/integration/screen_changes_test.cpp +++ b/autotests/integration/screen_changes_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/screenedge_client_show_test.cpp b/autotests/integration/screenedge_client_show_test.cpp index 56d2da692b..7134dff63c 100644 --- a/autotests/integration/screenedge_client_show_test.cpp +++ b/autotests/integration/screenedge_client_show_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "screenedge.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/screenedges_test.cpp b/autotests/integration/screenedges_test.cpp index 3c3e5c04a8..b076157eca 100644 --- a/autotests/integration/screenedges_test.cpp +++ b/autotests/integration/screenedges_test.cpp @@ -10,10 +10,10 @@ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "effectloader.h" #include "main.h" -#include "platform.h" #include "screenedge.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/screens_test.cpp b/autotests/integration/screens_test.cpp index 963b08337b..ec846e8532 100644 --- a/autotests/integration/screens_test.cpp +++ b/autotests/integration/screens_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "screens.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/scripting/minimizeall_test.cpp b/autotests/integration/scripting/minimizeall_test.cpp index ac2f6799f5..88e6d11fd5 100644 --- a/autotests/integration/scripting/minimizeall_test.cpp +++ b/autotests/integration/scripting/minimizeall_test.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" -#include "output.h" -#include "platform.h" +#include "core/output.h" +#include "core/platform.h" #include "scripting/scripting.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/scripting/screenedge_test.cpp b/autotests/integration/scripting/screenedge_test.cpp index c92a4be1aa..5a098b00e6 100644 --- a/autotests/integration/scripting/screenedge_test.cpp +++ b/autotests/integration/scripting/screenedge_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "effectloader.h" -#include "platform.h" #include "scripting/scripting.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/shade_test.cpp b/autotests/integration/shade_test.cpp index 87e263c2a6..ce06a3de6e 100644 --- a/autotests/integration/shade_test.cpp +++ b/autotests/integration/shade_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/showing_desktop_test.cpp b/autotests/integration/showing_desktop_test.cpp index 7da9e5241c..ba970a802e 100644 --- a/autotests/integration/showing_desktop_test.cpp +++ b/autotests/integration/showing_desktop_test.cpp @@ -8,7 +8,7 @@ */ #include "kwin_wayland_test.h" -#include "platform.h" +#include "core/platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/stacking_order_test.cpp b/autotests/integration/stacking_order_test.cpp index 0f63bec86d..5829693e03 100644 --- a/autotests/integration/stacking_order_test.cpp +++ b/autotests/integration/stacking_order_test.cpp @@ -10,9 +10,9 @@ #include "kwin_wayland_test.h" #include "atoms.h" +#include "core/platform.h" #include "deleted.h" #include "main.h" -#include "platform.h" #include "wayland_server.h" #include "window.h" #include "workspace.h" diff --git a/autotests/integration/struts_test.cpp b/autotests/integration/struts_test.cpp index 3f0039fd1b..3296d0bc3f 100644 --- a/autotests/integration/struts_test.cpp +++ b/autotests/integration/struts_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "screenedge.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/tabbox_test.cpp b/autotests/integration/tabbox_test.cpp index 7f2f96179e..bc2ad3ea10 100644 --- a/autotests/integration/tabbox_test.cpp +++ b/autotests/integration/tabbox_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" -#include "platform.h" #include "tabbox/tabbox.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/test_virtualkeyboard_dbus.cpp b/autotests/integration/test_virtualkeyboard_dbus.cpp index aa4e43bb11..44f4410efa 100644 --- a/autotests/integration/test_virtualkeyboard_dbus.cpp +++ b/autotests/integration/test_virtualkeyboard_dbus.cpp @@ -9,8 +9,8 @@ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "virtualkeyboard_dbus.h" #include "wayland_server.h" diff --git a/autotests/integration/touch_input_test.cpp b/autotests/integration/touch_input_test.cpp index fef439acd4..dae83d6f64 100644 --- a/autotests/integration/touch_input_test.cpp +++ b/autotests/integration/touch_input_test.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "touch_input.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/transient_placement.cpp b/autotests/integration/transient_placement.cpp index 74658a5e17..104252e169 100644 --- a/autotests/integration/transient_placement.cpp +++ b/autotests/integration/transient_placement.cpp @@ -8,9 +8,9 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "wayland/seat_interface.h" #include "wayland/surface_interface.h" #include "wayland_server.h" diff --git a/autotests/integration/virtual_desktop_test.cpp b/autotests/integration/virtual_desktop_test.cpp index 2820c96377..eedb623b34 100644 --- a/autotests/integration/virtual_desktop_test.cpp +++ b/autotests/integration/virtual_desktop_test.cpp @@ -8,8 +8,8 @@ */ #include "kwin_wayland_test.h" +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "virtualdesktops.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/window_rules_test.cpp b/autotests/integration/window_rules_test.cpp index cfc4ee57a7..31c180af05 100644 --- a/autotests/integration/window_rules_test.cpp +++ b/autotests/integration/window_rules_test.cpp @@ -9,10 +9,10 @@ #include "kwin_wayland_test.h" #include "atoms.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "rules.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/window_selection_test.cpp b/autotests/integration/window_selection_test.cpp index d26aa34c8e..e3e2c829cf 100644 --- a/autotests/integration/window_selection_test.cpp +++ b/autotests/integration/window_selection_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "keyboard_input.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/x11_window_test.cpp b/autotests/integration/x11_window_test.cpp index 737ba4328b..652d764edb 100644 --- a/autotests/integration/x11_window_test.cpp +++ b/autotests/integration/x11_window_test.cpp @@ -10,11 +10,11 @@ #include "atoms.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" #include "effectloader.h" #include "effects.h" -#include "platform.h" #include "wayland_server.h" #include "workspace.h" #include "x11window.h" diff --git a/autotests/integration/xdgshellwindow_rules_test.cpp b/autotests/integration/xdgshellwindow_rules_test.cpp index 2d66a82670..ba679f39d2 100644 --- a/autotests/integration/xdgshellwindow_rules_test.cpp +++ b/autotests/integration/xdgshellwindow_rules_test.cpp @@ -11,10 +11,10 @@ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/outputconfiguration.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "outputconfiguration.h" -#include "platform.h" #include "rules.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/autotests/integration/xdgshellwindow_test.cpp b/autotests/integration/xdgshellwindow_test.cpp index f210f320fe..21c0b61053 100644 --- a/autotests/integration/xdgshellwindow_test.cpp +++ b/autotests/integration/xdgshellwindow_test.cpp @@ -9,13 +9,13 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "decorations/decorationbridge.h" #include "decorations/settings.h" #include "deleted.h" #include "effects.h" -#include "output.h" -#include "platform.h" #include "virtualdesktops.h" #include "wayland/clientconnection.h" #include "wayland/display.h" diff --git a/autotests/integration/xwayland_input_test.cpp b/autotests/integration/xwayland_input_test.cpp index 19cbea56c0..59ef7cb0e0 100644 --- a/autotests/integration/xwayland_input_test.cpp +++ b/autotests/integration/xwayland_input_test.cpp @@ -8,10 +8,10 @@ */ #include "kwin_wayland_test.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "deleted.h" -#include "output.h" -#include "platform.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/integration/xwayland_selections_test.cpp b/autotests/integration/xwayland_selections_test.cpp index c9683efad3..d620746075 100644 --- a/autotests/integration/xwayland_selections_test.cpp +++ b/autotests/integration/xwayland_selections_test.cpp @@ -9,8 +9,8 @@ */ #include "kwin_wayland_test.h" -#include "output.h" -#include "platform.h" +#include "core/output.h" +#include "core/platform.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "window.h" diff --git a/autotests/integration/xwaylandserver_crash_test.cpp b/autotests/integration/xwaylandserver_crash_test.cpp index 52e7e45472..6f9feb028c 100644 --- a/autotests/integration/xwaylandserver_crash_test.cpp +++ b/autotests/integration/xwaylandserver_crash_test.cpp @@ -7,9 +7,9 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "scene.h" #include "unmanaged.h" #include "wayland_server.h" diff --git a/autotests/integration/xwaylandserver_restart_test.cpp b/autotests/integration/xwaylandserver_restart_test.cpp index 6d9b7fb1d0..22c6a142fb 100644 --- a/autotests/integration/xwaylandserver_restart_test.cpp +++ b/autotests/integration/xwaylandserver_restart_test.cpp @@ -7,8 +7,8 @@ #include "kwin_wayland_test.h" #include "composite.h" +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "scene.h" #include "wayland_server.h" #include "workspace.h" diff --git a/autotests/libinput/CMakeLists.txt b/autotests/libinput/CMakeLists.txt index d1156fd532..8fed98fa88 100644 --- a/autotests/libinput/CMakeLists.txt +++ b/autotests/libinput/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${Libinput_INCLUDE_DIRS}) add_definitions(-DKWIN_BUILD_TESTING) -add_library(LibInputTestObjects STATIC ../../src/backends/libinput/device.cpp ../../src/backends/libinput/events.cpp ../../src/inputdevice.cpp ../../src/mousebuttons.cpp mock_libinput.cpp) +add_library(LibInputTestObjects STATIC ../../src/backends/libinput/device.cpp ../../src/backends/libinput/events.cpp ../../src/core/inputdevice.cpp ../../src/mousebuttons.cpp mock_libinput.cpp) target_link_libraries(LibInputTestObjects Qt::Test Qt::Widgets Qt::DBus Qt::Gui KF5::ConfigCore) target_include_directories(LibInputTestObjects PUBLIC ${CMAKE_SOURCE_DIR}/src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 268047156a..a9a2eadc7e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,11 +32,28 @@ target_sources(kwin PRIVATE atoms.cpp client_machine.cpp colors/colordevice.cpp - colors/colorlut.cpp colors/colormanager.cpp - colors/colorpipelinestage.cpp - colors/colortransformation.cpp composite.cpp + core/colorlut.cpp + core/colorpipelinestage.cpp + core/colortransformation.cpp + core/inputbackend.cpp + core/inputdevice.cpp + core/output.cpp + core/outputconfiguration.cpp + core/outputlayer.cpp + core/overlaywindow.cpp + core/platform.cpp + core/renderbackend.cpp + core/renderjournal.cpp + core/renderlayer.cpp + core/renderlayerdelegate.cpp + core/renderloop.cpp + core/rendertarget.cpp + core/session.cpp + core/session_consolekit.cpp + core/session_logind.cpp + core/session_noop.cpp cursor.cpp cursordelegate_opengl.cpp cursordelegate_qpainter.cpp @@ -59,13 +76,12 @@ target_sources(kwin PRIVATE gestures.cpp globalshortcuts.cpp group.cpp + hide_cursor_spy.cpp idle_inhibition.cpp idledetector.cpp input.cpp input_event.cpp input_event_spy.cpp - inputbackend.cpp - inputdevice.cpp inputmethod.cpp inputpanelv1integration.cpp inputpanelv1window.cpp @@ -89,33 +105,19 @@ target_sources(kwin PRIVATE options.cpp osd.cpp outline.cpp - output.cpp - outputconfiguration.cpp - outputlayer.cpp - overlaywindow.cpp placeholderinputeventfilter.cpp placement.cpp placementtracker.cpp - platform.cpp plugin.cpp pluginmanager.cpp pointer_input.cpp popup_input_filter.cpp - renderbackend.cpp - renderjournal.cpp - renderlayer.cpp - renderlayerdelegate.cpp - renderloop.cpp - rendertarget.cpp rootinfo_filter.cpp rulebooksettings.cpp rules.cpp scene.cpp screenedge.cpp screens.cpp - scripting/v2/clientmodel.cpp - scripting/v3/clientmodel.cpp - scripting/v3/virtualdesktopmodel.cpp scripting/dbuscall.cpp scripting/desktopbackgrounditem.cpp scripting/screenedgeitem.cpp @@ -123,12 +125,11 @@ target_sources(kwin PRIVATE scripting/scripting.cpp scripting/scripting_logging.cpp scripting/scriptingutils.cpp + scripting/v2/clientmodel.cpp + scripting/v3/clientmodel.cpp + scripting/v3/virtualdesktopmodel.cpp scripting/windowthumbnailitem.cpp scripting/workspace_wrapper.cpp - session.cpp - session_consolekit.cpp - session_logind.cpp - session_noop.cpp shadow.cpp shadowitem.cpp sm.cpp @@ -139,7 +140,6 @@ target_sources(kwin PRIVATE syncalarmx11filter.cpp tablet_input.cpp tabletmodemanager.cpp - hide_cursor_spy.cpp touch_input.cpp unmanaged.cpp useractions.cpp diff --git a/src/activation.cpp b/src/activation.cpp index fe31de2513..d55c34ade1 100644 --- a/src/activation.cpp +++ b/src/activation.cpp @@ -15,10 +15,10 @@ */ +#include "core/platform.h" #include "cursor.h" #include "focuschain.h" #include "netinfo.h" -#include "platform.h" #include "workspace.h" #include "x11window.h" #if KWIN_BUILD_ACTIVITIES diff --git a/src/backends/drm/drm_abstract_output.cpp b/src/backends/drm/drm_abstract_output.cpp index 996280b52f..190629b28f 100644 --- a/src/backends/drm/drm_abstract_output.cpp +++ b/src/backends/drm/drm_abstract_output.cpp @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "drm_abstract_output.h" +#include "core/renderloop_p.h" #include "drm_backend.h" #include "drm_gpu.h" -#include "renderloop_p.h" namespace KWin { diff --git a/src/backends/drm/drm_abstract_output.h b/src/backends/drm/drm_abstract_output.h index 09e273d524..8a39413a49 100644 --- a/src/backends/drm/drm_abstract_output.h +++ b/src/backends/drm/drm_abstract_output.h @@ -8,7 +8,7 @@ */ #pragma once -#include "output.h" +#include "core/output.h" namespace KWin { diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp index 47766d4b8a..156796e47f 100644 --- a/src/backends/drm/drm_backend.cpp +++ b/src/backends/drm/drm_backend.cpp @@ -11,6 +11,9 @@ #include #include "backends/libinput/libinputbackend.h" +#include "core/outputconfiguration.h" +#include "core/renderloop.h" +#include "core/session.h" #include "drm_egl_backend.h" #include "drm_gpu.h" #include "drm_logging.h" @@ -23,9 +26,6 @@ #include "drm_render_backend.h" #include "drm_virtual_output.h" #include "gbm_dmabuf.h" -#include "outputconfiguration.h" -#include "renderloop.h" -#include "session.h" #include "utils/udev.h" // KF5 #include diff --git a/src/backends/drm/drm_backend.h b/src/backends/drm/drm_backend.h index c56f73094d..7abe010b4f 100644 --- a/src/backends/drm/drm_backend.h +++ b/src/backends/drm/drm_backend.h @@ -8,7 +8,7 @@ */ #ifndef KWIN_DRM_BACKEND_H #define KWIN_DRM_BACKEND_H -#include "platform.h" +#include "core/platform.h" #include "dpmsinputeventfilter.h" diff --git a/src/backends/drm/drm_egl_backend.cpp b/src/backends/drm/drm_egl_backend.cpp index bb55e86f50..270f9e2194 100644 --- a/src/backends/drm/drm_egl_backend.cpp +++ b/src/backends/drm/drm_egl_backend.cpp @@ -10,6 +10,7 @@ #include "basiceglsurfacetexture_internal.h" #include "basiceglsurfacetexture_wayland.h" // kwin +#include "core/renderloop_p.h" #include "drm_abstract_output.h" #include "drm_backend.h" #include "drm_buffer_gbm.h" @@ -28,7 +29,6 @@ #include "kwineglutils_p.h" #include "linux_dmabuf.h" #include "options.h" -#include "renderloop_p.h" #include "surfaceitem_wayland.h" #include "wayland/clientconnection.h" #include "wayland/linuxdmabufv1clientbuffer.h" diff --git a/src/backends/drm/drm_egl_layer_surface.h b/src/backends/drm/drm_egl_layer_surface.h index e88e26b9f0..74f6215dc3 100644 --- a/src/backends/drm/drm_egl_layer_surface.h +++ b/src/backends/drm/drm_egl_layer_surface.h @@ -13,8 +13,8 @@ #include #include +#include "core/outputlayer.h" #include "drm_object_plane.h" -#include "outputlayer.h" namespace KWaylandServer { diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp index d5435ef838..8566fbff69 100644 --- a/src/backends/drm/drm_gpu.cpp +++ b/src/backends/drm/drm_gpu.cpp @@ -11,6 +11,8 @@ #include #include "abstract_egl_backend.h" +#include "core/renderloop_p.h" +#include "core/session.h" #include "drm_backend.h" #include "drm_egl_backend.h" #include "drm_layer.h" @@ -22,8 +24,6 @@ #include "drm_pipeline.h" #include "drm_virtual_output.h" #include "gbm_dmabuf.h" -#include "renderloop_p.h" -#include "session.h" #include "wayland/drmleasedevice_v1_interface.h" #include "wayland_server.h" // system diff --git a/src/backends/drm/drm_layer.h b/src/backends/drm/drm_layer.h index 6f5ca93e3a..562ed86c45 100644 --- a/src/backends/drm/drm_layer.h +++ b/src/backends/drm/drm_layer.h @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #pragma once -#include "outputlayer.h" +#include "core/outputlayer.h" #include #include diff --git a/src/backends/drm/drm_object_connector.h b/src/backends/drm/drm_object_connector.h index f3f50f6a27..b6e824c128 100644 --- a/src/backends/drm/drm_object_connector.h +++ b/src/backends/drm/drm_object_connector.h @@ -14,9 +14,9 @@ #include +#include "core/output.h" #include "drm_object.h" #include "drm_pointer.h" -#include "output.h" #include "utils/edid.h" namespace KWin diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp index fcbf9b7a6a..5b0a7810b6 100644 --- a/src/backends/drm/drm_output.cpp +++ b/src/backends/drm/drm_output.cpp @@ -14,6 +14,10 @@ #include "drm_object_crtc.h" #include "drm_pipeline.h" +#include "core/outputconfiguration.h" +#include "core/renderloop.h" +#include "core/renderloop_p.h" +#include "core/session.h" #include "cursor.h" #include "drm_dumb_buffer.h" #include "drm_dumb_swapchain.h" @@ -21,10 +25,6 @@ #include "drm_layer.h" #include "drm_logging.h" #include "kwinglutils.h" -#include "outputconfiguration.h" -#include "renderloop.h" -#include "renderloop_p.h" -#include "session.h" #include "wayland/drmleasedevice_v1_interface.h" // Qt #include diff --git a/src/backends/drm/drm_pipeline.cpp b/src/backends/drm/drm_pipeline.cpp index 3d8dde20ed..24157eb159 100644 --- a/src/backends/drm/drm_pipeline.cpp +++ b/src/backends/drm/drm_pipeline.cpp @@ -11,6 +11,7 @@ #include +#include "core/session.h" #include "cursor.h" #include "drm_backend.h" #include "drm_buffer.h" @@ -23,7 +24,6 @@ #include "drm_object_crtc.h" #include "drm_object_plane.h" #include "drm_output.h" -#include "session.h" #include #include diff --git a/src/backends/drm/drm_pipeline.h b/src/backends/drm/drm_pipeline.h index 6f6aade4e1..5d6006f61c 100644 --- a/src/backends/drm/drm_pipeline.h +++ b/src/backends/drm/drm_pipeline.h @@ -16,10 +16,10 @@ #include #include -#include "colorlut.h" +#include "core/colorlut.h" +#include "core/output.h" +#include "core/renderloop_p.h" #include "drm_object_plane.h" -#include "output.h" -#include "renderloop_p.h" namespace KWin { diff --git a/src/backends/drm/drm_qpainter_backend.cpp b/src/backends/drm/drm_qpainter_backend.cpp index c2fa5fed5c..9b41ad5292 100644 --- a/src/backends/drm/drm_qpainter_backend.cpp +++ b/src/backends/drm/drm_qpainter_backend.cpp @@ -7,6 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "drm_qpainter_backend.h" +#include "core/renderloop_p.h" #include "drm_backend.h" #include "drm_buffer.h" #include "drm_gpu.h" @@ -14,7 +15,6 @@ #include "drm_pipeline.h" #include "drm_qpainter_layer.h" #include "drm_virtual_output.h" -#include "renderloop_p.h" #include diff --git a/src/backends/drm/drm_virtual_output.cpp b/src/backends/drm/drm_virtual_output.cpp index cf125dcc3d..3be92f3a53 100644 --- a/src/backends/drm/drm_virtual_output.cpp +++ b/src/backends/drm/drm_virtual_output.cpp @@ -9,12 +9,12 @@ */ #include "drm_virtual_output.h" +#include "core/renderloop_p.h" #include "drm_backend.h" #include "drm_gpu.h" #include "drm_layer.h" #include "drm_logging.h" #include "drm_render_backend.h" -#include "renderloop_p.h" #include "softwarevsyncmonitor.h" namespace KWin diff --git a/src/backends/drm/drm_virtual_output.h b/src/backends/drm/drm_virtual_output.h index af93176f15..12002ebacb 100644 --- a/src/backends/drm/drm_virtual_output.h +++ b/src/backends/drm/drm_virtual_output.h @@ -9,8 +9,8 @@ */ #pragma once +#include "core/platform.h" #include "drm_abstract_output.h" -#include "platform.h" #include #include diff --git a/src/backends/fakeinput/fakeinputbackend.h b/src/backends/fakeinput/fakeinputbackend.h index ace17d4f35..d8d9d661c6 100644 --- a/src/backends/fakeinput/fakeinputbackend.h +++ b/src/backends/fakeinput/fakeinputbackend.h @@ -6,7 +6,7 @@ #pragma once -#include "inputbackend.h" +#include "core/inputbackend.h" namespace KWin { diff --git a/src/backends/fakeinput/fakeinputdevice.h b/src/backends/fakeinput/fakeinputdevice.h index 9f7e063921..fb08679638 100644 --- a/src/backends/fakeinput/fakeinputdevice.h +++ b/src/backends/fakeinput/fakeinputdevice.h @@ -6,7 +6,7 @@ #pragma once -#include "inputdevice.h" +#include "core/inputdevice.h" namespace KWaylandServer { diff --git a/src/backends/libinput/connection.cpp b/src/backends/libinput/connection.cpp index 1734f85fc0..a8ac4514d1 100644 --- a/src/backends/libinput/connection.cpp +++ b/src/backends/libinput/connection.cpp @@ -13,16 +13,16 @@ // TODO: Make it compile also in testing environment #ifndef KWIN_BUILD_TESTING +#include "core/output.h" +#include "core/platform.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "window.h" #include "workspace.h" #endif +#include "core/session.h" #include "input_event.h" #include "libinput_logging.h" -#include "session.h" #include "utils/realtime.h" #include "utils/udev.h" diff --git a/src/backends/libinput/context.cpp b/src/backends/libinput/context.cpp index dd0659ba84..c43608e9b5 100644 --- a/src/backends/libinput/context.cpp +++ b/src/backends/libinput/context.cpp @@ -10,7 +10,7 @@ #include "events.h" #include "libinput_logging.h" -#include "session.h" +#include "core/session.h" #include "utils/udev.h" #include diff --git a/src/backends/libinput/device.cpp b/src/backends/libinput/device.cpp index 139c6836ab..c1093db42b 100644 --- a/src/backends/libinput/device.cpp +++ b/src/backends/libinput/device.cpp @@ -10,11 +10,11 @@ #include +#include "core/output.h" +#include "core/platform.h" #include "libinput_logging.h" #include "main.h" #include "mousebuttons.h" -#include "output.h" -#include "platform.h" #include "pointer_input.h" #include diff --git a/src/backends/libinput/device.h b/src/backends/libinput/device.h index 2c9a679575..5a7bbfb405 100644 --- a/src/backends/libinput/device.h +++ b/src/backends/libinput/device.h @@ -9,7 +9,7 @@ #ifndef KWIN_LIBINPUT_DEVICE_H #define KWIN_LIBINPUT_DEVICE_H -#include "inputdevice.h" +#include "core/inputdevice.h" #include diff --git a/src/backends/libinput/libinputbackend.h b/src/backends/libinput/libinputbackend.h index 0d11041ecf..03e23a65fb 100644 --- a/src/backends/libinput/libinputbackend.h +++ b/src/backends/libinput/libinputbackend.h @@ -6,7 +6,7 @@ #pragma once -#include "inputbackend.h" +#include "core/inputbackend.h" #include diff --git a/src/backends/virtual/virtual_backend.h b/src/backends/virtual/virtual_backend.h index 62a4022d1d..8458acf63c 100644 --- a/src/backends/virtual/virtual_backend.h +++ b/src/backends/virtual/virtual_backend.h @@ -8,7 +8,7 @@ */ #pragma once -#include "platform.h" +#include "core/platform.h" #include diff --git a/src/backends/virtual/virtual_egl_backend.h b/src/backends/virtual/virtual_egl_backend.h index 6fada54d18..0a199c8aa9 100644 --- a/src/backends/virtual/virtual_egl_backend.h +++ b/src/backends/virtual/virtual_egl_backend.h @@ -9,7 +9,7 @@ #pragma once #include "abstract_egl_backend.h" -#include "outputlayer.h" +#include "core/outputlayer.h" namespace KWin { diff --git a/src/backends/virtual/virtual_output.cpp b/src/backends/virtual/virtual_output.cpp index a455455953..e2f617b648 100644 --- a/src/backends/virtual/virtual_output.cpp +++ b/src/backends/virtual/virtual_output.cpp @@ -9,7 +9,7 @@ #include "virtual_output.h" #include "virtual_backend.h" -#include "renderloop_p.h" +#include "core/renderloop_p.h" #include "softwarevsyncmonitor.h" namespace KWin diff --git a/src/backends/virtual/virtual_output.h b/src/backends/virtual/virtual_output.h index 008d6f6a5e..9bd4132f28 100644 --- a/src/backends/virtual/virtual_output.h +++ b/src/backends/virtual/virtual_output.h @@ -8,7 +8,7 @@ */ #pragma once -#include "output.h" +#include "core/output.h" #include #include diff --git a/src/backends/virtual/virtual_qpainter_backend.h b/src/backends/virtual/virtual_qpainter_backend.h index f882b5361c..01d4341bdb 100644 --- a/src/backends/virtual/virtual_qpainter_backend.h +++ b/src/backends/virtual/virtual_qpainter_backend.h @@ -8,7 +8,7 @@ */ #pragma once -#include "outputlayer.h" +#include "core/outputlayer.h" #include "qpainterbackend.h" #include diff --git a/src/backends/wayland/wayland_backend.cpp b/src/backends/wayland/wayland_backend.cpp index c52f71b921..9e238c2bd5 100644 --- a/src/backends/wayland/wayland_backend.cpp +++ b/src/backends/wayland/wayland_backend.cpp @@ -13,7 +13,7 @@ #include "wayland_egl_backend.h" #include #endif -#include "renderloop_p.h" +#include "core/renderloop_p.h" #include "wayland_logging.h" #include "wayland_output.h" #include "wayland_qpainter_backend.h" diff --git a/src/backends/wayland/wayland_backend.h b/src/backends/wayland/wayland_backend.h index c2dd8a946f..3a1eddd23f 100644 --- a/src/backends/wayland/wayland_backend.h +++ b/src/backends/wayland/wayland_backend.h @@ -11,9 +11,9 @@ #include // KWin -#include "inputbackend.h" -#include "inputdevice.h" -#include "platform.h" +#include "core/inputbackend.h" +#include "core/inputdevice.h" +#include "core/platform.h" #include "utils/filedescriptor.h" #include // Qt diff --git a/src/backends/wayland/wayland_egl_backend.h b/src/backends/wayland/wayland_egl_backend.h index 14b438d799..03a246e77c 100644 --- a/src/backends/wayland/wayland_egl_backend.h +++ b/src/backends/wayland/wayland_egl_backend.h @@ -10,7 +10,7 @@ #pragma once #include "abstract_egl_backend.h" -#include "outputlayer.h" +#include "core/outputlayer.h" #include "utils/damagejournal.h" // wayland #include diff --git a/src/backends/wayland/wayland_output.cpp b/src/backends/wayland/wayland_output.cpp index 231cbc4712..bfb447c416 100644 --- a/src/backends/wayland/wayland_output.cpp +++ b/src/backends/wayland/wayland_output.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "wayland_output.h" -#include "renderloop.h" +#include "core/renderloop.h" #include "wayland_backend.h" #include "wayland_server.h" diff --git a/src/backends/wayland/wayland_output.h b/src/backends/wayland/wayland_output.h index 33b7925e01..899ca75990 100644 --- a/src/backends/wayland/wayland_output.h +++ b/src/backends/wayland/wayland_output.h @@ -8,7 +8,7 @@ */ #pragma once -#include "output.h" +#include "core/output.h" #include diff --git a/src/backends/wayland/wayland_qpainter_backend.h b/src/backends/wayland/wayland_qpainter_backend.h index 063eff817d..14f7c0794c 100644 --- a/src/backends/wayland/wayland_qpainter_backend.h +++ b/src/backends/wayland/wayland_qpainter_backend.h @@ -9,7 +9,7 @@ */ #pragma once -#include "outputlayer.h" +#include "core/outputlayer.h" #include "qpainterbackend.h" #include "utils/damagejournal.h" diff --git a/src/backends/x11/common/x11_common_egl_backend.cpp b/src/backends/x11/common/x11_common_egl_backend.cpp index a0adfefcfc..649febbe97 100644 --- a/src/backends/x11/common/x11_common_egl_backend.cpp +++ b/src/backends/x11/common/x11_common_egl_backend.cpp @@ -10,10 +10,10 @@ // kwineffects #include // kwin +#include "core/overlaywindow.h" +#include "core/platform.h" #include "main.h" #include "options.h" -#include "overlaywindow.h" -#include "platform.h" #include "utils/common.h" #include "utils/xcbutils.h" // X11 diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp index f0962f941f..bb1d4a3547 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.cpp @@ -6,11 +6,11 @@ */ #include "x11_standalone_egl_backend.h" +#include "core/overlaywindow.h" +#include "core/platform.h" +#include "core/renderloop_p.h" #include "kwinglplatform.h" #include "options.h" -#include "overlaywindow.h" -#include "platform.h" -#include "renderloop_p.h" #include "scene.h" #include "softwarevsyncmonitor.h" #include "surfaceitem_x11.h" diff --git a/src/backends/x11/standalone/x11_standalone_egl_backend.h b/src/backends/x11/standalone/x11_standalone_egl_backend.h index 4a93685b1c..be541fdfc3 100644 --- a/src/backends/x11/standalone/x11_standalone_egl_backend.h +++ b/src/backends/x11/standalone/x11_standalone_egl_backend.h @@ -7,8 +7,8 @@ #pragma once #include "../common/x11_common_egl_backend.h" +#include "core/outputlayer.h" #include "openglsurfacetexture_x11.h" -#include "outputlayer.h" #include "utils/damagejournal.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp index 095ca4757f..5858902288 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.cpp +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.cpp @@ -23,10 +23,10 @@ #include "x11_standalone_sgivideosyncvsyncmonitor.h" // kwin #include "composite.h" +#include "core/overlaywindow.h" +#include "core/platform.h" +#include "core/renderloop_p.h" #include "options.h" -#include "overlaywindow.h" -#include "platform.h" -#include "renderloop_p.h" #include "scene.h" #include "surfaceitem_x11.h" #include "utils/xcbutils.h" diff --git a/src/backends/x11/standalone/x11_standalone_glx_backend.h b/src/backends/x11/standalone/x11_standalone_glx_backend.h index 52e6e043a3..07394c5090 100644 --- a/src/backends/x11/standalone/x11_standalone_glx_backend.h +++ b/src/backends/x11/standalone/x11_standalone_glx_backend.h @@ -8,9 +8,9 @@ */ #ifndef KWIN_GLX_BACKEND_H #define KWIN_GLX_BACKEND_H +#include "core/outputlayer.h" #include "openglbackend.h" #include "openglsurfacetexture_x11.h" -#include "outputlayer.h" #include "utils/damagejournal.h" #include "x11eventfilter.h" diff --git a/src/backends/x11/standalone/x11_standalone_output.cpp b/src/backends/x11/standalone/x11_standalone_output.cpp index fb71343c05..a6376aed45 100644 --- a/src/backends/x11/standalone/x11_standalone_output.cpp +++ b/src/backends/x11/standalone/x11_standalone_output.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "x11_standalone_output.h" -#include "colorlut.h" +#include "core/colorlut.h" #include "x11_standalone_platform.h" namespace KWin diff --git a/src/backends/x11/standalone/x11_standalone_output.h b/src/backends/x11/standalone/x11_standalone_output.h index ba4bff880b..7f0cb5025e 100644 --- a/src/backends/x11/standalone/x11_standalone_output.h +++ b/src/backends/x11/standalone/x11_standalone_output.h @@ -9,7 +9,7 @@ #ifndef KWIN_X11_OUTPUT_H #define KWIN_X11_OUTPUT_H -#include "output.h" +#include "core/output.h" #include #include diff --git a/src/backends/x11/standalone/x11_standalone_overlaywindow.h b/src/backends/x11/standalone/x11_standalone_overlaywindow.h index 16b70cc0d0..84cd296147 100644 --- a/src/backends/x11/standalone/x11_standalone_overlaywindow.h +++ b/src/backends/x11/standalone/x11_standalone_overlaywindow.h @@ -10,7 +10,7 @@ #ifndef KWIN_OVERLAYWINDOW_X11_H #define KWIN_OVERLAYWINDOW_X11_H -#include "overlaywindow.h" +#include "core/overlaywindow.h" #include "x11eventfilter.h" namespace KWin diff --git a/src/backends/x11/standalone/x11_standalone_placeholderoutput.h b/src/backends/x11/standalone/x11_standalone_placeholderoutput.h index 7515c3dbff..ad226e7096 100644 --- a/src/backends/x11/standalone/x11_standalone_placeholderoutput.h +++ b/src/backends/x11/standalone/x11_standalone_placeholderoutput.h @@ -6,7 +6,7 @@ #pragma once -#include "output.h" +#include "core/output.h" namespace KWin { diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp index 45a60708e5..83cddcfdb8 100644 --- a/src/backends/x11/standalone/x11_standalone_platform.cpp +++ b/src/backends/x11/standalone/x11_standalone_platform.cpp @@ -11,7 +11,7 @@ #include #include "atoms.h" -#include "session.h" +#include "core/session.h" #include "x11_standalone_cursor.h" #include "x11_standalone_edge.h" #include "x11_standalone_placeholderoutput.h" @@ -23,9 +23,9 @@ #if HAVE_X11_XINPUT #include "x11_standalone_xinputintegration.h" #endif +#include "core/renderloop.h" #include "keyboard_input.h" #include "options.h" -#include "renderloop.h" #include "utils/c_ptr.h" #include "utils/edid.h" #include "utils/xcbutils.h" diff --git a/src/backends/x11/standalone/x11_standalone_platform.h b/src/backends/x11/standalone/x11_standalone_platform.h index f75520db8b..1ff44a28ad 100644 --- a/src/backends/x11/standalone/x11_standalone_platform.h +++ b/src/backends/x11/standalone/x11_standalone_platform.h @@ -8,7 +8,7 @@ */ #ifndef KWIN_X11_PLATFORM_H #define KWIN_X11_PLATFORM_H -#include "platform.h" +#include "core/platform.h" #include diff --git a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp index 336866ca7c..68c0ca47ba 100644 --- a/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp +++ b/src/backends/x11/standalone/x11_standalone_xinputintegration.cpp @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "x11_standalone_xinputintegration.h" +#include "core/platform.h" #include "gestures.h" #include "keyboard_input.h" #include "main.h" -#include "platform.h" #include "pointer_input.h" #include "screenedge.h" #include "x11_standalone_cursor.h" diff --git a/src/backends/x11/windowed/x11_windowed_backend.h b/src/backends/x11/windowed/x11_windowed_backend.h index 47d5edfe80..ef395b350a 100644 --- a/src/backends/x11/windowed/x11_windowed_backend.h +++ b/src/backends/x11/windowed/x11_windowed_backend.h @@ -8,9 +8,9 @@ */ #pragma once -#include "inputbackend.h" -#include "inputdevice.h" -#include "platform.h" +#include "core/inputbackend.h" +#include "core/inputdevice.h" +#include "core/platform.h" #include diff --git a/src/backends/x11/windowed/x11_windowed_egl_backend.h b/src/backends/x11/windowed/x11_windowed_egl_backend.h index e5d34c8f2b..310423e8a8 100644 --- a/src/backends/x11/windowed/x11_windowed_egl_backend.h +++ b/src/backends/x11/windowed/x11_windowed_egl_backend.h @@ -9,8 +9,8 @@ #pragma once #include "../common/x11_common_egl_backend.h" +#include "core/outputlayer.h" #include "kwinglutils.h" -#include "outputlayer.h" #include diff --git a/src/backends/x11/windowed/x11_windowed_output.cpp b/src/backends/x11/windowed/x11_windowed_output.cpp index a2d77d0b4b..ef1a79bcf8 100644 --- a/src/backends/x11/windowed/x11_windowed_output.cpp +++ b/src/backends/x11/windowed/x11_windowed_output.cpp @@ -10,7 +10,7 @@ #include -#include "renderloop_p.h" +#include "core/renderloop_p.h" #include "softwarevsyncmonitor.h" #include "x11_windowed_backend.h" diff --git a/src/backends/x11/windowed/x11_windowed_output.h b/src/backends/x11/windowed/x11_windowed_output.h index c281969ab0..df3e5f314b 100644 --- a/src/backends/x11/windowed/x11_windowed_output.h +++ b/src/backends/x11/windowed/x11_windowed_output.h @@ -8,7 +8,7 @@ */ #pragma once -#include "output.h" +#include "core/output.h" #include #include diff --git a/src/backends/x11/windowed/x11_windowed_qpainter_backend.h b/src/backends/x11/windowed/x11_windowed_qpainter_backend.h index ab8f4ca385..3a096bc650 100644 --- a/src/backends/x11/windowed/x11_windowed_qpainter_backend.h +++ b/src/backends/x11/windowed/x11_windowed_qpainter_backend.h @@ -8,7 +8,7 @@ */ #pragma once -#include "outputlayer.h" +#include "core/outputlayer.h" #include "qpainterbackend.h" #include diff --git a/src/colors/colordevice.cpp b/src/colors/colordevice.cpp index f4c2c52139..1fc2e6e137 100644 --- a/src/colors/colordevice.cpp +++ b/src/colors/colordevice.cpp @@ -5,9 +5,9 @@ */ #include "colordevice.h" -#include "colorpipelinestage.h" -#include "colortransformation.h" -#include "output.h" +#include "core/colorpipelinestage.h" +#include "core/colortransformation.h" +#include "core/output.h" #include "utils/common.h" #include "3rdparty/colortemperature.h" diff --git a/src/colors/colormanager.cpp b/src/colors/colormanager.cpp index 4cd0ee1c73..ffa60e451e 100644 --- a/src/colors/colormanager.cpp +++ b/src/colors/colormanager.cpp @@ -6,9 +6,9 @@ #include "colormanager.h" #include "colordevice.h" +#include "core/output.h" +#include "core/session.h" #include "main.h" -#include "output.h" -#include "session.h" #include "utils/common.h" #include "workspace.h" diff --git a/src/composite.cpp b/src/composite.cpp index 6cbe21f6d7..41d4a20d89 100644 --- a/src/composite.cpp +++ b/src/composite.cpp @@ -10,6 +10,12 @@ #include +#include "core/output.h" +#include "core/outputlayer.h" +#include "core/overlaywindow.h" +#include "core/platform.h" +#include "core/renderlayer.h" +#include "core/renderloop.h" #include "cursordelegate_opengl.h" #include "cursordelegate_qpainter.h" #include "dbusinterface.h" @@ -19,13 +25,7 @@ #include "ftrace.h" #include "internalwindow.h" #include "openglbackend.h" -#include "output.h" -#include "outputlayer.h" -#include "overlaywindow.h" -#include "platform.h" #include "qpainterbackend.h" -#include "renderlayer.h" -#include "renderloop.h" #include "scene.h" #include "scenes/opengl/scene_opengl.h" #include "scenes/qpainter/scene_qpainter.h" diff --git a/src/colors/colorlut.cpp b/src/core/colorlut.cpp similarity index 100% rename from src/colors/colorlut.cpp rename to src/core/colorlut.cpp diff --git a/src/colors/colorlut.h b/src/core/colorlut.h similarity index 100% rename from src/colors/colorlut.h rename to src/core/colorlut.h diff --git a/src/colors/colorpipelinestage.cpp b/src/core/colorpipelinestage.cpp similarity index 100% rename from src/colors/colorpipelinestage.cpp rename to src/core/colorpipelinestage.cpp diff --git a/src/colors/colorpipelinestage.h b/src/core/colorpipelinestage.h similarity index 100% rename from src/colors/colorpipelinestage.h rename to src/core/colorpipelinestage.h diff --git a/src/colors/colortransformation.cpp b/src/core/colortransformation.cpp similarity index 100% rename from src/colors/colortransformation.cpp rename to src/core/colortransformation.cpp index 0cf01db526..2e93d5016e 100644 --- a/src/colors/colortransformation.cpp +++ b/src/core/colortransformation.cpp @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "colortransformation.h" +#include "colorpipelinestage.h" #include -#include "colorpipelinestage.h" #include "utils/common.h" namespace KWin diff --git a/src/colors/colortransformation.h b/src/core/colortransformation.h similarity index 100% rename from src/colors/colortransformation.h rename to src/core/colortransformation.h diff --git a/src/inputbackend.cpp b/src/core/inputbackend.cpp similarity index 100% rename from src/inputbackend.cpp rename to src/core/inputbackend.cpp diff --git a/src/inputbackend.h b/src/core/inputbackend.h similarity index 100% rename from src/inputbackend.h rename to src/core/inputbackend.h diff --git a/src/inputdevice.cpp b/src/core/inputdevice.cpp similarity index 100% rename from src/inputdevice.cpp rename to src/core/inputdevice.cpp diff --git a/src/inputdevice.h b/src/core/inputdevice.h similarity index 100% rename from src/inputdevice.h rename to src/core/inputdevice.h diff --git a/src/output.cpp b/src/core/output.cpp similarity index 100% rename from src/output.cpp rename to src/core/output.cpp diff --git a/src/output.h b/src/core/output.h similarity index 100% rename from src/output.h rename to src/core/output.h diff --git a/src/outputconfiguration.cpp b/src/core/outputconfiguration.cpp similarity index 100% rename from src/outputconfiguration.cpp rename to src/core/outputconfiguration.cpp diff --git a/src/outputconfiguration.h b/src/core/outputconfiguration.h similarity index 99% rename from src/outputconfiguration.h rename to src/core/outputconfiguration.h index f74d090c74..277599ceb4 100644 --- a/src/outputconfiguration.h +++ b/src/core/outputconfiguration.h @@ -8,12 +8,13 @@ */ #pragma once +#include "kwin_export.h" + +#include "output.h" + #include #include -#include "kwin_export.h" -#include "output.h" - namespace KWin { diff --git a/src/outputlayer.cpp b/src/core/outputlayer.cpp similarity index 100% rename from src/outputlayer.cpp rename to src/core/outputlayer.cpp diff --git a/src/outputlayer.h b/src/core/outputlayer.h similarity index 100% rename from src/outputlayer.h rename to src/core/outputlayer.h diff --git a/src/overlaywindow.cpp b/src/core/overlaywindow.cpp similarity index 100% rename from src/overlaywindow.cpp rename to src/core/overlaywindow.cpp diff --git a/src/overlaywindow.h b/src/core/overlaywindow.h similarity index 100% rename from src/overlaywindow.h rename to src/core/overlaywindow.h diff --git a/src/platform.cpp b/src/core/platform.cpp similarity index 100% rename from src/platform.cpp rename to src/core/platform.cpp diff --git a/src/platform.h b/src/core/platform.h similarity index 100% rename from src/platform.h rename to src/core/platform.h diff --git a/src/renderbackend.cpp b/src/core/renderbackend.cpp similarity index 100% rename from src/renderbackend.cpp rename to src/core/renderbackend.cpp diff --git a/src/renderbackend.h b/src/core/renderbackend.h similarity index 100% rename from src/renderbackend.h rename to src/core/renderbackend.h diff --git a/src/renderjournal.cpp b/src/core/renderjournal.cpp similarity index 100% rename from src/renderjournal.cpp rename to src/core/renderjournal.cpp diff --git a/src/renderjournal.h b/src/core/renderjournal.h similarity index 100% rename from src/renderjournal.h rename to src/core/renderjournal.h diff --git a/src/renderlayer.cpp b/src/core/renderlayer.cpp similarity index 100% rename from src/renderlayer.cpp rename to src/core/renderlayer.cpp diff --git a/src/renderlayer.h b/src/core/renderlayer.h similarity index 100% rename from src/renderlayer.h rename to src/core/renderlayer.h diff --git a/src/renderlayerdelegate.cpp b/src/core/renderlayerdelegate.cpp similarity index 100% rename from src/renderlayerdelegate.cpp rename to src/core/renderlayerdelegate.cpp diff --git a/src/renderlayerdelegate.h b/src/core/renderlayerdelegate.h similarity index 100% rename from src/renderlayerdelegate.h rename to src/core/renderlayerdelegate.h diff --git a/src/renderloop.cpp b/src/core/renderloop.cpp similarity index 100% rename from src/renderloop.cpp rename to src/core/renderloop.cpp diff --git a/src/renderloop.h b/src/core/renderloop.h similarity index 100% rename from src/renderloop.h rename to src/core/renderloop.h diff --git a/src/renderloop_p.h b/src/core/renderloop_p.h similarity index 100% rename from src/renderloop_p.h rename to src/core/renderloop_p.h diff --git a/src/rendertarget.cpp b/src/core/rendertarget.cpp similarity index 100% rename from src/rendertarget.cpp rename to src/core/rendertarget.cpp diff --git a/src/rendertarget.h b/src/core/rendertarget.h similarity index 100% rename from src/rendertarget.h rename to src/core/rendertarget.h diff --git a/src/session.cpp b/src/core/session.cpp similarity index 100% rename from src/session.cpp rename to src/core/session.cpp diff --git a/src/session.h b/src/core/session.h similarity index 100% rename from src/session.h rename to src/core/session.h diff --git a/src/session_consolekit.cpp b/src/core/session_consolekit.cpp similarity index 100% rename from src/session_consolekit.cpp rename to src/core/session_consolekit.cpp diff --git a/src/session_consolekit.h b/src/core/session_consolekit.h similarity index 100% rename from src/session_consolekit.h rename to src/core/session_consolekit.h diff --git a/src/session_logind.cpp b/src/core/session_logind.cpp similarity index 100% rename from src/session_logind.cpp rename to src/core/session_logind.cpp diff --git a/src/session_logind.h b/src/core/session_logind.h similarity index 100% rename from src/session_logind.h rename to src/core/session_logind.h diff --git a/src/session_noop.cpp b/src/core/session_noop.cpp similarity index 100% rename from src/session_noop.cpp rename to src/core/session_noop.cpp diff --git a/src/session_noop.h b/src/core/session_noop.h similarity index 100% rename from src/session_noop.h rename to src/core/session_noop.h diff --git a/src/cursor.cpp b/src/cursor.cpp index 3109e81b5f..c2156a0272 100644 --- a/src/cursor.cpp +++ b/src/cursor.cpp @@ -10,11 +10,11 @@ #include "cursor.h" // kwin #include "composite.h" +#include "core/output.h" +#include "core/platform.h" #include "input.h" #include "keyboard_input.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "scene.h" #include "utils/common.h" #include "utils/xcbutils.h" diff --git a/src/cursordelegate_opengl.cpp b/src/cursordelegate_opengl.cpp index 9dcc4895bb..4c4742a252 100644 --- a/src/cursordelegate_opengl.cpp +++ b/src/cursordelegate_opengl.cpp @@ -5,11 +5,11 @@ */ #include "cursordelegate_opengl.h" +#include "core/renderlayer.h" +#include "core/rendertarget.h" #include "cursor.h" #include "kwingltexture.h" #include "kwinglutils.h" -#include "renderlayer.h" -#include "rendertarget.h" namespace KWin { diff --git a/src/cursordelegate_opengl.h b/src/cursordelegate_opengl.h index c213d5abba..f543330e2d 100644 --- a/src/cursordelegate_opengl.h +++ b/src/cursordelegate_opengl.h @@ -7,7 +7,7 @@ #pragma once #include -#include "renderlayerdelegate.h" +#include "core/renderlayerdelegate.h" namespace KWin { diff --git a/src/cursordelegate_qpainter.cpp b/src/cursordelegate_qpainter.cpp index 7e472488ca..2aa94a5bb9 100644 --- a/src/cursordelegate_qpainter.cpp +++ b/src/cursordelegate_qpainter.cpp @@ -5,9 +5,9 @@ */ #include "cursordelegate_qpainter.h" +#include "core/renderlayer.h" +#include "core/rendertarget.h" #include "cursor.h" -#include "renderlayer.h" -#include "rendertarget.h" #include diff --git a/src/cursordelegate_qpainter.h b/src/cursordelegate_qpainter.h index 47c25ba8d5..376448b96a 100644 --- a/src/cursordelegate_qpainter.h +++ b/src/cursordelegate_qpainter.h @@ -6,7 +6,7 @@ #pragma once -#include "renderlayerdelegate.h" +#include "core/renderlayerdelegate.h" namespace KWin { diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp index b16b81723c..d9391ded90 100644 --- a/src/dbusinterface.cpp +++ b/src/dbusinterface.cpp @@ -16,14 +16,14 @@ // kwin #include "atoms.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "debug_console.h" #include "kwinadaptor.h" #include "main.h" -#include "output.h" #include "placement.h" -#include "platform.h" #include "pluginmanager.h" -#include "renderbackend.h" #include "unmanaged.h" #include "virtualdesktops.h" #include "window.h" diff --git a/src/debug_console.cpp b/src/debug_console.cpp index 0596d8a467..1983fd921f 100644 --- a/src/debug_console.cpp +++ b/src/debug_console.cpp @@ -8,8 +8,8 @@ */ #include "debug_console.h" #include "composite.h" +#include "core/inputdevice.h" #include "input_event.h" -#include "inputdevice.h" #include "internalwindow.h" #include "keyboard_input.h" #include "main.h" diff --git a/src/decorationitem.cpp b/src/decorationitem.cpp index 99be0daeeb..3f2f71dcc5 100644 --- a/src/decorationitem.cpp +++ b/src/decorationitem.cpp @@ -7,9 +7,9 @@ #include "decorationitem.h" #include "composite.h" +#include "core/output.h" #include "decorations/decoratedclient.h" #include "deleted.h" -#include "output.h" #include "scene.h" #include "utils/common.h" #include "window.h" diff --git a/src/dpmsinputeventfilter.cpp b/src/dpmsinputeventfilter.cpp index c0f0c4d860..b1830f1c30 100644 --- a/src/dpmsinputeventfilter.cpp +++ b/src/dpmsinputeventfilter.cpp @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "dpmsinputeventfilter.h" +#include "core/output.h" +#include "core/platform.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "wayland/seat_interface.h" #include "wayland_server.h" #include "workspace.h" diff --git a/src/effects.cpp b/src/effects.cpp index bf14009bbd..637be1f991 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -12,12 +12,14 @@ #include +#include "core/output.h" #include "effectloader.h" #include "effectsadaptor.h" -#include "output.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif +#include "core/renderbackend.h" +#include "core/renderlayer.h" #include "cursor.h" #include "deleted.h" #include "group.h" @@ -25,8 +27,6 @@ #include "internalwindow.h" #include "osd.h" #include "pointer_input.h" -#include "renderbackend.h" -#include "renderlayer.h" #include "unmanaged.h" #include "x11window.h" #if KWIN_BUILD_TABBOX @@ -38,11 +38,11 @@ #include "screenlockerwatcher.h" #endif #include "composite.h" +#include "core/platform.h" #include "decorations/decorationbridge.h" #include "inputmethod.h" #include "inputpanelv1window.h" #include "kwinglutils.h" -#include "platform.h" #include "utils/xcbutils.h" #include "virtualdesktops.h" #include "wayland_server.h" diff --git a/src/hide_cursor_spy.cpp b/src/hide_cursor_spy.cpp index e335c6061b..4f84c9e512 100644 --- a/src/hide_cursor_spy.cpp +++ b/src/hide_cursor_spy.cpp @@ -7,10 +7,10 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "hide_cursor_spy.h" +#include "core/platform.h" #include "cursor.h" #include "input_event.h" #include "main.h" -#include "platform.h" namespace KWin { diff --git a/src/input.cpp b/src/input.cpp index b6e91c1582..4963c9386e 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -13,6 +13,8 @@ #include "backends/fakeinput/fakeinputbackend.h" #include "backends/libinput/connection.h" #include "backends/libinput/device.h" +#include "core/inputbackend.h" +#include "core/session.h" #include "effects.h" #include "gestures.h" #include "globalshortcuts.h" @@ -20,23 +22,21 @@ #include "idledetector.h" #include "input_event.h" #include "input_event_spy.h" -#include "inputbackend.h" #include "inputmethod.h" #include "keyboard_input.h" #include "main.h" #include "mousebuttons.h" #include "pointer_input.h" -#include "session.h" #include "tablet_input.h" #include "touch_input.h" #include "x11window.h" #if KWIN_BUILD_TABBOX #include "tabbox/tabbox.h" #endif +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "internalwindow.h" -#include "output.h" -#include "platform.h" #include "popup_input_filter.h" #include "screenedge.h" #include "screens.h" diff --git a/src/inputpanelv1window.cpp b/src/inputpanelv1window.cpp index 751dd4548c..81154b33eb 100644 --- a/src/inputpanelv1window.cpp +++ b/src/inputpanelv1window.cpp @@ -8,10 +8,10 @@ */ #include "inputpanelv1window.h" +#include "core/output.h" +#include "core/platform.h" #include "deleted.h" #include "inputmethod.h" -#include "output.h" -#include "platform.h" #include "wayland/output_interface.h" #include "wayland/seat_interface.h" #include "wayland/surface_interface.h" diff --git a/src/internalwindow.cpp b/src/internalwindow.cpp index 41cc622a1d..9f44bf51db 100644 --- a/src/internalwindow.cpp +++ b/src/internalwindow.cpp @@ -8,9 +8,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "internalwindow.h" +#include "core/platform.h" #include "decorations/decorationbridge.h" #include "deleted.h" -#include "platform.h" #include "surfaceitem.h" #include "windowitem.h" #include "workspace.h" diff --git a/src/item.cpp b/src/item.cpp index 4ac2365711..062eb6f39b 100644 --- a/src/item.cpp +++ b/src/item.cpp @@ -6,10 +6,10 @@ #include "item.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderloop.h" #include "main.h" -#include "output.h" -#include "platform.h" -#include "renderloop.h" #include "scene.h" #include "utils/common.h" #include "workspace.h" diff --git a/src/keyboard_layout.cpp b/src/keyboard_layout.cpp index 230001c675..02057da353 100644 --- a/src/keyboard_layout.cpp +++ b/src/keyboard_layout.cpp @@ -7,11 +7,11 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "keyboard_layout.h" +#include "core/platform.h" #include "input_event.h" #include "keyboard_input.h" #include "keyboard_layout_switching.h" #include "main.h" -#include "platform.h" #include #include diff --git a/src/killwindow.cpp b/src/killwindow.cpp index 77cfc6a7db..a079b5cc93 100644 --- a/src/killwindow.cpp +++ b/src/killwindow.cpp @@ -9,9 +9,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "killwindow.h" +#include "core/platform.h" #include "main.h" #include "osd.h" -#include "platform.h" #include "unmanaged.h" #include "window.h" diff --git a/src/layershellv1integration.cpp b/src/layershellv1integration.cpp index f9cd45ef3d..fd14df1157 100644 --- a/src/layershellv1integration.cpp +++ b/src/layershellv1integration.cpp @@ -5,9 +5,9 @@ */ #include "layershellv1integration.h" +#include "core/output.h" +#include "core/platform.h" #include "layershellv1window.h" -#include "output.h" -#include "platform.h" #include "wayland/display.h" #include "wayland/layershell_v1_interface.h" #include "wayland/output_interface.h" diff --git a/src/layershellv1window.cpp b/src/layershellv1window.cpp index d851295e85..93bf4f04af 100644 --- a/src/layershellv1window.cpp +++ b/src/layershellv1window.cpp @@ -5,9 +5,9 @@ */ #include "layershellv1window.h" +#include "core/output.h" #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" diff --git a/src/main.cpp b/src/main.cpp index 88f58336ad..c66c9f2e3c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,16 +14,16 @@ #include "atoms.h" #include "colormanager.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "input.h" #include "inputmethod.h" #include "options.h" -#include "platform.h" #include "pluginmanager.h" #if KWIN_BUILD_SCREENLOCKER #include "screenlockerwatcher.h" #endif -#include "session.h" +#include "core/session.h" #include "sm.h" #include "tabletmodemanager.h" #include "utils/xcbutils.h" diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp index 142141d420..944512670d 100644 --- a/src/main_wayland.cpp +++ b/src/main_wayland.cpp @@ -15,10 +15,10 @@ #include "backends/wayland/wayland_backend.h" #include "backends/x11/windowed/x11_windowed_backend.h" #include "composite.h" +#include "core/platform.h" +#include "core/session.h" #include "effects.h" #include "inputmethod.h" -#include "platform.h" -#include "session.h" #include "tabletmodemanager.h" #include "utils/realtime.h" #include "wayland/display.h" diff --git a/src/main_x11.cpp b/src/main_x11.cpp index 4aaaab23d4..f80d8917b3 100644 --- a/src/main_x11.cpp +++ b/src/main_x11.cpp @@ -13,8 +13,8 @@ #include #include "backends/x11/standalone/x11_standalone_platform.h" -#include "platform.h" -#include "session.h" +#include "core/platform.h" +#include "core/session.h" #include "sm.h" #include "tabletmodemanager.h" #include "utils/xcbutils.h" diff --git a/src/options.cpp b/src/options.cpp index b8be19d389..fdecb55b8a 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -12,7 +12,7 @@ #include "config-kwin.h" -#include "platform.h" +#include "core/platform.h" #include "utils/common.h" #ifndef KCMRULES diff --git a/src/outline.cpp b/src/outline.cpp index bf9d89bdf6..e81f1af27e 100644 --- a/src/outline.cpp +++ b/src/outline.cpp @@ -11,8 +11,8 @@ #include "outline.h" // KWin #include "composite.h" +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "scripting/scripting.h" #include "utils/common.h" // Frameworks diff --git a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp index 9ae7c952c0..1934f8c5c8 100644 --- a/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp +++ b/src/platformsupport/scenes/opengl/abstract_egl_backend.cpp @@ -8,15 +8,15 @@ */ #include "abstract_egl_backend.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "dmabuftexture.h" #include "egl_dmabuf.h" #include "options.h" -#include "output.h" -#include "platform.h" #include "utils/common.h" #include "utils/egl_context_attribute_builder.h" #include "wayland/display.h" #include "wayland_server.h" -#include "dmabuftexture.h" // kwin libs #include #include diff --git a/src/platformsupport/scenes/opengl/openglbackend.h b/src/platformsupport/scenes/opengl/openglbackend.h index 5033fd1ca4..0e2f2c0e3c 100644 --- a/src/platformsupport/scenes/opengl/openglbackend.h +++ b/src/platformsupport/scenes/opengl/openglbackend.h @@ -10,7 +10,7 @@ #ifndef KWIN_SCENE_OPENGL_BACKEND_H #define KWIN_SCENE_OPENGL_BACKEND_H -#include "renderbackend.h" +#include "core/renderbackend.h" #include #include diff --git a/src/platformsupport/scenes/qpainter/qpainterbackend.h b/src/platformsupport/scenes/qpainter/qpainterbackend.h index b1ad56e317..c39b76f62a 100644 --- a/src/platformsupport/scenes/qpainter/qpainterbackend.h +++ b/src/platformsupport/scenes/qpainter/qpainterbackend.h @@ -9,7 +9,7 @@ #ifndef KWIN_SCENE_QPAINTER_BACKEND_H #define KWIN_SCENE_QPAINTER_BACKEND_H -#include "renderbackend.h" +#include "core/renderbackend.h" #include diff --git a/src/plugins/buttonrebinds/buttonrebindsfilter.h b/src/plugins/buttonrebinds/buttonrebindsfilter.h index eb88323307..5903ae491d 100644 --- a/src/plugins/buttonrebinds/buttonrebindsfilter.h +++ b/src/plugins/buttonrebinds/buttonrebindsfilter.h @@ -8,8 +8,8 @@ #include "plugin.h" +#include "core/inputdevice.h" #include "input.h" -#include "inputdevice.h" class InputDevice : public KWin::InputDevice { diff --git a/src/plugins/colord-integration/colorddevice.cpp b/src/plugins/colord-integration/colorddevice.cpp index c51a66b98d..fb6a00bad7 100644 --- a/src/plugins/colord-integration/colorddevice.cpp +++ b/src/plugins/colord-integration/colorddevice.cpp @@ -9,7 +9,7 @@ #include "colordlogging.h" #include "colordprofileinterface.h" #include "colormanager.h" -#include "output.h" +#include "core/output.h" namespace KWin { diff --git a/src/plugins/colord-integration/colordintegration.cpp b/src/plugins/colord-integration/colordintegration.cpp index ee1fa6ee8f..2e1fe126a8 100644 --- a/src/plugins/colord-integration/colordintegration.cpp +++ b/src/plugins/colord-integration/colordintegration.cpp @@ -7,7 +7,7 @@ #include "colordintegration.h" #include "colorddevice.h" #include "colordlogging.h" -#include "output.h" +#include "core/output.h" #include "workspace.h" #include diff --git a/src/plugins/nightcolor/nightcolormanager.cpp b/src/plugins/nightcolor/nightcolormanager.cpp index 7d7e310480..2e51836d0c 100644 --- a/src/plugins/nightcolor/nightcolormanager.cpp +++ b/src/plugins/nightcolor/nightcolormanager.cpp @@ -15,10 +15,10 @@ #include "nightcolorsettings.h" #include "suncalc.h" +#include +#include #include #include -#include -#include #include #include diff --git a/src/plugins/qpa/eglplatformcontext.cpp b/src/plugins/qpa/eglplatformcontext.cpp index d2ebda7d76..542c330472 100644 --- a/src/plugins/qpa/eglplatformcontext.cpp +++ b/src/plugins/qpa/eglplatformcontext.cpp @@ -9,10 +9,10 @@ */ #include "eglplatformcontext.h" +#include "core/platform.h" #include "eglhelpers.h" #include "internalwindow.h" #include "offscreensurface.h" -#include "platform.h" #include "utils/egl_context_attribute_builder.h" #include "window.h" diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp index 46d14cc056..79b88b8698 100644 --- a/src/plugins/qpa/integration.cpp +++ b/src/plugins/qpa/integration.cpp @@ -15,9 +15,9 @@ #include "screen.h" #include "window.h" +#include "core/output.h" +#include "core/platform.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "workspace.h" #include diff --git a/src/plugins/qpa/offscreensurface.cpp b/src/plugins/qpa/offscreensurface.cpp index 2c354b5efa..68c8ab5f60 100644 --- a/src/plugins/qpa/offscreensurface.cpp +++ b/src/plugins/qpa/offscreensurface.cpp @@ -8,9 +8,9 @@ */ #include "offscreensurface.h" +#include "core/platform.h" #include "eglhelpers.h" #include "main.h" -#include "platform.h" #include diff --git a/src/plugins/qpa/screen.cpp b/src/plugins/qpa/screen.cpp index 77671c1e9b..34a206c248 100644 --- a/src/plugins/qpa/screen.cpp +++ b/src/plugins/qpa/screen.cpp @@ -7,9 +7,9 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "screen.h" +#include "core/output.h" #include "integration.h" #include "logging.h" -#include "output.h" #include "platformcursor.h" #include diff --git a/src/plugins/qpa/window.cpp b/src/plugins/qpa/window.cpp index 3d0aebd1b7..b8a1fe7b9c 100644 --- a/src/plugins/qpa/window.cpp +++ b/src/plugins/qpa/window.cpp @@ -8,8 +8,8 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "window.h" +#include "core/platform.h" #include "eglhelpers.h" -#include "platform.h" #include "internalwindow.h" diff --git a/src/plugins/screencast/outputscreencastsource.cpp b/src/plugins/screencast/outputscreencastsource.cpp index 9b2cd7e44c..e2f41e3271 100644 --- a/src/plugins/screencast/outputscreencastsource.cpp +++ b/src/plugins/screencast/outputscreencastsource.cpp @@ -8,10 +8,10 @@ #include "screencastutils.h" #include "composite.h" +#include "core/output.h" +#include "core/renderloop.h" #include "kwingltexture.h" #include "kwinglutils.h" -#include "output.h" -#include "renderloop.h" #include "scene.h" namespace KWin diff --git a/src/plugins/screencast/regionscreencastsource.cpp b/src/plugins/screencast/regionscreencastsource.cpp index a03e335427..71b67bb0aa 100644 --- a/src/plugins/screencast/regionscreencastsource.cpp +++ b/src/plugins/screencast/regionscreencastsource.cpp @@ -8,9 +8,9 @@ #include "screencastutils.h" #include +#include #include #include -#include #include #include diff --git a/src/plugins/screencast/screencastmanager.cpp b/src/plugins/screencast/screencastmanager.cpp index 19aecef285..58a2181b89 100644 --- a/src/plugins/screencast/screencastmanager.cpp +++ b/src/plugins/screencast/screencastmanager.cpp @@ -8,12 +8,12 @@ #include "screencastmanager.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" #include "deleted.h" #include "effects.h" #include "kwingltexture.h" -#include "output.h" #include "outputscreencastsource.h" -#include "platform.h" #include "regionscreencastsource.h" #include "scene.h" #include "screencaststream.h" diff --git a/src/plugins/screencast/screencaststream.cpp b/src/plugins/screencast/screencaststream.cpp index 2bf9330cdd..92b3f53a92 100644 --- a/src/plugins/screencast/screencaststream.cpp +++ b/src/plugins/screencast/screencaststream.cpp @@ -8,6 +8,7 @@ #include "screencaststream.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "dmabuftexture.h" #include "eglnativefence.h" @@ -18,7 +19,6 @@ #include "kwinscreencast_logging.h" #include "main.h" #include "pipewirecore.h" -#include "platform.h" #include "scene.h" #include "screencastsource.h" #include "utils/common.h" diff --git a/src/plugins/screencast/windowscreencastsource.cpp b/src/plugins/screencast/windowscreencastsource.cpp index 78c7c08c91..080ad57a4d 100644 --- a/src/plugins/screencast/windowscreencastsource.cpp +++ b/src/plugins/screencast/windowscreencastsource.cpp @@ -8,13 +8,13 @@ #include "screencastutils.h" #include "composite.h" +#include "core/output.h" +#include "core/renderloop.h" #include "deleted.h" #include "effects.h" #include "kwineffects.h" #include "kwingltexture.h" #include "kwinglutils.h" -#include "output.h" -#include "renderloop.h" #include "scene.h" #include "window.h" #include "windowitem.h" diff --git a/src/pointer_input.cpp b/src/pointer_input.cpp index 666773c14b..2de29c26e6 100644 --- a/src/pointer_input.cpp +++ b/src/pointer_input.cpp @@ -12,14 +12,14 @@ #include +#include "core/output.h" +#include "core/platform.h" #include "decorations/decoratedclient.h" #include "effects.h" #include "input_event.h" #include "input_event_spy.h" #include "mousebuttons.h" #include "osd.h" -#include "output.h" -#include "platform.h" #include "screens.h" #include "wayland/datadevice_interface.h" #include "wayland/display.h" diff --git a/src/rules.cpp b/src/rules.cpp index d8daa2c34b..2c3a8944d9 100644 --- a/src/rules.cpp +++ b/src/rules.cpp @@ -20,8 +20,8 @@ #ifndef KCMRULES #include "client_machine.h" +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "virtualdesktops.h" #include "window.h" #include "workspace.h" diff --git a/src/scene.cpp b/src/scene.cpp index b9e1881e13..96c010ec90 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -54,13 +54,13 @@ #include "scene.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" +#include "core/renderlayer.h" +#include "core/renderloop.h" #include "deleted.h" #include "effects.h" #include "internalwindow.h" -#include "output.h" -#include "platform.h" -#include "renderlayer.h" -#include "renderloop.h" #include "shadow.h" #include "shadowitem.h" #include "surfaceitem.h" diff --git a/src/scene.h b/src/scene.h index 0662159829..fd4a5ade89 100644 --- a/src/scene.h +++ b/src/scene.h @@ -10,8 +10,8 @@ #ifndef KWIN_SCENE_H #define KWIN_SCENE_H +#include "core/renderlayerdelegate.h" #include "kwineffects.h" -#include "renderlayerdelegate.h" #include "utils/common.h" #include "window.h" diff --git a/src/scenes/opengl/scene_opengl.cpp b/src/scenes/opengl/scene_opengl.cpp index d8cae6a000..bc9e6bd302 100644 --- a/src/scenes/opengl/scene_opengl.cpp +++ b/src/scenes/opengl/scene_opengl.cpp @@ -18,10 +18,10 @@ #include #include "composite.h" +#include "core/output.h" #include "decorations/decoratedclient.h" #include "effects.h" #include "main.h" -#include "output.h" #include "shadowitem.h" #include "surfaceitem.h" #include "utils/common.h" diff --git a/src/scenes/qpainter/scene_qpainter.cpp b/src/scenes/qpainter/scene_qpainter.cpp index 502dca6191..282ab880d8 100644 --- a/src/scenes/qpainter/scene_qpainter.cpp +++ b/src/scenes/qpainter/scene_qpainter.cpp @@ -9,9 +9,9 @@ #include "scene_qpainter.h" #include "qpaintersurfacetexture.h" // KWin +#include "core/output.h" #include "decorations/decoratedclient.h" #include "effects.h" -#include "output.h" #include "surfaceitem.h" #include "window.h" #include "windowitem.h" diff --git a/src/screenedge.cpp b/src/screenedge.cpp index 4fac6aab54..36a590b40e 100644 --- a/src/screenedge.cpp +++ b/src/screenedge.cpp @@ -20,12 +20,12 @@ #include +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "effects.h" #include "gestures.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "utils/common.h" #include "virtualdesktops.h" #include diff --git a/src/screens.cpp b/src/screens.cpp index 9bdff7a2df..0d58e6fa1c 100644 --- a/src/screens.cpp +++ b/src/screens.cpp @@ -10,9 +10,9 @@ #include +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" -#include "output.h" -#include "platform.h" #include "settings.h" #include "utils/common.h" #include diff --git a/src/scripting/desktopbackgrounditem.cpp b/src/scripting/desktopbackgrounditem.cpp index 5245aa12f2..712a153d84 100644 --- a/src/scripting/desktopbackgrounditem.cpp +++ b/src/scripting/desktopbackgrounditem.cpp @@ -5,13 +5,13 @@ */ #include "desktopbackgrounditem.h" -#include "output.h" +#include "core/output.h" #include "window.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif +#include "core/platform.h" #include "main.h" -#include "platform.h" #include "scripting_logging.h" #include "virtualdesktops.h" #include "workspace.h" diff --git a/src/scripting/v2/clientmodel.cpp b/src/scripting/v2/clientmodel.cpp index 88902e0fec..d75af0a69d 100644 --- a/src/scripting/v2/clientmodel.cpp +++ b/src/scripting/v2/clientmodel.cpp @@ -13,7 +13,7 @@ #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif -#include "output.h" +#include "core/output.h" #include "virtualdesktops.h" #include "window.h" #include "workspace.h" diff --git a/src/scripting/v3/clientmodel.cpp b/src/scripting/v3/clientmodel.cpp index 01241ff519..93bdb09fe9 100644 --- a/src/scripting/v3/clientmodel.cpp +++ b/src/scripting/v3/clientmodel.cpp @@ -5,8 +5,8 @@ */ #include "clientmodel.h" -#include "output.h" -#include "platform.h" +#include "core/output.h" +#include "core/platform.h" #include "virtualdesktops.h" #include "window.h" #include "workspace.h" diff --git a/src/scripting/windowthumbnailitem.cpp b/src/scripting/windowthumbnailitem.cpp index d8093091fc..ba639f74d1 100644 --- a/src/scripting/windowthumbnailitem.cpp +++ b/src/scripting/windowthumbnailitem.cpp @@ -8,8 +8,8 @@ #include "windowthumbnailitem.h" #include "composite.h" +#include "core/renderbackend.h" #include "effects.h" -#include "renderbackend.h" #include "scene.h" #include "scripting_logging.h" #include "virtualdesktops.h" diff --git a/src/scripting/workspace_wrapper.cpp b/src/scripting/workspace_wrapper.cpp index 020d2ccd13..2da0b8894a 100644 --- a/src/scripting/workspace_wrapper.cpp +++ b/src/scripting/workspace_wrapper.cpp @@ -9,9 +9,9 @@ */ #include "workspace_wrapper.h" +#include "core/output.h" +#include "core/platform.h" #include "outline.h" -#include "output.h" -#include "platform.h" #include "virtualdesktops.h" #include "workspace.h" #include "x11window.h" diff --git a/src/tabbox/switcheritem.cpp b/src/tabbox/switcheritem.cpp index 6d8e204d84..ae52ad4388 100644 --- a/src/tabbox/switcheritem.cpp +++ b/src/tabbox/switcheritem.cpp @@ -9,7 +9,7 @@ #include "switcheritem.h" // KWin #include "composite.h" -#include "output.h" +#include "core/output.h" #include "screens.h" #include "tabboxhandler.h" #include "workspace.h" diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp index 9f56832dd8..e6c92565d6 100644 --- a/src/tabbox/tabbox.cpp +++ b/src/tabbox/tabbox.cpp @@ -24,11 +24,11 @@ #include "activities.h" #endif #include "composite.h" +#include "core/platform.h" #include "effects.h" #include "focuschain.h" #include "input.h" #include "keyboard_input.h" -#include "platform.h" #include "pointer_input.h" #include "screenedge.h" #include "unmanaged.h" diff --git a/src/tabletmodemanager.cpp b/src/tabletmodemanager.cpp index 4e2f224239..ce93eca68d 100644 --- a/src/tabletmodemanager.cpp +++ b/src/tabletmodemanager.cpp @@ -7,12 +7,12 @@ #include "tabletmodemanager.h" -#include "backends/libinput/device.h" #include "backends/fakeinput/fakeinputdevice.h" +#include "backends/libinput/device.h" +#include "core/inputdevice.h" #include "input.h" #include "input_event.h" #include "input_event_spy.h" -#include "inputdevice.h" #include "main.h" #include "wayland_server.h" diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp index eab3d6ee7d..d6a743d38b 100644 --- a/src/unmanaged.cpp +++ b/src/unmanaged.cpp @@ -9,9 +9,9 @@ #include "unmanaged.h" +#include "core/platform.h" #include "deleted.h" #include "effects.h" -#include "platform.h" #include "surfaceitem_x11.h" #include "utils/common.h" #include "wayland/surface_interface.h" diff --git a/src/useractions.cpp b/src/useractions.cpp index c3d479ee46..b54116473f 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -24,14 +24,14 @@ #include -#include "useractions.h" #include "composite.h" +#include "core/output.h" +#include "core/platform.h" #include "cursor.h" #include "effects.h" #include "input.h" -#include "output.h" -#include "platform.h" #include "scripting/scripting.h" +#include "useractions.h" #include "virtualdesktops.h" #include "workspace.h" #include "x11window.h" diff --git a/src/utils/common.cpp b/src/utils/common.cpp index c25d166ae9..e064780932 100644 --- a/src/utils/common.cpp +++ b/src/utils/common.cpp @@ -25,7 +25,7 @@ #include #include "atoms.h" -#include "platform.h" +#include "core/platform.h" #include "workspace.h" #include diff --git a/src/wayland/output_interface.cpp b/src/wayland/output_interface.cpp index 5b5a8c4f8a..2494db56e7 100644 --- a/src/wayland/output_interface.cpp +++ b/src/wayland/output_interface.cpp @@ -9,7 +9,7 @@ #include "display_p.h" #include "utils.h" -#include "output.h" +#include "core/output.h" #include "qwayland-server-wayland.h" diff --git a/src/wayland/output_interface.h b/src/wayland/output_interface.h index 5999a8a035..c845225410 100644 --- a/src/wayland/output_interface.h +++ b/src/wayland/output_interface.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/output.h" #include "kwin_export.h" -#include "output.h" #include #include diff --git a/src/wayland/outputdevice_v2_interface.cpp b/src/wayland/outputdevice_v2_interface.cpp index 868b682dc0..788f6cba55 100644 --- a/src/wayland/outputdevice_v2_interface.cpp +++ b/src/wayland/outputdevice_v2_interface.cpp @@ -11,7 +11,7 @@ #include "utils.h" #include "utils/common.h" -#include "output.h" +#include "core/output.h" #include #include diff --git a/src/wayland/outputmanagement_v2_interface.cpp b/src/wayland/outputmanagement_v2_interface.cpp index faef084585..8d6e96d15a 100644 --- a/src/wayland/outputmanagement_v2_interface.cpp +++ b/src/wayland/outputmanagement_v2_interface.cpp @@ -10,9 +10,9 @@ #include "outputmanagement_v2_interface.h" #include "utils/common.h" +#include "core/outputconfiguration.h" +#include "core/platform.h" #include "main.h" -#include "outputconfiguration.h" -#include "platform.h" #include "screens.h" #include "workspace.h" diff --git a/src/wayland/tests/fakeoutput.h b/src/wayland/tests/fakeoutput.h index 2cfadcf94d..3ae080c1e6 100644 --- a/src/wayland/tests/fakeoutput.h +++ b/src/wayland/tests/fakeoutput.h @@ -8,7 +8,7 @@ */ #pragma once -#include "output.h" +#include "core/output.h" class FakeOutput : public KWin::Output { diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp index 003f4d75d2..2f20905a23 100644 --- a/src/wayland_server.cpp +++ b/src/wayland_server.cpp @@ -11,13 +11,13 @@ #include #include "composite.h" +#include "core/output.h" +#include "core/platform.h" #include "idle_inhibition.h" #include "inputpanelv1integration.h" #include "keyboard_input.h" #include "layershellv1integration.h" #include "main.h" -#include "output.h" -#include "platform.h" #include "scene.h" #include "unmanaged.h" #include "utils/serviceutils.h" diff --git a/src/waylandoutput.h b/src/waylandoutput.h index 75e2835764..6ad70bb50b 100644 --- a/src/waylandoutput.h +++ b/src/waylandoutput.h @@ -6,7 +6,7 @@ #pragma once -#include "output.h" +#include "core/output.h" #include "wayland/output_interface.h" #include "wayland/utils.h" #include "wayland/xdgoutput_v1_interface.h" diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp index 4183f3092b..56bb4b8c8a 100644 --- a/src/waylandwindow.cpp +++ b/src/waylandwindow.cpp @@ -7,7 +7,7 @@ */ #include "waylandwindow.h" -#include "platform.h" +#include "core/platform.h" #include "screens.h" #include "wayland/clientbuffer.h" #include "wayland/clientconnection.h" diff --git a/src/window.cpp b/src/window.cpp index df62bd2870..874b262d78 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -9,7 +9,7 @@ */ #include "window.h" -#include "output.h" +#include "core/output.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif @@ -17,6 +17,7 @@ #include "atoms.h" #include "client_machine.h" #include "composite.h" +#include "core/platform.h" #include "decorations/decoratedclient.h" #include "decorations/decorationbridge.h" #include "decorations/decorationpalette.h" @@ -24,7 +25,6 @@ #include "focuschain.h" #include "outline.h" #include "placement.h" -#include "platform.h" #if KWIN_BUILD_TABBOX #include "tabbox.h" #endif diff --git a/src/workspace.cpp b/src/workspace.cpp index 444d4a91a3..ba9e2f9d48 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -13,13 +13,15 @@ // kwin libs #include // kwin -#include "output.h" +#include "core/output.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif #include "appmenu.h" #include "atoms.h" #include "composite.h" +#include "core/outputconfiguration.h" +#include "core/platform.h" #include "cursor.h" #include "dbusinterface.h" #include "deleted.h" @@ -32,9 +34,7 @@ #include "moving_client_x11_filter.h" #include "netinfo.h" #include "outline.h" -#include "outputconfiguration.h" #include "placement.h" -#include "platform.h" #include "pluginmanager.h" #include "rules.h" #include "screenedge.h" diff --git a/src/x11syncmanager.cpp b/src/x11syncmanager.cpp index 65c59ec15d..04cce69469 100644 --- a/src/x11syncmanager.cpp +++ b/src/x11syncmanager.cpp @@ -8,9 +8,9 @@ */ #include "x11syncmanager.h" #include "composite.h" +#include "core/platform.h" +#include "core/renderbackend.h" #include "main.h" -#include "platform.h" -#include "renderbackend.h" #include "scene.h" #include "utils/common.h" diff --git a/src/x11window.cpp b/src/x11window.cpp index c122765ee3..e8d8deec45 100644 --- a/src/x11window.cpp +++ b/src/x11window.cpp @@ -10,13 +10,14 @@ // own #include "x11window.h" // kwin -#include "output.h" +#include "core/output.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif #include "atoms.h" #include "client_machine.h" #include "composite.h" +#include "core/platform.h" #include "cursor.h" #include "decorations/decoratedclient.h" #include "decorations/decorationbridge.h" @@ -26,7 +27,6 @@ #include "group.h" #include "netinfo.h" #include "placement.h" -#include "platform.h" #include "screenedge.h" #include "shadow.h" #include "surfaceitem_x11.h" diff --git a/src/xdgshellwindow.cpp b/src/xdgshellwindow.cpp index 9c0b70560c..3954de6dcf 100644 --- a/src/xdgshellwindow.cpp +++ b/src/xdgshellwindow.cpp @@ -9,14 +9,13 @@ SPDX-License-Identifier: GPL-2.0-or-later */ #include "xdgshellwindow.h" -#include "output.h" +#include "core/output.h" #if KWIN_BUILD_ACTIVITIES #include "activities.h" #endif #include "decorations/decorationbridge.h" #include "deleted.h" #include "placement.h" -#include "platform.h" #include "screenedge.h" #include "touch_input.h" #include "utils/subsurfacemonitor.h" diff --git a/src/xwayland/xwayland.cpp b/src/xwayland/xwayland.cpp index 78de5845d1..d515d62d3c 100644 --- a/src/xwayland/xwayland.cpp +++ b/src/xwayland/xwayland.cpp @@ -18,9 +18,9 @@ #include "xwaylandlauncher.h" #include "xwldrophandler.h" +#include "core/output.h" +#include "core/platform.h" #include "main_wayland.h" -#include "output.h" -#include "platform.h" #include "utils/common.h" #include "utils/xcbutils.h" #include "wayland_server.h"