focus_in = NULL;
if (client == focus_out)
focus_out = NULL;
+ if (client == focus_hilite)
+ focus_hilite = NULL;
}
static void event_done(gpointer data)
frame_adjust_focus(focus_in->frame, TRUE);
client_calc_layer(focus_in);
}
+
+ focus_hilite = focus_in;
}
if (focus_out) {
if (focus_out == focus_client)
focus_set_client(NULL);
frame_adjust_focus(focus_out->frame, FALSE);
client_calc_layer(focus_out);
- }
- focus_hilite = focus_in;
+ if (!focus_in)
+ focus_hilite = NULL;
+ }
if (focus_client != last) {
- if (!focus_client)
- focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+ if (!focus_client) {
+ Window w;
+ int r;
+
+ /* is focus anywhere valid? */
+ XGetInputFocus(ob_display, &w, &r);
+ if (!w || w == RootWindow(ob_display, ob_screen))
+ focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+ }
last = focus_client;
}
e->type == MotionNotify)
mouse_event(client, e);
else if (e->type == KeyPress)
- keyboard_event((focus_hilite ?
- focus_hilite : client), e);
+ keyboard_event((focus_cycle_target ? focus_cycle_target :
+ (focus_hilite ? focus_hilite : client)),
+ e);
}
}
}
e->xfocus.window, client->window,
e->xfocus.mode, e->xfocus.detail);
#endif
- focus_out = client;
+ if (focus_hilite == client || focus_client == client)
+ focus_out = client;
if (focus_in == client)
focus_in = NULL;
break;