X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=454119e25d11623738996f3f81dff2d504302877;hp=eccb679f35e971a2749d9a721c3153334be84bd7;hb=7d4bf581b5f2885d00a86f8a6235bc12fca10731;hpb=ac5817edcb30c89bc1e5fdcf3a124c3dc2e49630

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index eccb679..454119e 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,18 +1,73 @@
 #include "BasicBlockWidget.hxx"
+#include "CustomQGraphicsTextItem.hxx"
 #include "gui/Mainwindow.hxx"
+#include "gui/dialogs/SimpleStringDialog.hxx"
+
+class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
+public:
+	CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent, Mainwindow* mainwindow)
+		: QGraphicsTextItem(text, parent), parent(parent), mainwindow(mainwindow) {}
+	void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
+private:
+	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::contextMenuEvent(QGraphicsSceneContextMenuEvent* event) {
+	QTextCursor c = textCursor();
+	c.setPosition(document()->documentLayout()->hitTest(event->pos(), Qt::FuzzyHit));
+	c.select(QTextCursor::WordUnderCursor);
+
+	QMenu menu;
+	bool ok;
+	uint64_t address = c.selectedText().toLongLong(&ok, 16);
+	if (ok) {
+		QAction* act = menu.addAction(c.selectedText() + " is a Function");
+		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());
+}
 
 BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
-	: width(270), height(45)
-	, _widget("", this)
-	, _table(NULL), name(name)
+	: width(270), height(45), name(name)
+	, _table(NULL)
 	, block(block), mainwindow(mainwindow) {
 	next[0] = NULL;	next[1] = NULL;
-	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+	_widget.reset(new CustomQGraphicsTextItem("", this, mainwindow));
+	_widget->setPos(5, 20);
+	_widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
 	                                Qt::LinksAccessibleByMouse);
 
-	_widget.setPos(5, 20);
-
 	if (width < 250) width = 250;
 }
 
@@ -29,7 +84,7 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		QTextTableFormat format;
 		format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
 		format.setBorder(0);
-		_table = _widget.textCursor().insertTable(1, 3, format);
+		_table = _widget->textCursor().insertTable(1, 3, format);
 	}
 
 	for (size_t i(0); i < num_bytes; ++i) {
@@ -48,16 +103,37 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 
 	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
 
-	QObject::connect(&_widget, &QGraphicsTextItem::linkActivated,
+	QObject::connect(_widget.get(), &QGraphicsTextItem::linkActivated,
 	                 [=](QString str) {
 		                 if (str.startsWith("function:")) {
 			                 QString address = str.remove("function:");
 			                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
 		                 }
 	                 });
+}
 
-	width = 10 + _widget.boundingRect().width();
-	height = 25 + _widget.boundingRect().height();
-
+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;
+
+	painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
+	painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
+	painter->drawRect(0, 0, width, height);
+	painter->drawText(5, 15, name);
 }
+
+QRectF BasicBlockWidget::boundingRect() const  {
+	qreal penWidth = 1;
+	QRectF result(- penWidth / 2, - penWidth / 2,
+	              width + penWidth, height + penWidth);
+	return result;
+}
+
+std::array<QPointF, 3> BasicBlockWidget::getExits() const {
+	return { { mapToScene(QPointF(  width/3, height)),
+			   mapToScene(QPointF(  width/2, height)),
+			   mapToScene(QPointF(2*width/3, height)) } };
+}
+