Ticket #10970: 10970.patch

src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp

@@ -21 +21 @@
 #include <MessageFilter.h>
 #include <MessageRunner.h>
 #include <Path.h>
+#include <PopUpMenu.h>
+#include <Query.h>
 #include <StringView.h>
 #include <TabView.h>
 #include <ScrollView.h>
 #include <SplitView.h>
 #include <TextView.h>
+#include <VolumeRoster.h>
 
+#include <AutoDeleter.h>
 #include <AutoLocker.h>
 
 #include "Breakpoint.h"
@@ -378 +382 @@
         }
         case MSG_LOCATE_SOURCE_IF_NEEDED:
         {
-            if (fActiveFunction != NULL
-                && fActiveFunction->GetFunctionDebugInfo()
-                    ->SourceFile() != NULL && fActiveSourceCode != NULL
-                && fActiveSourceCode->GetSourceFile() == NULL
-                && fActiveFunction->GetFunction()->SourceCodeState()
-                    != FUNCTION_SOURCE_NOT_LOADED) {
-                try {
-                    if (fFilePanel == NULL) {
-                        fFilePanel = new BFilePanel(B_OPEN_PANEL,
-                            new BMessenger(this));
-                    }
-                    fFilePanel->Show();
-                } catch (...) {
-                    delete fFilePanel;
-                    fFilePanel = NULL;
-                }
-            }
-            break;
+            _HandleLocateSourceRequest();
         }
         case MSG_THREAD_RUN:
         case MSG_THREAD_STOP:
@@ -1582 +1569 @@
 }
 
 
+void
+TeamWindow::_HandleLocateSourceRequest()
+{
+    if (fActiveFunction == NULL)
+        return;
+    if (fActiveFunction->GetFunctionDebugInfo()->SourceFile() == NULL)
+        return;
+    if (fActiveSourceCode == NULL)
+        return;
+    if (fActiveSourceCode->GetSourceFile() != NULL)
+        return;
+    if (fActiveFunction->GetFunction()->SourceCodeState()
+        == FUNCTION_SOURCE_NOT_LOADED) {
+        return;
+    }
+
+    BPath path;
+    BString data;
+    fActiveFunction->GetFunctionDebugInfo()->SourceFile()->GetPath(data);
+    if (path.SetTo(data) != B_OK)
+        return;
+
+    BString predicate;
+    predicate.SetToFormat("name=%s", path.Leaf());
+    BQuery query;
+    query.SetPredicate(predicate);
+
+    BVolumeRoster roster;
+    BVolume volume;
+
+    BStringList entries;
+
+    while (roster.GetNextVolume(&volume) == B_OK) {
+        entry_ref ref;
+        if (query.SetVolume(&volume) != B_OK)
+            continue;
+
+        if (query.Fetch() != B_OK)
+            continue;
+
+        while (query.GetNextRef(&ref) == B_OK) {
+            path.SetTo(&ref);
+            entries.Add(path.Path());
+        }
+
+        query.Clear();
+    }
+
+    int32 count = entries.CountStrings();
+    if (count > 0) {
+        entries.Sort();
+        BPopUpMenu* menu = new(std::nothrow) BPopUpMenu("");
+        if (menu == NULL)
+            return;
+        BPrivate::ObjectDeleter<BPopUpMenu> menuDeleter(menu);
+        BMenuItem* item = NULL;
+        for (int32 i = 0; i < count; i++) {
+            item = new(std::nothrow) BMenuItem(entries.StringAt(i).String(),
+                NULL);
+            if (item == NULL)
+                return;
+            menu->AddItem(item);
+        }
+        menu->AddSeparatorItem();
+        BMenuItem* manualItem = new(std::nothrow) BMenuItem(
+            "Locate manually" B_UTF8_ELLIPSIS, NULL);
+        if (manualItem == NULL)
+            return;
+        menu->AddItem(manualItem);
+
+        BPoint point;
+        fSourcePathView->GetMouse(&point, NULL, false);
+        fSourcePathView->ConvertToScreen(&point);
+        item = menu->Go(point, false, true);
+        if (item == NULL)
+            return;
+        else if (item != manualItem) {
+            entry_ref ref;
+            if (get_ref_for_path(item->Label(), &ref) == B_OK) {
+                _HandleResolveMissingSourceFile(ref);
+                return;
+            }
+        }
+    }
+
+    try {
+        if (fFilePanel == NULL) {
+            fFilePanel = new BFilePanel(B_OPEN_PANEL,
+                new BMessenger(this));
+        }
+        fFilePanel->Show();
+    } catch (...) {
+        delete fFilePanel;
+        fFilePanel = NULL;
+    }
+}
+
+
 status_t
 TeamWindow::_SaveInspectorSettings(const BMessage* settings)
 {

src/apps/debugger/user_interface/gui/team_window/TeamWindow.h

@@ -169 +169 @@
                                     Watchpoint* watchpoint);
             void                _HandleResolveMissingSourceFile(entry_ref&
                                     locatedPath);
+            void                _HandleLocateSourceRequest();
 
             status_t            _SaveInspectorSettings(
                                     const BMessage* settings);