fix: adapt dtkgui to Treeland protocol 0.6.0 API changes

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 12),
     libgmock-dev,
     libdtkcommon-dev,
     librsvg2-dev,
-    treeland-protocols (>>0.5.8),
+    treeland-protocols (>= 0.6.0),
     extra-cmake-modules,
     libdtkdata,
     libdtkcore-dev <!nodtk5>,

src/kernel/dplatformhandle.cpp

@@ -607,6 +607,12 @@ bool DPlatformHandle::setWindowBlurAreaByWM(QWindow *window, const QVector<DPlat
     if (auto impl = dynamic_cast<DXCBPlatformWindowInterface *>(platformWindowImpl(&handle))) {
         return impl->setWindowBlurArea(area);
     }
+#endif
+#ifndef DTK_DISABLE_TREELAND
+    if (auto impl = dynamic_cast<DTreeLandPlatformWindowInterface *>(platformWindowImpl(&handle))) {
+        impl->setWindowBlurAreas(area);
+        return true;
+    }
 #endif
     handle.setEnableBlurWindow(true);
     return true;
@@ -663,6 +669,12 @@ bool DPlatformHandle::setWindowBlurAreaByWM(QWindow *window, const QList<QPainte
     if (auto impl = dynamic_cast<DXCBPlatformWindowInterface *>(platformWindowImpl(&handle))) {
         return impl->setWindowBlurArea(paths);
     }
+#endif
+#ifndef DTK_DISABLE_TREELAND
+    if (auto impl = dynamic_cast<DTreeLandPlatformWindowInterface *>(platformWindowImpl(&handle))) {
+        impl->setWindowBlurPaths(paths);
+        return true;
+    }
 #endif
     handle.setEnableBlurWindow(true);
     return true;

src/plugins/platform/config.tests/treeland_test/CMakeLists.txt

@@ -21,12 +21,17 @@ pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
 
 find_package(TreelandProtocols)
 set(TreelandProtocols_FOUND ${TreelandProtocols_FOUND})
+find_package(ECM REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${ECM_MODULE_PATH}")
+find_package(WaylandProtocols)
 
 add_executable(${PROJECT_NAME} main.cpp)
 
 if("${QT_VERSION_MAJOR}" STREQUAL "6")
     qt6_generate_wayland_protocol_client_sources(${PROJECT_NAME} FILES
-        ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-personalization-manager-v1.xml
+        ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-appearance-unstable-v1.xml
+        ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-decoration-unstable-v1.xml
+        ${WaylandProtocols_DATADIR}/staging/ext-background-effect/ext-background-effect-v1.xml
     )
 
     if (${Qt6Core_VERSION} VERSION_GREATER_EQUAL "6.10.0")
@@ -36,14 +41,20 @@ if("${QT_VERSION_MAJOR}" STREQUAL "6")
 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(TABLET_SRCS
-        PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-personalization-manager-v1.xml
-        BASENAME treeland-personalization-manager-v1
+    ecm_add_qtwayland_client_protocol(CLIENT_SRCS
+        PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-appearance-unstable-v1.xml
+        BASENAME treeland-appearance-unstable-v1
     )
-    target_sources(${PROJECT_NAME} PRIVATE ${TABLET_SRCS})
+    ecm_add_qtwayland_client_protocol(CLIENT_SRCS
+        PROTOCOL ${TREELAND_PROTOCOLS_DATA_DIR}/treeland-decoration-unstable-v1.xml
+        BASENAME treeland-decoration-unstable-v1
+    )
+    ecm_add_qtwayland_client_protocol(CLIENT_SRCS
+        PROTOCOL ${WaylandProtocols_DATADIR}/staging/ext-background-effect/ext-background-effect-v1.xml
+        BASENAME ext-background-effect-v1
+    )
+    target_sources(${PROJECT_NAME} PRIVATE ${CLIENT_SRCS})
 
     target_link_libraries(${PROJECT_NAME} PRIVATE
         Qt${QT_VERSION_MAJOR}::XkbCommonSupportPrivate

src/plugins/platform/config.tests/treeland_test/main.cpp

@@ -6,26 +6,26 @@
 
 #include <QtWaylandClient/QWaylandClientExtension>
 #include <QtWaylandClient/private/qwaylandsurface_p.h>
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 
 #include <wayland-client-core.h>
-#include "qwayland-treeland-personalization-manager-v1.h"
+#include "qwayland-treeland-decoration-unstable-v1.h"
 #include <qwaylandclientextension.h>
 
 #include <private/qguiapplication_p.h>
 #include <private/qwaylandintegration_p.h>
 #include <private/qwaylandwindow_p.h>
 #include <private/qwaylanddisplay_p.h>
 
-class PersonalizationWindowContext : public QWaylandClientExtensionTemplate<PersonalizationWindowContext>,
-                                     public QtWayland::treeland_personalization_window_context_v1
+class TreelandDecorationContext : public QWaylandClientExtensionTemplate<TreelandDecorationContext>,
+                                  public QtWayland::treeland_decoration_context_v1
 {
 public:
-    PersonalizationWindowContext(struct ::treeland_personalization_window_context_v1 *context)
-    : QWaylandClientExtensionTemplate<PersonalizationWindowContext>(1)
-    , QtWayland::treeland_personalization_window_context_v1(context)
+    TreelandDecorationContext(struct ::treeland_decoration_context_v1 *context)
+    : QWaylandClientExtensionTemplate<TreelandDecorationContext>(1)
+    , QtWayland::treeland_decoration_context_v1(context)
     {
-        set_titlebar(enable_mode::enable_mode_disable);
+        set_titlebar_mode(titlebar_mode_hide);
     }
 };
 

src/plugins/platform/treeland/dtreelandplatforminterface.cpp

@@ -4,9 +4,9 @@
 
 #include "dtreelandplatforminterface.h"
 
 #include "dplatformtheme.h"
 #include "private/dplatforminterface_p.h"
-#include "personalizationwaylandclientextension.h"
+#include "treelandappearanceclientextension.h"
 
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 #include <QtWaylandClient/private/qwaylandsurface_p.h>
@@ -16,7 +16,6 @@
 
 DTreelandPlatformInterface::DTreelandPlatformInterface(DPlatformTheme *platformTheme)
     : DPlatformInterface(platformTheme)
-    , m_manager(nullptr)
     , m_activeColor(QColor())
     , m_titleHeight(0)
     , m_fontName(QByteArray())
@@ -27,24 +26,21 @@
     , m_windowRadius(0)
     , m_scrollBarPolicy(0)
     , m_themeName(QByteArray())
-    , m_blurOpacity(0)
+    , m_blurOpacity(0.0)
 {
-    m_manager = PersonalizationManager::instance();
-    connect(m_manager, &PersonalizationManager::activeChanged, this, [this](){
-        if (m_manager->isActive()) {
+    connect(TreelandAppearance::instance(), &TreelandAppearance::activeChanged, this, [this](){
+        if (TreelandAppearance::instance()->isSupported()) {
             initContext();
         }
     });
+    if (TreelandAppearance::instance()->isSupported()) {
+        initContext();
+    }
 }
 
 void DTreelandPlatformInterface::initContext()
 {
-    if (m_appearanceContext.isNull()) { 
-        m_appearanceContext.reset(new PersonalizationAppearanceContext(m_manager->get_appearance_context(), this));
-    }
-    if (m_fontContext.isNull()) {
-        m_fontContext.reset(new PersonalizationFontContext(m_manager->get_font_context(), this));
-    }
+    TreelandAppearance::instance()->m_interface = this;
 }
 
 QByteArray DTreelandPlatformInterface::iconThemeName() const
@@ -74,7 +70,6 @@
 
 QColor DTreelandPlatformInterface::darkActiveColor() const
 {
-    // treeland does not provide dark active color, return active color as fallback
     return m_activeColor;
 }
 
@@ -95,44 +90,32 @@
 
 void DTreelandPlatformInterface::setWindowRadius(int windowRadius)
 {
-    if (m_appearanceContext) {
-        m_appearanceContext->set_round_corner_radius(windowRadius);
-    }
+    Q_UNUSED(windowRadius)
 }
 
 void DTreelandPlatformInterface::setIconThemeName(const QByteArray &iconThemeName)
 {
-    if (m_appearanceContext) {
-        m_appearanceContext->set_icon_theme(iconThemeName);
-    }
+    Q_UNUSED(iconThemeName)
 }
 
 void DTreelandPlatformInterface::setFontName(const QByteArray &fontName)
 {
-    if (m_fontContext) {
-        m_fontContext->set_font(fontName);
-    }
+    Q_UNUSED(fontName)
 }
 
 void DTreelandPlatformInterface::setMonoFontName(const QByteArray &monoFontName)
 {
-    if (m_fontContext) {
-        m_fontContext->set_monospace_font(monoFontName);
-    }
+    Q_UNUSED(monoFontName)
 }
 
 void DTreelandPlatformInterface::setFontPointSize(qreal fontPointSize)
 {
-    if (m_fontContext) {
-        m_fontContext->set_font_size(fontPointSize);
-    }
+    Q_UNUSED(fontPointSize)
 }
 
 void DTreelandPlatformInterface::setActiveColor(const QColor activeColor)
 {
-    if (m_appearanceContext) {
-        m_appearanceContext->set_active_color(activeColor.name());
-    }
+    Q_UNUSED(activeColor)
 }
 
 DGUI_END_NAMESPACE

src/plugins/platform/treeland/dtreelandplatforminterface.h

@@ -14,17 +14,12 @@
 DGUI_BEGIN_NAMESPACE
 
 class DTreelandPlatformInterfacePrivate;
-class PersonalizationManager;
-class PersonalizationFontContext;
-class PersonalizationAppearanceContext;
-class PersonalizationWindowContext;
+class TreelandAppearance;
 
 class DTreelandPlatformInterface : public QObject, public DPlatformInterface, public DCORE_NAMESPACE::DObject
 {
     Q_OBJECT
-    friend PersonalizationFontContext;
-    friend PersonalizationAppearanceContext;
-    friend PersonalizationWindowContext;
+    friend TreelandAppearance;
 public:
     explicit DTreelandPlatformInterface(DPlatformTheme *platformTheme);
 
@@ -51,10 +46,6 @@ class DTreelandPlatformInterface : public QObject, public DPlatformInterface, pu
     void initContext();
 
 private:
-    PersonalizationManager *m_manager;
-    QScopedPointer<PersonalizationAppearanceContext> m_appearanceContext;
-    QScopedPointer<PersonalizationFontContext> m_fontContext;
-
     QColor m_activeColor;
     int m_titleHeight;
     QByteArray m_fontName;
@@ -65,7 +56,7 @@ class DTreelandPlatformInterface : public QObject, public DPlatformInterface, pu
     int m_windowRadius;
     int m_scrollBarPolicy;
     QByteArray m_themeName;
-    uint32_t m_blurOpacity;
+    qreal m_blurOpacity;
 };
 
 DGUI_END_NAMESPACE