a) set the focus client before calculating its layer

b) cleanup in focus.c
This commit is contained in:
Dana Jansens 2007-04-22 19:35:50 +00:00
parent 55b5b828e9
commit 911ad76372
2 changed files with 2 additions and 6 deletions

View file

@ -471,8 +471,8 @@ static void event_process(const XEvent *ec, gpointer data)
focus_fallback(TRUE);
} else if (client && client != focus_client) {
frame_adjust_focus(client->frame, TRUE);
client_calc_layer(client);
focus_set_client(client);
client_calc_layer(client);
}
} else if (e->type == FocusOut) {
gboolean nomove = FALSE;

View file

@ -259,10 +259,6 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
void focus_fallback(gboolean allow_refocus)
{
ObClient *new;
ObClient *old;
/* save this before moving focus away to nothing */
old = focus_client;
/* unfocus any focused clients.. they can be focused by Pointer events
and such, and then when I try focus them, I won't get a FocusIn event
@ -270,7 +266,7 @@ void focus_fallback(gboolean allow_refocus)
*/
focus_nothing();
if ((new = focus_fallback_target(allow_refocus, old)))
if ((new = focus_fallback_target(allow_refocus, focus_client)))
client_focus(new);
}