Make RaiseLower work for the dock as well

As a side effect, _NET_RESTACK_REQUEST now also allows specifying the dock as the sibling.

diff --git a/openbox/actions/lowerraiseone.c b/openbox/actions/lowerraiseone.c
index b41a0ede56ab69dd4f8109c4152161d8ac383b1d..3786e57519042e08fb4db7410fb71cee3d192e23 100644 (file)
--- a/openbox/actions/lowerraiseone.c
+++ b/openbox/actions/lowerraiseone.c
@@ -34,7 +34,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
     if (data->client) {
         ObClient *client = data->client;
-        ObClient *sibling;
+        ObWindow *sibling;
         actions_client_move(data, TRUE);
         if (dir == 1) {
           sibling = stacking_occluded(client, NULL);

diff --git a/openbox/event.c b/openbox/event.c
index fee9800cd0f8a17b911192de5ce278d7f1ee2e68..659314a2dc1cc7a8883e3b8fe17dfe5847f720b0 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1210,7 +1210,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             }
 
         if (e->xconfigurerequest.value_mask & CWStackMode) {
-            ObClient *sibling = NULL;
+            ObWindow *sibling = NULL;
             gulong ignore_start;
             gboolean ok = TRUE;
 
@@ -1221,7 +1221,11 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 if (win && WINDOW_IS_CLIENT(win) &&
                     WINDOW_AS_CLIENT(win) != client)
                 {
-                    sibling = WINDOW_AS_CLIENT(win);
+                    sibling = win;
+                }
+                else if (win && WINDOW_IS_DOCK(win))
+                {
+                    sibling = win;
                 }
                 else
                     /* an invalid sibling was specified so don't restack at
@@ -1577,13 +1581,17 @@ static void event_handle_client(ObClient *client, XEvent *e)
                               "invalid source indication %ld",
                               client->title, e->xclient.data.l[0]);
             } else {
-                ObClient *sibling = NULL;
+                ObWindow *sibling = NULL;
                 if (e->xclient.data.l[1]) {
                     ObWindow *win = window_find(e->xclient.data.l[1]);
                     if (WINDOW_IS_CLIENT(win) &&
                         WINDOW_AS_CLIENT(win) != client)
                     {
-                        sibling = WINDOW_AS_CLIENT(win);
+                        sibling = win;
+                    }
+                    if (WINDOW_IS_DOCK(win))
+                    {
+                        sibling = win;
                     }
                     if (sibling == NULL)
                         ob_debug_type(OB_DEBUG_APP_BUGS,

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 43eff8531bbd19e5e112b08c24b3a6932972c48f..5fc07032ce5bd505d68f239602942de4eeaacdd5 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -26,6 +26,7 @@
 #include "window.h"
 #include "event.h"
 #include "debug.h"
+#include "dock.h"
 #include "obt/prop.h"
 
 GList  *stacking_list = NULL;
@@ -578,14 +579,18 @@ void stacking_add_nonintrusive(ObWindow *win)
     stacking_list_tail = g_list_last(stacking_list);
 }
 
-ObClient *stacking_occluded(ObClient *client, ObClient *sibling)
+ObWindow *stacking_occluded(ObClient *client, ObWindow *sibling_win)
 {
     GList *it;
-    ObClient *occluded = NULL;
+    ObWindow *occluded = NULL;
+    ObClient *sibling = NULL;
+
+    if (sibling_win && WINDOW_IS_CLIENT(sibling_win))
+        sibling = WINDOW_AS_CLIENT(sibling_win);
 
     /* no need for any looping in this case */
     if (sibling && client->layer != sibling->layer)
-        return occluded;
+        return NULL;
 
     for (it = g_list_previous(g_list_find(stacking_list, client)); it;
          it = g_list_previous(it))
@@ -600,12 +605,12 @@ ObClient *stacking_occluded(ObClient *client, ObClient *sibling)
                 {
                     if (sibling != NULL) {
                         if (c == sibling) {
-                            occluded = sibling;
+                            occluded = sibling_win;
                             break;
                         }
                     }
                     else if (c->layer == client->layer) {
-                        occluded = c;
+                        occluded = CLIENT_AS_WINDOW(c);
                         break;
                     }
                     else if (c->layer > client->layer)
@@ -613,17 +618,35 @@ ObClient *stacking_occluded(ObClient *client, ObClient *sibling)
                 }
             }
         }
+        else if (WINDOW_IS_DOCK(it->data)) {
+            ObDock *dock = it->data;
+            if (RECT_INTERSECTS_RECT(dock->area, client->frame->area))
+            {
+                if (sibling_win != NULL) {
+                    if (DOCK_AS_WINDOW(dock) == sibling_win) {
+                        occluded = sibling_win;
+                        break;
+                    }
+                }
+                else
+                    occluded = DOCK_AS_WINDOW(dock);
+            }
+        }
     return occluded;
 }
 
