Properly use X11 startup ids

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index fba45f43c431b9698e272c5d3676e1e8a3490a9f..a9b85dbcc8971ea82fc292a67ba8ea5e44f87c2a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,8 +12,8 @@
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"

-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#include "config-dolphin.h"
+#if HAVE_KUSERFEEDBACK

 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 
 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 


@@ -21,17 +21,28 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>

-#include <Kdelibs4ConfigMigrator>

 #include <KConfigGui>
 #include <KConfigGui>

+#include <KIO/PreviewJob>
+#include <KWindowSystem>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <Kdelibs4ConfigMigrator>
+#endif

 
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>
 
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>

-#include <QDBusInterface>
-#include <QDBusAbstractInterface>

 #include <QDBusConnectionInterface>
 #include <QSessionManager>
 
 #include <QDBusConnectionInterface>
 #include <QSessionManager>
 

+#if HAVE_X11
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
+#include <QX11Info>
+#endif
+#endif
+

 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif
 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif


@@ -43,10 +54,16 @@ int main(int argc, char **argv)
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {
     // Prohibit using sudo or kdesu (but allow using the root user directly)
     if (getuid() == 0) {
         if (!qEnvironmentVariableIsEmpty("SUDO_USER")) {

-            std::cout << "Executing Dolphin with sudo is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with sudo can cause bugs and expose you to security vulnerabilities. "
+                         "Instead use Dolphin normally and you will be prompted for elevated privileges when "
+                         "performing file operations that require them."
+                      << std::endl;

             return EXIT_FAILURE;
         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {
             return EXIT_FAILURE;
         } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) {

-            std::cout << "Executing Dolphin with kdesu is not possible due to unfixable security vulnerabilities." << std::endl;
+            std::cout << "Running Dolphin with kdesu can cause bugs and expose you to security vulnerabilities. "
+                         "Instead use Dolphin normally and you will be prompted for elevated privileges when "
+                         "performing file operations that require them."
+                      << std::endl;

             return EXIT_FAILURE;
         }
     }
             return EXIT_FAILURE;
         }
     }


@@ -55,28 +72,39 @@ int main(int argc, char **argv)
     /**
      * enable high dpi support
      */
     /**
      * enable high dpi support
      */

+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);

-
+#endif

     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 

+    KIO::PreviewJob::setDefaultDevicePixelRatio(app.devicePixelRatio());
+

     KCrash::initialize();
 
     KCrash::initialize();
 

+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)

     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();
     Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
     migrate.migrate();

+#endif

 
     KLocalizedString::setApplicationDomain("dolphin");
 
     KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
 
     KLocalizedString::setApplicationDomain("dolphin");
 
     KAboutData aboutData(QStringLiteral("dolphin"), i18n("Dolphin"), QStringLiteral(DOLPHIN_VERSION_STRING),
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,

-                         i18nc("@info:credit", "(C) 2006-2018 Peter Penz, Frank Reininghaus, Emmanuel Pescosta and Elvis Angelaccio"));
+                         i18nc("@info:credit", "(C) 2006-2022 The Dolphin Developers"));

     aboutData.setHomepage(QStringLiteral("https://kde.org/applications/system/org.kde.dolphin"));
     aboutData.setHomepage(QStringLiteral("https://kde.org/applications/system/org.kde.dolphin"));

