don't focus new windows when the user is in a menu or move/resizing a window

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 0392ee35e2a04e28481ac05754b12b247eb76614..a7b616d22eb2f5fd7db0ff62497db7d4a9dfb363 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -452,9 +452,18 @@ void client_manage(Window window)
                       "(last time %u)\n",
                       self->window, self->user_time, last_time);
 
+        if (menu_frame_visible || moveresize_in_progress) {
+            activate = FALSE;
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "Not focusing the window because the user is inside "
+                          "an Openbox menu or is move/resizing a window and "
+                          "we don't want to interrupt them\n");
+        }
+
         /* if it's on another desktop */
-        if (!(self->desktop == screen_desktop || self->desktop == DESKTOP_ALL)
-            && /* the timestamp is from before you changed desktops */
+        else if (!(self->desktop == screen_desktop ||
+              self->desktop == DESKTOP_ALL) &&
+            /* the timestamp is from before you changed desktops */
             self->user_time && screen_desktop_user_time &&
             !event_time_after(self->user_time, screen_desktop_user_time))
         {