From 8a85b2bddaaf5dea466a5dc84b022c0ad8b6e6d3 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sat, 26 May 2007 19:51:20 +0000 Subject: [PATCH] merge r6895-6896 from trunk --- openbox/frame.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/openbox/frame.c b/openbox/frame.c index a03a876a..dbb17681 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -842,6 +842,11 @@ void frame_adjust_icon(ObFrame *self) void frame_grab_client(ObFrame *self) { + /* DO NOT map the client window here. we used to do that, but it is bogus. + we need to set up the client's dimensions and everything before we + send a mapnotify or we create race conditions. + */ + /* reparent the client to the frame */ XReparentWindow(ob_display, self->client->window, self->plate, 0, 0); @@ -860,9 +865,6 @@ void frame_grab_client(ObFrame *self) req's) the ButtonPress is to catch clicks on the client border */ XSelectInput(ob_display, self->plate, PLATE_EVENTMASK); - /* map the client so it maps when the frame does */ - XMapWindow(ob_display, self->client->window); - /* set all the windows for the frame in the window_map */ g_hash_table_insert(window_map, &self->window, self->client); g_hash_table_insert(window_map, &self->plate, self->client); -- 2.34.1