X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=8c023618e71188b85a5b02580733bf08b13c8567;hb=6d0f44e1d15b258fb29f303e2799b3184e4dcb3a;hp=25abdd5b57ddf4c9e20df8ab688cab462e4b6bfa;hpb=03b4c872054fd93f1337ee78c19338968de1fd6c;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 25abdd5b..8c023618 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -133,7 +133,8 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
         */
         if ((allow_omnipresent || c->desktop == screen_desktop) &&
             focus_valid_target(c, screen_desktop,
-                               TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) &&
+                               TRUE, FALSE, FALSE, TRUE, FALSE, FALSE,
+                               FALSE) &&
             !c->shaded &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
@@ -154,7 +155,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
            backup fallback though)
         */
         if (focus_valid_target(c, screen_desktop,
-                               TRUE, FALSE, FALSE, FALSE, TRUE, FALSE) &&
+                               TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE) &&
             (allow_refocus || client_focus_target(c) != old) &&
             client_focus(c))
         {
@@ -193,7 +194,7 @@ void focus_nothing(void)
 
     /* when nothing will be focused, send focus to the backup target */
     XSetInputFocus(obt_display, screen_support_win, RevertToPointerRoot,
-                   event_curtime);
+                   event_time());
 }
 
 void focus_order_add_new(ObClient *c)
@@ -288,7 +289,7 @@ static gboolean focus_target_has_siblings(ObClient *ft,
         if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL &&
             focus_valid_target(c, screen_desktop,
                                TRUE, iconic_windows, all_desktops,
-                               FALSE, FALSE, FALSE))
+                               TRUE, FALSE, FALSE, FALSE))
         {
             return TRUE;
         }
@@ -301,6 +302,7 @@ gboolean focus_valid_target(ObClient *ft,
                             gboolean helper_windows,
                             gboolean iconic_windows,
                             gboolean all_desktops,
+                            gboolean nonhilite_windows,
                             gboolean dock_windows,
                             gboolean desktop_windows,
                             gboolean user_request)
@@ -321,6 +323,9 @@ gboolean focus_valid_target(ObClient *ft,
     ok = (all_desktops || ft->desktop == desktop ||
           ft->desktop == DESKTOP_ALL);
 
+    /* if we only include hilited windows, check if the window is */
+    ok = ok && (nonhilite_windows || ft->demands_attention);
+
     /* the window can receive focus somehow */
     ok = ok && (ft->can_focus || ft->focus_notify);
 
@@ -350,11 +355,13 @@ gboolean focus_valid_target(ObClient *ft,
 
     /* it's not set to skip the taskbar (but this is overridden if the
        window is modal or if the user asked for this window to be focused,
-       or if the window is iconified, and it is not used for windows which are
+       or if the window is iconified (and does not have any parents with
+       which to uniconify it), and it is not used for windows which are
        hilited, or dialog windows as these need user interaction and should
        not be long-lasting windows */
     ok = ok && (!ft->skip_taskbar ||
-                (ft->modal || ft->iconic || user_request ||
+                (ft->modal || user_request ||
+                 (ft->iconic && !ft->parents) ||
                  ft->demands_attention ||
                  ft->type == OB_CLIENT_TYPE_DIALOG));
 
@@ -368,6 +375,7 @@ gboolean focus_valid_target(ObClient *ft,
                                                      TRUE,
                                                      iconic_windows,
                                                      all_desktops,
+                                                     nonhilite_windows,
                                                      dock_windows,
                                                      desktop_windows,
                                                      FALSE));