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,4 +1,16 @@
|
||||
use std::{io, os::unix::fs::PermissionsExt};
|
||||
use std::io;
|
||||
#[cfg(unix)]
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
/// `std.fs.path.delimiter` / `sep`.
|
||||
#[cfg(windows)]
|
||||
const DELIMITER: char = ';';
|
||||
#[cfg(not(windows))]
|
||||
const DELIMITER: char = ':';
|
||||
#[cfg(windows)]
|
||||
const SEP: char = '\\';
|
||||
#[cfg(not(windows))]
|
||||
const SEP: char = '/';
|
||||
|
||||
/// Equivalent of `std.fs.max_path_bytes` on Linux.
|
||||
const MAX_PATH_BYTES: usize = 4096;
|
||||
@@ -27,14 +39,14 @@ pub fn expand(cmd: &str) -> Result<Option<String>, Error> {
|
||||
let path_var = path_var.to_string_lossy();
|
||||
|
||||
let mut seen_eacces = false;
|
||||
for search_path in path_var.split(':').filter(|s| !s.is_empty()) {
|
||||
for search_path in path_var.split(DELIMITER).filter(|s| !s.is_empty()) {
|
||||
// We need enough space in our path buffer to store this
|
||||
let path_len = search_path.len() + cmd.len() + 1;
|
||||
if MAX_PATH_BYTES < path_len {
|
||||
return Err(Error::PathTooLong);
|
||||
}
|
||||
|
||||
let full_path = format!("{search_path}/{cmd}");
|
||||
let full_path = format!("{search_path}{SEP}{cmd}");
|
||||
|
||||
// Stat it
|
||||
let f = match std::fs::File::open(&full_path) {
|
||||
@@ -51,7 +63,7 @@ pub fn expand(cmd: &str) -> Result<Option<String>, Error> {
|
||||
},
|
||||
};
|
||||
let meta = f.metadata()?;
|
||||
if !meta.is_dir() && is_executable(meta.permissions().mode()) {
|
||||
if !meta.is_dir() && is_executable(&meta) {
|
||||
return Ok(Some(full_path));
|
||||
}
|
||||
}
|
||||
@@ -63,8 +75,14 @@ pub fn expand(cmd: &str) -> Result<Option<String>, Error> {
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
fn is_executable(mode: u32) -> bool {
|
||||
mode & 0o0111 != 0
|
||||
#[cfg(unix)]
|
||||
fn is_executable(meta: &std::fs::Metadata) -> bool {
|
||||
meta.permissions().mode() & 0o0111 != 0
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
fn is_executable(_meta: &std::fs::Metadata) -> bool {
|
||||
true
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -74,8 +92,13 @@ mod tests {
|
||||
// `uname -n` is the *nix equivalent of `hostname.exe` on Windows
|
||||
#[test]
|
||||
fn expand_hostname() {
|
||||
let path = crate::testutil::with_env_lock(|| expand("uname").unwrap().unwrap());
|
||||
assert!(path.len() > "uname".len());
|
||||
let executable = if cfg!(windows) {
|
||||
"hostname.exe"
|
||||
} else {
|
||||
"uname"
|
||||
};
|
||||
let path = crate::testutil::with_env_lock(|| expand(executable).unwrap().unwrap());
|
||||
assert!(path.len() > executable.len());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -91,6 +114,7 @@ mod tests {
|
||||
assert_eq!(path.len(), 7);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn expand_skips_non_executable_and_dirs() {
|
||||
let dir = crate::TempDir::init().unwrap();
|
||||
|
||||
Reference in new issue
Block a user