mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-08-05 07:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

macos: defer transparent titlebar KVO rebinding

Browse Source 
Fixes #13386

Defer transparent-titlebar KVO rebinding to the next main-queue turn.
Track the observed tab group so unchanged bindings are preserved.

Previously, a tab-group callback could invalidate and recreate its own
observation before returning, leaving closed terminal windows registered
with AppKit after the undo timeout. These windows accumulated titlebar and
layer state, increasing memory use and WindowServer CPU with tab churn.

Validated with an AppDelegate change that sat and created/closed tabs
in a loop, then counted weak controllers/windows/nsapp window.

Co-authored-by: Mustafa J <mustafa.0x@gmail.com>
This commit is contained in:
Mitchell Hashimoto
2026-08-04 06:29:15 -07:00
parent 1f6e26642e
commit cfa0ca7106
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
macos/Sources/Features/Terminal/Window Styles/TransparentTitlebarTerminalWindow.swift
View File

@@ -9,6 +9,7 @@ class TransparentTitlebarTerminalWindow: TerminalWindow {
private var lastSurfaceConfig: Ghostty.SurfaceView.DerivedConfig?
/// KVO observation for tab group window changes.
private weak var observedTabGroup: NSWindowTabGroup?
private var tabGroupWindowsObservation: NSKeyValueObservation?
private var tabBarVisibleObservation: NSKeyValueObservation?
@@ -129,9 +130,27 @@ class TransparentTitlebarTerminalWindow: TerminalWindow {
// MARK: Tab Group Observation
private func setupKVO() {
// See the docs for the respective setup functions for why.
setupTabGroupObservation()
setupTabBarVisibleObservation()
// This can run from one of the observation callbacks below. Replacing
// an observation before its callback returns leaves the window retained
// by AppKit, so always rebind on the next main-queue turn.
DispatchQueue.main.async { [weak self] in
guard let self else { return }
// Recheck because the tab group and observation state may have changed
// while this work was waiting on the main queue.
let currentTabGroup = self.tabGroup
let observationsValid = currentTabGroup == nil || (
self.tabGroupWindowsObservation != nil &&
self.tabBarVisibleObservation != nil
)
// Keep the existing observations when they already match.
guard self.observedTabGroup !== currentTabGroup || !observationsValid else { return }
self.observedTabGroup = currentTabGroup
self.setupTabGroupObservation()
self.setupTabBarVisibleObservation()
}
}
/// Monitors the tabGroup windows value for any changes and resyncs the appearance on change.