mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 19:21:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Quick access terminal: Restore focus to previously active window when hiding the quick access terminal window

Browse Source 
Fixes #8627
This commit is contained in:
Kovid Goyal
2025-05-12 13:15:42 +05:30
parent eab298683d
commit 064bc963a8
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@@ -111,6 +111,8 @@ Detailed list of changes
- Fix ambiguous width and private use characters not being rendered when used with variable width text-sizing protocol escape codes - Fix ambiguous width and private use characters not being rendered when used with variable width text-sizing protocol escape codes
- macOS: Quick access terminal: Restore focus to previously active window when hiding the quick access terminal window (:iss:`8627`)
0.42.0 [2025-05-11] 0.42.0 [2025-05-11]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1
glfw/cocoa_platform.h vendored
View File

@@ -125,6 +125,7 @@ typedef struct _GLFWwindowNS
id delegate; id delegate;
id view; id view;
id layer; id layer;
pid_t previous_front_most_application;
bool maximized; bool maximized;
bool retina; bool retina;

17
glfw/cocoa_window.m
View File

@@ -2201,14 +2201,31 @@ void _glfwPlatformMaximizeWindow(_GLFWwindow* window)
void _glfwPlatformShowWindow(_GLFWwindow* window) void _glfwPlatformShowWindow(_GLFWwindow* window)
{ {
NSRunningApplication *app = [[NSWorkspace sharedWorkspace] frontmostApplication];
window->ns.previous_front_most_application = 0;
if (app && app.processIdentifier != getpid()) window->ns.previous_front_most_application = app.processIdentifier;
if (window->ns.layer_shell.is_active && window->ns.layer_shell.config.type == GLFW_LAYER_SHELL_BACKGROUND) { if (window->ns.layer_shell.is_active && window->ns.layer_shell.config.type == GLFW_LAYER_SHELL_BACKGROUND) {
[window->ns.object orderBack:nil]; [window->ns.object orderBack:nil];
} else [window->ns.object orderFront:nil]; } else [window->ns.object orderFront:nil];
debug("Previously active application pid: %d bundle identifier: %s\n", window->ns.previous_front_most_application,
window->ns.previous_front_most_application ? [NSRunningApplication runningApplicationWithProcessIdentifier:window->ns.previous_front_most_application].bundleIdentifier.UTF8String : "");
} }
void _glfwPlatformHideWindow(_GLFWwindow* window) void _glfwPlatformHideWindow(_GLFWwindow* window)
{ {
[window->ns.object orderOut:nil]; [window->ns.object orderOut:nil];
pid_t prev_app_pid = window->ns.previous_front_most_application; window->ns.previous_front_most_application = 0;
NSRunningApplication *app;
if (window->ns.layer_shell.is_active && prev_app_pid > 0 && (app = [NSRunningApplication runningApplicationWithProcessIdentifier:prev_app_pid])) {
unsigned num_visible = 0;
for (_GLFWwindow *w = _glfw.windowListHead; w; w = w->next) {
if (_glfwPlatformWindowVisible(w)) num_visible++;
}
if (!num_visible) {
[NSApp yieldActivationToApplication: app];
[app activateWithOptions:0];
}
}
} }
void _glfwPlatformRequestWindowAttention(_GLFWwindow* window UNUSED) void _glfwPlatformRequestWindowAttention(_GLFWwindow* window UNUSED)