}
}
-static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old,
+ gboolean send_focus)
{
GList *it;
ObClient *c;
if (config_focus_follow && !config_focus_last)
if ((c = client_under_pointer()) &&
(allow_refocus || c != old) &&
- (client_normal(c) &&
- client_focus(c)))
+ client_normal(c) &&
+ /* if we're sending focus then try to */
+ ((send_focus && client_focus(c)) ||
+ /* if not just see if we could try, or it's already focused */
+ (!send_focus && (c == old || client_can_focus(c)))))
{
- ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n");
+ ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff (%d)\n",
+ send_focus);
return c;
}
if (allow_refocus && old &&
old->desktop == DESKTOP_ALL &&
client_normal(old) &&
- client_focus(old))
+ /* this one is only for when not sending focus, to keep it there */
+ !send_focus)
{
- ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n");
+ ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness (%d)\n",
+ send_focus);
return old;
}
if (c->desktop == screen_desktop &&
client_normal(c) &&
(allow_refocus || c != old) &&
- client_focus(c))
+ /* if we're sending focus then try to */
+ ((send_focus && client_focus(c)) ||
+ /* if not just see if we could try, or it's already focused */
+ (!send_focus && (c == old || client_can_focus(c)))))
{
- ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
+ ob_debug_type(OB_DEBUG_FOCUS, "found in focus order (%d)\n",
+ send_focus);
return c;
}
}
*/
if (c->type == OB_CLIENT_TYPE_DESKTOP &&
(allow_refocus || c != old) &&
- client_focus(c))
+ /* if we're sending focus then try to */
+ ((send_focus && client_focus(c)) ||
+ /* if not just see if we could try, or it's already focused */
+ (!send_focus && (c == old || client_can_focus(c)))))
{
- ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
+ ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window (%d)\n",
+ send_focus);
return c;
}
}
ObClient *new;
ObClient *old = focus_client;
+ new = focus_fallback_target(allow_refocus, old, FALSE);
+ if (new == old) return;
+
/* unfocus any focused clients.. they can be focused by Pointer events
and such, and then when we try focus them, we won't get a FocusIn
event at all for them. */
focus_nothing();
- new = focus_fallback_target(allow_refocus, old);
+ new = focus_fallback_target(allow_refocus, old, TRUE);
return new;
}