client and stacking list work

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index f510749c5810d018035fd9652fff0266891041e1..f38a38fc2fab25ae2571689ecc418992034d597c 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -122,10 +122,14 @@ OBScreen::~OBScreen()
 {
   if (! _managed) return;
 
+  XSelectInput(otk::OBDisplay::display, _info->rootWindow(), NoEventMask);
+  
   // unmanage all windows
   while (!clients.empty())
     unmanageWindow(clients.front());
 
+  XDestroyWindow(otk::OBDisplay::display, _focuswindow);
+
   delete _image_control;
 }
 
@@ -263,12 +267,13 @@ void OBScreen::calcArea()
 void OBScreen::setClientList()
 {
   Window *windows;
+  unsigned int size = clients.size();
 
   // create an array of the window ids
-  if (clients.size() > 0) {
+  if (size > 0) {
     Window *win_it;
     
-    windows = new Window[clients.size()];
+    windows = new Window[size];
     win_it = windows;
     ClientList::const_iterator it = clients.begin();
     const ClientList::const_iterator end = clients.end();
@@ -280,9 +285,9 @@ void OBScreen::setClientList()
   Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_client_list,
                                      otk::OBProperty::Atom_Window,
-                                     windows, clients.size());
+                                     windows, size);
 
-  if (clients.size())
+  if (size)
     delete [] windows;
 
   setStackingList();
@@ -291,19 +296,32 @@ void OBScreen::setClientList()
 
 void OBScreen::setStackingList()
 {
-  // The below comment is wrong now hopefully :> but ill keep it here for
-  // reference anyways
-  /*
-    Get the stacking order from all of the workspaces.
-    We start with the current workspace so that the sticky windows will be
-    in the right order on the current workspace.
-  */
-  /*
-  Openbox::instance->property()->set(_info->getRootWindow(),
+  Window *windows;
+  unsigned int size = _stacking.size();
+
+  assert(size == clients.size()); // just making sure.. :)
+
+  
+  // create an array of the window ids
+  if (size > 0) {
+    Window *win_it;
+    
+    windows = new Window[size];
+    win_it = windows;
+    ClientList::const_iterator it = _stacking.begin();
+    const ClientList::const_iterator end = _stacking.end();
+    for (; it != end; ++it, ++win_it)
+      *win_it = (*it)->window();
+  } else
+    windows = (Window*) 0;
+
+  Openbox::instance->property()->set(_info->rootWindow(),
                                      otk::OBProperty::net_client_list_stacking,
                                      otk::OBProperty::Atom_Window,
-                                     _stacking, _stacking.size());
-  */
+                                     windows, size);
+
+  if (size)
+    delete [] windows;
 }
 
 
@@ -406,7 +424,7 @@ void OBScreen::manageWindow(Window window)
   clients.push_back(client);
   // this puts into the stacking order, then raises it
   _stacking.push_back(client);
-  raise(client);
+  restack(true, client);
   // update the root properties
   setClientList();
 
@@ -420,7 +438,17 @@ void OBScreen::unmanageWindow(OBClient *client)
 
   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());
@@ -452,8 +480,7 @@ void OBScreen::unmanageWindow(OBClient *client)
   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;
 
@@ -461,7 +488,7 @@ void OBScreen::unmanageWindow(OBClient *client)
   setClientList();
 }
 
-void OBScreen::raise(OBClient *client)
+void OBScreen::restack(bool raise, OBClient *client)
 {
   const int layer = client->layer();
   std::vector<Window> wins;
@@ -473,33 +500,7 @@ void OBScreen::raise(OBClient *client)
   ClientList::iterator it = _stacking.begin(), end = _stacking.end();
   // insert the windows above this window
   for (; it != end; ++it) {
-    if ((*it)->layer() <= layer)
-      break;
-    wins.push_back((*it)->frame->window());
-  }
-  // insert our client
-  wins.push_back(client->frame->window());
-  _stacking.insert(it, client);
-  // insert the remaining below this window
-  for (; it != end; ++it)
-    wins.push_back((*it)->frame->window());
-
-  XRestackWindows(otk::OBDisplay::display, &wins[0], wins.size());
-}
-
-void OBScreen::lower(OBClient *client)
-{
-  const int layer = client->layer();
-  std::vector<Window> wins;
-
-  _stacking.remove(client);
-
-  // the stacking list is from highest to lowest
-  
-  ClientList::iterator it = _stacking.begin(), end = _stacking.end();
-  // insert the windows above this window
-  for (; it != end; ++it) {
-    if ((*it)->layer() < layer)
+    if ((*it)->layer() < layer || (raise && (*it)->layer() == layer))
       break;
     wins.push_back((*it)->frame->window());
   }
@@ -511,6 +512,7 @@ void OBScreen::lower(OBClient *client)
     wins.push_back((*it)->frame->window());
 
   XRestackWindows(otk::OBDisplay::display, &wins[0], wins.size());
+  setStackingList();
 }
 
 }