X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=880ab1b552cc20952166a685ef491871b73e8825;hb=eb2a0feb0154e86a1c6c117fd0f6d1a18959b694;hp=9a506d15560ebf56b8a28321348c4e7ba99f01bd;hpb=2d03d0957792a08c852ad8997f0f19ed579c07d1;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 9a506d15..880ab1b5 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -234,6 +234,8 @@ static void frame_free(ObFrame *self)
 
 void frame_show(ObFrame *self)
 {
+    ob_debug("frame_show for window 0x%x : %d\n", self->client->window,
+             self->visible);
     if (!self->visible) {
         self->visible = TRUE;
         XMapWindow(ob_display, self->client->window);
@@ -243,9 +245,11 @@ void frame_show(ObFrame *self)
 
 void frame_hide(ObFrame *self)
 {
+    ob_debug("frame_hide for window 0x%x : %d\n", self->client->window,
+             self->visible);
     if (self->visible) {
         self->visible = FALSE;
-        self->client->ignore_unmaps += 2;
+        self->client->ignore_unmaps += 1;
         /* we unmap the client itself so that we can get MapRequest
            events, and because the ICCCM tells us to! */
         XUnmapWindow(ob_display, self->window);
@@ -535,10 +539,6 @@ void frame_grab_client(ObFrame *self, ObClient *client)
 
     /* 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);