nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save the focus_client when falling back, so we don't actually refocus it when we don't want to.

Browse source
This commit is contained in:
Dana Jansens 2007-03-14 15:56:59 +00:00
parent adc5675823
commit a9175a8a32
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
openbox/focus.c
View file

@ -248,14 +248,11 @@ static ObClient* focus_fallback_transient(ObClient *top, ObClient *old)
return NULL;
}
ObClient* focus_fallback_target(gboolean allow_refocus)
ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
{
GList *it;
ObClient *old;
ObClient *target = NULL;
old = focus_client;
if (!allow_refocus && old && old->transient_for) {
gboolean trans = FALSE;
@ -344,6 +341,10 @@ ObClient* focus_fallback_target(gboolean allow_refocus)
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
@ -351,7 +352,7 @@ void focus_fallback(gboolean allow_refocus)
*/
focus_set_client(NULL);
if ((new = focus_fallback_target(allow_refocus)))
if ((new = focus_fallback_target(allow_refocus, old)))
client_focus(new);
}

3
openbox/focus.h
View file

@ -50,7 +50,8 @@ void focus_shutdown(gboolean reconfig);
send focus anywhere, its called by the Focus event handlers */
void focus_set_client(struct _ObClient *client);
struct _ObClient* focus_fallback_target(gboolean allow_refocus);
struct _ObClient* focus_fallback_target(gboolean allow_refocus,
struct _ObClient *old);
/*! Call this when you need to focus something! */
void focus_fallback(gboolean allow_refocus);

2
openbox/screen.c
View file

@ -463,7 +463,7 @@ void screen_set_desktop(guint num)
event_ignore_queued_enters();
focus_hilite = focus_fallback_target(TRUE);
focus_hilite = focus_fallback_target(TRUE, focus_client);
if (focus_hilite) {
frame_adjust_focus(focus_hilite->frame, TRUE);