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
@@ -33,7 +33,7 @@ use crate::{
|
||||
codepoint_map::CodepointMap,
|
||||
codepoint_resolver::{CodepointResolver, StyleStatus},
|
||||
collection::{self, AddOptions, Collection, LoadOptions, SizeAdjustment},
|
||||
discovery::{Descriptor, Discover, Fontconfig},
|
||||
discovery::{Descriptor, Discover},
|
||||
embedded,
|
||||
face::{self, DesiredSize, FontData},
|
||||
library::{Library, LibraryError},
|
||||
@@ -47,7 +47,7 @@ pub enum RefError {
|
||||
#[error(transparent)]
|
||||
Discover(#[from] crate::discovery::DiscoverError),
|
||||
#[error("font discovery failed: {0}")]
|
||||
DiscoverNext(#[from] crate::fontconfig::Error),
|
||||
DiscoverNext(#[from] crate::discovery::NextError),
|
||||
#[error(transparent)]
|
||||
Add(#[from] collection::AddError),
|
||||
#[error(transparent)]
|
||||
@@ -57,7 +57,7 @@ pub enum RefError {
|
||||
#[error(transparent)]
|
||||
GetFace(#[from] collection::GetFaceError),
|
||||
#[error(transparent)]
|
||||
Face(#[from] face::freetype::FaceError),
|
||||
Face(#[from] face::FaceError),
|
||||
#[error(transparent)]
|
||||
Grid(#[from] shared_grid::InitError),
|
||||
#[error(transparent)]
|
||||
@@ -321,20 +321,49 @@ impl SharedGridSet {
|
||||
fallback(Style::Regular, SizeAdjustment::None),
|
||||
)?;
|
||||
|
||||
// Emoji fallback. (Zig skips this on macOS, which is out of scope.)
|
||||
c.add(
|
||||
Face::init(&self.font_lib, FontData::Static(embedded::EMOJI), face_opts)?,
|
||||
// No size adjustment for emojis.
|
||||
fallback(Style::Regular, SizeAdjustment::None),
|
||||
)?;
|
||||
c.add(
|
||||
Face::init(
|
||||
&self.font_lib,
|
||||
FontData::Static(embedded::EMOJI_TEXT),
|
||||
face_opts,
|
||||
)?,
|
||||
fallback(Style::Regular, SizeAdjustment::None),
|
||||
)?;
|
||||
// On macOS, always search for and add the Apple Emoji font
|
||||
// as our preferred emoji font for fallback. We do this in case
|
||||
// people add other emoji fonts to their system, we always want to
|
||||
// prefer the official one. Users can override this by explicitly
|
||||
// specifying a font-family for emoji.
|
||||
#[cfg(font_coretext)]
|
||||
{
|
||||
let disco = Self::discover(inner);
|
||||
let mut disco_it = disco.discover(&Descriptor {
|
||||
family: Some("Apple Color Emoji".into()),
|
||||
..Default::default()
|
||||
})?;
|
||||
if let Some(face) = disco_it.next()? {
|
||||
c.add_deferred(
|
||||
face,
|
||||
AddOptions {
|
||||
style: Style::Regular,
|
||||
fallback: true,
|
||||
// No size adjustment for emojis.
|
||||
size_adjustment: SizeAdjustment::None,
|
||||
},
|
||||
)?;
|
||||
}
|
||||
}
|
||||
|
||||
// Emoji fallback. We don't include this on Mac since Mac is expected
|
||||
// to always have the Apple Emoji available on the system.
|
||||
#[cfg(not(font_coretext))]
|
||||
{
|
||||
c.add(
|
||||
Face::init(&self.font_lib, FontData::Static(embedded::EMOJI), face_opts)?,
|
||||
// No size adjustment for emojis.
|
||||
fallback(Style::Regular, SizeAdjustment::None),
|
||||
)?;
|
||||
c.add(
|
||||
Face::init(
|
||||
&self.font_lib,
|
||||
FontData::Static(embedded::EMOJI_TEXT),
|
||||
face_opts,
|
||||
)?,
|
||||
fallback(Style::Regular, SizeAdjustment::None),
|
||||
)?;
|
||||
}
|
||||
|
||||
Ok(c)
|
||||
}
|
||||
@@ -361,8 +390,8 @@ impl SharedGridSet {
|
||||
/// Initialize once and return the font discovery mechanism. This remains
|
||||
/// initialized throughout the lifetime of the application because some
|
||||
/// font discovery mechanisms (i.e. fontconfig) are unsafe to reinit.
|
||||
fn discover(inner: &mut Inner) -> &Fontconfig {
|
||||
inner.font_discover.get_or_insert_with(Fontconfig::init)
|
||||
fn discover(inner: &mut Inner) -> &Discover {
|
||||
inner.font_discover.get_or_insert_with(Discover::init)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user