Merge branch 'grapheme-break' into grapheme-width-changes

build.zig.zon

@@ -116,7 +116,7 @@
         // Other
         .apple_sdk = .{ .path = "./pkg/apple-sdk" },
         .iterm2_themes = .{
-            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251110-150531-d5f3d53/ghostty-themes.tgz",
+            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251124-150533-2b326a8/ghostty-themes.tgz",
             .hash = "N-V-__8AAPZCAwDJ0OsIn2nbr3FMvBw68oiv-hC2pFuY1eLN",
             .lazy = true,
         },

build.zig.zon.json

@@ -51,8 +51,8 @@
   },
   "N-V-__8AAPZCAwDJ0OsIn2nbr3FMvBw68oiv-hC2pFuY1eLN": {
     "name": "iterm2_themes",
-    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251110-150531-d5f3d53/ghostty-themes.tgz",
-    "hash": "sha256-VZq3L/cAAu7kLA5oqJYNjAZApoblfBtAzfdKVOuJPQI="
+    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251124-150533-2b326a8/ghostty-themes.tgz",
+    "hash": "sha256-5mmXW7d9SkesHyIwUBlWmyGtOWf6wu0S6zkHe93FVLM="
   },
   "N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x": {
     "name": "jetbrains_mono",

build.zig.zon.nix

@@ -166,8 +166,8 @@ in
       name = "N-V-__8AAPZCAwDJ0OsIn2nbr3FMvBw68oiv-hC2pFuY1eLN";
       path = fetchZigArtifact {
         name = "iterm2_themes";
-        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251110-150531-d5f3d53/ghostty-themes.tgz";
-        hash = "sha256-VZq3L/cAAu7kLA5oqJYNjAZApoblfBtAzfdKVOuJPQI=";
+        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251124-150533-2b326a8/ghostty-themes.tgz";
+        hash = "sha256-5mmXW7d9SkesHyIwUBlWmyGtOWf6wu0S6zkHe93FVLM=";
       };
     }
     {

build.zig.zon.txt

@@ -29,7 +29,7 @@ https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e
 https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz
 https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz
 https://github.com/jacobsandlund/uucode/archive/31655fba3c638229989cc524363ef5e3c7b580c1.tar.gz
-https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251110-150531-d5f3d53/ghostty-themes.tgz
+https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251124-150533-2b326a8/ghostty-themes.tgz
 https://github.com/natecraddock/zf/archive/3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz
 https://github.com/rockorager/libvaxis/archive/7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz
 https://github.com/vancluever/z2d/archive/refs/tags/v0.9.0.tar.gz

flatpak/zig-packages.json

@@ -61,9 +61,9 @@
   },
   {
     "type": "archive",
-    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251110-150531-d5f3d53/ghostty-themes.tgz",
+    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20251124-150533-2b326a8/ghostty-themes.tgz",
     "dest": "vendor/p/N-V-__8AAPZCAwDJ0OsIn2nbr3FMvBw68oiv-hC2pFuY1eLN",
-    "sha256": "559ab72ff70002eee42c0e68a8960d8c0640a686e57c1b40cdf74a54eb893d02"
+    "sha256": "e669975bb77d4a47ac1f22305019569b21ad3967fac2ed12eb39077bddc554b3"
   },
   {
     "type": "archive",

macos/Sources/App/macOS/AppDelegate.swift

@@ -1184,10 +1184,19 @@ class AppDelegate: NSObject,
             // want to bring back these windows if we remove the toggle.
             //
             // We also ignore fullscreen windows because they don't hide anyways.
-            self.hiddenWindows = NSApp.windows.filter {
+            var visibleWindows = [Weak<NSWindow>]()
+            NSApp.windows.filter {
                 $0.isVisible &&
                 !$0.styleMask.contains(.fullScreen)
-            }.map { Weak($0) }
+            }.forEach { window in
+                // We only keep track of selectedWindow if it's in a tabGroup,
+                // so we can keep its selection state when restoring
+                let windowToHide = window.tabGroup?.selectedWindow ?? window
+                if !visibleWindows.contains(where: { $0.value === windowToHide }) {
+                    visibleWindows.append(Weak(windowToHide))
+                }
+            }
+            self.hiddenWindows = visibleWindows
         }
 
         func restore() {

macos/Sources/Features/Terminal/TerminalController.swift

@@ -508,55 +508,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         window.syncAppearance(surfaceConfig)
     }
 
