Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / stacking.c

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 4c24e3e..3c05df4 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -18,7 +18,6 @@
 */
 
 #include "openbox.h"
 */
 
 #include "openbox.h"

-#include "prop.h"

 #include "screen.h"
 #include "focus.h"
 #include "client.h"
 #include "screen.h"
 #include "focus.h"
 #include "client.h"


@@ -27,6 +26,7 @@
 #include "window.h"
 #include "event.h"
 #include "debug.h"
 #include "window.h"
 #include "event.h"
 #include "debug.h"

+#include "obt/prop.h"

 
 GList  *stacking_list = NULL;
 /*! When true, stacking changes will not be reflected on the screen.  This is
 
 GList  *stacking_list = NULL;
 /*! When true, stacking changes will not be reflected on the screen.  This is


@@ -55,8 +55,8 @@ void stacking_set_list(void)
         }
     }
 
         }
     }
 

-    PROP_SETA32(RootWindow(ob_display, ob_screen),
-                net_client_list_stacking, window, (gulong*)windows, i);
+    OBT_PROP_SETA32(obt_root(ob_screen), NET_CLIENT_LIST_STACKING, WINDOW,
+                    (gulong*)windows, i);

 
     g_free(windows);
 }
 
     g_free(windows);
 }


@@ -105,7 +105,7 @@ static void do_restack(GList *wins, GList *before)
 #endif
 
     if (!pause_changes)
 #endif
 
     if (!pause_changes)

-        XRestackWindows(ob_display, win, i);
+        XRestackWindows(obt_display, win, i);

     g_free(win);
 
     stacking_set_list();
     g_free(win);
 
     stacking_set_list();


@@ -132,7 +132,7 @@ void stacking_temp_raise(ObWindow *window)
 
     win[1] = window_top(window);
     start = event_start_ignore_all_enters();
 
     win[1] = window_top(window);
     start = event_start_ignore_all_enters();

-    XRestackWindows(ob_display, win, 2);
+    XRestackWindows(obt_display, win, 2);

     event_end_ignore_all_enters(start);
 
     pause_changes = TRUE;
     event_end_ignore_all_enters(start);
 
     pause_changes = TRUE;


@@ -150,7 +150,7 @@ void stacking_restore(void)
     for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it))
         win[i] = window_top(it->data);
     start = event_start_ignore_all_enters();
     for (i = 1, it = stacking_list; it; ++i, it = g_list_next(it))
         win[i] = window_top(it->data);
     start = event_start_ignore_all_enters();

-    XRestackWindows(ob_display, win, i);
+    XRestackWindows(obt_display, win, i);

     event_end_ignore_all_enters(start);
     g_free(win);
 
     event_end_ignore_all_enters(start);
     g_free(win);
 


@@ -633,21 +633,20 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
                     sibling->iconic))
     {
         ob_debug("Setting restack sibling to NULL, they are not on the same "
                     sibling->iconic))
     {
         ob_debug("Setting restack sibling to NULL, they are not on the same "

-                 "desktop or it is iconified\n");
+                 "desktop or it is iconified");

         sibling = NULL;
     }
 
     switch (detail) {
     case Below:
         sibling = NULL;
     }
 
     switch (detail) {
     case Below:

-        ob_debug("Restack request Below for client %s sibling %s\n",
+        ob_debug("Restack request Below for client %s sibling %s",

                  client->title, sibling ? sibling->title : "(all)");
         /* just lower it */
         stacking_lower(CLIENT_AS_WINDOW(client));
         ret = TRUE;
         break;
     case BottomIf:
                  client->title, sibling ? sibling->title : "(all)");
         /* just lower it */
         stacking_lower(CLIENT_AS_WINDOW(client));
         ret = TRUE;
         break;
     case BottomIf:

-        ob_debug("Restack request BottomIf for client %s sibling "
-                 "%s\n",
+        ob_debug("Restack request BottomIf for client %s sibling %s",

                  client->title, sibling ? sibling->title : "(all)");
         /* if this client occludes sibling (or anything if NULL), then
            lower it to the bottom */
                  client->title, sibling ? sibling->title : "(all)");
         /* if this client occludes sibling (or anything if NULL), then
            lower it to the bottom */


@@ -657,13 +656,13 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
         }
         break;
     case Above:
         }
         break;
     case Above:

-        ob_debug("Restack request Above for client %s sibling %s\n",
+        ob_debug("Restack request Above for client %s sibling %s",

                  client->title, sibling ? sibling->title : "(all)");
         stacking_raise(CLIENT_AS_WINDOW(client));
         ret = TRUE;
         break;
     case TopIf:
                  client->title, sibling ? sibling->title : "(all)");
         stacking_raise(CLIENT_AS_WINDOW(client));
         ret = TRUE;
         break;
     case TopIf:

-        ob_debug("Restack request TopIf for client %s sibling %s\n",
+        ob_debug("Restack request TopIf for client %s sibling %s",

                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
             stacking_raise(CLIENT_AS_WINDOW(client));
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
             stacking_raise(CLIENT_AS_WINDOW(client));


@@ -671,8 +670,7 @@ gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
         }
         break;
     case Opposite:
         }
         break;
     case Opposite:

-        ob_debug("Restack request Opposite for client %s sibling "
-                 "%s\n",
+        ob_debug("Restack request Opposite for client %s sibling %s",

                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
             stacking_raise(CLIENT_AS_WINDOW(client));
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
             stacking_raise(CLIENT_AS_WINDOW(client));