(w32_read_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/w32term.c b/src/w32term.c
index e56a74e0edd..f3d13b826e1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4339,7 +4339,13 @@ w32_read_socket (sd, expected, hold_quit)
                      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;