Disable focus during grab safeguards.

diff --git a/openbox/client.c b/openbox/client.c
index d1bdd163925f512708cab304068154bbf1374cda..55402cc65667fe4dd607a719a95bb6553b8c4165 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -426,17 +426,8 @@ void client_manage(Window window, ObPrompt *prompt)
                       self->window, map_time, launch_time,
                       event_last_user_time);
 
-        if (menu_frame_visible || moveresize_in_progress) {
-            activate = FALSE;
-            raise = TRUE;
-            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");
-        }
-
         /* if it's on another desktop */
-        else if (!(self->desktop == screen_desktop ||
+        if (!(self->desktop == screen_desktop ||
                    self->desktop == DESKTOP_ALL) &&
                  /* the timestamp is from before you changed desktops */
                  launch_time && screen_desktop_user_time &&

diff --git a/openbox/event.c b/openbox/event.c
index aca69cc36aab7380ea9dcee15611f6e63e8c12d3..e6a5719c98b7bb24551b02f2fb92c3b20c53c58d 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1918,9 +1918,6 @@ static gboolean focus_delay_func(gpointer data)
     ObFocusDelayData *d = data;
     Time old = event_curtime;
 
-    /* don't move focus and kill the menu or the move/resize */
-    if (menu_frame_visible || moveresize_in_progress) return FALSE;
-
     event_curtime = d->time;
     event_curserial = d->serial;
     if (client_focus(d->client) && config_focus_raise)
@@ -1999,6 +1996,7 @@ static gboolean is_enter_focus_event_ignored(gulong serial)
 
 void event_cancel_all_key_grabs(void)
 {
+    return;
     if (actions_interactive_act_running()) {
         actions_interactive_cancel_act();
         ob_debug("KILLED interactive action");