Skip to content

Commit 928d003

Browse files
ankitkrshah30ankitkrshah30
committed
feat(view): Enable mouse cursor movement in shell
1 parent 7bceab8 commit 928d003

8 files changed

Lines changed: 86 additions & 14 deletions

File tree

‎app/src/main/java/com/termux/app/TermuxActivity.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,12 @@ public void onStart() {
305305
public void onResume() {
306306
super.onResume();
307307

308+
// Use the existing mTerminalView variable to get the current terminal view
309+
TerminalView terminalView = mTerminalView;
310+
if (terminalView != null) {
311+
terminalView.reloadPreferences();
312+
}
313+
308314
Logger.logVerbose(LOG_TAG, "onResume");
309315

310316
if (mIsInvalidState) return;

‎app/src/main/java/com/termux/app/fragments/settings/termux/TerminalViewPreferencesFragment.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
2424

2525
setPreferencesFromResource(R.xml.termux_terminal_view_preferences, rootKey);
2626
}
27-
2827
}
2928

3029
class TerminalViewPreferencesDataStore extends PreferenceDataStore {
@@ -46,16 +45,16 @@ public static synchronized TerminalViewPreferencesDataStore getInstance(Context
4645
return mInstance;
4746
}
4847

49-
50-
5148
@Override
5249
public void putBoolean(String key, boolean value) {
53-
if (mPreferences == null) return;
54-
if (key == null) return;
50+
if (mPreferences == null || key == null) return;
5551

5652
switch (key) {
5753
case "terminal_margin_adjustment":
58-
mPreferences.setTerminalMarginAdjustment(value);
54+
mPreferences.setTerminalMarginAdjustment(value);
55+
break;
56+
case "mouse_cursor_movement_enabled":
57+
mPreferences.setMouseCursorMovementEnabled(value);
5958
break;
6059
default:
6160
break;
@@ -64,14 +63,15 @@ public void putBoolean(String key, boolean value) {
6463

6564
@Override
6665
public boolean getBoolean(String key, boolean defValue) {
67-
if (mPreferences == null) return false;
66+
if (mPreferences == null) return defValue;
6867

6968
switch (key) {
7069
case "terminal_margin_adjustment":
7170
return mPreferences.isTerminalMarginAdjustmentEnabled();
71+
case "mouse_cursor_movement_enabled":
72+
return mPreferences.isMouseCursorMovementEnabled();
7273
default:
73-
return false;
74+
return defValue;
7475
}
7576
}
76-
7777
}

‎app/src/main/res/xml/root_preferences.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,4 @@
4545
app:title="@string/donate_preference_title"
4646
app:persistent="false"
4747
app:isPreferenceVisible="false"/>
48-
4948
</PreferenceScreen>

‎app/src/main/res/xml/termux_preferences.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
app:title="@string/termux_terminal_view_preferences_title"
1515
app:summary="@string/termux_terminal_view_preferences_summary"
1616
app:fragment="com.termux.app.fragments.settings.termux.TerminalViewPreferencesFragment"/>
17-
1817
</PreferenceScreen>

‎app/src/main/res/xml/termux_terminal_view_preferences.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
app:summaryOn="@string/termux_terminal_view_terminal_margin_adjustment_on"
1111
app:title="@string/termux_terminal_view_terminal_margin_adjustment_title" />
1212

13+
<SwitchPreferenceCompat
14+
app:key="mouse_cursor_movement_enabled"
15+
app:title="Move Cursor With Tap"
16+
app:summaryOn="The cursor will move to the tapped location in the command line."
17+
app:summaryOff="Standard terminal behavior (long-press to select text)."
18+
app:defaultValue="false" />
1319
</PreferenceCategory>
1420

1521
</PreferenceScreen>

‎terminal-view/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ android {
77
dependencies {
88
implementation "androidx.annotation:annotation:1.3.0"
99
api project(":terminal-emulator")
10+
implementation "androidx.preference:preference:1.1.1"
1011
}
1112

1213
defaultConfig {

‎terminal-view/src/main/java/com/termux/view/TerminalView.java‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public final class TerminalView extends View {
5353
/** Our terminal emulator whose session is {@link #mTermSession}. */
5454
public TerminalEmulator mEmulator;
5555

56+
private boolean mIsMouseCursorMovementEnabled = false;
57+
5658
public TerminalRenderer mRenderer;
5759

5860
public TerminalViewClient mClient;
@@ -295,6 +297,9 @@ public boolean attachSession(TerminalSession session) {
295297
mEmulator = null;
296298
mCombiningAccent = 0;
297299

300+
android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext());
301+
mIsMouseCursorMovementEnabled = prefs.getBoolean("mouse_cursor_movement_enabled", false);
302+
298303
updateSize();
299304

300305
// Wait with enabling the scrollbar until we have a terminal to get scroll position from.
@@ -611,11 +616,11 @@ public boolean onTouchEvent(MotionEvent event) {
611616
updateFloatingToolbarVisibility(event);
612617
mGestureRecognizer.onTouchEvent(event);
613618
return true;
614-
} else if (event.isFromSource(InputDevice.SOURCE_MOUSE)) {
615-
if (event.isButtonPressed(MotionEvent.BUTTON_SECONDARY)) {
619+
} else if (event.isFromSource(InputDevice.SOURCE_MOUSE) || event.isFromSource(InputDevice.SOURCE_TOUCHSCREEN)) {
620+
if (event.isFromSource(InputDevice.SOURCE_MOUSE) && event.isButtonPressed(MotionEvent.BUTTON_SECONDARY)) {
616621
if (action == MotionEvent.ACTION_DOWN) showContextMenu();
617622
return true;
618-
} else if (event.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
623+
} else if (event.isFromSource(InputDevice.SOURCE_MOUSE) && event.isButtonPressed(MotionEvent.BUTTON_TERTIARY)) {
619624
ClipboardManager clipboardManager = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
620625
ClipData clipData = clipboardManager.getPrimaryClip();
621626
if (clipData != null) {
@@ -636,6 +641,47 @@ public boolean onTouchEvent(MotionEvent event) {
636641
break;
637642
}
638643
}
644+
else { // Mouse tracking is OFF, handle for the shell
645+
if (mIsMouseCursorMovementEnabled && event.getAction() == MotionEvent.ACTION_DOWN) {
646+
// Get target row and column from the click
647+
int[] targetCoords = getColumnAndRow(event, false);
648+
int targetColumn = targetCoords[0];
649+
int targetRow = targetCoords[1];
650+
// Boundary Check
651+
try {
652+
String clickedChar = mEmulator.getScreen().getSelectedText(targetColumn, targetRow, targetColumn + 1, targetRow).toString();
653+
if (clickedChar == null || clickedChar.trim().isEmpty()) {
654+
return true;
655+
}
656+
} catch (Exception e) {
657+
return true;
658+
}
659+
660+
// Get cursor's current visual position
661+
int currentRow = mEmulator.getCursorRow();
662+
int currentColumn = mEmulator.getCursorCol();
663+
664+
// Get the width of the terminal in characters
665+
int terminalWidth = mEmulator.mColumns;
666+
667+
// Calculate the 1D index for both the click position and the cursor position.
668+
int targetIndex = (targetRow * terminalWidth) + targetColumn;
669+
int currentIndex = (currentRow * terminalWidth) + currentColumn;
670+
671+
int diff = targetIndex - currentIndex;
672+
673+
// Send Left or Right commands
674+
if (diff > 0) { // Need to move right
675+
for (int i = 0; i < diff; i++) {
676+
handleKeyCode(android.view.KeyEvent.KEYCODE_DPAD_RIGHT, 0);
677+
}
678+
} else if (diff < 0) { // Need to move left
679+
for (int i = 0; i < -diff; i++) {
680+
handleKeyCode(android.view.KeyEvent.KEYCODE_DPAD_LEFT, 0);
681+
}
682+
}
683+
}
684+
}
639685
}
640686

641687
mGestureRecognizer.onTouchEvent(event);
@@ -1495,4 +1541,9 @@ public void updateFloatingToolbarVisibility(MotionEvent event) {
14951541
}
14961542
}
14971543

1544+
public void reloadPreferences() {
1545+
android.content.SharedPreferences prefs = androidx.preference.PreferenceManager.getDefaultSharedPreferences(getContext());
1546+
mIsMouseCursorMovementEnabled = prefs.getBoolean("mouse_cursor_movement_enabled", false);
1547+
}
1548+
14981549
}

‎termux-shared/src/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,4 +258,14 @@ public void setCrashReportNotificationsEnabled(boolean value) {
258258
SharedPreferenceUtils.setBoolean(mSharedPreferences, TERMUX_APP.KEY_CRASH_REPORT_NOTIFICATIONS_ENABLED, value, false);
259259
}
260260

261+
// Method to READ the setting
262+
public boolean isMouseCursorMovementEnabled() {
263+
return SharedPreferenceUtils.getBoolean(mSharedPreferences, "mouse_cursor_movement_enabled", false);
264+
}
265+
266+
// Method to SAVE the setting
267+
public void setMouseCursorMovementEnabled(boolean value) {
268+
SharedPreferenceUtils.setBoolean(mSharedPreferences, "mouse_cursor_movement_enabled", value, false);
269+
}
270+
261271
}

0 commit comments

Comments
 (0)