feat: replace internal XdgActivation implementation with Dde::Shell

CMakeLists.txt

@@ -26,6 +26,7 @@ find_package(QT NAMES ${QT_NS} REQUIRED COMPONENTS Core)
 find_package(${QT_NS} REQUIRED COMPONENTS Core Gui Concurrent Qml Svg Quick QuickControls2 LinguistTools)
 find_package(${DTK_NS} REQUIRED COMPONENTS Core Gui)
 find_package(${ASQT_NS} 1.0 REQUIRED)
+find_package(DDEShell REQUIRED)
 find_package(ECM NO_MODULE)
 if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
   find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
@@ -147,6 +148,7 @@ target_link_libraries(launchpadcommon PUBLIC
     launcher-models
     dde-integration-dbus
     treeland-integration
+    Dde::Shell
 )
 
 if (HAVE_DDE_API_EVENTLOGGER)

debian/control

@@ -17,7 +17,6 @@ Build-Depends:
  qt6-tools-dev-tools,
  qt6-wayland-dev,
  qt6-wayland-private-dev,
- wayland-protocols,
  libdtkcommon-dev,
  libdtk6core-dev (>= 6.0.43),
 # v-- provides qdbusxml2cpp-fix binary
@@ -26,7 +25,7 @@ Build-Depends:
  libdtk6gui-dev (>= 6.0.19),
  libdtk6declarative-dev (>> 6.7.33),
  dde-api-dev (>> 6.0.39),
- libdde-shell-dev (>= 0.0.10),
+ libdde-shell-dev (>= 2.0.45),
  libappstreamqt-dev (>= 1.0.0)
 Standards-Version: 4.6.0
 Rules-Requires-Root: no

desktopintegration.cpp

@@ -12,15 +12,12 @@
 #include <QRect>
 #include <QGuiApplication>
 #include <QLoggingCategory>
 #include <appinfo.h>
 #include <appmgr.h>
 
-#ifdef HAVE_WAYLAND_XDG_ACTIVATION
 #include <xdgactivation.h>
-#include <DGuiApplicationHelper>
-#endif
 
 #include <AppStreamQt/pool.h>
 
 #include "appwiz.h"
 #include "ddedock.h"
@@ -51,16 +48,15 @@
 void DesktopIntegration::launchByDesktopId(const QString &desktopId)
 {
     qCInfo(logDesktopIntegration) << "Launching app by desktop ID:" << desktopId;
-    QString token;
-#ifdef HAVE_WAYLAND_XDG_ACTIVATION
-    auto xdgActivation = DDEIntegration::XdgActivationV1::instance();
-    if (xdgActivation->isActive())
-        token = xdgActivation->requestToken(QGuiApplication::focusWindow(), desktopId);
-#endif
-    if (!AppMgr::launchApp(desktopId, token)) {
-        qCDebug(logDesktopIntegration) << "AppMgr launch failed, trying AppInfo launch";
-        AppInfo::launchByDesktopId(desktopId);
-    }
+    auto *activation = new ds::XdgActivation(&instance());
+    connect(activation, &ds::XdgActivation::tokenReady, &instance(), [desktopId, activation](const QString &token) {
+        if (!AppMgr::launchApp(desktopId, token)) {
+            qCDebug(logDesktopIntegration) << "AppMgr launch failed, trying AppInfo launch";
+            AppInfo::launchByDesktopId(desktopId);
+        }
+        activation->deleteLater();
+    });
+    activation->requestToken();
 }
 
 QString DesktopIntegration::environmentVariable(const QString &env)
@@ -266,19 +262,6 @@
     m_iconScaleFactor = dconfig->value("iconScaleFactor", 1.0).toReal();
     qCInfo(logDesktopIntegration) << "Icon scale factor loaded:" << m_iconScaleFactor;
 
