Ticket #8286: debugger_tooltip.2.patch

src/apps/debuganalyzer/gui/table/TreeTable.cpp

@@ -1 +1 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 
@@ -226 +227 @@
 }
 
 
+// #pragma mark - TreeTableToolTipProvider
+
+
+TreeTableToolTipProvider::~TreeTableToolTipProvider()
+{
+}
+
+
 // #pragma mark - TreeTableListener
 
 
@@ -650 +659 @@
     :
     AbstractTable(name, flags, borderStyle, showHorizontalScrollbar),
     fModel(NULL),
+    fToolTipProvider(NULL),
     fRootNode(NULL),
     fSelectionModel(this),
     fIgnoreSelectionChange(0)
@@ -731 +741 @@
 }
 
 
+void
+TreeTable::SetToolTipProvider(TreeTableToolTipProvider* toolTipProvider)
+{
+    fToolTipProvider = toolTipProvider;
+}
+
+
 TreeTableSelectionModel*
 TreeTable::SelectionModel()
 {
@@ -810 +827 @@
 }
 
 
+bool
+TreeTable::GetToolTipAt(BPoint point, BToolTip** _tip)
+{
+    if (fToolTipProvider == NULL)
+        return AbstractTable::GetToolTipAt(point, _tip);
+
+    // get the table row
+    BRow* row = RowAt(point);
+    if (row == NULL)
+        return AbstractTable::GetToolTipAt(point, _tip);
+
+    TreeTableRow* treeRow = dynamic_cast<TreeTableRow*>(row);
+    // get the table column
+    BColumn* column = ColumnAt(point);
+
+    int32 columnIndex = column != NULL ? column->LogicalFieldNum() : -1;
+
+    TreeTablePath path;
+    _GetPathForNode(treeRow->Node(), path);
+
+    return fToolTipProvider->GetToolTipForTablePath(path, columnIndex,
+        _tip);
+}
+
+
 void
 TreeTable::SelectionChanged()
 {

src/apps/debuganalyzer/gui/table/TreeTable.h

@@ -1 +1 @@
 /*
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
  * Distributed under the terms of the MIT License.
  */
 #ifndef TREE_TABLE_H
@@ -122 +123 @@
 };
 
 
