M otk/display.cc → otk/display.cc

@@ -162,6 +162,8 @@ 
 void OBDisplay::destroy()
 {
   delete _gccache;
+  while (_grab_count > 0)
+    ungrab();
   XCloseDisplay(display);
 }
 

M src/client.cc → src/client.cc

@@ -7,7 +7,6 @@ 
 #include "client.hh"
 #include "frame.hh"
 #include "screen.hh"
-#include "bbscreen.hh"
 #include "openbox.hh"
 #include "otk/display.hh"
 #include "otk/property.hh"

M src/openbox.cc → src/openbox.cc

@@ -172,9 +172,6 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  // return input focus to the root
-  XSetInputFocus(otk::OBDisplay::display, PointerRoot, None, CurrentTime);
-  
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
 
   delete _bindings;
@@ -183,11 +180,14 @@ delete _property;
 
   python_destroy();
 
-  XSync(otk::OBDisplay::display, False);
-  
-  // close the X display
-  otk::OBDisplay::destroy();
-  printf("Exiting!\n");
+  XSetInputFocus(otk::OBDisplay::display, PointerRoot, RevertToNone,
+                 CurrentTime);
+  XSync(otk::OBDisplay::display, false);
+
+  // this tends to block.. i honestly am not sure why. causing an x error in
+  // the shutdown process unblocks it. blackbox simply did a ::exit(0), so
+  // all im gunna do is the same.
+  //otk::OBDisplay::destroy();
 }
 
 

M src/screen.cc → src/screen.cc

@@ -123,13 +123,12 @@ {
   if (! _managed) return;
 
   XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask);
-  XSync(otk::OBDisplay::display, False);
   
-  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
-
   // unmanage all windows
   while (!clients.empty())
     unmanageWindow(clients.front());
+
+  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
 
   delete _image_control;
 }
@@ -425,7 +424,17 @@ OBFrame *frame = client->frame;
 
   Openbox::instance->bindings()->grabButtons(false, client);
 
-  // XXX: pass around focus if this window was focused
+  // remove from the stacking order
+  _stacking.remove(client);
+  
+  // pass around focus if this window was focused XXX do this better!
+  if (Openbox::instance->focusedClient() == client) {
+    OBClient *newfocus = 0;
+    if (!_stacking.empty())
+      newfocus = _stacking.front();
+    if (! (newfocus && newfocus->focus()))
+      client->unfocus();
+  }
 
   // remove from the wm's map
   Openbox::instance->removeClient(client->window());
@@ -457,8 +466,7 @@ 
   delete client->frame;
   client->frame = 0;
 
-  // remove from the screen's lists
-  _stacking.remove(client);
+  // remove from the screen's list
   clients.remove(client);
   delete client;