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

when you focus a window, bring any modal children it has to that desktop

Browse source 
when falling back, return the window which actually was focused by client_focus
let you focus cycle to windows when their modal window is on another desktop (it will be brought over)
This commit is contained in:
Dana Jansens 2007-05-28 00:33:58 +00:00
parent 8874ec1fc4
commit 16fcb1213d
4 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
openbox/client.c
View file

@ -3463,6 +3463,8 @@ gboolean client_can_focus(ObClient *self)
gboolean client_focus(ObClient *self) gboolean client_focus(ObClient *self)
{ {
client_bring_modal_windows(self);
/* choose the correct target */ /* choose the correct target */
self = client_focus_target(self); self = client_focus_target(self);
@ -3582,15 +3584,18 @@ void client_activate(ObClient *self, gboolean here, gboolean user)
client_hilite(self, TRUE); client_hilite(self, TRUE);
} }
static void client_bring_helper_windows_recursive(ObClient *self, static void client_bring_windows_recursive(ObClient *self,
guint desktop) guint desktop,
gboolean helpers,
gboolean modals)
{ {
GSList *it; GSList *it;
for (it = self->transients; it; it = g_slist_next(it)) for (it = self->transients; it; it = g_slist_next(it))
client_bring_helper_windows_recursive(it->data, desktop); client_bring_windows_recursive(it->data, desktop, helpers, modals);
if (client_helper(self) && if (((helpers && client_helper(self)) ||
(modals && self->modal))&&
self->desktop != desktop && self->desktop != DESKTOP_ALL) self->desktop != desktop && self->desktop != DESKTOP_ALL)
{ {
client_set_desktop(self, desktop, FALSE); client_set_desktop(self, desktop, FALSE);
@ -3599,7 +3604,12 @@ static void client_bring_helper_windows_recursive(ObClient *self,
void client_bring_helper_windows(ObClient *self) void client_bring_helper_windows(ObClient *self)
{ {
client_bring_helper_windows_recursive(self, self->desktop); client_bring_windows_recursive(self, self->desktop, TRUE, FALSE);
}
void client_bring_modal_windows(ObClient *self)
{
client_bring_windows_recursive(self, self->desktop, FALSE, TRUE);
} }
gboolean client_focused(ObClient *self) gboolean client_focused(ObClient *self)

3
openbox/client.h
View file

@ -562,6 +562,9 @@ void client_activate(ObClient *self, gboolean here, gboolean user);
stuff windows. */ stuff windows. */
void client_bring_helper_windows(ObClient *self); void client_bring_helper_windows(ObClient *self);
/*! Bring all of its modal windows to its desktop. */
void client_bring_modal_windows(ObClient *self);
/*! Calculates the stacking layer for the client window */ /*! Calculates the stacking layer for the client window */
void client_calc_layer(ObClient *self); void client_calc_layer(ObClient *self);

2
openbox/focus.c
View file

@ -166,6 +166,8 @@ ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer)
focus_nothing(); focus_nothing();
new = focus_fallback_target(allow_refocus, allow_pointer, old); new = focus_fallback_target(allow_refocus, allow_pointer, old);
/* get what was really focused */
if (new) new = client_focus_target(new);
return new; return new;
} }

6
openbox/focus_cycle.c
View file

@ -150,7 +150,11 @@ gboolean focus_cycle_target_valid(ObClient *ft,
!ft->skip_taskbar); !ft->skip_taskbar);
/* it's not going to just send fous off somewhere else (modal window) */ /* it's not going to just send fous off somewhere else (modal window) */
ok = ok && ft == client_focus_target(ft); {
ObClient *cft = client_focus_target(ft);
ok = ok && (ft == cft || (cft->desktop != DESKTOP_ALL &&
cft->desktop != ft->desktop));
}
return ok; return ok;
} }