Escape and Ctrl+Alt keys in user action section

termux · Jul 4, 2024 · 2c17333 · 2c17333
1 parent 1e8c824
commit 2c17333
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/app/src/main/java/com/termux/x11/input/InputEventSender.java b/app/src/main/java/com/termux/x11/input/InputEventSender.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 import java.util.TreeSet;
+import java.util.function.Consumer;
 
 /**
  * A set of functions to send users' activities, which are represented by Android classes, to
@@ -39,6 +40,9 @@ public final class InputEventSender {
     public boolean pauseKeyInterceptingWithEsc = false;
     public boolean stylusIsMouse = false;
     public boolean stylusButtonContactModifierMode = false;
+    public boolean ctrlAltMonitor = false;
+    public Consumer<Boolean> escapeKeyAction = (down) -> {};
+    public Consumer<Boolean> ctrlAltKeyAction = (down) -> {};
 
     /** Set of pressed keys for which we've sent TextEvent. */
     private final TreeSet<Integer> mPressedTextKeys;
@@ -215,7 +219,24 @@ else if (e.getUnicodeChar() != 0)
             return true;
 
         if (keyCode == KEYCODE_ESCAPE && !pressed && e.hasNoModifiers())
-            MainActivity.setCapturingEnabled(false);
+            escapeKeyAction.accept(true);
+
+        if (!(e.isAltPressed() && e.isCtrlPressed()) && ctrlAltMonitor) {
+            ctrlAltMonitor = false;
+            ctrlAltKeyAction.accept(true);
+        }
+        if (e.isAltPressed() && e.isCtrlPressed())
+            ctrlAltMonitor = true;
+        if (ctrlAltMonitor)
+            switch (keyCode) {
+                case KEYCODE_ALT_LEFT:
+                case KEYCODE_ALT_RIGHT:
+                case KEYCODE_CTRL_LEFT:
+                case KEYCODE_CTRL_RIGHT:
+                    break;
+                default:
+                    ctrlAltMonitor = false;
+            }
 
         // We try to send all other key codes to the host directly.
         return mInjector.sendKeyEvent(scancode, keyCode, pressed);

diff --git a/app/src/main/java/com/termux/x11/input/TouchInputHandler.java b/app/src/main/java/com/termux/x11/input/TouchInputHandler.java
@@ -465,6 +465,8 @@ public void reloadPreferences(Prefs p) {
         volumeUpAction = extractUserActionFromPreferences(p, "volumeUp");
         volumeDownAction = extractUserActionFromPreferences(p, "volumeDown");
         backButtonAction = extractUserActionFromPreferences(p, "backButton");
+        mInjector.escapeKeyAction = extractUserActionFromPreferences(p, "escapeKey");
+        mInjector.ctrlAltKeyAction = extractUserActionFromPreferences(p, "ctrlAltKey");
 
         if(mTouchpadHandler != null)
             mTouchpadHandler.reloadPreferences(p);

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -112,7 +112,7 @@
 
         <SwitchPreferenceCompat
             android:title="Capture external pointer devices when possible"
-            android:summary="Intercept all hardware pointer events. Pointer is back to Android after pressing Escape key."
+            android:summary="Intercept all hardware pointer events. Customize &quot;Response to user actions&quot; to return pointer to Android. "
             android:defaultValue="false"
             android:key="pointerCapture" />
 
@@ -282,5 +282,20 @@
             android:defaultValue="toggle soft keyboard"
             android:entries="@array/userActionsValues"
             android:entryValues="@array/userActionsValues" />
+
+        <ListPreference
+            android:title="Escape"
+            android:key="escapeKeyAction"
+            android:defaultValue="release pointer and keyboard capture"
+            android:entries="@array/userActionsValues"
+            android:entryValues="@array/userActionsValues" />
+
+        <ListPreference
+            android:title="Ctrl + Alt"
+            android:key="ctrlAltKeyAction"
+            android:summary="Subject to IME and device model"
+            android:defaultValue="release pointer and keyboard capture"
+            android:entries="@array/userActionsValues"
+            android:entryValues="@array/userActionsValues" />
     </PreferenceCategory>
 </PreferenceScreen>