-    /// Returns the default size of the window. This is contextual based on the focused surface because
-    /// the focused surface may specify a different default size than others.
-    private var defaultSize: NSRect? {
-        guard let screen = window?.screen ?? NSScreen.main else { return nil }
-
-        if derivedConfig.maximize {
-            return screen.visibleFrame
-        } else if let focusedSurface,
-                  let initialSize = focusedSurface.initialSize {
-            // Get the current frame of the window
-            guard var frame = window?.frame else { return nil }
-
-            // Calculate the chrome size (window size minus view size)
-            let chromeWidth = frame.size.width - focusedSurface.frame.size.width
-            let chromeHeight = frame.size.height - focusedSurface.frame.size.height
-
-            // Calculate the new width and height, clamping to the screen's size
-            let newWidth = min(initialSize.width + chromeWidth, screen.visibleFrame.width)
-            let newHeight = min(initialSize.height + chromeHeight, screen.visibleFrame.height)
-
-            // Update the frame size while keeping the window's position intact
-            frame.size.width = newWidth
-            frame.size.height = newHeight
-
-            // Ensure the window doesn't go outside the screen boundaries
-            frame.origin.x = max(screen.frame.origin.x, min(frame.origin.x, screen.frame.maxX - newWidth))
-            frame.origin.y = max(screen.frame.origin.y, min(frame.origin.y, screen.frame.maxY - newHeight))
-
-            return adjustForWindowPosition(frame: frame, on: screen)
-        }
-
-        guard let initialFrame else { return nil }
-        guard var frame = window?.frame else { return nil }
-
-        // Calculate the new width and height, clamping to the screen's size
-        let newWidth = min(initialFrame.size.width, screen.visibleFrame.width)
-        let newHeight = min(initialFrame.size.height, screen.visibleFrame.height)
-
-        // Update the frame size while keeping the window's position intact
-        frame.size.width = newWidth
-        frame.size.height = newHeight
-
-        // Ensure the window doesn't go outside the screen boundaries
-        frame.origin.x = max(screen.frame.origin.x, min(frame.origin.x, screen.frame.maxX - newWidth))
-        frame.origin.y = max(screen.frame.origin.y, min(frame.origin.y, screen.frame.maxY - newHeight))
-
-        return adjustForWindowPosition(frame: frame, on: screen)
-    }
-    
     /// Adjusts the given frame for the configured window position.
     func adjustForWindowPosition(frame: NSRect, on screen: NSScreen) -> NSRect {
         guard let x = derivedConfig.windowPositionX else { return frame }
@@ -922,9 +873,6 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
         super.windowDidLoad()
         guard let window else { return }
 
-        // Store our initial frame so we can know our default later.
-        initialFrame = window.frame
-
         // I copy this because we may change the source in the future but also because
         // I regularly audit our codebase for "ghostty.config" access because generally
         // you shouldn't use it. Its safe in this case because for a new window we should
@@ -944,19 +892,38 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
             // If this is our first surface then our focused surface will be nil
             // so we force the focused surface to the leaf.
             focusedSurface = view
-
-            if let defaultSize {
-                window.setFrame(defaultSize, display: true)
-            }
         }
 
         // Initialize our content view to the SwiftUI root
         window.contentView = NSHostingView(rootView: TerminalView(
             ghostty: self.ghostty,
             viewModel: self,
-            delegate: self
+            delegate: self,
         ))
-
+        
+        // If we have a default size, we want to apply it.
+        if let defaultSize {
+            switch (defaultSize) {
+            case .frame:
+                // Frames can be applied immediately
+                defaultSize.apply(to: window)
+                
+            case .contentIntrinsicSize:
+                // Content intrinsic size requires a short delay so that AppKit
+                // can layout our SwiftUI views.
+                DispatchQueue.main.asyncAfter(deadline: .now() + .microseconds(10_000)) { [weak window] in
+                    guard let window else { return }
+                    defaultSize.apply(to: window)
+                }
+            }
+        }
+        
+        // Store our initial frame so we can know our default later. This MUST
+        // be after the defaultSize call above so that we don't re-apply our frame.
+        // Note: we probably want to set this on the first frame change or something
+        // so it respects cascade.
+        initialFrame = window.frame
+        
         // In various situations, macOS automatically tabs new windows. Ghostty handles
         // its own tabbing so we DONT want this behavior. This detects this scenario and undoes
         // it.
@@ -1144,8 +1111,8 @@ class TerminalController: BaseTerminalController, TabGroupCloseCoordinator.Contr
     }
 
     @IBAction func returnToDefaultSize(_ sender: Any?) {
-        guard let defaultSize else { return }
-        window?.setFrame(defaultSize, display: true)
+        guard let window, let defaultSize else { return }
+        defaultSize.apply(to: window)
     }
 
     @IBAction override func closeWindow(_ sender: Any?) {
@@ -1421,19 +1388,68 @@ extension TerminalController {
 
             // If our window is already the default size or we don't have a
             // default size, then disable.
-            guard let defaultSize,
-                  window.frame.size != .init(
-                    width: defaultSize.size.width,
-                    height: defaultSize.size.height
-                  )
-            else {
-                return false
-            }
-
-            return true
+            return defaultSize?.isChanged(for: window) ?? false
 
         default:
             return super.validateMenuItem(item)
         }
     }
 }
