mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-04-20 00:18:53 +03:00

Related to #799 With tabbing mode disabled, fullscreen (native) windows when creating a new tab creates a window in the tab bar, but ALSO puts the window into a new "screen" on macOS. When you click the tab bar, macOS animates between screens. Its jarring! This commit makes it so that in fullscreen we go back to automatic tabbing even for new windows, which produces new windows within a tab. This is normal default behavior for macOS tabbed programs. When you are not in fullscreen or exit fullscreen, then the tabbing mode returns to disabled so Ghostty can manage it.
169 lines
6.2 KiB
Swift
169 lines
6.2 KiB
Swift
import Cocoa
|
|
import SwiftUI
|
|
import GhosttyKit
|
|
import Combine
|
|
|
|
/// Manages a set of terminal windows. This is effectively an array of TerminalControllers.
|
|
/// This abstraction helps manage tabs and multi-window scenarios.
|
|
class TerminalManager {
|
|
struct Window {
|
|
let controller: TerminalController
|
|
let closePublisher: AnyCancellable
|
|
}
|
|
|
|
let ghostty: Ghostty.AppState
|
|
|
|
/// The currently focused surface of the main window.
|
|
var focusedSurface: Ghostty.SurfaceView? { mainWindow?.controller.focusedSurface }
|
|
|
|
/// The set of windows we currently have.
|
|
private var windows: [Window] = []
|
|
|
|
// Keep track of the last point that our window was launched at so that new
|
|
// windows "cascade" over each other and don't just launch directly on top
|
|
// of each other.
|
|
private static var lastCascadePoint = NSPoint(x: 0, y: 0)
|
|
|
|
/// Returns the main window of the managed window stack. If there is no window
|
|
/// then an arbitrary window will be chosen.
|
|
private var mainWindow: Window? {
|
|
for window in windows {
|
|
if (window.controller.window?.isMainWindow ?? false) {
|
|
return window
|
|
}
|
|
}
|
|
|
|
// If we have no main window, just use the first window.
|
|
return windows.first
|
|
}
|
|
|
|
init(_ ghostty: Ghostty.AppState) {
|
|
self.ghostty = ghostty
|
|
|
|
let center = NotificationCenter.default
|
|
center.addObserver(
|
|
self,
|
|
selector: #selector(onNewTab),
|
|
name: Ghostty.Notification.ghosttyNewTab,
|
|
object: nil)
|
|
center.addObserver(
|
|
self,
|
|
selector: #selector(onNewWindow),
|
|
name: Ghostty.Notification.ghosttyNewWindow,
|
|
object: nil)
|
|
}
|
|
|
|
deinit {
|
|
let center = NotificationCenter.default
|
|
center.removeObserver(self)
|
|
}
|
|
|
|
// MARK: - Window Management
|
|
|
|
/// Create a new terminal window.
|
|
func newWindow(withBaseConfig base: Ghostty.SurfaceConfiguration? = nil) {
|
|
let c = createWindow(withBaseConfig: base)
|
|
if let window = c.window {
|
|
Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
|
|
}
|
|
|
|
c.showWindow(self)
|
|
}
|
|
|
|
/// Creates a new tab in the current main window. If there are no windows, a window
|
|
/// is created.
|
|
func newTab(withBaseConfig base: Ghostty.SurfaceConfiguration? = nil) {
|
|
// If there is no main window, just create a new window
|
|
guard let parent = mainWindow?.controller.window else {
|
|
newWindow(withBaseConfig: base)
|
|
return
|
|
}
|
|
|
|
// Create a new window and add it to the parent
|
|
newTab(to: parent, withBaseConfig: base)
|
|
}
|
|
|
|
private func newTab(to parent: NSWindow, withBaseConfig base: Ghostty.SurfaceConfiguration?) {
|
|
// Create a new window and add it to the parent
|
|
let window = createWindow(withBaseConfig: base).window!
|
|
parent.addTabbedWindow(window, ordered: .above)
|
|
window.makeKeyAndOrderFront(self)
|
|
}
|
|
|
|
/// Creates a window controller, adds it to our managed list, and returns it.
|
|
private func createWindow(withBaseConfig base: Ghostty.SurfaceConfiguration?) -> TerminalController {
|
|
// Initialize our controller to load the window
|
|
let c = TerminalController(ghostty, withBaseConfig: base)
|
|
|
|
// Create a listener for when the window is closed so we can remove it.
|
|
let pubClose = NotificationCenter.default.publisher(
|
|
for: NSWindow.willCloseNotification,
|
|
object: c.window!
|
|
).sink { notification in
|
|
guard let window = notification.object as? NSWindow else { return }
|
|
guard let c = window.windowController as? TerminalController else { return }
|
|
self.removeWindow(c)
|
|
}
|
|
|
|
// Keep track of every window we manage
|
|
windows.append(Window(
|
|
controller: c,
|
|
closePublisher: pubClose
|
|
))
|
|
|
|
return c
|
|
}
|
|
|
|
private func removeWindow(_ controller: TerminalController) {
|
|
// Remove it from our managed set
|
|
guard let idx = self.windows.firstIndex(where: { $0.controller == controller }) else { return }
|
|
let w = self.windows[idx]
|
|
self.windows.remove(at: idx)
|
|
|
|
// Ensure any publishers we have are cancelled
|
|
w.closePublisher.cancel()
|
|
|
|
// If we remove a window, we reset the cascade point to the key window so that
|
|
// the next window cascade's from that one.
|
|
if let focusedWindow = NSApplication.shared.keyWindow {
|
|
// If we are NOT the focused window, then we are a tabbed window. If we
|
|
// are closing a tabbed window, we want to set the cascade point to be
|
|
// the next cascade point from this window.
|
|
if focusedWindow != controller.window {
|
|
Self.lastCascadePoint = focusedWindow.cascadeTopLeft(from: NSZeroPoint)
|
|
return
|
|
}
|
|
|
|
// If we are the focused window, then we set the last cascade point to
|
|
// our own frame so that it shows up in the same spot.
|
|
let frame = focusedWindow.frame
|
|
Self.lastCascadePoint = NSPoint(x: frame.minX, y: frame.maxY)
|
|
}
|
|
}
|
|
|
|
/// Relabels all the tabs with the proper keyboard shortcut.
|
|
func relabelAllTabs() {
|
|
for w in windows {
|
|
w.controller.relabelTabs()
|
|
}
|
|
}
|
|
|
|
// MARK: - Notifications
|
|
|
|
@objc private func onNewWindow(notification: SwiftUI.Notification) {
|
|
let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
|
|
let config = configAny as? Ghostty.SurfaceConfiguration
|
|
self.newWindow(withBaseConfig: config)
|
|
}
|
|
|
|
@objc private func onNewTab(notification: SwiftUI.Notification) {
|
|
guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
|
|
guard let window = surfaceView.window else { return }
|
|
|
|
let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
|
|
let config = configAny as? Ghostty.SurfaceConfiguration
|
|
|
|
self.newTab(to: window, withBaseConfig: config)
|
|
}
|
|
}
|