Skip to content

Fix focus_follows_mouse switching active window on desktop return #9873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lxcode wants to merge 1 commit into from
Closed

Fix focus_follows_mouse switching active window on desktop return #9873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ Detailed list of changes

- Change :opt:`focus_follows_mouse` to switch the active window only when the mouse crosses into a different window, instead of on every mouse motion event. Prevents accidental mouse bumps from undoing a keyboard-driven window switch.

- Fix :opt:`focus_follows_mouse` switching the active window when returning from another desktop/space, instead of preserving the previously active window.

- Wayland: Use hold gestures to cancel momentum scrolling when fingers are placed on the trackpad, for a more natural kinetic scrolling experience (:iss:`9863`)

- Fix thickness of diagonal lines in box drawing characters not the same as horizontal/vertical lines (:iss:`9719`)
Expand Down
14 changes: 7 additions & 7 deletions kitty/mouse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ update_scrollbar_hover_state(Window *w, bool hovering) {
}

static void
set_currently_hovered_window(id_type window_id, int modifiers) {
set_currently_hovered_window(id_type window_id, int modifiers, bool focus_follows) {
if (global_state.mouse_hover_in_window != window_id) {
Window *left_window = window_for_id(global_state.mouse_hover_in_window);
global_state.mouse_hover_in_window = window_id;
Expand All @@ -196,7 +196,7 @@ set_currently_hovered_window(id_type window_id, int modifiers) {
debug("Sent mouse leave event to window: %llu\n", left_window->id);
}
}
if (window_id && OPT(focus_follows_mouse) && global_state.callback_os_window && global_state.callback_os_window->num_tabs) {
if (focus_follows && window_id && OPT(focus_follows_mouse) && global_state.callback_os_window && global_state.callback_os_window->num_tabs) {
Tab *t = global_state.callback_os_window->tabs + global_state.callback_os_window->active_tab;
for (unsigned i = 0; i < t->num_windows; i++) {
if (t->windows[i].id == window_id) {
Expand Down Expand Up @@ -927,7 +927,7 @@ currently_pressed_button(void) {
HANDLER(handle_event) {
modifiers &= ~GLFW_LOCK_MASK;
set_mouse_cursor_for_screen(w->render_data.screen);
set_currently_hovered_window(w->id, modifiers);
set_currently_hovered_window(w->id, modifiers, true);
if (button == -1) {
button = currently_pressed_button();
handle_move_event(w, button, modifiers, window_idx);
Expand All @@ -948,7 +948,7 @@ handle_window_title_bar_mouse(Window *w, int button, int modifiers, int action)

static void
handle_tab_bar_mouse(int button, int modifiers, int action) {
set_currently_hovered_window(0, modifiers);
set_currently_hovered_window(0, modifiers, false);
OSWindow *w = global_state.callback_os_window;
// dont report motion events, as they are expensive and useless
if (w && (button > -1 || global_state.tab_being_dragged.id)) {
Expand Down Expand Up @@ -1139,7 +1139,7 @@ update_mouse_pointer_shape(void) {
void
leave_event(int modifiers) {
if (global_state.redirect_mouse_handling || global_state.active_drag_in_window || global_state.tracked_drag_in_window) return;
set_currently_hovered_window(0, modifiers);
set_currently_hovered_window(0, modifiers, false);
}

void
Expand All @@ -1161,7 +1161,7 @@ enter_event(int modifiers) {
if (global_state.redirect_mouse_handling || global_state.active_drag_in_window || global_state.tracked_drag_in_window) return;
MouseRegion r = mouse_region(false, false);
Window *w = r.window;
set_currently_hovered_window(w ? w->id : 0, modifiers);
set_currently_hovered_window(w ? w->id : 0, modifiers, false);
if (!w || r.in_tab_bar || r.in_title_bar) return;

if (handle_scrollbar_mouse(w, -1, MOVE, modifiers)) return;
Expand Down Expand Up @@ -1347,7 +1347,7 @@ mouse_event(const int button, int modifiers, int action) {
}
MouseRegion r = mouse_region(true, true);
w = r.window; window_idx = r.window_idx;
set_currently_hovered_window(w && !r.window_border && !r.in_title_bar ? w->id : 0, modifiers);
set_currently_hovered_window(w && !r.window_border && !r.in_title_bar ? w->id : 0, modifiers, true);

if (r.in_tab_bar || global_state.tab_being_dragged.id) {
mouse_cursor_shape = POINTER_POINTER;
Expand Down
Loading