+
+// MARK: Default Size
+
+extension TerminalController {
+    /// The possible default sizes for a terminal. The size can't purely be known as a
+    /// window frame because if we set `window-width/height` then it is based
+    /// on content size.
+    enum DefaultSize {
+        /// A frame, set with `window.setFrame`
+        case frame(NSRect)
+        
+        /// A content size, set with `window.setContentSize`
+        case contentIntrinsicSize
+        
+        func isChanged(for window: NSWindow) -> Bool {
+            switch self {
+            case .frame(let rect):
+                return window.frame != rect
+            case .contentIntrinsicSize:
+                guard let view = window.contentView else {
+                    return false
+                }
+                
+                return view.frame.size != view.intrinsicContentSize
+            }
+        }
+        
+        func apply(to window: NSWindow) {
+            switch self {
+            case .frame(let rect):
+                window.setFrame(rect, display: true)
+            case .contentIntrinsicSize:
+                guard let size = window.contentView?.intrinsicContentSize else {
+                    return
+                }
+                
+                window.setContentSize(size)
+                window.constrainToScreen()
+            }
+        }
+    }
+    
+    private var defaultSize: DefaultSize? {
+        if derivedConfig.maximize, let screen = window?.screen ?? NSScreen.main {
+            // Maximize takes priority, we take up the full screen we're on.
+            return .frame(screen.visibleFrame)
+        } else if focusedSurface?.initialSize != nil {
+            // Initial size as requested by the configuration (e.g. `window-width`)
+            // takes next priority.
+            return .contentIntrinsicSize
+        } else if let initialFrame {
+            // The initial frame we had when we started otherwise.
+            return .frame(initialFrame)
+        } else {
+            return nil
+        }
+    }
+}

macos/Sources/Features/Terminal/TerminalView.swift

@@ -45,7 +45,7 @@ struct TerminalView<ViewModel: TerminalViewModel>: View {
 
     // An optional delegate to receive information about terminal changes.
     weak var delegate: (any TerminalViewDelegate)? = nil
-
+    
     // The most recently focused surface, equal to focusedSurface when
     // it is non-nil.
     @State private var lastFocusedSurface: Weak<Ghostty.SurfaceView> = .init()
@@ -100,6 +100,8 @@ struct TerminalView<ViewModel: TerminalViewModel>: View {
                             guard let size = newValue else { return }
                             self.delegate?.cellSizeDidChange(to: size)
                         }
+                        .frame(idealWidth: lastFocusedSurface.value?.initialSize?.width,
+                               idealHeight: lastFocusedSurface.value?.initialSize?.height)
                 }
                 // Ignore safe area to extend up in to the titlebar region if we have the "hidden" titlebar style
                 .ignoresSafeArea(.container, edges: ghostty.config.macosTitlebarStyle == "hidden" ? .top : [])

macos/Sources/Ghostty/SurfaceView.swift

