add code for interactive actions

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 1ef080752dbfdb50a885b10e27f83d7b3a39a23a..7e02bff43accde12621ba2eb7438d99b0a24560d 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -27,6 +27,7 @@
 #include "moveresize.h"
 #include "config.h"
 #include "screen.h"
+#include "composite.h"
 #include "client.h"
 #include "session.h"
 #include "frame.h"
@@ -364,15 +365,6 @@ void screen_startup(gboolean reconfig)
         return;
     }
 
-#ifdef USE_XCOMPOSITE
-    if (extensions_comp) {
-        /* Redirect window contents to offscreen pixmaps */
-        XCompositeRedirectSubwindows(ob_display,
-                                     RootWindow(ob_display, ob_screen),
-                                     CompositeRedirectAutomatic);
-    }
-#endif
-
     /* get the initial size */
     screen_resize();
 
@@ -499,6 +491,9 @@ void screen_resize()
 
     for (it = client_list; it; it = g_list_next(it))
         client_move_onscreen(it->data, FALSE);
+
+    /* this needs to be setup whenever the root window's size changes */
+    composite_setup_root_window();
 }
 
 void screen_set_num_desktops(guint num)
@@ -538,7 +533,7 @@ void screen_set_num_desktops(guint num)
             else if (screen_desktop == num - 1 &&
                      (c->desktop == DESKTOP_ALL ||
                       c->desktop == screen_desktop))
-                stacking_raise(WINDOW_AS_CLIENT(c));
+                stacking_raise(CLIENT_AS_WINDOW(c));
         }
     }