fix: inspector font/formatting, FreeType-only backend on Apple
Resolves the parity items of docs/rewrite/notes/review-rv17-codex.md (final-Z20.md): - FreeType-only font backend is also available on Apple targets (discovery-free, embedded emoji fonts); ghostty_surface_quicklook_font returns null for every backend except plain CoreText like Zig. - The +list-fonts test keys off the font crate's selected backend (HAS_DISCOVERY), correct under feature unification and on Apple. - Inspector font: 32 px rasterized with FreeType (dear-imgui freetype) like Ghostty; a new `visual-parity.sh inspector` scenario shows 0.031% differing pixels (hover highlight) vs the original on Linux. Windows, Apple and wasm keep stb_truetype at 32 px (registered as a deliberate deviation). - Inspector DCS/APC descriptions follow Zig 0.15.2's formatting (checked by running Zig), incl. the terminal.Parser.Action prefix. - The ImGui demo window appears only in dev-profile builds, mirroring Zig's .Debug-only gate. Test Plan: - cargo test --workspace --no-fail-fast (3582 passed) - just check-macos (both, also with --features font-backend-freetype) - scripts/visual-parity.sh inspector
This commit is contained in:
1 parent
5ab6dba4a4
commit
132f7c27ba
18 files changed
+267
-83
No files matched your search
@@ -3,6 +3,8 @@
|
||||
# Uses `zig cc` wrappers for the few C build scripts in the dependency
|
||||
# tree; real macOS builds need none of this. See docs/rewrite/notes/macos-M1.md.
|
||||
# Usage: scripts/macos-crosscheck.sh [check|clippy] [target]
|
||||
# MACOS_CHECK_FEATURES="ghostty-font/font-backend-freetype" adds cargo features
|
||||
# (for example the FreeType-only font backend on Apple).
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")/.."
|
||||
MODE=${1:-clippy}
|
||||
@@ -54,8 +56,12 @@ CRATES=(-p ghostty-vt -p ghostty-unicode -p ghostty-datastruct -p ghostty-os -p
|
||||
-p ghostty-config -p ghostty-terminal -p ghostty-font -p ghostty-renderer -p ghostty-termio
|
||||
-p ghostty-core -p ghostty-apprt -p ghostty-inspector -p ghostty-lib -p ghostty-crash
|
||||
-p ghostty-bench -p ghostty-vt-capi)
|
||||
FEATURES=()
|
||||
if [ -n "${MACOS_CHECK_FEATURES:-}" ]; then
|
||||
FEATURES=(--features "$MACOS_CHECK_FEATURES")
|
||||
fi
|
||||
if [ "$MODE" = clippy ]; then
|
||||
cargo clippy --target "$TARGET" "${CRATES[@]}" --lib --tests -- -D warnings
|
||||
cargo clippy --target "$TARGET" "${CRATES[@]}" "${FEATURES[@]}" --lib --tests -- -D warnings
|
||||
else
|
||||
cargo check --target "$TARGET" "${CRATES[@]}" --lib --tests
|
||||
cargo check --target "$TARGET" "${CRATES[@]}" "${FEATURES[@]}" --lib --tests
|
||||
fi
|
||||
@@ -2,7 +2,8 @@
|
||||
# Visual parity: capture original Ghostty and the Rust build in an isolated,
|
||||
# headless nested weston and compare pixel-wise.
|
||||
#
|
||||
# scripts/visual-parity.sh [scenario...] (default: page page-bar tabs)
|
||||
# scripts/visual-parity.sh [scenario...] (default: page page-bar tabs;
|
||||
# also available: inspector = ctrl+shift+i via xdotool)
|
||||
#
|
||||
# env: RUST_BIN (default target/production/ghostty), REF_BIN (default
|
||||
# /usr/bin/ghostty), OUT (default target/visual-parity), W/H output size.
|
||||
@@ -22,7 +23,7 @@ WORK=$(mktemp -d "$OUT/work.XXXX")
|
||||
SOCK=vp$$
|
||||
|
||||
XWL=
|
||||
case " $SCEN " in *" tabs "*) XWL=xwayland=true; mkdir -p /tmp/.X11-unix ;; esac
|
||||
case " $SCEN " in *" tabs "*|*" inspector "*) XWL=xwayland=true; mkdir -p /tmp/.X11-unix ;; esac
|
||||
cat >"$WORK/weston.ini" <<INI
|
||||
[core]
|
||||
shell=desktop-shell.so
|
||||
@@ -80,7 +81,7 @@ run_one() {
|
||||
HOME=$WORK/home-$label)
|
||||
mkdir -p "$WORK/home-$label"
|
||||
case $scen in
|
||||
tabs)
|
||||
tabs|inspector)
|
||||
# Needs input: run under Xwayland and drive with xdotool.
|
||||
env=("${env[@]/GDK_BACKEND=wayland/GDK_BACKEND=x11}")
|
||||
env+=(DISPLAY="$(xwl_display)")
|
||||
@@ -88,7 +89,7 @@ run_one() {
|
||||
-e "$VP/testpage.sh" >"$WORK/$label-$scen.log" 2>&1 &
|
||||
local pid=$!
|
||||
sleep 6
|
||||
xdotool_keys
|
||||
xdotool_keys "$scen"
|
||||
sleep 3
|
||||
shoot "$out"
|
||||
kill $pid 2>/dev/null; wait $pid 2>/dev/null
|
||||
@@ -106,6 +107,10 @@ run_one() {
|
||||
xwl_display() { grep -o "display :[0-9]*" "$WORK/weston.log" | tail -1 | sed 's/display //'; }
|
||||
xdotool_keys() {
|
||||
export DISPLAY=$(xwl_display)
|
||||
if [ "${1:-}" = inspector ]; then
|
||||
xdotool key --clearmodifiers ctrl+shift+i; sleep 3
|
||||
return
|
||||
fi
|
||||
xdotool key --clearmodifiers ctrl+shift+t; sleep 1
|
||||
xdotool key --clearmodifiers ctrl+shift+o; sleep 1
|
||||
xdotool key --clearmodifiers ctrl+shift+e; sleep 1
|
||||
|
||||
Reference in new issue
Block a user