make it possible to iconify a modal window when its parent is the only window left on the desktop.

when focus falls off of a window, don't allow focus to go back to that same target - when a window is iconified is the case.

what focus_fallback_target, to check whe allow_refocus is false, check where focus will actually be sent
This commit is contained in:
Dana Jansens 2007-05-30 20:53:00 +00:00
parent 4ff0d49cc7
commit 467b7f4d4d
2 changed files with 4 additions and 4 deletions

View file

@ -531,7 +531,7 @@ static void event_process(const XEvent *ec, gpointer data)
*/ */
if (!focus_left_screen) if (!focus_left_screen)
focus_fallback(TRUE, FALSE); focus_fallback(FALSE, FALSE);
} }
} }
else if (!client) else if (!client)

View file

@ -105,7 +105,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n"); ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
if (allow_pointer && config_focus_follow) if (allow_pointer && config_focus_follow)
if ((c = client_under_pointer()) && if ((c = client_under_pointer()) &&
(allow_refocus || c != old) && (allow_refocus || client_focus_target(c) != old) &&
(client_normal(c) && (client_normal(c) &&
client_focus(c))) client_focus(c)))
{ {
@ -125,7 +125,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
*/ */
if (c->desktop == screen_desktop && if (c->desktop == screen_desktop &&
client_normal(c) && client_normal(c) &&
(allow_refocus || c != old) && (allow_refocus || client_focus_target(c) != old) &&
client_focus(c)) client_focus(c))
{ {
ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n"); ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
@ -144,7 +144,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus,
backup fallback though) backup fallback though)
*/ */
if (c->type == OB_CLIENT_TYPE_DESKTOP && if (c->type == OB_CLIENT_TYPE_DESKTOP &&
(allow_refocus || c != old) && (allow_refocus || client_focus_target(c) != old) &&
client_focus(c)) client_focus(c))
{ {
ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n"); ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");