refactor(config): parse config values from raw bytes like Zig
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
This commit is contained in:
1 parent
70c250cf2d
commit
6f9b3129e1
100 files changed
+2310
-1054
No files matched your search
@@ -251,7 +251,9 @@ impl SharedGridSet {
|
||||
|
||||
log::warn!(
|
||||
"font-family {style:?} not found: {}",
|
||||
desc.family.as_deref().unwrap_or("")
|
||||
desc.family
|
||||
.as_ref()
|
||||
.map_or("", ghostty_os::osbytes::EncodedOs::as_encoded)
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -501,8 +503,8 @@ impl Key {
|
||||
let mut descriptors: Vec<Descriptor> = Vec::new();
|
||||
for family in &config.font_family.list {
|
||||
descriptors.push(Descriptor {
|
||||
family: Some(ghostty_os::osbytes::config_str_to_text(family)),
|
||||
style: config.font_style.name_value().map(str::to_string),
|
||||
family: Some(family.clone()),
|
||||
style: config.font_style.name_value().cloned(),
|
||||
size: font_size.points,
|
||||
variations: config.font_variation.list.clone(),
|
||||
..Descriptor::default()
|
||||
@@ -518,9 +520,9 @@ impl Key {
|
||||
// no results would be found if we restrict to ALSO searching for
|
||||
// italic.
|
||||
for family in &config.font_family_bold.list {
|
||||
let style = config.font_style_bold.name_value().map(str::to_string);
|
||||
let style = config.font_style_bold.name_value().cloned();
|
||||
descriptors.push(Descriptor {
|
||||
family: Some(ghostty_os::osbytes::config_str_to_text(family)),
|
||||
family: Some(family.clone()),
|
||||
bold: style.is_none(),
|
||||
style,
|
||||
size: font_size.points,
|
||||
@@ -529,9 +531,9 @@ impl Key {
|
||||
});
|
||||
}
|
||||
for family in &config.font_family_italic.list {
|
||||
let style = config.font_style_italic.name_value().map(str::to_string);
|
||||
let style = config.font_style_italic.name_value().cloned();
|
||||
descriptors.push(Descriptor {
|
||||
family: Some(ghostty_os::osbytes::config_str_to_text(family)),
|
||||
family: Some(family.clone()),
|
||||
italic: style.is_none(),
|
||||
style,
|
||||
size: font_size.points,
|
||||
@@ -540,12 +542,9 @@ impl Key {
|
||||
});
|
||||
}
|
||||
for family in &config.font_family_bold_italic.list {
|
||||
let style = config
|
||||
.font_style_bold_italic
|
||||
.name_value()
|
||||
.map(str::to_string);
|
||||
let style = config.font_style_bold_italic.name_value().cloned();
|
||||
descriptors.push(Descriptor {
|
||||
family: Some(ghostty_os::osbytes::config_str_to_text(family)),
|
||||
family: Some(family.clone()),
|
||||
bold: style.is_none(),
|
||||
italic: style.is_none(),
|
||||
style,
|
||||
|
||||
Reference in new issue
Block a user