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

@@ -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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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)
 

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

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

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
 {

src/backends/drm/drm_abstract_output.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "output.h"
+#include "core/output.h"
 
 namespace KWin
 {

src/backends/drm/drm_backend.cpp

@@ -11,6 +11,9 @@
 #include <config-kwin.h>
 
 #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 <KCoreAddons>

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"
 

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"

src/backends/drm/drm_egl_layer_surface.h

@@ -13,8 +13,8 @@
 #include <QRegion>
 #include <optional>
 
+#include "core/outputlayer.h"
 #include "drm_object_plane.h"
-#include "outputlayer.h"
 
 namespace KWaylandServer
 {

src/backends/drm/drm_gpu.cpp

@@ -11,6 +11,8 @@
 #include <config-kwin.h>
 
 #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

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 <QRegion>
 #include <memory>

src/backends/drm/drm_object_connector.h

@@ -14,9 +14,9 @@
 
 #include <QSize>
 
+#include "core/output.h"
 #include "drm_object.h"
 #include "drm_pointer.h"
-#include "output.h"
 #include "utils/edid.h"
 
 namespace KWin

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 <QCryptographicHash>

src/backends/drm/drm_pipeline.cpp

@@ -11,6 +11,7 @@
 
 #include <errno.h>
 
+#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 <drm_fourcc.h>
 #include <gbm.h>

src/backends/drm/drm_pipeline.h

@@ -16,10 +16,10 @@
 #include <chrono>
 #include <xf86drmMode.h>
 
-#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
 {

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 <drm_fourcc.h>
 

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

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 <QObject>
 #include <QRect>

src/backends/fakeinput/fakeinputbackend.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "inputbackend.h"
+#include "core/inputbackend.h"
 
 namespace KWin
 {

src/backends/fakeinput/fakeinputdevice.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "inputdevice.h"
+#include "core/inputdevice.h"
 
 namespace KWaylandServer
 {

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"
 

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 <fcntl.h>

src/backends/libinput/device.cpp

@@ -10,11 +10,11 @@
 
 #include <config-kwin.h>
 
+#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 <QDBusArgument>

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 <libinput.h>
 

src/backends/libinput/libinputbackend.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "inputbackend.h"
+#include "core/inputbackend.h"
 
 #include <QThread>
 

src/backends/virtual/virtual_backend.h

@@ -8,7 +8,7 @@
 */
 #pragma once
 
-#include "platform.h"
+#include "core/platform.h"
 
 #include <kwin_export.h>