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.

diff --git a/src/haikuterm.c b/src/haikuterm.c
index 0a3695df19d361a4d1bdc4544f236b394f94cfb6..c25e73f8c1a861a1bf6308763efa6418d8a47283 100644 (file)
--- 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;