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

remove the group option for the restacking commands in rc.xml, cuz groups are clever now

Browse source
This commit is contained in:
Dana Jansens 2007-03-12 02:27:58 +00:00
parent d33f44cd86
commit 2244bc036a
6 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
openbox/action.c
View file

@ -1004,8 +1004,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
act->func == action_raiselower || act->func == action_raiselower ||
act->func == action_shadelower || act->func == action_shadelower ||
act->func == action_unshaderaise) { act->func == action_unshaderaise) {
if ((n = parse_find_node("group", node->xmlChildrenNode)))
act->data.stacking.group = parse_bool(doc, n);
} }
INTERACTIVE_LIMIT(act, uact); INTERACTIVE_LIMIT(act, uact);
} }
@ -1221,7 +1219,7 @@ void action_raiselower(union ActionData *data)
void action_raise(union ActionData *data) void action_raise(union ActionData *data)
{ {
client_action_start(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); client_action_end(data);
} }
@ -1244,7 +1242,7 @@ void action_shadelower(union ActionData *data)
void action_lower(union ActionData *data) void action_lower(union ActionData *data)
{ {
client_action_start(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); client_action_end(data);
} }

1
openbox/action.h
View file

@ -145,7 +145,6 @@ struct CycleWindows {
struct Stacking { struct Stacking {
struct AnyAction any; struct AnyAction any;
gboolean group;
}; };
union ActionData { union ActionData {

4
openbox/event.c
View file

@ -1179,9 +1179,9 @@ static void event_handle_dock(ObDock *s, XEvent *e)
switch (e->type) { switch (e->type) {
case ButtonPress: case ButtonPress:
if (e->xbutton.button == 1) if (e->xbutton.button == 1)
stacking_raise(DOCK_AS_WINDOW(s), FALSE); stacking_raise(DOCK_AS_WINDOW(s));
else if (e->xbutton.button == 2) else if (e->xbutton.button == 2)
stacking_lower(DOCK_AS_WINDOW(s), FALSE); stacking_lower(DOCK_AS_WINDOW(s));
break; break;
case EnterNotify: case EnterNotify:
dock_hide(FALSE); dock_hide(FALSE);

2
openbox/popup.c
View file

@ -205,7 +205,7 @@ void popup_show(ObPopup *self, gchar *text)
if (!self->mapped) { if (!self->mapped) {
XMapWindow(ob_display, self->bg); XMapWindow(ob_display, self->bg);
stacking_raise(INTERNAL_AS_WINDOW(self), FALSE); stacking_raise(INTERNAL_AS_WINDOW(self));
self->mapped = TRUE; self->mapped = TRUE;
} }
} }

14
openbox/stacking.c
View file

@ -158,7 +158,7 @@ static void do_lower(GList *wins)
} }
} }
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 *it, *last, *below, *above, *next;
GList *wins = NULL; GList *wins = NULL;
@ -187,7 +187,7 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group)
/* call restack for each of these to lower them */ /* call restack for each of these to lower them */
for (top_it = top_reorder; top_it; top_it = g_slist_next(top_it)) 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; return;
} }
@ -306,12 +306,12 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group)
g_list_free(wins); g_list_free(wins);
} }
void stacking_raise(ObWindow *window, gboolean group) void stacking_raise(ObWindow *window)
{ {
if (WINDOW_IS_CLIENT(window)) { if (WINDOW_IS_CLIENT(window)) {
ObClient *selected; ObClient *selected;
selected = WINDOW_AS_CLIENT(window); selected = WINDOW_AS_CLIENT(window);
restack_windows(selected, TRUE, group); restack_windows(selected, TRUE);
} else { } else {
GList *wins; GList *wins;
wins = g_list_append(NULL, window); wins = g_list_append(NULL, window);
@ -321,12 +321,12 @@ void stacking_raise(ObWindow *window, gboolean group)
} }
} }
void stacking_lower(ObWindow *window, gboolean group) void stacking_lower(ObWindow *window)
{ {
if (WINDOW_IS_CLIENT(window)) { if (WINDOW_IS_CLIENT(window)) {
ObClient *selected; ObClient *selected;
selected = WINDOW_AS_CLIENT(window); selected = WINDOW_AS_CLIENT(window);
restack_windows(selected, FALSE, group); restack_windows(selected, FALSE);
} else { } else {
GList *wins; GList *wins;
wins = g_list_append(NULL, window); wins = g_list_append(NULL, window);
@ -356,7 +356,7 @@ void stacking_add(ObWindow *win)
future */ future */
stacking_list = g_list_append(stacking_list, win); stacking_list = g_list_append(stacking_list, win);
stacking_raise(win, FALSE); stacking_raise(win);
} }
void stacking_add_nonintrusive(ObWindow *win) void stacking_add_nonintrusive(ObWindow *win)

4
openbox/stacking.h
View file

@ -48,10 +48,10 @@ void stacking_add_nonintrusive(ObWindow *win);
#define stacking_remove(win) stacking_list = g_list_remove(stacking_list, win); #define stacking_remove(win) stacking_list = g_list_remove(stacking_list, win);
/*! Raises a window above all others in its stacking layer */ /*! 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 */ /*! 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. /*! Moves a window below another if its in the same layer.
This function does not enforce stacking rules IRT transients n such, and so This function does not enforce stacking rules IRT transients n such, and so