Move the toggle immediate base handling to DisassemblyWidget.cpp

(Removes the entry from the context menu)
plaets · Sep 23, 2020 · 1473d2f · 1473d2f
1 parent 84049e8
commit 1473d2f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 24 deletions.
diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
@@ -125,10 +125,6 @@ DisassemblyContextMenu::DisassemblyContextMenu(QWidget *parent, MainWindow *main
 
     addSetBaseMenu();
 
-    initAction(&actionToggleBase, tr("Toggle Immediate Base (Hex/Dec)"),
-               SLOT(on_actionToggleBase_triggered()), getToggleBaseSequence());
-    addAction(&actionToggleBase);
-
     addSetBitsMenu();
 
     structureOffsetMenu = addMenu(tr("Structure offset"));
@@ -678,11 +674,6 @@ QKeySequence DisassemblyContextMenu::getUndefineFunctionSequence() const
     return {Qt::Key_U};
 }
 
-QKeySequence DisassemblyContextMenu::getToggleBaseSequence() const
-{
-    return {Qt::Key_H};
-}
-
 
 void DisassemblyContextMenu::on_actionEditInstruction_triggered()
 {
@@ -812,17 +803,6 @@ void DisassemblyContextMenu::on_actionAnalyzeFunction_triggered()
     }
 }
 
-// TODO: requires the user to trigger the action twice if the number is in decimals
-void DisassemblyContextMenu::on_actionToggleBase_triggered()
-{
-    int base = Core()->getImmediateBase(offset);
-    if (base == 10) {
-	setBase("h");
-    } else {
-	setBase("d");
-    }
-}
-
 void DisassemblyContextMenu::on_actionAddFlag_triggered()
 {
     FlagDialog dialog(offset, this->parentWidget());

diff --git a/src/menus/DisassemblyContextMenu.h b/src/menus/DisassemblyContextMenu.h
@@ -68,8 +68,6 @@ private slots:
     void on_actionSetToData_triggered();
     void on_actionSetToDataEx_triggered();
 
-    void on_actionToggleBase_triggered();
-
     /**
      * @brief Executed on selecting an offset from the structureOffsetMenu
      * Uses the applyStructureOffset() function of CutterCore to apply the
@@ -103,7 +101,6 @@ private slots:
     QKeySequence getDefineNewFunctionSequence() const;
     QKeySequence getUndefineFunctionSequence() const;
     QKeySequence getEditFunctionSequence() const;
-    QKeySequence getToggleBaseSequence() const;
     QList<QKeySequence> getAddBPSequence() const;
 
     /**
@@ -159,7 +156,6 @@ private slots:
     QAction actionSetBaseIPAddr;
     QAction actionSetBaseSyscall;
     QAction actionSetBaseString;
-    QAction actionToggleBase;
 
     QMenu *setBitsMenu;
     QAction actionSetBits16;

diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
@@ -202,6 +202,10 @@ DisassemblyWidget::DisassemblyWidget(MainWindow *main)
     ADD_ACTION(QKeySequence::MoveToPreviousPage, Qt::WidgetWithChildrenShortcut, [this]() {
         moveCursorRelative(true, true);
     })
+
+    ADD_ACTION(Qt::Key_H, Qt::WidgetWithChildrenShortcut, [this]() {
+	toggleBase();
+    })
 #undef ADD_ACTION
 }
 
@@ -623,6 +627,25 @@ void DisassemblyWidget::jumpToOffsetUnderCursor(const QTextCursor &cursor)
     seekable->seekToReference(offset);
 }
 
+// TODO: requires the user to trigger the action twice if the number is in decimals
+void DisassemblyWidget::toggleBase()
+{
+    RVA offset = readCurrentDisassemblyOffset();
+    QJsonObject instObject = Core()->cmdj("aoj @ " + QString::number(
+                                              offset)).array().first().toObject();
+    auto keys = instObject.keys();
+    bool immBase = keys.contains("val") || keys.contains("ptr");
+
+    if(immBase) {
+	int base = Core()->getImmediateBase(offset);
+	if (base == 10) {
+	    Core()->setImmediateBase("h", offset);
+	} else {
+	    Core()->setImmediateBase("d", offset);
+	}
+    }
+}
+
 bool DisassemblyWidget::eventFilter(QObject *obj, QEvent *event)
 {
     if (event->type() == QEvent::MouseButtonDblClick

diff --git a/src/widgets/DisassemblyWidget.h b/src/widgets/DisassemblyWidget.h
@@ -88,6 +88,8 @@ protected slots:
     void moveCursorRelative(bool up, bool page);
 
     void jumpToOffsetUnderCursor(const QTextCursor&);
+
+    void toggleBase();
 };
 
 class DisassemblyScrollArea : public QAbstractScrollArea