make an optional bool param for ustring's other constructors

[chaz/openbox] / src / screen.cc

diff --git a/src/screen.cc b/src/screen.cc
index 22ff3ca96483f3222ac8aec377007ccfe4ae6937..c4dfe8fc7d0f92cdda8d124216e986c41d97b993 100644 (file)
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -75,8 +75,7 @@ Screen::Screen(int screen)
                 openbox->cursors().session);
 
   // initialize the shit that is used for all drawing on the screen
-  _image_control = new otk::ImageControl(openbox->timerManager(),
-                                         _info, true);
+  _image_control = new otk::ImageControl(_info, true);
   _image_control->installRootColormap();
   _root_cmap_installed = True;
 
@@ -110,9 +109,9 @@ Screen::Screen(int screen)
   std::vector<otk::ustring> names;
   python_get_stringlist("desktop_names", &names);
   openbox->property()->set(_info->rootWindow(),
-                                     otk::Property::net_desktop_names,
-                                     otk::Property::utf8,
-                                     names);
+                           otk::Property::net_desktop_names,
+                           otk::Property::utf8,
+                           names);
   // the above set() will cause the updateDesktopNames to fire right away so
   // we have a list of desktop names
 
@@ -410,23 +409,23 @@ void Screen::changeStackingList()
   assert(size == clients.size()); // just making sure.. :)
 
   
-  // create an array of the window ids
+  // create an array of the window ids (from bottom to top, reverse order!)
   if (size > 0) {
     Window *win_it;
     
     windows = new Window[size];
     win_it = windows;
-    Client::List::const_iterator it = _stacking.begin();
-    const Client::List::const_iterator end = _stacking.end();
+    Client::List::const_reverse_iterator it = _stacking.rbegin();
+    const Client::List::const_reverse_iterator end = _stacking.rend();
     for (; it != end; ++it, ++win_it)
       *win_it = (*it)->window();
   } else
     windows = (Window*) 0;
 
   openbox->property()->set(_info->rootWindow(),
-                                     otk::Property::net_client_list_stacking,
-                                     otk::Property::Atom_Window,
-                                     windows, size);
+                           otk::Property::net_client_list_stacking,
+                           otk::Property::Atom_Window,
+                           windows, size);
 
   if (size)
     delete [] windows;