CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-07-10 09:43:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make first mouse clicks activate and pass through

Browse source 
Allow the first mouse click on an inactive Cocoa OS window to be delivered to kitty instead of only activating the window.

Make the matching kitty-internal behavior consistent by forwarding clicks that switch focus to another kitty window in the currently focused OS window. This lets the same first click both focus the target kitty window and perform the click action, including forwarding to mouse-tracking applications.
This commit is contained in:
zhaolei 2026-07-07 15:35:48 +08:00
parent cc95fccc8d
commit e7a7362d54
3 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glfw/cocoa_window.m
View file

@ -1016,7 +1016,7 @@ static void _glfwUpdateNotchCover(_GLFWwindow*);
- (BOOL)acceptsFirstMouse:(NSEvent *)event
{
(void)event;
return NO; // changed by Kovid, to follow cocoa platform conventions
return YES; // follow cocoa platform conventions
}
- (void)mouseDown:(NSEvent *)event

23
kitty/mouse.c
View file

@ -870,27 +870,10 @@ HANDLER(handle_button_event) {
Tab *t = osw->tabs + osw->active_tab;
bool is_release = !osw->mouse_button_pressed[button];
if (button == GLFW_MOUSE_BUTTON_LEFT && osw->suppress_left_mouse_release) {
osw->suppress_left_mouse_release = false;
if (is_release) {
zero_at_ptr(&w->drag_source.initial_left_press);
return;
}
}
if (handle_scrollbar_mouse(w, button, is_release ? RELEASE : PRESS, modifiers)) return;
bool suppress_child_forwarding = false;
if (osw->is_focused && window_idx != t->active_window && !is_release) {
call_boss(switch_focus_to_in_active_tab, "K", t->windows[window_idx].id);
if (button == GLFW_MOUSE_BUTTON_LEFT) {
// Treat split-focus transfer clicks as focus-only for child processes:
// suppress forwarding the left press and matching release to the child
// to avoid release-without-press reports. Still allow kitty to process
// the event internally (e.g., start text selection via click-and-drag).
osw->suppress_left_mouse_release = true;
suppress_child_forwarding = true;
}
}
Screen *screen = w->render_data.screen;
@ -909,7 +892,7 @@ HANDLER(handle_button_event) {
}
id_type wid = w->id;
if (!dispatch_mouse_event(w, button, is_release ? -1 : 1, modifiers, screen->modes.mouse_tracking_mode != 0)) {
if (!suppress_child_forwarding && screen->modes.mouse_tracking_mode != 0) {
if (screen->modes.mouse_tracking_mode != 0) {
int sz = encode_mouse_button(w, button, is_release ? RELEASE : PRESS, modifiers);
if (sz > 0) { mouse_event_buf[sz] = 0; write_escape_code_to_child(screen, ESC_CSI, mouse_event_buf); }
}
@ -1316,10 +1299,6 @@ mouse_event(const int button, int modifiers, int action) {
w = window_for_id(global_state.active_drag_in_window);
if (w) {
end_drag(w);
// Clear any stale suppress flag that was set during a focus-transfer
// press, since the drag release bypasses handle_button_event where
// it would normally be cleared.
if (osw) osw->suppress_left_mouse_release = false;
debug("handled as drag end\n");
dispatch_possible_click(w, button, modifiers);
return;

1
kitty/state.h
View file

@ -446,7 +446,6 @@ typedef struct OSWindow {
double mouse_x, mouse_y;
bool mouse_button_pressed[32];
bool has_too_few_tabs;
bool suppress_left_mouse_release;
PyObject *window_title;
bool disallow_title_changes, title_is_overriden;
bool viewport_size_dirty, viewport_updated_at_least_once;