winft · romangg · Feb 27, 2024 · Feb 26, 2024 · Feb 26, 2024 · Feb 26, 2024
diff --git a/.github/workflows/change.yml b/.github/workflows/change.yml
@@ -40,6 +40,11 @@ jobs:
     with:
       image: registry.gitlab.com/kwinft/ci-images/archlinux/kwinft-base-master
       artifact-name: clang-build
+      # Following tests are currently disabled on CI:
+      # * lockscreen, modifier-only-shortcut: flaky on CI because the lockscreen greeter process likes to
+      #   freeze off. Also see: https://bugreports.qt.io/browse/QTBUG-82911
+      # * all others: the GLES2 backend of wlroots can't be run in CI/without GPU at the moment,
+      #   see https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/2871
       ctest-args:
         "-E 'lockscreen|modifier only shortcut|no crash empty deco|no crash no border\
           |scene opengl|opengl shadow|no crash reinit compositor|buffer size change\

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -334,15 +334,15 @@ include_directories(BEFORE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-add_subdirectory(kconf_update)
 add_subdirectory(como)
 add_subdirectory(plugins)
 
 if (BUILD_TESTING)
-    add_subdirectory(autotests)
     add_subdirectory(tests)
 endif()
 
+add_subdirectory(examples)
+
 if (KF6DocTools_FOUND)
     add_subdirectory(docs)
 endif()

diff --git a/Messages.sh b/Messages.sh
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ This cross-desktop interoperability will be expanded upon in the future.
 **Ease of Use**
 <br>
 With The Compositor Modules a Wayland compositor can be created with a handful of lines only.
-See our MVP [Minico](tests/minico) for an example of that.
+See our MVP [Minico](examples/minico) for an example of that.
 
 **Customizability**
 <br>
@@ -127,7 +127,7 @@ You can make use of the FDBuild tool to automate this process as described
 It's easiest to link via CMake to The Compositor Modules libraries that you want to make use of
 and then create their central platform types from your main function to launch the compositor session.
 
-[Minico](tests/minico) as a minimal example and the [Plasma test binaries](tests/plasma)
+[Minico](examples/minico) as a minimal example and the [Plasma test binaries](tests/plasma)
 as a more complex one demonstrate this in a straightforward way.
 
 # Contact

diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
diff --git a/autotests/libxrenderutils/CMakeLists.txt b/autotests/libxrenderutils/CMakeLists.txt
diff --git a/autotests/libxrenderutils/blendpicture_test.cpp b/autotests/libxrenderutils/blendpicture_test.cpp
diff --git a/como/desktop/CMakeLists.txt b/como/desktop/CMakeLists.txt
@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Roman Gilg <[email protected]>
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
+add_subdirectory(kconf_update)
 
 add_library(desktop SHARED)
 

diff --git a/kconf_update/CMakeLists.txt → como/desktop/kconf_update/CMakeLists.txt b/kconf_update/CMakeLists.txt → como/desktop/kconf_update/CMakeLists.txt
diff --git a/....0-delete-desktop-switching-shortcuts.cpp → ....0-delete-desktop-switching-shortcuts.cpp b/....0-delete-desktop-switching-shortcuts.cpp → ....0-delete-desktop-switching-shortcuts.cpp
@@ -10,7 +10,7 @@
 #include <QGuiApplication>
 #include <QStandardPaths>
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     QGuiApplication app(argc, argv);
 
@@ -21,7 +21,7 @@ int main(int argc, char **argv)
         QStringLiteral("Walk Through Desktop List (Reverse)"),
     };
 
-    for (const QString &actionName : actionNames) {
+    for (const QString& actionName : actionNames) {
         QAction action;
         action.setObjectName(actionName);
         action.setProperty("componentName", QStringLiteral("kwin"));

diff --git a/...te/kwin-6.0-reset-active-mouse-screen.cpp → ...te/kwin-6.0-reset-active-mouse-screen.cpp b/...te/kwin-6.0-reset-active-mouse-screen.cpp → ...te/kwin-6.0-reset-active-mouse-screen.cpp
diff --git a/kconf_update/kwin.upd → como/desktop/kconf_update/kwin.upd b/kconf_update/kwin.upd → como/desktop/kconf_update/kwin.upd
diff --git a/como/render/xrender/utils.cpp b/como/render/xrender/utils.cpp
@@ -74,24 +74,6 @@ XRenderPicture xRenderFill(const QColor& c)
     return xRenderFill(preMultiply(c));
 }
 
-XRenderPicture xRenderBlendPicture(double opacity)
-{
-    static xcb_render_color_t s_blendColor = {0, 0, 0, 0};
-    s_blendColor.alpha = uint16_t(opacity * 0xffff);
-    if (XRenderUtils::s_blendPicture == XCB_RENDER_PICTURE_NONE) {
-        XRenderUtils::s_blendPicture = xRenderFill(s_blendColor);
-    } else {
-        xcb_rectangle_t rect = {0, 0, 1, 1};
-        xcb_render_fill_rectangles(XRenderUtils::s_connection,
-                                   XCB_RENDER_PICT_OP_SRC,
-                                   XRenderUtils::s_blendPicture,
-                                   s_blendColor,
-                                   1,
-                                   &rect);
-    }
-    return XRenderUtils::s_blendPicture;
-}
-
 static xcb_render_picture_t createPicture(xcb_pixmap_t pix, int depth)
 {
     if (pix == XCB_PIXMAP_NONE)

diff --git a/como/render/xrender/utils.h b/como/render/xrender/utils.h
@@ -95,12 +95,6 @@ inline XFixesRegion::operator xcb_xfixes_region_t()
     return m_region;
 }
 
-/**
- * Static 1x1 picture used to deliver a black pixel with given opacity (for blending performance)
- * Call and Use, the PixelPicture will stay, but may change it's opacity meanwhile. It's NOT
- * threadsafe either
- */
-COMO_EXPORT XRenderPicture xRenderBlendPicture(double opacity);
 /**
  * Creates a 1x1 Picture filled with c
  */

diff --git a/como/script/Messages.sh b/como/script/Messages.sh
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: 2024 Roman Gilg <[email protected]>
+# SPDX-License-Identifier: GPL-2.0-or-later
+add_subdirectory(minico)
diff --git a/tests/minico/CMakeLists.txt → examples/minico/CMakeLists.txt b/tests/minico/CMakeLists.txt → examples/minico/CMakeLists.txt
@@ -7,5 +7,3 @@ add_executable(minico main.cpp)
 target_link_libraries(minico
   como::wayland
 )
-
-install(TARGETS minico)