linuxdeepin · wineee · Aug 6, 2026 · Aug 6, 2026
diff --git a/.agents/skills/treeland-private-wayland-protocol/SKILL.md b/.agents/skills/treeland-private-wayland-protocol/SKILL.md
@@ -28,7 +28,7 @@ Complete these four things correctly:
 
 ## Read First
 1. The target module `CMakeLists.txt`
-2. `src/modules/tools/CMakeLists.txt`
+2. `waylib/tools/CMakeLists.txt`
 3. Generated files in the build directory
 4. `src/seat/helper.cpp`
 
@@ -354,7 +354,7 @@ For new private protocols, prefer `appidresolver`, `prelaunch-splash`, or `scree
 - `src/modules/app-id-resolver/appidresolver.cpp`
 - `src/modules/prelaunch-splash/prelaunchsplash.cpp`
 - `src/modules/screensaver/screensaverinterfacev1.cpp`
-- `src/modules/tools/CMakeLists.txt`
+- `waylib/tools/CMakeLists.txt`
 - `src/seat/helper.cpp`
 
 ## Output Requirements

diff --git a/.github/workflows/waylib-archlinux-build.yml b/.github/workflows/waylib-archlinux-build.yml
@@ -40,6 +40,18 @@ jobs:
             xorg-xwayland
           pacman -S --noconfirm --noprogressbar fakeroot meson sudo
 
+      - name: Build and Install treeland-protocols
+        run: |
+          echo "Building treeland-protocols from source..."
+          git clone https://github.com/linuxdeepin/treeland-protocols.git --depth 1
+          cd treeland-protocols
+          cmake -B build \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DCMAKE_BUILD_TYPE=Release
+          cmake --build build
+          cmake --install build
+          echo "✅ treeland-protocols built and installed from source"
+
       - uses: actions/checkout@v4
 
       - name: Configure and Build waylib with ci preset

diff --git a/.github/workflows/waylib-debian-build.yml b/.github/workflows/waylib-debian-build.yml
@@ -40,6 +40,19 @@ jobs:
           rm -f /etc/apt/sources.list.d/deepin-community.list
           apt-get update
 
+          # Build and install treeland-protocols locally (required build dependency)
+          echo "🔧 Building treeland-protocols from source"
+          WAYLIB_DIR="$PWD"
+          cd /tmp
+          if [ ! -d treeland-protocols ]; then
+            git clone --depth=1 --branch master --single-branch https://github.com/linuxdeepin/treeland-protocols.git
+          fi
+          cd treeland-protocols
+          mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
+          dpkg-buildpackage -uc -us -b
+          apt-get install -y ../*.deb || dpkg -i ../*.deb || apt-get -f install -y
+          cd "$WAYLIB_DIR"
+
           mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
 
           dpkg-buildpackage -uc -us -b

diff --git a/.github/workflows/waylib-deepin-build.yml b/.github/workflows/waylib-deepin-build.yml
@@ -36,6 +36,19 @@ jobs:
           # Install wlr-protocols package directly (ignore auth for this one operation)
           apt-get install -y --allow-unauthenticated wlr-protocols || true
 
+          # Build and install treeland-protocols locally (required build dependency)
+          echo "🔧 Building treeland-protocols from source"
+          WAYLIB_DIR="$PWD"
+          cd /tmp
+          if [ ! -d treeland-protocols ]; then
+            git clone --depth=1 --branch master --single-branch https://github.com/linuxdeepin/treeland-protocols.git
+          fi
+          cd treeland-protocols
+          mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
+          dpkg-buildpackage -uc -us -b
+          apt-get install -y ../*.deb || dpkg -i ../*.deb || apt-get -f install -y
+          cd "$WAYLIB_DIR"
+
           mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
 
       - name: Build waylib deb package

diff --git a/REUSE.toml b/REUSE.toml
@@ -178,6 +178,7 @@ path = [
     "waylib/src/server/kernel/WServerInterface",
     "waylib/src/server/kernel/WSurface",
     "waylib/src/server/kernel/WSurfaceLayout",
+    "waylib/src/server/kernel/WSubsurface",
     "waylib/src/server/kernel/WTexture",
     "waylib/src/server/kernel/WXdgShell",
     "waylib/src/server/kernel/WXdgSurface",

diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
@@ -24,7 +24,6 @@ link_libraries(
 # ws_generate); compiling it again here would duplicate global symbols
 # (xdg_*_interface) across the two shared libraries.
 
-add_subdirectory(tools)
 add_subdirectory(foreign-toplevel)
 add_subdirectory(output-manager)
 add_subdirectory(personalization)

diff --git a/src/modules/activation/CMakeLists.txt b/src/modules/activation/CMakeLists.txt
@@ -1,6 +1,6 @@
 pkg_get_variable(WAYLAND_PROTOCOLS_DATADIR wayland-protocols pkgdatadir)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${WAYLAND_PROTOCOLS_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
     BASENAME xdg-activation-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/activation/activationmanagerinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/activation/activationmanagerinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/activation/wayland-xdg-activation-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/app-id-resolver/CMakeLists.txt b/src/modules/app-id-resolver/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-app-id-resolver-v1.xml
     BASENAME treeland-app-id-resolver-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         appidresolver.h
         appidresolver.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/app-id-resolver/wayland-treeland-app-id-resolver-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     LINK

diff --git a/src/modules/capture/capture.cpp b/src/modules/capture/capture.cpp
@@ -17,17 +17,19 @@
 #include <wlayersurface.h>
 #include <woutputitem.h>
 #include <woutputrenderwindow.h>
 #include <woutputviewport.h>
 #include <wquickcursor.h>
 #include <wquicktextureproxy.h>
+#include <wsubsurface.h>
 #include <wtools.h>
 
 #include <QLoggingCategory>
 #include <QQueue>
 #include <QQuickItemGrabResult>
 #include <QSGTextureProvider>
 
+#include <algorithm>
 #include <utility>
 
 static inline QRectF scaledRect(const QRectF &rect, qreal devicePixelRatio)
 {
@@ -445,6 +447,17 @@
 {
     // Exclude cursor surface item and the mask
     Q_ASSERT(m_outputRenderWindow);
+    const auto isMaskOrSubsurface = [mask](WSurface *surface) {
+        if (!mask)
+            return false;
+        if (surface == mask)
+            return true;
+        const auto subsurfaces = mask->subsurfaces();
+        return std::any_of(subsurfaces.cbegin(), subsurfaces.cend(), [surface](WSubsurface *subsurface) {
+            return subsurface->surface() == surface;
+        });
+    };
+
     QQueue<QQuickItem *> nodes;
     nodes.enqueue(m_outputRenderWindow->contentItem());
     while (!nodes.isEmpty()) {
@@ -453,9 +466,7 @@
             if (auto cursor = qobject_cast<WQuickCursor *>(node->parentItem())) {
                 if (freeze)
                     m_frozenCursorPos = cursor->position(); // Just store position for cursor
-            } else if (!mask
-                       || (content->surface() != mask
-                           && !mask->subsurfaces().contains(content->surface()))) {
+            } else if (!isMaskOrSubsurface(content->surface())) {
                 content->setLive(!freeze);
             } else if (content->surface() == mask) {
                 auto surfaceItem = closestSurfaceItem(content);

diff --git a/src/modules/dde-shell/CMakeLists.txt b/src/modules/dde-shell/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-dde-shell-v1.xml
     BASENAME treeland-dde-shell-v1
 )
@@ -13,7 +13,6 @@ impl_treeland(
         ${CMAKE_SOURCE_DIR}/src/modules/dde-shell/ddeshellattached.h
         ${CMAKE_SOURCE_DIR}/src/modules/dde-shell/ddeshellmanagerinterfacev1.cpp
         ${CMAKE_SOURCE_DIR}/src/modules/dde-shell/ddeshellattached.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/dde-shell/wayland-treeland-dde-shell-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/ddm/CMakeLists.txt b/src/modules/ddm/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-ddm-v1.xml
     BASENAME treeland-ddm-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/ddm/ddminterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/ddm/ddminterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/ddm/wayland-treeland-ddm-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/foreign-toplevel/CMakeLists.txt b/src/modules/foreign-toplevel/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-foreign-toplevel-manager-v1.xml
     BASENAME treeland-foreign-toplevel-manager-v1
 )
@@ -13,7 +13,6 @@ impl_treeland(
         ${CMAKE_SOURCE_DIR}/src/modules/foreign-toplevel/foreigntoplevelhandlev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/foreign-toplevel/foreigntoplevelmanagerv1.h
         ${CMAKE_SOURCE_DIR}/src/modules/foreign-toplevel/foreigntoplevelmanagerv1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/foreign-toplevel/wayland-treeland-foreign-toplevel-manager-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/input-manager/CMakeLists.txt b/src/modules/input-manager/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-input-manager-unstable-v1.xml
     BASENAME treeland-input-manager-unstable-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/input-manager/inputmanagerinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/input-manager/inputmanagerinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/input-manager/wayland-treeland-input-manager-unstable-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/keyboard-state-notify/CMakeLists.txt b/src/modules/keyboard-state-notify/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-keyboard-state-notify-unstable-v1.xml
     BASENAME treeland-keyboard-state-notify-unstable-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/keyboard-state-notify/keyboardstatenotifymanagerinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/keyboard-state-notify/keyboardstatenotifymanagerinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/keyboard-state-notify/wayland-treeland-keyboard-state-notify-unstable-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/output-manager/CMakeLists.txt b/src/modules/output-manager/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-output-manager-v1.xml
     BASENAME treeland-output-manager-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/output-manager/outputmanagement.h
         ${CMAKE_SOURCE_DIR}/src/modules/output-manager/outputmanagement.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/output-manager/wayland-treeland-output-manager-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/personalization/CMakeLists.txt b/src/modules/personalization/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-personalization-manager-v1.xml
     BASENAME treeland-personalization-manager-v1
 )
@@ -13,7 +13,6 @@ set(PUBLIC_HEADERS
 
 set(SRCS
     ${CMAKE_SOURCE_DIR}/src/modules/personalization/personalizationmanagerinterfacev1.cpp
-    ${CMAKE_BINARY_DIR}/src/modules/personalization/wayland-treeland-personalization-manager-v1-server-protocol.c
 )
 
 impl_treeland(

diff --git a/src/modules/prelaunch-splash/CMakeLists.txt b/src/modules/prelaunch-splash/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols 0.5.5 REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-prelaunch-splash-v2.xml
     BASENAME treeland-prelaunch-splash-v2
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         prelaunchsplash.h
         prelaunchsplash.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/prelaunch-splash/wayland-treeland-prelaunch-splash-v2-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     LINK

diff --git a/src/modules/screensaver/CMakeLists.txt b/src/modules/screensaver/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols 0.5.3 REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-screensaver-v1.xml
     BASENAME treeland-screensaver-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/screensaver/screensaverinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/screensaver/screensaverinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/screensaver/wayland-treeland-screensaver-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )
diff --git a/src/modules/shortcut/CMakeLists.txt b/src/modules/shortcut/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-shortcut-manager-v2.xml
     BASENAME treeland-shortcut-manager-v2
 )
@@ -15,7 +15,6 @@ impl_treeland(
         ${CMAKE_SOURCE_DIR}/src/modules/shortcut/shortcutrunner.cpp
         ${CMAKE_SOURCE_DIR}/src/modules/shortcut/shortcutcontroller.h
         ${CMAKE_SOURCE_DIR}/src/modules/shortcut/shortcutcontroller.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/shortcut/wayland-treeland-shortcut-manager-v2-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     LINK

diff --git a/src/modules/virtual-output/CMakeLists.txt b/src/modules/virtual-output/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-virtual-output-manager-v1.xml
     BASENAME treeland-virtual-output-manager-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/virtual-output/virtualoutputmanagerinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/virtual-output/virtualoutputmanagerinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/virtual-output/wayland-treeland-virtual-output-manager-v1-server-protocol.c
     LINK
         Wlroots::wlroots
         Waylib::WaylibServer

diff --git a/src/modules/wallpaper-color/CMakeLists.txt b/src/modules/wallpaper-color/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-wallpaper-color-v1.xml
     BASENAME treeland-wallpaper-color-v1
 )
@@ -11,7 +11,6 @@ impl_treeland(
     SOURCE
         ${CMAKE_SOURCE_DIR}/src/modules/wallpaper-color/wallpapercolorinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/wallpaper-color/wallpapercolorinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/wallpaper-color/wayland-treeland-wallpaper-color-v1-server-protocol.c
     LINK
         Wlroots::wlroots
         Waylib::WaylibServer

diff --git a/src/modules/wallpaper/CMakeLists.txt b/src/modules/wallpaper/CMakeLists.txt
@@ -1,11 +1,11 @@
 find_package(TreelandProtocols REQUIRED)
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-wallpaper-manager-unstable-v1.xml
     BASENAME treeland-wallpaper-manager-unstable-v1
 )
 
-local_qtwayland_server_protocol_treeland(libtreeland
+waylib_generate_qtwayland_server_protocol(libtreeland
     PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-wallpaper-shell-unstable-v1.xml
     BASENAME treeland-wallpaper-shell-unstable-v1
 )
@@ -20,8 +20,6 @@ impl_treeland(
         ${CMAKE_SOURCE_DIR}/src/modules/wallpaper/wallpapershellinterfacev1.cpp
         ${CMAKE_SOURCE_DIR}/src/modules/wallpaper/wallpapernotifierinterfacev1.h
         ${CMAKE_SOURCE_DIR}/src/modules/wallpaper/wallpapernotifierinterfacev1.cpp
-        ${CMAKE_BINARY_DIR}/src/modules/wallpaper/wayland-treeland-wallpaper-manager-unstable-v1-server-protocol.c
-        ${CMAKE_BINARY_DIR}/src/modules/wallpaper/wayland-treeland-wallpaper-shell-unstable-v1-server-protocol.c
     INCLUDE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 )