{
expect(fontStack(DEFAULT_FONT)).toBe('"JetBrains Mono", monospace');
});
});
+
+describe("clampFontSize", () => {
+ test("clamps below the minimum up to MIN", () => {
+ expect(clampFontSize(1)).toBe(MIN_FONT_SIZE);
+ });
+
+ test("clamps above the maximum down to MAX", () => {
+ expect(clampFontSize(999)).toBe(MAX_FONT_SIZE);
+ });
+
+ test("rounds to a whole pixel", () => {
+ expect(clampFontSize(13.4)).toBe(13);
+ expect(clampFontSize(13.6)).toBe(14);
+ });
+
+ test("passes a valid whole value through unchanged", () => {
+ expect(clampFontSize(16)).toBe(16);
+ });
+
+ test("non-finite input falls back to the default", () => {
+ expect(clampFontSize(NaN)).toBe(DEFAULT_FONT_SIZE);
+ expect(clampFontSize(Infinity)).toBe(DEFAULT_FONT_SIZE);
+ });
+});
+
+describe("parseFontSizes", () => {
+ test("null (nothing stored) yields an empty map", () => {
+ expect(parseFontSizes(null)).toEqual({});
+ });
+
+ test("corrupt JSON or a non-object yields an empty map rather than throwing", () => {
+ expect(parseFontSizes("not json")).toEqual({});
+ expect(parseFontSizes("42")).toEqual({});
+ expect(parseFontSizes("null")).toEqual({});
+ });
+
+ test("drops entries whose value isn't a finite number", () => {
+ expect(parseFontSizes('{"xterm:iosevka":"big","ghostty:iosevka":15}')).toEqual({
+ "ghostty:iosevka": 15,
+ });
+ });
+
+ test("clamps surviving values into range", () => {
+ expect(parseFontSizes('{"xterm:iosevka":999}')).toEqual({
+ "xterm:iosevka": MAX_FONT_SIZE,
+ });
+ });
+});
+
+describe("loadFontSizes / saveFontSizes", () => {
+ beforeEach(() => {
+ localStorage.clear();
+ });
+
+ test("defaults to an empty map when nothing is stored", () => {
+ expect(loadFontSizes()).toEqual({});
+ });
+
+ test("persists the whole map under the papyrus:fontSizes key and reads back", () => {
+ const map = { "xterm:iosevka": 14, "ghostty:jetbrains-mono": 18 };
+ saveFontSizes(map);
+ expect(localStorage.getItem(FONT_SIZE_STORAGE_KEY)).toBe(JSON.stringify(map));
+ expect(loadFontSizes()).toEqual(map);
+ });
+
+ test("a corrupt stored value loads as an empty map", () => {
+ localStorage.setItem(FONT_SIZE_STORAGE_KEY, "{bogus");
+ expect(loadFontSizes()).toEqual({});
+ });
+});
+
+describe("fontSizeFor / fontSizeKey", () => {
+ test("keys a pair as `${backend}:${font}`", () => {
+ expect(fontSizeKey("xterm", "iosevka")).toBe("xterm:iosevka");
+ });
+
+ test("an unset pair falls back to the default size", () => {
+ expect(fontSizeFor({}, "xterm", "iosevka")).toBe(DEFAULT_FONT_SIZE);
+ });
+
+ test("each (emulator, font) pair resolves its own stored size", () => {
+ const map = { "xterm:iosevka": 14, "ghostty:iosevka": 20, "xterm:jetbrains-mono": 11 };
+ expect(fontSizeFor(map, "xterm", "iosevka")).toBe(14);
+ expect(fontSizeFor(map, "ghostty", "iosevka")).toBe(20);
+ expect(fontSizeFor(map, "xterm", "jetbrains-mono")).toBe(11);
+ // A pair absent from the map still defaults.
+ expect(fontSizeFor(map, "ghostty", "jetbrains-mono")).toBe(DEFAULT_FONT_SIZE);
+ });
+});
diff --git a/experimental/papyrus/client/src/settings.ts b/experimental/papyrus/client/src/settings.ts
index 1a7abed..0d3cd47 100644
--- a/experimental/papyrus/client/src/settings.ts
+++ b/experimental/papyrus/client/src/settings.ts
@@ -135,3 +135,66 @@ export function saveFont(storageKey: string, id: FontId): void {
export function fontStack(id: FontId): string {
return (TERMINAL_FONTS.find((f) => f.id === id) ?? TERMINAL_FONTS[0]).stack;
}
+
+// --- Terminal font size ---
+//
+// Font size in px, remembered independently per (emulator, font) pair — different fonts render
+// at different apparent sizes, so each combination keeps its own value. Persisted as a single
+// JSON map under one key, keyed by `${backend}:${font}`; a missing pair falls back to
+// DEFAULT_FONT_SIZE. Values are clamped to a sane px range and rounded to whole pixels.
+
+export const FONT_SIZE_STORAGE_KEY = "papyrus:fontSizes";
+
+export const MIN_FONT_SIZE = 6;
+export const MAX_FONT_SIZE = 40;
+export const FONT_SIZE_STEP = 1;
+// 12 is what xterm/ghostty panes were previously hardcoded to.
+export const DEFAULT_FONT_SIZE = 12;
+
+// The map key for an (emulator, font) pair.
+export function fontSizeKey(backend: BackendId, font: FontId): string {
+ return `${backend}:${font}`;
+}
+
+// Clamp to [MIN, MAX] and round to a whole pixel. Non-finite input falls back to the default.
+export function clampFontSize(n: number): number {
+ if (!Number.isFinite(n)) return DEFAULT_FONT_SIZE;
+ return Math.round(Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, n)));
+}
+
+// A lenient parse: corrupt JSON, a non-object, or entries whose value isn't a finite number are
+// dropped (they fall back to DEFAULT_FONT_SIZE at read). Surviving values are clamped.
+export function parseFontSizes(raw: string | null): Record
{
+ if (raw === null) return {};
+ try {
+ const parsed: unknown = JSON.parse(raw);
+ if (!parsed || typeof parsed !== "object") return {};
+ const out: Record = {};
+ for (const [k, v] of Object.entries(parsed as Record)) {
+ if (typeof v === "number" && Number.isFinite(v)) out[k] = clampFontSize(v);
+ }
+ return out;
+ } catch {
+ return {};
+ }
+}
+
+export function loadFontSizes(): Record {
+ if (typeof localStorage === "undefined") return {};
+ return parseFontSizes(localStorage.getItem(FONT_SIZE_STORAGE_KEY));
+}
+
+export function saveFontSizes(map: Record): void {
+ if (typeof localStorage === "undefined") return;
+ localStorage.setItem(FONT_SIZE_STORAGE_KEY, JSON.stringify(map));
+}
+
+// The effective size for an (emulator, font) pair, defaulting when unset.
+export function fontSizeFor(
+ map: Record,
+ backend: BackendId,
+ font: FontId,
+): number {
+ const v = map[fontSizeKey(backend, font)];
+ return typeof v === "number" && Number.isFinite(v) ? clampFontSize(v) : DEFAULT_FONT_SIZE;
+}
diff --git a/experimental/papyrus/client/src/stores/useStore.ts b/experimental/papyrus/client/src/stores/useStore.ts
index d458c85..410bb4d 100644
--- a/experimental/papyrus/client/src/stores/useStore.ts
+++ b/experimental/papyrus/client/src/stores/useStore.ts
@@ -13,11 +13,15 @@ import {
type FontId,
GHOSTTY_FONT_STORAGE_KEY,
XTERM_FONT_STORAGE_KEY,
+ clampFontSize,
clampLineSpacing,
+ fontSizeKey,
loadFont,
+ loadFontSizes,
loadLineSpacing,
loadTerminalBackend,
saveFont,
+ saveFontSizes,
saveLineSpacing,
saveTerminalBackend,
} from "../settings";
@@ -136,6 +140,9 @@ interface AppState {
setXtermFont: (id: FontId) => void;
ghosttyFont: FontId;
setGhosttyFont: (id: FontId) => void;
+ // Font size (px) is per (emulator, font) pair, keyed by `${backend}:${font}` in this map.
+ fontSizes: Record;
+ setFontSize: (backend: BackendId, font: FontId, size: number) => void;
}
export const useStore = create((set) => ({
@@ -236,4 +243,12 @@ export const useStore = create((set) => ({
saveFont(GHOSTTY_FONT_STORAGE_KEY, id);
set({ ghosttyFont: id });
},
+ // Terminal reads the active (emulator, font) pair's size live (xterm) or via a remount (ghostty).
+ fontSizes: loadFontSizes(),
+ setFontSize: (backend, font, size) =>
+ set((state) => {
+ const next = { ...state.fontSizes, [fontSizeKey(backend, font)]: clampFontSize(size) };
+ saveFontSizes(next);
+ return { fontSizes: next };
+ }),
}));
diff --git a/experimental/papyrus/client/src/terminal/backend.ts b/experimental/papyrus/client/src/terminal/backend.ts
index 39b8c1a..112da5b 100644
--- a/experimental/papyrus/client/src/terminal/backend.ts
+++ b/experimental/papyrus/client/src/terminal/backend.ts
@@ -46,6 +46,7 @@ export interface TerminalBackend {
setTheme(themeName: ThemeName, cursorColor: string): boolean;
setLineHeight(value: number): boolean;
setFont(fontFamily: string): boolean;
+ setFontSize(px: number): boolean;
dispose(): void;
}
diff --git a/experimental/papyrus/client/src/terminal/ghosttyBackend.ts b/experimental/papyrus/client/src/terminal/ghosttyBackend.ts
index 3f6b5c6..f5b3569 100644
--- a/experimental/papyrus/client/src/terminal/ghosttyBackend.ts
+++ b/experimental/papyrus/client/src/terminal/ghosttyBackend.ts
@@ -101,10 +101,10 @@ class GhosttyBackend implements TerminalBackend {
return true;
}
- // Line-height and font can't mutate live: Terminal.tsx folds them into its remount token,
- // rebuilding the pane with the new settings baked into the constructor. A font remount re-runs
- // createGhosttyBackend (awaits document.fonts.ready) and open() (re-measures the cell via
- // roundCellWidth), so the new font is sized correctly.
+ // Line-height, font, and font size can't mutate live: Terminal.tsx folds them into its remount
+ // token, rebuilding the pane with the new settings baked into the constructor. A font/size
+ // remount re-runs createGhosttyBackend (awaits document.fonts.ready) and open() (re-measures the
+ // cell via roundCellWidth), so the new font is sized correctly.
setLineHeight(): boolean {
return false;
}
@@ -113,6 +113,10 @@ class GhosttyBackend implements TerminalBackend {
return false;
}
+ setFontSize(): boolean {
+ return false;
+ }
+
dispose() {
this.term.dispose();
}
diff --git a/experimental/papyrus/client/src/terminal/xtermBackend.ts b/experimental/papyrus/client/src/terminal/xtermBackend.ts
index 914f4a4..60fd2af 100644
--- a/experimental/papyrus/client/src/terminal/xtermBackend.ts
+++ b/experimental/papyrus/client/src/terminal/xtermBackend.ts
@@ -68,6 +68,11 @@ class XtermBackend implements TerminalBackend {
return true;
}
+ setFontSize(px: number): boolean {
+ this.term.options.fontSize = px;
+ return true;
+ }
+
dispose() {
this.term.dispose();
}