Fix "return" key in disassembler widget (rizinorg#3090)

whol-hoopa · Feb 23, 2023 · a34fa40 · a34fa40
1 parent 68ec5a3
commit a34fa40
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/src/common/DisassemblyPreview.cpp b/src/common/DisassemblyPreview.cpp
@@ -89,3 +89,13 @@ RVA DisassemblyPreview::readDisassemblyOffset(QTextCursor tc)
 
     return userData->line.offset;
 }
+
+RVA DisassemblyPreview::readDisassemblyArrow(QTextCursor tc)
+{
+    auto userData = getUserData(tc.block());
+    if (!userData && userData->line.arrow != RVA_INVALID) {
+        return RVA_INVALID;
+    }
+
+    return userData->line.arrow;
+}
diff --git a/src/common/DisassemblyPreview.h b/src/common/DisassemblyPreview.h
@@ -41,5 +41,11 @@ bool showDisasPreview(QWidget *parent, const QPoint &pointOfEvent, const RVA off
  * @return The disassembly offset of the hovered asm text
  */
 RVA readDisassemblyOffset(QTextCursor tc);
+
+/*!
+ * @brief Reads the arrow offset for the cursor position
+ * @return The jump address of the hovered asm text
+ */
+RVA readDisassemblyArrow(QTextCursor tc);
 }
 #endif
diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
@@ -617,6 +617,12 @@ void DisassemblyWidget::jumpToOffsetUnderCursor(const QTextCursor &cursor)
     seekable->seekToReference(offset);
 }
 
+void DisassemblyWidget::jumpToArrowOffsetUnderCursor(const QTextCursor &cursor)
+{
+    RVA offset = DisassemblyPreview::readDisassemblyArrow(cursor);
+    seekable->seek(offset);
+}
+
 bool DisassemblyWidget::eventFilter(QObject *obj, QEvent *event)
 {
     if (event->type() == QEvent::MouseButtonDblClick
@@ -647,7 +653,7 @@ void DisassemblyWidget::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Return) {
         const QTextCursor cursor = mDisasTextEdit->textCursor();
-        jumpToOffsetUnderCursor(cursor);
+        jumpToArrowOffsetUnderCursor(cursor);
     }
 
     MemoryDockWidget::keyPressEvent(event);

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