Fix terminal keys swallowed after opening browser (#45)
* Fix terminal keys (arrows, Ctrl+N/P) swallowed after opening browser After a browser panel is shown, SwiftUI's internal focus system activates and its _NSHostingView starts consuming arrow keys and other non-Command key events via performKeyEquivalent, preventing them from reaching the terminal's keyDown handler. Fix: In the NSWindow performKeyEquivalent swizzle, when GhosttyNSView is the first responder and the event has no Command modifier, route directly to the terminal's performKeyEquivalent — bypassing SwiftUI's view hierarchy walk entirely. Also clear stale browserAddressBarFocusedPanelId when a terminal surface has focus, preventing Cmd+N from being eaten by omnibar selection logic after focus transitions away from a browser. Adds DEBUG-only keyboard event ring buffer (KeyDebugLog) that dumps to /tmp/cmux-key-debug.log for diagnosing future key routing issues. * Fix split focus and Cmd+Shift+N swallowed after opening browser Split focus: capture the source terminal's hostedView before bonsplit mutates focusedPaneId, so focusPanel moves focus FROM the old pane instead of from the new pane to itself. Also retry ensureFocus when the new terminal's view has no window yet (matching the existing retry pattern for isVisibleInUI). Cmd+Shift+N: after WKWebView has been in the responder chain, SwiftUI's internal focus system can intercept Command-key events in the content view hierarchy (returning true) without firing the CommandGroup action closure. Fix by dispatching Command-key events directly to NSApp.mainMenu when the terminal is first responder, bypassing the broken SwiftUI path. Also add Cmd+Shift+N to handleCustomShortcut so it's customizable and doesn't depend on SwiftUI menu dispatch at all. * Unified debug event log: merge key/mouse/focus into /tmp/cmux-debug.log - Delete KeyDebugLog, MouseDebugLog, klog(), mlog() from AppDelegate - Replace all klog/mlog calls with dlog() (provided by bonsplit) - Remove debugLogCallback wiring from Workspace - Add focus change logging: focus.panel, focus.firstResponder, split.created, focus.moveFocus - Add import Bonsplit where needed for dlog access - Fix stale drag state on cancelled tab drags (bonsplit submodule) * Fix split focus stolen by re-entrant becomeFirstResponder during reparenting During programmatic splits (Cmd+D / Cmd+Shift+D), SwiftUI reparents the old terminal view, which fires becomeFirstResponder → onFocus → focusPanel for the OLD panel, stealing focus from the newly created pane. Add programmaticFocusTargetPanelId guard to suppress re-entrant focusPanel calls for non-target panels during split creation. Also document the unified debug event log in CLAUDE.md. * Clear stale title/favicon when browser navigation fails When a page fails to load (e.g. connection refused), the tab was still showing the previous page's title and favicon. Now didFailProvisionalNavigation resets pageTitle to the failed URL and clears faviconPNGData. * Fix Cmd+N swallowed by browser omnibar and improve split focus suppression - Only Ctrl+N/P trigger omnibar navigation, not Cmd+N/P (Cmd+N should always create new workspace regardless of address bar focus) - Move split focus suppression from workspace-level guard to source: suppress becomeFirstResponder side-effects (onFocus + ghostty_surface_set_focus) directly on the old GhosttyNSView during reparenting, preventing both model-level and libghostty-level focus divergence - Remove programmaticFocusTargetPanelId from Workspace.focusPanel * Fix omnibar hang, WebView white flash, drag-over-browser, and idle CPU spin - Omnibar: first click selects all without entering NSTextView tracking loop; subsequent clicks have 3s synthetic mouseUp safety net to prevent hang - WebView: set underPageBackgroundColor to match window so new browsers don't flash white before content loads - Drag/drop: register custom UTType (com.splittabbar.tabtransfer) in Info.plist so WKWebView doesn't intercept tab drags; override registerForDraggedTypes on CmuxWebView as belt-and-suspenders - CPU: fix infinite makeFirstResponder loop in controlTextDidEndEditing by checking both the text field and its field editor (the actual first responder)
This commit is contained in:
Lawrence Chen
GitHub
parent
0a2ef499b5
commit
484b66c8ac
14 changed files with 364 additions and 23 deletions
|
|
@ -58,6 +58,7 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
/// When true, suppresses auto-creation in didSplitPane (programmatic splits handle their own panels)
|
||||
private var isProgrammaticSplit = false
|
||||
|
||||
|
||||
// Closing tabs mutates split layout immediately; terminal views handle their own AppKit
|
||||
// layout/size synchronization.
|
||||
|
||||
|
|
@ -392,6 +393,10 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
)
|
||||
surfaceIdToPanelId[newTab.id] = newPanel.id
|
||||
|
||||
// Capture the source terminal's hosted view before bonsplit mutates focusedPaneId,
|
||||
// so we can hand it to focusPanel as the "move focus FROM" view.
|
||||
let previousHostedView = focusedTerminalPanel?.hostedView
|
||||
|
||||
// Create the split with the new tab already present in the new pane.
|
||||
isProgrammaticSplit = true
|
||||
defer { isProgrammaticSplit = false }
|
||||
|
|
@ -401,10 +406,18 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
return nil
|
||||
}
|
||||
|
||||
// SplitViewController focuses the newly created pane, but the AppKit first responder can lag
|
||||
// (or remain on the source surface) during SwiftUI/bonsplit structural updates. Explicitly
|
||||
// focus the new panel so model focus + responder chain converge deterministically.
|
||||
focusPanel(newPanel.id)
|
||||
#if DEBUG
|
||||
dlog("split.created pane=\(paneId.id.uuidString.prefix(5)) orientation=\(orientation)")
|
||||
#endif
|
||||
|
||||
// Suppress the old view's becomeFirstResponder side-effects during SwiftUI reparenting.
|
||||
// Without this, reparenting triggers onFocus + ghostty_surface_set_focus on the old view,
|
||||
// stealing focus from the new panel and creating model/surface divergence.
|
||||
previousHostedView?.suppressReparentFocus()
|
||||
focusPanel(newPanel.id, previousHostedView: previousHostedView)
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
|
||||
previousHostedView?.clearSuppressReparentFocus()
|
||||
}
|
||||
|
||||
return newPanel
|
||||
}
|
||||
|
|
@ -505,9 +518,13 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
return nil
|
||||
}
|
||||
|
||||
// See newTerminalSplit: explicitly focus the newly created panel so focus state is
|
||||
// deterministic for both user and socket-driven workflows.
|
||||
// See newTerminalSplit: suppress old view's becomeFirstResponder during reparenting.
|
||||
let previousHostedView = focusedTerminalPanel?.hostedView
|
||||
previousHostedView?.suppressReparentFocus()
|
||||
focusPanel(browserPanel.id)
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
|
||||
previousHostedView?.clearSuppressReparentFocus()
|
||||
}
|
||||
|
||||
installBrowserPanelSubscription(browserPanel)
|
||||
|
||||
|
|
@ -790,9 +807,10 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
}
|
||||
// MARK: - Focus Management
|
||||
|
||||
func focusPanel(_ panelId: UUID) {
|
||||
func focusPanel(_ panelId: UUID, previousHostedView: GhosttySurfaceScrollView? = nil) {
|
||||
#if DEBUG
|
||||
let pane = bonsplitController.focusedPaneId?.id.uuidString ?? "nil"
|
||||
let pane = bonsplitController.focusedPaneId?.id.uuidString.prefix(5) ?? "nil"
|
||||
dlog("focus.panel panel=\(panelId.uuidString.prefix(5)) pane=\(pane)")
|
||||
FocusLogStore.shared.append("Workspace.focusPanel panelId=\(panelId.uuidString) focusedPane=\(pane)")
|
||||
#endif
|
||||
guard let tabId = surfaceIdFromPanelId(panelId) else { return }
|
||||
|
|
@ -801,7 +819,9 @@ final class Workspace: Identifiable, ObservableObject {
|
|||
// Capture the currently focused terminal view so we can explicitly move AppKit first
|
||||
// responder when focusing another terminal (helps avoid "highlighted but typing goes to
|
||||
// another pane" after heavy split/tab mutations).
|
||||
let previousTerminalHostedView = focusedTerminalPanel?.hostedView
|
||||
// When a caller passes an explicit previousHostedView (e.g. during split creation where
|
||||
// bonsplit has already mutated focusedPaneId), prefer it over the derived value.
|
||||
let previousTerminalHostedView = previousHostedView ?? focusedTerminalPanel?.hostedView
|
||||
|
||||
// `selectTab` does not necessarily move bonsplit's focused pane. For programmatic focus
|
||||
// (socket API, notification click, etc.), ensure the target tab's pane becomes focused
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue