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

better stacking_add_nonintrusive.

Browse source
This commit is contained in:
Dana Jansens 2007-05-04 04:06:53 +00:00
parent 02dda1ef65
commit cdcba19cf9
1 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
openbox/stacking.c
View file

@ -366,10 +366,44 @@ void stacking_add(ObWindow *win)
stacking_raise(win); stacking_raise(win);
} }
static GList *find_highest_relative(ObClient *client)
{
GList *ret = NULL;
if (client->transient_for) {
GList *it;
GSList *top;
/* get all top level relatives of this client */
top = client_search_all_top_parents(client);
/* go from the top of the stacking order down */
for (it = stacking_list; !ret && it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
/* only look at windows in the same layer */
if (c->layer == client->layer) {
GSList *sit;
/* go through each top level parent and see it this window
is related to them */
for (sit = top; !ret && sit; sit = g_slist_next(sit)) {
ObClient *topc = sit->data;
/* are they related ? */
if (topc == c || client_search_transient(topc, c))
ret = it;
}
}
}
}
}
return ret;
}
void stacking_add_nonintrusive(ObWindow *win) void stacking_add_nonintrusive(ObWindow *win)
{ {
ObClient *client; ObClient *client;
ObClient *parent = NULL;
GList *it_below = NULL; GList *it_below = NULL;
if (!WINDOW_IS_CLIENT(win)) { if (!WINDOW_IS_CLIENT(win)) {
@ -379,33 +413,12 @@ void stacking_add_nonintrusive(ObWindow *win)
client = WINDOW_AS_CLIENT(win); client = WINDOW_AS_CLIENT(win);
/* insert above its highest parent */ /* insert above its highest parent (or its highest child !) */
if (client->transient_for) { it_below = find_highest_relative(client);
if (client->transient_for != OB_TRAN_GROUP) {
parent = client->transient_for;
} else {
GSList *sit;
GList *it;
if (client->group) if (!it_below) {
for (it = stacking_list; !parent && it; it = g_list_next(it)) { /* nothing to put it directly above, so try find the focused client to
if ((sit = g_slist_find(client->group->members, it->data))) put it underneath it */
for (sit = client->group->members; !parent && sit;
sit = g_slist_next(sit))
{
ObClient *c = sit->data;
/* checking transient_for prevents infinate loops!
*/
if (sit->data == it->data && !c->transient_for)
parent = it->data;
}
}
}
}
if (!(it_below = g_list_find(stacking_list, parent))) {
/* no parent to put above, try find the focused client to go
under */
if (focus_client && focus_client->layer == client->layer) { if (focus_client && focus_client->layer == client->layer) {
if ((it_below = g_list_find(stacking_list, focus_client))) if ((it_below = g_list_find(stacking_list, focus_client)))
it_below = it_below->next; it_below = it_below->next;