🔥 merge pull request termux#4366

Author: lkijewski

app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java

@@ -214,6 +214,11 @@ public boolean isTerminalViewSelected() {
         return mActivity.getTerminalToolbarViewPager() == null || mActivity.isTerminalViewSelected() || mActivity.getTerminalView().hasFocus();
     }
 
+    @Override
+    public boolean isTerminalViewScalingDisabled() {
+        return mActivity.getProperties().isTerminalViewScalingDisabled();
+    }
+
     @Override
     public void copyModeChanged(boolean copyMode) {
         // Disable drawer while copying.

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

@@ -205,19 +205,19 @@ public boolean onScroll(MotionEvent e, float distanceX, float distanceY) {
                     int deltaRows = (int) (distanceY / mRenderer.mFontLineSpacing);
                     mScrollRemainder = distanceY - deltaRows * mRenderer.mFontLineSpacing;
                     doScroll(e, deltaRows);
-                    
+
                     distanceX += mScrollXRemainder;
                     int deltaCols = (int) (distanceX / mRenderer.mFontWidth);
                     mScrollXRemainder = distanceX - deltaCols * mRenderer.mFontWidth;
-//mClient.logError("scrolll", distanceY, distanceX);
+                    //mClient.logError("scrolll", distanceY, distanceX);
                     doScrollX(e, deltaCols);
                 }
                 return true;
             }
 
             @Override
             public boolean onScale(float focusX, float focusY, float scale) {
-                if (mEmulator == null || isSelectingText())
+                if (mEmulator == null || isSelectingText() || mClient.isTerminalViewScalingDisabled())
                     return true;
                 mScaleFactor *= scale;
                 mScaleFactor = mClient.onScale(mScaleFactor);
@@ -236,7 +236,7 @@ public boolean onFling(final MotionEvent e2, float velocityX, float velocityY) {
                 if (mouseTrackingAtStartOfFling) {
                     mScroller.fling(0, 0, 0, -(int) (velocityY * SCALE), 0, 0, -mEmulator.mRows / 2, mEmulator.mRows / 2);
                 } else {
-                	//this doesn't fling in less
+                    //this doesn't fling in less
                     mScroller.fling(0, mTopRow, 0, -(int) (velocityY * SCALE), 0, 0, -mEmulator.getScreen().getActiveTranscriptRows(), 0);
                 }
                 post(new Runnable() {
@@ -764,19 +764,19 @@ void doScroll(MotionEvent event, int rowsDown) {
             }
         }
     }
-    
+
     void doScrollX(MotionEvent event, int cols) {
         boolean left = cols < 0;
         int amount = Math.abs(cols);
         for (int i = 0; i < amount; i++) {
             if (mEmulator.isMouseTrackingActive()) {
                 sendMouseEventCode(event, left ? TerminalEmulator.MOUSE_WHEEL_LEFT : TerminalEmulator.MOUSE_WHEEL_RIGHT, true);
             } else if (mEmulator.isAlternateBufferActive()) {
-            	/* less is broken let me know if it works elsewhere @john-peterson
+                /* less is broken let me know if it works elsewhere @john-peterson
                 handleKeyCode(left ? KeyEvent.KEYCODE_DPAD_LEFT : KeyEvent.KEYCODE_DPAD_RIGHT, 0);
                 */
             } else {
-            	/*
+                /*
                 mTopRow = Math.min(0, Math.max(-(mEmulator.getScreen().getActiveTranscriptRows()), mTopRow + (up ? -1 : 1)));
                 if (!awakenScrollBars())
                     invalidate();

terminal-view/src/main/java/com/termux/view/TerminalViewClient.java

@@ -33,6 +33,8 @@ public interface TerminalViewClient {
 
     boolean isTerminalViewSelected();
 
+    boolean isTerminalViewScalingDisabled();
+
     void copyModeChanged(boolean copyMode);
 
     boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session);

termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxPropertyConstants.java

@@ -83,9 +83,18 @@
  * - 0.18.5 (2022-08-18)
  *      - Add `KEY_ACTIVITY_FINISH_REMOVE_TASK`.
  *      - Add `KEY_DISABLE_FILE_SHARE_RECEIVER` and `KEY_DISABLE_FILE_VIEW_RECEIVER`.
- * 
+<<<<<<< HEAD
+ *
  * - 0.19.0 (2022-11-04)
- *      - Add `KEY_BACKGROUND_OVERLAY_COLOR` and `DEFAULT_IVALUE_BACKGROUND_OVERLAY_COLOR`
+ *      - Add `KEY_BACKGROUND_OVERLAY_COLOR` and `DEFAULT_IVALUE_BACKGROUND_OVERLAY_COLOR`.
+ *
+ * - 0.20.0 (2025-01-23)
+ *      - Add `KEY_DISABLE_ZOOM_SCALE`.
+=======
+ *
+ * - 0.19.0 (2025-01-23)
+ *      - Add `disable-terminal-view-scaling`.
+>>>>>>> 720a6499 (Added: Implement text scale disabling feature in terminal view)
  */
 /**
  * A class that defines shared constants of the SharedProperties used by Termux app and its plugins.
@@ -103,6 +112,12 @@ public final class TermuxPropertyConstants {
     private static final String LOG_TAG = "TermuxPropertyConstants";
 
     /* boolean */
+    /**
+     * Defines the key for whether terminal view scaling are enabled.
+     */
+    // Default: "disable-terminal-view-scaling"
+    public static final String KEY_DISABLE_TERMINAL_VIEW_SCALING =  "disable-terminal-view-scaling";
+
     /**
      * Defines the key for whether file share receiver of the app is enabled.
      */
@@ -476,20 +491,73 @@ public final class TermuxPropertyConstants {
      * Defines the set for keys loaded by termux
      * Setting this to {@code null} will make {@link SharedProperties} throw an exception.
      */
-    public static final Set<String> TERMUX_APP_PROPERTIES_LIST = new HashSet<>(Arrays.asList(/* boolean */
-    KEY_DISABLE_FILE_SHARE_RECEIVER, KEY_DISABLE_FILE_VIEW_RECEIVER, KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS, KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, KEY_ENFORCE_CHAR_BASED_INPUT, KEY_EXTRA_KEYS_TEXT_ALL_CAPS, KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, KEY_RUN_TERMUX_AM_SOCKET_SERVER, KEY_TERMINAL_ONCLICK_URL_OPEN, KEY_DRAW_BOLD_TEXT_WITH_BRIGHT_COLORS, KEY_USE_CTRL_SPACE_WORKAROUND, KEY_USE_FULLSCREEN, KEY_USE_FULLSCREEN_WORKAROUND, TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, KEY_ACTIVITY_FINISH_REMOVE_TASK, /* int */
-    KEY_BELL_BEHAVIOUR, KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT, KEY_TERMINAL_CURSOR_BLINK_RATE, KEY_TERMINAL_CURSOR_STYLE, KEY_TERMINAL_MARGIN_HORIZONTAL, KEY_TERMINAL_MARGIN_VERTICAL, KEY_TERMINAL_TRANSCRIPT_ROWS, /* float */
-    KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR, /* Integer */
-    KEY_SHORTCUT_CREATE_SESSION, KEY_SHORTCUT_NEXT_SESSION, KEY_SHORTCUT_PREVIOUS_SESSION, KEY_SHORTCUT_RENAME_SESSION, /* String */
-    KEY_BACK_KEY_BEHAVIOUR, KEY_DEFAULT_WORKING_DIRECTORY, KEY_EXTRA_KEYS, KEY_EXTRA_KEYS2, KEY_EXTRA_KEYS_STYLE, KEY_NIGHT_MODE, KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR, KEY_VOLUME_KEYS_BEHAVIOUR, KEY_BACKGROUND_OVERLAY_COLOR));
+    public static final Set<String> TERMUX_APP_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        /* boolean */
+        KEY_DISABLE_TERMINAL_VIEW_SCALING,
+        KEY_DISABLE_FILE_SHARE_RECEIVER,
+        KEY_DISABLE_FILE_VIEW_RECEIVER,
+        KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
+        KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
+        KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_EXTRA_KEYS_TEXT_ALL_CAPS,
+        KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
+        KEY_RUN_TERMUX_AM_SOCKET_SERVER,
+        KEY_TERMINAL_ONCLICK_URL_OPEN,
+        KEY_DRAW_BOLD_TEXT_WITH_BRIGHT_COLORS,
+        KEY_USE_CTRL_SPACE_WORKAROUND,
+        KEY_USE_FULLSCREEN,
+        KEY_USE_FULLSCREEN_WORKAROUND,
+        TermuxConstants.PROP_ALLOW_EXTERNAL_APPS,
+        KEY_ACTIVITY_FINISH_REMOVE_TASK,
+        /* int */
+        KEY_BELL_BEHAVIOUR,
+        KEY_DELETE_TMPDIR_FILES_OLDER_THAN_X_DAYS_ON_EXIT,
+        KEY_TERMINAL_CURSOR_BLINK_RATE,
+        KEY_TERMINAL_CURSOR_STYLE,
+        KEY_TERMINAL_MARGIN_HORIZONTAL,
+        KEY_TERMINAL_MARGIN_VERTICAL,
+        KEY_TERMINAL_TRANSCRIPT_ROWS,
+        /* float */
+        KEY_TERMINAL_TOOLBAR_HEIGHT_SCALE_FACTOR,
+        /* Integer */
+        KEY_SHORTCUT_CREATE_SESSION,
+        KEY_SHORTCUT_NEXT_SESSION,
+        KEY_SHORTCUT_PREVIOUS_SESSION,
+        KEY_SHORTCUT_RENAME_SESSION,
+        /* String */
+        KEY_BACK_KEY_BEHAVIOUR,
+        KEY_DEFAULT_WORKING_DIRECTORY,
+        KEY_EXTRA_KEYS,
+        KEY_EXTRA_KEYS2,
+        KEY_EXTRA_KEYS_STYLE,
+        KEY_NIGHT_MODE,
+        KEY_SOFT_KEYBOARD_TOGGLE_BEHAVIOUR,
+        KEY_VOLUME_KEYS_BEHAVIOUR,
+        KEY_BACKGROUND_OVERLAY_COLOR
+    ));
 
     /**
      * Defines the set for keys loaded by termux that have default boolean behaviour with false as default.
      * "true" -> true
      * "false" -> false
      * default: false
      */
-    public static final Set<String> TERMUX_DEFAULT_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(KEY_DISABLE_FILE_SHARE_RECEIVER, KEY_DISABLE_FILE_VIEW_RECEIVER, KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS, KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST, KEY_ENFORCE_CHAR_BASED_INPUT, KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP, KEY_TERMINAL_ONCLICK_URL_OPEN, KEY_USE_CTRL_SPACE_WORKAROUND, KEY_USE_FULLSCREEN, KEY_USE_FULLSCREEN_WORKAROUND, KEY_ACTIVITY_FINISH_REMOVE_TASK, KEY_DRAW_BOLD_TEXT_WITH_BRIGHT_COLORS, TermuxConstants.PROP_ALLOW_EXTERNAL_APPS));
+    public static final Set<String> TERMUX_DEFAULT_FALSE_BOOLEAN_BEHAVIOUR_PROPERTIES_LIST = new HashSet<>(Arrays.asList(
+        KEY_DISABLE_TERMINAL_VIEW_SCALING,
+        KEY_DISABLE_FILE_SHARE_RECEIVER,
+        KEY_DISABLE_FILE_VIEW_RECEIVER,
+        KEY_DISABLE_HARDWARE_KEYBOARD_SHORTCUTS,
+        KEY_DISABLE_TERMINAL_SESSION_CHANGE_TOAST,
+        KEY_ENFORCE_CHAR_BASED_INPUT,
+        KEY_HIDE_SOFT_KEYBOARD_ON_STARTUP,
+        KEY_TERMINAL_ONCLICK_URL_OPEN,
+        KEY_USE_CTRL_SPACE_WORKAROUND,
+        KEY_USE_FULLSCREEN,
+        KEY_USE_FULLSCREEN_WORKAROUND,
+        KEY_ACTIVITY_FINISH_REMOVE_TASK,
+        KEY_DRAW_BOLD_TEXT_WITH_BRIGHT_COLORS,
+        TermuxConstants.PROP_ALLOW_EXTERNAL_APPS
+    ));
 
     /**
      * Defines the set for keys loaded by termux that have default boolean behaviour with true as default.

termux-shared/src/main/java/com/termux/shared/termux/settings/properties/TermuxSharedProperties.java

@@ -534,6 +534,10 @@ public static String getVolumeKeysBehaviourInternalPropertyValueFromValue(String
         return (String) SharedProperties.getDefaultIfNotInMap(TermuxPropertyConstants.KEY_VOLUME_KEYS_BEHAVIOUR, TermuxPropertyConstants.MAP_VOLUME_KEYS_BEHAVIOUR, SharedProperties.toLowerCase(value), TermuxPropertyConstants.DEFAULT_IVALUE_VOLUME_KEYS_BEHAVIOUR, true, LOG_TAG);
     }
 
+    public boolean isTerminalViewScalingDisabled() {
+        return (boolean) getInternalPropertyValue(TermuxPropertyConstants.KEY_DISABLE_TERMINAL_VIEW_SCALING, true);
+    }
+
     public boolean shouldAllowExternalApps() {
         return (boolean) getInternalPropertyValue(TermuxConstants.PROP_ALLOW_EXTERNAL_APPS, true);
     }

termux-shared/src/main/java/com/termux/shared/termux/terminal/TermuxTerminalViewClientBase.java

@@ -11,6 +11,11 @@ public class TermuxTerminalViewClientBase implements TerminalViewClient {
     public TermuxTerminalViewClientBase() {
     }
 
+    @Override
+    public boolean isTerminalViewScalingDisabled() {
+        return false;
+    }
+
     @Override
     public float onScale(float scale) {
         return 1.0f;