#2462 shortcuts: try activate window with XDG_ACTIVATION_TOKEN

Signed-off-by: Patrizio Bekerle <[email protected]>

Author: pbek

src/mainwindow.cpp

@@ -97,6 +97,7 @@
 #include <QTreeWidgetItem>
 #include <QUuid>
 #include <QWidgetAction>
+#include <QWindow>
 #include <QtConcurrent>
 #include <libraries/qttoolbareditor/src/toolbar_editor.hpp>
 #include <memory>
@@ -773,9 +774,10 @@ void MainWindow::initWaylandGlobalShortcuts(SettingsService &settings, const QSt
 
     _xdgShortcutManager->setShortcuts(shortcuts);
 
-    // Connect the activation signal to trigger the corresponding action
+    // Connect the activation signal to trigger the corresponding action.
+    // The activationToken from the portal authorizes window activation on Wayland.
     connect(_xdgShortcutManager, &XdgGlobalShortcutManager::shortcutActivated, this,
-            [this](const QString &shortcutId) {
+            [this](const QString &shortcutId, const QString &activationToken) {
                 QAction *action = findAction(shortcutId);
                 if (action == nullptr) {
                     qDebug() << "XDG GlobalShortcuts: failed to find action:" << shortcutId;
@@ -784,13 +786,19 @@ void MainWindow::initWaylandGlobalShortcuts(SettingsService &settings, const QSt
 
                 qDebug() << "XDG global shortcut action triggered:" << action->objectName();
 
+                // Set the activation token so that showWindow() can use it to
+                // request window activation from the Wayland compositor
+                _waylandActivationToken = activationToken;
+
                 // Don't call showWindow() for the "Show/Hide application" action
                 // because it will call it itself
                 if (action->objectName() != QStringLiteral("actionShow_Hide_application")) {
                     showWindow();
                 }
 
                 action->trigger();
+
+                _waylandActivationToken.clear();
             });
 
     // Start the session creation and shortcut binding flow
@@ -6746,6 +6754,26 @@ void MainWindow::showWindow() {
     // show the window in case we are using the system tray
     show();
 
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
+    // On Wayland, use the XDG activation token (if available) to request
+    // window activation from the compositor.  Without a valid token the
+    // compositor will refuse to raise/focus the window because Wayland
+    // does not allow applications to steal focus on their own.
+    if (!_waylandActivationToken.isEmpty() && windowHandle() != nullptr) {
+        qputenv("XDG_ACTIVATION_TOKEN", _waylandActivationToken.toUtf8());
+        windowHandle()->requestActivate();
+        qunsetenv("XDG_ACTIVATION_TOKEN");
+
+        // Still un-minimize if needed
+        if (windowState() & Qt::WindowMinimized) {
+            setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);
+        }
+
+        startNavigationParser();
+        return;
+    }
+#endif
+
     // bring application window to the front
     activateWindow();    // for Windows
     setWindowState((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive);

src/mainwindow.h

@@ -898,6 +898,9 @@ class MainWindow : public QMainWindow {
     QList<QHotkey *> _globalShortcuts;
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
     XdgGlobalShortcutManager *_xdgShortcutManager = nullptr;
+    // Activation token from the XDG GlobalShortcuts portal, used to authorize
+    // window activation on Wayland compositors via xdg_activation_v1
+    QString _waylandActivationToken;
 #endif
     int _lastNoteId = 0;
     bool _scriptUpdateFound = false;

src/services/xdgglobalshortcutmanager.cpp

@@ -221,14 +221,19 @@ void XdgGlobalShortcutManager::onShortcutActivated(QDBusObjectPath sessionHandle
                                                    QString shortcutId, qulonglong timestamp,
                                                    QVariantMap options) {
     Q_UNUSED(timestamp)
-    Q_UNUSED(options)
 
     if (sessionHandle.path() != _sessionHandle) {
         return;
     }
 
-    qDebug() << "XDG GlobalShortcuts: shortcut activated:" << shortcutId;
-    emit shortcutActivated(shortcutId);
+    // Extract the activation token from the portal options — this token
+    // authorizes the application to activate (raise/focus) its window on
+    // Wayland compositors that implement xdg_activation_v1
+    const QString activationToken = options.value(QStringLiteral("activation_token")).toString();
+
+    qDebug() << "XDG GlobalShortcuts: shortcut activated:" << shortcutId << "activation_token:"
+             << (activationToken.isEmpty() ? QStringLiteral("(none)") : activationToken);
+    emit shortcutActivated(shortcutId, activationToken);
 }
 
 QString XdgGlobalShortcutManager::keySequenceToXdgTrigger(const QKeySequence &seq) {

src/services/xdgglobalshortcutmanager.h

@@ -81,8 +81,10 @@ class XdgGlobalShortcutManager : public QObject {
     /**
      * Emitted when a global shortcut is activated by the user.
      * @param shortcutId The action object name of the triggered shortcut
+     * @param activationToken The XDG activation token from the portal,
+     *        used to authorize window activation on Wayland compositors
      */
-    void shortcutActivated(const QString &shortcutId);
+    void shortcutActivated(const QString &shortcutId, const QString &activationToken);
 
    private slots:
     void onCreateSessionResponse(uint response, QVariantMap results);