Update copyright and maintainership info

[dolphin.git] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index d217a67ec82c71996d90b2f2b01636a88189380d..5d6d90b59e16259dc2d2c6e610c5e274a23babba 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -62,8 +62,7 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
 {
     bool attached = false;
 
 {
     bool attached = false;
 

-    // TODO: once Wayland clients can raise or activate themselves remove check from conditional
-    if (KWindowSystem::isPlatformWayland() || inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {
+    if (inputUrls.isEmpty() || !GeneralSettings::openExternallyCalledFolderInNewTab()) {

         return false;
     }
 
         return false;
     }
 


@@ -72,35 +71,55 @@ bool Dolphin::attachToExistingInstance(const QList<QUrl>& inputUrls, bool openFi
         return false;
     }
 
         return false;
     }
 

-    QStringList newUrls;
+    int activeWindowIndex = -1;
+    for (const auto& interface: qAsConst(dolphinInterfaces)) {
+        ++activeWindowIndex;

 
 

-    // check to see if any instances already have any of the given URLs open
+        auto isActiveWindowReply = interface.first->isActiveWindow();
+        isActiveWindowReply.waitForFinished();
+        if (!isActiveWindowReply.isError() && isActiveWindowReply.value()) {
+            break;
+        }
+    }
+
+    // check to see if any instances already have any of the given URLs or their parents open

     const auto urls = QUrl::toStringList(inputUrls);
     for (const QString& url : urls) {
         bool urlFound = false;
     const auto urls = QUrl::toStringList(inputUrls);
     for (const QString& url : urls) {
         bool urlFound = false;

-        for (auto& interface: dolphinInterfaces) {
-            auto isUrlOpenReply = interface.first->isUrlOpen(url);
+
+        // looping through the windows starting from the active one
+        int i = activeWindowIndex;
+        do {
+            auto &interface = dolphinInterfaces[i];
+
+            auto isUrlOpenReply = openFiles ? interface.first->isUrlOrParentOpen(url) : interface.first->isUrlOpen(url);

             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
                 interface.second.append(url);
                 urlFound = true;
                 break;
             }
             isUrlOpenReply.waitForFinished();
             if (!isUrlOpenReply.isError() && isUrlOpenReply.value()) {
                 interface.second.append(url);
                 urlFound = true;
                 break;
             }

+
+            i = (i + 1) % dolphinInterfaces.size();

         }
         }

+        while (i != activeWindowIndex);
+

         if (!urlFound) {
         if (!urlFound) {

-            newUrls.append(url);
+            dolphinInterfaces[activeWindowIndex].second.append(url);

         }
     }
         }
     }

-    dolphinInterfaces.front().second << newUrls;

 
     for (const auto& interface: qAsConst(dolphinInterfaces)) {
 
     for (const auto& interface: qAsConst(dolphinInterfaces)) {

-        if (!interface.second.isEmpty()) {
-            auto reply = openFiles ? interface.first->openFiles(interface.second, splitView) : interface.first->openDirectories(interface.second, splitView);
-            reply.waitForFinished();
-            if (!reply.isError()) {
-                interface.first->activateWindow();
-                attached = true;
-            }
+        if (interface.second.isEmpty()) {
+            continue;
+        }
+        auto reply = openFiles ?
+                    interface.first->openFiles(interface.second, splitView) :
+                    interface.first->openDirectories(interface.second, splitView);
+        reply.waitForFinished();
+        if (!reply.isError()) {
+            interface.first->activateWindow();
+            attached = true;

         }
     }
     return attached;
         }
     }
     return attached;