X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus.c;h=c2d7e11e5dd879d8a776fd7bfb65ce0524d1d3db;hb=c313b219a226c3b968ff312b96120eef0c527d91;hp=9a0b2bdc31b466c21ab6c151fbed345c2225ed5c;hpb=0d0ce065df9ff1acc06fe63e4a0fe45c184de693;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 9a0b2bdc..c2d7e11e 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);
 }
@@ -159,7 +167,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
 }
 
 ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
-                         gboolean allow_omnipresent)
+                         gboolean allow_omnipresent, gboolean focus_lost)
 {
     ObClient *new;
     ObClient *old = focus_client;
@@ -167,7 +175,8 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
     /* unfocus any focused clients.. they can be focused by Pointer events
        and such, and then when we try focus them, we won't get a FocusIn
        event at all for them. */
-    focus_nothing();
+    if (focus_lost)
+        focus_nothing();
 
     new = focus_fallback_target(allow_refocus, allow_pointer,
                                 allow_omnipresent, old);
@@ -177,7 +186,7 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
     return new;
 }
 
-void focus_nothing()
+void focus_nothing(void)
 {
     /* Install our own colormap */
     if (focus_client != NULL) {
@@ -274,7 +283,7 @@ ObClient *focus_order_find_first(guint desktop)
 static gboolean focus_target_has_siblings(ObClient *ft,
                                           gboolean iconic_windows,
                                           gboolean all_desktops)
-                                                         
+
 {
     GSList *it;
 
@@ -320,7 +329,7 @@ gboolean focus_valid_target(ObClient *ft,
         ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) ||
                     (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP));
     /* modal windows are important and can always get focus if they are
-       visible and stuff, so don't change 'ok' based on their type */ 
+       visible and stuff, so don't change 'ok' based on their type */
     else if (!ft->modal)
         /* normal non-helper windows are valid targets */
         ok = ok &&
@@ -332,17 +341,13 @@ gboolean focus_valid_target(ObClient *ft,
                  include helper windows ... */
               ((focus_client && ft->group == focus_client->group &&
                 helper_windows) ||
-               /* ... or if there are no other windows in its group 
+               /* ... or if there are no other windows in its group
                   that can be focused instead */
                !focus_target_has_siblings(ft, iconic_windows, all_desktops))));
 
-    /* it's not set to skip the taskbar (unless it is a type that would be
-       expected to set this hint, or modal) */
-    ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
-                 ft->type == OB_CLIENT_TYPE_DESKTOP ||
-                 ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-                 ft->type == OB_CLIENT_TYPE_MENU ||
-                 ft->type == OB_CLIENT_TYPE_UTILITY) ||
+    /* it's not set to skip the taskbar (but this only applies to normal typed
+       windows, and is overridden if the window is modal) */
+    ok = ok && (ft->type != OB_CLIENT_TYPE_NORMAL ||
                 ft->modal ||
                 !ft->skip_taskbar);