ddidderr
6f9b3129e1
Zig parses config values (cli/args.zig, Config.zig field parsers, config/string.zig) from raw byte slices, and each field type decides whether it requires UTF-8 (InvalidValue otherwise) or stores bytes. The port escape-encoded raw bytes into Strings at the line reader and let fields parse the escaped text, so fields could observe encoding artifacts; successive audits kept finding such leaks (RV5-RV8). Field parsers now receive the original bytes: text fields validate UTF-8 where Zig does, byte/path fields store bytes (EncodedOs/OsString). This resolves all 9 RV8 findings (docs/rewrite/notes/review-rv8-codex.md), each with a regression test: Windows path conversion fails with BadPathName instead of substituting U+FFFD; Windows process launch uses strict UTF-8 like Zig's Command; the WTF-8 decoder accepts paired- surrogate encodings like Zig; literal U+FDD0 Unicode key triggers; selection-word-chars and clipboard-codepoint-map reject invalid UTF-8; font style / codepoint-map family names use original bytes; C title actions forward bytes; D-Bus new-window/Flatpak conversions match Zig. Design, sweep and validation: docs/rewrite/notes/final-bytes-refactor.md. Also moves the bundled iTerm2-Color-Schemes license out of resources/themes/ so +list-themes no longer lists it as a theme (output is now byte-identical to Ghostty 1.3.1). Done by Codex (gpt-6-astra), reviewed and verified by the orchestrator. Test Plan: - cargo test --workspace --no-fail-fast (3428 passed, exit 0) - just check-macos (both), just check-windows, just check-wasm - +show-config --default --docs, +list-keybinds, +list-actions --docs, +list-themes --plain compared with /usr/bin/ghostty
64 lines
2.5 KiB
Rust
64 lines
2.5 KiB
Rust
//! Shaping types shared by all shapers. Port of `font/shape.zig`.
|
|
//!
|
|
//! The shaper implementation for the Linux backend is HarfBuzz
|
|
//! (`crate::shaper::harfbuzz::Shaper`), for the macOS backend CoreText
|
|
//! (`crate::shaper::coretext::Shaper`).
|
|
|
|
#[cfg(font_coretext_shaper)]
|
|
pub use crate::shaper::coretext;
|
|
#[cfg(font_coretext_shaper)]
|
|
pub use crate::shaper::coretext::{ShapeError, ShapeRunError, Shaper};
|
|
pub use crate::shaper::feature::{DEFAULT_FEATURES, Feature, FeatureList};
|
|
#[cfg(font_harfbuzz)]
|
|
pub use crate::shaper::harfbuzz;
|
|
/// Shaper implementation for our compile options (backend
|
|
/// `fontconfig_freetype`, `coretext_freetype`, `coretext_harfbuzz` =>
|
|
/// HarfBuzz; `coretext` => CoreText; `coretext_noshape` => no-op).
|
|
#[cfg(font_harfbuzz)]
|
|
pub use crate::shaper::harfbuzz::{ShapeError, ShapeRunError, Shaper};
|
|
#[cfg(font_noshape)]
|
|
pub use crate::shaper::noop::{ShapeError, ShapeRunError, Shaper};
|
|
/// Shaper implementation for the `web_canvas` backend (wasm32).
|
|
#[cfg(target_arch = "wasm32")]
|
|
pub use crate::shaper::web_canvas::Shaper;
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
pub use crate::shaper::{
|
|
cache::Cache,
|
|
noop,
|
|
run::{RunIterator, RunIteratorHook, RunOptions, TextRun},
|
|
};
|
|
|
|
/// A cell is a single single within a terminal that should be rendered
|
|
/// for a shaping call. Note all terminal cells may be present; only
|
|
/// cells that have a glyph that needs to be rendered.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
|
pub struct Cell {
|
|
/// The X position of this shaper cell relative to the offset of the
|
|
/// run. Because runs are always within a single row, it is expected
|
|
/// that the caller can reconstruct the full position of the cell by
|
|
/// using the known Y position of the cell and adding the X position
|
|
/// to the run offset.
|
|
pub x: u16,
|
|
|
|
/// An additional offset to apply to the rendering.
|
|
pub x_offset: i16,
|
|
pub y_offset: i16,
|
|
|
|
/// The glyph index for this cell. The font index to use alongside
|
|
/// this cell is available in the text run. This glyph index is only
|
|
/// valid for a given GroupCache and FontIndex that was used to create
|
|
/// the runs.
|
|
pub glyph_index: u32,
|
|
}
|
|
|
|
/// Options for shapers.
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct Options {
|
|
/// Font features to use when shaping.
|
|
///
|
|
/// Note: eventually, this will move to font.Face probably as we may
|
|
/// want to support per-face feature configuration. For now, we only
|
|
/// support applying features globally.
|
|
pub features: Vec<ghostty_os::osbytes::EncodedOs>,
|
|
}
|