Merge branch 'main' into lsp

Author: RohitKushvaha01

config.xml

@@ -37,7 +37,6 @@
         <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
             <application android:networkSecurityConfig="@xml/network_security_config" />
             <application android:hardwareAccelerated="true" />
-            <application android:requestLegacyExternalStorage="true" />
             <application android:largeHeap="true" />
             <application android:requestLegacyExternalStorage="true"/>
         </edit-config>

package-lock.json

@@ -31,6 +31,7 @@ export default class TerminalComponent {
 			scrollOnUserInput: true,
 			rows: options.rows || 24,
 			cols: options.cols || 80,
+			port: options.port || 8767,
 			fontSize: terminalSettings.fontSize,
 			fontFamily: terminalSettings.fontFamily,
 			fontWeight: terminalSettings.fontWeight,
@@ -128,7 +129,7 @@ export default class TerminalComponent {
 		let lastKnownScrollPosition = 0;
 		let isResizing = false;
 		let resizeCount = 0;
-		const RESIZE_DEBOUNCE = 150;
+		const RESIZE_DEBOUNCE = 100;
 		const MAX_RAPID_RESIZES = 3;
 
 		// Store original dimensions for comparison
@@ -170,8 +171,37 @@ export default class TerminalComponent {
 						await this.resizeTerminal(size.cols, size.rows);
 					}
 
-					// Preserve scroll position for content-heavy terminals
-					this.preserveViewportPosition(lastKnownScrollPosition);
+					// Handle keyboard resize cursor positioning
+					const heightRatio = size.rows / originalRows;
+					if (
+						heightRatio < 0.75 &&
+						this.terminal.buffer &&
+						this.terminal.buffer.active
+					) {
+						// Keyboard resize detected - ensure cursor is visible
+						const buffer = this.terminal.buffer.active;
+						const cursorY = buffer.cursorY;
+						const cursorViewportPos = buffer.baseY + cursorY;
+						const viewportTop = buffer.viewportY;
+						const viewportBottom = viewportTop + this.terminal.rows - 1;
+
+						if (
+							cursorViewportPos <= viewportTop + 1 ||
+							cursorViewportPos >= viewportBottom - 1
+						) {
+							const targetScroll = Math.max(
+								0,
+								Math.min(
+									buffer.length - this.terminal.rows,
+									cursorViewportPos - Math.floor(this.terminal.rows * 0.25),
+								),
+							);
+							this.terminal.scrollToLine(targetScroll);
+						}
+					} else {
+						// Regular resize - preserve scroll position
+						this.preserveViewportPosition(lastKnownScrollPosition);
+					}
 
 					// Update stored dimensions
 					originalRows = size.rows;
@@ -437,8 +467,9 @@ export default class TerminalComponent {
       height: 100%;
       position: relative;
       background: ${this.options.theme.background};
-      border-radius: 4px;
       overflow: hidden;
+      padding: 0.25rem;
+      box-sizing: border-box;
     `;
 
 		return this.container;
@@ -455,6 +486,9 @@ export default class TerminalComponent {
 
 		this.container = container;
 
+		// Apply terminal background color to container to match theme
+		this.container.style.background = this.options.theme.background;
+
 		try {
 			try {
 				this.terminal.loadAddon(this.webglAddon);
@@ -535,13 +569,16 @@ export default class TerminalComponent {
 				rows: this.terminal.rows,
 			};
 
-			const response = await fetch("http://localhost:8767/terminals", {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			const response = await fetch(
+				`http://localhost:${this.options.port}/terminals`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify(requestBody),
 				},
-				body: JSON.stringify(requestBody),
-			});
+			);
 
 			if (!response.ok) {
 				throw new Error(`HTTP error! status: ${response.status}`);
@@ -573,7 +610,7 @@ export default class TerminalComponent {
 
 		this.pid = pid;
 
-		const wsUrl = `ws://localhost:8767/terminals/${pid}`;
+		const wsUrl = `ws://localhost:${this.options.port}/terminals/${pid}`;
 
 		this.websocket = new WebSocket(wsUrl);
 
@@ -627,13 +664,16 @@ export default class TerminalComponent {
 		if (!this.pid || !this.serverMode) return;
 
 		try {
-			await fetch(`http://localhost:8767/terminals/${this.pid}/resize`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
+			await fetch(
+				`http://localhost:${this.options.port}/terminals/${this.pid}/resize`,
+				{
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+					},
+					body: JSON.stringify({ cols, rows }),
 				},
-				body: JSON.stringify({ cols, rows }),
-			});
+			);
 		} catch (error) {
 			console.error("Failed to resize terminal:", error);
 		}
@@ -653,7 +693,18 @@ export default class TerminalComponent {
 	 * @param {string} data - Data to write
 	 */
 	write(data) {
-		this.terminal.write(data);
+		if (
+			this.serverMode &&
+			this.isConnected &&
+			this.websocket &&
+			this.websocket.readyState === WebSocket.OPEN
+		) {
+			// Send data through WebSocket instead of direct write
+			this.websocket.send(data);
+		} else {
+			// For local mode or disconnected terminals, write directly
+			this.terminal.write(data);
+		}
 	}
 
 	/**
@@ -675,6 +726,32 @@ export default class TerminalComponent {
 	 * Focus terminal
 	 */
 	focus() {
+		// Ensure cursor is visible before focusing to prevent half-visibility
+		if (this.terminal.buffer && this.terminal.buffer.active) {
+			const buffer = this.terminal.buffer.active;
+			const cursorY = buffer.cursorY;
+			const cursorViewportPos = buffer.baseY + cursorY;
+			const viewportTop = buffer.viewportY;
+			const viewportBottom = viewportTop + this.terminal.rows - 1;
+
+			// Check if cursor is fully visible (with margin to prevent half-visibility)
+			const isCursorFullyVisible =
+				cursorViewportPos >= viewportTop + 1 &&
+				cursorViewportPos <= viewportBottom - 2;
+
+			// If cursor is not fully visible, scroll to make it properly visible
+			if (!isCursorFullyVisible && buffer.length > this.terminal.rows) {
+				const targetScroll = Math.max(
+					0,
+					Math.min(
+						buffer.length - this.terminal.rows,
+						cursorViewportPos - Math.floor(this.terminal.rows * 0.25),
+					),
+				);
+				this.terminal.scrollToLine(targetScroll);
+			}
+		}
+
 		this.terminal.focus();
 	}
 
@@ -896,9 +973,12 @@ export default class TerminalComponent {
 
 		if (this.pid && this.serverMode) {
 			try {
-				await fetch(`http://localhost:8767/terminals/${this.pid}/terminate`, {
-					method: "POST",
-				});
+				await fetch(
+					`http://localhost:${this.options.port}/terminals/${this.pid}/terminate`,
+					{
+						method: "POST",
+					},
+				);
 			} catch (error) {
 				console.error("Failed to terminate terminal:", error);
 			}

src/components/terminal/terminal.js

@@ -223,6 +223,11 @@ class TerminalManager {
 						terminalId,
 					);
 
+					// Set up custom title for installation terminal
+					terminalFile.setCustomTitle(
+						() => "Installing Terminal Environment...",
+					);
+
 					const instance = {
 						id: terminalId,
 						name: terminalName,
@@ -343,6 +348,15 @@ class TerminalManager {
 				// Format terminal title as "Terminal ! - title"
 				const formattedTitle = `Terminal ${this.terminalCounter} - ${title}`;
 				terminalFile.filename = formattedTitle;
+
+				// Refresh the header subtitle if this terminal is active
+				if (
+					editorManager.activeFile &&
+					editorManager.activeFile.id === terminalFile.id
+				) {
+					// Force refresh of the header subtitle
+					terminalFile.setCustomTitle(getTerminalTitle);
+				}
 			}
 		};
 
@@ -366,6 +380,17 @@ class TerminalManager {
 		terminalFile._terminalId = terminalId;
 		terminalFile.terminalComponent = terminalComponent;
 		terminalFile._resizeObserver = resizeObserver;
+
+		// Set up custom title function for terminal
+		const getTerminalTitle = () => {
+			if (terminalComponent.pid) {
+				return `PID: ${terminalComponent.pid}`;
+			}
+			// fallback to terminal name
+			return `${terminalId}`;
+		};
+
+		terminalFile.setCustomTitle(getTerminalTitle);
 	}
 
 	/**
@@ -447,6 +472,7 @@ class TerminalManager {
 				background: #1e1e1e;
 				overflow: hidden;
 				position: relative;
+				padding: 0.25rem;
 			}
 		`;
 	}

src/components/terminal/terminalManager.js

@@ -240,6 +240,11 @@ export default class TerminalTouchSelection {
 			return;
 		}
 
+		// Check if touch is near screen edge (likely Android back gesture)
+		if (this.isEdgeGesture(touch)) {
+			return;
+		}
+
 		// Clear any existing tap-hold timeout
 		if (this.tapHoldTimeout) {
 			clearTimeout(this.tapHoldTimeout);
@@ -269,6 +274,21 @@ export default class TerminalTouchSelection {
 		const touch = event.touches[0];
 		const deltaX = Math.abs(touch.clientX - this.touchStartPos.x);
 		const deltaY = Math.abs(touch.clientY - this.touchStartPos.y);
+		const horizontalDelta = touch.clientX - this.touchStartPos.x;
+
+		// Check if this looks like a back gesture (started near edge and moving horizontally inward)
+		if (
+			this.isEdgeGesture(this.initialTouchPos) &&
+			Math.abs(horizontalDelta) > deltaY &&
+			deltaX > this.options.moveThreshold
+		) {
+			// This looks like a back gesture, cancel selection
+			if (this.tapHoldTimeout) {
+				clearTimeout(this.tapHoldTimeout);
+				this.tapHoldTimeout = null;
+			}
+			return;
+		}
 
 		// If significant movement, cancel tap-hold
 		if (
@@ -1141,6 +1161,26 @@ export default class TerminalTouchSelection {
 		return Math.sqrt(dx * dx + dy * dy);
 	}
 
+	/**
+	 * Check if touch is likely an Android back gesture (starts near screen edge)
+	 */
+	isEdgeGesture(touch) {
+		const edgeThreshold = 30; // pixels from screen edge
+		const screenWidth = window.innerWidth;
+
+		// Check if touch starts near left edge (most common for back gesture)
+		if (touch.clientX <= edgeThreshold) {
+			return true;
+		}
+
+		// Check if touch starts near right edge (for RTL languages or right-handed back gesture)
+		if (touch.clientX >= screenWidth - edgeThreshold) {
+			return true;
+		}
+
+		return false;
+	}
+
 	destroy() {
 		// Clear selection
 		this.forceClearSelection();

src/components/terminal/terminalTouchSelection.js

@@ -126,6 +126,7 @@
 	"animation": "Animasi",
 	"backup": "Cadangkan",
 	"restore": "Mengembalikan",
+	"allFileAccess": "Semua akses berkas",
 	"backup successful": "Berhasil membuat cadangan",
 	"invalid backup file": "Berkas cadangan tidak valid",
 	"add path": "Tambah jalur",
@@ -410,16 +411,16 @@
 	"enable_plugin": "Aktifkan Plugin ini",
 	"disable_plugin": "Nonaktifkan Plugin ini",
 	"open_source": "Sumber Terbuka",
-	"terminal settings": "Terminal Settings",
-	"font ligatures": "Font Ligatures",
-	"letter spacing": "Letter Spacing",
-	"terminal:tab stop width": "Tab Stop Width",
-	"terminal:scrollback": "Scrollback Lines",
-	"terminal:cursor blink": "Cursor Blink",
-	"terminal:font weight": "Font Weight",
-	"terminal:cursor inactive style": "Cursor Inactive Style",
-	"terminal:cursor style": "Cursor Style",
-	"terminal:font family": "Font Family",
-	"terminal:convert eol": "Convert EOL",
+	"terminal settings": "Pengaturan Terminal",
+	"font ligatures": "Ligatur Huruf",
+	"letter spacing": "Jarak Antar Huruf",
+	"terminal:tab stop width": "Lebar Hentian Tab",
+	"terminal:scrollback": "Garis Gulir Balik",
+	"terminal:cursor blink": "Kursor Berkedip",
+	"terminal:font weight": "Berat Huruf",
+	"terminal:cursor inactive style": "Gaya Kursor Tidak Aktif",
+	"terminal:cursor style": "Gaya Kursor",
+	"terminal:font family": "Keluarga Huruf",
+	"terminal:convert eol": "Konversi Akhir Baris",
 	"terminal": "Terminal"
 }