feat(macos): port Ghostty's macOS code paths (Metal, CoreText, Darwin)
Ports the macOS-specific Zig code behind cfg(target_os = "macos"): - renderer: a GraphicsApi trait with generic::Renderer<G>; Metal backend (all renderer/metal/* files, shaders.metal verbatim, runtime library compile, IOSurface layer, CVDisplayLink), shadertoy -> MSL via naga; OpenGL remains the backend elsewhere. - font: CoreText face, shaper and discovery with build.rs backend selection (coretext default; coretext-freetype / coretext-harfbuzz / coretext-noshape features), no fontconfig/freetype/harfbuzz on Apple. - input: KeymapDarwin via UCKeyTranslate, option-as-alt, mac keycodes. - os: macos, mach, cf_release_thread, NSProcessInfo args and macOS branches; config: macOS defaults, keybinds, Application Support paths. - termio/core: login(1) wrapping, openpty/execvpe, Darwin child exit handling, os_log logging. Compile-checked for aarch64/x86_64-apple-darwin (clippy -D warnings clean) using the cross setup in docs/rewrite/notes/macos-M1.md; cannot run here. The embedded runtime/C API (embedded.zig) is the next step. Also includes the cross-platform integration edits shared by the crash, verification, Windows and macOS work (Cargo target-gating, thread crash-context hooks, apprt-gtk surface/IME refactor, termio/os cfg gates), a cfg fix so ghostty-config builds on wasm32, and an allow for the intentional recursion in the crash overflow test. Test Plan: - cargo test --workspace (3224 passed) - cargo clippy --workspace --all-targets -- -D warnings - cargo check --target aarch64-apple-darwin -p ghostty-renderer (with the documented cross env)
This commit is contained in:
1 parent
76771bed0d
commit
bab49ee596
124 files changed
+14936
-1242
No files matched your search
@@ -1,6 +1,7 @@
|
||||
//! Face types shared by all face implementations. Port of `font/face.zig`.
|
||||
//!
|
||||
//! The concrete FreeType face lives in [`freetype`] (`font/face/freetype.zig`).
|
||||
//! The concrete FreeType face lives in [`freetype`] (`font/face/freetype.zig`),
|
||||
//! the CoreText face (Apple targets) in [`coretext`] (`font/face/coretext.zig`).
|
||||
|
||||
// `(a + b) / 2` is kept verbatim from upstream (f64::midpoint rounds differently).
|
||||
#![allow(clippy::manual_midpoint)]
|
||||
@@ -9,14 +10,23 @@ use std::sync::Arc;
|
||||
|
||||
use crate::metrics::Metrics;
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
#[cfg(font_coretext_face)]
|
||||
pub mod coretext;
|
||||
pub mod coretext_math;
|
||||
#[cfg(font_freetype)]
|
||||
pub mod freetype;
|
||||
// The pure (non-JS) parts of the web_canvas face compile everywhere so they
|
||||
// can be unit tested natively; the JS-backed `Face` is wasm32-only.
|
||||
pub mod web_canvas;
|
||||
|
||||
#[cfg(not(target_arch = "wasm32"))]
|
||||
pub use freetype::Face;
|
||||
#[cfg(all(font_coretext_face, font_harfbuzz))]
|
||||
pub use coretext::HbFont;
|
||||
#[cfg(font_coretext_face)]
|
||||
pub use coretext::{Face, FaceError, RenderError};
|
||||
#[cfg(font_freetype)]
|
||||
pub use freetype::HbFont;
|
||||
#[cfg(font_freetype)]
|
||||
pub use freetype::{Face, FaceError, RenderError};
|
||||
pub use ghostty_config::types_b::FreetypeLoadFlags;
|
||||
#[cfg(target_arch = "wasm32")]
|
||||
pub use web_canvas::Face;
|
||||
@@ -24,6 +34,9 @@ pub use web_canvas::Face;
|
||||
/// If a DPI can't be calculated, this DPI is used. This is probably
|
||||
/// wrong on modern devices so it is highly recommended you get the DPI
|
||||
/// using whatever platform method you can.
|
||||
#[cfg(target_os = "macos")]
|
||||
pub const DEFAULT_DPI: u16 = 72;
|
||||
#[cfg(not(target_os = "macos"))]
|
||||
pub const DEFAULT_DPI: u16 = 96;
|
||||
|
||||
pub const FREETYPE_LOAD_FLAGS_DEFAULT: FreetypeLoadFlags = FreetypeLoadFlags {
|
||||
|
||||
Reference in new issue
Block a user