From ab232b30604a49e6ad586294392434295333050f Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <m@mitchellh.com>
Date: Fri, 26 Dec 2025 13:49:34 -0800
Subject: [PATCH] macos: move Ghostty surface view into dedicated folder

---
 macos/Ghostty.xcodeproj/project.pbxproj                   | 8 ++++----
 .../Ghostty/{ => Surface View}/InspectorView.swift        | 0
 .../Ghostty/{ => Surface View}/SurfaceProgressBar.swift   | 0
 .../Ghostty/{ => Surface View}/SurfaceScrollView.swift    | 0
 .../Sources/Ghostty/{ => Surface View}/SurfaceView.swift  | 0
 .../Ghostty/{ => Surface View}/SurfaceView_AppKit.swift   | 3 ---
 .../Ghostty/{ => Surface View}/SurfaceView_UIKit.swift    | 0
 7 files changed, 4 insertions(+), 7 deletions(-)
 rename macos/Sources/Ghostty/{ => Surface View}/InspectorView.swift (100%)
 rename macos/Sources/Ghostty/{ => Surface View}/SurfaceProgressBar.swift (100%)
 rename macos/Sources/Ghostty/{ => Surface View}/SurfaceScrollView.swift (100%)
 rename macos/Sources/Ghostty/{ => Surface View}/SurfaceView.swift (100%)
 rename macos/Sources/Ghostty/{ => Surface View}/SurfaceView_AppKit.swift (99%)
 rename macos/Sources/Ghostty/{ => Surface View}/SurfaceView_UIKit.swift (100%)

diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index feda1bed0..49f668e12 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -142,10 +142,10 @@
 				Ghostty/Ghostty.Event.swift,
 				Ghostty/Ghostty.Input.swift,
 				Ghostty/Ghostty.Surface.swift,
-				Ghostty/InspectorView.swift,
 				"Ghostty/NSEvent+Extension.swift",
-				Ghostty/SurfaceScrollView.swift,
-				Ghostty/SurfaceView_AppKit.swift,
+				"Ghostty/Surface View/InspectorView.swift",
+				"Ghostty/Surface View/SurfaceScrollView.swift",
+				"Ghostty/Surface View/SurfaceView_AppKit.swift",
 				Helpers/AppInfo.swift,
 				Helpers/CodableBridge.swift,
 				Helpers/Cursor.swift,
@@ -187,7 +187,7 @@
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				App/iOS/iOSApp.swift,
-				Ghostty/SurfaceView_UIKit.swift,
+				"Ghostty/Surface View/SurfaceView_UIKit.swift",
 			);
 			target = A5B30530299BEAAA0047F10C /* Ghostty */;
 		};
diff --git a/macos/Sources/Ghostty/InspectorView.swift b/macos/Sources/Ghostty/Surface View/InspectorView.swift
similarity index 100%
rename from macos/Sources/Ghostty/InspectorView.swift
rename to macos/Sources/Ghostty/Surface View/InspectorView.swift
diff --git a/macos/Sources/Ghostty/SurfaceProgressBar.swift b/macos/Sources/Ghostty/Surface View/SurfaceProgressBar.swift
similarity index 100%
rename from macos/Sources/Ghostty/SurfaceProgressBar.swift
rename to macos/Sources/Ghostty/Surface View/SurfaceProgressBar.swift
diff --git a/macos/Sources/Ghostty/SurfaceScrollView.swift b/macos/Sources/Ghostty/Surface View/SurfaceScrollView.swift
similarity index 100%
rename from macos/Sources/Ghostty/SurfaceScrollView.swift
rename to macos/Sources/Ghostty/Surface View/SurfaceScrollView.swift
diff --git a/macos/Sources/Ghostty/SurfaceView.swift b/macos/Sources/Ghostty/Surface View/SurfaceView.swift
similarity index 100%
rename from macos/Sources/Ghostty/SurfaceView.swift
rename to macos/Sources/Ghostty/Surface View/SurfaceView.swift
diff --git a/macos/Sources/Ghostty/SurfaceView_AppKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
similarity index 99%
rename from macos/Sources/Ghostty/SurfaceView_AppKit.swift
rename to macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift
index 77e1c43d4..37cc9282e 100644
--- a/macos/Sources/Ghostty/SurfaceView_AppKit.swift
+++ b/macos/Sources/Ghostty/Surface View/SurfaceView_AppKit.swift	
@@ -1654,7 +1654,6 @@ extension Ghostty {
         struct DerivedConfig {
             let backgroundColor: Color
             let backgroundOpacity: Double
-            let backgroundBlur: Ghostty.Config.BackgroundBlur
             let macosWindowShadow: Bool
             let windowTitleFontFamily: String?
             let windowAppearance: NSAppearance?
@@ -1663,7 +1662,6 @@ extension Ghostty {
             init() {
                 self.backgroundColor = Color(NSColor.windowBackgroundColor)
                 self.backgroundOpacity = 1
-                self.backgroundBlur = .disabled
                 self.macosWindowShadow = true
                 self.windowTitleFontFamily = nil
                 self.windowAppearance = nil
@@ -1673,7 +1671,6 @@ extension Ghostty {
             init(_ config: Ghostty.Config) {
                 self.backgroundColor = config.backgroundColor
                 self.backgroundOpacity = config.backgroundOpacity
-                self.backgroundBlur = config.backgroundBlur
                 self.macosWindowShadow = config.macosWindowShadow
                 self.windowTitleFontFamily = config.windowTitleFontFamily
                 self.windowAppearance = .init(ghosttyConfig: config)
diff --git a/macos/Sources/Ghostty/SurfaceView_UIKit.swift b/macos/Sources/Ghostty/Surface View/SurfaceView_UIKit.swift
similarity index 100%
rename from macos/Sources/Ghostty/SurfaceView_UIKit.swift
rename to macos/Sources/Ghostty/Surface View/SurfaceView_UIKit.swift