if (fi.xfocus.window == e->xfocus.window)
return;
+ /* secret magic way of event_process telling us that no client
+ was found for the FocusIn event */
+ if (fi.xfocus.window == None)
+ focus_fallback(FALSE);
} else
- focus_set_client(NULL);
+ focus_fallback(FALSE);
}
break;
case EnterNotify:
event_handle_root(e);
else if (e->type == MapRequest)
client_manage(window);
+ else if (e->type == FocusIn)
+ e->xfocus.window = None; /* says no client was found for the event */
else if (e->type == ConfigureRequest) {
/* unhandled configure requests must be used to configure the
window directly */
engine_frame_adjust_focus(client->frame);
break;
case EnterNotify:
- if (ob_state == State_Starting) {
- /* move it to the top of the focus order */
- guint desktop = client->desktop;
- if (desktop == DESKTOP_ALL) desktop = screen_desktop;
- focus_order[desktop] = g_list_remove(focus_order[desktop], client);
- focus_order[desktop] = g_list_prepend(focus_order[desktop],client);
- } else {
- if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
- g_assert_not_reached();
- if (focus_follow.bool)
- client_focus(client);
+ if (client_normal(client)) {
+ if (ob_state == State_Starting) {
+ /* move it to the top of the focus order */
+ guint desktop = client->desktop;
+ if (desktop == DESKTOP_ALL) desktop = screen_desktop;
+ focus_order[desktop] = g_list_remove(focus_order[desktop],
+ client);
+ focus_order[desktop] = g_list_prepend(focus_order[desktop],
+ client);
+ } else {
+ if (!config_get("focusFollowsMouse",Config_Bool,&focus_follow))
+ g_assert_not_reached();
+ if (focus_follow.bool)
+ client_focus(client);
+ }
}
break;
case ConfigureRequest: