From 1a4c6ade9fe3f43c528302c134101eee87f8a6cb Mon Sep 17 00:00:00 2001 From: bincxz <16399091+binaricat@users.noreply.github.com> Date: Thu, 18 Dec 2025 00:22:54 +0800 Subject: [PATCH] Enables local terminal customization for theme and font Allows users to customize theme, font family, and font size for local terminals independently of remote host settings. Improves user experience by making appearance preferences for local sessions more flexible and immediately responsive. --- App.tsx | 8 +++++ components/Terminal.tsx | 21 +++++++++-- components/TerminalLayer.tsx | 12 +++++++ components/terminal/TerminalToolbar.tsx | 36 +++++++++++++++++-- .../terminal/runtime/createXTermRuntime.ts | 3 +- 5 files changed, 73 insertions(+), 7 deletions(-) diff --git a/App.tsx b/App.tsx index 0174837bf..4f309e2ee 100755 --- a/App.tsx +++ b/App.tsx @@ -85,8 +85,12 @@ function App() { const { theme, setTheme, + setTerminalThemeId, currentTerminalTheme, + terminalFontFamilyId, + setTerminalFontFamilyId, terminalFontSize, + setTerminalFontSize, terminalSettings, hotkeyScheme, keyBindings, @@ -657,10 +661,14 @@ function App() { draggingSessionId={draggingSessionId} terminalTheme={currentTerminalTheme} terminalSettings={terminalSettings} + terminalFontFamilyId={terminalFontFamilyId} fontSize={terminalFontSize} hotkeyScheme={hotkeyScheme} keyBindings={keyBindings} onHotkeyAction={handleHotkeyAction} + onUpdateTerminalThemeId={setTerminalThemeId} + onUpdateTerminalFontFamilyId={setTerminalFontFamilyId} + onUpdateTerminalFontSize={setTerminalFontSize} onCloseSession={closeSession} onUpdateSessionStatus={updateSessionStatus} onUpdateHostDistro={updateHostDistro} diff --git a/components/Terminal.tsx b/components/Terminal.tsx index 0e343bcc3..126e5ae8b 100644 --- a/components/Terminal.tsx +++ b/components/Terminal.tsx @@ -49,11 +49,15 @@ interface TerminalProps { isResizing?: boolean; isFocusMode?: boolean; isFocused?: boolean; + fontFamilyId: string; fontSize: number; terminalTheme: TerminalTheme; terminalSettings?: TerminalSettings; sessionId: string; startupCommand?: string; + onUpdateTerminalThemeId?: (themeId: string) => void; + onUpdateTerminalFontFamilyId?: (fontFamilyId: string) => void; + onUpdateTerminalFontSize?: (fontSize: number) => void; hotkeyScheme?: "disabled" | "mac" | "pc"; keyBindings?: KeyBinding[]; onHotkeyAction?: (action: string, event: KeyboardEvent) => void; @@ -89,11 +93,15 @@ const TerminalComponent: React.FC = ({ isResizing, isFocusMode, isFocused, + fontFamilyId, fontSize, terminalTheme, terminalSettings, sessionId, startupCommand, + onUpdateTerminalThemeId, + onUpdateTerminalFontFamilyId, + onUpdateTerminalFontSize, hotkeyScheme = "disabled", keyBindings = [], onHotkeyAction, @@ -307,8 +315,9 @@ const TerminalComponent: React.FC = ({ const runtime = createXTermRuntime({ container: containerRef.current, host, + fontFamilyId, fontSize, - terminalTheme, + terminalTheme: effectiveTheme, terminalSettingsRef, terminalBackend, sessionRef, @@ -510,7 +519,7 @@ const TerminalComponent: React.FC = ({ const effectiveFontSize = host.fontSize || fontSize; termRef.current.options.fontSize = effectiveFontSize; - const hostFontId = host.fontFamily || "menlo"; + const hostFontId = host.fontFamily || fontFamilyId || "menlo"; const fontObj = TERMINAL_FONTS.find((f) => f.id === hostFontId) || TERMINAL_FONTS[0]; termRef.current.options.fontFamily = fontObj.family; @@ -521,7 +530,7 @@ const TerminalComponent: React.FC = ({ setTimeout(() => safeFit(), 50); } - }, [host.fontSize, host.fontFamily, host.theme, fontSize, effectiveTheme]); + }, [host.fontSize, host.fontFamily, host.theme, fontFamilyId, fontSize, effectiveTheme]); useEffect(() => { if (isVisible && fitAddonRef.current) { @@ -761,6 +770,12 @@ const TerminalComponent: React.FC = ({ status={status} snippets={snippets} host={host} + defaultThemeId={terminalTheme.id} + defaultFontFamilyId={fontFamilyId} + defaultFontSize={fontSize} + onUpdateTerminalThemeId={onUpdateTerminalThemeId} + onUpdateTerminalFontFamilyId={onUpdateTerminalFontFamilyId} + onUpdateTerminalFontSize={onUpdateTerminalFontSize} isScriptsOpen={isScriptsOpen} setIsScriptsOpen={setIsScriptsOpen} onOpenSFTP={() => setShowSFTP((v) => !v)} diff --git a/components/TerminalLayer.tsx b/components/TerminalLayer.tsx index aaab2335f..b954195e5 100644 --- a/components/TerminalLayer.tsx +++ b/components/TerminalLayer.tsx @@ -40,10 +40,14 @@ interface TerminalLayerProps { draggingSessionId: string | null; terminalTheme: TerminalTheme; terminalSettings?: TerminalSettings; + terminalFontFamilyId: string; fontSize?: number; hotkeyScheme?: 'disabled' | 'mac' | 'pc'; keyBindings?: KeyBinding[]; onHotkeyAction?: (action: string, event: KeyboardEvent) => void; + onUpdateTerminalThemeId?: (themeId: string) => void; + onUpdateTerminalFontFamilyId?: (fontFamilyId: string) => void; + onUpdateTerminalFontSize?: (fontSize: number) => void; onCloseSession: (sessionId: string, e?: React.MouseEvent) => void; onUpdateSessionStatus: (sessionId: string, status: TerminalSession['status']) => void; onUpdateHostDistro: (hostId: string, distro: string) => void; @@ -73,10 +77,14 @@ const TerminalLayerInner: React.FC = ({ draggingSessionId, terminalTheme, terminalSettings, + terminalFontFamilyId, fontSize = 14, hotkeyScheme = 'disabled', keyBindings = [], onHotkeyAction, + onUpdateTerminalThemeId, + onUpdateTerminalFontFamilyId, + onUpdateTerminalFontSize, onCloseSession, onUpdateSessionStatus, onUpdateHostDistro, @@ -657,11 +665,15 @@ const TerminalLayerInner: React.FC = ({ isResizing={!!resizing} isFocusMode={isFocusMode} isFocused={isFocusedPane} + fontFamilyId={terminalFontFamilyId} fontSize={fontSize} terminalTheme={terminalTheme} terminalSettings={terminalSettings} sessionId={session.id} startupCommand={session.startupCommand} + onUpdateTerminalThemeId={onUpdateTerminalThemeId} + onUpdateTerminalFontFamilyId={onUpdateTerminalFontFamilyId} + onUpdateTerminalFontSize={onUpdateTerminalFontSize} hotkeyScheme={hotkeyScheme} keyBindings={keyBindings} onHotkeyAction={onHotkeyAction} diff --git a/components/terminal/TerminalToolbar.tsx b/components/terminal/TerminalToolbar.tsx index 65cff4b3c..b30c669ac 100644 --- a/components/terminal/TerminalToolbar.tsx +++ b/components/terminal/TerminalToolbar.tsx @@ -15,6 +15,12 @@ export interface TerminalToolbarProps { status: 'connecting' | 'connected' | 'disconnected'; snippets: Snippet[]; host?: Host; + defaultThemeId: string; + defaultFontFamilyId: string; + defaultFontSize: number; + onUpdateTerminalThemeId?: (themeId: string) => void; + onUpdateTerminalFontFamilyId?: (fontFamilyId: string) => void; + onUpdateTerminalFontSize?: (fontSize: number) => void; isScriptsOpen: boolean; setIsScriptsOpen: (open: boolean) => void; onOpenSFTP: () => void; @@ -31,6 +37,12 @@ export const TerminalToolbar: React.FC = ({ status, snippets, host, + defaultThemeId, + defaultFontFamilyId, + defaultFontSize, + onUpdateTerminalThemeId, + onUpdateTerminalFontFamilyId, + onUpdateTerminalFontSize, isScriptsOpen, setIsScriptsOpen, onOpenSFTP, @@ -45,19 +57,37 @@ export const TerminalToolbar: React.FC = ({ const [themeModalOpen, setThemeModalOpen] = useState(false); const buttonBase = "h-7 px-2 text-[11px] bg-white/5 hover:bg-white/10 text-white shadow-none border-none"; + const isLocalTerminal = host?.protocol === 'local' || host?.id?.startsWith('local-'); + + const currentThemeId = host?.theme || defaultThemeId; + const currentFontFamilyId = host?.fontFamily || defaultFontFamilyId; + const currentFontSize = host?.fontSize || defaultFontSize; + const handleThemeChange = (themeId: string) => { + if (isLocalTerminal) { + onUpdateTerminalThemeId?.(themeId); + return; + } if (host && onUpdateHost) { onUpdateHost({ ...host, theme: themeId }); } }; const handleFontFamilyChange = (fontFamilyId: string) => { + if (isLocalTerminal) { + onUpdateTerminalFontFamilyId?.(fontFamilyId); + return; + } if (host && onUpdateHost) { onUpdateHost({ ...host, fontFamily: fontFamilyId }); } }; const handleFontSizeChange = (fontSize: number) => { + if (isLocalTerminal) { + onUpdateTerminalFontSize?.(fontSize); + return; + } if (host && onUpdateHost) { onUpdateHost({ ...host, fontSize }); } @@ -153,9 +183,9 @@ export const TerminalToolbar: React.FC = ({ setThemeModalOpen(false)} - currentThemeId={host?.theme || 'termius-dark'} - currentFontFamilyId={host?.fontFamily || 'menlo'} - currentFontSize={host?.fontSize || 14} + currentThemeId={currentThemeId} + currentFontFamilyId={currentFontFamilyId} + currentFontSize={currentFontSize} onThemeChange={handleThemeChange} onFontFamilyChange={handleFontFamilyChange} onFontSizeChange={handleFontSizeChange} diff --git a/components/terminal/runtime/createXTermRuntime.ts b/components/terminal/runtime/createXTermRuntime.ts index 2afdeebf0..c8a13620c 100644 --- a/components/terminal/runtime/createXTermRuntime.ts +++ b/components/terminal/runtime/createXTermRuntime.ts @@ -43,6 +43,7 @@ export type XTermRuntime = { export type CreateXTermRuntimeContext = { container: HTMLDivElement; host: Host; + fontFamilyId: string; fontSize: number; terminalTheme: TerminalTheme; terminalSettingsRef: RefObject; @@ -104,7 +105,7 @@ export const createXTermRuntime = (ctx: CreateXTermRuntimeContext): XTermRuntime deviceMemoryGb, }); - const hostFontId = ctx.host.fontFamily || "menlo"; + const hostFontId = ctx.host.fontFamily || ctx.fontFamilyId || "menlo"; const fontObj = TERMINAL_FONTS.find((f) => f.id === hostFontId) || TERMINAL_FONTS[0]; const fontFamily = fontObj.family;