Restructured widget source tree, initial support for splitted views

REDasmOrg · Nov 16, 2020 · e957692 · e957692
1 parent 06ea2c3
commit e957692
Show file tree

Hide file tree

Showing 51 changed files with 812 additions and 541 deletions.
diff --git a/LibREDasm b/LibREDasm
diff --git a/dialogs/devdialog/tabs/rdiltab.cpp b/dialogs/devdialog/tabs/rdiltab.cpp
@@ -24,7 +24,7 @@ void RDILTab::updateInformation()
 
     ui->lblTitle->setText(RD_GetInstruction(m_context.get(), item.address));
     m_graph.reset(RDILGraph_Create(m_context.get(), item.address));
-    ui->graphView->setGraph(m_graph.get());
+    //ui->graphView->setGraph(m_graph.get());
     return;
 
 notitle:

diff --git a/dialogs/gotodialog/gotodialog.cpp b/dialogs/gotodialog/gotodialog.cpp
@@ -1,14 +1,15 @@
 #include "gotodialog.h"
 #include "ui_gotodialog.h"
+#include "../../hooks/disassemblerhooks.h"
+#include "../../renderer/surfaceqt.h"
 
-GotoDialog::GotoDialog(ICommand* command, QWidget *parent) : QDialog(parent), ui(new Ui::GotoDialog), m_command(command)
+GotoDialog::GotoDialog(const RDContextPtr& ctx, QWidget *parent) : QDialog(parent), ui(new Ui::GotoDialog), m_context(ctx)
 {
     ui->setupUi(this);
 
-    m_document = RDContext_GetDocument(command->context().get());
-
+    m_document = RDContext_GetDocument(ctx.get());
     m_gotomodel = new GotoFilterModel(ui->tvFunctions);
-    m_gotomodel->setContext(command->context());
+    m_gotomodel->setContext(ctx);
 
     ui->tvFunctions->setModel(m_gotomodel);
     ui->tvFunctions->horizontalHeader()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
@@ -45,12 +46,20 @@ void GotoDialog::validateEntry()
 
 void GotoDialog::onGotoClicked()
 {
-    if(this->hasValidAddress()) m_command->goToAddress(m_address);
+    if(this->hasValidAddress())
+    {
+        auto* surface = DisassemblerHooks::instance()->activeSurface();
+        if(surface) surface->goToAddress(m_address);
+    }
+
     this->accept();
 }
 
 void GotoDialog::onItemSelected(const QModelIndex &index)
 {
     QModelIndex srcindex = m_gotomodel->mapToSource(index);
-    if(srcindex.isValid()) m_command->goTo(m_gotomodel->item(index));
+    if(!srcindex.isValid()) return;
+
+    auto* surface = DisassemblerHooks::instance()->activeSurface();
+    if(surface) surface->goTo(std::addressof(m_gotomodel->item(index)));
 }
diff --git a/dialogs/gotodialog/gotodialog.h b/dialogs/gotodialog/gotodialog.h
@@ -2,7 +2,6 @@
 
 #include <QDialog>
 #include <rdapi/rdapi.h>
-#include "../../hooks/icommand.h"
 #include "../../models/gotomodel/gotofiltermodel.h"
 
 namespace Ui {
@@ -14,7 +13,7 @@ class GotoDialog : public QDialog
     Q_OBJECT
 
     public:
-        explicit GotoDialog(ICommand* command, QWidget *parent = nullptr);
+        explicit GotoDialog(const RDContextPtr& ctx, QWidget *parent = nullptr);
         ~GotoDialog();
 
     private:
@@ -27,7 +26,7 @@ class GotoDialog : public QDialog
 
     private:
         Ui::GotoDialog *ui;
-        ICommand* m_command;
+        RDContextPtr m_context;
         RDDocument* m_document;
         GotoFilterModel* m_gotomodel;
         rd_address m_address{0};

diff --git a/dialogs/referencesdialog/referencesdialog.cpp b/dialogs/referencesdialog/referencesdialog.cpp
@@ -1,15 +1,17 @@
 #include "referencesdialog.h"
 #include "ui_referencesdialog.h"
+#include "../../hooks/disassemblerhooks.h"
+#include "../../renderer/surfaceqt.h"
 
-ReferencesDialog::ReferencesDialog(ICommand* command, const RDSymbol* symbol, QWidget *parent) : QDialog(parent), ui(new Ui::ReferencesDialog), m_command(command)
+ReferencesDialog::ReferencesDialog(const RDContextPtr& ctx, const RDSymbol* symbol, QWidget *parent) : QDialog(parent), ui(new Ui::ReferencesDialog), m_context(ctx)
 {
     ui->setupUi(this);
 
-    RDDocument* doc = RDContext_GetDocument(command->context().get());
+    RDDocument* doc = RDContext_GetDocument(ctx.get());
     this->setWindowTitle(QString("%1 References").arg(RDDocument_GetSymbolName(doc, symbol->address)));
 
-    m_referencesmodel = new ReferencesModel(command, ui->tvReferences);
-    m_referencesmodel->setContext(command->context());
+    m_referencesmodel = new ReferencesModel(ui->tvReferences);
+    m_referencesmodel->setContext(ctx);
     m_referencesmodel->xref(symbol->address);
 
     ui->tvReferences->setModel(m_referencesmodel);
@@ -22,6 +24,7 @@ void ReferencesDialog::on_tvReferences_doubleClicked(const QModelIndex &index)
     if(!index.isValid() || !index.internalId())
         return;
 
-    m_command->goToAddress(static_cast<rd_address>(index.internalId()));
+    auto* surface = DisassemblerHooks::instance()->activeSurface();
+    if(surface) surface->goToAddress(static_cast<rd_address>(index.internalId()));
     this->accept();
 }
diff --git a/dialogs/referencesdialog/referencesdialog.h b/dialogs/referencesdialog/referencesdialog.h
@@ -2,7 +2,6 @@
 
 #include <QDialog>
 #include "../../models/referencesmodel.h"
-#include "../../hooks/icommand.h"
 
 namespace Ui {
 class ReferencesDialog;
@@ -13,14 +12,14 @@ class ReferencesDialog : public QDialog
     Q_OBJECT
 
     public:
-        explicit ReferencesDialog(ICommand* command, const RDSymbol *symbol, QWidget *parent = nullptr);
+        explicit ReferencesDialog(const RDContextPtr& ctx, const RDSymbol *symbol, QWidget *parent = nullptr);
         ~ReferencesDialog();
 
     private slots:
         void on_tvReferences_doubleClicked(const QModelIndex &index);
 
     private:
         Ui::ReferencesDialog *ui;
+        RDContextPtr m_context;
         ReferencesModel* m_referencesmodel;
-        ICommand* m_command;
 };
+7 −0		rdapi/context.cpp
+6 −0		rdapi/context.h
+0 −3		rdapi/disassembler.cpp
+0 −3		rdapi/disassembler.h
+0 −2		rdapi/document/document.cpp
+0 −2		rdapi/document/document.h
+2 −1		rdapi/events.h
+11 −9		rdapi/renderer/surface.cpp
+2 −0		rdapi/renderer/surface.h
+4 −1		rdcore/builtin/analyzer/functionanalyzer.cpp
+2 −1		rdcore/builtin/graph/functiongraph.cpp
+7 −3		rdcore/builtin/graph/functiongraph.h
+4 −0		rdcore/context.cpp
+6 −2		rdcore/context.h
+2 −2		rdcore/document/backend/itemcontainer.h
+9 −5		rdcore/engine/engine.cpp
+1 −0		rdcore/object.cpp
+4 −7		rdcore/object.h
+42 −71		rdcore/renderer/cursor.cpp
+28 −21		rdcore/renderer/cursor.h
+82 −44		rdcore/renderer/surface.cpp
+14 −9		rdcore/renderer/surface.h
+4 −4		rdcore/renderer/surfacepath.cpp