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=689223cbee4ec170a1b037cbad1a9a8733afaa72;hb=3894c7f40260a8f5f4b47e82860ae40ec592efc1;hpb=78942350b02f0b23d8152d3f5b06a8d500fedaab

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 689223c..0036bda 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,63 +1,140 @@
 #include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.hxx"
+#include "gui/dialogs/SimpleStringDialog.hxx"
+#include "core/BasicBlock.hxx"
 
-BasicBlockWidget::BasicBlockWidget(const QString& name)
-	: x(-5), y(-20)
-	, dx(270), dy(45)
-	, name(name) {
-    _widget.setGridStyle(Qt::NoPen);
-    _widget.setMinimumHeight(_widget.rowHeight(0) + 10);
-    _widget.setMaximumHeight(20);
-    _widget.resizeColumnToContents(0);
-    _widget.resizeColumnToContents(1);
-    _widget.resizeColumnToContents(2);
-    _widget.updateGeometry();
-    _widget.setMaximumWidth(260);
-    _widget.setColumnCount(3);
-    _widget.verticalHeader()->hide();
-    _widget.horizontalHeader()->hide();
-    dx = _widget.rowHeight(0) + 20;
-    if (dx < 270) dx = 270;
+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 BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               const QString& line) {
-    size_t current_row = _widget.rowCount();
-    int column_width;
+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), name(name)
+	, _table(NULL)
+	, block(block), mainwindow(mainwindow)
+	, logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
+	next[0] = NULL;	next[1] = NULL;
+	_widget.reset(new CustomQGraphicsTextItem("", this));
+	_widget->setPos(5, 20);
+	_widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
+	                                Qt::LinksAccessibleByMouse);
 
-    QString bytestring;
+	if (width < 250) width = 250;
 
-    for (size_t i(0); i < num_bytes; ++i) {
-        const char * hexdigits = "0123456789ABCDEF";
-        bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
-        bytestring += hexdigits[bytes[i] & 0xF];
-        bytestring += ' ';
-    }
+	QObject::connect(_widget.get(), &QGraphicsTextItem::linkActivated,
+	                 [=](QString str) {
+		                 if (str.startsWith("function:")) {
+			                 QString address = str.remove("function:");
+			                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+		                 }
+	                 });
+}
+}
 
-    _widget.setRowCount(current_row + 1);
+void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
+                               QString line, const QString& href) {
+	QString bytestring;
+	int row;
 
-    _widget.setItem(current_row, 0, new QTableWidgetItem(bytestring));
-    _widget.setItem(current_row, 1, new QTableWidgetItem(line));
-    _widget.setItem(current_row, 2, new QTableWidgetItem(""));
-    _widget.updateGeometry();
+	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);
+	}
 
-    _widget.resizeColumnToContents(0);
-    _widget.resizeColumnToContents(1);
-    _widget.resizeColumnToContents(2);
+	for (size_t i(0); i < num_bytes; ++i) {
+		const char * hexdigits = "0123456789ABCDEF";
+		bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
+		bytestring += hexdigits[bytes[i] & 0xF];
+		bytestring += ' ';
+	}
 
-    _widget.resizeRowToContents(current_row);
+	_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
 
-    column_width =
-        _widget.columnWidth(0) +
-        _widget.columnWidth(1) +
-        _widget.columnWidth(2) +
-        2;
+	line = line.replace('\t', ' ').toHtmlEscaped();
+	if (href != "") {
+		line = "<a href=\"" + href + "\">" + line + "</a>";
+	}
 
-    _widget.setMinimumWidth(column_width);
-    _widget.setMinimumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
-    _widget.setMaximumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+	_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;
 
-    dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-    dx = column_width + 10;
-    if (dx < 270) dx = 270;
+	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)) } };
+}
+