feat: Adapt to TreeLand's Titlebar protocol

debian/control

@@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= 12), pkg-config,
  qtbase5-private-dev, qtbase5-dev-tools, doxygen, graphviz, qttools5-dev,
  libdtkcore-dev, librsvg2-dev, libfreeimage-dev, libraw-dev, libgtest-dev, libgmock-dev,
  libqt5xdg-dev, libqt5xdgiconloader-dev, cmake, qt5-image-formats-plugins, libqt5waylandclient5-dev,
- extra-cmake-modules, qtwayland5-dev-tools, qtwayland5-private-dev, libkf5wayland-dev
+ extra-cmake-modules, qtwayland5-dev-tools, qtwayland5-private-dev, libkf5wayland-dev, treeland-protocols
 Standards-Version: 3.9.8
 
 Package: libdtkgui5

include/kernel/dguiapplicationhelper.h

@@ -59,7 +59,8 @@ class DGuiApplicationHelper : public QObject, public DCORE_NAMESPACE::DObject
         IsXWindowPlatform        = ReadOnlyLimit << 2,
         IsTableEnvironment       = ReadOnlyLimit << 3,
         IsDeepinEnvironment      = ReadOnlyLimit << 4,
-        IsSpecialEffectsEnvironment = ReadOnlyLimit << 5
+        IsSpecialEffectsEnvironment = ReadOnlyLimit << 5,
+        IsTreelandPlatform       = ReadOnlyLimit << 6
     };
     Q_ENUM(Attribute)
     Q_DECLARE_FLAGS(Attributes, Attribute)

src/CMakeLists.txt

@@ -4,6 +4,10 @@ else()
     find_package(Qt5 REQUIRED COMPONENTS WaylandClient XkbCommonSupport)
 endif()
 
+option(DTK_DISABLE_TREELAND "Disable TreeLand Protocols" OFF)
+find_package(TreeLandProtocols)
+set(TreeLandProtocols_FOUND ${TreeLandProtocols_FOUND})
+
 add_library(${LIB_NAME} SHARED)
 
 include(dbus/dbus.cmake)
@@ -12,30 +16,34 @@ include(kernel/kernel.cmake)
 include(private/private.cmake)
 include(util/util.cmake)
 
-if("${QT_VERSION_MAJOR}" STREQUAL "6")
-    qt6_generate_wayland_protocol_client_sources(${LIB_NAME} FILES
-        ${CMAKE_CURRENT_SOURCE_DIR}/wayland/protocol/treeland-personalization-manager-v1.xml
-    )
-else()
-# ECM setup
-    include(FeatureSummary)
-    find_package(ECM REQUIRED NO_MODULE)
-    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ECM_MODULE_PATH}")
-    find_package(QtWaylandScanner)
-    ecm_add_qtwayland_client_protocol(${LIB_NAME}
-        PROTOCOL ${CMAKE_CURRENT_SOURCE_DIR}/wayland/protocol/treeland-personalization-manager-v1.xml
-        BASENAME treeland-personalization-manager-v1
-    )
+if(NOT DTK_DISABLE_TREELAND AND TreeLandProtocols_FOUND)
+    message("Support Treeland!")
+    if("${QT_VERSION_MAJOR}" STREQUAL "6")
+        qt6_generate_wayland_protocol_client_sources(${LIB_NAME} FILES
+            ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-personalization-manager-v1.xml
+        )
+    else()
+    # ECM setup
+        include(FeatureSummary)
+        find_package(ECM REQUIRED NO_MODULE)
+        set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ECM_MODULE_PATH}")
+        find_package(QtWaylandScanner)
+        ecm_add_qtwayland_client_protocol(${LIB_NAME}
+            PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-personalization-manager-v1.xml
+            BASENAME treeland-personalization-manager-v1
+        )
+        target_sources(${LIB_NAME} PRIVATE
+            ${CLIENT_LIB_SRCS}
+        )
+    endif()
+    include(wayland/wayland.cmake)
     target_sources(${LIB_NAME} PRIVATE
-        ${CLIENT_LIB_SRCS}
+        ${wayland_SRC}
     )
