-/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
stacking.c for the Openbox window manager
Copyright (c) 2003 Ben Jansens
{
GList *it, *next;
Window *win;
- int i;
+ gint i;
#ifdef DEBUG
/* pls only restack stuff in the same layer at a time */
{
GList *it;
GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
- int i;
+ gint i;
for (it = wins; it; it = g_list_next(it)) {
ObStackingLayer l;
{
GList *it;
GList *layer[OB_NUM_STACKING_LAYERS] = {NULL};
- int i;
+ gint i;
for (it = wins; it; it = g_list_next(it)) {
ObStackingLayer l;
GList *ret = NULL;
GList *it, *next, *prev;
GSList *sit;
- int i, n;
+ gint i, n;
GList *modals = NULL;
GList *trans = NULL;
GList *modal_sel = NULL; /* the selected guys if modal */
return ret;
}
-#if 0
static GList *pick_group_windows(ObClient *top, ObClient *selected,
gboolean raise)
{
GList *ret = NULL;
GList *it, *next, *prev;
GSList *sit;
- int i, n;
+ gint i, n;
/* add group members in their stacking order */
if (top->group) {
next = g_list_next(it);
if ((sit = g_slist_find(top->group->members, it->data))) {
+ ObClient *c;
+ ObClientType t;
+
++i;
- 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;
+ c = it->data;
+ t = c->type;
+
+ if ((c->desktop == selected->desktop ||
+ c->desktop == DESKTOP_ALL) &&
+ (t == OB_CLIENT_TYPE_TOOLBAR ||
+ 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;
}
-#endif
void stacking_raise(ObWindow *window)
{
ObClient *c;
ObClient *selected;
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 = g_list_concat(wins, pick_group_windows(c, selected, TRUE));*/
+ wins = g_list_concat(wins, pick_group_windows(c, selected, TRUE));
} else {
wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window);
selected = WINDOW_AS_CLIENT(window);
c = client_search_top_transient(selected);
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 {
wins = g_list_append(NULL, window);
stacking_list = g_list_remove(stacking_list, window);
GList *it;
if (client->group)
- for (it = stacking_list; !parent && it; it = it->next) {
+ for (it = stacking_list; !parent && it; it = g_list_next(it)) {
if ((sit = g_slist_find(client->group->members, it->data)))
for (sit = client->group->members; !parent && sit;
- sit = sit->next) {
+ sit = g_slist_next(sit))
+ {
ObClient *c = sit->data;
/* checking transient_for prevents infinate loops! */
if (sit->data == it->data && !c->transient_for)