feat: add xdg-activation-v1 client for SNI tray activation token

18202781743 · 18202781743 · commit 1a230576765c · 2026-06-04T11:44:59.000+08:00
Add XdgActivationClient that uses QWaylandClientExtension to bind dde-shell's xdg_activation_v1 global and request activation tokens via standard Wayland protocol before calling SNI Activate. Modified sniprotocolhandler to request token asynchronously before calling Activate, setting XDG_ACTIVATION_TOKEN env var. Log: SNI托盘图标Wayland下点击时申请xdgactivation token激活DBus窗口 Issue: #6
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 #
 # SPDX-License-Identifier: CC0-1.0
 
@@ -40,6 +40,9 @@ endif()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
+find_package(PkgConfig REQUIRED)
+pkg_get_variable(WAYLAND_PROTOCOLS_DATADIR wayland-protocols pkgdatadir)
+
 add_subdirectory(plugins)
 add_subdirectory(src)
 
diff --git a/plugins/application-tray/CMakeLists.txt b/plugins/application-tray/CMakeLists.txt
@@ -7,11 +7,15 @@ set(PLUGIN_NAME "application-tray")
 project(${PLUGIN_NAME})
 
 find_package(PkgConfig REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED Core Gui Widgets DBus)
+find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED Core Gui Widgets DBus WaylandClient)
+if(Qt${QT_VERSION_MAJOR}_VERSION VERSION_GREATER_EQUAL 6.10)
+  find_package(Qt${QT_VERSION_MAJOR} COMPONENTS GuiPrivate WaylandClientPrivate REQUIRED)
+endif()
 find_package(Dtk${DTK_VERSION_MAJOR} REQUIRED Core Gui Widget Tools)
 find_package(KF6WindowSystem 6.6 REQUIRED) # for x11 tray selection owner
 
 pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11 xcb xcb-image xcb-damage xcb-composite xcb-xfixes xcb-util xcb-shape xtst xcb-xtest xcb-res xcb-ewmh)
+pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)
 
 set(TRAY_SOURCES
     api/types/dbusimagelist.cpp api/types/dbusimagelist.h
@@ -29,6 +33,9 @@ set(TRAY_SOURCES
     c_ptr.h
     traymanager1.cpp traymanager1.h
     fdoselectionmanager.cpp fdoselectionmanager.h
+
+    ${CMAKE_SOURCE_DIR}/src/tray-wayland-integration/xdgactivationclient.h
+    ${CMAKE_SOURCE_DIR}/src/tray-wayland-integration/xdgactivationclient.cpp
 )
 
 set_source_files_properties(
@@ -65,6 +72,12 @@ add_library(${PLUGIN_NAME} SHARED
     application-tray.qrc
 )
 
+qt_generate_wayland_protocol_client_sources(${PLUGIN_NAME}
+NO_INCLUDE_CORE_ONLY
+FILES
+    ${WAYLAND_PROTOCOLS_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+)
+
 target_compile_definitions(${PLUGIN_NAME} PRIVATE "QT_PLUGIN")
 
 target_link_libraries(${PLUGIN_NAME}
@@ -74,11 +87,16 @@ target_link_libraries(${PLUGIN_NAME}
         Qt${QT_VERSION_MAJOR}::Widgets
         Qt${QT_VERSION_MAJOR}::CorePrivate
         Qt${QT_VERSION_MAJOR}::WidgetsPrivate
+        Qt${QT_VERSION_MAJOR}::GuiPrivate
+        Qt${QT_VERSION_MAJOR}::WaylandClient
+        Qt${QT_VERSION_MAJOR}::WaylandClientPrivate
+        Wayland::Client
         Dtk${DTK_VERSION_MAJOR}::Core
         Dtk${DTK_VERSION_MAJOR}::Gui
         Dtk${DTK_VERSION_MAJOR}::Widget
         KF6::WindowSystem
         PkgConfig::X11
+        PkgConfig::WaylandClient
         dbusmenuqt
         dockpluginmanager-interface
 )
diff --git a/plugins/application-tray/sniprotocolhandler.cpp b/plugins/application-tray/sniprotocolhandler.cpp
@@ -8,6 +8,7 @@
 
 #include "util.h"
 #include "plugin.h"
+#include "xdgactivationclient.h"
 
 #include "dbusmenuimporter.h"
 
@@ -317,7 +318,21 @@ bool SniTrayProtocolHandler::eventFilter(QObject *watched, QEvent *event)
         if (event->type() == QEvent::MouseButtonRelease) {
             QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
             if (mouseEvent->button() == Qt::LeftButton) {
-                m_sniInter->Activate(0, 0);
+                auto *activationClient = XdgActivationClient::instance();
+                if (activationClient->isActive()) {
+                    auto widget = static_cast<QWidget*>(parent());
+                    auto *win = widget->window()->windowHandle();
+                    auto sniInter = m_sniInter;
+                    activationClient->requestToken(win, QString(), [sniInter](const QString &token) {
+                        if (!token.isEmpty()) {
+                            qputenv("XDG_ACTIVATION_TOKEN", token.toUtf8());
+                        }
+                        sniInter->Activate(0, 0);
+                        qunsetenv("XDG_ACTIVATION_TOKEN");
+                    });
+                } else {
+                    m_sniInter->Activate(0, 0);
+                }
             } else if (mouseEvent->button() == Qt::RightButton) {
                 if (!menuImporter()) {
                     m_sniInter->ContextMenu(0, 0);
diff --git a/src/tray-wayland-integration/CMakeLists.txt b/src/tray-wayland-integration/CMakeLists.txt
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
+# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
 #
 # SPDX-License-Identifier: CC0-1.0
 
@@ -35,13 +35,16 @@ add_library(dockpluginmanager SHARED
     pluginmanagerintegration.cpp
     pluginsurface_p.h
     pluginsurface.cpp
+    xdgactivationclient.h
+    xdgactivationclient.cpp
     main.cpp
 )
 
 qt_generate_wayland_protocol_client_sources(dockpluginmanager
 NO_INCLUDE_CORE_ONLY
 FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/plugin-manager-v1.xml
+    ${WAYLAND_PROTOCOLS_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
 )
 
 target_link_libraries(dockpluginmanager
diff --git a/src/tray-wayland-integration/xdgactivationclient.cpp b/src/tray-wayland-integration/xdgactivationclient.cpp
@@ -0,0 +1,138 @@
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "xdgactivationclient.h"
+
+#include <QGuiApplication>
+#include <QLoggingCategory>
+#include <QPointer>
+#include <QWindow>
+#include <QtWaylandClient/QWaylandClientExtension>
+
+#include "qwayland-xdg-activation-v1.h"
+#include <private/qwaylanddisplay_p.h>
+#include <private/qwaylandinputdevice_p.h>
+#include <private/qwaylandwindow_p.h>
+
+Q_LOGGING_CATEGORY(trayXdgActivation, "dde.tray.xdgactivation")
+
+namespace tray {
+
+class XdgActivationTokenV1 : public QObject, public QtWayland::xdg_activation_token_v1
+{
+    Q_OBJECT
+public:
+    ~XdgActivationTokenV1() override { destroy(); }
+
+Q_SIGNALS:
+    void done(const QString &token);
+
+protected:
+    void xdg_activation_token_v1_done(const QString &token) override
+    {
+        Q_EMIT done(token);
+    }
+};
+
+class XdgActivationV1 : public QWaylandClientExtensionTemplate<XdgActivationV1>,
+                        public QtWayland::xdg_activation_v1
+{
+public:
+    XdgActivationV1()
+        : QWaylandClientExtensionTemplate<XdgActivationV1>(1)
+    {
+        initialize();
+    }
+
+    ~XdgActivationV1() override
+    {
+        if (isInitialized())
+            destroy();
+    }
+
+    XdgActivationTokenV1 *createTokenProvider(QWindow *window, const QString &appId)
+    {
+        auto *provider = new XdgActivationTokenV1;
+        provider->init(get_activation_token());
+
+        if (window) {
+            if (auto *waylandWindow = dynamic_cast<QtWaylandClient::QWaylandWindow *>(window->handle())) {
+                if (auto *surface = waylandWindow->wlSurface())
+                    provider->set_surface(surface);
+                if (auto *inputDevice = waylandWindow->display()->lastInputDevice())
+                    provider->set_serial(inputDevice->serial(), inputDevice->wl_seat());
+            }
+        }
+
+        if (!appId.isEmpty())
+            provider->set_app_id(appId);
+
+        provider->commit();
+        return provider;
+    }
+};
+
+XdgActivationClient *XdgActivationClient::instance()
+{
+    static XdgActivationClient *s_instance = nullptr;
+    if (!s_instance) {
+        s_instance = new XdgActivationClient(qApp);
+    }
+    return s_instance;
+}
+
+XdgActivationClient::XdgActivationClient(QObject *parent)
+    : QObject(parent)
+    , m_activation(new XdgActivationV1)
+{
+    m_activation->setParent(this);
+}
+
+XdgActivationClient::~XdgActivationClient() = default;
+
+bool XdgActivationClient::isActive() const
+{
+    return m_activation && m_activation->isActive();
+}
+
+void XdgActivationClient::requestToken(QWindow *window, const QString &appId, TokenCallback callback)
+{
+    if (m_pendingProvider) {
+        qCWarning(trayXdgActivation) << "Token request already in progress";
+        if (callback) callback(QString());
+        return;
+    }
+
+    if (!isActive()) {
+        qCDebug(trayXdgActivation) << "xdg_activation_v1 not active";
+        if (callback) callback(QString());
+        return;
+    }
+
+    auto effectiveWindow = window ? window : QGuiApplication::focusWindow();
+    if (!effectiveWindow) {
+        qCWarning(trayXdgActivation) << "No target window for activation token";
+        if (callback) callback(QString());
+        return;
+    }
+
+    auto *provider = m_activation->createTokenProvider(effectiveWindow, appId);
+    m_pendingProvider = provider;
+
+    connect(provider, &XdgActivationTokenV1::done, this, [this, callback](const QString &token) {
+        m_pendingProvider = nullptr;
+
+        if (token.isEmpty())
+            qCWarning(trayXdgActivation) << "Empty activation token received";
+        else
+            qCDebug(trayXdgActivation) << "Activation token received";
+
+        if (callback) callback(token);
+        sender()->deleteLater();
+    }, Qt::SingleShotConnection);
+}
+
+} // namespace tray
+
+#include "xdgactivationclient.moc"
diff --git a/src/tray-wayland-integration/xdgactivationclient.h b/src/tray-wayland-integration/xdgactivationclient.h
@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <QObject>
+#include <QPointer>
+#include <QString>
+#include <functional>
+
+class QWindow;
+
+namespace tray {
+
+class XdgActivationTokenV1;
+
+class XdgActivationClient : public QObject
+{
+    Q_OBJECT
+public:
+    static XdgActivationClient *instance();
+
+    bool isActive() const;
+
+    using TokenCallback = std::function<void(const QString &token)>;
+    void requestToken(QWindow *window, const QString &appId, TokenCallback callback);
+
+private:
+    explicit XdgActivationClient(QObject *parent = nullptr);
+    ~XdgActivationClient() override;
+
+    class XdgActivationV1 *m_activation = nullptr;
+    QPointer<XdgActivationTokenV1> m_pendingProvider;
+};
+
+} // namespace tray

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.`
	`1`	`+# SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: CC0-1.0`
`4`	`4`
`@@ -35,13 +35,16 @@ add_library(dockpluginmanager SHARED`
`35`	`35`	`pluginmanagerintegration.cpp`
`36`	`36`	`pluginsurface_p.h`
`37`	`37`	`pluginsurface.cpp`
	`38`	`+ xdgactivationclient.h`
	`39`	`+ xdgactivationclient.cpp`
`38`	`40`	`main.cpp`
`39`	`41`	`)`
`40`	`42`
`41`	`43`	`qt_generate_wayland_protocol_client_sources(dockpluginmanager`
`42`	`44`	`NO_INCLUDE_CORE_ONLY`
`43`	`45`	`FILES`
`44`	`46`	`${CMAKE_CURRENT_SOURCE_DIR}/../protocol/plugin-manager-v1.xml`
	`47`	`+ ${WAYLAND_PROTOCOLS_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml`
`45`	`48`	`)`
`46`	`49`
`47`	`50`	`target_link_libraries(dockpluginmanager`