X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=f6113292dc97a325d48103693f3472caf62f5ca0;hb=e75c3d69cb2ebf78e156932deb136c0346b10234;hp=c434c46949f6a4cede34ea28652ba2f1c5c2c61f;hpb=459e107cb0f6fcf17618e06837fc8ff5b3f0ce8d;p=frida%2Ffrida.git
diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index c434c46..f611329 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,22 +1,15 @@
#include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.hxx"
-BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
- : width(270), height(45)
- , name(name), block(block)
- , _proxy(this) {
+BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
+ Mainwindow * mainwindow)
+ : width(270), height(45), name(name)
+ , _widget("", this), _table(NULL)
+ , block(block), mainwindow(mainwindow) {
next[0] = NULL; next[1] = NULL;
- _widget.setStyleSheet("QTableWidget { background-color : #ddddff; }");
- _widget.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
- _widget.verticalHeader()->setDefaultSectionSize(18);
- _widget.setColumnCount(3);
- _widget.verticalHeader()->hide();
- _widget.horizontalHeader()->hide();
- _widget.setShowGrid(false);
- _widget.setWordWrap(false);
- _widget.setMinimumSize(210, 40);
-
- _proxy.setWidget(&_widget);
- _proxy.setPos(5, 20);
+ _widget.setPos(5, 20);
+ _widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+ Qt::LinksAccessibleByMouse);
if (width < 250) width = 250;
}
@@ -24,6 +17,18 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
QString line, const QString& href) {
QString bytestring;
+ int row;
+
+ if (_table) {
+ row = _table->rows();
+ _table->appendRows(1);
+ } else {
+ row = 0;
+ QTextTableFormat format;
+ format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+ format.setBorder(0);
+ _table = _widget.textCursor().insertTable(1, 3, format);
+ }
for (size_t i(0); i < num_bytes; ++i) {
const char * hexdigits = "0123456789ABCDEF";
@@ -32,19 +37,47 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
bytestring += ' ';
}
- int current_row = _widget.rowCount();
- _widget.setRowCount(1 + current_row);
- _widget.setItem(current_row, 0, new QTableWidgetItem(bytestring));
- _widget.setItem(current_row, 1, new QTableWidgetItem(line.replace('\t', ' ')));
-// _widget.setItem(current_row, 2, new QTableWidgetItem(href));
+ _table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
+
+ line = line.replace('\t', ' ').toHtmlEscaped();
+ if (href != "") {
+ line = "" + line + "";
+ }
+
+ _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
- _widget.resizeColumnToContents(0);
- _widget.resizeColumnToContents(1);
- _widget.resizeColumnToContents(2);
+ QObject::connect(&_widget, &QGraphicsTextItem::linkActivated,
+ [=](QString str) {
+ if (str.startsWith("function:")) {
+ QString address = str.remove("function:");
+ mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+ }
+ });
- width = 12 + _widget.sizeHint().width();
- height = 25 + _widget.sizeHint().height();
+ width = 10 + _widget.boundingRect().width();
+ height = 25 + _widget.boundingRect().height();
if (width < 250) width = 250;
- _widget.resize(width - 12, height - 25);
}
+
+void BasicBlockWidget::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);
+}
+
+QRectF BasicBlockWidget::boundingRect() const {
+ qreal penWidth = 1;
+ QRectF result(- penWidth / 2, - penWidth / 2,
+ width + penWidth, height + penWidth);
+ return result;
+}
+
+std::array BasicBlockWidget::getExits() const {
+ return { { mapToScene(QPointF( width/3, height)),
+ mapToScene(QPointF( width/2, height)),
+ mapToScene(QPointF(2*width/3, height)) } };
+}
+