ddidderr
452b782149
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)
54 lines
1.3 KiB
Rust
54 lines
1.3 KiB
Rust
//! A noop implementation of the keymap interface so that the embedded
|
|
//! library can compile on non-macOS platforms. Port of
|
|
//! `input/KeymapNoop.zig`.
|
|
|
|
use crate::Mods;
|
|
|
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
|
|
pub struct State;
|
|
|
|
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
|
pub struct Translation {
|
|
pub text: String,
|
|
pub composing: bool,
|
|
pub mods: Mods,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy, Default)]
|
|
pub struct Keymap;
|
|
|
|
impl Keymap {
|
|
#[allow(clippy::unnecessary_wraps)]
|
|
pub fn new() -> Result<Keymap, std::convert::Infallible> {
|
|
Ok(Keymap)
|
|
}
|
|
|
|
#[allow(clippy::unnecessary_wraps, clippy::unused_self)]
|
|
pub fn reload(&mut self) -> Result<(), std::convert::Infallible> {
|
|
Ok(())
|
|
}
|
|
|
|
#[allow(clippy::unnecessary_wraps, clippy::unused_self)]
|
|
pub fn translate(
|
|
&self,
|
|
_state: &mut State,
|
|
_code: u16,
|
|
_mods: Mods,
|
|
) -> Result<Translation, std::convert::Infallible> {
|
|
Ok(Translation::default())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[allow(clippy::unwrap_used)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn noop_translate_is_empty() {
|
|
let km = Keymap::new().unwrap();
|
|
let t = km.translate(&mut State, 0, Mods::default()).unwrap();
|
|
assert_eq!(t, Translation::default());
|
|
}
|
|
}
|