(XTread_socket): When focus_follows_mouse is nil make

SELECT_WINDOW_EVENT only if we don't leave the selected
frame.

1 files changed, 7 insertions, 1 deletions

diff --git a/src/macterm.c b/src/macterm.c
index f101899ddf9..726a0f72b18 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -11128,7 +11128,13 @@ XTread_socket (sd, expected, hold_quit)
                              will be selected only when it is active.  */
                           if (WINDOWP (window)
                               && !EQ (window, last_window)
-                              && !EQ (window, selected_window))
+                              && !EQ (window, selected_window)
+                              /* For click-to-focus window managers
+                                 create event iff we don't leave the
+                                 selected frame.  */
+                              && (focus_follows_mouse
+                                  || (EQ (XWINDOW (window)->frame,
+                                          XWINDOW (selected_window)->frame))))
                             {
                               inev.kind = SELECT_WINDOW_EVENT;
                               inev.frame_or_window = window;