-#ifdef HAVE_WAYLAND_XDG_ACTIVATION
-    if (DTK_GUI_NAMESPACE::DGuiApplicationHelper::testAttribute(
-            DTK_GUI_NAMESPACE::DGuiApplicationHelper::IsWaylandPlatform)) {
-        auto *xdgActivation = DDEIntegration::XdgActivationV1::instance();
-        connect(xdgActivation, &DDEIntegration::XdgActivationV1::activeChanged, this, []() {
-            if (DDEIntegration::XdgActivationV1::instance()->isActive())
-                qCInfo(logDesktopIntegration) << "XdgActivationV1: ready, XDG activation token support enabled";
-            else
-                qCWarning(logDesktopIntegration) << "XdgActivationV1: compositor did not advertise xdg_activation_v1, token requests will be skipped";
-        });
-    }
-#endif
-
     connect(m_dockIntegration, &DdeDock::directionChanged, this, &DesktopIntegration::dockPositionChanged);
     connect(m_dockIntegration, &DdeDock::geometryChanged, this, &DesktopIntegration::dockGeometryChanged);
     connect(m_appearanceIntegration, &Appearance::wallpaperBlurhashChanged, this, &DesktopIntegration::backgroundUrlChanged);

shell-launcher-applet/package/launcheritem.qml

@@ -152,8 +152,8 @@ AppletItem {
     }
 
     function launchApp(desktopId) {
-        LauncherController.visible = false;
         DesktopIntegration.launchByDesktopId(desktopId);
+        LauncherController.visible = false;
     }
 
     function assignFullscreenFrameScreen() {

src/ddeintegration/CMakeLists.txt

@@ -150,55 +150,3 @@ if (HAVE_DDE_API_EVENTLOGGER)
     target_compile_definitions(dde-integration-dbus PRIVATE HAVE_DDE_API_EVENTLOGGER)
     target_link_libraries(dde-integration-dbus PRIVATE DDEAPI::EventLogger)
 endif()
-
-# Optional Wayland XDG activation support: request a token from the compositor
-# before launching applications so they can raise their window on first map.
-# Requires Qt6WaylandClient and wayland-protocols (for xdg-activation-v1.xml).
-find_package(Qt6 COMPONENTS WaylandClient QUIET)
-find_package(PkgConfig QUIET)
-if(Qt6WaylandClient_FOUND AND PkgConfig_FOUND)
-    pkg_check_modules(WaylandProtocols QUIET wayland-protocols)
-    if(WaylandProtocols_FOUND)
-        pkg_get_variable(WAYLAND_PROTOCOLS_DATADIR wayland-protocols pkgdatadir)
-        set(XDG_ACTIVATION_XML
-            "${WAYLAND_PROTOCOLS_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml")
-    endif()
-endif()
-
-if(Qt6WaylandClient_FOUND AND DEFINED XDG_ACTIVATION_XML AND EXISTS "${XDG_ACTIVATION_XML}")
-    if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
-        find_package(Qt6 COMPONENTS WaylandClientPrivate QUIET)
-    endif()
-
-    qt_generate_wayland_protocol_client_sources(dde-integration-dbus
-        FILES
-            ${XDG_ACTIVATION_XML}
-    )
-
-    target_sources(dde-integration-dbus PRIVATE
-        xdgactivation.cpp
-    )
-
-    target_sources(dde-integration-dbus PUBLIC
-        FILE_SET HEADERS FILES xdgactivation.h
-    )
-
-    # The Wayland protocol generator emits headers into the binary dir;
-    # expose it publicly so consumers (e.g. launchpadcommon) can find them.
-    target_include_directories(dde-integration-dbus PUBLIC
-        ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-    target_link_libraries(dde-integration-dbus PUBLIC
-        Qt6::WaylandClient
-        Qt6::WaylandClientPrivate
-        ${DTK_NS}::Gui
-    )
-
-    target_compile_definitions(dde-integration-dbus PUBLIC
-        HAVE_WAYLAND_XDG_ACTIVATION
-    )
-    message(STATUS "XDG activation support enabled (${XDG_ACTIVATION_XML})")
-else()
-    message(STATUS "XDG activation support disabled (Qt6WaylandClient or wayland-protocols not found)")
-endif()