macos: add macos-icon-frame and some custom frame styles

macos/Assets.xcassets/Custom Icon/CustomIconBaseBeige.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "beige.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

macos/Assets.xcassets/Custom Icon/CustomIconBaseChrome.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "chrome.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

macos/Assets.xcassets/Custom Icon/CustomIconBasePlastic.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "plastic.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}

macos/Sources/App/macOS/AppDelegate.swift

@@ -532,12 +532,13 @@ class AppDelegate: NSObject,
             self.appIcon = nil
             break
 
-        case .customColor:
+        case .customStyle:
             guard let ghostColor = config.macosIconGhostColor else { break }
             guard let screenColors = config.macosIconScreenColor else { break }
             guard let icon = ColorizedGhosttyIcon(
                 screenColors: screenColors,
-                ghostColor: ghostColor
+                ghostColor: ghostColor,
+                frame: config.macosIconFrame
             ).makeImage() else { break }
             self.appIcon = icon
         }

macos/Sources/Features/Colorized Ghostty Icon/ColorizedGhosttyIcon.swift

@@ -7,16 +7,26 @@ struct ColorizedGhosttyIcon {
     /// The color of the ghost.
     let ghostColor: NSColor
 
+    /// The frame type to use
+    let frame: Ghostty.MacOSIconFrame
+
     /// Make a custom colorized ghostty icon.
     func makeImage() -> NSImage? {
-        // All of our layers (in order)
-        guard let base = NSImage(named: "CustomIconBase") else { return nil }
+        // All of our layers (not in order)
         guard let screen = NSImage(named: "CustomIconScreen") else { return nil }
         guard let screenMask = NSImage(named: "CustomIconScreenMask") else { return nil }
         guard let ghost = NSImage(named: "CustomIconGhost") else { return nil }
         guard let crt = NSImage(named: "CustomIconCRT") else { return nil }
         guard let gloss = NSImage(named: "CustomIconGloss") else { return nil }
 
+        let baseName = switch (frame) {
+        case .aluminum: "CustomIconBaseAluminum"
+        case .beige: "CustomIconBaseBeige"
+        case .chrome: "CustomIconBaseChrome"
+        case .plastic: "CustomIconBasePlastic"
+        }
+        guard let base = NSImage(named: baseName) else { return nil }
+
         // Apply our color in various ways to our layers.
         // NOTE: These functions are not built-in, they're implemented as an extension
         // to NSImage in NSImage+Extension.swift.

macos/Sources/Features/Colorized Ghostty Icon/ColorizedGhosttyIconView.swift

@@ -6,7 +6,8 @@ struct ColorizedGhosttyIconView: View {
     var body: some View {
         Image(nsImage: ColorizedGhosttyIcon(
             screenColors: [.purple, .blue],
-            ghostColor: .yellow
+            ghostColor: .yellow,
+            frame: .aluminum
         ).makeImage()!)
     }
 }

macos/Sources/Ghostty/Ghostty.Config.swift

@@ -263,6 +263,17 @@ extension Ghostty {
             return MacOSIcon(rawValue: str) ?? defaultValue
         }
 
+        var macosIconFrame: MacOSIconFrame {
+            let defaultValue = MacOSIconFrame.aluminum
+            guard let config = self.config else { return defaultValue }
+            var v: UnsafePointer<Int8>? = nil
+            let key = "macos-icon-frame"
+            guard ghostty_config_get(config, &v, key, UInt(key.count)) else { return defaultValue }
+            guard let ptr = v else { return defaultValue }
+            let str = String(cString: ptr)
+            return MacOSIconFrame(rawValue: str) ?? defaultValue
+        }
+
         var macosIconGhostColor: OSColor? {
             guard let config = self.config else { return nil }
             var v: ghostty_config_color_s = .init()

macos/Sources/Ghostty/Package.swift

@@ -198,7 +198,15 @@ extension Ghostty {
     /// macos-icon
     enum MacOSIcon: String {
         case official
-        case customColor = "custom-color"
+        case customStyle = "custom-style"
+    }
+
+    /// macos-icon-frame
+    enum MacOSIconFrame: String {
+        case aluminum
+        case beige
+        case plastic
+        case chrome
     }
 
     /// Enum for the macos-titlebar-proxy-icon config option

src/config/Config.zig

@@ -16,7 +16,6 @@ const build_config = @import("../build_config.zig");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
-const build_config = @import("../build_config.zig");
 const global_state = &@import("../global.zig").state;
 const fontpkg = @import("../font/main.zig");
 const inputpkg = @import("../input.zig");
@@ -1688,11 +1687,11 @@ keybind: Keybinds = .{},
 /// Valid values:
 ///
 ///  * `official` - Use the official Ghostty icon.
-///  * `custom-color` - Use the official Ghostty icon but with custom
-///    colors applied to various layers. The custom colors must be
-///    specified using the additional `macos-icon-x-color` configurations.
-///    Note that all colors are required. If any are missing, the icon
-///    will not be changed.
+///  * `custom-style` - Use the official Ghostty icon but with custom
+///    styles applied to various layers. The custom styles must be
+///    specified using the additional `macos-icon`-prefixed configurations.
+///    The `macos-icon-ghost-color` and `macos-icon-screen-color`
+///    configurations are required for this style.
 ///
 /// Other caveats:
 ///
@@ -1703,12 +1702,27 @@ keybind: Keybinds = .{},
 ///
 @"macos-icon": MacAppIcon = .official,
 
+/// The material to use for the frame of the macOS app icon.
+///
+/// Valid values:
+///
+///  * `aluminum` - A brushed aluminum frame. This is the default.
+///  * `beige` - A classic 90's computer beige frame.
+///  * `plastic` - A glossy, dark plastic frame.
+///  * `chrome` - A shiny chrome frame.
+///
+/// This only has an effect when `macos-icon` is set to `custom-style`.
+@"macos-icon-frame": MacAppIconFrame = .aluminum,
+
 /// The color of the ghost in the macOS app icon.
 ///
 /// The format of the color is the same as the `background` configuration;
 /// see that for more information.
 ///
-/// This only has an effect when `macos-icon` is set to `custom-color`.
+/// Note: This configuration is required when `macos-icon` is set to
+/// `custom-style`.
+///
+/// This only has an effect when `macos-icon` is set to `custom-style`.
 @"macos-icon-ghost-color": ?Color = null,
 
 /// The color of the screen in the macOS app icon.
@@ -1718,7 +1732,10 @@ keybind: Keybinds = .{},
 /// format of the color is the same as the `background` configuration;
 /// see that for more information.
 ///
-/// This only has an effect when `macos-icon` is set to `custom-color`.
+/// Note: This configuration is required when `macos-icon` is set to
+/// `custom-style`.
+///
+/// This only has an effect when `macos-icon` is set to `custom-style`.
 @"macos-icon-screen-color": ?ColorList = null,
 
 /// Put every surface (tab, split, window) into a dedicated Linux cgroup.
@@ -5107,7 +5124,15 @@ pub const MacTitlebarProxyIcon = enum {
 /// format at all.
 pub const MacAppIcon = enum {
     official,
-    @"custom-color",
+    @"custom-style",
+};
+
+/// See macos-icon-frame
+pub const MacAppIconFrame = enum {
+    aluminum,
+    beige,
+    plastic,
+    chrome,
 };
 
 /// See gtk-single-instance