do need display then

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 01abd83c0c341a7f7deadf026bd7db5cda8d7d4b..d40a2a3a537a0ec86f9227953e35d3a19252ef00 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -354,7 +354,7 @@ void OBScreen::manageWindow(Window window)
   Openbox::instance->registerHandler(window, client);
 
   // we dont want a border on the client
-  XSetWindowBorderWidth(otk::OBDisplay::display, window, 0);
+  client->toggleClientBorder(false);
   
   // specify that if we exit, the window should not be destroyed and should be
   // reparented back to root automatically
@@ -387,6 +387,8 @@ void OBScreen::unmanageWindow(OBClient *client)
 
   // XXX: pass around focus if this window was focused
 
+  // remove from the wm's map
+  Openbox::instance->removeClient(client->window());
   // unregister for handling events
   Openbox::instance->clearHandler(client->window());
   
@@ -397,10 +399,9 @@ void OBScreen::unmanageWindow(OBClient *client)
   XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
 
   frame->hide();
-  
-  // we dont want a border on the client
-  XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
-                        client->borderWidth());
+
+  // give the client its border back
+  client->toggleClientBorder(true);
 
   delete client->frame;
   client->frame = 0;