X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fframe.cc;h=c5b144c5f3cbd4f8104389cb7529c008a77c8fef;hb=15a7384d11b7a521945a14c8192b0d176adadfe7;hp=55a0cec0db00bc5c119e580ba838195aa5639cef;hpb=e5eb783aa22440625d497a07fa079cae93bdaa86;p=chaz%2Fopenbox

diff --git a/src/frame.cc b/src/frame.cc
index 55a0cec0..c5b144c5 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -56,14 +56,11 @@ OBFrame::OBFrame(OBClient *client, otk::Style *style)
   otk::OtkWidget::unfocus(); // stuff starts out appearing focused in otk
   
   _plate.show(); // the other stuff is shown based on decor settings
-  
-  grabClient();
 }
 
 
 OBFrame::~OBFrame()
 {
-  releaseClient();
 }
 
 
@@ -432,23 +429,21 @@ void OBFrame::grabClient()
 
 void OBFrame::releaseClient()
 {
-  // check if the app has already reparented its window to the root window
   XEvent ev;
+
+  // check if the app has already reparented its window away
   if (XCheckTypedWindowEvent(otk::OBDisplay::display, _client->window(),
                              ReparentNotify, &ev)) {
-    // XXX: ob2/bb didn't do this.. look up this process in other wm's!
-    //XPutBackEvent(otk::OBDisplay::display, &ev);
-    XMapWindow(otk::OBDisplay::display, _client->window());
+    XPutBackEvent(otk::OBDisplay::display, &ev);
+    // re-map the window since the unmanaging process unmaps it
+    XMapWindow(otk::OBDisplay::display, _client->window());  
   } else {
-    // according to the ICCCM - if the client doesn't reparent to
-    // root, then we have to do it for them
+    // according to the ICCCM - if the client doesn't reparent itself, then we
+    // will reparent the window to root for them
     XReparentWindow(otk::OBDisplay::display, _client->window(),
                     _screen->rootWindow(),
                     _client->area().x(), _client->area().y());
   }
-
-  // do an extra map here .. ? XXX
-//  XMapWindow(otk::OBDisplay::display, _client->window());
 }