X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.hxx;h=3c61121c75fa3da7f7e55894dc723c3f15e2e5be;hp=557f556a33edbb0424ce4baaa583ede926b4c473;hb=d51782798930575415d53300340ede3a004f1661;hpb=2ac7c08ca9536a5b0c08c6ff331241ce6b082af0

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 557f556..3c61121 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -1,88 +1,83 @@
+#ifndef INCLUDE__BasicBlockWidget_hxx
+#define INCLUDE__BasicBlockWidget_hxx
+
 #include "gui/qt.hxx"
+#include "disassembler/BasicBlock.hxx"
+#include <vector>
+#include <cassert>
 
 class BasicBlockWidget : public QGraphicsItem
 {
 public:
-    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 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(const QString& name, BasicBlock * block);
 
-		_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();
+	void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
 
-		_widget.resizeColumnToContents(0);
-		_widget.resizeColumnToContents(1);
-		_widget.resizeColumnToContents(2);
-
-		_widget.resizeRowToContents(current_row);
+    QRectF boundingRect() const  {
+        qreal penWidth = 1;
+		QRectF result(x - penWidth / 2, y - penWidth / 2,
+                      dx + penWidth, dy + penWidth);
 
-		column_width =
-			_widget.columnWidth(0) +
-			_widget.columnWidth(1) +
-			_widget.columnWidth(2) +
-			2;
 
-		_widget.setMinimumWidth(column_width);
-		_widget.setMinimumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
-		_widget.setMaximumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+		if (next[0])
+			result |= QRectF(QPointF(x + dx/3, y+dy),
+							 mapFromScene(next[0]->getEntry()));
 
+		if (next[1])
+			result |= QRectF(QPointF(x + 2*dx/3, y+dy),
+							 mapFromScene(next[1]->getEntry()));
 
-		dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-		dx = column_width + 10;
-		if (dx < 270) dx = 270;
+        return result;
+    }
+	void mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+		QGraphicsItem::mouseMoveEvent(event);
+		std::for_each(previous.begin(), previous.end(),
+					  [&] (BasicBlockWidget * item) {
+						  item->update(boundingRect() | item->boundingRect());
+					  });
 	}
 
-    QRectF boundingRect() const
-    {
-        qreal penWidth = 1;
-        return QRectF(x - penWidth / 2, y - penWidth / 2,
-                      dx + penWidth, dy + penWidth);
-    }
+	QPointF getEntry() const {
+		return mapToScene(QPointF(x + dx/2, y));
+	}
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget)
-    {
+               QWidget *widget) {
         painter->fillRect(x, y, dx, dy, QColor(0xcc, 0xcc, 0xff, 0xff));
         painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
         painter->drawRect(x, y, dx, dy);
         painter->drawText(0, -5, name);
-        _widget.render(painter);
+		if (_widget.rowCount() != 0)
+			_widget.render(painter);
+
+		painter->setPen(QColor(0x00, 0xff, 0x00, 0xff));
+		if (next[0])
+			painter->drawLine(QPointF(x + dx/3, y+dy),
+							  mapFromScene(next[0]->getEntry()));
+
+		painter->setPen(QColor(0xff, 0x00, 0x00, 0xff));
+		if (next[1])
+			painter->drawLine(QPointF(x + 2*dx/3, y+dy),
+							  mapFromScene(next[1]->getEntry()));
+
     }
+
+	void addPrevious(BasicBlockWidget * widget) {
+		previous.push_back(widget);
+	}
+
+	void addNext(BasicBlockWidget * left, BasicBlockWidget * right) {
+		next[0] = left;
+		next[1] = right;
+	}
+
 private:
     int x, y, dx, dy;
     QTableWidget _widget;
 	QString name;
+	BasicBlock * block;
+	std::vector<BasicBlockWidget*> previous;
+	BasicBlockWidget* next[2];
 };
+
+#endif