X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.hxx;h=8cf709c9f2f821449ac689c6af147ada50db34e8;hp=bc579a90efaf7670dd5bfdd77a144145ae42a836;hb=5514e0b76ec9af2fa67abebe77cfe26052f2326f;hpb=2c83a39c132aa0ea0ed0b771d160ada7691261f3

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index bc579a9..8cf709c 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -2,93 +2,62 @@
 #define INCLUDE__BasicBlockWidget_hxx
 
 #include "gui/qt.hxx"
-#include "disassembler/BasicBlock.hxx"
 #include <vector>
 #include <cassert>
+#include <tuple>
+#include <array>
+#include <memory>
+#include <log4cxx/logger.h>
 
-class BasicBlockWidget : public QGraphicsItem
-{
-public:
-    BasicBlockWidget(const QString& name, BasicBlock * block);
-
-	void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
-
-    QRectF boundingRect() const  {
-        qreal penWidth = 1;
+class Mainwindow;
+class CustomQGraphicsTextItem;
 
+class BasicBlock;
 
-		if (next[0]) {
-			if (next[1]) {
-				result |= QRectF(QPointF(x + dx/3, y+dy),
-								 mapFromScene(next[0]->getEntry()));
-			} else {
-				result |= QRectF(QPointF(x + dx/2, y+dy),
-								 mapFromScene(next[0]->getEntry()));
-			}
-		}
-		if (next[1])
-			result |= QRectF(QPointF(x + 2*dx/3, y+dy),
-							 mapFromScene(next[1]->getEntry()));
+class RenameFunctionEvent;
 
-		QRectF result(- penWidth / 2, - penWidth / 2,
-                      width + penWidth, height + penWidth);
-        return result;
-    }
-	void mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
-		QGraphicsItem::mouseMoveEvent(event);
-		std::for_each(previous.begin(), previous.end(),
-					  [&] (BasicBlockWidget * item) {
-						  item->update(boundingRect() | item->boundingRect());
-					  });
-	}
+class BasicBlockWidget : public QObject, public QGraphicsItem
+{
+	Q_OBJECT
+	friend class CustomQGraphicsTextItem;
+public:
+	BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
-	QPointF getEntry() const {
-		return mapToScene(QPointF(width/2, 0));
-	}
+	void addItem(uint8_t* bytes, size_t num_bytes, QString line, const QString& href);
+	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	           QWidget *widget);
+	QRectF boundingRect() const;
+	std::array<QPointF, 3> getExits() const;
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget) {
-        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);
-		if (_widget.rowCount() != 0)
-			_widget.render(painter);
+	void mouseMoveEvent(QGraphicsSceneMouseEvent * event)
+		{ QGraphicsItem::mouseMoveEvent(event); scene()->update(); }
 
-		if (next[0]) {
-			if (next[1]) {
-				painter->setPen(QColor(0x00, 0xff, 0x00, 0xff));
-				painter->drawLine(QPointF(x + dx/3, y+dy),
-								  mapFromScene(next[0]->getEntry()));
-			} else {
-				painter->setPen(QColor(0x00, 0x00, 0x00, 0xff));
-				painter->drawLine(QPointF(x + dx/2, 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()));
+	QPointF getEntry() const
+		{ return mapToScene(QPointF(width/2, 0)); }
 
-    }
+	void addPrevious(BasicBlockWidget * widget)
+		{ previous.push_back(widget); }
 
-	void addPrevious(BasicBlockWidget * widget) {
-		previous.push_back(widget);
-	}
+	void addNext(BasicBlockWidget * left, BasicBlockWidget * right)
+		{ next[0] = left; next[1] = right; }
 
-	void addNext(BasicBlockWidget * left, BasicBlockWidget * right) {
-		next[0] = left;
-		next[1] = right;
-	}
+	BasicBlockWidget ** getNext()
+		{ return next; }
 
+	QString getName() const
+		{ return name; }
 private:
-    uint32_t width, height;
-    QTableWidget _widget;
+	void updateFunctionName(RenameFunctionEvent* event);
+
+	uint32_t width, height;
 	QString name;
-	BasicBlock * block;
+	std::unique_ptr<QGraphicsTextItem> _widget;
+	QTextTable* _table;
+	BasicBlock* block;
+	Mainwindow* mainwindow;
 	std::vector<BasicBlockWidget*> previous;
 	BasicBlockWidget* next[2];
+	log4cxx::LoggerPtr logger;
 };
 
 #endif