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

core: show mouse whenever focus state changes on surface

Browse Source 
Related to #2525
This commit is contained in:
Mitchell Hashimoto
2024-10-30 18:03:01 -04:00
parent e0c5bdc53b
commit 569d887de8
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Surface.zig
View File

@ -130,6 +130,11 @@ config: DerivedConfig,
/// This is used to determine if we need to confirm, hold open, etc. /// This is used to determine if we need to confirm, hold open, etc.
child_exited: bool = false, child_exited: bool = false,
/// We maintain our focus state and assume we're focused by default.
/// If we're not initially focused then apprts can call focusCallback
/// to let us know.
focused: bool = true,
/// The effect of an input event. This can be used by callers to take /// The effect of an input event. This can be used by callers to take
/// the appropriate action after an input event. For example, key /// the appropriate action after an input event. For example, key
/// input can be forwarded to the OS for further processing if it /// input can be forwarded to the OS for further processing if it
@ -1988,6 +1993,10 @@ pub fn focusCallback(self: *Surface, focused: bool) !void {
crash.sentry.thread_state = self.crashThreadState(); crash.sentry.thread_state = self.crashThreadState();
defer crash.sentry.thread_state = null; defer crash.sentry.thread_state = null;
// If our focus state is the same we do nothing.
if (self.focused == focused) return;
self.focused = focused;
// Notify our render thread of the new state // Notify our render thread of the new state
_ = self.renderer_thread.mailbox.push(.{ _ = self.renderer_thread.mailbox.push(.{
.focus = focused, .focus = focused,
@ -2044,6 +2053,12 @@ pub fn focusCallback(self: *Surface, focused: bool) !void {
// Schedule render which also drains our mailbox // Schedule render which also drains our mailbox
try self.queueRender(); try self.queueRender();
// Whenever our focus changes we unhide the mouse. The mouse will be
// hidden again if the user starts typing. This helps alleviate some
// buggy behavior upstream in macOS with the mouse never becoming visible
// again when tabbing between programs (see #2525).
self.showMouse();
// Update the focus state and notify the terminal // Update the focus state and notify the terminal
{ {
self.renderer_state.mutex.lock(); self.renderer_state.mutex.lock();