Window focus_backup = None;
gboolean focus_new = TRUE;
-gboolean focus_follow = TRUE;
+gboolean focus_follow = FALSE;
+static gboolean focus_last = TRUE;
+static gboolean focus_last_on_desktop = TRUE;
static gboolean noreorder = 0;
else {
focus_follow = value->data.bool;
}
+ } else if (!g_ascii_strcasecmp(name, "focuslast")) {
+ if (value->type != TOKEN_BOOL)
+ yyerror("invalid value");
+ else {
+ focus_last = value->data.bool;
+ }
+ } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
+ if (value->type != TOKEN_BOOL)
+ yyerror("invalid value");
+ else {
+ focus_last_on_desktop = value->data.bool;
+ }
} else
yyerror("invalid option");
parse_free_token(value);
focus_client = NULL;
focus_new = TRUE;
- focus_follow = TRUE;
+ focus_follow = FALSE;
+ focus_last = TRUE;
+ focus_last_on_desktop = TRUE;
attrib.override_redirect = TRUE;
focus_backup = XCreateWindow(ob_display, ob_root,
if (desktop == DESKTOP_ALL) desktop = screen_desktop;
focus_order[desktop] = g_list_remove(focus_order[desktop], client);
focus_order[desktop] = g_list_prepend(focus_order[desktop], client);
- g_message("REORDERING");
}
void focus_set_client(Client *client)
void focus_fallback(gboolean switching_desks)
{
GList *it;
- gboolean under = FALSE;
Client *old = NULL;
old = focus_client;
if (switching_desks) {
/* don't skip any windows when switching desktops */
old = NULL;
- } else {
- if (focus_follow)
- under = focus_under_pointer();
}
- if (!under) {
- for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
- if (it->data != old && client_normal(it->data))
- if (client_focus(it->data))
- break;
- if (it == NULL) /* nothing to focus */
- focus_set_client(NULL);
+ if (!(switching_desks ? focus_last_on_desktop : focus_last)) {
+ if (focus_follow) focus_under_pointer();
+ return;
}
+
+ for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+ if (it->data != old && client_normal(it->data))
+ if (client_focus(it->data))
+ return;
+
+ /* nothing to focus */
+ focus_set_client(NULL);
}
void focus_cycle(gboolean forward, gboolean linear, gboolean done,
else list = focus_order[screen_desktop];
start = it = g_list_find(list, focus_client);
- if (!start) goto done_cycle; /* switched desktops or something? */
+ if (!start) /* switched desktops or something? */
+ start = it = forward ? g_list_last(list) : g_list_first(list);
+ if (!start) goto done_cycle;
do {
if (forward) {