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
75fd25d1f1
commit
e536b603b2
18 files changed
+267
-83
No files matched your search
@@ -3,9 +3,10 @@
|
||||
//!
|
||||
//! Backends (see `src/backend.rs`):
|
||||
//! * Linux & other non-Apple, non-wasm targets: `fontconfig_freetype`.
|
||||
//! * Linux & other non-Apple, non-wasm targets with the cargo feature
|
||||
//! * Any non-wasm target (Apple included) with the cargo feature
|
||||
//! `font-backend-freetype`: `freetype` (FreeType rendering, HarfBuzz
|
||||
//! shaping, no font discovery; Zig `-Dfont-backend=freetype`).
|
||||
//! shaping, no font discovery; Zig `-Dfont-backend=freetype`). On Apple
|
||||
//! it takes precedence over the `coretext-*` features.
|
||||
//! * wasm32: `web_canvas`.
|
||||
//! * Apple targets: `coretext` (default), or via cargo features
|
||||
//! `coretext-freetype`, `coretext-harfbuzz`, `coretext-noshape`.
|
||||
@@ -46,14 +47,15 @@ fn main() {
|
||||
let ct_hb = feat("CORETEXT_HARFBUZZ");
|
||||
let ct_noshape = feat("CORETEXT_NOSHAPE");
|
||||
|
||||
// Zig `-Dfont-backend=freetype` is valid on every non-wasm target,
|
||||
// Darwin included (no discovery, so the embedded emoji fonts are used).
|
||||
let ft_only = feat("FONT_BACKEND_FREETYPE");
|
||||
if ft_only && (wasm || apple) {
|
||||
println!(
|
||||
"cargo:warning=feature `font-backend-freetype` only applies to non-Apple, \
|
||||
non-wasm targets; ignored"
|
||||
);
|
||||
if ft_only && wasm {
|
||||
println!("cargo:warning=feature `font-backend-freetype` does not apply to wasm32; ignored");
|
||||
}
|
||||
let ft_only = ft_only && !wasm && !apple;
|
||||
let ft_only = ft_only && !wasm;
|
||||
// CoreText is the backend on Apple targets unless FreeType-only is asked.
|
||||
let coretext = apple && !ft_only;
|
||||
|
||||
let on = |c: &str, v: bool| {
|
||||
if v {
|
||||
@@ -61,17 +63,17 @@ fn main() {
|
||||
}
|
||||
};
|
||||
|
||||
let freetype = !wasm && (!apple || ct_ft);
|
||||
let harfbuzz = !wasm && (!apple || ct_ft || ct_hb);
|
||||
let freetype = !wasm && (!coretext || ct_ft);
|
||||
let harfbuzz = !wasm && (!coretext || ct_ft || ct_hb);
|
||||
on("font_freetype", freetype);
|
||||
let fontconfig = !wasm && !apple && !ft_only;
|
||||
on("font_fontconfig", fontconfig);
|
||||
on("font_discovery", fontconfig || apple);
|
||||
on("font_discovery", fontconfig || coretext);
|
||||
on("font_harfbuzz", harfbuzz);
|
||||
on("font_coretext", apple);
|
||||
on("font_coretext_face", apple && !ct_ft);
|
||||
on("font_coretext", coretext);
|
||||
on("font_coretext_face", coretext && !ct_ft);
|
||||
// The shaper is CoreText only for the plain `coretext` backend;
|
||||
// `coretext_noshape` uses the no-op shaper.
|
||||
on("font_coretext_shaper", apple && !harfbuzz && !ct_noshape);
|
||||
on("font_noshape", apple && !harfbuzz && ct_noshape);
|
||||
on("font_coretext_shaper", coretext && !harfbuzz && !ct_noshape);
|
||||
on("font_noshape", coretext && !harfbuzz && ct_noshape);
|
||||
}
|
||||
Reference in new issue
Block a user