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=98d3e6301b266b5d4c51663b08b7e57cd26a9844;hb=5514e0b76ec9af2fa67abebe77cfe26052f2326f;hpb=f47dd6b106b9ba1d6363277b47cdec2ac0448f6c

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 98d3e63..8cf709c 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -1,82 +1,63 @@
-#include "gui/qt.hxx"
-
-class BasicBlockWidget : public QGraphicsItem
-{
-public:
-    BasicBlockWidget(const QString& name)
-		: x(-5), y(-20)
-		, dx(270), dy(45)
-		, name(name) {
-		_widget.setMinimumHeight(_widget.rowHeight(0) + 10);
-		_widget.setMaximumHeight(20);
-		_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;
+#ifndef INCLUDE__BasicBlockWidget_hxx
+#define INCLUDE__BasicBlockWidget_hxx
 
-		QString bytestring;
+#include "gui/qt.hxx"
+#include <vector>
+#include <cassert>
+#include <tuple>
+#include <array>
+#include <memory>
+#include <log4cxx/logger.h>
 
-		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 += ' ';
-		}
+class Mainwindow;
+class CustomQGraphicsTextItem;
 
-		_widget.setRowCount(current_row + 1);
+class BasicBlock;
 
-		_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();
+class RenameFunctionEvent;
 
-		_widget.resizeColumnToContents(0);
-		_widget.resizeColumnToContents(1);
-		_widget.resizeColumnToContents(2);
+class BasicBlockWidget : public QObject, public QGraphicsItem
+{
+	Q_OBJECT
+	friend class CustomQGraphicsTextItem;
+public:
+	BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
-		_widget.resizeRowToContents(current_row);
+	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;
 
-		column_width =
-			_widget.columnWidth(0) +
-			_widget.columnWidth(1) +
-			_widget.columnWidth(2) +
-			2;
+	void mouseMoveEvent(QGraphicsSceneMouseEvent * event)
+		{ QGraphicsItem::mouseMoveEvent(event); scene()->update(); }
 
-		_widget.setMinimumWidth(column_width);
-		_widget.setMinimumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
-		_widget.setMaximumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+	QPointF getEntry() const
+		{ return mapToScene(QPointF(width/2, 0)); }
 
+	void addPrevious(BasicBlockWidget * widget)
+		{ previous.push_back(widget); }
 
-		dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-		dx = column_width + 10;
-		if (dx < 270) dx = 270;
-	}
+	void addNext(BasicBlockWidget * left, BasicBlockWidget * right)
+		{ next[0] = left; next[1] = right; }
 
-    QRectF boundingRect() const
-    {
-        qreal penWidth = 1;
-        return QRectF(x - penWidth / 2, y - penWidth / 2,
-                      dx + penWidth, dy + penWidth);
-    }
+	BasicBlockWidget ** getNext()
+		{ return next; }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               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);
-    }
+	QString getName() const
+		{ return name; }
 private:
-    int x, y, dx, dy;
-    QTableWidget _widget;
+	void updateFunctionName(RenameFunctionEvent* event);
+
+	uint32_t width, height;
 	QString name;
+	std::unique_ptr<QGraphicsTextItem> _widget;
+	QTextTable* _table;
+	BasicBlock* block;
+	Mainwindow* mainwindow;
+	std::vector<BasicBlockWidget*> previous;
+	BasicBlockWidget* next[2];
+	log4cxx::LoggerPtr logger;
 };
+
+#endif