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=6ea927b3e4706965447c0adc633f4226637691cd;hb=d51782798930575415d53300340ede3a004f1661;hpb=2a014774e29e324bc5b5f26143d0384351738ca1

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 6ea927b..3c61121 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -1,36 +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() {
-        x = -5;
-        y = -20;
-        dx = 250;
-        dy = 270;
-        _widget.addItem("THIS");
-        _widget.addItem("IS");
-        _widget.addItem("A");
-        _widget.addItem("TEST");
-    }
+    BasicBlockWidget(const QString& name, BasicBlock * block);
 
-    QRectF boundingRect() const
-    {
+	void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
+
+    QRectF boundingRect() const  {
         qreal penWidth = 1;
-        return QRectF(x - penWidth / 2, y - penWidth / 2,
+		QRectF result(x - penWidth / 2, y - penWidth / 2,
                       dx + penWidth, dy + penWidth);
+
+
+		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()));
+
+        return result;
     }
+	void mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+		QGraphicsItem::mouseMoveEvent(event);
+		std::for_each(previous.begin(), previous.end(),
+					  [&] (BasicBlockWidget * item) {
+						  item->update(boundingRect() | item->boundingRect());
+					  });
+	}
+
+	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, "BLOCK");
-        _widget.render(painter);
+        painter->drawText(0, -5, name);
+		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;
-    QListWidget _widget;
+    QTableWidget _widget;
+	QString name;
+	BasicBlock * block;
+	std::vector<BasicBlockWidget*> previous;
+	BasicBlockWidget* next[2];
 };
+
+#endif