this fixes pypanel.. heh.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 5d9e0fe4a294078ceed942bdc7bcddc207dc7278..80cd0b080affecc29f00e8b10272ddcfe0040a9e 100644 (file)
--- 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;
@@ -295,7 +295,6 @@ static gchar *popup_get_name(ObClient *c, ObClient **nametarget)
     /* find our highest direct parent, including non-normal windows */
     for (p = c; p->transient_for && p->transient_for != OB_TRAN_GROUP;
          p = p->transient_for);
-    if (nametarget) *nametarget = p;
 
     if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop)
         desk = screen_desktop_names[c->desktop];
@@ -315,6 +314,8 @@ static gchar *popup_get_name(ObClient *c, ObClient **nametarget)
     }
     g_free(title);
 
+    /* set this only if we're returning true and they asked for it */
+    if (ret && nametarget) *nametarget = p;
     return ret;
 }
 
@@ -361,13 +362,15 @@ static void popup_cycle(ObClient *c, gboolean show,
         /* make it null terminated so we can use g_strfreev */
         names = g_new(char*, n+1);
         for (it = targets, i = 0; it; it = g_list_next(it), ++i) {
-            ObClient *ft = it->data;
-            names[i] = popup_get_name(ft, &showtarget);
+            ObClient *ft = it->data, *t;
+            names[i] = popup_get_name(ft, &t);
 
-            /* little optimization.. save this text so we dont have to get it
-               again */
-            if (ft == c)
+            /* little optimization.. save this text and client, so we dont
+               have to get it again */
+            if (ft == c) {
                 showtext = g_strdup(names[i]);
+                showtarget = t;
+            }
         }
         names[n] = NULL;
 
@@ -525,6 +528,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(ft) &&
+            valid_focus_target(ft, 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)
@@ -545,24 +570,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) */