+    aboutData.addAuthor(i18nc("@info:credit", "Felix Ernst"),
+                        i18nc("@info:credit", "Maintainer (since 2021) and developer"),
+                        QStringLiteral("felixernst@kde.org"));
+    aboutData.addAuthor(i18nc("@info:credit", "Méven Car"),
+                        i18nc("@info:credit", "Maintainer (since 2021) and developer (since 2019)"),
+                        QStringLiteral("meven@kde.org"));

     aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),
     aboutData.addAuthor(i18nc("@info:credit", "Elvis Angelaccio"),

-                        i18nc("@info:credit", "Maintainer (since 2018) and developer"),
+                        i18nc("@info:credit", "Maintainer (2018-2021) and developer"),

                         QStringLiteral("elvis.angelaccio@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
                         i18nc("@info:credit", "Maintainer (2014-2018) and developer"),
                         QStringLiteral("elvis.angelaccio@kde.org"));
     aboutData.addAuthor(i18nc("@info:credit", "Emmanuel Pescosta"),
                         i18nc("@info:credit", "Maintainer (2014-2018) and developer"),


@@ -122,7 +150,7 @@ int main(int argc, char **argv)
                                                                                         "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("new-window"), i18nc("@info:shell", "Dolphin will explicitly open in a new window.")));
                                                                                         "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
     parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("new-window"), i18nc("@info:shell", "Dolphin will explicitly open in a new window.")));

-    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
+    parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface).")));

     parser.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open"));
 
     parser.process(app);
     parser.addPositionalArgument(QStringLiteral("+[Url]"), i18nc("@info:shell", "Document to open"));
 
     parser.process(app);


@@ -145,14 +173,29 @@ int main(int argc, char **argv)
         QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
         QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 
         QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
         QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
 

+#ifdef FLATPAK
+        KDBusService dolphinDBusService(KDBusService::NoExitOnFailure);
+#else

         KDBusService dolphinDBusService;
         KDBusService dolphinDBusService;

+#endif

         DBusInterface interface;
         interface.setAsDaemon();
         return app.exec();
     }
 
     if (!parser.isSet(QStringLiteral("new-window"))) {
         DBusInterface interface;
         interface.setAsDaemon();
         return app.exec();
     }
 
     if (!parser.isSet(QStringLiteral("new-window"))) {

-        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
+
+        QString token;
+        if (KWindowSystem::isPlatformWayland()) {
+            token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
+            qunsetenv("XDG_ACTIVATION_TOKEN");
+        } else if (KWindowSystem::isPlatformX11()) {
+#if HAVE_X11
+            token = QX11Info::nextStartupId();
+#endif
+        }
+
+        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView, QString(), token)) {

             // Successfully attached to existing instance of Dolphin
             return 0;
         }
             // Successfully attached to existing instance of Dolphin
             return 0;
         }


@@ -178,7 +221,12 @@ int main(int argc, char **argv)
 
     mainWindow->show();
 
 
     mainWindow->show();
 

-    KDBusService dolphinDBusService;
+    // Allow starting Dolphin on a system that is not running DBus:
+    KDBusService::StartupOptions serviceOptions = KDBusService::Multiple;
+    if (!QDBusConnection::sessionBus().isConnected()) {
+        serviceOptions |= KDBusService::NoExitOnFailure;
+    }
+    KDBusService dolphinDBusService(serviceOptions);

     DBusInterface interface;
 
     if (!app.isSessionRestored()) {
     DBusInterface interface;
 
     if (!app.isSessionRestored()) {


@@ -202,19 +250,19 @@ int main(int argc, char **argv)
                 // If the user passed any URLs to Dolphin, open those in the
                 // window after session-restoring it
                 if (startedWithURLs) {
                 // If the user passed any URLs to Dolphin, open those in the
                 // window after session-restoring it
                 if (startedWithURLs) {

-                    mainWindow->openDirectories(urls, splitView);
+                    if (openFiles) {
+                        mainWindow->openFiles(urls, splitView);
+                    } else {
+                        mainWindow->openDirectories(urls, splitView);
+                    }

                 }
                 }

-
-                // Now handle invalid locations in the set of active views to
-                // avoid issues like https://bugs.kde.org/show_bug.cgi?id=427619
-                mainWindow->setViewsWithInvalidPathsToHome();

             } else {
                 qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
             }
         }
     }
 
             } else {
                 qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
             }
         }
     }
 

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     auto feedbackProvider = DolphinFeedbackProvider::instance();
     Q_UNUSED(feedbackProvider)
 #endif
     auto feedbackProvider = DolphinFeedbackProvider::instance();
     Q_UNUSED(feedbackProvider)
 #endif