From d4c2f5b524a262934cbfac5b7a4e9affb2628a00 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 2 Feb 2022 04:56:55 +0000 Subject: [PATCH] Improve behaviour of `mouse-autoselect-window' on Haiku * src/haikuterm.c (haiku_read_socket): Don't select windows if the selected window is a minibuffer window or a popup is activated. --- src/haikuterm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/haikuterm.c b/src/haikuterm.c index 0a3695df19d..c25e73f8c1a 100644 --- a/src/haikuterm.c +++ b/src/haikuterm.c @@ -2816,9 +2816,10 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit) if (WINDOWP (window) && !EQ (window, last_mouse_window) && !EQ (window, selected_window) + && !popup_activated_p + && !MINI_WINDOW_P (XWINDOW (selected_window)) && (!NILP (focus_follows_mouse) - || (EQ (XWINDOW (window)->frame, - XWINDOW (selected_window)->frame)))) + || f == SELECTED_FRAME ())) { inev.kind = SELECT_WINDOW_EVENT; inev.frame_or_window = window; -- 2.39.5