#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;
}
icon_popup_position(focus_cycle_popup, CenterGravity,
a->x + a->width / 2, a->y + a->height / 2);
icon_popup_height(focus_cycle_popup, POPUP_HEIGHT);
+ icon_popup_min_width(focus_cycle_popup, POPUP_WIDTH);
+ icon_popup_max_width(focus_cycle_popup,
+ MAX(a->width/3, POPUP_WIDTH));
+
/* make its width to be the width of all the possible titles */
/* 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;
- icon_popup_width_to_strings(focus_cycle_popup,
- names, n,
- MAX(a->width/3, POPUP_WIDTH));
+ icon_popup_text_width_to_strings(focus_cycle_popup, names, n);
g_strfreev(names);
}
}
}
+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)
{
gboolean ok = FALSE;
- /* we don't use client_can_focus here, because that doesn't let you
- focus an iconic window, but we want to be able to, so we just check
- if the focus flags on the window allow it, and its on the current
- desktop */
+
+ /* it's on this desktop unless you want all desktops.
+
+ do this check first because it will usually filter out the most
+ windows */
+ ok = (all_desktops || ft->desktop == screen_desktop ||
+ ft->desktop == DESKTOP_ALL);
+
+ /* the window can receive focus somehow */
+ ok = ok && (ft->can_focus || ft->focus_notify);
+
+ /* it's the right type of window */
if (dock_windows)
- ok = ft->type == OB_CLIENT_TYPE_DOCK;
+ ok = ok && ft->type == OB_CLIENT_TYPE_DOCK;
else
- 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))));
- ok = ok && (ft->can_focus || ft->focus_notify);
- if (!dock_windows && /* use dock windows that skip taskbar too */
- !(ft->type == OB_CLIENT_TYPE_TOOLBAR || /* also, if we actually are */
- ft->type == OB_CLIENT_TYPE_MENU || /* being allowed to target */
- ft->type == OB_CLIENT_TYPE_UTILITY)) /* one of these, don't let */
- ok = ok && !ft->skip_taskbar; /* skip taskbar stop us */
- if (!all_desktops)
- ok = ok && (ft->desktop == screen_desktop ||
- ft->desktop == DESKTOP_ALL);
+ /* 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) ||
+ !ft->skip_taskbar);
+
+ /* it's not going to just send fous off somewhere else (modal window) */
ok = ok && ft == client_focus_target(ft);
- return ok;
-/*
- {
- GSList *it;
- for (it = ft->transients; it; it = g_slist_next(it)) {
- ObClient *c = it->data;
-
- if (frame_visible(c->frame))
- return FALSE;
- }
- return TRUE;
- }
-*/
+ return ok;
}
void focus_cycle(gboolean forward, gboolean all_desktops,
projects / chaz / openbox / blobdiff