- event_ignore_queued_enters();
-
- focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
- if (focus_hilite) {
- frame_adjust_focus(focus_hilite->frame, TRUE);
-
- /*!
- When this focus_client check is not used, you can end up with races,
- as demonstrated with gnome-panel, sometmies the window you click on
- another desktop ends up losing focus cuz of the focus change here.
- */
- /*if (!focus_client)*/
- client_focus(focus_hilite);
+ /* have to try focus here because when you leave an empty desktop
+ there is no focus out to watch for */
+ if ((c = focus_fallback_target(TRUE, focus_client))) {
+ /* reduce flicker by hiliting now rather than waiting for the server
+ FocusIn event */
+ frame_adjust_focus(c->frame, TRUE);
+ client_focus(c);