refix for managing iconic windows, without having the frame map which caused flashing. instead, keep track of if the frame has been mapped yet. if it hasn't and it is getting hidden, then make sure to unmap the child.
Dana Jansens danakj@orodu.net
3 files changed,
20 insertions(+),
14 deletions(-)
M
openbox/client.c
→
openbox/client.c
@@ -2116,10 +2116,9 @@ void client_showhide(ObClient *self)
{ if (client_should_show(self)) { - if (!self->frame->visible) - frame_show(self->frame); + frame_show(self->frame); } - else if (self->frame->visible) { + else { frame_hide(self->frame); /* Fall back focus since we're disappearing */
M
openbox/frame.c
→
openbox/frame.c
@@ -238,18 +238,28 @@ if (!self->visible) {
self->visible = TRUE; XMapWindow(ob_display, self->client->window); XMapWindow(ob_display, self->window); + self->firstmap = TRUE; } } void frame_hide(ObFrame *self) { - if (self->visible) { - self->visible = FALSE; - self->client->ignore_unmaps += 2; - /* we unmap the client itself so that we can get MapRequest - events, and because the ICCCM tells us to! */ - XUnmapWindow(ob_display, self->window); - XUnmapWindow(ob_display, self->client->window); + if (self->visible || self->firstmap == FALSE) { + if (self->visible) { + self->visible = FALSE; + self->client->ignore_unmaps += 2; + /* we unmap the client itself so that we can get MapRequest + events, and because the ICCCM tells us to! */ + XUnmapWindow(ob_display, self->window); + XUnmapWindow(ob_display, self->client->window); + } else { + /* the frame wasn't visible, but the frame is being hidden now. + so we don't need to unmap the frame, but we do need to unmap + the client. */ + self->client->ignore_unmaps += 1; + XUnmapWindow(ob_display, self->client->window); + } + self->firstmap = TRUE; } }@@ -535,10 +545,6 @@ frame_adjust_area(self, TRUE, TRUE, FALSE);
/* map the client so it maps when the frame does */ XMapWindow(ob_display, client->window); - /* map the frame so they are in a consistant state together */ - XMapWindow(ob_display, self->window); - /* reflect that we're initially visible */ - self->visible = TRUE; /* set all the windows for the frame in the window_map */ g_hash_table_insert(window_map, &self->window, client);
M
openbox/frame.h
→
openbox/frame.h
@@ -76,6 +76,7 @@
Strut size; Rect area; gboolean visible; + gboolean firstmap; /*! Whether the window is obscured at all or fully visible. */ gboolean obscured;