remove the group option for the restacking commands in rc.xml, cuz groups are clever now
Dana Jansens danakj@orodu.net
6 files changed,
14 insertions(+),
17 deletions(-)
M
openbox/action.c
→
openbox/action.c
@@ -1004,8 +1004,6 @@ act->func == action_lower ||
act->func == action_raiselower || act->func == action_shadelower || act->func == action_unshaderaise) { - if ((n = parse_find_node("group", node->xmlChildrenNode))) - act->data.stacking.group = parse_bool(doc, n); } INTERACTIVE_LIMIT(act, uact); }@@ -1221,7 +1219,7 @@
void action_raise(union ActionData *data) { client_action_start(data); - stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group); + stacking_raise(CLIENT_AS_WINDOW(data->client.any.c)); client_action_end(data); }@@ -1244,7 +1242,7 @@
void action_lower(union ActionData *data) { client_action_start(data); - stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group); + stacking_lower(CLIENT_AS_WINDOW(data->client.any.c)); client_action_end(data); }
M
openbox/action.h
→
openbox/action.h
@@ -145,7 +145,6 @@ };
struct Stacking { struct AnyAction any; - gboolean group; }; union ActionData {
M
openbox/event.c
→
openbox/event.c
@@ -1179,9 +1179,9 @@ {
switch (e->type) { case ButtonPress: if (e->xbutton.button == 1) - stacking_raise(DOCK_AS_WINDOW(s), FALSE); + stacking_raise(DOCK_AS_WINDOW(s)); else if (e->xbutton.button == 2) - stacking_lower(DOCK_AS_WINDOW(s), FALSE); + stacking_lower(DOCK_AS_WINDOW(s)); break; case EnterNotify: dock_hide(FALSE);
M
openbox/popup.c
→
openbox/popup.c
@@ -205,7 +205,7 @@ }
if (!self->mapped) { XMapWindow(ob_display, self->bg); - stacking_raise(INTERNAL_AS_WINDOW(self), FALSE); + stacking_raise(INTERNAL_AS_WINDOW(self)); self->mapped = TRUE; } }
M
openbox/stacking.c
→
openbox/stacking.c
@@ -158,7 +158,7 @@ }
} } -static void restack_windows(ObClient *selected, gboolean raise, gboolean group) +static void restack_windows(ObClient *selected, gboolean raise) { GList *it, *last, *below, *above, *next; GList *wins = NULL;@@ -187,7 +187,7 @@ g_assert(top == NULL);
/* call restack for each of these to lower them */ for (top_it = top_reorder; top_it; top_it = g_slist_next(top_it)) - restack_windows(top_it->data, raise, group); + restack_windows(top_it->data, raise); return; }@@ -306,12 +306,12 @@ do_restack(wins, below);
g_list_free(wins); } -void stacking_raise(ObWindow *window, gboolean group) +void stacking_raise(ObWindow *window) { if (WINDOW_IS_CLIENT(window)) { ObClient *selected; selected = WINDOW_AS_CLIENT(window); - restack_windows(selected, TRUE, group); + restack_windows(selected, TRUE); } else { GList *wins; wins = g_list_append(NULL, window);@@ -321,12 +321,12 @@ g_list_free(wins);
} } -void stacking_lower(ObWindow *window, gboolean group) +void stacking_lower(ObWindow *window) { if (WINDOW_IS_CLIENT(window)) { ObClient *selected; selected = WINDOW_AS_CLIENT(window); - restack_windows(selected, FALSE, group); + restack_windows(selected, FALSE); } else { GList *wins; wins = g_list_append(NULL, window);@@ -356,7 +356,7 @@ g_assert(screen_support_win != None); /* make sure I dont break this in the
future */ stacking_list = g_list_append(stacking_list, win); - stacking_raise(win, FALSE); + stacking_raise(win); } void stacking_add_nonintrusive(ObWindow *win)
M
openbox/stacking.h
→
openbox/stacking.h
@@ -48,10 +48,10 @@ void stacking_add_nonintrusive(ObWindow *win);
#define stacking_remove(win) stacking_list = g_list_remove(stacking_list, win); /*! Raises a window above all others in its stacking layer */ -void stacking_raise(ObWindow *window, gboolean group); +void stacking_raise(ObWindow *window); /*! Lowers a window below all others in its stacking layer */ -void stacking_lower(ObWindow *window, gboolean group); +void stacking_lower(ObWindow *window); /*! Moves a window below another if its in the same layer. This function does not enforce stacking rules IRT transients n such, and so