From a109b8d755c1a1920945ce35bb4559eab45ed96e Mon Sep 17 00:00:00 2001
From: Lucy Davinhart <lucy@lucymhdavies.com>
Date: Thu, 3 Oct 2024 19:09:37 +0100
Subject: [PATCH] Implements initial-window=false for macOS

Closes https://github.com/ghostty-org/ghostty/issues/2361
---
 macos/Sources/App/macOS/AppDelegate.swift  | 4 ++--
 macos/Sources/Ghostty/Ghostty.Config.swift | 8 ++++++++
 src/config/Config.zig                      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/macos/Sources/App/macOS/AppDelegate.swift b/macos/Sources/App/macOS/AppDelegate.swift
index e926e380b..aab92a990 100644
--- a/macos/Sources/App/macOS/AppDelegate.swift
+++ b/macos/Sources/App/macOS/AppDelegate.swift
@@ -173,7 +173,7 @@ class AppDelegate: NSObject,
         // is possible to have other windows in a few scenarios:
         //   - if we're opening a URL since `application(_:openFile:)` is called before this.
         //   - if we're restoring from persisted state
-        if terminalManager.windows.count == 0 {
+        if terminalManager.windows.count == 0 && ghostty.config.initialWindow {
             terminalManager.newWindow()
         }
     }
@@ -587,7 +587,7 @@ class AppDelegate: NSObject,
         if !isVisible {
             NSApp.activate(ignoringOtherApps: true)
         }
-        
+
         isVisible.toggle()
     }
 }
diff --git a/macos/Sources/Ghostty/Ghostty.Config.swift b/macos/Sources/Ghostty/Ghostty.Config.swift
index 40a0e0fde..99e08bf9d 100644
--- a/macos/Sources/Ghostty/Ghostty.Config.swift
+++ b/macos/Sources/Ghostty/Ghostty.Config.swift
@@ -151,6 +151,14 @@ extension Ghostty {
         /// details on what each means. We only add documentation if there is a strange conversion
         /// due to the embedded library and Swift.
 
+        var initialWindow: Bool {
+            guard let config = self.config else { return true }
+            var v = true;
+            let key = "initial-window"
+            _ = ghostty_config_get(config, &v, key, UInt(key.count))
+            return v
+        }
+
         var shouldQuitAfterLastWindowClosed: Bool {
             guard let config = self.config else { return true }
             var v = false;
diff --git a/src/config/Config.zig b/src/config/Config.zig
index eefd3703f..4a2f789bf 100644
--- a/src/config/Config.zig
+++ b/src/config/Config.zig
@@ -1229,7 +1229,7 @@ keybind: Keybinds = .{},
 /// is run. Note that if `quit-after-last-window-closed` is `true` and
 /// `quit-after-last-window-closed-delay` is set, setting `initial-window` to
 /// `false` will mean that Ghostty will quit after the configured delay if no
-/// window is ever created. Only implemented on Linux.
+/// window is ever created. Only implemented on Linux and macOS.
 @"initial-window": bool = true,
 
 /// The position of the "quick" terminal window. To learn more about the