X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=63eb2ccaf88ac7520d074c1b3abb9a71c6a9abff;hb=c716d1788bb4f4b9db403617023f06347ba48102;hp=a4eb2cfa32a76b000c16d6f7d2160519382ed49a;hpb=6dfc3c726a2164ba70cfac3df436ee035822bdb1;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index a4eb2cfa..63eb2cca 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -57,6 +57,14 @@ void focus_shutdown(gboolean reconfig)
 
 static void push_to_top(ObClient *client)
 {
+    ObClient *p;
+
+    /* if it is modal for a single window, then put that window at the top
+       of the focus order first, so it will be right after ours. the same is
+       done with stacking */
+    if (client->modal && (p = client_direct_parent(client)))
+        push_to_top(p);
+
     focus_order = g_list_remove(focus_order, client);
     focus_order = g_list_prepend(focus_order, client);
 }
@@ -189,13 +197,6 @@ void focus_nothing(void)
     /* nothing is focused, update the colormap and _the root property_ */
     focus_set_client(NULL);
 
-    /* if there is a grab going on, then we need to cancel it. if we move
-       focus during the grab, applications will get NotifyWhileGrabbed events
-       and ignore them !
-
-       actions should not rely on being able to move focus during an
-       interactive grab.
-    */
     event_cancel_all_key_grabs();
 
     /* when nothing will be focused, send focus to the backup target */
@@ -358,4 +359,3 @@ gboolean focus_valid_target(ObClient *ft,
 
     return ok;
 }
-