Merge branch 'Applications/19.08'

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index d0e477bc8d1b3ab22142615fbea8223b3aaf1906..12f86a2f369ace55f2dc082acdee69a09f6e479c 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -18,13 +18,17 @@
  */
 
 #include "global.h"
  */
 
 #include "global.h"

-#include "dolphindebug.h"
+

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

+#include "dolphindebug.h"

 
 #include <KRun>
 
 #include <KRun>

+#include <KWindowSystem>

 
 #include <QApplication>
 #include <QIcon>
 
 #include <QApplication>
 #include <QIcon>

+#include <QDBusInterface>
+#include <QDBusConnectionInterface>

 
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {
 
 QList<QUrl> Dolphin::validateUris(const QStringList& uriList)
 {


@@ -48,7 +52,7 @@ QUrl Dolphin::homeUrl()
 
 void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const OpenNewWindowFlags &flags)
 {
 
 void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const OpenNewWindowFlags &flags)
 {

-    QString command = QStringLiteral("dolphin");
+    QString command = QStringLiteral("dolphin --new-window");

 
     if (flags.testFlag(OpenNewWindowFlag::Select)) {
         command.append(QLatin1String(" --select"));
 
     if (flags.testFlag(OpenNewWindowFlag::Select)) {
         command.append(QLatin1String(" --select"));


@@ -57,6 +61,83 @@ void Dolphin::openNewWindow(const QList<QUrl> &urls, QWidget *window, const Open
     if (!urls.isEmpty()) {
         command.append(QLatin1String(" %U"));
     }
     if (!urls.isEmpty()) {
         command.append(QLatin1String(" %U"));
     }

+    KRun::run(
+        command,
+        urls,
+        window,
+        QApplication::applicationDisplayName(),
+        QApplication::windowIcon().name()
+    );
+}
+
+bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFiles, bool splitView, const QString& preferredService)
+{
+    // TODO: once Wayland clients can raise or activate themselves remove check from conditional
+    if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {
+        return false;
+    }
+
+    QVector<QPair<QSharedPointer<QDBusInterface>, QStringList>> dolphinServices;
+    if (!preferredService.isEmpty()) {
+        QSharedPointer<QDBusInterface> preferred(
+            new QDBusInterface(preferredService,
+            QStringLiteral("/dolphin/Dolphin_1"),
+            QStringLiteral("org.kde.dolphin.MainWindow"))
+        );
+        if (preferred->isValid() && !preferred->lastError().isValid()) {
+            dolphinServices.append(qMakePair(preferred, QStringList()));
+        }
+    }
+
+    // find all dolphin instances
+    const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames().value();
+    // Don't match the service without trailing "-" (unique instance)
+    const QString pattern = QStringLiteral("org.kde.dolphin-");
+    // Don't match the pid without leading "-"
+    const QString myPid = QStringLiteral("-") + QString::number(QCoreApplication::applicationPid());
+    for (const QString& service : services) {
+        if (service.startsWith(pattern) && !service.endsWith(myPid)) {
+            // Check if instance can handle our URLs
+            QSharedPointer<QDBusInterface> instance(
+                new QDBusInterface(service,
+                QStringLiteral("/dolphin/Dolphin_1"),
+                QStringLiteral("org.kde.dolphin.MainWindow"))
+            );
+            if (instance->isValid() && !instance->lastError().isValid()) {
+                dolphinServices.append(qMakePair(instance, QStringList()));
+            }
+        }
+    }
+
+    if (dolphinServices.isEmpty()) {
+        return false;
+    }
+
+    QStringList newUrls;

 
 

-    KRun::run(command, urls, window, qApp->applicationDisplayName(), qApp->windowIcon().name());
+    // check to see if any instances already have any of the given URLs open
+    const auto urls = QUrl::toStringList(inputUrls);
+    for (const QString& url : urls) {
+        bool urlFound = false;
+        for (auto& service: dolphinServices) {
+            QDBusReply<bool> isUrlOpen = service.first->call(QStringLiteral("isUrlOpen"), url);
+            if (isUrlOpen.isValid() && isUrlOpen.value()) {
+                service.second.append(url);
+                urlFound = true;
+                break;
+            }
+        }
+        if (!urlFound) {
+            newUrls.append(url);
+        }
+    }
+    dolphinServices.front().second << newUrls;
+
+    for (const auto& service: dolphinServices) {
+        if (!service.second.isEmpty()) {
+            service.first->call(openFiles ? QStringLiteral("openFiles") : QStringLiteral("openDirectories"), service.second, splitView);
+            service.first->call(QStringLiteral("activateWindow"));
+        }
+    }
+    return true;

 }
 }