Comments in BasicBlockWidget for the magic

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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index bdddd520f429c925fb4a446a3209867e2a13e1de..ee3b7afc0048ead4a014630349187602ea61b2a4 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -15,6 +15,8 @@ public:
        CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
                : QGraphicsTextItem(text, parent), parent(parent) {}
        void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
+
+       void adjustSize();
 private:
        void addComment(int row, bool global);
 
@@ -30,12 +32,15 @@ void CustomQGraphicsTextItem::addComment(int row, bool global) {
                if (global) {
                        comment = parent->block->getManager()->newGlobalComment(address);
                } else {
-                       comment = parent->block->getManager()->newLocalComment(address, NULL);
+                       /* TODO: 0x23 as we currently don't have the function here
+                        * and setting it to null will make the comment appear
+                        * global. Also means local comments are largely still
+                        * broken.
+                        */
+                       comment = parent->block->getManager()->newLocalComment(address, (Function*)0x23);
                }
                comment->setText(dialog.result().toStdString());
                parent->block->getManager()->finishComment(comment);
-
-//             cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
        } else {
                LOG4CXX_DEBUG(parent->logger, "addComment aborted");
        }
@@ -70,9 +75,34 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e
        menu.exec(event->screenPos());
 }
 
+/* QGraphicsTextItem has an adjustSize() function that is supposed to
+ * resize the widget to it's "ideal" size. However it totally ignores
+ * all directives to not wrap lines and "ideal" is actually just a
+ * bunch of heuristics.
+ *
+ * We are starting with a hopefully absurdly large startingwidth and
+ * reduce it untill a line is broken (detected by a change in
+ * height). As long as the width (1000 here) is sufficiently large,
+ * this should give us a widget without any line-wrapping.
+ *
+ * One needs to call this on a Pointer of tye CustomQGraphicsTextItem
+ * as the adjustSize() function is not polymorphic (vurtual).
+ */
+void CustomQGraphicsTextItem::adjustSize() {
+       int width = 1000;
+       setTextWidth(width);
+       int height = boundingRect().height();
+       while (width > 250 && height == boundingRect().height()) {
+               setTextWidth(width -= 10);
+       }
+       width += 10;
+       if (width < 250) width = 250;
+       setTextWidth(width);
+}
+
 BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
-       : width(270), height(45), name(name)
+       : width(200), height(45), name(name)
        , _table(NULL)
        , block(block), mainwindow(mainwindow)
        , logger(log4cxx::Logger::getLogger("gui.BasicBlockWidget." + name.toStdString())) {
@@ -110,13 +140,24 @@ void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
                        if (isLink)
                        {
                                if (search == format.anchorHref()) {
-                                       LOG4CXX_DEBUG(logger, i.fragment().text().toStdString() << " ---> " << format.anchorHref().toStdString());
+                                       LOG4CXX_DEBUG(logger, i.fragment().text().toStdString() << " ---> "
+                                                     << format.anchorHref().toStdString());
+
+                                       /* This should select the function name. It stars
+                                        * by selecting the whole link fragment from back
+                                        * to front and then moves one word to the back
+                                        * again deselecting whatever mnemonic is used for
+                                        * the call instruction.
+                                        */
                                        QTextCursor c(b);
                                        c.setPosition(i.fragment().position());
                                        c.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, i.fragment().length());
                                        c.movePosition(QTextCursor::Left,  QTextCursor::KeepAnchor, i.fragment().length());
                                        c.movePosition(QTextCursor::WordRight,  QTextCursor::KeepAnchor);
                                        c.insertText(event->new_name.c_str());
+
+                                       QGraphicsTextItem* item = _widget.get();
+                                       ((CustomQGraphicsTextItem*)item)->adjustSize();
                                }
                        }
                }
@@ -144,6 +185,8 @@ void BasicBlockWidget::changeCommentHandler(ChangeCommentEvent* event) {
                }
                cursor.removeSelectedText();
                cursor.insertHtml(formatComments(&*inst_it));
+               QGraphicsTextItem* item = _widget.get();
+               ((CustomQGraphicsTextItem*)item)->adjustSize();
        }
 }
 
@@ -168,7 +211,7 @@ void BasicBlockWidget::populateWidget() {
                        bytestring += hexdigits[byte & 0xF];
                        bytestring += ' ';
                }
-               _table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
+               _table->cellAt(row, 0).firstCursorPosition().insertHtml("<nobr>" + bytestring + "</nobr>");
 
                QString line = inst.getText().c_str();
                line = line.replace('\t', ' ').toHtmlEscaped();
@@ -186,23 +229,24 @@ void BasicBlockWidget::populateWidget() {
                        }
                        line = "<a href=\"" + href + "\">" + line + "</a>";
                }
-               _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+               _table->cellAt(row, 1).firstCursorPosition().insertHtml("<nobr>" + line + "</nobr>");
                _table->cellAt(row, 2).firstCursorPosition().insertHtml(formatComments(&inst));
        }
+       QGraphicsTextItem* item = _widget.get();
+       ((CustomQGraphicsTextItem*)item)->adjustSize();
 }
 
 QString BasicBlockWidget::formatComments(Instruction* inst) {
        QString comments;
        for (Comment* c: inst->comments()) {
                comments += "<br />";
-               comments += c->getText().c_str();
+               comments += QString(c->getText().c_str()).toHtmlEscaped();
        }
        return (comments == "" ? "" : ";; ") + comments.trimmed();
 }
 
 void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,
                   QWidget*) {
-       _widget->adjustSize();
        width = 10 + _widget->boundingRect().width();
        height = 25 + _widget->boundingRect().height();
        if (width < 250) width = 250;