From c9e99b52b2e2ecd8b41502f83752f59db75f417e Mon Sep 17 00:00:00 2001
From: wjyrich <wujiangyu@uniontech.com>
Date: Wed, 11 Jun 2025 11:49:47 +0800
Subject: [PATCH] feat: add activeWindow Dbus interface.

add interface for deepin-apps.

Log:
---
 .../dock/api/old/org.deepin.dde.daemon.Dock1.xml   |  3 +++
 panels/dock/dockdbusproxy.cpp                      | 14 ++++++++++++++
 panels/dock/dockdbusproxy.h                        |  1 +
 panels/dock/taskmanager/taskmanager.cpp            | 11 +++++++++++
 panels/dock/taskmanager/taskmanager.h              |  1 +
 5 files changed, 30 insertions(+)

diff --git a/panels/dock/api/old/org.deepin.dde.daemon.Dock1.xml b/panels/dock/api/old/org.deepin.dde.daemon.Dock1.xml
index aac0eb5dc..59970c250 100644
--- a/panels/dock/api/old/org.deepin.dde.daemon.Dock1.xml
+++ b/panels/dock/api/old/org.deepin.dde.daemon.Dock1.xml
@@ -15,6 +15,9 @@
             <arg name="desktopFile" type="s" direction="in"/>
             <arg name="docked" type="b" direction="out"/>
         </method>
+        <method name="ActivateWindow">
+            <arg name="win" type="u" direction="in"/>
+        </method>
         <property access="readwrite" type="u" name="WindowSizeEfficient"/>
         <property access="readwrite" type="u" name="WindowSizeFashion"/>
         <!-- <property access="readwrite" type="u" name="ShowTimeout"/>
diff --git a/panels/dock/dockdbusproxy.cpp b/panels/dock/dockdbusproxy.cpp
index f70f94ab2..59a19c31d 100644
--- a/panels/dock/dockdbusproxy.cpp
+++ b/panels/dock/dockdbusproxy.cpp
@@ -195,6 +195,20 @@ bool DockDBusProxy::RequestUndock(const QString &desktopFile)
     return res;
 }
 
+void DockDBusProxy::ActivateWindow(uint32_t win)
+{
+    qDebug() << "ActivateWindow" << win;
+    
+    // 通过 taskmanager 来激活窗口，避免直接依赖 X11Utils
+    DAppletBridge bridge("org.deepin.ds.dock.taskmanager");
+    auto appletItem = bridge.applet();
+    if (appletItem) {
+        QMetaObject::invokeMethod(appletItem, "activateWindow", Qt::QueuedConnection, Q_ARG(uint32_t, win));
+    } else {
+        qWarning() << "Cannot activate window: taskmanager applet not available";
+    }
+}
+
 QStringList DockDBusProxy::GetLoadedPlugins()
 {
     // TODO: implement this function
diff --git a/panels/dock/dockdbusproxy.h b/panels/dock/dockdbusproxy.h
index d78a3b38d..ab4283bff 100644
--- a/panels/dock/dockdbusproxy.h
+++ b/panels/dock/dockdbusproxy.h
@@ -71,6 +71,7 @@ class DockDBusProxy final: public QObject, public QDBusContext
     bool RequestDock(const QString &desktopFile, int index);
     bool IsDocked(const QString &desktopFile);
     bool RequestUndock(const QString &desktopFile);
+    void ActivateWindow(uint32_t win);
 
     bool showInPrimary() const;
     void setShowInPrimary(bool newShowInPrimary);
diff --git a/panels/dock/taskmanager/taskmanager.cpp b/panels/dock/taskmanager/taskmanager.cpp
index f3a0a16ab..d13cb962f 100644
--- a/panels/dock/taskmanager/taskmanager.cpp
+++ b/panels/dock/taskmanager/taskmanager.cpp
@@ -27,6 +27,7 @@
 
 #ifdef BUILD_WITH_X11
 #include "x11windowmonitor.h"
+#include "x11utils.h"
 #endif
 
 Q_LOGGING_CATEGORY(taskManagerLog, "dde.shell.dock.taskmanager", QtDebugMsg)
@@ -407,6 +408,16 @@ bool TaskManager::windowFullscreen()
     return m_windowFullscreen;
 }
 
+void TaskManager::activateWindow(uint32_t windowID)
+{
+#ifdef BUILD_WITH_X11
+    X11Utils::instance()->setActiveWindow(static_cast<xcb_window_t>(windowID));
+#else
+    qWarning() << "activateWindow not supported on this platform";
+    Q_UNUSED(windowID)
+#endif
+}
+
 D_APPLET_CLASS(TaskManager)
 }
 
diff --git a/panels/dock/taskmanager/taskmanager.h b/panels/dock/taskmanager/taskmanager.h
index 13e8e052c..731b929d5 100644
--- a/panels/dock/taskmanager/taskmanager.h
+++ b/panels/dock/taskmanager/taskmanager.h
@@ -99,6 +99,7 @@ class TaskManager : public DS_NAMESPACE::DContainment, public AbstractTaskManage
     Q_INVOKABLE void hideItemPreview();
 
     Q_INVOKABLE void setAppItemWindowIconGeometry(const QString& appid, QObject* relativePositionItem, const int& x1, const int& y1, const int& x2, const int& y2);
+    Q_INVOKABLE void activateWindow(uint32_t windowID);
 
 Q_SIGNALS:
     void dataModelChanged();