clearer code paths

diff --git a/openbox/event.c b/openbox/event.c
index dc9ba9f96e5e03b46a409a7bdf63462eaaa405ef..95937f5faddf7722016a49b0a0b88ec18758fabf 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1531,7 +1531,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 #ifdef SHAPE
         if (extensions_shape && e->type == extensions_shape_event_basep) {
             client->shaped = ((XShapeEvent*)e)->shaped;
-            frame_adjust_shape(client->frame);
+            frame_adjust_area(client->frame, FALSE, TRUE, FALSE);
         }
 #endif
     }

diff --git a/openbox/frame.c b/openbox/frame.c
index 8f947e49d49e289aea1bf48f2564b899fe0cdf43..04dbe6e2b35cd32bcd80c534f3000092f330f930 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -51,6 +51,7 @@ static void layout_title(ObFrame *self);
 static void set_theme_statics(ObFrame *self);
 static void free_theme_statics(ObFrame *self);
 static gboolean frame_animate_iconify(gpointer self);
+static void frame_adjust_shape(ObFrame *self);
 static void frame_adjust_cursors(ObFrame *self);
 static void frame_get_offscreen_buffer(ObFrame *self);
 static void frame_free_offscreen_buffer(ObFrame *self);
@@ -313,9 +314,6 @@ void frame_adjust_shape(ObFrame *self)
                                 ShapeUnion, Unsorted);
     }
 #endif
-
-    /* the offscreen buffer's shape needs to match */
-    frame_get_offscreen_buffer(self);
 }
 
 void frame_adjust_area(ObFrame *self, gboolean moved,
@@ -786,8 +784,10 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         if (resized) {
             self->need_render = TRUE;
             framerender_frame(self);
-            /* this also updates the offscreen buffer */
             frame_adjust_shape(self);
+
+            /* the offscreen buffer's shape needs to match */
+            frame_get_offscreen_buffer(self);
         }
 
         if (!STRUT_EQUAL(self->size, oldsize)) {

diff --git a/openbox/frame.h b/openbox/frame.h
index c21860ee665e86004efc555030688691fa0dc288..beb6b8a0dfceed2762c74c3f1f9d90e70cb60160 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -209,7 +209,6 @@ void frame_free(ObFrame *self);
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);
 void frame_adjust_theme(ObFrame *self);
-void frame_adjust_shape(ObFrame *self);
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
 void frame_adjust_client_area(ObFrame *self);