Add an option to use termux-app's additional key bar behaviour.

Fixes #604
termux · May 16, 2024 · ebfac49 · ebfac49
1 parent 2f26555
commit ebfac49
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/app/src/main/java/com/termux/x11/MainActivity.java b/app/src/main/java/com/termux/x11/MainActivity.java
@@ -96,6 +96,7 @@ public class MainActivity extends AppCompatActivity implements View.OnApplyWindo
     private boolean filterOutWinKey = false;
     private boolean hideEKOnVolDown = false;
     private boolean toggleIMEUsingBackKey = false;
+    private boolean useTermuxEKBarBehaviour = false;
     private static final int KEY_BACK = 158;
 
     private final BroadcastReceiver receiver = new BroadcastReceiver() {
@@ -173,6 +174,7 @@ public void swipeDown() {
             }
         }, new InputEventSender(lorieView));
         mLorieKeyListener = (v, k, e) -> {
+            InputDevice dev = e.getDevice();
             if (!captureVolumeKeys && (k == KEYCODE_VOLUME_DOWN || k == KEYCODE_VOLUME_UP))
                 return false;
 
@@ -199,6 +201,10 @@ public void swipeDown() {
                 }
             }
 
+            // Do not steal dedicated buttons from a full external keyboard.
+            if (useTermuxEKBarBehaviour && mExtraKeys != null && (dev == null || dev.isVirtual()))
+                mExtraKeys.unsetSpecialKeys();
+
             return mInputHandler.sendKeyEvent(v, e);
         };
 
@@ -538,6 +544,7 @@ void onPreferencesChanged(String key) {
             KeyInterceptor.shutdown();
 
         hideEKOnVolDown = p.getBoolean("hideEKOnVolDown", false);
+        useTermuxEKBarBehaviour = p.getBoolean("useTermuxEKBarBehaviour", false);
         toggleIMEUsingBackKey = p.getBoolean("toggleIMEUsingBackKey", true);
 
         int requestedOrientation = p.getBoolean("forceLandscape", false) ?

diff --git a/app/src/main/java/com/termux/x11/utils/TermuxX11ExtraKeys.java b/app/src/main/java/com/termux/x11/utils/TermuxX11ExtraKeys.java
@@ -122,6 +122,15 @@ protected void onTerminalExtraKeyButtonClick(@SuppressWarnings("unused") View vi
         }
     }
 
+    public void unsetSpecialKeys() {
+        if (mExtraKeysView == null)
+            return;
+        mExtraKeysView.readSpecialButton(SpecialButton.CTRL, true);
+        mExtraKeysView.readSpecialButton(SpecialButton.ALT, true);
+        mExtraKeysView.readSpecialButton(SpecialButton.SHIFT, true);
+        mExtraKeysView.readSpecialButton(SpecialButton.META, true);
+    }
+
     @Override
     public boolean performExtraKeyButtonHapticFeedback(View view, ExtraKeyButton buttonInfo, Button button) {
         MainActivity.handler.postDelayed(() -> {

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -142,6 +142,12 @@
             android:defaultValue="false"
             android:key="hideEKOnVolDown" />
 
+        <SwitchPreferenceCompat
+            android:title="Deactivate special keys on additional key bar after each keypress"
+            android:summary="Use long-tap to lock special keys"
+            android:defaultValue="false"
+            android:key="useTermuxEKBarBehaviour" />
+
         <SwitchPreferenceCompat
             android:title="Show IME with external keyboard"
             android:summary="Show software keyboard while hardware keyboard is connected. Requires WRITE_SECURE_SETTINGS permission."