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

diff --git a/openbox/action.c b/openbox/action.c
index 5cd39f3d2b56a970326672b6173058fb2d385a3e..097eaf8d165db736d3acea1b3a146c7c8cc5a85d 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1004,8 +1004,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        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_raiselower(union ActionData *data)
 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_shadelower(union ActionData *data)
 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);
 }
 

diff --git a/openbox/action.h b/openbox/action.h
index c8e91cfa5b654147c6db67622bb8f516fd9df710..b1bc081fe93e657cee398045828b53ee12b761e7 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -145,7 +145,6 @@ struct CycleWindows {
 
 struct Stacking {
     struct AnyAction any;
-    gboolean group;
 };
 
 union ActionData {

diff --git a/openbox/event.c b/openbox/event.c
index 6d1fa8dc39f92c41f12f95da3780408c250b3ba2..791c5c073537157bc7ed390b07266aec4937af15 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1179,9 +1179,9 @@ static void event_handle_dock(ObDock *s, XEvent *e)
     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);

diff --git a/openbox/popup.c b/openbox/popup.c
index 6b118792835852b744adfdac991f489b817baade..e7fcbbe552acbf9c93a3e2f29dd3137f9fade101 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -205,7 +205,7 @@ void popup_show(ObPopup *self, gchar *text)
 
     if (!self->mapped) {
         XMapWindow(ob_display, self->bg);
-        stacking_raise(INTERNAL_AS_WINDOW(self), FALSE);
+        stacking_raise(INTERNAL_AS_WINDOW(self));
         self->mapped = TRUE;
     }
 }

diff --git a/openbox/stacking.c b/openbox/stacking.c
index db1606b58417726022d4231c5cfe1f2222d3e767..e77e199fb41a4b2559fd66805ed4874730f6ba6c 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -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 *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 */
         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 @@ static void restack_windows(ObClient *selected, gboolean raise, gboolean group)
     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 @@ void stacking_raise(ObWindow *window, gboolean group)
     }
 }
 
-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 @@ void stacking_add(ObWindow *win)
                                              future */
 
     stacking_list = g_list_append(stacking_list, win);
-    stacking_raise(win, FALSE);
+    stacking_raise(win);
 }
 
 void stacking_add_nonintrusive(ObWindow *win)

diff --git a/openbox/stacking.h b/openbox/stacking.h
index edcedea24909235955b525c5bc73d7c97bceb126..a0af4c044151bc291991fca1d70411711b894e8f 100644 (file)
--- a/openbox/stacking.h
+++ b/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