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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 6d187a7..eccb679 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,63 +1,63 @@
 #include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.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;
-}
-
-void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               const QString& line) {
-    size_t current_row = _widget.rowCount();
-    int column_width;
-
-    QString bytestring;
-
-    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.setRowCount(current_row + 1);
+BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
+                                   Mainwindow * mainwindow)
+	: width(270), height(45)
+	, _widget("", this)
+	, _table(NULL), name(name)
+	, block(block), mainwindow(mainwindow) {
+	next[0] = NULL;	next[1] = NULL;
+	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+	                                Qt::LinksAccessibleByMouse);
 
-    _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();
-
-    _widget.resizeColumnToContents(0);
-    _widget.resizeColumnToContents(1);
-    _widget.resizeColumnToContents(2);
-
-    _widget.resizeRowToContents(current_row);
-
-    column_width =
-        _widget.columnWidth(0) +
-        _widget.columnWidth(1) +
-        _widget.columnWidth(2) +
-        2;
-
-    _widget.setMinimumWidth(column_width);
-    _widget.setMinimumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 2);
-    _widget.setMaximumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 2);
+	_widget.setPos(5, 20);
 
+	if (width < 250) width = 250;
+}
 
-    dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-    dx = column_width + 10;
-    if (dx < 270) dx = 270;
+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";
+		bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
+		bytestring += hexdigits[bytes[i] & 0xF];
+		bytestring += ' ';
+	}
+
+	_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
+
+	line = line.replace('\t', ' ').toHtmlEscaped();
+	if (href != "") {
+		line = "<a href=\"" + href + "\">" + line + "</a>";
+	}
+
+	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+
+	QObject::connect(&_widget, &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();
+
+	if (width < 250) width = 250;
 }