From 8803dca5516ea528f29af4e712c9a2fcfda9c210 Mon Sep 17 00:00:00 2001 From: Nathan <39394314+fuddlesworth@users.noreply.github.com> Date: Thu, 21 May 2026 13:21:51 -0500 Subject: [PATCH] =?UTF-8?q?Revert=20"rebrand=20libghostty=20CLI=20strings:?= =?UTF-8?q?=20Ghostty=20=E2=86=92=20Ghastty"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cli/action.zig | 2 +- src/cli/boo.zig | 2 +- src/cli/edit_config.zig | 12 +- src/cli/explain_config.zig | 8 +- src/cli/help.zig | 15 +- src/cli/list_actions.zig | 2 +- src/cli/list_colors.zig | 2 +- src/cli/list_fonts.zig | 12 +- src/cli/list_keybinds.zig | 4 +- src/cli/list_themes.zig | 24 +-- src/cli/new_window.zig | 30 +-- src/cli/show_config.zig | 4 +- src/cli/show_face.zig | 12 +- src/cli/ssh_cache.zig | 6 +- src/cli/toggle_quick_terminal.zig | 10 +- src/cli/validate_config.zig | 2 +- src/cli/version.zig | 6 +- src/config/Config.zig | 312 +++++++++++++++--------------- src/input/Binding.zig | 36 ++-- src/input/command.zig | 6 +- src/main_c.zig | 8 +- src/main_ghostty.zig | 20 +- 22 files changed, 272 insertions(+), 263 deletions(-) diff --git a/src/cli/action.zig b/src/cli/action.zig index 9d3a9d580..41173a9f1 100644 --- a/src/cli/action.zig +++ b/src/cli/action.zig @@ -73,7 +73,7 @@ pub fn SpecialCase(comptime E: type) type { /// If there is no pending action (we haven't seen an action yet) /// then we should return no action. This is kind of weird but is - /// a special case to allow "-e" in Ghastty. + /// a special case to allow "-e" in Ghostty. abort_if_no_action, }; } diff --git a/src/cli/boo.zig b/src/cli/boo.zig index d8ff16593..2834eadbd 100644 --- a/src/cli/boo.zig +++ b/src/cli/boo.zig @@ -171,7 +171,7 @@ const Boo = struct { } }; -/// The `boo` command is used to display the animation from the Ghastty website in the terminal +/// The `boo` command is used to display the animation from the Ghostty website in the terminal pub fn run(gpa: Allocator) !u8 { // Disable on non-desktop systems. switch (builtin.os.tag) { diff --git a/src/cli/edit_config.zig b/src/cli/edit_config.zig index 42a34b853..c08651a06 100644 --- a/src/cli/edit_config.zig +++ b/src/cli/edit_config.zig @@ -20,13 +20,13 @@ pub const Options = struct { } }; -/// The `edit-config` command opens the Ghastty configuration file in the +/// The `edit-config` command opens the Ghostty configuration file in the /// editor specified by the `$VISUAL` or `$EDITOR` environment variables. /// /// IMPORTANT: This command will not reload the configuration after /// editing. You will need to manually reload the configuration using the -/// application menu, configured keybind, or by restarting Ghastty. We -/// plan to auto-reload in the future, but Ghastty isn't capable of +/// application menu, configured keybind, or by restarting Ghostty. We +/// plan to auto-reload in the future, but Ghostty isn't capable of /// this yet. /// /// The filepath opened is the default user-specific configuration @@ -79,7 +79,7 @@ fn runInner(alloc: Allocator, stderr: *std.Io.Writer) !u8 { // We don't currently support Windows because we use the exec syscall. if (comptime builtin.os.tag == .windows) { try stderr.print( - \\The `ghastty +edit-config` command is not supported on Windows. + \\The `ghostty +edit-config` command is not supported on Windows. \\Please edit the configuration file manually at the following path: \\ \\{s} @@ -113,7 +113,7 @@ fn runInner(alloc: Allocator, stderr: *std.Io.Writer) !u8 { if (editor.len == 0) { try stderr.print( \\The $EDITOR or $VISUAL environment variable is not set or is empty. - \\This environment variable is required to edit the Ghastty configuration + \\This environment variable is required to edit the Ghostty configuration \\via this CLI command. \\ \\Please set the environment variable to your preferred terminal @@ -154,7 +154,7 @@ fn runInner(alloc: Allocator, stderr: *std.Io.Writer) !u8 { // We require libc because we want to use std.c.environ for envp // and not have to build that ourselves. We can remove this - // limitation later but Ghastty already heavily requires libc + // limitation later but Ghostty already heavily requires libc // so this is not a big deal. comptime assert(builtin.link_libc); diff --git a/src/cli/explain_config.zig b/src/cli/explain_config.zig index 227805551..4f034afef 100644 --- a/src/cli/explain_config.zig +++ b/src/cli/explain_config.zig @@ -31,7 +31,7 @@ pub const Options = struct { }; /// The `explain-config` command prints the documentation for a single -/// Ghastty configuration option or keybind action. +/// Ghostty configuration option or keybind action. /// /// Examples: /// @@ -78,9 +78,9 @@ pub fn run(alloc: Allocator) !u8 { var stderr: std.fs.File = .stderr(); var buffer: [4096]u8 = undefined; var stderr_writer = stderr.writer(&buffer); - try stderr_writer.interface.writeAll("Usage: ghastty +explain-config