#include <glib.h>
#include <assert.h>
-#define FOCUS_INDICATOR_WIDTH 5
+#define FOCUS_INDICATOR_WIDTH 6
ObClient *focus_client = NULL;
GList *focus_order = NULL;
}
- 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;
/* 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];
}
g_free(title);
+ /* set this only if we're returning true and they asked for it */
+ if (ret && nametarget) *nametarget = p;
return ret;
}
/* 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;
}
}
+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)
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) */