X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=b473686aea5a49b970e76dc303436c0502a41cd5;hb=aae4f66f68b32c8ad2760eeb12ebb9cb3d44602a;hp=eea8d148579042319fed27e2fc72e1413f28c2c3;hpb=e1081644c1eea458aab0901c76ebc7a112d280d7;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index eea8d148..b473686a 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -224,7 +224,7 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
     }
 
 
-    ob_debug_type(OB_DEBUG_FOCUS, "trying  the focus order\n");
+    ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n");
     for (it = focus_order; it; it = g_list_next(it))
         if (allow_refocus || it->data != old) {
             ObClient *c = it->data;
@@ -556,16 +556,15 @@ static gboolean valid_focus_target(ObClient *ft,
                      /* let alt-tab go to these windows when a window in its
                         group already has focus ... */
                      ((focus_client && ft->group == focus_client->group) ||
-                      /* ... or if there are no application windows in its
-                         group */
-                      !client_has_application_group_siblings(ft))));
+                      /* ... or if there are no main windows in its group */
+                      !client_has_non_helper_group_siblings(ft))));
 
     /* it's not set to skip the taskbar (unless it is a type that would be
        expected to set this hint */
-    ok = ok && (!(ft->type == OB_CLIENT_TYPE_DOCK ||
-                  ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-                  ft->type == OB_CLIENT_TYPE_MENU ||
-                  ft->type == OB_CLIENT_TYPE_UTILITY) ||
+    ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
+                 ft->type == OB_CLIENT_TYPE_TOOLBAR ||
+                 ft->type == OB_CLIENT_TYPE_MENU ||
+                 ft->type == OB_CLIENT_TYPE_UTILITY) ||
                 !ft->skip_taskbar);
 
     /* it's not going to just send fous off somewhere else (modal window) */