Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #513 from mitchellh/macos-mouse

Browse Source 
macos: multiple mouse-hide-while-typing fixes
This commit is contained in:
Mitchell Hashimoto
2023-09-21 09:50:15 -07:00
committed by GitHub
parent ea16fcf255 7f549c5b41
commit 680478ed88
1 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
macos/Sources/Ghostty/SurfaceView.swift
View File

@ -236,7 +236,7 @@ extension Ghostty {
return return
} }
self.surface = surface; self.surface = surface;
// Setup our tracking area so we get mouse moved events // Setup our tracking area so we get mouse moved events
updateTrackingAreas() updateTrackingAreas()
} }
@ -283,6 +283,25 @@ extension Ghostty {
// The size represents our final size we're going for. // The size represents our final size we're going for.
let scaledSize = self.convertToBacking(size) let scaledSize = self.convertToBacking(size)
ghostty_surface_set_size(surface, UInt32(scaledSize.width), UInt32(scaledSize.height)) ghostty_surface_set_size(surface, UInt32(scaledSize.width), UInt32(scaledSize.height))
// Frame changes do not always call mouseEntered/mouseExited, so we do some
// calculations ourself to call those events.
if let window = self.window {
let mouseScreen = NSEvent.mouseLocation
let mouseWindow = window.convertPoint(fromScreen: mouseScreen)
let mouseView = self.convert(mouseWindow, from: nil)
let isEntered = self.isMousePoint(mouseView, in: bounds)
if (isEntered) {
mouseEntered(with: NSEvent())
} else {
mouseExited(with: NSEvent())
}
} else {
// If we don't have a window, then our mouse can NOT be in our view.
// When the window comes back, I believe this event fires again so
// we'll get a mouseEntered.
mouseExited(with: NSEvent())
}
} }
func setCursorShape(_ shape: ghostty_mouse_shape_e) { func setCursorShape(_ shape: ghostty_mouse_shape_e) {
@ -419,12 +438,13 @@ extension Ghostty {
options: [ options: [
.mouseEnteredAndExited, .mouseEnteredAndExited,
.mouseMoved, .mouseMoved,
// Only send mouse events that happen in our visible (not obscured) rect
.inVisibleRect, .inVisibleRect,
// It is possible this is incorrect when we have splits. This will make // We want active always because we want to still send mouse reports
// mouse events only happen while the terminal is focused. Is that what // even if we're not focused or key.
// we want? .activeAlways,
.activeWhenFirstResponder,
], ],
owner: self, owner: self,
userInfo: nil)) userInfo: nil))
@ -561,20 +581,18 @@ extension Ghostty {
} }
override func cursorUpdate(with event: NSEvent) { override func cursorUpdate(with event: NSEvent) {
if (focused) { switch (cursorVisible) {
switch (cursorVisible) { case .visible, .hidden:
case .visible, .hidden: // Do nothing, stable state
// Do nothing, stable state break
break
case .pendingHidden:
case .pendingHidden: NSCursor.hide()
NSCursor.hide() cursorVisible = .hidden
cursorVisible = .hidden
case .pendingVisible:
case .pendingVisible: NSCursor.unhide()
NSCursor.unhide() cursorVisible = .visible
cursorVisible = .visible
}
} }
cursor.set() cursor.set()