diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-06-21 15:04:51 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-06-21 15:04:51 +0000 |
| commit | d158b642820910adf2d4f73370cf3537749230a6 (patch) | |
| tree | 1bd085a1c86455a3931d17fd2bc72cfd471e1690 | |
| parent | 7d3e3ff6dfda1fa87165d9823e47cd2c9dd9f57e (diff) | |
clearer code paths
| -rw-r--r-- | openbox/event.c | 2 | ||||
| -rw-r--r-- | openbox/frame.c | 8 | ||||
| -rw-r--r-- | openbox/frame.h | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/openbox/event.c b/openbox/event.c index dc9ba9f9..95937f5f 100644 --- 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 8f947e49..04dbe6e2 100644 --- 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 c21860ee..beb6b8a0 100644 --- 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); |