summaryrefslogtreecommitdiff
path: root/openbox/focus.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-24 06:41:04 +0000
committerDana Jansens <danakj@orodu.net>2007-04-24 06:41:04 +0000
commitc6fe4f8d8f4bd462ff9b1b1344422d0115cd5ff3 (patch)
tree5deecaf1eb8fdf6bcae353f0965d5cb835e89c97 /openbox/focus.c
parentad852b6b56e43bdd7dda1389f54051cf92c0fad9 (diff)
focus_order_remove is called in a few places. move the check for unsetting focus_client into client_unmanage.
Diffstat (limited to 'openbox/focus.c')
-rw-r--r--openbox/focus.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/openbox/focus.c b/openbox/focus.c
index 788e1683..e62b3dbd 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -273,6 +273,8 @@ void focus_fallback(gboolean allow_refocus)
*/
focus_nothing();
+ focus_client = NULL;
+
if ((new = focus_fallback_target(allow_refocus, old)))
client_focus(new);
}
@@ -285,8 +287,6 @@ void focus_nothing()
screen_install_colormap(NULL, TRUE);
}
- focus_client = NULL;
-
/* when nothing will be focused, send focus to the backup target */
XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
event_curtime);
@@ -763,8 +763,6 @@ void focus_order_add_new(ObClient *c)
void focus_order_remove(ObClient *c)
{
focus_order = g_list_remove(focus_order, c);
- if (c == focus_client)
- focus_client = NULL;
}
void focus_order_to_top(ObClient *c)