KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mouse position reported incorrectly on click event in a newly created window if the mouse has never moved in that window

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-22 15:10:14 +05:30
parent 3867620be5
commit 720bf7efd6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kitty/mouse.c
View File

@ -327,23 +327,31 @@ detect_url(Screen *screen, unsigned int x, unsigned int y) {
else set_mouse_cursor_for_screen(screen); else set_mouse_cursor_for_screen(screen);
} }
static bool
set_mouse_position(Window *w, bool *mouse_cell_changed, bool *cell_half_changed) {
unsigned int x = 0, y = 0;
bool in_left_half_of_cell = false;
if (!cell_for_pos(w, &x, &y, &in_left_half_of_cell, global_state.callback_os_window)) return false;
*mouse_cell_changed = x != w->mouse_pos.cell_x || y != w->mouse_pos.cell_y;
*cell_half_changed = in_left_half_of_cell != w->mouse_pos.in_left_half_of_cell;
w->mouse_pos.cell_x = x; w->mouse_pos.cell_y = y;
w->mouse_pos.in_left_half_of_cell = in_left_half_of_cell;
return true;
}
HANDLER(handle_move_event) { HANDLER(handle_move_event) {
modifiers &= ~GLFW_LOCK_MASK; modifiers &= ~GLFW_LOCK_MASK;
unsigned int x = 0, y = 0;
if (OPT(focus_follows_mouse)) { if (OPT(focus_follows_mouse)) {
Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab; Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab;
if (window_idx != t->active_window) { if (window_idx != t->active_window) {
call_boss(switch_focus_to, "K", t->windows[window_idx].id); call_boss(switch_focus_to, "K", t->windows[window_idx].id);
} }
} }
bool in_left_half_of_cell = false; bool mouse_cell_changed = false;
if (!cell_for_pos(w, &x, &y, &in_left_half_of_cell, global_state.callback_os_window)) return; bool cell_half_changed = false;
if (!set_mouse_position(w, &mouse_cell_changed, &cell_half_changed)) return;
Screen *screen = w->render_data.screen; Screen *screen = w->render_data.screen;
if(OPT(detect_urls)) detect_url(screen, x, y); if(OPT(detect_urls)) detect_url(screen, w->mouse_pos.cell_x, w->mouse_pos.cell_y);
bool mouse_cell_changed = x != w->mouse_pos.cell_x || y != w->mouse_pos.cell_y;
bool cell_half_changed = in_left_half_of_cell != w->mouse_pos.in_left_half_of_cell;
w->mouse_pos.cell_x = x; w->mouse_pos.cell_y = y;
w->mouse_pos.in_left_half_of_cell = in_left_half_of_cell;
bool in_tracking_mode = ( bool in_tracking_mode = (
screen->modes.mouse_tracking_mode == ANY_MODE || screen->modes.mouse_tracking_mode == ANY_MODE ||
(screen->modes.mouse_tracking_mode == MOTION_MODE && button >= 0)); (screen->modes.mouse_tracking_mode == MOTION_MODE && button >= 0));
@ -497,6 +505,8 @@ HANDLER(handle_button_event) {
} }
Screen *screen = w->render_data.screen; Screen *screen = w->render_data.screen;
if (!screen) return; if (!screen) return;
bool a, b;
set_mouse_position(w, &a, &b);
id_type wid = w->id; id_type wid = w->id;
if (!dispatch_mouse_event(w, button, is_release ? -1 : 1, modifiers, screen->modes.mouse_tracking_mode != 0)) { if (!dispatch_mouse_event(w, button, is_release ? -1 : 1, modifiers, screen->modes.mouse_tracking_mode != 0)) {
if (screen->modes.mouse_tracking_mode != 0) { if (screen->modes.mouse_tracking_mode != 0) {