ddidderr
7b408257c4
Completes the font engine port: - shaper/run.rs ports run.zig: the RunIterator over terminal rows that splits text runs at style/face boundaries, selection and cursor, handles graphemes and ligatures; Shaper::shape_run shapes a run. - shared_grid_set.rs ports SharedGridSet.zig: grids keyed by a config derived key, handed out as Arc<SharedGrid>. - Font-related types now have one canonical definition in ghostty-config (Variation, Descriptor, CodepointMap, metric modifiers, freetype load flags, synthetic style, shaping break) which the font crate re-exports. MetricModifier::apply_i32 now saturates to -i32::MAX like Zig. - The 23 terminal-driven harfbuzz shaper tests are ported, printing via Screen until Terminal lands. Test Plan: - cargo test -p ghostty-font (157 passed, 3 ignored - also skipped in Zig); Devanagari/Chakma/Bengali tests return early without system fonts - cargo test -p ghostty-config (255 passed)
67 lines
2.0 KiB
Rust
67 lines
2.0 KiB
Rust
//! CodepointMap is a map of codepoints to a discovery descriptor of a font
|
|
//! to use for that codepoint. If the descriptor doesn't return any matching
|
|
//! font, the codepoint is rendered using the default font.
|
|
//! Port of `font/CodepointMap.zig`.
|
|
|
|
//!
|
|
//! The canonical definition lives in `ghostty-config` (the `font-codepoint-map`
|
|
//! option parses straight into it); it is re-exported here.
|
|
|
|
pub use ghostty_config::font_types::CodepointMap;
|
|
pub use ghostty_config::font_types::CodepointMapEntry as Entry;
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use ghostty_config::font_types::Descriptor;
|
|
|
|
fn desc(family: &str) -> Descriptor {
|
|
Descriptor {
|
|
family: Some(family.to_string()),
|
|
..Default::default()
|
|
}
|
|
}
|
|
|
|
fn entry(a: u32, b: u32, family: &str) -> Entry {
|
|
Entry {
|
|
range: [a, b],
|
|
descriptor: desc(family),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn codepointmap() {
|
|
let mut m = CodepointMap::default();
|
|
|
|
// Exact range
|
|
assert!(m.get(1).is_none());
|
|
m.add(entry(1, 1, "A"));
|
|
assert_eq!("A", m.get(1).unwrap().family.as_deref().unwrap());
|
|
|
|
// Later entry takes priority
|
|
m.add(entry(1, 2, "B"));
|
|
assert_eq!("B", m.get(1).unwrap().family.as_deref().unwrap());
|
|
|
|
// Non-matching
|
|
assert!(m.get(0).is_none());
|
|
assert!(m.get(3).is_none());
|
|
|
|
m.add(entry(3, 4, "C"));
|
|
m.add(entry(5, 6, "D"));
|
|
assert_eq!("C", m.get(3).unwrap().family.as_deref().unwrap());
|
|
assert_eq!("B", m.get(1).unwrap().family.as_deref().unwrap());
|
|
}
|
|
|
|
#[test]
|
|
fn hashcode_depends_on_contents() {
|
|
let mut a = CodepointMap::default();
|
|
let mut b = CodepointMap::default();
|
|
assert_eq!(a.hashcode(), b.hashcode());
|
|
a.add(entry(1, 2, "A"));
|
|
assert_ne!(a.hashcode(), b.hashcode());
|
|
b.add(entry(1, 2, "A"));
|
|
assert_eq!(a.hashcode(), b.hashcode());
|
|
b.add(entry(3, 3, "B"));
|
|
assert_ne!(a.hashcode(), b.hashcode());
|
|
}
|
|
}
|