From 293b2244ac43a2aef37533b3e6972da179c95d6b Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Thu, 13 Jan 2022 15:54:03 +0200 Subject: [PATCH] Move xcbutils to utils directory --- autotests/integration/activities_test.cpp | 2 +- autotests/integration/debug_console_test.cpp | 2 +- autotests/integration/desktop_window_x11_test.cpp | 2 +- autotests/integration/kwin_wayland_test.cpp | 2 +- autotests/test_client_machine.cpp | 2 +- autotests/test_xcb_size_hints.cpp | 2 +- autotests/test_xcb_window.cpp | 2 +- autotests/test_xcb_wrapper.cpp | 2 +- src/CMakeLists.txt | 2 +- src/atoms.h | 2 +- src/backends/x11/common/eglonxbackend.cpp | 2 +- src/backends/x11/standalone/edge.h | 2 +- src/backends/x11/standalone/effects_x11.h | 2 +- src/backends/x11/standalone/glxbackend.cpp | 2 +- src/backends/x11/standalone/non_composited_outline.h | 2 +- src/backends/x11/standalone/overlaywindow_x11.cpp | 2 +- src/backends/x11/standalone/windowselector.cpp | 2 +- src/backends/x11/standalone/x11_platform.cpp | 2 +- src/backends/x11/standalone/x11cursor.cpp | 2 +- src/backends/x11/standalone/xfixes_cursor_event_filter.cpp | 2 +- src/backends/x11/windowed/x11windowed_backend.cpp | 2 +- src/composite.cpp | 2 +- src/cursor.cpp | 2 +- src/effects.cpp | 2 +- src/events.cpp | 2 +- src/main.cpp | 2 +- src/main_x11.cpp | 2 +- src/scenes/opengl/lanczosfilter.cpp | 4 ---- src/syncalarmx11filter.cpp | 2 +- src/tabbox/tabbox.cpp | 2 +- src/tabbox/tabboxhandler.cpp | 2 +- src/toplevel.h | 2 +- src/unmanaged.cpp | 1 - src/utils/CMakeLists.txt | 3 +++ src/{ => utils}/xcbutils.cpp | 2 +- src/{ => utils}/xcbutils.h | 0 src/workspace.cpp | 2 +- src/x11client.h | 2 +- src/xwl/selection.cpp | 2 +- src/xwl/xwayland.cpp | 2 +- tests/screenedgeshowtest.cpp | 2 +- tests/x11shadowreader.cpp | 2 +- 42 files changed, 41 insertions(+), 43 deletions(-) create mode 100644 src/utils/CMakeLists.txt rename src/{ => utils}/xcbutils.cpp (99%) rename src/{ => utils}/xcbutils.h (100%) diff --git a/autotests/integration/activities_test.cpp b/autotests/integration/activities_test.cpp index 1f258bf32a..4d723696d6 100644 --- a/autotests/integration/activities_test.cpp +++ b/autotests/integration/activities_test.cpp @@ -17,7 +17,7 @@ #include "screens.h" #include "wayland_server.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/autotests/integration/debug_console_test.cpp b/autotests/integration/debug_console_test.cpp index 3ce47486c0..21de7bdf2c 100644 --- a/autotests/integration/debug_console_test.cpp +++ b/autotests/integration/debug_console_test.cpp @@ -15,7 +15,7 @@ #include "screens.h" #include "wayland_server.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/autotests/integration/desktop_window_x11_test.cpp b/autotests/integration/desktop_window_x11_test.cpp index 262ca8dae3..45a77b1c93 100644 --- a/autotests/integration/desktop_window_x11_test.cpp +++ b/autotests/integration/desktop_window_x11_test.cpp @@ -17,7 +17,7 @@ #include "screens.h" #include "wayland_server.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/autotests/integration/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp index 4d4e79d903..c23f8fa1d7 100644 --- a/autotests/integration/kwin_wayland_test.cpp +++ b/autotests/integration/kwin_wayland_test.cpp @@ -15,7 +15,7 @@ #include "pluginmanager.h" #include "wayland_server.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "xwl/xwayland.h" #include diff --git a/autotests/test_client_machine.cpp b/autotests/test_client_machine.cpp index d057bfc720..5aff04cff3 100644 --- a/autotests/test_client_machine.cpp +++ b/autotests/test_client_machine.cpp @@ -9,7 +9,7 @@ #include "testutils.h" // KWin #include "client_machine.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/autotests/test_xcb_size_hints.cpp b/autotests/test_xcb_size_hints.cpp index c8dd001ffb..dfc090389c 100644 --- a/autotests/test_xcb_size_hints.cpp +++ b/autotests/test_xcb_size_hints.cpp @@ -8,7 +8,7 @@ */ #include "testutils.h" // KWin -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/autotests/test_xcb_window.cpp b/autotests/test_xcb_window.cpp index a419458f5a..d9feed5780 100644 --- a/autotests/test_xcb_window.cpp +++ b/autotests/test_xcb_window.cpp @@ -8,7 +8,7 @@ */ #include "testutils.h" // KWin -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/autotests/test_xcb_wrapper.cpp b/autotests/test_xcb_wrapper.cpp index 521dc88250..9aa4abaaa1 100644 --- a/autotests/test_xcb_wrapper.cpp +++ b/autotests/test_xcb_wrapper.cpp @@ -8,7 +8,7 @@ */ #include "testutils.h" // KWin -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0bbfb3513d..2059f90bd5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,7 +151,6 @@ target_sources(kwin PRIVATE x11client.cpp x11eventfilter.cpp x11syncmanager.cpp - xcbutils.cpp xcursortheme.cpp xdgactivationv1.cpp xdgshellclient.cpp @@ -239,6 +238,7 @@ target_sources(kwin PRIVATE add_subdirectory(backends) add_subdirectory(scenes) +add_subdirectory(utils) if (KWIN_BUILD_CMS) target_sources(kwin PRIVATE diff --git a/src/atoms.h b/src/atoms.h index 6b5a82dcb0..72321ce9c4 100644 --- a/src/atoms.h +++ b/src/atoms.h @@ -12,7 +12,7 @@ #ifndef KWIN_ATOMS_H #define KWIN_ATOMS_H -#include "xcbutils.h" +#include "utils/xcbutils.h" namespace KWin { diff --git a/src/backends/x11/common/eglonxbackend.cpp b/src/backends/x11/common/eglonxbackend.cpp index a94b27411e..c57129750b 100644 --- a/src/backends/x11/common/eglonxbackend.cpp +++ b/src/backends/x11/common/eglonxbackend.cpp @@ -14,7 +14,7 @@ #include "options.h" #include "overlaywindow.h" #include "platform.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/src/backends/x11/standalone/edge.h b/src/backends/x11/standalone/edge.h index ae1d83db36..a541140422 100644 --- a/src/backends/x11/standalone/edge.h +++ b/src/backends/x11/standalone/edge.h @@ -18,7 +18,7 @@ #ifndef KWIN_EDGE_H #define KWIN_EDGE_H #include "screenedge.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" namespace KWin { diff --git a/src/backends/x11/standalone/effects_x11.h b/src/backends/x11/standalone/effects_x11.h index 7e442243d0..8ed50bd95c 100644 --- a/src/backends/x11/standalone/effects_x11.h +++ b/src/backends/x11/standalone/effects_x11.h @@ -11,7 +11,7 @@ #define KWIN_EFFECTS_X11_H #include "effects.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include diff --git a/src/backends/x11/standalone/glxbackend.cpp b/src/backends/x11/standalone/glxbackend.cpp index 71e92229c3..653c4342b8 100644 --- a/src/backends/x11/standalone/glxbackend.cpp +++ b/src/backends/x11/standalone/glxbackend.cpp @@ -29,7 +29,7 @@ #include "scene.h" #include "screens.h" #include "surfaceitem_x11.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // kwin libs #include #include diff --git a/src/backends/x11/standalone/non_composited_outline.h b/src/backends/x11/standalone/non_composited_outline.h index 6b3f1a137d..52e863c0e6 100644 --- a/src/backends/x11/standalone/non_composited_outline.h +++ b/src/backends/x11/standalone/non_composited_outline.h @@ -9,7 +9,7 @@ #ifndef KWIN_NON_COMPOSITED_OUTLINE_H #define KWIN_NON_COMPOSITED_OUTLINE_H #include "outline.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" namespace KWin { diff --git a/src/backends/x11/standalone/overlaywindow_x11.cpp b/src/backends/x11/standalone/overlaywindow_x11.cpp index 7917205f56..60f4630dc6 100644 --- a/src/backends/x11/standalone/overlaywindow_x11.cpp +++ b/src/backends/x11/standalone/overlaywindow_x11.cpp @@ -14,7 +14,7 @@ #include "scene.h" #include "screens.h" #include "utils.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include diff --git a/src/backends/x11/standalone/windowselector.cpp b/src/backends/x11/standalone/windowselector.cpp index 1cfd0e0a28..545e02cf44 100644 --- a/src/backends/x11/standalone/windowselector.cpp +++ b/src/backends/x11/standalone/windowselector.cpp @@ -13,7 +13,7 @@ #include "cursor.h" #include "unmanaged.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // XLib #include #include diff --git a/src/backends/x11/standalone/x11_platform.cpp b/src/backends/x11/standalone/x11_platform.cpp index c47d73b4cd..ec8809a6e5 100644 --- a/src/backends/x11/standalone/x11_platform.cpp +++ b/src/backends/x11/standalone/x11_platform.cpp @@ -31,7 +31,7 @@ #include "non_composited_outline.h" #include "workspace.h" #include "x11_output.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "renderloop.h" #include diff --git a/src/backends/x11/standalone/x11cursor.cpp b/src/backends/x11/standalone/x11cursor.cpp index 7529a1852e..3675fb1d08 100644 --- a/src/backends/x11/standalone/x11cursor.cpp +++ b/src/backends/x11/standalone/x11cursor.cpp @@ -10,7 +10,7 @@ #include "input.h" #include "keyboard_input.h" #include "utils.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "xfixes_cursor_event_filter.h" #include diff --git a/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp b/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp index aa04ed05d8..abe5e6d757 100644 --- a/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp +++ b/src/backends/x11/standalone/xfixes_cursor_event_filter.cpp @@ -8,7 +8,7 @@ */ #include "xfixes_cursor_event_filter.h" #include "x11cursor.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" namespace KWin { diff --git a/src/backends/x11/windowed/x11windowed_backend.cpp b/src/backends/x11/windowed/x11windowed_backend.cpp index 8d1d2e0e65..444fb7cda3 100644 --- a/src/backends/x11/windowed/x11windowed_backend.cpp +++ b/src/backends/x11/windowed/x11windowed_backend.cpp @@ -12,7 +12,7 @@ #include "scene_qpainter_x11_backend.h" #include "logging.h" #include "wayland_server.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "egl_x11_backend.h" #include "screens.h" #include "session.h" diff --git a/src/composite.cpp b/src/composite.cpp index 85808b1397..43859cf22c 100644 --- a/src/composite.cpp +++ b/src/composite.cpp @@ -32,7 +32,7 @@ #include "wayland_server.h" #include "workspace.h" #include "x11syncmanager.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/src/cursor.cpp b/src/cursor.cpp index 9371fadd53..8634a76579 100644 --- a/src/cursor.cpp +++ b/src/cursor.cpp @@ -14,7 +14,7 @@ #include "main.h" #include "platform.h" #include "utils.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "abstract_output.h" #include "composite.h" #include "scene.h" diff --git a/src/effects.cpp b/src/effects.cpp index 143dac77c3..1be036079f 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -46,8 +46,8 @@ #include #include "composite.h" -#include "xcbutils.h" #include "platform.h" +#include "utils/xcbutils.h" #include "waylandclient.h" #include "wayland_server.h" diff --git a/src/events.cpp b/src/events.cpp index deaa756e9d..c09f615af9 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -30,7 +30,7 @@ #include "effects.h" #include "screenedge.h" #include "screens.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include diff --git a/src/main.cpp b/src/main.cpp index 378dc98b34..086c982f58 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,9 +24,9 @@ #include "screens.h" #include "screenlockerwatcher.h" #include "sm.h" +#include "utils/xcbutils.h" #include "workspace.h" #include "x11eventfilter.h" -#include "xcbutils.h" #include diff --git a/src/main_x11.cpp b/src/main_x11.cpp index 5b8170d6cd..03535831f6 100644 --- a/src/main_x11.cpp +++ b/src/main_x11.cpp @@ -15,7 +15,7 @@ #include "platform.h" #include "sm.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/src/scenes/opengl/lanczosfilter.cpp b/src/scenes/opengl/lanczosfilter.cpp index d275e65aaf..afd7207715 100644 --- a/src/scenes/opengl/lanczosfilter.cpp +++ b/src/scenes/opengl/lanczosfilter.cpp @@ -9,12 +9,8 @@ */ #include "lanczosfilter.h" -#include "x11client.h" -#include "deleted.h" #include "effects.h" -#include "unmanaged.h" #include "options.h" -#include "utils.h" #include "workspace.h" #include diff --git a/src/syncalarmx11filter.cpp b/src/syncalarmx11filter.cpp index 64ee66bfbc..8678767ca4 100644 --- a/src/syncalarmx11filter.cpp +++ b/src/syncalarmx11filter.cpp @@ -10,7 +10,7 @@ #include "syncalarmx11filter.h" #include "workspace.h" #include "x11client.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" namespace KWin { diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp index 8f8fadcc33..a1c50b27fc 100644 --- a/src/tabbox/tabbox.cpp +++ b/src/tabbox/tabbox.cpp @@ -36,7 +36,7 @@ #include "unmanaged.h" #include "virtualdesktops.h" #include "workspace.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/src/tabbox/tabboxhandler.cpp b/src/tabbox/tabboxhandler.cpp index 494699af17..5e5de4efb4 100644 --- a/src/tabbox/tabboxhandler.cpp +++ b/src/tabbox/tabboxhandler.cpp @@ -11,7 +11,7 @@ #include "tabboxhandler.h" #include #include -#include "xcbutils.h" +#include "utils/xcbutils.h" // tabbox #include "clientmodel.h" #include "desktopmodel.h" diff --git a/src/toplevel.h b/src/toplevel.h index 2ad992b7e1..256fdb4253 100644 --- a/src/toplevel.h +++ b/src/toplevel.h @@ -12,7 +12,7 @@ // kwin #include "utils.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // KDE #include // Qt diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp index 5d83230186..5cad066a72 100644 --- a/src/unmanaged.cpp +++ b/src/unmanaged.cpp @@ -14,7 +14,6 @@ #include "deleted.h" #include "surfaceitem_x11.h" #include "utils.h" -#include "xcbutils.h" #include #include diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 0000000000..7b5baeec48 --- /dev/null +++ b/src/utils/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(kwin PRIVATE + xcbutils.cpp +) diff --git a/src/xcbutils.cpp b/src/utils/xcbutils.cpp similarity index 99% rename from src/xcbutils.cpp rename to src/utils/xcbutils.cpp index dae4713765..7563281a3b 100644 --- a/src/xcbutils.cpp +++ b/src/utils/xcbutils.cpp @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "utils.h" // Qt #include diff --git a/src/xcbutils.h b/src/utils/xcbutils.h similarity index 100% rename from src/xcbutils.h rename to src/utils/xcbutils.h diff --git a/src/workspace.cpp b/src/workspace.cpp index 07222a79ac..e4e3e19728 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -49,7 +49,7 @@ #include "virtualdesktops.h" #include "was_user_interaction_x11_filter.h" #include "wayland_server.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" #include "main.h" #include "decorations/decorationbridge.h" #include "xwaylandclient.h" diff --git a/src/x11client.h b/src/x11client.h index 53ad7ba418..b523044d3d 100644 --- a/src/x11client.h +++ b/src/x11client.h @@ -13,7 +13,7 @@ // kwin #include "decorationitem.h" #include "abstract_client.h" -#include "xcbutils.h" +#include "utils/xcbutils.h" // Qt #include #include diff --git a/src/xwl/selection.cpp b/src/xwl/selection.cpp index 64a5f3c0a4..2866088f61 100644 --- a/src/xwl/selection.cpp +++ b/src/xwl/selection.cpp @@ -12,9 +12,9 @@ #include "transfer.h" #include "atoms.h" +#include "utils/xcbutils.h" #include "workspace.h" #include "x11client.h" -#include "xcbutils.h" #include #include diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp index 3aeb1c7345..ed41a4e6f7 100644 --- a/src/xwl/xwayland.cpp +++ b/src/xwl/xwayland.cpp @@ -19,8 +19,8 @@ #include "options.h" #include "utils.h" #include "platform.h" +#include "utils/xcbutils.h" #include "wayland_server.h" -#include "xcbutils.h" #include "xwayland_logging.h" #include "xwaylandsocket.h" diff --git a/tests/screenedgeshowtest.cpp b/tests/screenedgeshowtest.cpp index 2bf41701f3..109aacd2d0 100644 --- a/tests/screenedgeshowtest.cpp +++ b/tests/screenedgeshowtest.cpp @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include diff --git a/tests/x11shadowreader.cpp b/tests/x11shadowreader.cpp index 2050ad40fd..abd6f40eff 100644 --- a/tests/x11shadowreader.cpp +++ b/tests/x11shadowreader.cpp @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL */ -#include "xcbutils.h" +#include "utils/xcbutils.h" #include #include