Activation fixes

src/ipc/ipcserver.h

@@ -5,9 +5,17 @@
 #ifndef TREMOTESF_IPCSERVER_H
 #define TREMOTESF_IPCSERVER_H
 
+#include <optional>
 #include <QObject>
 
 namespace tremotesf {
+    struct WindowActivationToken {
+#ifdef TREMOTESF_UNIX_FREEDESKTOP
+        std::optional<QByteArray> x11StartupNotificationId{};
+        std::optional<QByteArray> waylandXdfActivationToken{};
+#endif
+    };
+
     class IpcServer : public QObject {
         Q_OBJECT
 
@@ -18,12 +26,9 @@ namespace tremotesf {
         inline explicit IpcServer(QObject* parent = nullptr) : QObject(parent){};
 
     signals:
-        void windowActivationRequested(
-            const QString& torrentHash, const QByteArray& startupNotificationId, const QByteArray& xdgActivationToken
-        );
-        void torrentsAddingRequested(
-            const QStringList& files, const QStringList& urls, const QByteArray& startupNoficationId
-        );
+        void windowActivationRequested(const QString& torrentHash, const WindowActivationToken& token);
+        void
+        torrentsAddingRequested(const QStringList& files, const QStringList& urls, const WindowActivationToken& token);
     };
 }
 

src/ipc/ipcserver_dbus_service.cpp

@@ -16,6 +16,21 @@ SPECIALIZE_FORMATTER_FOR_QDEBUG(QVariantMap)
 SPECIALIZE_FORMATTER_FOR_QDEBUG(QVariantList)
 
 namespace tremotesf {
+    namespace {
+        WindowActivationToken platformDataToWindowActivationToken(const QVariantMap& platformData) {
+            WindowActivationToken token{};
+            if (const auto startupId = platformData.value(IpcDbusService::desktopStartupIdField).toByteArray();
+                !startupId.isEmpty()) {
+                token.x11StartupNotificationId = startupId;
+            }
+            if (const auto activationToken = platformData.value(IpcDbusService::xdgActivationTokenField).toByteArray();
+                !activationToken.isEmpty()) {
+                token.waylandXdfActivationToken = activationToken;
+            }
+            return token;
+        }
+    }
+
     IpcDbusService::IpcDbusService(IpcServerDbus* ipcServer, QObject* parent) : QObject(parent), mIpcServer(ipcServer) {
         new OrgFreedesktopApplicationAdaptor(this);
 
@@ -39,8 +54,7 @@ namespace tremotesf {
         logInfo("Window activation requested, platform_data = {}", platform_data);
         emit mIpcServer->windowActivationRequested(
             platform_data.value(torrentHashField).toString(),
-            platform_data.value(desktopStartupIdField).toByteArray(),
-            platform_data.value(xdgActivationTokenField).toByteArray()
+            platformDataToWindowActivationToken(platform_data)
         );
     }
 
@@ -57,7 +71,7 @@ namespace tremotesf {
                 }
             }
         }
-        emit mIpcServer->torrentsAddingRequested(files, urls, platform_data.value(desktopStartupIdField).toByteArray());
+        emit mIpcServer->torrentsAddingRequested(files, urls, platformDataToWindowActivationToken(platform_data));
     }
 
     void IpcDbusService::ActivateAction(

src/ipc/ipcserver_socket.cpp

@@ -88,7 +88,7 @@ namespace tremotesf {
                 const QByteArray message(socket->readAll());
                 if (message.size() == 1 && message.front() == activateWindowMessage) {
                     logInfo("IpcServerSocket: window activation requested");
-                    emit windowActivationRequested({}, {}, {});
+                    emit windowActivationRequested({}, {});
                 } else {
                     QCborParserError error{};
                     const auto cbor = QCborValue::fromCbor(message, &error);

src/startup/main.cpp

@@ -188,7 +188,7 @@ int main(int argc, char** argv) {
     const SaveWindowStateDispatcher saveStateDispatcher{};
 
     MainWindow window(std::move(args.files), std::move(args.urls));
-    window.showMinimized(args.minimized);
+    window.initialShow(args.minimized);
 
     if (signalHandler.isExitRequested()) {
         return EXIT_SUCCESS;