+else()
+    target_compile_definitions(${LIB_NAME} PRIVATE DTK_DISABLE_TREELAND)
 endif()
 
-include(wayland/wayland.cmake)
-target_sources(${LIB_NAME} PRIVATE
-    ${wayland_SRC}
-)
-
 target_sources(${LIB_NAME} PRIVATE
     ${dbus_SRC}
     ${filedrag_SRC}

src/kernel/dguiapplicationhelper.cpp

@@ -1739,6 +1739,11 @@ bool DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::Attribute attri
     case IsSpecialEffectsEnvironment: {
         return qgetenv("DTK_DISABLED_SPECIAL_EFFECTS").toInt() != 1;
     }
+    case IsTreelandPlatform: {
+        static bool isTreeland =  qgetenv("DDE_CURRENT_COMPOSITOR") == "TreeLand"
+            && qApp->platformName() == QByteArrayLiteral("wayland");
+        return isTreeland;
+    }
     default:
         return DGuiApplicationHelperPrivate::attributes.testFlag(attribute);
     }

src/kernel/dplatformhandle.cpp

@@ -6,8 +6,11 @@
 #include "dplatformhandle.h"
 #include "dplatformtheme.h"
 #include "dwindowmanagerhelper.h"
-#include "wayland/dcontextshellwindow.h"
+#ifndef DTK_DISABLE_TREELAND
+#include "wayland/personalizationwaylandclientextension.h"
+#endif
 #include <private/qwaylandwindow_p.h>
+#include <QtWaylandClient/private/qwaylandwindow_p.h>
 
 #include <QWindow>
 #include <QGuiApplication>
@@ -97,11 +100,6 @@ static void setWindowProperty(QWindow *window, const char *name, const QVariant
     reinterpret_cast<void(*)(QWindow *, const char *, const QVariant &)>(setWindowProperty)(window, name, value);
 }
 
