#include "gui/dialogs/SimpleStringDialog.hxx"
#include "core/BasicBlock.hxx"
#include "core/Function.hxx"
+#include "core/Comment.hxx"
+#include "disassembler/Instruction.hxx"
#include "core/InformationManager.hxx"
#include "core/events/RenameFunctionEvent.hxx"
-#include <iostream>
+#include "core/events/ChangeCommentEvent.hxx"
+#include <algorithm>
class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
public:
CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
: QGraphicsTextItem(text, parent), parent(parent) {}
void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
+
+ void adjustSize();
private:
- void addComment(QTextTableCell cell, const QString& title);
+ void addComment(int row, bool global);
BasicBlockWidget* parent;
};
-void CustomQGraphicsTextItem::addComment(QTextTableCell cell, const QString& title) {
- SimpleStringDialog dialog(title);
+void CustomQGraphicsTextItem::addComment(int row, bool global) {
+ SimpleStringDialog dialog(global ? "Global comment" : "Local comment");
int result = dialog.exec();
+ uint64_t address = parent->instructions[row].getAddress();
if (QDialog::Accepted == result) {
- LOG4CXX_DEBUG(parent->logger, "adding comment " << dialog.result().toStdString()
- << " at row " << cell.row());
- cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
+ Comment* comment;
+ if (global) {
+ comment = parent->block->getManager()->newGlobalComment(address);
+ } else {
+ 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");
}
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"); });
+ [=]() { addComment(row, true); });
QObject::connect(localComment, &QAction::triggered,
- [=]() { addComment(cell, "Local comment"); });
+ [=]() { addComment(row, false); });
}
menu.exec(event->screenPos());
}
+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())) {
});
instructions = block->getInstructions();
populateWidget();
+ block->getManager()->registerChangeCommentEvent([=](ChangeCommentEvent* e) {changeCommentHandler(e);});
}
void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
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();
}
}
}
}
}
+void BasicBlockWidget::changeCommentHandler(ChangeCommentEvent* event) {
+ auto inst_it = std::find_if(instructions.begin(), instructions.end(),
+ [=](Instruction& inst) {
+ return inst.getAddress() == event->address;
+ });
+ if (inst_it != instructions.end()) {
+ if (std::find(inst_it->comments().begin(),
+ inst_it->comments().begin(),
+ event->comment) == inst_it->comments().end()) {
+ LOG4CXX_DEBUG(logger, "Change Comment Event -- New Comment!");
+ inst_it->comments().push_back(event->comment);
+ }
+ int row = inst_it - instructions.begin();
+ LOG4CXX_DEBUG(logger, "Inserting comment for instruction at row " << std::hex << row);
+ QTextCursor cursor = _table->cellAt(row, 2).lastCursorPosition();
+ while (cursor != _table->cellAt(row, 2).firstCursorPosition()) {
+ cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor, 1);
+ }
+ cursor.removeSelectedText();
+ cursor.insertHtml(formatComments(&*inst_it));
+ QGraphicsTextItem* item = _widget.get();
+ ((CustomQGraphicsTextItem*)item)->adjustSize();
+ }
+}
+
void BasicBlockWidget::populateWidget() {
int row;
QTextTableFormat format;
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();
}
line = "<a href=\"" + href + "\">" + line + "</a>";
}
+ _table->cellAt(row, 1).firstCursorPosition().insertHtml("<nobr>" + line + "</nobr>");
+ _table->cellAt(row, 2).firstCursorPosition().insertHtml(formatComments(&inst));
+ }
+ QGraphicsTextItem* item = _widget.get();
+ ((CustomQGraphicsTextItem*)item)->adjustSize();
+}
- _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+QString BasicBlockWidget::formatComments(Instruction* inst) {
+ QString comments;
+ for (Comment* c: inst->comments()) {
+ comments += "<br />";
+ 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;
projects / frida / frida.git / blobdiff