From: Dana Jansens <danakj@orodu.net>
Date: Tue, 8 May 2007 18:48:58 +0000 (+0000)
Subject: make r6179 more reliable and consistant
X-Git-Tag: openbox-3_3_991-RELEASE~137
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c63f47b17bde1dadcb280d8066d52f91087df780;p=dana%2Fopenbox.git

make r6179 more reliable and consistant
---

diff --git a/openbox/focus.c b/openbox/focus.c
index 71d22026..08542f9d 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -528,8 +528,9 @@ void focus_cycle_draw_indicator()
     }
 }
 
-static gboolean has_non_helper_group_siblings_on_desktop(ObClient *ft,
-                                                         gboolean all_desktops)
+static gboolean has_valid_group_siblings_on_desktop(ObClient *ft,
+                                                    gboolean all_desktops)
+                                                         
 {
     GSList *it;
 
@@ -537,9 +538,9 @@ static gboolean has_non_helper_group_siblings_on_desktop(ObClient *ft,
 
     for (it = ft->group->members; it; it = g_slist_next(it)) {
         ObClient *c = it->data;
-        if (c != ft && client_normal(c) && !client_helper(c) &&
-            (c->desktop == ft->desktop || c->desktop == DESKTOP_ALL ||
-             all_desktops))
+        /* check that it's not a helper window to avoid infinite recursion */
+        if (c != ft && !client_helper(ft) &&
+            valid_focus_target(ft, all_desktops, FALSE))
         {
             return TRUE;
         }
@@ -547,6 +548,8 @@ static gboolean has_non_helper_group_siblings_on_desktop(ObClient *ft,
     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)
@@ -567,18 +570,17 @@ 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 main windows in its group */
-                      !has_non_helper_group_siblings_on_desktop(ft,
-                                                                all_desktops))
-                        ));
+        /* 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 */