Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: prevent super hot loop to restore focus state

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-01-03 12:07:03 -08:00
parent ae7221d680
commit c9ff034b62
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
macos/Sources/Features/Terminal/TerminalRestorable.swift
View File

@ -101,11 +101,23 @@ class TerminalWindowRestoration: NSObject, NSWindowRestoration {
/// This restores the focus state of the surfaceview within the given window. When restoring, /// This restores the focus state of the surfaceview within the given window. When restoring,
/// the view isn't immediately attached to the window since we have to wait for SwiftUI to /// the view isn't immediately attached to the window since we have to wait for SwiftUI to
/// catch up. Therefore, we sit in an async loop waiting for the attachment to happen. /// catch up. Therefore, we sit in an async loop waiting for the attachment to happen.
private static func restoreFocus(to: Ghostty.SurfaceView, inWindow: NSWindow) { private static func restoreFocus(to: Ghostty.SurfaceView, inWindow: NSWindow, attempts: Int = 0) {
DispatchQueue.main.async { // For the first attempt, we schedule it immediately. Subsequent events wait a bit
// so we don't just spin the CPU at 100%. Give up after some period of time.
let after: DispatchTime
if (attempts == 0) {
after = .now()
} else if (attempts > 40) {
// 2 seconds, give up
return
} else {
after = .now() + .milliseconds(50)
}
DispatchQueue.main.asyncAfter(deadline: after) {
// If the view is not attached to a window yet then we repeat. // If the view is not attached to a window yet then we repeat.
guard let viewWindow = to.window else { guard let viewWindow = to.window else {
restoreFocus(to: to, inWindow: inWindow) restoreFocus(to: to, inWindow: inWindow, attempts: attempts + 1)
return return
} }