Add link handler only once for each basic block

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.cxx

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 454119e25d11623738996f3f81dff2d504302877..0036bda65180ea76cfa8e787332109a597cccfcb 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,29 +1,28 @@
 #include "BasicBlockWidget.hxx"
-#include "CustomQGraphicsTextItem.hxx"
 #include "gui/Mainwindow.hxx"
 #include "gui/dialogs/SimpleStringDialog.hxx"
+#include "core/BasicBlock.hxx"
 
 class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
 public:
-       CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent, Mainwindow* mainwindow)
-               : QGraphicsTextItem(text, parent), parent(parent), mainwindow(mainwindow) {}
+       CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
+               : QGraphicsTextItem(text, parent), parent(parent) {}
        void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
 private:
+       void addComment(QTextTableCell cell, const QString& title);
+
        BasicBlockWidget* parent;
-       Mainwindow* mainwindow;
 };
 
-namespace {
-       void addComment(QTextTableCell cell, const QString& title) {
-               SimpleStringDialog dialog(title);
-               int result = dialog.exec();
-               if (QDialog::Accepted == result) {
-                       // LOG4CXX_DEBUG(logger, "adding comment " << dialog.result().toStdString()
-                       //               << " at row " << cell.row());
-                       cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
-               } else {
-                       // LOG4CXX_DEBUG(logger, "addComment aborted");
-               }
+void CustomQGraphicsTextItem::addComment(QTextTableCell cell, const QString& title) {
+       SimpleStringDialog dialog(title);
+       int result = dialog.exec();
+       if (QDialog::Accepted == result) {
+               LOG4CXX_DEBUG(parent->logger, "adding comment " << dialog.result().toStdString()
+                             << " at row " << cell.row());
+               cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
+       } else {
+               LOG4CXX_DEBUG(parent->logger, "addComment aborted");
        }
 }
 
@@ -38,7 +37,7 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
        if (ok) {
                QAction* act = menu.addAction(c.selectedText() + " is a Function");
                QObject::connect(act, &QAction::triggered,
-                                [=]() {mainwindow->requestNewFunctionByAddress(address);});
+                                [=]() {parent->mainwindow->requestNewFunctionByAddress(address);});
        }
 
        QTextTable* table = c.currentTable();
@@ -61,14 +60,24 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
        : width(270), height(45), name(name)
        , _table(NULL)
-       , block(block), mainwindow(mainwindow) {
+       , block(block), mainwindow(mainwindow)
+       , logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
        next[0] = NULL; next[1] = NULL;
-       _widget.reset(new CustomQGraphicsTextItem("", this, mainwindow));
+       _widget.reset(new CustomQGraphicsTextItem("", this));
        _widget->setPos(5, 20);
        _widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
                                        Qt::LinksAccessibleByMouse);
 
        if (width < 250) width = 250;
+
+       QObject::connect(_widget.get(), &QGraphicsTextItem::linkActivated,
+                        [=](QString str) {
+                                if (str.startsWith("function:")) {
+                                        QString address = str.remove("function:");
+                                        mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+                                }
+                        });
+}
 }
 
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
@@ -102,14 +111,6 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
        }
 
        _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
-
-       QObject::connect(_widget.get(), &QGraphicsTextItem::linkActivated,
-                        [=](QString str) {
-                                if (str.startsWith("function:")) {
-                                        QString address = str.remove("function:");
-                                        mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
-                                }
-                        });
 }
 
 void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,