remove the ob_root var, its redundant of what Xlib already provides

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 9356468378bc301a3171bdc89b04cb0c065fe4f1..96eac5cff418f2f116a0ee6d170050577ab12988 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -3,6 +3,7 @@
 #include "screen.h"
 #include "prop.h"
 #include "client.h"
+#include "frame.h"
 #include "dispatch.h"
 #include "openbox.h"
 #include "popup.h"
@@ -14,7 +15,7 @@
 #include <glib.h>
 
 gboolean moveresize_in_progress = FALSE;
-Client *moveresize_client = NULL;
+ObClient *moveresize_client = NULL;
 
 static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */
 
@@ -41,7 +42,9 @@ void moveresize_startup()
     popup_size_to_string(popup, "W:  0000  W:  0000");
 
     attrib.save_under = True;
-    opaque_window.win = XCreateWindow(ob_display, ob_root, 0, 0, 1, 1, 0,
+    opaque_window.win = XCreateWindow(ob_display,
+                                      RootWindow(ob_display, ob_screen),
+                                      0, 0, 1, 1, 0,
                                       RrDepth(ob_rr_inst), InputOutput,
                                       RrVisual(ob_rr_inst),
                                       CWSaveUnder, &attrib);
@@ -79,7 +82,7 @@ static void popup_coords(char *format, int a, int b)
     g_free(text);
 }
 
-void moveresize_start(Client *c, int x, int y, guint b, guint32 cnr)
+void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 {
     ObCursor cur;
     Rect *a;