X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.hxx;h=5fda53e68d5beb93420fe24ae59bd80484c4b3dd;hp=7f4a0a36dfb791aff828b98e79f60bf741f4f4cf;hb=9230b2cf1a95c50e2bf0b4ca8e214bddd45cf65f;hpb=cd5fda05c80a6cd3c31a7884559d985ef79473f7

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 7f4a0a3..5fda53e 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -1,47 +1,71 @@
+#ifndef INCLUDE__BasicBlockWidget_hxx
+#define INCLUDE__BasicBlockWidget_hxx
+
 #include "gui/qt.hxx"
+#include "disassembler/BasicBlock.hxx"
+#include <vector>
+#include <cassert>
+#include <tuple>
 
 class BasicBlockWidget : public QGraphicsItem
 {
 public:
-    BasicBlockWidget(const QString& name)
-		: x(-5), y(-20)
-		, dx(270), dy(45)
-		, name(name) {
-		_widget.setMinimumWidth(_widget.sizeHintForColumn(0) + 10);
-		_widget.setMaximumHeight(20);
-		dx = _widget.sizeHintForColumn(0) + 20;
-		if (dx < 270) dx = 270;
+    BasicBlockWidget(const QString& name, BasicBlock * block);
+
+	void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
+
+    QRectF boundingRect() const  {
+        qreal penWidth = 1;
+		QRectF result(- penWidth / 2, - penWidth / 2,
+                      width + penWidth, height + penWidth);
+        return result;
     }
 
-	void addItem(const QString& line) {
-		_widget.addItem(line);
-		_widget.updateGeometry();
-		_widget.setMinimumWidth(_widget.sizeHintForColumn(0) + 10);
-		_widget.setMinimumHeight(_widget.sizeHintForRow(0) * (1 + _widget.count()));
-		_widget.setMaximumHeight(_widget.sizeHintForRow(0) * (1 + _widget.count()));
-		dy = _widget.sizeHintForRow(0) * (1 + _widget.count()) + 25;
-		dx = _widget.sizeHintForColumn(0) + 20;
-		if (dx < 270) dx = 270;
+	void mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
+		QGraphicsItem::mouseMoveEvent(event);
+        scene()->update();
 	}
 
-    QRectF boundingRect() const
-    {
-        qreal penWidth = 1;
-        return QRectF(x - penWidth / 2, y - penWidth / 2,
-                      dx + penWidth, dy + penWidth);
+	QPointF getEntry() const {
+		return mapToScene(QPointF(width/2, 0));
+	}
+
+    std::array<QPointF, 3> getExits() const {
+        return { {  mapToScene(QPointF(  width/3, height)),
+					mapToScene(QPointF(  width/2, height)),
+					mapToScene(QPointF(2*width/3, height)) } };
     }
 
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget)
-    {
-        painter->fillRect(x, y, dx, dy, QColor(0xcc, 0xcc, 0xff, 0xff));
+               QWidget *widget) {
+        painter->fillRect(0, 0, width, height, 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);
+        painter->drawRect(0, 0, width, height);
+        painter->drawText(5, 15, name);
+		if (_widget.rowCount() != 0)
+			_widget.render(painter, QPoint(5, 20));
     }
+
+	void addPrevious(BasicBlockWidget * widget) {
+		previous.push_back(widget);
+	}
+
+	void addNext(BasicBlockWidget * left, BasicBlockWidget * right) {
+		next[0] = left;
+		next[1] = right;
+	}
+
+    BasicBlockWidget ** getNext() {
+        return next;
+    }
+
 private:
-    int x, y, dx, dy;
-    QListWidget _widget;
+    uint32_t width, height;
+    QTableWidget _widget;
 	QString name;
+	BasicBlock * block;
+	std::vector<BasicBlockWidget*> previous;
+	BasicBlockWidget* next[2];
 };
+
+#endif