X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=0036bda65180ea76cfa8e787332109a597cccfcb;hp=2880af34a8cf2ff23ca13798d1f81291aa3ee99b;hb=3894c7f40260a8f5f4b47e82860ae40ec592efc1;hpb=8ba5b5b647e39ce4b337b6b56a246f293c511954

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 2880af3..0036bda 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,24 +1,100 @@
 #include "BasicBlockWidget.hxx"
 #include "gui/Mainwindow.hxx"
+#include "gui/dialogs/SimpleStringDialog.hxx"
+#include "core/BasicBlock.hxx"
+
+class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
+public:
+	CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
+		: QGraphicsTextItem(text, parent), parent(parent) {}
+	void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
+private:
+	void addComment(QTextTableCell cell, const QString& title);
+
+	BasicBlockWidget* parent;
+};
+
+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");
+	}
+}
+
+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,
+		                 [=]() {parent->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)
-	, _proxy(this), name(name)
-	, block(block), mainwindow(mainwindow) {
+	: width(270), height(45), name(name)
+	, _table(NULL)
+	, block(block), mainwindow(mainwindow)
+	, logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
 	next[0] = NULL;	next[1] = NULL;
-	_widget.setStyleSheet("QWidget { background-color : #ddddff; }");
-	_widget.setLayout(&_layout);
-	_layout.setContentsMargins(0, 0, 0, 0);
-	_proxy.setWidget(&_widget);
-	_proxy.setPos(5, 20);
+	_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::addItem(uint8_t* bytes, size_t num_bytes,
                                QString line, const QString& href) {
 	QString bytestring;
+	int row;
+
+	if (_table) {
+		row = _table->rows();
+		_table->appendRows(1);
+	} else {
+		row = 0;
+		QTextTableFormat format;
+		format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+		format.setBorder(0);
+		_table = _widget->textCursor().insertTable(1, 3, format);
+	}
 
 	for (size_t i(0); i < num_bytes; ++i) {
 		const char * hexdigits = "0123456789ABCDEF";
@@ -27,38 +103,38 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		bytestring += ' ';
 	}
 
-	int current_row = _layout.rowCount();
-	QLabel * bytestring_label = new QLabel(bytestring);
-	bytestring_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
-	                                          Qt::LinksAccessibleByMouse);
-	bytestring_label->setWordWrap(false);
-	_layout.addWidget(bytestring_label, current_row, 0);
-	bytestring_label->setVisible(true);
+	_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
 
 	line = line.replace('\t', ' ').toHtmlEscaped();
 	if (href != "") {
 		line = "<a href=\"" + href + "\">" + line + "</a>";
 	}
-	QLabel * instruction_label = new QLabel(line);
-	instruction_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
-	                                           Qt::LinksAccessibleByMouse);
-	instruction_label->setWordWrap(false);
-	instruction_label->setFocusPolicy(Qt::StrongFocus);
-	if (href != "") {
-		QObject::connect(instruction_label, &QLabel::linkActivated,
-		                 [=](QString str) {
-			                 if (str.startsWith("function:")) {
-					                 QString address = str.remove("function:");
-					                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
-				                 }
-		                 });
-	}
-	_layout.addWidget(instruction_label, current_row, 1);
-	instruction_label->setVisible(true);
 
-	width = 12 + _widget.sizeHint().width();
-	height = 25 + _widget.childrenRect().height();
+	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+}
 
+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;
-	_widget.resize(width - 12, height - 25);
+
+	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)) } };
+}
+