static ObIconPopup *focus_cycle_popup;
-static void focus_cycle_destructor(ObClient *c)
+static void focus_cycle_destructor(ObClient *client, gpointer data)
{
/* end cycling if the target disappears */
- if (focus_cycle_target == c)
+ if (focus_cycle_target == client)
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
}
focus_cycle_popup = icon_popup_new(TRUE);
if (!reconfig) {
- client_add_destructor((GDestroyNotify) focus_cycle_destructor);
+ client_add_destructor(focus_cycle_destructor, NULL);
/* start with nothing focused */
focus_set_client(NULL);
icon_popup_free(focus_cycle_popup);
if (!reconfig) {
- client_remove_destructor((GDestroyNotify) focus_cycle_destructor);
+ client_remove_destructor(focus_cycle_destructor);
for (i = 0; i < screen_num_desktops; ++i)
g_list_free(focus_order[i]);
g_free(focus_order);
/* reset focus to root */
- XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
- event_lasttime);
+ XSetInputFocus(ob_display, PointerRoot, RevertToNone, event_lasttime);
}
}
screen_install_colormap(client, TRUE);
if (client == NULL) {
- /* when nothing will be focused, send focus to the backup target */
- XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
+#ifdef DEBUG_FOCUS
+ ob_debug("actively focusing NONWINDOW\n");
+#endif
+ /* when nothing will be focused, send focus to the backup target */
+ XSetInputFocus(ob_display, screen_support_win, RevertToNone,
event_lasttime);
XSync(ob_display, FALSE);
}
*/
focus_set_client(NULL);
- if (!config_focus_last && config_focus_follow)
- if (focus_under_pointer())
- return;
-
if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
- /* try for transient relations */
if (old->transient_for) {
- if (old->transient_for == OB_TRAN_GROUP) {
- for (it = focus_order[screen_desktop]; it; it = it->next) {
- GSList *sit;
+ gboolean trans = FALSE;
- for (sit = old->group->members; sit; sit = sit->next)
- if (sit->data == it->data)
- if (focus_fallback_transient(sit->data, old))
- return;
+ if (!config_focus_follow)
+ trans = TRUE;
+ else {
+ ObClient *c;
+
+ if ((c = client_under_pointer()) &&
+ client_search_transient(client_search_top_transient(c),
+ old))
+ trans = TRUE;
+ }
+
+ /* try for transient relations */
+ if (trans) {
+ if (old->transient_for == OB_TRAN_GROUP) {
+ for (it = focus_order[screen_desktop]; it; it = it->next) {
+ GSList *sit;
+
+ for (sit = old->group->members; sit; sit = sit->next)
+ if (sit->data == it->data)
+ if (focus_fallback_transient(sit->data, old))
+ return;
+ }
+ } else {
+ if (focus_fallback_transient(old->transient_for, old))
+ return;
}
- } else {
- if (focus_fallback_transient(old->transient_for, old))
- return;
}
}
+ }
+
+ if (config_focus_follow)
+ if (focus_under_pointer())
+ return;
#if 0
/* try for group relations */
}
}
#endif
- }
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
- if (client_normal(it->data) &&
- /* dont fall back to 'anonymous' fullscreen windows. theres no
- checks for this is in transient/group fallbacks, so they can
- be fallback targets there. */
- !((ObClient*)it->data)->fullscreen &&
- client_can_focus(it->data)) {
+ if (client_normal(it->data) && client_can_focus(it->data)) {
gboolean r = client_focus(it->data);
assert(r);
return;
static void popup_cycle(ObClient *c, gboolean show)
{
- if (!show || !config_dialog_focus) {
+ if (!show) {
icon_popup_hide(focus_cycle_popup);
} else {
Rect *a;
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 */
- return (ft->transients == NULL && client_normal(ft) &&
+ return (!ft->transients && client_normal(ft) &&
((ft->can_focus || ft->focus_notify) &&
!ft->skip_taskbar &&
(ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
it = it->prev;
if (it == NULL) it = g_list_last(list);
}
- /*ft = client_focus_target(it->data);*/
ft = it->data;
if (valid_focus_target(ft)) {
if (ft != focus_cycle_target) { /* prevents flicker */