marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Honor focus-follows-mouse on terminal hover (#519)

Browse source
This commit is contained in:
Lawrence Chen 2026-02-25 18:43:41 -08:00 • committed by GitHub
parent 58af38a28d
commit f502e6afc9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 120 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Sources/GhosttyTerminalView.swift
View file

@ -837,6 +837,15 @@ class GhosttyApp {
)
}
func focusFollowsMouseEnabled() -> Bool {
guard let config else { return false }
var enabled = false
let key = "focus-follows-mouse"
let keyLength = UInt(key.lengthOfBytes(using: .utf8))
let found = ghostty_config_get(config, &enabled, key, keyLength)
return found && enabled
}
private func applyDefaultBackground(
color: NSColor,
opacity: Double,
@ -2237,6 +2246,24 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
bounds.width > 1 && bounds.height > 1
}
static func shouldRequestFirstResponderForMouseFocus(
focusFollowsMouseEnabled: Bool,
pressedMouseButtons: Int,
appIsActive: Bool,
windowIsKey: Bool,
alreadyFirstResponder: Bool,
visibleInUI: Bool,
hasUsableGeometry: Bool,
hiddenInHierarchy: Bool
) -> Bool {
guard focusFollowsMouseEnabled else { return false }
guard pressedMouseButtons == 0 else { return false }
guard appIsActive, windowIsKey else { return false }
guard !alreadyFirstResponder else { return false }
guard visibleInUI, hasUsableGeometry, !hiddenInHierarchy else { return false }
return true
}
// Visibility is used for focus gating, not for libghostty occlusion.
fileprivate var isVisibleInUI: Bool { visibleInUI }
fileprivate func setVisibleInUI(_ visible: Bool) {
@ -3394,6 +3421,7 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
}
override func mouseMoved(with event: NSEvent) {
maybeRequestFirstResponderForMouseFocus()
guard let surface = surface else { return }
let point = convert(event.locationInWindow, from: nil)
ghostty_surface_mouse_pos(surface, point.x, bounds.height - point.y, modsFromEvent(event))
@ -3401,11 +3429,29 @@ class GhosttyNSView: NSView, NSUserInterfaceValidations {
override func mouseEntered(with event: NSEvent) {
super.mouseEntered(with: event)
maybeRequestFirstResponderForMouseFocus()
guard let surface = surface else { return }
let point = convert(event.locationInWindow, from: nil)
ghostty_surface_mouse_pos(surface, point.x, bounds.height - point.y, modsFromEvent(event))
}
private func maybeRequestFirstResponderForMouseFocus() {
guard let window else { return }
let alreadyFirstResponder = window.firstResponder === self
let shouldRequest = Self.shouldRequestFirstResponderForMouseFocus(
focusFollowsMouseEnabled: GhosttyApp.shared.focusFollowsMouseEnabled(),
pressedMouseButtons: NSEvent.pressedMouseButtons,
appIsActive: NSApp.isActive,
windowIsKey: window.isKeyWindow,
alreadyFirstResponder: alreadyFirstResponder,
visibleInUI: isVisibleInUI,
hasUsableGeometry: hasUsableFocusGeometry,
hiddenInHierarchy: isHiddenOrHasHiddenAncestor
)
guard shouldRequest else { return }
window.makeFirstResponder(self)
}
override func mouseExited(with event: NSEvent) {
guard let surface = surface else { return }
if NSEvent.pressedMouseButtons != 0 {