Superoldman96 · pull · May 30, 2025 · May 29, 2025 · May 29, 2025
diff --git a/src/Iaito.pro b/src/Iaito.pro
@@ -341,6 +341,7 @@ SOURCES += \
     dialogs/NewFileDialog.cpp \
     widgets/CommentsWidget.cpp \
     widgets/ConsoleWidget.cpp \
+    widgets/CustomCommandWidget.cpp \
     widgets/Dashboard.cpp \
     widgets/EntrypointWidget.cpp \
     widgets/ExportsWidget.cpp \
@@ -511,6 +512,7 @@ HEADERS  += \
     dialogs/NewFileDialog.h \
     widgets/CommentsWidget.h \
     widgets/ConsoleWidget.h \
+    widgets/CustomCommandWidget.h \
     widgets/Dashboard.h \
     widgets/EntrypointWidget.h \
     widgets/ExportsWidget.h \
@@ -719,6 +721,7 @@ FORMS    += \
     widgets/ListDockWidget.ui \
     dialogs/LayoutManager.ui \
     widgets/R2GraphWidget.ui \
+    widgets/CustomCommandWidget.ui \
     dialogs/preferences/AnalOptionsWidget.ui
 
 RESOURCES += \

diff --git a/src/core/Iaito.cpp b/src/core/Iaito.cpp
@@ -1496,7 +1496,11 @@ RefDescription IaitoCore::formatRefDesc(QJsonObject refItem)
         } else if (type == "library") {
             desc.refColor = ConfigColor("floc");
         } else if (type == "stack") {
+#if R2_VERSION_NUMBER >= 50909
+            desc.refColor = ConfigColor("addr");
+#else
             desc.refColor = ConfigColor("offset");
+#endif
         }
     }
 

diff --git a/src/core/MainWindow.cpp b/src/core/MainWindow.cpp
@@ -33,6 +33,7 @@
 #include "widgets/ClassesWidget.h"
 #include "widgets/CommentsWidget.h"
 #include "widgets/ConsoleWidget.h"
+#include "widgets/CustomCommandWidget.h"
 #include "widgets/Dashboard.h"
 #include "widgets/DebugActions.h"
 #include "widgets/DecompilerWidget.h"
@@ -158,6 +159,7 @@ void MainWindow::initUI()
     connect(ui->actionExtraGraph, &QAction::triggered, this, &MainWindow::addExtraGraph);
     connect(ui->actionExtraDisassembly, &QAction::triggered, this, &MainWindow::addExtraDisassembly);
     connect(ui->actionExtraHexdump, &QAction::triggered, this, &MainWindow::addExtraHexdump);
+    connect(ui->actionAddCustomCommand, &QAction::triggered, this, &MainWindow::addExtraCustomCommand);
     connect(ui->actionCommitChanges, &QAction::triggered, this, []() {
         Core()->commitWriteCache();
     });
@@ -525,6 +527,12 @@ void MainWindow::addExtraDecompiler()
     addExtraWidget(extraDock);
 }
 
+void MainWindow::addExtraCustomCommand()
+{
+    auto *extraDock = new CustomCommandWidget(this);
+    addExtraWidget(extraDock);
+}
+
 void MainWindow::addExtraWidget(IaitoDockWidget *extraDock)
 {
     extraDock->setTransient(true);

diff --git a/src/core/MainWindow.h b/src/core/MainWindow.h
@@ -182,6 +182,7 @@ private slots:
     void addExtraHexdump();
     void addExtraDisassembly();
     void addExtraDecompiler();
+    void addExtraCustomCommand();
 
     void on_actionRefresh_Panels_triggered();
 

diff --git a/src/core/MainWindow.ui b/src/core/MainWindow.ui
@@ -188,6 +188,7 @@
     <addaction name="menuAddDebugWidgets"/>
     <addaction name="menuPlugins"/>
     <addaction name="separator"/>
+    <addaction name="actionAddCustomCommand"/>
    </widget>
    <widget class="QMenu" name="menu
8000
Debug">
     <property name="title">
@@ -799,6 +800,11 @@
     <string>Add Graph</string>
    </property>
   </action>
+  <action name="actionAddCustomCommand">
+   <property name="text">
+    <string>Add Custom Command</string>
+   </property>
+  </action>
   <action name="actionGrouped_dock_dragging">
    <property name="checkable">
     <bool>true</bool>

diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp
@@ -38,11 +38,17 @@ AsmOptionsWidget::AsmOptionsWidget(PreferencesDialog *dialog)
     }
     ui->relToComboBox->blockSignals(false);
     // Connect combobox changes to config update
-    connect(ui->relToComboBox,
-            static_cast<void(QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
-            this, &AsmOptionsWidget::on_relToComboBox_currentIndexChanged);
-    connect(ui->relToComboBox, &QComboBox::editTextChanged,
-            this, &AsmOptionsWidget::on_relToComboBox_currentIndexChanged);
+    // Connect combobox text changes to config update
+    connect(
+        ui->relToComboBox,
+        &QComboBox::currentTextChanged,
+        this,
+        &AsmOptionsWidget::on_relToComboBox_currentIndexChanged);
+    connect(
+        ui->relToComboBox,
+        &QComboBox::editTextChanged,
+        this,
+        &AsmOptionsWidget::on_relToComboBox_currentIndexChanged);
 
     ui->syntaxComboBox->blockSignals(true);
     for (const auto &syntax : Core()->cmdList("e asm.syntax=?"))

diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
@@ -197,8 +197,11 @@ DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent, MainWindow *main
         getDisplayOptionsSequence());
     // Add "Relative to" submenu to select asm.addr.relto values at runtime
     relativeToMenu = addMenu(tr("Relative to"));
-    connect(relativeToMenu, &QMenu::triggered,
-            this, &DisassemblyContextMenu::on_actionRelativeTo_triggered);
+    connect(
+        relativeToMenu,
+        &QMenu::triggered,
+        this,
+        &DisassemblyContextMenu::on_actionRelativeTo_triggered);
 
     addSeparator();
 

diff --git a/src/widgets/CustomCommandWidget.cpp b/src/widgets/CustomCommandWidget.cpp
@@ -0,0 +1,68 @@
+#include "widgets/CustomCommandWidget.h"
+#include "common/CommandTask.h"
+#include "core/MainWindow.h"
+#include "ui_CustomCommandWidget.h"
+#include <QPlainTextEdit>
+#include <QSettings>
+#include <QTextCursor>
+
+CustomCommandWidget::CustomCommandWidget(MainWindow *main)
+    : IaitoDockWidget(main)
+    , ui(new Ui::CustomCommandWidget)
+{
+    ui->setupUi(this);
+    setWindowTitle(tr("Custom Command"));
+
+    connect(ui->runButton, &QPushButton::clicked, this, &CustomCommandWidget::runCommand);
+    connect(ui->commandLineEdit, &QLineEdit::returnPressed, this, &CustomCommandWidget::runCommand);
+    connect(ui->wrapCheckBox, &QCheckBox::toggled, this, &CustomCommandWidget::setWrap);
+    setWrap(ui->wrapCheckBox->isChecked());
+
+    refreshDeferrer = createRefreshDeferrer([this]() {
+        if (!ui->commandLineEdit->text().isEmpty()) {
+            runCommand();
+        }
+    });
+}
+
+CustomCommandWidget::~CustomCommandWidget() = default;
+
+void CustomCommandWidget::runCommand()
+{
+    if (!commandTask.isNull()) {
+        return;
+    }
+    const QString cmd = ui->commandLineEdit->text().trimmed();
+    if (cmd.isEmpty()) {
+        return;
+    }
+    // Clear previous output when running a new command
+    ui->outputTextEdit->clear();
+    ui->runButton->setEnabled(false);
+    ui->commandLineEdit->setEnabled(false);
+
+    // ui->outputTextEdit->appendPlainText(QString("> %1").arg(cmd));
+    ui->outputTextEdit->moveCursor(QTextCursor::End);
+    ui->outputTextEdit->ensureCursorVisible();
+
+    commandTask = QSharedPointer<CommandTask>(new CommandTask(cmd, CommandTask::MODE_256, true));
+    connect(commandTask.data(), &CommandTask::finished, this, &CustomCommandWidget::onCommandFinished);
+    Core()->getAsyncTaskManager()->start(commandTask);
+}
+
+void CustomCommandWidget::onCommandFinished(const QString &result)
+{
+    ui->outputTextEdit->appendHtml(result);
+    ui->outputTextEdit->moveCursor(QTextCursor::End);
+    ui->outputTextEdit->ensureCursorVisible();
+
+    ui->runButton->setEnabled(true);
+    ui->commandLineEdit->setEnabled(true);
+    // Clear the current task so the user can run another command
+    commandTask.reset();
+}
+
+void CustomCommandWidget::setWrap(bool wrap)
+{
+    ui->outputTextEdit->setLineWrapMode(wrap ? QPlainTextEdit::WidgetWidth : QPlainTextEdit::NoWrap);
+}
diff --git a/src/widgets/CustomCommandWidget.h b/src/widgets/CustomCommandWidget.h
@@ -0,0 +1,35 @@
+#ifndef CUSTOMCOMMANDWIDGET_H
+#define CUSTOMCOMMANDWIDGET_H
+
+#include "common/CommandTask.h"
+#include "widgets/IaitoDockWidget.h"
+#include <memory>
+#include <QSharedPointer>
+#include <QString>
+
+namespace Ui {
+class CustomCommandWidget;
+}
+class RefreshDeferrer;
+class MainWindow;
+
+class CustomCommandWidget : public IaitoDockWidget
+{
+    Q_OBJECT
+
+public:
+    explicit CustomCommandWidget(MainWindow *main);
+    ~CustomCommandWidget() override;
+
+private slots:
+    void runCommand();
+    void onCommandFinished(const QString &result);
+    void setWrap(bool wrap);
+
+private:
+    std::unique_ptr<Ui::CustomCommandWidget> ui;
+    QSharedPointer<CommandTask> commandTask;
+    RefreshDeferrer *refreshDeferrer;
+};
+
+#endif // CUSTOMCOMMANDWIDGET_H
diff --git a/src/widgets/CustomCommandWidget.ui b/src/widgets/CustomCommandWidget.ui
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CustomCommandWidget</class>
+ <widget class="QDockWidget" name="CustomCommandWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Custom Command</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>5</number>
+    </property>
+    <item>
+     <layout class="QHBoxLayout" name="hLayoutInput">
+      <item>
+       <widget class="QLineEdit" name="commandLineEdit">
+        <property name="placeholderText">
+         <string>Enter command</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="runButton">
+        <property name="text">
+         <string>Run</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="wrapCheckBox">
+        <property name="text">
+         <string>Wrap Lines</string>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QPlainTextEdit" name="outputTextEdit">
+      <property name="readOnly">
+       <bool>true</bool>
+      </property>
+      <property name="lineWrapMode">
+       <enum>QPlainTextEdit::NoWrap</enum>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+      </property>
+      <property name="font">
+       <font>
+        <family>Monospace</family>
+       </font>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>