Ticket #9755: 9755.patch

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

@@ -11 +11 @@
 #include <new>
 #include <set>
 
+#include <LayoutBuilder.h>
+#include <MessageRunner.h>
 #include <StringList.h>
+#include <TextControl.h>
 
 #include <AutoDeleter.h>
 
@@ -25 +28 @@
 #include "Tracing.h"
 
 
+static const uint32 MSG_FUNCTION_FILTER_CHANGED = 'mffc';
+static const uint32 MSG_FUNCTION_TYPING_TIMEOUT = 'mftt';
+
+static const uint32 kKeypressTimeout = 250000;
+
+
 // #pragma mark - SourcePathComponentNode
 
 
@@ -198 +207 @@
 
         LocatableFile* currentFile = NULL;
         BStringList pathComponents;
+        bool applyFilter = !fCurrentFilter.IsEmpty();
         int32 functionCount = fImageDebugInfo->CountFunctions();
         for (int32 i = 0; i < functionCount; i++) {
             FunctionInstance* instance = fImageDebugInfo->FunctionAt(i);
@@ -213 +223 @@
             }
 
             LocatableFile* sourceFile = instance->SourceFile();
+            if (applyFilter && !_FilterFunction(instance, sourceFile))
+                continue;
+
             if (sourceFile == NULL) {
                 if (!_AddFunctionNode(sourcelessNode, instance, NULL))
                     return;
@@ -351 +364 @@
         return false;
     }
 
+    void SetFilter(const char* filter)
+    {
+        fCurrentFilter = filter;
+
+        SetImageDebugInfo(fImageDebugInfo);
+    }
+
 private:
     bool _GetSourcePathComponents(LocatableFile* currentFile,
         BStringList& pathComponents)
@@ -438 +458 @@
         return true;
     }
 
+    bool _FilterFunction(FunctionInstance* instance, LocatableFile* sourceFile)
+    {
+        if (instance->PrettyName().IFindFirst(fCurrentFilter) >= 0)
+            return true;
+        else if (sourceFile != NULL) {
+            BString path;
+            sourceFile->GetPath(path);
+            return path.IFindFirst(fCurrentFilter) >= 0;
+        }
+
+        return false;
+    }
+
+
 private:
     typedef BObjectList<SourcePathComponentNode> ChildPathComponentList;
 
@@ -445 +479 @@
     ImageDebugInfo*         fImageDebugInfo;
     ChildPathComponentList  fChildPathComponents;
     SourcePathComponentNode* fSourcelessNode;
+    BString                 fCurrentFilter;
 };
 
 
@@ -455 +490 @@
     :
     BGroupView(B_VERTICAL),
     fImageDebugInfo(NULL),
+    fFilterField(NULL),
     fFunctionsTable(NULL),
     fFunctionsTableModel(NULL),
-    fListener(listener)
+    fListener(listener),
+    fLastFilterKeypress(0)
 {
     SetName("Functions");
 }
@@ -545 +582 @@
 
 
 void
+ImageFunctionsView::AttachedToWindow()
+{
+    BView::AttachedToWindow();
+
+    fFilterField->SetTarget(this);
+}
+
+
+void
+ImageFunctionsView::MessageReceived(BMessage* message)
+{
+    switch (message->what) {
+        case MSG_FUNCTION_FILTER_CHANGED:
+        {
+            fLastFilterKeypress = system_time();
+            BMessage keypressMessage(MSG_FUNCTION_TYPING_TIMEOUT);
+            BMessageRunner::StartSending(BMessenger(this), &keypressMessage,
+                kKeypressTimeout, 1);
+            break;
+        }
+
+        case MSG_FUNCTION_TYPING_TIMEOUT:
+        {
+            if (system_time() - fLastFilterKeypress >= kKeypressTimeout) {
+                fFunctionsTableModel->SetFilter(fFilterField->Text());
+                _ExpandFilteredNodes();
+            }
+        }
+
+        default:
+            BView::MessageReceived(message);
+            break;
+    }
+}
+
+
+void
 ImageFunctionsView::LoadSettings(const BMessage& settings)
 {
     BMessage tableSettings;
@@ -591 +665 @@
 {
     fFunctionsTable = new TreeTable("functions", 0, B_FANCY_BORDER);
     AddChild(fFunctionsTable->ToView());
+    AddChild(fFilterField = new BTextControl("filtertext", "Filter:",
+            NULL, new BMessage(MSG_FUNCTION_FILTER_CHANGED)));
+
+    fFilterField->SetModificationMessage(new BMessage(
+            MSG_FUNCTION_FILTER_CHANGED));
     fFunctionsTable->SetSortingEnabled(false);
 
     // columns
@@ -605 +684 @@
 }
 
 
+void
+ImageFunctionsView::_ExpandFilteredNodes()
+{
+    if (fFilterField->TextView()->TextLength() != 0)
+        _ExpandChildren(fFunctionsTableModel);
+}
+
+
+void
+ImageFunctionsView::_ExpandChildren(void* parent)
+{
+    for (int32 i = 0; i < fFunctionsTableModel->CountChildren(parent); i++) {
+        void* child = fFunctionsTableModel->ChildAt(parent, i);
+        if (fFunctionsTableModel->CountChildren(child) == 0) {
+            SourcePathComponentNode* node = (SourcePathComponentNode*)child;
+            TreeTablePath path;
+            if (fFunctionsTableModel->GetFunctionPath(node->Function(), path))
+                fFunctionsTable->SetNodeExpanded(path, true, true);
+            return;
+        } else
+            _ExpandChildren(child);
+    }
+}
+
+
 // #pragma mark - Listener
 
 

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

@@ -12 +12 @@
 #include "Team.h"
 
 
+class BTextControl;
 class FunctionInstance;
 
 
@@ -31 +32 @@
             void                SetImageDebugInfo(
                                     ImageDebugInfo* imageDebugInfo);
             void                SetFunction(FunctionInstance* function);
+    virtual void                AttachedToWindow();
+    virtual void                MessageReceived(BMessage* message);
 
             void                LoadSettings(const BMessage& settings);
             status_t            SaveSettings(BMessage& settings);
@@ -45 +48 @@
 
             void                _Init();
 
+            void                _ExpandFilteredNodes();
+            void                _ExpandChildren(void *parentNode);
+
 private:
             ImageDebugInfo*     fImageDebugInfo;
+            BTextControl*       fFilterField;
             TreeTable*          fFunctionsTable;
             FunctionsTableModel* fFunctionsTableModel;
             Listener*           fListener;
+            bigtime_t           fLastFilterKeypress;
 };
 
 

src/kits/interface/ColumnListView.cpp

@@ -3070 +3070 @@
     DeselectAll();
         // Make sure selection list doesn't point to deleted rows!
     RecursiveDeleteRows(&fRows, false);
-    Invalidate();
     fItemsHeight = 0.0;
     FixScrollBar(true);
+    Invalidate();
 }
 
 
@@ -4378 +4378 @@
                 vScrollBar->SetRange(0.0, maxScrollBarValue);
                 vScrollBar->SetSteps(20.0, fVisibleRect.Height());
             }
-        } else if (vScrollBar->Value() == 0.0)
+        } else if (vScrollBar->Value() == 0.0 || fItemsHeight == 0.0)
             vScrollBar->SetRange(0.0, 0.0);     // disable scroll bar.
     }
 }