-ObClient *stacking_occludes(ObClient *client, ObClient *sibling)
+ObWindow *stacking_occludes(ObClient *client, ObWindow *sibling_win)
 {
     GList *it;
-    ObClient *occludes = NULL;
+    ObWindow *occludes = NULL;
+    ObClient *sibling = NULL;
+
+    if (sibling_win && WINDOW_IS_CLIENT(sibling_win))
+        sibling = WINDOW_AS_CLIENT(sibling_win);
 
     /* no need for any looping in this case */
     if (sibling && client->layer != sibling->layer)
-        return occludes;
+        return NULL;
 
     for (it = g_list_next(g_list_find(stacking_list, client));
          it; it = g_list_next(it))
@@ -638,12 +661,12 @@ ObClient *stacking_occludes(ObClient *client, ObClient *sibling)
                 {
                     if (sibling != NULL) {
                         if (c == sibling) {
-                            occludes = sibling;
+                            occludes = sibling_win;
                             break;
                         }
                     }
                     else if (c->layer == client->layer) {
-                        occludes = c;
+                        occludes = CLIENT_AS_WINDOW(c);
                         break;
                     }
                     else if (c->layer < client->layer)
@@ -651,14 +674,33 @@ ObClient *stacking_occludes(ObClient *client, ObClient *sibling)
                 }
             }
         }
+        else if (WINDOW_IS_DOCK(it->data)) {
+            ObDock *dock = it->data;
+            if (RECT_INTERSECTS_RECT(dock->area, client->frame->area))
+            {
+                if (sibling_win != NULL) {
+                    if (DOCK_AS_WINDOW(dock) == sibling_win) {
+                        occludes = sibling_win;
+                        break;
+                    }
+                }
+                else
+                    occludes = DOCK_AS_WINDOW(dock);
+            }
+        }
     return occludes;
 }
 
-gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
+gboolean stacking_restack_request(ObClient *client, ObWindow *sibling_win,
                                   gint detail)
 {
     gboolean ret = FALSE;
 
+    ObClient *sibling;
+
+    if (sibling_win && WINDOW_IS_CLIENT(sibling_win))
+        sibling = WINDOW_AS_CLIENT(sibling_win);
+
     if (sibling && ((client->desktop != sibling->desktop &&
                      client->desktop != DESKTOP_ALL &&
                      sibling->desktop != DESKTOP_ALL) ||
@@ -682,7 +724,7 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                  client->title, sibling ? sibling->title : "(all)");
         /* if this client occludes sibling (or anything if NULL), then
            lower it to the bottom */
-        if (stacking_occludes(client, sibling)) {
+        if (stacking_occludes(client, sibling_win)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
             ret = TRUE;
         }
@@ -696,7 +738,7 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
     case TopIf:
         ob_debug("Restack request TopIf for client %s sibling %s",
                  client->title, sibling ? sibling->title : "(all)");
-        if (stacking_occluded(client, sibling)) {
+        if (stacking_occluded(client, sibling_win)) {
             stacking_raise(CLIENT_AS_WINDOW(client));
             ret = TRUE;
         }
@@ -704,11 +746,11 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
     case Opposite:
         ob_debug("Restack request Opposite for client %s sibling %s",
                  client->title, sibling ? sibling->title : "(all)");
-        if (stacking_occluded(client, sibling)) {
+        if (stacking_occluded(client, sibling_win)) {
             stacking_raise(CLIENT_AS_WINDOW(client));
             ret = TRUE;
         }
-        else if (stacking_occludes(client, sibling)) {
+        else if (stacking_occludes(client, sibling_win)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
             ret = TRUE;
         }

diff --git a/openbox/stacking.h b/openbox/stacking.h
index c5385766881ce0ccf4057d15418cbf2872f6969e..dfc0a9d000e83de41a20110100ebae887427dbfd 100644 (file)
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -72,18 +72,18 @@ void stacking_below(struct _ObWindow *window, struct _ObWindow *below);
 void stacking_above(struct _ObWindow *window, struct _ObWindow *above);
 
 /*! Returns sibling if client is occluded by the sibling. If sibling is NULL it
-  tries against all other clients, then the nearest client occluding is returned.
+  tries against all other clients, then the nearest window occluding is returned.
 */
-struct _ObClient *stacking_occluded(struct _ObClient *client, struct _ObClient *sibling);
+struct _ObWindow *stacking_occluded(struct _ObClient *client, struct _ObWindow *sibling);
 
 /*! Returns sibling if client occludes the sibling. If sibling is NULL it tries
-  against all other clients, then the nearest client occluded is returned.
+  against all other clients, then the nearest window occluded is returned.
 */
-struct _ObClient *stacking_occludes(struct _ObClient *client, struct _ObClient *sibling);
+struct _ObWindow *stacking_occludes(struct _ObClient *client, struct _ObWindow *sibling);
 
 /*! Restack a window based upon a sibling (or all windows) in various ways.
   @param client The client to be restacked
-  @param sibling Another client to compare to, or NULL to compare to all
+  @param sibling A window to compare to, or NULL to compare to all
                  windows
   @param detail One of Above, Below, TopIf, BottomIf, Opposite
   @return TRUE if the client was restacked
@@ -91,7 +91,7 @@ struct _ObClient *stacking_occludes(struct _ObClient *client, struct _ObClient *
   how each detail works with and without a sibling.
 */
 gboolean stacking_restack_request(struct _ObClient *client,
-                                  struct _ObClient *sibling,
+                                  struct _ObWindow *sibling,
                                   gint detail);
 
 #endif