X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=1b9887d95ecdd529182c7919ee9fdcb90d373113;hb=62f1473c651a564391e53548e0cb7daa5303776d;hp=3e3b9632d50ede9169864fb03a6a251b0c5aa0ef;hpb=845833226b7d65019d41eb3afce6fad7ae3d30a2;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 3e3b9632..1b9887d9 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "openbox.h"
 #include "dock.h"
 #include "xerror.h"
@@ -65,7 +66,7 @@ static gboolean replace_wm()
     current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom);
     if (current_wm_sn_owner) {
         if (!ob_replace_wm) {
-            g_message("A window manager is already running on screen %d",
+            g_warning("A window manager is already running on screen %d",
                       ob_screen);
             return FALSE;
         }
@@ -102,7 +103,7 @@ static gboolean replace_wm()
                        timestamp);
 
     if (XGetSelectionOwner(ob_display, wm_sn_atom) != screen_support_win) {
-        g_message("Could not acquire window manager selection on screen %d",
+        g_warning("Could not acquire window manager selection on screen %d",
                   ob_screen);
         return FALSE;
     }
@@ -123,7 +124,7 @@ static gboolean replace_wm()
       }
 
       if (wait >= timeout) {
-          g_message("Timeout expired while waiting for the current WM to die "
+          g_warning("Timeout expired while waiting for the current WM to die "
                     "on screen %d", ob_screen);
           return FALSE;
       }
@@ -165,7 +166,7 @@ gboolean screen_annex()
                  ROOT_EVENTMASK);
     xerror_set_ignore(FALSE);
     if (xerror_occured) {
-        g_message("A window manager is already running on screen %d",
+        g_warning("A window manager is already running on screen %d",
                   ob_screen);
 
         XDestroyWindow(ob_display, screen_support_win);
@@ -173,7 +174,7 @@ gboolean screen_annex()
     }
 
 
-    g_message("Managing screen %d", ob_screen);
+    ob_debug("Managing screen %d\n", ob_screen);
 
     set_root_cursor();
 
@@ -352,11 +353,11 @@ void screen_resize()
     if (ob_state() == OB_STATE_STARTING)
 	return;
 
-    dock_configure();
     screen_update_areas();
+    dock_configure();
 
     for (it = client_list; it; it = it->next)
-        client_move_onscreen(it->data);
+        client_move_onscreen(it->data, FALSE);
 }
 
 void screen_set_num_desktops(guint num)
@@ -426,7 +427,7 @@ void screen_set_desktop(guint num)
 
     if (old == num) return;
 
-    g_message("Moving to desktop %d", num+1);
+    ob_debug("Moving to desktop %d\n", num+1);
 
     /* show windows before hiding the rest to lessen the enter/leave events */
 
@@ -452,11 +453,11 @@ void screen_set_desktop(guint num)
        from the switch so it doesnt mess with the focus */
     while (XCheckTypedEvent(ob_display, EnterNotify, &e));
 #ifdef DEBUG_FOCUS
-    g_message("switch fallback");
+    ob_debug("switch fallback\n");
 #endif
     focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
 #ifdef DEBUG_FOCUS
-    g_message("/switch fallback");
+    ob_debug("/switch fallback\n");
 #endif
 
     dispatch_ob(Event_Ob_Desktop, num, old);
@@ -636,8 +637,6 @@ void screen_update_areas()
 {
     guint i, x;
     guint32 *dims;
-    Rect **old_area = area;
-    Rect **rit;
     GList *it;
 
     g_free(monitor_area);
@@ -656,7 +655,6 @@ void screen_update_areas()
      
     dims = g_new(guint32, 4 * screen_num_desktops);
 
-    rit = old_area;
     for (i = 0; i < screen_num_desktops + 1; ++i) {
         Strut s;
         int l, r, t, b;
@@ -799,7 +797,7 @@ void screen_update_areas()
         }
     }
     PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal,
-		dims, 4 * screen_num_desktops);
+                dims, 4 * screen_num_desktops);
 
     g_free(dims);
 }