#include <X11/Xlib.h>
#include <glib.h>
-ObClient *focus_cycle_target = NULL;
+ObClient *focus_cycle_target = NULL;
+static gboolean focus_cycle_iconic_windows;
+static gboolean focus_cycle_all_desktops;
+static gboolean focus_cycle_dock_windows;
+static gboolean focus_cycle_desktop_windows;
-static void focus_cycle_destroy_notify (ObClient *client, gpointer data);
static gboolean focus_target_has_siblings (ObClient *ft,
gboolean iconic_windows,
gboolean all_desktops);
void focus_cycle_startup(gboolean reconfig)
{
if (reconfig) return;
-
- client_add_destroy_notify(focus_cycle_destroy_notify, NULL);
}
void focus_cycle_shutdown(gboolean reconfig)
{
if (reconfig) return;
-
- client_remove_destroy_notify(focus_cycle_destroy_notify);
-}
-
-void focus_cycle_stop()
-{
- if (focus_cycle_target)
- focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
}
-static void focus_cycle_destroy_notify(ObClient *client, gpointer data)
+void focus_cycle_stop(ObClient *ifclient)
{
- /* end cycling if the target disappears. CurrentTime is fine, time won't
- be used
- */
- if (focus_cycle_target == client)
+ /* stop focus cycling if the given client is a valid focus target,
+ and so the cycling is being disrupted */
+ if (focus_cycle_target && ifclient &&
+ focus_cycle_target_valid(ifclient,
+ focus_cycle_iconic_windows,
+ focus_cycle_all_desktops,
+ focus_cycle_dock_windows,
+ focus_cycle_desktop_windows))
+ {
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+ focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);
+ }
}
/*! Returns if a focus target has valid group siblings that can be cycled
!ft->skip_taskbar);
/* it's not going to just send fous off somewhere else (modal window) */
- ok = ok && ft == client_focus_target(ft);
+ {
+ ObClient *cft = client_focus_target(ft);
+ ok = ok && (ft == cft || (cft->desktop != DESKTOP_ALL &&
+ cft->desktop != ft->desktop));
+ }
return ok;
}
goto done_cycle;
list = client_list;
}
- if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+
+ if (focus_cycle_target == NULL) {
+ focus_cycle_iconic_windows = TRUE;
+ focus_cycle_all_desktops = all_desktops;
+ focus_cycle_dock_windows = dock_windows;
+ focus_cycle_desktop_windows = desktop_windows;
+ focus_cycle_target = focus_client;
+ }
start = it = g_list_find(list, focus_cycle_target);
if (!start) /* switched desktops or something? */
if (it == NULL) it = g_list_last(list);
}
ft = it->data;
- if (focus_cycle_target_valid(ft, TRUE,
- all_desktops, dock_windows,
- desktop_windows))
+ if (focus_cycle_target_valid(ft,
+ focus_cycle_iconic_windows,
+ focus_cycle_all_desktops,
+ focus_cycle_dock_windows,
+ focus_cycle_desktop_windows))
{
if (interactive) {
if (ft != focus_cycle_target) { /* prevents flicker */
}
if (dialog)
/* same arguments as focus_target_valid */
- focus_cycle_popup_show(ft, TRUE,
- all_desktops, dock_windows,
- desktop_windows);
+ focus_cycle_popup_show(ft,
+ focus_cycle_iconic_windows,
+ focus_cycle_all_desktops,
+ focus_cycle_dock_windows,
+ focus_cycle_desktop_windows);
return;
} else if (ft != focus_cycle_target) {
focus_cycle_target = ft;
if (!focus_order)
goto done_cycle;
+ if (focus_cycle_target == NULL) {
+ focus_cycle_iconic_windows = FALSE;
+ focus_cycle_all_desktops = FALSE;
+ focus_cycle_dock_windows = dock_windows;
+ focus_cycle_desktop_windows = desktop_windows;
+ focus_cycle_target = focus_client;
+ }
+
if (!first) first = focus_client;
- if (!focus_cycle_target) focus_cycle_target = focus_client;
if (focus_cycle_target)
ft = focus_find_directional(focus_cycle_target, dir, dock_windows,
GList *it;
for (it = focus_order; it; it = g_list_next(it))
- if (focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows,
- desktop_windows))
+ if (focus_cycle_target_valid(it->data,
+ focus_cycle_iconic_windows,
+ focus_cycle_all_desktops,
+ focus_cycle_dock_windows,
+ focus_cycle_desktop_windows))
ft = it->data;
}
if (focus_cycle_target && dialog) {
/* same arguments as focus_target_valid */
focus_cycle_popup_single_show(focus_cycle_target,
- FALSE, FALSE, dock_windows,
- desktop_windows);
+ focus_cycle_iconic_windows,
+ focus_cycle_all_desktops,
+ focus_cycle_dock_windows,
+ focus_cycle_desktop_windows);
return;
}