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

diff --git a/openbox/focus.c b/openbox/focus.c
index eea8d148..393ec98e 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -37,7 +37,7 @@
 #include <glib.h>
 #include <assert.h>
 
-#define FOCUS_INDICATOR_WIDTH 5
+#define FOCUS_INDICATOR_WIDTH 6
 
 ObClient *focus_client = NULL;
 GList *focus_order = NULL;
@@ -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;
@@ -255,7 +255,7 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
     return desktop;   
 }
 
-void focus_fallback(gboolean allow_refocus)
+ObClient* focus_fallback(gboolean allow_refocus)
 {
     ObClient *new;
     ObClient *old = focus_client;
@@ -266,8 +266,11 @@ void focus_fallback(gboolean allow_refocus)
     */
     focus_nothing();
 
-    if ((new = focus_fallback_target(allow_refocus, old)))
+    if ((new = focus_fallback_target(allow_refocus, old))) {
         client_focus(new);
+        return new;
+    } else
+        return NULL;
 }
 
 void focus_nothing()
@@ -528,6 +531,28 @@ void focus_cycle_draw_indicator()
     }
 }
 
+static gboolean has_valid_group_siblings_on_desktop(ObClient *ft,
+                                                    gboolean all_desktops)
+                                                         
+{
+    GSList *it;
+
+    if (!ft->group) return FALSE;
+
+    for (it = ft->group->members; it; it = g_slist_next(it)) {
+        ObClient *c = it->data;
+        /* check that it's not a helper window to avoid infinite recursion */
+        if (c != ft && !client_helper(c) &&
+            valid_focus_target(c, all_desktops, FALSE))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/*! @param allow_helpers This is used for calling itself recursively while
+                         checking helper windows. */
 static gboolean valid_focus_target(ObClient *ft,
                                    gboolean all_desktops,
                                    gboolean dock_windows)
@@ -548,24 +573,24 @@ static gboolean valid_focus_target(ObClient *ft,
     if (dock_windows)
         ok = ok && ft->type == OB_CLIENT_TYPE_DOCK;
     else
-        ok = ok && (ft->type == OB_CLIENT_TYPE_NORMAL ||
-                    ft->type == OB_CLIENT_TYPE_DIALOG ||
-                    ((ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-                      ft->type == OB_CLIENT_TYPE_MENU ||
-                      ft->type == OB_CLIENT_TYPE_UTILITY) &&
-                     /* 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))));
+        /* normal non-helper windows are valid targets */
+        ok = ok &&
+            ((client_normal(ft) && !client_helper(ft))
+             ||
+             /* helper windows are valid targets it... */
+             (client_helper(ft) &&
+              /* ...a window in its group already has focus ... */
+              ((focus_client && ft->group == focus_client->group) ||
+               /* ... or if there are no other windows in its group 
+                  that can be cycled to instead */
+               !has_valid_group_siblings_on_desktop(ft, all_desktops))));
 
     /* 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) */