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
3c8fae1089
commit
452b782149
124 files changed
+14936
-1242
No files matched your search
@@ -27,17 +27,22 @@ use ghostty_apprt::surface::Message as SurfaceMessage;
|
||||
use ghostty_datastruct::blocking_queue::Timeout;
|
||||
use ghostty_renderer::size::Size;
|
||||
use ghostty_vt::{csi, modes::Mode};
|
||||
#[cfg(unix)]
|
||||
use rustix::event::{PollFd, PollFlags};
|
||||
|
||||
use crate::{
|
||||
backend::ThreadData as BackendThreadData,
|
||||
exec,
|
||||
message::Message,
|
||||
state::SharedStateExt,
|
||||
termio::{Error, Termio, ThreadData},
|
||||
wakeup::Wakeup,
|
||||
};
|
||||
|
||||
/// The Windows event loop (`WaitForMultipleObjects`).
|
||||
#[cfg(windows)]
|
||||
#[path = "thread_windows.rs"]
|
||||
mod windows_loop;
|
||||
|
||||
/// The number of milliseconds to coalesce certain messages like resize for.
|
||||
/// Not all message types are coalesced.
|
||||
pub const COALESCE_MIN_MS: u64 = 25;
|
||||
@@ -81,6 +86,9 @@ pub struct Thread {
|
||||
sync_reset_deadline: Option<Instant>,
|
||||
|
||||
flags: Flags,
|
||||
|
||||
/// The surface dimensions recorded in crash reports.
|
||||
pub crash_dims: Option<std::sync::Arc<ghostty_crash::SurfaceDims>>,
|
||||
}
|
||||
|
||||
impl Thread {
|
||||
@@ -96,6 +104,7 @@ impl Thread {
|
||||
coalesce_resize: None,
|
||||
sync_reset_deadline: None,
|
||||
flags: Flags::default(),
|
||||
crash_dims: None,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -109,6 +118,10 @@ impl Thread {
|
||||
/// once the stop handle was notified; dropping the termio afterwards
|
||||
/// cleans everything up.
|
||||
pub fn thread_main(mut self, mut io: Termio) {
|
||||
// Setup our crash metadata
|
||||
let _crash =
|
||||
ghostty_crash::ThreadGuard::new(ghostty_crash::ThreadType::Io, self.crash_dims.clone());
|
||||
|
||||
// Call child function so we can use errors...
|
||||
let result = self.thread_main_(&mut io);
|
||||
if let Err(err) = result {
|
||||
@@ -140,6 +153,7 @@ impl Thread {
|
||||
}
|
||||
|
||||
/// After an abnormal failure: discard messages until the stop signal.
|
||||
#[cfg(unix)]
|
||||
fn drain_until_stop(&mut self, io: &Termio) {
|
||||
let mailbox = io.mailbox().clone();
|
||||
loop {
|
||||
@@ -183,6 +197,7 @@ impl Thread {
|
||||
}
|
||||
|
||||
/// The event loop. Returns when stopped.
|
||||
#[cfg(unix)]
|
||||
fn run(&mut self, io: &mut Termio, td: &mut ThreadData) {
|
||||
let mailbox = io.mailbox().clone();
|
||||
|
||||
@@ -386,7 +401,8 @@ fn report_start_error(io: &Termio, err: &Error) {
|
||||
t.modes.set(Mode::CursorVisible, false);
|
||||
|
||||
let msg: String = match err {
|
||||
Error::Exec(exec::Error::Pty(crate::pty::Error::OpenptyFailed)) => "\
|
||||
#[cfg(unix)]
|
||||
Error::Exec(crate::exec::Error::Pty(crate::pty::Error::OpenptyFailed)) => "\
|
||||
Your system cannot allocate any more pty devices.
|
||||
|
||||
Ghostty requires a pty device to launch a new terminal.
|
||||
|
||||
Reference in new issue
Block a user