@@ -405,7 +405,7 @@ extension Ghostty {
         
         var body: some View {
             GeometryReader { geo in
-                HStack(spacing: 8) {
+                HStack(spacing: 4) {
                     TextField("Search", text: $searchState.needle)
                     .textFieldStyle(.plain)
                     .frame(width: 180)
@@ -451,7 +451,7 @@ extension Ghostty {
                     }) {
                         Image(systemName: "chevron.up")
                     }
-                    .buttonStyle(.borderless)
+                    .buttonStyle(SearchButtonStyle())
                     
                     Button(action: {
                         guard let surface = surfaceView.surface else { return }
@@ -460,12 +460,12 @@ extension Ghostty {
                     }) {
                         Image(systemName: "chevron.down")
                     }
-                    .buttonStyle(.borderless)
+                    .buttonStyle(SearchButtonStyle())
                     
                     Button(action: onClose) {
                         Image(systemName: "xmark")
                     }
-                    .buttonStyle(.borderless)
+                    .buttonStyle(SearchButtonStyle())
                 }
                 .padding(8)
                 .background(.background)
@@ -556,6 +556,35 @@ extension Ghostty {
                 return point.y < midY ? .topRight : .bottomRight
             }
         }
+        
+        struct SearchButtonStyle: ButtonStyle {
+            @State private var isHovered = false
+            
+            func makeBody(configuration: Configuration) -> some View {
+                configuration.label
+                    .foregroundStyle(isHovered || configuration.isPressed ? .primary : .secondary)
+                    .padding(.horizontal, 2)
+                    .frame(height: 26)
+                    .background(
+                        RoundedRectangle(cornerRadius: 6)
+                            .fill(backgroundColor(isPressed: configuration.isPressed))
+                    )
+                    .onHover { hovering in
+                        isHovered = hovering
+                    }
+                    .backport.pointerStyle(.link)
+            }
+            
+            private func backgroundColor(isPressed: Bool) -> Color {
+                if isPressed {
+                    return Color.primary.opacity(0.2)
+                } else if isHovered {
+                    return Color.primary.opacity(0.1)
+                } else {
+                    return Color.clear
+                }
+            }
+        }
     }
 
     /// A surface is terminology in Ghostty for a terminal surface, or a place where a terminal is actually drawn

macos/Sources/Helpers/Extensions/NSWindow+Extension.swift

@@ -15,4 +15,20 @@ extension NSWindow {
         guard let firstWindow = tabGroup?.windows.first else { return true }
         return firstWindow === self
     }
+
+    /// Adjusts the window origin if necessary to ensure the window remains visible on screen.
+    func constrainToScreen() {
+        guard let screen = screen ?? NSScreen.main else { return }
+        let visibleFrame = screen.visibleFrame
+        var windowFrame = frame
+
+        windowFrame.origin.x = max(visibleFrame.minX,
+            min(windowFrame.origin.x, visibleFrame.maxX - windowFrame.width))
+        windowFrame.origin.y = max(visibleFrame.minY,
+            min(windowFrame.origin.y, visibleFrame.maxY - windowFrame.height))
+
+        if windowFrame.origin != frame.origin {
+            setFrameOrigin(windowFrame.origin)
+        }
+    }
 }

src/App.zig

@@ -7,19 +7,14 @@ const std = @import("std");
 const builtin = @import("builtin");
 const assert = @import("quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const build_config = @import("build_config.zig");
 const apprt = @import("apprt.zig");
 const Surface = @import("Surface.zig");
-const tracy = @import("tracy");
 const input = @import("input.zig");
 const configpkg = @import("config.zig");
 const Config = configpkg.Config;
 const BlockingQueue = @import("datastruct/main.zig").BlockingQueue;
 const renderer = @import("renderer.zig");
 const font = @import("font/main.zig");
-const internal_os = @import("os/main.zig");
-const macos = @import("macos");
-const objc = @import("objc");
 
 const log = std.log.scoped(.app);
 

src/Surface.zig

@@ -26,9 +26,6 @@ const crash = @import("crash/main.zig");
 const unicode = @import("unicode/main.zig");
 const rendererpkg = @import("renderer.zig");
 const termio = @import("termio.zig");
-const objc = @import("objc");
-const imgui = @import("imgui");
-const Pty = @import("pty.zig").Pty;
 const font = @import("font/main.zig");
 const Command = @import("Command.zig");
 const terminal = @import("terminal/main.zig");

src/apprt.zig

@@ -8,8 +8,6 @@
 //! The goal is to have different implementations share as much of the core
 //! logic as possible, and to only reach out to platform-specific implementation
 //! code when absolutely necessary.
-const std = @import("std");
-const builtin = @import("builtin");
 const build_config = @import("build_config.zig");
 
 const structs = @import("apprt/structs.zig");

src/apprt/gtk.zig

@@ -1,5 +1,3 @@
-const internal_os = @import("../os/main.zig");
-
 // The required comptime API for any apprt.
 pub const App = @import("gtk/App.zig");
 pub const Surface = @import("gtk/Surface.zig");

src/apprt/gtk/App.zig

@@ -5,18 +5,13 @@ const App = @This();
 const std = @import("std");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
-const gio = @import("gio");
 const apprt = @import("../../apprt.zig");
 const configpkg = @import("../../config.zig");
-const internal_os = @import("../../os/main.zig");
 const Config = configpkg.Config;
 const CoreApp = @import("../../App.zig");
 
 const Application = @import("class/application.zig").Application;
 const Surface = @import("Surface.zig");
-const gtk_version = @import("gtk_version.zig");
-const adw_version = @import("adw_version.zig");
 const ipcNewWindow = @import("ipc/new_window.zig").newWindow;
 
 const log = std.log.scoped(.gtk);

src/apprt/gtk/cgroup.zig

@@ -1,14 +1,11 @@
 /// Contains all the logic for putting the Ghostty process and
 /// each individual surface into its own cgroup.
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 const gio = @import("gio");
 const glib = @import("glib");
-const gobject = @import("gobject");
 
-const App = @import("App.zig");
 const internal_os = @import("../../os/main.zig");
 
 const log = std.log.scoped(.gtk_systemd_cgroup);

src/apprt/gtk/class/application.zig

@@ -1,7 +1,6 @@
 const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const builtin = @import("builtin");
 const adw = @import("adw");
 const gdk = @import("gdk");
 const gio = @import("gio");
@@ -9,7 +8,6 @@ const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const build_config = @import("../../../build_config.zig");
 const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
 const cgroup = @import("../cgroup.zig");

src/apprt/gtk/class/clipboard_confirmation_dialog.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");

src/apprt/gtk/class/close_confirmation_dialog.zig

@@ -1,13 +1,10 @@
 const std = @import("std");
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
 const i18n = @import("../../../os/main.zig").i18n;
-const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
-const Config = @import("config.zig").Config;
 const Dialog = @import("dialog.zig").Dialog;
 
 const log = std.log.scoped(.gtk_ghostty_close_confirmation_dialog);

src/apprt/gtk/class/config.zig

@@ -1,7 +1,5 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
-const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 

src/apprt/gtk/class/config_errors_dialog.zig

@@ -1,10 +1,8 @@
 const std = @import("std");
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
-const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
 const Config = @import("config.zig").Config;
 const Dialog = @import("dialog.zig").Dialog;

src/apprt/gtk/class/debug_warning.zig

@@ -1,9 +1,7 @@
-const std = @import("std");
 const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const build_config = @import("../../../build_config.zig");
 const adw_version = @import("../adw_version.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;

src/apprt/gtk/class/dialog.zig

@@ -3,10 +3,8 @@ const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const gresource = @import("../build/gresource.zig");
 const adw_version = @import("../adw_version.zig");
 const Common = @import("../class.zig").Common;
-const Config = @import("config.zig").Config;
 
 const log = std.log.scoped(.gtk_ghostty_dialog);
 

src/apprt/gtk/class/global_shortcuts.zig

@@ -1,14 +1,11 @@
 const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const adw = @import("adw");
 const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
-const gtk = @import("gtk");
 
 const Binding = @import("../../../input.zig").Binding;
-const gresource = @import("../build/gresource.zig");
 const key = @import("../key.zig");
 const Common = @import("../class.zig").Common;
 const Application = @import("application.zig").Application;

src/apprt/gtk/class/inspector_widget.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 
-const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 

src/apprt/gtk/class/inspector_window.zig

@@ -2,15 +2,12 @@ const std = @import("std");
 const build_config = @import("../../../build_config.zig");
 
 const adw = @import("adw");
-const gdk = @import("gdk");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
 
-const key = @import("../key.zig");
 const Common = @import("../class.zig").Common;
-const Application = @import("application.zig").Application;
 const Surface = @import("surface.zig").Surface;
 const DebugWarning = @import("debug_warning.zig").DebugWarning;
 const InspectorWidget = @import("inspector_widget.zig").InspectorWidget;

src/apprt/gtk/class/resize_overlay.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");

src/apprt/gtk/class/split_tree.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const build_config = @import("../../../build_config.zig");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const adw = @import("adw");
@@ -8,17 +7,11 @@ const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
-const input = @import("../../../input.zig");
-const CoreSurface = @import("../../../Surface.zig");
-const gtk_version = @import("../gtk_version.zig");
-const adw_version = @import("../adw_version.zig");
 const ext = @import("../ext.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;
 const WeakRef = @import("../weak_ref.zig").WeakRef;
-const Config = @import("config.zig").Config;
 const Application = @import("application.zig").Application;
 const CloseConfirmationDialog = @import("close_confirmation_dialog.zig").CloseConfirmationDialog;
 const Surface = @import("surface.zig").Surface;

src/apprt/gtk/class/surface.zig

@@ -19,7 +19,6 @@ const terminal = @import("../../../terminal/main.zig");
 const CoreSurface = @import("../../../Surface.zig");
 const gresource = @import("../build/gresource.zig");
 const ext = @import("../ext.zig");
-const adw_version = @import("../adw_version.zig");
 const gtk_key = @import("../key.zig");
 const ApprtSurface = @import("../Surface.zig");
 const Common = @import("../class.zig").Common;
@@ -30,7 +29,6 @@ const ChildExited = @import("surface_child_exited.zig").SurfaceChildExited;
 const ClipboardConfirmationDialog = @import("clipboard_confirmation_dialog.zig").ClipboardConfirmationDialog;
 const TitleDialog = @import("surface_title_dialog.zig").SurfaceTitleDialog;
 const Window = @import("window.zig").Window;
-const WeakRef = @import("../weak_ref.zig").WeakRef;
 const InspectorWindow = @import("inspector_window.zig").InspectorWindow;
 const i18n = @import("../../../os/i18n.zig");
 

src/apprt/gtk/class/surface_child_exited.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const glib = @import("glib");
 const gobject = @import("gobject");

src/apprt/gtk/class/surface_scrolled_window.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const gobject = @import("gobject");
 const gtk = @import("gtk");

src/apprt/gtk/class/surface_title_dialog.zig

@@ -6,7 +6,6 @@ const gobject = @import("gobject");
 const gtk = @import("gtk");
 
 const gresource = @import("../build/gresource.zig");
-const adw_version = @import("../adw_version.zig");
 const ext = @import("../ext.zig");
 const Common = @import("../class.zig").Common;
 

src/apprt/gtk/class/tab.zig

@@ -1,19 +1,13 @@
 const std = @import("std");
-const build_config = @import("../../../build_config.zig");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const adw = @import("adw");
 const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");
 
-const i18n = @import("../../../os/main.zig").i18n;
 const apprt = @import("../../../apprt.zig");
-const input = @import("../../../input.zig");
 const CoreSurface = @import("../../../Surface.zig");
 const ext = @import("../ext.zig");
-const gtk_version = @import("../gtk_version.zig");
-const adw_version = @import("../adw_version.zig");
 const gresource = @import("../build/gresource.zig");
 const Common = @import("../class.zig").Common;
 const Config = @import("config.zig").Config;

src/apprt/gtk/class/window.zig

@@ -28,7 +28,6 @@ const Surface = @import("surface.zig").Surface;
 const Tab = @import("tab.zig").Tab;
 const DebugWarning = @import("debug_warning.zig").DebugWarning;
 const CommandPalette = @import("command_palette.zig").CommandPalette;
-const InspectorWindow = @import("inspector_window.zig").InspectorWindow;
 const WeakRef = @import("../weak_ref.zig").WeakRef;
 
 const log = std.log.scoped(.gtk_ghostty_window);

src/apprt/gtk/ext.zig

@@ -7,7 +7,6 @@ const std = @import("std");
 const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 
-const gio = @import("gio");
 const glib = @import("glib");
 const gobject = @import("gobject");
 const gtk = @import("gtk");

src/apprt/gtk/key.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const build_options = @import("build_options");
 
 const gdk = @import("gdk");
 const glib = @import("glib");

src/apprt/gtk/winproto/wayland.zig

@@ -1,7 +1,6 @@
 //! Wayland protocol implementation for the Ghostty GTK apprt.
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const build_options = @import("build_options");
 
 const gdk = @import("gdk");
 const gdk_wayland = @import("gdk_wayland");

src/apprt/gtk/winproto/x11.zig

@@ -1,10 +1,8 @@
 //! X11 window protocol implementation for the Ghostty GTK apprt.
 const std = @import("std");
 const builtin = @import("builtin");
-const build_options = @import("build_options");
 const Allocator = std.mem.Allocator;
 
-const adw = @import("adw");
 const gdk = @import("gdk");
 const gdk_x11 = @import("gdk_x11");
 const glib = @import("glib");

src/benchmark/IsSymbol.zig

@@ -4,7 +4,6 @@
 const IsSymbol = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const Benchmark = @import("Benchmark.zig");

src/build/GhosttyBench.zig

@@ -2,7 +2,6 @@
 const GhosttyBench = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 const SharedDeps = @import("SharedDeps.zig");
 
 steps: []*std.Build.Step.Compile,

src/build/GhosttyFrameData.zig

@@ -3,8 +3,6 @@
 const GhosttyFrameData = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
-const SharedDeps = @import("SharedDeps.zig");
 const DistResource = @import("GhosttyDist.zig").Resource;
 
 /// The output path for the compressed framedata zig file

src/build/GhosttyLibVt.zig

@@ -3,11 +3,7 @@ const GhosttyLibVt = @This();
 const std = @import("std");
 const assert = std.debug.assert;
 const RunStep = std.Build.Step.Run;
-const Config = @import("Config.zig");
 const GhosttyZig = @import("GhosttyZig.zig");
-const SharedDeps = @import("SharedDeps.zig");
-const LibtoolStep = @import("LibtoolStep.zig");
-const LipoStep = @import("LipoStep.zig");
 
 /// The step that generates the file.
 step: *std.Build.Step,

src/build/GhosttyResources.zig

@@ -1,9 +1,7 @@
 const GhosttyResources = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = std.debug.assert;
-const buildpkg = @import("main.zig");
 const Config = @import("Config.zig");
 const RunStep = std.Build.Step.Run;
 const SharedDeps = @import("SharedDeps.zig");

src/build/GhosttyWebdata.zig

@@ -3,7 +3,6 @@
 const GhosttyWebdata = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 const SharedDeps = @import("SharedDeps.zig");
 
 steps: []*std.Build.Step,

src/build/UnicodeTables.zig

@@ -1,7 +1,6 @@
 const UnicodeTables = @This();
 
 const std = @import("std");
-const Config = @import("Config.zig");
 
 /// The exe.
 props_exe: *std.Build.Step.Compile,

src/build/webgen/main_actions.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const help_strings = @import("help_strings");
 const helpgen_actions = @import("../../input/helpgen_actions.zig");
 
 pub fn main() !void {

src/build_config.zig

@@ -9,7 +9,6 @@ const assert = std.debug.assert;
 const apprt = @import("apprt.zig");
 const font = @import("font/main.zig");
 const rendererpkg = @import("renderer.zig");
-const WasmTarget = @import("os/wasm/target.zig").Target;
 const BuildConfig = @import("build/Config.zig");
 
 pub const ReleaseChannel = BuildConfig.ReleaseChannel;

src/cli/boo.zig

@@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Allocator = std.mem.Allocator;
-const help_strings = @import("help_strings");
 const vaxis = @import("vaxis");
 
 const framedata = @import("framedata").compressed;

src/cli/list_themes.zig

@@ -1,11 +1,9 @@
 const std = @import("std");
-const inputpkg = @import("../input.zig");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Config = @import("../config/Config.zig");
 const themepkg = @import("../config/theme.zig");
 const tui = @import("tui.zig");
-const internal_os = @import("../os/main.zig");
 const global_state = &@import("../global.zig").state;
 
 const vaxis = @import("vaxis");
@@ -180,7 +178,13 @@ pub fn run(gpa_alloc: std.mem.Allocator) !u8 {
         return 0;
     }
 
+    var theme_config = try Config.default(gpa_alloc);
+    defer theme_config.deinit();
     for (themes.items) |theme| {
+        try theme_config.loadFile(theme_config._arena.?.allocator(), theme.path);
+        if (!shouldIncludeTheme(opts.color, theme_config)) {
+            continue;
+        }
         if (opts.path)
             try stdout.print("{s} ({t}) {s}\n", .{ theme.theme, theme.location, theme.path })
         else

src/cli/ssh_cache.zig

@@ -1,7 +1,6 @@
 const std = @import("std");
 const fs = std.fs;
 const Allocator = std.mem.Allocator;
-const xdg = @import("../os/xdg.zig");
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 pub const Entry = @import("ssh-cache/Entry.zig");

src/cli/validate_config.zig

@@ -3,7 +3,6 @@ const Allocator = std.mem.Allocator;
 const args = @import("args.zig");
 const Action = @import("ghostty.zig").Action;
 const Config = @import("../config.zig").Config;
-const cli = @import("../cli.zig");
 
 pub const Options = struct {
     /// The path of the config file to validate. If this isn't specified,

src/config/CApi.zig

@@ -1,6 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
-const cli = @import("../cli.zig");
 const inputpkg = @import("../input.zig");
 const state = &@import("../global.zig").state;
 const c = @import("../main_c.zig");

src/config/Config.zig

@@ -29,8 +29,6 @@ const formatterpkg = @import("formatter.zig");
 const themepkg = @import("theme.zig");
 const url = @import("url.zig");
 const Key = @import("key.zig").Key;
-const KeyValue = @import("key.zig").Value;
-const ErrorList = @import("ErrorList.zig");
 const MetricModifier = fontpkg.Metrics.Modifier;
 const help_strings = @import("help_strings");
 pub const Command = @import("command.zig").Command;

src/config/command.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const formatterpkg = @import("formatter.zig");

src/config/conditional.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 /// Conditionals in Ghostty configuration are based on a static, typed

src/config/edit.zig

@@ -3,7 +3,6 @@ const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
-const internal_os = @import("../os/main.zig");
 const file_load = @import("file_load.zig");
 
 /// The path to the configuration that should be opened for editing.

src/config/theme.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const global_state = &@import("../global.zig").state;
 const internal_os = @import("../os/main.zig");

src/datastruct/blocking_queue.zig

@@ -2,8 +2,6 @@
 //! between threads.
 
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 /// Returns a blocking queue implementation for type T.

src/extra/sublime.zig

@@ -1,4 +1,3 @@
-const std = @import("std");
 const Config = @import("../config/Config.zig");
 
 const Template = struct {

src/font/Collection.zig

@@ -16,7 +16,6 @@
 const Collection = @This();
 
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const config = @import("../config.zig");
 const comparison = @import("../datastruct/comparison.zig");

src/font/DeferredFace.zig

@@ -7,7 +7,6 @@
 const DeferredFace = @This();
 
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const fontconfig = @import("fontconfig");
 const macos = @import("macos");

src/font/discovery.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const assert = @import("../quirks.zig").inlineAssert;
 const fontconfig = @import("fontconfig");

src/font/face/freetype.zig

@@ -16,7 +16,6 @@ const font = @import("../main.zig");
 const Glyph = font.Glyph;
 const Library = font.Library;
 const opentype = @import("../opentype.zig");
-const fastmem = @import("../../fastmem.zig");
 const quirks = @import("../../quirks.zig");
 const config = @import("../../config.zig");
 

src/font/face/web_canvas.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;

src/font/library.zig

@@ -2,7 +2,6 @@
 //! library implementation(s) require per-process.
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const builtin = @import("builtin");
 const options = @import("main.zig").options;
 const freetype = @import("freetype");
 const font = @import("main.zig");

src/font/opentype/head.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// Font Header Table

src/font/opentype/hhea.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// Horizontal Header Table

src/font/opentype/os2.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 pub const FSSelection = packed struct(sfnt.uint16) {

src/font/opentype/post.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const sfnt = @import("sfnt.zig");
 
 /// PostScript Table

src/font/opentype/svg.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const font = @import("../main.zig");
 
 /// SVG glyphs description table.

src/font/shape.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const options = @import("main.zig").options;
 const run = @import("shaper/run.zig");
 const feature = @import("shaper/feature.zig");

src/font/shaper/Cache.zig

@@ -11,7 +11,6 @@
 pub const Cache = @This();
 
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const font = @import("../main.zig");
 const CacheTable = @import("../../datastruct/main.zig").CacheTable;

src/font/shaper/coretext.zig

@@ -3,11 +3,9 @@ const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const macos = @import("macos");
-const trace = @import("tracy").trace;
 const font = @import("../main.zig");
 const os = @import("../../os/main.zig");
 const terminal = @import("../../terminal/main.zig");
-const config = @import("../../config.zig");
 const Feature = font.shape.Feature;
 const FeatureList = font.shape.FeatureList;
 const default_features = font.shape.default_features;

src/font/shaper/feature.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 

src/font/shaper/harfbuzz.zig

@@ -4,7 +4,6 @@ const Allocator = std.mem.Allocator;
 const harfbuzz = @import("harfbuzz");
 const font = @import("../main.zig");
 const terminal = @import("../../terminal/main.zig");
-const config = @import("../../config.zig");
 const Feature = font.shape.Feature;
 const FeatureList = font.shape.FeatureList;
 const default_features = font.shape.default_features;

src/font/shaper/noop.zig

@@ -1,7 +1,5 @@
 const std = @import("std");
-const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
-const trace = @import("tracy").trace;
 const font = @import("../main.zig");
 const Face = font.Face;
 const Collection = font.Collection;

src/font/sprite/Face.zig

@@ -13,7 +13,6 @@
 const Face = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const wuffs = @import("wuffs");

src/font/sprite/draw/block.zig

@@ -6,11 +6,8 @@
 //!
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Shade = common.Shade;
 const Quads = common.Quads;
@@ -18,7 +15,6 @@ const Alignment = common.Alignment;
 const fill = common.fill;
 
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 // Utility names for common fractions
 const one_eighth: f64 = 0.125;

src/font/sprite/draw/box.zig

@@ -15,8 +15,6 @@ const std = @import("std");
 const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Shade = common.Shade;
@@ -30,7 +28,6 @@ const hlineMiddle = common.hlineMiddle;
 const vlineMiddle = common.vlineMiddle;
 
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 /// Specification of a traditional intersection-style line/box-drawing char,
 /// which can have a different style of line from each edge to the center.

src/font/sprite/draw/branch.zig

@@ -16,7 +16,6 @@
 //!
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
 const common = @import("common.zig");

src/font/sprite/draw/common.zig

@@ -4,13 +4,9 @@
 //! rather than being single-use.
 
 const std = @import("std");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const font = @import("../../main.zig");
-const Sprite = @import("../../sprite.zig").Sprite;
 
 const log = std.log.scoped(.sprite_font);
 

src/font/sprite/draw/geometric_shapes.zig

@@ -15,8 +15,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Corner = common.Corner;

src/font/sprite/draw/powerline.zig

@@ -11,8 +11,6 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Shade = common.Shade;

src/font/sprite/draw/special.zig

@@ -6,8 +6,6 @@
 //! having names that exactly match the enum fields in Sprite.
 
 const std = @import("std");
-const builtin = @import("builtin");
-const assert = @import("../../../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const font = @import("../../main.zig");
 const Sprite = font.sprite.Sprite;

src/font/sprite/draw/symbols_for_legacy_computing.zig

@@ -23,8 +23,6 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const assert = @import("../../../quirks.zig").inlineAssert;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Alignment = common.Alignment;

src/font/sprite/draw/symbols_for_legacy_computing_supplement.zig

@@ -51,8 +51,6 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const assert = @import("../../../quirks.zig").inlineAssert;
 
-const z2d = @import("z2d");
-
 const common = @import("common.zig");
 const Thickness = common.Thickness;
 const Fraction = common.Fraction;

src/input/KeymapDarwin.zig

@@ -17,7 +17,6 @@ const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const macos = @import("macos");
 const codes = @import("keycodes.zig").entries;
-const Key = @import("key.zig").Key;
 const Mods = @import("key.zig").Mods;
 
 /// The current input source that is selected for the keyboard. This can

src/input/command.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const builtin = @import("builtin");
 const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const Action = @import("Binding.zig").Action;
@@ -185,12 +184,6 @@ fn actionCommands(action: Action.Key) []const Command {
             .description = "Navigate to the previous search result, if any.",
         } },
 
-        .search => comptime &.{.{
-            .action = .{ .search = "" },
-            .title = "End Search",
-            .description = "End a search if one is active.",
-        }},
-
         .increase_font_size => comptime &.{.{
             .action = .{ .increase_font_size = 1 },
             .title = "Increase Font Size",
@@ -633,6 +626,7 @@ fn actionCommands(action: Action.Key) []const Command {
         .esc,
         .cursor_key,
         .set_font_size,
+        .search,
         .scroll_to_row,
         .scroll_page_fractional,
         .scroll_page_lines,

src/input/kitty.zig

@@ -1,4 +1,3 @@
-const std = @import("std");
 const key = @import("key.zig");
 
 /// A single entry in the kitty keymap data. There are only ~100 entries

src/input/paste.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Terminal = @import("../terminal/Terminal.zig");
 
 pub const Options = struct {

src/inspector/cursor.zig

@@ -1,4 +1,3 @@
-const std = @import("std");
 const cimgui = @import("cimgui");
 const terminal = @import("../terminal/main.zig");
 

src/inspector/page.zig

@@ -1,9 +1,7 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const cimgui = @import("cimgui");
 const terminal = @import("../terminal/main.zig");
-const inspector = @import("main.zig");
 const units = @import("units.zig");
 
 pub fn render(page: *const terminal.Page) void {

src/lib/union.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const testing = std.testing;
 const Target = @import("target.zig").Target;
 

src/main_bench.zig

@@ -1,5 +1,3 @@
-const std = @import("std");
-const builtin = @import("builtin");
 const benchmark = @import("benchmark/main.zig");
 
 pub const main = benchmark.cli.main;

src/main_gen.zig

@@ -1,5 +1,3 @@
-const std = @import("std");
-const builtin = @import("builtin");
 const synthetic = @import("synthetic/main.zig");
 
 pub const main = synthetic.cli.main;

src/main_ghostty.zig

@@ -6,14 +6,8 @@ const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const posix = std.posix;
 const build_config = @import("build_config.zig");
-const options = @import("build_options");
-const glslang = @import("glslang");
 const macos = @import("macos");
-const oni = @import("oniguruma");
 const cli = @import("cli.zig");
-const internal_os = @import("os/main.zig");
-const fontconfig = @import("fontconfig");
-const harfbuzz = @import("harfbuzz");
 const renderer = @import("renderer.zig");
 const apprt = @import("apprt.zig");
 

src/os/TempDir.zig

@@ -3,7 +3,6 @@
 const TempDir = @This();
 
 const std = @import("std");
-const builtin = @import("builtin");
 const testing = std.testing;
 const Dir = std.fs.Dir;
 const allocTmpDir = @import("file.zig").allocTmpDir;

src/os/args.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const objc = @import("objc");
 const macos = @import("macos");

src/os/flatpak.zig

@@ -1,5 +1,4 @@
 const std = @import("std");
-const assert = @import("../quirks.zig").inlineAssert;
 const Allocator = std.mem.Allocator;
 const builtin = @import("builtin");
 const posix = std.posix;

src/os/homedir.zig

@@ -1,6 +1,5 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const assert = @import("../quirks.zig").inlineAssert;
 const passwd = @import("passwd.zig");
 const posix = std.posix;
 const objc = @import("objc");