fix(config): match Zig's numeric grammar, NUL handling and diagnostics

Resolves the 6 differential gap groups in docs/rewrite/notes/review-
rv9-codex.md (details in final-Z11.md):
- ghostty_os::zig_fmt ports std.fmt.parseInt/parseUnsigned/parseFloat
  (underscores, 0x/0o/0b prefixes, hex floats, inf/nan) with the Zig std
  tests and replaces every int/float parse in config, keybind
  parameters, ssh-cache and desktop detection.
- Interior NUL no longer panics in font names and ends C strings like
  Zig's backing bytes (fontconfig, C config getters, title actions,
  clipboard callback, relative paths, config-file, shaders, background
  image, GTK CSS).
- GTK new-window arguments are trimmed of ASCII whitespace only.
- Command tokenization uses a port of std.process.ArgIteratorGeneral
  (incl. CR/LF separators) with its std tests.
- UTF-8 validation happens where Zig's field parsers do it, so error
  kinds match (metric modifiers, quick-terminal size, link, ...).

A scripted differential run of 202 fields x ~220 hostile/valid values
against /usr/bin/ghostty (+validate-config and +show-config: exit code,
stdout, stderr) now has zero mismatches besides build-specific defaults
(theme resources path, auto-update-channel, gtk-opengl-debug); it also
surfaced and fixed background-blur failure state, NaN formatting and
NaN/-0 finalize clamps. Regression tests: ghostty-config/tests/
zig_parity.rs.

Test Plan:
- cargo test --workspace --no-fail-fast (3456 passed, exit 0)
- just check-macos (both), just check-windows, just check-wasm
This commit is contained in:
ddidderr committed 2026-10-12 12:35:37 +02:00
1 parent 7480f99d91
commit 79a7fd4f76
26 files changed
+1835 -228

No files matched your search

+15 -9
View File
@@ -30,13 +30,18 @@ impl MetricModifier {
/// Parses the modifier value. If the value ends in "%" it is assumed
/// to be a percent, otherwise the value is parsed as an integer.
pub fn parse(input: &str) -> Result<MetricModifier, ArgError> {
Self::parse_bytes(input.as_bytes())
}
/// [`MetricModifier::parse`] over the original bytes (Zig never
/// validates UTF-8; every failure is `InvalidFormat`).
pub fn parse_bytes(input: &[u8]) -> Result<MetricModifier, ArgError> {
if input.is_empty() {
return Err(ArgError::other("InvalidFormat"));
}
if let Some(num) = input.strip_suffix('%') {
let mut percent = num
.parse::<f64>()
if let Some(num) = input.strip_suffix(b"%") {
let mut percent = ghostty_os::zig_fmt::parse_float::<f64>(num)
.map_err(|_| ArgError::other("InvalidFormat"))?;
percent /= 100.0;
@@ -46,15 +51,14 @@ impl MetricModifier {
return Ok(MetricModifier::Percent(1.0 + percent));
}
input
.parse::<i32>()
ghostty_os::zig_fmt::parse_int::<i32>(input, 10)
.map(MetricModifier::Absolute)
.map_err(|_| ArgError::other("InvalidFormat"))
}
/// So it works with the config framework.
pub fn parse_cli_value(input: Option<&str>) -> Result<MetricModifier, ArgError> {
Self::parse(input.ok_or(ArgError::ValueRequired)?)
pub fn parse_cli_value(input: Option<&[u8]>) -> Result<MetricModifier, ArgError> {
Self::parse_bytes(input.ok_or(ArgError::ValueRequired)?)
}
/// Apply a modifier to an integer value (saturating, clamped at zero for
@@ -100,14 +104,16 @@ impl MetricModifier {
impl ConfigField for MetricModifier {
fn parse_bytes(&mut self, value: Option<&[u8]>) -> Result<(), ArgError> {
let value = crate::cli_args::text_value(value)?;
*self = Self::parse_cli_value(value)?;
Ok(())
}
fn format_entry(&self, f: &mut EntryFormatter<'_>) -> fmt::Result {
let s = match self {
MetricModifier::Percent(v) => format!("{}%", (v - 1.0) * 100.0),
MetricModifier::Percent(v) => format!(
"{}%",
ghostty_os::zig_fmt::format_float_d((v - 1.0) * 100.0)
),
MetricModifier::Absolute(v) => format!("{v}"),
};
f.format_entry(&s)