-static bool isTreeLand()
-{
-    return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand";
-};
-
 /*!
   \class Dtk::Gui::DPlatformHandle
   \inmodule dtkgui
@@ -613,51 +611,60 @@ static void initWindowRadius(QWindow *window)
     }
 }
 
-class Q_DECL_HIDDEN CreatorWindowEventFile : public QObject {
-    bool m_windowMoving = false;
+class Q_DECL_HIDDEN CreatorWindowEventFilter : public QObject {
 public:
-    CreatorWindowEventFile(QObject *par= nullptr): QObject(par){}
+    CreatorWindowEventFilter(QObject *par= nullptr): QObject(par){}
 
 public:
     bool eventFilter(QObject *watched, QEvent *event) override {
         if (event->type() == QEvent::PlatformSurface) {
             QPlatformSurfaceEvent *se = static_cast<QPlatformSurfaceEvent*>(event);
             if (se->surfaceEventType() == QPlatformSurfaceEvent::SurfaceCreated) {  // 若收到此信号， 则 WinID 已被创建
-                initWindowRadius(qobject_cast<QWindow *>(watched));
-                deleteLater();
+                auto window = qobject_cast<QWindow *>(watched);
+                initWindowRadius(window);
+
+            #ifndef DTK_DISABLE_TREELAND
+                if (DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsTreelandPlatform)) {
+                    PersonalizationManager::instance()->setEnableTitleBar(window, false);
+                }
+            #endif
+            deleteLater();
             }
         }
+        return QObject::eventFilter(watched, event);
+    }
+};
 
-        if (auto *w = qobject_cast<QWindow *>(watched); w && isTreeLand()) {
-            if(DContextShellWindow *window = DContextShellWindow::get(qobject_cast<QWindow *>(watched))) {
-                bool is_mouse_move = event->type() == QEvent::MouseMove && static_cast<QMouseEvent*>(event)->buttons() == Qt::LeftButton;
+// only for TreeLand
+class Q_DECL_HIDDEN MoveWindowEventFilter : public QObject {
+  bool m_windowMoving = false;
+public:
+    MoveWindowEventFilter(QObject *par= nullptr): QObject(par){}
+public:
+    bool eventFilter(QObject *watched, QEvent *event) override {
+        if (auto *w = qobject_cast<QWindow *>(watched); w) {
+            bool is_mouse_move = event->type() == QEvent::MouseMove && static_cast<QMouseEvent*>(event)->buttons() == Qt::LeftButton;
 
-                if (event->type() == QEvent::MouseButtonRelease) {
-                    m_windowMoving = false;
-                }
+            if (event->type() == QEvent::MouseButtonRelease) {
+                m_windowMoving = false;
+            }
+            if (event->type() == QEvent::MouseButtonPress) {
+                m_windowMoving = false;
+            }
 
-                // workaround for kwin: Qt receives no release event when kwin finishes MOVE operation,
-                // which makes app hang in windowMoving state. when a press happens, there's no sense of
-                // keeping the moving state, we can just reset ti back to normal.
-                if (event->type() == QEvent::MouseButtonPress) {
-                    m_windowMoving = false;
-                }
+            // FIXME: We need to check whether the event is accepted.
+            //        Only when the upper control does not accept the event,
+            //        the window should be moved through the window.
+            //        But every event here has been accepted. I don't know what happened.
+            if (is_mouse_move && w->geometry().contains(static_cast<QMouseEvent*>(event)->globalPos())) {
+                if (!m_windowMoving) {
+                    m_windowMoving = true;
 
-                // FIXME: We need to check whether the event is accepted.
-                //        Only when the upper control does not accept the event,
-                //        the window should be moved through the window.
-                //        But every event here has been accepted. I don't know what happened.
-                if (is_mouse_move && w->geometry().contains(static_cast<QMouseEvent*>(event)->globalPos())) {
-                    if (!m_windowMoving && window->noTitlebar()) {
-                        m_windowMoving = true;
-
-                        event->accept();
-                        static_cast<QtWaylandClient::QWaylandWindow *>(w->handle())->startSystemMove();
-                    }
+                    event->accept();
+                    static_cast<QPlatformWindow *>(w->handle())->startSystemMove();
                 }
             }
         }
-
         return QObject::eventFilter(watched, event);
     }
 };
@@ -679,17 +686,16 @@ bool DPlatformHandle::setEnabledNoTitlebarForWindow(QWindow *window, bool enable
     auto isDWaylandPlatform = [] {
         return qApp->platformName() == "dwayland" || qApp->property("_d_isDwayland").toBool();
     };
-    if (!(isDXcbPlatform() || isDWaylandPlatform() || isTreeLand()))
+    if (!(isDXcbPlatform() || isDWaylandPlatform() || DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsTreelandPlatform)))
         return false;
 
-    if (window && isTreeLand()) {
-        DContextShellWindow *contextWindow = DContextShellWindow::get(window);
-        if (contextWindow->noTitlebar() == enable)
-            return true;
-        contextWindow->setNoTitlebar(enable);
-        window->installEventFilter(new CreatorWindowEventFile(window));
+#ifndef DTK_DISABLE_TREELAND
+    if (window && DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::IsTreelandPlatform)) {
+        window->installEventFilter(new CreatorWindowEventFilter(window));
+        window->installEventFilter(new MoveWindowEventFilter(window));
         return true;
     }
+#endif
 
     if (isEnabledNoTitlebar(window) == enable)
         return true;
@@ -706,7 +712,7 @@ bool DPlatformHandle::setEnabledNoTitlebarForWindow(QWindow *window, bool enable
             if (window->handle()) {
                 initWindowRadius(window);
             } else {
-                window->installEventFilter(new CreatorWindowEventFile(window));
+                window->installEventFilter(new CreatorWindowEventFilter(window));
             }
         }