+class TreeTableToolTipProvider {
+public:
+    virtual                     ~TreeTableToolTipProvider();
+
+    virtual bool                GetToolTipForTablePath(
+                                    const TreeTablePath& path,
+                                    int32 columnIndex, BToolTip** _tip) = 0;
+                                    // columnIndex can be -1, if not in a column
+};
+
+
 class TreeTableListener {
 public:
     virtual                     ~TreeTableListener();
@@ -157 +169 @@
             bool                SetTreeTableModel(TreeTableModel* model);
             TreeTableModel*     GetTreeTableModel() const   { return fModel; }
 
+            void                SetToolTipProvider(
+                                    TreeTableToolTipProvider* toolTipProvider);
+            TreeTableToolTipProvider* ToolTipProvider() const
+                                    { return fToolTipProvider; }
+
             TreeTableSelectionModel* SelectionModel();
 
             void                SelectNode(const TreeTablePath& path,
@@ -177 +194 @@
                                     TreeTableListener* listener);
 
 protected:
+    virtual bool                GetToolTipAt(BPoint point, BToolTip** _tip);
+
     virtual void                SelectionChanged();
 
     virtual AbstractColumn*     CreateColumn(TableColumn* column);
@@ -226 +245 @@
 
 private:
             TreeTableModel*     fModel;
+            TreeTableToolTipProvider* fToolTipProvider;
             TreeTableNode*      fRootNode;
             TreeTableSelectionModel fSelectionModel;
             ListenerList        fListeners;

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

@@ -13 +13 @@
 
 #include <Looper.h>
 #include <PopUpMenu.h>
+#include <ToolTip.h>
 
 #include <AutoDeleter.h>
 #include <AutoLocker.h>
@@ -25 +26 @@
 #include "FunctionInstance.h"
 #include "GUISettingsUtils.h"
 #include "MessageCodes.h"
+#include "Register.h"
 #include "SettingsMenu.h"
 #include "StackFrame.h"
 #include "StackFrameValues.h"
@@ -345 +347 @@
 // #pragma mark - VariableTableModel
 
 
-class VariablesView::VariableTableModel : public TreeTableModel {
+class VariablesView::VariableTableModel : public TreeTableModel,
+    public TreeTableToolTipProvider {
 public:
                                 VariableTableModel();
                                 ~VariableTableModel();
@@ -379 +382 @@
             void                NotifyNodeChanged(ModelNode* node);
             void                NotifyNodeHidden(ModelNode* node);
 
+    virtual bool                GetToolTipForTablePath(
+                                    const TreeTablePath& path,
+                                    int32 columnIndex, BToolTip** _tip);
+
 private:
             struct NodeHashDefinition {
                 typedef ValueNodeChild* KeyType;
@@ -1159 +1166 @@
 }
 
 
+bool
+VariablesView::VariableTableModel::GetToolTipForTablePath(
+    const TreeTablePath& path, int32 columnIndex, BToolTip** _tip)
+{
+    ModelNode* node = (ModelNode*)NodeForPath(path);
+    if (node == NULL)
+        return false;
+
+    if (node->NodeChild()->LocationResolutionState() != B_OK)
+        return false;
+
+    ValueLocation* location = node->NodeChild()->Location();
+    BString tipData("Location piece(s):");
+    for (int32 i = 0; i < location->CountPieces(); i++) {
+        ValuePieceLocation piece = location->PieceAt(i);
+        BString pieceData;
+        switch (piece.type) {
+        case VALUE_PIECE_LOCATION_MEMORY:
+            pieceData.SetToFormat("\n\t(%ld): Address: 0x%llx, Size: "
+                "%lld bytes", i, piece.address, piece.size);
+            break;
+        case VALUE_PIECE_LOCATION_REGISTER:
+        {
+            Architecture* architecture = fThread->GetTeam()->GetArchitecture();
+            pieceData.SetToFormat("\n\t(%ld): Register (%s)",
+                i, architecture->Registers()[piece.reg].Name());
+
+            break;
+        }
+        default:
+            break;
+        }
+        tipData += pieceData;
+    }
+
+    *_tip = new(std::nothrow) BTextToolTip(tipData);
+    if (*_tip == NULL)
+        return false;
+
+    return true;
+}
+
+
 status_t
 VariablesView::VariableTableModel::_AddNode(Variable* variable,
     ModelNode* parent, ValueNodeChild* nodeChild, bool isPresentationNode,
@@ -1734 +1784 @@
     if (fVariableTableModel->Init() != B_OK)
         throw std::bad_alloc();
     fVariableTable->SetTreeTableModel(fVariableTableModel);
+    fVariableTable->SetToolTipProvider(fVariableTableModel);
 
     fContainerListener = new ContainerListener(this);
     fVariableTableModel->SetContainerListener(fContainerListener);

src/apps/debugger/value/value_nodes/CompoundValueNode.cpp

@@ -1 +1 @@
 /*
+ * Copyright 2012, Rene Gollent, rene@gollent.com.
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
@@ -8 +9 @@
 
 #include <new>
 
+#include "AddressValue.h"
 #include "Architecture.h"
 #include "IntegerValue.h"
 #include "Tracing.h"
@@ -186 +188 @@
     location->AcquireReference();
     _location = location;
     _value = NULL;
+    if (location->CountPieces() == 1) {
+        ValuePieceLocation piece = location->PieceAt(0);
+        if (piece.type == VALUE_PIECE_LOCATION_MEMORY) {
+            _value = new(std::nothrow) AddressValue(piece.address);
+            if (_value == NULL)
+                return B_NO_MEMORY;
+        }
+    }
+
     return B_OK;
 }