Add option to comment on instructions (in GUI)

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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 586b7078efd8853041494b5f95fa06dc081ec70d..454119e25d11623738996f3f81dff2d504302877 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,6 +1,7 @@
 #include "BasicBlockWidget.hxx"
 #include "CustomQGraphicsTextItem.hxx"
 #include "gui/Mainwindow.hxx"
+#include "gui/dialogs/SimpleStringDialog.hxx"
 
 class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
 public:
@@ -12,6 +13,20 @@ private:
        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::contextMenuEvent(QGraphicsSceneContextMenuEvent* event) {
        QTextCursor c = textCursor();
        c.setPosition(document()->documentLayout()->hitTest(event->pos(), Qt::FuzzyHit));
@@ -25,6 +40,20 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
                QObject::connect(act, &QAction::triggered,
                                 [=]() {mainwindow->requestNewFunctionByAddress(address);});
        }
+
+       QTextTable* table = c.currentTable();
+       if (NULL != table) {
+               int row = table->cellAt(c).row();
+               QTextTableCell cell = table->cellAt(row, 2);
+               QAction* globalComment = menu.addAction("Add global Comment");
+               QAction* localComment = menu.addAction("Add local Comment");
+
+               QObject::connect(globalComment, &QAction::triggered,
+                                [=]() { addComment(cell, "Global comment"); });
+               QObject::connect(localComment, &QAction::triggered,
+                                [=]() { addComment(cell, "Local comment"); });
+       }
+
        menu.exec(event->screenPos());
 }
 
@@ -81,15 +110,14 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
                                         mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
                                 }
                         });
+}
 
+void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                  QWidget *widget) {
        width = 10 + _widget->boundingRect().width();
        height = 25 + _widget->boundingRect().height();
-
        if (width < 250) width = 250;
-}
 
-void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-                  QWidget *widget) {
        painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
        painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
        painter->drawRect(0, 0, width, height);