Performance optimizations; add TerminusV variable-width font

This commit is contained in:
James Babcock committed 2026-07-11 23:41:57 -07:00
1 parent ff447d5161
commit b2c90bc043
16 files changed
+4267 -217

No files matched your search

+19 -1
View File
@@ -6,7 +6,12 @@ import {
setBooleanSetting,
setStringSetting,
} from "~/native/settings-store";
import { getDefaultSmallFont } from "~/graphics/bdffont";
import {
getDefaultSmallFont,
UI_FONT_SETTING_KEY,
UI_FONT_VALUES,
type UiFontChoice,
} from "~/graphics/bdffont";
import { wrapText } from "~/graphics/textwrap";
import { drawRightValueMenuItem, drawToggleMenuItem, MenuItem, MenuLayer } from "./menu";
import { DashboardInputEvent, Layer, type LayerContext } from "./layers";
@@ -180,6 +185,15 @@ export const batteryDisplayModeSetting = new ConfigSettingEnum<BatteryDisplayMod
formatValue: batteryDisplayModeLabel,
});
export const uiFontSetting = new ConfigSettingEnum<UiFontChoice>({
id: "uiFont",
label: "Font",
storageKey: UI_FONT_SETTING_KEY,
defaultValue: "terminus",
values: UI_FONT_VALUES,
formatValue: uiFontLabel,
});
export const timeFormatSetting = new ConfigSettingEnum<TimeFormat>({
id: "timeFormat",
label: "Time format",
@@ -322,6 +336,10 @@ export function timeFormatLabel(value: TimeFormat): string {
return value === "12h" ? "12-hour" : "24-hour";
}
export function uiFontLabel(value: UiFontChoice): string {
return value === "terminusv" ? "TerminusV" : "Terminus";
}
export function loadNightscoutSettings(): NightscoutSettings {
return {
siteUrl: nightscoutSiteUrlSetting.get(),
-35
View File
@@ -1,35 +0,0 @@
import { getDefaultSmallFont } from "~/graphics/bdffont";
import { GrayImage } from "~/graphics/image";
import { getDashboardLogo } from "~/graphics/logo";
import { DashboardInputEvent, Layer, LayerContext, LayerStack } from "../layers";
export class AboutPage implements Layer {
paint(ctx: LayerContext): GrayImage {
// Sized to the hosting stack (the Settings app viewport).
const { width, height } = ctx.stack.getBaseSize();
const image = new GrayImage(width, height, 0);
const logo = getDashboardLogo();
const dashboardFont = getDefaultSmallFont();
image.drawText(dashboardFont, 22, 16, "About Faceclaw", 220);
if (logo) {
image.bitBlt(logo, 22, 42, { transparentZero: true });
}
image.drawText(dashboardFont, 108, 48, "Faceclaw", 220);
image.drawText(dashboardFont, 108, 64, "Dashboard prototype", 180);
image.drawTextWrapped({
font: dashboardFont,
x: 22, y: 128,
width: width - 44,
text: "By James Babcock. Distributed under the GNU General Public License, version 3. Version 0.1.0. Too much of an early janky development prototype to have proper numbered releases.",
value: 180
});
return image;
}
handleInput(event: DashboardInputEvent, ctx: { stack: LayerStack }): void {
if (event.type === "double-click") {
ctx.stack.pop();
}
}
}
+112 -131
View File
@@ -1,139 +1,120 @@
import { APP_VIEWPORT } from "../shell/geometry";
import { MenuLayer, type MenuLayout } from "../menu";
import { getDefaultSmallFont } from "../../graphics/bdffont";
import { getDashboardLogo } from "../../graphics/logo";
import { shell } from "../shell/shell";
import { batteryDisplayModeSetting, elevenLabsApiKeySetting, enumSettingMenuItem, firmwareDebugFlagsSetting, rawScreenshotsEnabledSetting, saveVoiceRecordingsSetting, terminalAuthTokenSetting, terminalHostSetting, terminalPortSetting, textSettingMenuItem, timeFormatSetting, toggleSettingMenuItem, voiceProviderSetting, nightscoutSiteUrlSetting, nightscoutApiTokenSetting, screenTimeoutSetting } from "../dashboard-settings";
import { AboutPage } from "./about-page";
import {
batteryDisplayModeSetting,
elevenLabsApiKeySetting,
enumSettingMenuItem,
firmwareDebugFlagsSetting,
rawScreenshotsEnabledSetting,
saveVoiceRecordingsSetting,
terminalAuthTokenSetting,
terminalHostSetting,
terminalPortSetting,
textSettingMenuItem,
timeFormatSetting,
toggleSettingMenuItem,
uiFontSetting,
voiceProviderSetting,
nightscoutSiteUrlSetting,
nightscoutApiTokenSetting,
screenTimeoutSetting,
} from "../dashboard-settings";
import { openSettingsSubMenu, SettingsPanelLayer, type SettingsSection } from "./settings-panel";
// Rendered in the Settings app window (viewport-sized); cap height to it.
const SETTINGS_MENU_LAYOUT: MenuLayout = { x: 8, y: 8, width: 272, maxHeight: APP_VIEWPORT.height - 16 };
export function createSettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings",
[
{
label: "Display",
onSelect: (ctx) => {
ctx.stack.push(createDisplaySettingsMenuLayer());
},
},
{
label: "Voice",
onSelect: (ctx) => {
ctx.stack.push(createVoiceSettingsMenuLayer());
},
},
{
label: "Integrations",
onSelect: (ctx) => {
ctx.stack.push(createIntegrationsMenuLayer());
},
},
{
label: "Terminal",
onSelect: (ctx) => {
ctx.stack.push(createTerminalSettingsMenuLayer());
},
},
{
label: "Developer",
onSelect: (ctx) => {
ctx.stack.push(createDeveloperSettingsMenuLayer());
},
},
{
label: "About",
onSelect: (ctx) => {
ctx.stack.push(new AboutPage());
},
},
{
label: "Quit / Disconnect",
onSelect: async (ctx) => {
ctx.stack.clearToBase();
await ctx.actions.disconnect();
},
},
],
SETTINGS_MENU_LAYOUT,
);
/** The Settings app's master-detail panel (sections on the left, contents on the right). */
export function createSettingsPanelLayer(): SettingsPanelLayer {
return new SettingsPanelLayer(settingsSections());
}
function createTerminalSettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Terminal",
[
textSettingMenuItem(terminalHostSetting),
textSettingMenuItem(terminalPortSetting),
textSettingMenuItem(terminalAuthTokenSetting),
],
SETTINGS_MENU_LAYOUT,
);
}
function createDeveloperSettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Developer",
[
toggleSettingMenuItem(rawScreenshotsEnabledSetting),
toggleSettingMenuItem(saveVoiceRecordingsSetting),
toggleSettingMenuItem(firmwareDebugFlagsSetting),
],
SETTINGS_MENU_LAYOUT,
);
}
function createDisplaySettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Display",
[
enumSettingMenuItem(screenTimeoutSetting, {
onChange: () => {
shell.noteUserActivity();
function settingsSections(): SettingsSection[] {
return [
{
label: "Display",
items: [
enumSettingMenuItem(screenTimeoutSetting, {
onChange: () => {
shell.noteUserActivity();
},
}),
// Controls the top-bar battery indicators (icon vs percentage).
enumSettingMenuItem(batteryDisplayModeSetting),
// Controls the top-bar clock (24-hour vs 12-hour).
enumSettingMenuItem(timeFormatSetting),
// Selects the UI body typeface (Terminus vs proportional TerminusV).
enumSettingMenuItem(uiFontSetting),
],
},
{
label: "Voice",
items: [enumSettingMenuItem(voiceProviderSetting), textSettingMenuItem(elevenLabsApiKeySetting)],
},
{
label: "Integrations",
items: [
{
label: "Nightscout",
onSelect: (ctx) => {
openSettingsSubMenu(ctx, "Nightscout", [
textSettingMenuItem(nightscoutSiteUrlSetting),
textSettingMenuItem(nightscoutApiTokenSetting),
]);
},
},
}),
// Controls the top-bar battery indicators (icon vs percentage).
enumSettingMenuItem(batteryDisplayModeSetting),
// Controls the top-bar clock (24-hour vs 12-hour).
enumSettingMenuItem(timeFormatSetting),
],
SETTINGS_MENU_LAYOUT,
);
}
function createVoiceSettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Voice",
[
enumSettingMenuItem(voiceProviderSetting),
textSettingMenuItem(elevenLabsApiKeySetting),
],
SETTINGS_MENU_LAYOUT,
);
}
function createIntegrationsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Integrations",
[
{
label: "Nightscout",
onSelect: (ctx) => {
ctx.stack.push(createNightscoutSettingsMenuLayer());
],
},
{
label: "Terminal",
items: [
textSettingMenuItem(terminalHostSetting),
textSettingMenuItem(terminalPortSetting),
textSettingMenuItem(terminalAuthTokenSetting),
],
},
{
label: "Developer",
items: [
toggleSettingMenuItem(rawScreenshotsEnabledSetting),
toggleSettingMenuItem(saveVoiceRecordingsSetting),
toggleSettingMenuItem(firmwareDebugFlagsSetting),
],
},
{
label: "About",
items: [],
renderDetail: renderAbout,
},
{
label: "Quit",
items: [
{
label: "Disconnect from glasses",
onSelect: async (ctx) => {
ctx.stack.clearToBase();
await ctx.actions.disconnect();
},
},
},
],
SETTINGS_MENU_LAYOUT,
);
],
},
];
}
export function createNightscoutSettingsMenuLayer(): MenuLayer {
return new MenuLayer(
"Settings > Integrations > Nightscout",
[
textSettingMenuItem(nightscoutSiteUrlSetting),
textSettingMenuItem(nightscoutApiTokenSetting),
],
SETTINGS_MENU_LAYOUT,
);
}
function renderAbout(args: { image: import("../../graphics/image").GrayImage; x: number; y: number; width: number }): void {
const { image, x, y, width } = args;
const font = getDefaultSmallFont();
const logo = getDashboardLogo();
if (logo) {
image.bitBlt(logo, x, y + 4, { transparentZero: true });
}
const textX = logo ? x + logo.width + 12 : x;
image.drawText(font, textX, y + 8, "Faceclaw", 220);
image.drawText(font, textX, y + 24, "Dashboard prototype", 170);
image.drawTextWrapped({
font,
x,
y: y + 64,
width,
text: "By James Babcock. Distributed under the GNU General Public License, version 3. Version 0.1.0. Too much of an early janky development prototype to have proper numbered releases.",
value: 170,
});
}
+192
View File
@@ -0,0 +1,192 @@
import { getDefaultSmallFont } from "../../graphics/bdffont";
import { GrayImage } from "../../graphics/image";
import { clamp } from "../../util/numeric-util";
import { GESTURE_CLICK, GESTURE_DOUBLE_CLICK, GESTURE_SCROLL } from "../gestures";
import { DashboardInputEvent, Layer, LayerContext } from "../layers";
import { drawSelectionHighlight, MenuItem, MenuLayer, type MenuLayout } from "../menu";
import { shell } from "../shell/shell";
/**
* One left-column entry. `items` are the right-column rows (reusing the shared
* MenuItem builders). `renderDetail`, when set, replaces the row list with
* custom informational content (e.g. About) and makes the pane non-interactive.
*/
export type SettingsSection = {
label: string;
items: MenuItem[];
renderDetail?: (args: {
image: GrayImage;
x: number;
y: number;
width: number;
height: number;
ctx: LayerContext;
}) => void;
};
const PAD = 8;
const ROW_H = 20;
const LEFT_W = 150;
// A throwaway menu to satisfy MenuItem.onSelect's second parameter; the
// settings items never use it (they act via ctx only).
const NO_MENU = new MenuLayer(null, []);
/**
* Two-column (master-detail) settings UI. The left column lists sections; the
* right column previews the highlighted section's contents. A tap moves focus
* into the right column, a double-tap moves it back out (and from the left
* column, out to the sidebar). Third-level menus open as centered modals.
*/
export class SettingsPanelLayer implements Layer {
private leftIndex = 0;
private rightIndex = 0;
private focus: "left" | "right" = "left";
private leftScroll = 0;
private rightScroll = 0;
constructor(private readonly sections: SettingsSection[]) {}
private section(): SettingsSection {
return this.sections[clamp(this.leftIndex, 0, this.sections.length - 1)]!;
}
paint(ctx: LayerContext): GrayImage {
const font = getDefaultSmallFont();
const { width, height } = ctx.stack.getBaseSize();
const image = new GrayImage(width, height, 0);
const appFocused = ctx.stack.isFocused();
this.leftIndex = clamp(this.leftIndex, 0, this.sections.length - 1);
const section = this.section();
const rightItems = section.items;
this.rightIndex = clamp(this.rightIndex, 0, Math.max(0, rightItems.length - 1));
const top = PAD;
const listBottom = height - PAD - 12; // leave a row for the gesture hint
// Left column: section labels.
const leftRows = Math.max(1, ((listBottom - top) / ROW_H) | 0);
this.leftScroll = clampScroll(this.leftIndex, this.leftScroll, leftRows, this.sections.length);
for (let i = this.leftScroll; i < Math.min(this.sections.length, this.leftScroll + leftRows); i++) {
const rowY = top + (i - this.leftScroll) * ROW_H;
const selected = i === this.leftIndex;
if (selected) {
drawSelectionHighlight(image, PAD - 2, rowY, LEFT_W, ROW_H - 2, appFocused && this.focus === "left", 6);
}
image.drawText(font, PAD + 8, rowY + 4, this.sections[i]!.label, selected ? 255 : 200);
}
// Column divider (a light rule, not a full border).
const divX = PAD + LEFT_W + 6;
image.drawLine(divX, top, divX, listBottom, 40);
// Right column: the highlighted section's contents.
const rightX = divX + 14;
const rightW = width - rightX - PAD;
if (section.renderDetail) {
section.renderDetail({ image, x: rightX, y: top, width: rightW, height: listBottom - top, ctx });
} else if (rightItems.length) {
const rightRows = Math.max(1, ((listBottom - top) / ROW_H) | 0);
this.rightScroll = clampScroll(this.rightIndex, this.rightScroll, rightRows, rightItems.length);
for (let i = this.rightScroll; i < Math.min(rightItems.length, this.rightScroll + rightRows); i++) {
const item = rightItems[i]!;
const rowY = top + (i - this.rightScroll) * ROW_H;
// A selection only appears once focus is in the right column; before
// that the pane is a preview of what tapping would open.
const selected = this.focus === "right" && i === this.rightIndex;
if (selected) {
drawSelectionHighlight(image, rightX - 2, rowY, rightW + 2, ROW_H - 2, appFocused, 6);
}
if (item.render) {
item.render({ image, x: rightX + 8, y: rowY, width: rightW - 16, height: ROW_H - 3, selected, text: item.label, ctx });
} else {
image.drawText(font, rightX + 8, rowY + 4, item.label, selected ? 255 : 200);
}
}
}
const hint =
this.focus === "left"
? `${GESTURE_SCROLL} section ${GESTURE_CLICK} open ${GESTURE_DOUBLE_CLICK} exit`
: `${GESTURE_SCROLL} item ${GESTURE_CLICK} select ${GESTURE_DOUBLE_CLICK} back`;
image.drawText(font, PAD, height - 10, hint, 110);
return image;
}
async handleInput(event: DashboardInputEvent, ctx: LayerContext): Promise<void> {
if (this.focus === "left") {
switch (event.type) {
case "scroll-up":
this.leftIndex = (this.leftIndex + this.sections.length - 1) % this.sections.length;
this.resetRight();
return;
case "scroll-down":
this.leftIndex = (this.leftIndex + 1) % this.sections.length;
this.resetRight();
return;
case "click":
// Only enter sections that have something interactive on the right.
if (this.section().items.length) {
this.focus = "right";
this.resetRight();
}
return;
case "double-click":
shell.yieldFocusToSidebar();
return;
default:
return;
}
}
const items = this.section().items;
switch (event.type) {
case "scroll-up":
if (items.length) this.rightIndex = (this.rightIndex + items.length - 1) % items.length;
return;
case "scroll-down":
if (items.length) this.rightIndex = (this.rightIndex + 1) % items.length;
return;
case "click":
if (items.length) await items[clamp(this.rightIndex, 0, items.length - 1)]!.onSelect(ctx, NO_MENU);
return;
case "double-click":
this.focus = "left";
return;
default:
return;
}
}
private resetRight(): void {
this.rightIndex = 0;
this.rightScroll = 0;
}
}
/**
* Open a third-level menu as a centered, bordered modal over the panel. Reuses
* MenuLayer (which draws the border and self-closes on double-click).
*/
export function openSettingsSubMenu(ctx: LayerContext, title: string, items: MenuItem[]): void {
const { width, height } = ctx.stack.getBaseSize();
const menuW = Math.min(320, width - 40);
const menuH = 16 + PAD + items.length * ROW_H + PAD;
const layout: MenuLayout = {
x: ((width - menuW) / 2) | 0,
y: ((height - menuH) / 2) | 0,
width: menuW,
minHeight: menuH,
maxHeight: menuH,
};
ctx.stack.push(new MenuLayer(title, items, layout));
}
function clampScroll(selected: number, scroll: number, visible: number, count: number): number {
if (selected < scroll) {
scroll = selected;
} else if (selected >= scroll + visible) {
scroll = selected - visible + 1;
}
return clamp(scroll, 0, Math.max(0, count - visible));
}
+5 -3
View File
@@ -1,8 +1,8 @@
import { GrayImage } from "../../graphics/image";
import { LayerActions } from "../layers";
import { EditTextSettingLayer } from "../dashboard-settings";
import { createSettingsMenuLayer } from "../dashboard/settings-menus";
import { createInProcessWindow, YieldAtRootLayer } from "./in-process-window";
import { createSettingsPanelLayer } from "../dashboard/settings-menus";
import { createInProcessWindow } from "./in-process-window";
import { type ShellWindow } from "./shell";
export const SETTINGS_WINDOW_ID = "settings";
@@ -40,7 +40,9 @@ export function createSettingsAppWindow(options: SettingsAppOptions): SettingsAp
icon: "settings",
closeable: true,
actions: options.actions,
baseLayer: new YieldAtRootLayer(createSettingsMenuLayer()),
// Not wrapped in YieldAtRootLayer: the panel routes double-click itself
// (right column -> left column, then left column -> sidebar).
baseLayer: createSettingsPanelLayer(),
submitFrame: options.submitFrame,
setSurfaceVisible: options.setSurfaceVisible,
removeSurface: options.removeSurface,