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

@@ -254,7 +254,7 @@ // reset them all
   for (sit = _struts.begin(); sit != send; ++sit)
     sit->left = sit->right = sit->top = sit->bottom = 0;
 
-  ClientList::const_iterator it, end = clients.end();
+  std::list<Client*>::const_iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     if ((*it)->iconic()) continue; // these dont count in the strut
     
@@ -318,7 +318,7 @@ #endif // XINERAMA
 */
     if (old_area != _area[i]) {
       // the area has changed, adjust all the maximized windows
-      ClientList::iterator it, end = clients.end();
+      std::list<Client*>::iterator it, end = clients.end();
       for (it = clients.begin(); it != end; ++it)
         if (i < _num_desktops) {
           if ((*it)->desktop() == i)
@@ -442,8 +442,8 @@ Window *win_it;
     
     windows = new Window[size];
     win_it = windows;
-    ClientList::const_iterator it = clients.begin();
-    const ClientList::const_iterator end = clients.end();
+    std::list<Client*>::const_iterator it = clients.begin();
+    const std::list<Client*>::const_iterator end = clients.end();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
@@ -473,8 +473,8 @@ Window *win_it;
     
     windows = new Window[size];
     win_it = windows;
-    ClientList::const_reverse_iterator it = _stacking.rbegin();
-    const ClientList::const_reverse_iterator end = _stacking.rend();
+    std::list<Client*>::const_reverse_iterator it = _stacking.rbegin();
+    const std::list<Client*>::const_reverse_iterator end = _stacking.rend();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
@@ -676,8 +676,8 @@ Window wins[2];  // only ever restack 2 windows.
 
   assert(!_stacking.empty()); // this would be bad
 
-  ClientList::iterator it = --_stacking.end();
-  const ClientList::iterator end = _stacking.begin();
+  std::list<Client*>::iterator it = --_stacking.end();
+  const std::list<Client*>::iterator end = _stacking.begin();
 
   if (client->modal() && client->transientFor()) {
     // don't let a modal window lower below its transient_for
@@ -685,7 +685,8 @@ it = std::find(_stacking.begin(), _stacking.end(), client->transientFor());
     assert(it != _stacking.end());
 
     wins[0] = (it == _stacking.begin() ? _focuswindow :
-               ((*(--ClientList::const_iterator(it)))->frame->window()));
+               ((*(--std::list<Client*>::const_iterator(it)))->
+                frame->window()));
     wins[1] = client->frame->window();
     if (wins[0] == wins[1]) return; // already right above the window
 
@@ -719,8 +720,8 @@ 
   // remove the client before looking so we can't run into ourselves
   _stacking.remove(client);
   
-  ClientList::iterator it = _stacking.begin();
-  const ClientList::iterator end = _stacking.end();
+  std::list<Client*>::iterator it = _stacking.begin();
+  const std::list<Client*>::iterator end = _stacking.end();
 
   // the stacking list is from highest to lowest
   for (; it != end && ((*it)->layer() > client->layer() || m == *it); ++it);
@@ -730,7 +731,7 @@ if our new position is the top, we want to stack under the _focuswindow
     otherwise, we want to stack under the previous window in the stack.
   */
   wins[0] = (it == _stacking.begin() ? _focuswindow :
-             ((*(--ClientList::const_iterator(it)))->frame->window()));
+             ((*(--std::list<Client*>::const_iterator(it)))->frame->window()));
   wins[1] = client->frame->window();
 
   _stacking.insert(it, client);
@@ -755,7 +756,7 @@ otk::Property::atoms.cardinal, _desktop);
 
   if (old == _desktop) return;
 
-  ClientList::iterator it, end = clients.end();
+  std::list<Client*>::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it)
     (*it)->showhide();
 
@@ -771,7 +772,7 @@ 
   if (!(num > 0)) return;
 
   // move windows on desktops that will no longer exist!
-  ClientList::iterator it, end = clients.end();
+  std::list<Client*>::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     unsigned int d = (*it)->desktop();
     if (d >= num && d != 0xffffffff) {
@@ -874,7 +875,7 @@ }
   
   _showing_desktop = show;
 
-  ClientList::iterator it, end = clients.end();
+  std::list<Client*>::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     if ((*it)->type() == Client::Type_Desktop) {
       if (show)

M src/screen.hh → src/screen.hh

@@ -54,10 +54,8 @@ SubstructureRedirectMask |
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  //! Holds a list of Clients
-  typedef std::list<Client*> ClientList;
   //! All managed clients on the screen (in order of being mapped)
-  ClientList clients;
+  std::list<Client*> clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -88,7 +86,7 @@ //! running
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  ClientList _stacking;
+  std::list<Client*> _stacking;
 
   //! The desktop currently being displayed
   unsigned int _desktop;