X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=1f34255343aafbf12d2d80c1e2d2169b83b31a87;hp=8b6dbe56d7ff336ac5331b7f2e5842824ba69384;hb=1c0f4550bed81773ad34d190508bd49616264a38;hpb=dbf3f68ecc0c6d5d992a8d0e8254a42c561592f9

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 8b6dbe5..1f34255 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -2,28 +2,31 @@
 #include "gui/Mainwindow.hxx"
 #include "gui/dialogs/SimpleStringDialog.hxx"
 #include "core/BasicBlock.hxx"
+#include "core/Function.hxx"
+#include "core/InformationManager.hxx"
+#include "core/events/RenameFunctionEvent.hxx"
+#include <iostream>
 
 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 +41,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();
@@ -62,14 +65,50 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
 	: width(270), height(45), name(name)
 	, _table(NULL)
 	, block(block), mainwindow(mainwindow)
-	, logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
+	, logger(log4cxx::Logger::getLogger(name.toStdString() + " BasicBlockWidget")) {
 	next[0] = NULL;	next[1] = NULL;
-	_widget.reset(new CustomQGraphicsTextItem("", this, mainwindow));
+
+	block->getManager()->connect_rename_function_signal([=](RenameFunctionEvent* event) {updateFunctionName(event);});
+
+	_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::updateFunctionName(RenameFunctionEvent *event) {
+	QString search = QString("function:") + QString::number(event->address, 16);
+	QTextDocument *document = _widget->document();
+	QTextBlock b = document->begin();
+	while (b.isValid()) {
+		for (QTextBlock::iterator i = b.begin(); !i.atEnd(); ++i) {
+			QTextCharFormat format = i.fragment().charFormat();
+			bool isLink = format.isAnchor();
+			if (isLink)
+			{
+				if (search == format.anchorHref()) {
+					LOG4CXX_DEBUG(logger, i.fragment().text().toStdString() << " ---> " << format.anchorHref().toStdString());
+					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());
+				}
+			}
+		}
+		b = b.next();
+	}
 }
 
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
@@ -99,18 +138,20 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 
 	line = line.replace('\t', ' ').toHtmlEscaped();
 	if (href != "") {
+		QStringList list = href.split(":");
+		if (list[0] == "function") {
+			uint64_t address = href.split(":")[1].toLongLong(NULL, 16);
+			Function* fun = block->getManager()->getFunction(address);
+
+			if (fun) {
+				line = line.split(" ")[0] + " " + QString(fun->getName().c_str()).toHtmlEscaped();
+				LOG4CXX_DEBUG(logger, "Naming function at " << address << " " << fun->getName());
+			}
+		}
 		line = "<a href=\"" + href + "\">" + line + "</a>";
 	}
 
 	_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,