feat: visual parity with the original Ghostty (pixel-diff pipeline)
Adds scripts/visual-parity.sh (`just visual-parity`): launches the installed Ghostty 1.3.1 and the Rust build in an isolated headless nested weston (GL renderer, Mesa forced, weston-screenshooter via --debug), with identical isolated config, a deterministic test page (ASCII, ligatures, all SGR styles and underline kinds, 16/256/truecolor, box/block/braille/powerline/nerd icons, CJK, emoji, wide chars, cursor) and a tabs+splits scenario driven through Xwayland, then diffs the captures (terminal area and chrome separately, heatmaps). Fixes found by comparing against the original: - A pane stayed blank after a nested split: the GTK render path called draw_frame(false) where Ghostty uses drawFrame(true) (a re-realized GLArea has a new swap chain that nothing else redraws). - Sprite glyph antialiasing now ports z2d's default 4x4 multisample rasterizer instead of tiny-skia's analytic coverage (pixels differing from Ghostty's reference sprite sheets: 5.76% -> 1.20%, none off by more than 96 levels); the sheet test tolerance is tightened to 0.1%. Result vs Ghostty 1.3.1: test page 0.020% of pixels differ (196 px at curly-underline ends and diagonal box strokes, max delta 86 levels); tabs+splits and headerbar/tab bar are bit-identical. Details in docs/rewrite/notes/visual-parity-VP.md. Test Plan: - just visual-parity (needs weston, weston-screenshooter, xdotool) - cargo test -p ghostty-font (sprite sheet comparison)
This commit is contained in:
ddidderr committed
1 parent
1ff1bab0e8
commit
ce9373aa7a
9 files changed
+599
-45
No files matched your search
Executable
+127
@@ -0,0 +1,127 @@
|
||||
#!/usr/bin/env bash
|
||||
# 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)
|
||||
#
|
||||
# env: RUST_BIN (default target/production/ghostty), REF_BIN (default
|
||||
# /usr/bin/ghostty), OUT (default target/visual-parity), W/H output size.
|
||||
# Output: $OUT/<scenario>/{ref,rust,diff}.png (+ chrome/term crops) and stats.txt.
|
||||
set -u
|
||||
ROOT=$(cd "$(dirname "$0")/.." && pwd)
|
||||
RUST_BIN=${RUST_BIN:-$ROOT/target/production/ghostty}
|
||||
REF_BIN=${REF_BIN:-/usr/bin/ghostty}
|
||||
OUT=${OUT:-$ROOT/target/visual-parity}
|
||||
W=${W:-1200}; H=${H:-800}
|
||||
VP=$ROOT/scripts/visual-parity
|
||||
SCEN=${*:-page page-bar tabs}
|
||||
mkdir -p "$OUT"
|
||||
export XDG_RUNTIME_DIR=${VP_RUNTIME_DIR:-/tmp/vp-runtime-$UID}
|
||||
mkdir -p -m700 "$XDG_RUNTIME_DIR"
|
||||
WORK=$(mktemp -d "$OUT/work.XXXX")
|
||||
SOCK=vp$$
|
||||
|
||||
XWL=
|
||||
case " $SCEN " in *" tabs "*) XWL=xwayland=true; mkdir -p /tmp/.X11-unix ;; esac
|
||||
cat >"$WORK/weston.ini" <<INI
|
||||
[core]
|
||||
shell=desktop-shell.so
|
||||
$XWL
|
||||
[output]
|
||||
name=headless
|
||||
mode=${W}x${H}
|
||||
[shell]
|
||||
panel-position=none
|
||||
background-color=0xff202020
|
||||
INI
|
||||
|
||||
__EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json XWAYLAND_NO_GLAMOR=1 weston --debug --backend=headless --renderer=gl --socket=$SOCK -c "$WORK/weston.ini" \
|
||||
>"$WORK/weston.log" 2>&1 &
|
||||
WPID=$!
|
||||
trap 'kill $WPID 2>/dev/null; wait 2>/dev/null' EXIT
|
||||
for _ in $(seq 50); do [ -S "$XDG_RUNTIME_DIR/$SOCK" ] && break; sleep 0.1; done
|
||||
sleep 1
|
||||
|
||||
write_cfg() { # dir, extra
|
||||
mkdir -p "$1/ghostty"
|
||||
cat >"$1/ghostty/config" <<CFG
|
||||
font-family = JetBrains Mono
|
||||
font-size = 13
|
||||
background = 1e1e2e
|
||||
foreground = cdd6f4
|
||||
maximize = true
|
||||
window-padding-x = 8
|
||||
window-padding-y = 8
|
||||
cursor-style = block
|
||||
cursor-style-blink = false
|
||||
window-theme = dark
|
||||
title = Ghostty
|
||||
confirm-close-surface = false
|
||||
shell-integration = none
|
||||
quit-after-last-window-closed = true
|
||||
$2
|
||||
CFG
|
||||
}
|
||||
|
||||
shoot() { # outfile
|
||||
local d; d=$(mktemp -d "$WORK/shot.XXXX")
|
||||
(cd "$d" && WAYLAND_DISPLAY=$SOCK timeout 20 weston-screenshooter >/dev/null 2>&1)
|
||||
mv "$d"/*.png "$1" && rmdir "$d"
|
||||
}
|
||||
|
||||
# run BIN LABEL SCENARIO OUTPNG
|
||||
run_one() {
|
||||
local bin=$1 label=$2 scen=$3 out=$4 cfgx=""
|
||||
local cfg="$WORK/cfg-$label-$scen"
|
||||
case $scen in page-bar) cfgx="cursor-style = bar" ;; esac
|
||||
write_cfg "$cfg" "$cfgx"
|
||||
local env=(LANG=C.UTF-8 XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR WAYLAND_DISPLAY=$SOCK XDG_CONFIG_HOME=$cfg GSETTINGS_BACKEND=memory
|
||||
DBUS_SESSION_BUS_ADDRESS=unix:path=/nonexistent GDK_BACKEND=wayland
|
||||
HOME=$WORK/home-$label)
|
||||
mkdir -p "$WORK/home-$label"
|
||||
case $scen in
|
||||
tabs)
|
||||
# Needs input: run under Xwayland and drive with xdotool.
|
||||
env=("${env[@]/GDK_BACKEND=wayland/GDK_BACKEND=x11}")
|
||||
env+=(DISPLAY="$(xwl_display)")
|
||||
env -i PATH="$PATH" "${env[@]}" timeout 60 "$bin" --gtk-single-instance=false \
|
||||
-e "$VP/testpage.sh" >"$WORK/$label-$scen.log" 2>&1 &
|
||||
local pid=$!
|
||||
sleep 6
|
||||
xdotool_keys
|
||||
sleep 3
|
||||
shoot "$out"
|
||||
kill $pid 2>/dev/null; wait $pid 2>/dev/null
|
||||
;;
|
||||
*)
|
||||
env -i PATH="$PATH" "${env[@]}" timeout 60 "$bin" --gtk-single-instance=false \
|
||||
-e "$VP/testpage.sh" >"$WORK/$label-$scen.log" 2>&1 &
|
||||
local pid=$!
|
||||
sleep 7
|
||||
shoot "$out"
|
||||
kill $pid 2>/dev/null; wait $pid 2>/dev/null
|
||||
;;
|
||||
esac
|
||||
}
|
||||
xwl_display() { grep -o "display :[0-9]*" "$WORK/weston.log" | tail -1 | sed 's/display //'; }
|
||||
xdotool_keys() {
|
||||
export DISPLAY=$(xwl_display)
|
||||
xdotool key --clearmodifiers ctrl+shift+t; sleep 1
|
||||
xdotool key --clearmodifiers ctrl+shift+o; sleep 1
|
||||
xdotool key --clearmodifiers ctrl+shift+e; sleep 1
|
||||
}
|
||||
|
||||
: >"$OUT/stats.txt"
|
||||
for s in $SCEN; do
|
||||
mkdir -p "$OUT/$s"
|
||||
run_one "$REF_BIN" ref "$s" "$OUT/$s/ref.png"
|
||||
run_one "$RUST_BIN" rust "$s" "$OUT/$s/rust.png"
|
||||
python3 "$VP/compare.py" "$OUT/$s/ref.png" "$OUT/$s/rust.png" "$OUT/$s/diff.png" --name "$s/full" | tee -a "$OUT/stats.txt"
|
||||
# terminal area: window content below the headerbar; chrome: the headerbar strip.
|
||||
# Window geometry is deterministic under desktop-shell; override with TERM_CROP / CHROME_CROP.
|
||||
python3 "$VP/compare.py" "$OUT/$s/ref.png" "$OUT/$s/rust.png" "$OUT/$s/diff-term.png" \
|
||||
--crop "${TERM_CROP:-0,48,1200,752}" --name "$s/terminal" | tee -a "$OUT/stats.txt"
|
||||
python3 "$VP/compare.py" "$OUT/$s/ref.png" "$OUT/$s/rust.png" "$OUT/$s/diff-chrome.png" \
|
||||
--crop "${CHROME_CROP:-0,0,1200,48}" --name "$s/chrome" | tee -a "$OUT/stats.txt"
|
||||
done
|
||||
[ -n "${KEEP:-}" ] || rm -rf "$WORK"
|
||||
Executable
+54
@@ -0,0 +1,54 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Pixel compare two PNG captures: stats + diff heatmap.
|
||||
|
||||
usage: compare.py REF.png RUST.png DIFF.png [--crop x,y,w,h] [--name NAME]
|
||||
Prints one line: name, size, differing pixels (%), >8 / >32 levels, max delta, mean delta.
|
||||
"""
|
||||
import sys
|
||||
import numpy as np
|
||||
from PIL import Image
|
||||
|
||||
|
||||
def main():
|
||||
a = sys.argv[1:]
|
||||
crop = None
|
||||
name = "all"
|
||||
pos = []
|
||||
i = 0
|
||||
while i < len(a):
|
||||
if a[i] == "--crop":
|
||||
crop = tuple(int(v) for v in a[i + 1].split(","))
|
||||
i += 2
|
||||
elif a[i] == "--name":
|
||||
name = a[i + 1]
|
||||
i += 2
|
||||
else:
|
||||
pos.append(a[i])
|
||||
i += 1
|
||||
ref = Image.open(pos[0]).convert("RGB")
|
||||
rs = Image.open(pos[1]).convert("RGB")
|
||||
if crop:
|
||||
x, y, w, h = crop
|
||||
ref, rs = ref.crop((x, y, x + w, y + h)), rs.crop((x, y, x + w, y + h))
|
||||
if ref.size != rs.size:
|
||||
print(f"{name}: SIZE MISMATCH {ref.size} vs {rs.size}")
|
||||
w, h = min(ref.size[0], rs.size[0]), min(ref.size[1], rs.size[1])
|
||||
ref, rs = ref.crop((0, 0, w, h)), rs.crop((0, 0, w, h))
|
||||
r = np.asarray(ref).astype(int)
|
||||
s = np.asarray(rs).astype(int)
|
||||
d = np.abs(r - s).max(axis=2)
|
||||
n = d.size
|
||||
diff = int((d > 0).sum())
|
||||
print(
|
||||
f"{name}: {ref.size[0]}x{ref.size[1]} differing={diff} ({100*diff/n:.3f}%) "
|
||||
f">8={100*(d>8).sum()/n:.3f}% >32={100*(d>32).sum()/n:.3f}% max={d.max()} mean={d.mean():.4f}"
|
||||
)
|
||||
# heatmap: dimmed reference with differences in red (intensity ~ delta)
|
||||
heat = (r * 0.25).astype(np.uint8)
|
||||
m = np.clip(d * 4, 0, 255).astype(np.uint8)
|
||||
heat[..., 0] = np.maximum(heat[..., 0], m)
|
||||
heat[..., 1] = np.where(m > 0, heat[..., 1] // 2, heat[..., 1])
|
||||
Image.fromarray(heat).save(pos[2])
|
||||
|
||||
|
||||
main()
|
||||
Executable
+43
@@ -0,0 +1,43 @@
|
||||
#!/bin/bash
|
||||
# Deterministic test page for visual-parity captures. No prompt, no variance.
|
||||
E=$'\e'
|
||||
printf '\e[?25l\e[2J\e[H'
|
||||
printf '%s\n' 'ASCII: The quick brown fox jumps over the lazy dog 0123456789 {}[]()<>'
|
||||
printf '%s\n' 'Ligs: -> => == != >= <= :: |> <| www fi fl ffi'
|
||||
printf '%s\n' 'Sym: !"#$%&'"'"'()*+,-./:;<=>?@[\]^_`{|}~ gjpqy ÀÉÎÕÜ ñ ß'
|
||||
printf '\e[1mBold\e[0m \e[3mItalic\e[0m \e[1;3mBoldItalic\e[0m \e[2mFaint\e[0m \e[7mInverse\e[0m \e[9mStrike\e[0m \e[53mOverline\e[0m \e[8mhidden\e[0m|\n'
|
||||
printf 'UL: \e[4mSingle\e[0m \e[4:2mDouble\e[0m \e[4:3mCurly\e[0m \e[4:4mDotted\e[0m \e[4:5mDashed\e[0m \e[4:3;58;2;255;0;0mRedCurly\e[0m \e[4;9mUL+Strike\e[0m\n'
|
||||
printf '16: '
|
||||
for i in 0 1 2 3 4 5 6 7; do printf '\e[4%dm \e[0m' $i; done; printf ' '
|
||||
for i in 0 1 2 3 4 5 6 7; do printf '\e[10%dm \e[0m' $i; done; printf '\n'
|
||||
printf 'FG: '
|
||||
for i in 0 1 2 3 4 5 6 7; do printf '\e[3%dmAb\e[0m' $i; done; printf ' '
|
||||
for i in 0 1 2 3 4 5 6 7; do printf '\e[9%dmAb\e[0m' $i; done; printf '\n'
|
||||
printf '256: '
|
||||
for i in $(seq 16 87); do printf '\e[48;5;%dm \e[0m' $i; done; printf '\n '
|
||||
for i in $(seq 88 159); do printf '\e[48;5;%dm \e[0m' $i; done; printf '\n '
|
||||
for i in $(seq 160 231); do printf '\e[48;5;%dm \e[0m' $i; done; printf '\n '
|
||||
for i in $(seq 232 255); do printf '\e[48;5;%dm \e[0m' $i; done; printf '\n'
|
||||
printf 'RGB: '
|
||||
for i in $(seq 0 4 255); do printf '\e[48;2;%d;%d;%dm \e[0m' $i $((255-i)) 128; done; printf '\n'
|
||||
printf 'FGRGB: \e[38;2;255;128;0mOrange\e[0m \e[38;2;0;200;255;48;2;40;40;90mCyanOnBlue\e[0m \e[38;5;196mRed196\e[0m \e[38;5;21;48;5;226mBlueOnYellow\e[0m\n'
|
||||
printf 'Box: ┌─┬─┐ ╔═╦═╗ ╭─╮ ┏━┳━┓ │ │ │ ║ ║ ║ ├─┼─┤ ╠═╬═╣ ╰─╯ ┗━┻━┛ ╱╲╳ ┈┉┊┋ ╌╍╎╏\n'
|
||||
printf ' └─┴─┘ ╚═╩═╝ ┐┘└┌ ╒╓╕╖ ╞╟╡╢ ╤╥╧╨ ╪╫ ╴╵╶╷ ╸╹╺╻ ╼╽╾╿\n'
|
||||
printf 'Blk: ▀▁▂▃▄▅▆▇█▉▊▋▌▍▎▏▐░▒▓▔▕▖▗▘▙▚▛▜▝▞▟ ◢◣◤◥ ⬛\n'
|
||||
printf 'Brl: ⠀⠁⠂⠃⠄⠅⠆⠇⡀⡁⣀⣿⠿⣤⢕⡪ ⣾⣽⣻⢿⡿⣟⣯⣷\n'
|
||||
printf 'Pwr: \n'
|
||||
printf '\e[30;44m \e[34;42m\e[30m main \e[32;40m\e[0m\n'
|
||||
printf 'Nerd: \U000f0219 \n'
|
||||
printf 'CJK: 日本語のテキスト 中文字符 한국어 ｆｕｌｌ ＡＢＣ\n'
|
||||
printf 'Emoji: 😀 🎉 🚀 ❤️ 👍🏽 👨👩👧 🇩🇪 ✅ ⭐ ☀\n'
|
||||
printf 'Wide: |日|本|a|語|\n'
|
||||
printf 'Math: ∑ ∫ ∂ √ ∞ ≠ ≤ ≥ ← → ↑ ↓ ⇒ λ π Ω αβγ \n'
|
||||
printf 'Curs: '
|
||||
printf '\e[1 q\e[?25hX'
|
||||
printf '\e[?25l\e[0 q'
|
||||
printf '\n'
|
||||
printf '\e[7mReverse\e[27m \e[38;5;240;48;5;238mdim on dim\e[0m \e[31;41mred on red\e[0m\n'
|
||||
printf '\e[5;1H'
|
||||
printf '\e[24;1H'
|
||||
printf '\e[1 q\e[?25h'
|
||||
exec sleep 100000
|
||||
@@ -0,0 +1,11 @@
|
||||
#!/usr/bin/env python3
|
||||
"""zoom.py DIR x,y,w,h scale OUT : side-by-side ref | rust | diff crop, upscaled (nearest)."""
|
||||
import sys
|
||||
from PIL import Image
|
||||
d, box, sc, out = sys.argv[1], [int(v) for v in sys.argv[2].split(",")], int(sys.argv[3]), sys.argv[4]
|
||||
x, y, w, h = box
|
||||
ims = [Image.open(f"{d}/{n}.png").convert("RGB").crop((x, y, x + w, y + h)).resize((w * sc, h * sc), Image.NEAREST) for n in ("ref", "rust", "diff")]
|
||||
o = Image.new("RGB", (w * sc, h * sc * 3 + 8), (255, 0, 255))
|
||||
for i, im in enumerate(ims):
|
||||
o.paste(im, (0, i * (h * sc + 4)))
|
||||
o.save(out)
|
||||
Reference in new issue
Block a user