cast the pixmap data to a char* for the pixmap_mask_new

[chaz/openbox] / engines / openbox / openbox.c

diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c
index 06b366168161fc079580d6710aae632d1ecd7506..0123f474246e30466a6f491cddb9bc61ed71e3d1 100644 (file)
--- a/engines/openbox/openbox.c
+++ b/engines/openbox/openbox.c
@@ -177,7 +177,7 @@ gboolean startup()
     a_unfocused_title = appearance_new(Surface_Planar, 0);
     a_focused_label = appearance_new(Surface_Planar, 1);
     a_unfocused_label = appearance_new(Surface_Planar, 1);
-    a_icon = appearance_new(Surface_Planar, 0);//1);
+    a_icon = appearance_new(Surface_Planar, 0);/*1);*/
     a_focused_handle = appearance_new(Surface_Planar, 0);
     a_unfocused_handle = appearance_new(Surface_Planar, 0);
 
@@ -475,14 +475,14 @@ void frame_adjust_area(ObFrame *self)
                        self->innersize.top + self->innersize.bottom +
                        self->frame.client->area.height));
 
-    /* do this in two steps because clients whose gravity is set to
-       'Static' don't end up getting moved at all with an XMoveResizeWindow */
-    XMoveWindow(ob_display, self->frame.plate,
-               self->innersize.left - self->cbwidth,
-               self->innersize.top - self->cbwidth);
-    XResizeWindow(ob_display, self->frame.plate,
-                 self->frame.client->area.width,
-                 self->frame.client->area.height);
+    /* move and resize the plate */
+    XMoveResizeWindow(ob_display, self->frame.plate,
+                      self->innersize.left - self->cbwidth,
+                      self->innersize.top - self->cbwidth,
+                      self->frame.client->area.width,
+                      self->frame.client->area.height);
+    /* when the client has StaticGravity, it likes to move around. */
+    XMoveWindow(ob_display, self->frame.client->window, 0, 0);
 
     STRUT_SET(self->frame.size,
              self->innersize.left + self->bwidth,
@@ -497,7 +497,7 @@ void frame_adjust_area(ObFrame *self)
                  self->frame.size.top + self->frame.size.bottom);
 
     render(self);
-     
+
     frame_adjust_shape(self);
 }