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

reverting the transient focus cycle change, its just not.. right. add the parent's title to the transient's for the popup instead of just relpacing it

Browse source
This commit is contained in:
Dana Jansens 2003-06-04 18:22:19 +00:00
parent 1139d96e7f
commit 4cb48bebb5
3 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
openbox/client.c
View file

@ -2254,6 +2254,7 @@ gboolean client_can_focus(Client *self)
self->desktop == DESKTOP_ALL) && self->desktop == DESKTOP_ALL) &&
!self->iconic)) !self->iconic))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }

5
openbox/client.h
View file

@ -493,8 +493,9 @@ Client *client_search_focus_tree(Client *self);
*/ */
Client *client_search_focus_tree_full(Client *self); Client *client_search_focus_tree_full(Client *self);
/*! Return a modal child of the client window /*! Return a modal child of the client window that can be focused.
@return A modal child of the client window, or 0 if none was found. @return A modal child of the client window that can be focused, or 0 if
none was found.
*/ */
Client *client_search_modal_child(Client *self); Client *client_search_modal_child(Client *self);

38
openbox/focus.c
View file

@ -245,6 +245,8 @@ static void popup_cycle(Client *c, gboolean show)
popup_hide(focus_cycle_popup); popup_hide(focus_cycle_popup);
} else { } else {
Rect *a; Rect *a;
Client *p = c;
char *title;
a = screen_area(c->desktop); a = screen_area(c->desktop);
popup_position(focus_cycle_popup, CenterGravity, popup_position(focus_cycle_popup, CenterGravity,
@ -257,8 +259,22 @@ static void popup_cycle(Client *c, gboolean show)
*/ */
popup_size(focus_cycle_popup, 320, 48); popup_size(focus_cycle_popup, 320, 48);
popup_show(focus_cycle_popup, (c->iconic ? c->icon_title : c->title), /* use the transient's parent's title/icon */
client_icon(c, 48, 48)); while (p->transient_for && p->transient_for != TRAN_GROUP)
p = p->transient_for;
if (p == c)
title = NULL;
else
title = g_strconcat((p->iconic ? p->icon_title : p->title),
" - ",
(c->iconic ? c->icon_title : c->title),
NULL);
popup_show(focus_cycle_popup,
(title ? title : (c->iconic ? c->icon_title : c->title)),
client_icon(p, 48, 48));
g_free(title);
} }
} }
@ -278,22 +294,8 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
frame_adjust_focus(focus_client->frame, TRUE); frame_adjust_focus(focus_client->frame, TRUE);
goto done_cycle; goto done_cycle;
} else if (done) { } else if (done) {
if (focus_cycle_target) { if (focus_cycle_target)
Client *t;
/* actually focus a transient */
/* fist, try for a modal */
t = client_focus_target(focus_cycle_target);
if (t != focus_cycle_target)
focus_cycle_target = t;
else
/* just grab the deepest transient you can find */
while (focus_cycle_target->transients)
focus_cycle_target = focus_cycle_target->transients->data;
client_activate(focus_cycle_target); client_activate(focus_cycle_target);
}
goto done_cycle; goto done_cycle;
} }
if (!first) if (!first)
@ -320,7 +322,7 @@ Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
} }
/*ft = client_focus_target(it->data);*/ /*ft = client_focus_target(it->data);*/
ft = it->data; ft = it->data;
if (ft->transient_for == NULL && client_normal(ft) && if (ft->transients == NULL && client_normal(ft) &&
client_can_focus(ft)) { client_can_focus(ft)) {
if (ft != focus_cycle_target) { /* prevents flicker */ if (ft != focus_cycle_target) { /* prevents flicker */
if (focus_cycle_target) if (focus_cycle_target)