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

raise grouped util windows with main windows

Browse source
This commit is contained in:
Dana Jansens 2003-10-09 19:29:51 +00:00
parent e5f8c683da
commit da226cdeff
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
openbox/stacking.c
View file

@ -228,7 +228,6 @@ static GList *pick_windows(ObClient *top, ObClient *selected, gboolean raise)
return ret; return ret;
} }
#if 0
static GList *pick_group_windows(ObClient *top, ObClient *selected, static GList *pick_group_windows(ObClient *top, ObClient *selected,
gboolean raise) gboolean raise)
{ {
@ -246,18 +245,28 @@ static GList *pick_group_windows(ObClient *top, ObClient *selected,
next = g_list_next(it); next = g_list_next(it);
if ((sit = g_slist_find(top->group->members, it->data))) { if ((sit = g_slist_find(top->group->members, it->data))) {
ObClientType t;
++i; ++i;
ret = g_list_concat(ret,
pick_windows(sit->data, selected, raise)); t = ((ObClient*)it->data)->type;
/* if we dont have a prev then start back at the beginning,
otherwise skip back to the prev's next */ if (t == OB_CLIENT_TYPE_TOOLBAR ||
next = prev ? g_list_next(prev) : stacking_list; t == OB_CLIENT_TYPE_MENU ||
t == OB_CLIENT_TYPE_UTILITY)
{
ret = g_list_concat(ret,
pick_windows(sit->data,
selected, raise));
/* if we dont have a prev then start back at the beginning,
otherwise skip back to the prev's next */
next = prev ? g_list_next(prev) : stacking_list;
}
} }
} }
} }
return ret; return ret;
} }
#endif
void stacking_raise(ObWindow *window) void stacking_raise(ObWindow *window)
{ {
@ -267,9 +276,9 @@ void stacking_raise(ObWindow *window)
ObClient *c; ObClient *c;
ObClient *selected; ObClient *selected;
selected = WINDOW_AS_CLIENT(window); selected = WINDOW_AS_CLIENT(window);
c = client_search_top_transient(selected); /*/ c = selected; */ c = client_search_top_transient(selected);
wins = pick_windows(c, selected, TRUE); wins = pick_windows(c, selected, TRUE);
/*wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));*/ wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));
} else { } else {
wins = g_list_append(NULL, window); wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window); stacking_list = g_list_remove(stacking_list, window);
@ -288,7 +297,7 @@ void stacking_lower(ObWindow *window)
selected = WINDOW_AS_CLIENT(window); selected = WINDOW_AS_CLIENT(window);
c = client_search_top_transient(selected); c = client_search_top_transient(selected);
wins = pick_windows(c, selected, FALSE); wins = pick_windows(c, selected, FALSE);
/*wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);*/ wins = g_list_concat(pick_group_windows(c, selected, FALSE), wins);
} else { } else {
wins = g_list_append(NULL, window); wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window); stacking_list = g_list_remove(stacking_list, window);