X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.cc;h=a7aded34273be936b60cdb42fd297374cc6b4594;hb=7b7ae097a0d389a35967fdab4ea310effcfc42c2;hp=0bbcebc6d8d694de53f06a283ef53b7147e75d23;hpb=d9d2e7a5094d6d9a9764a68b76de77f2864e4f06;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index 0bbcebc6..a7aded34 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -48,7 +48,8 @@ namespace ob {
 
 Screen::Screen(int screen)
   : WidgetBase(WidgetBase::Type_Root),
-    _number(screen)
+    _number(screen),
+    _style(screen, "")
 {
   assert(screen >= 0); assert(screen < ScreenCount(**otk::display));
   _info = otk::display->screenInfo(screen);
@@ -73,13 +74,8 @@ Screen::Screen(int screen)
   XDefineCursor(**otk::display, _info->rootWindow(),
                 openbox->cursors().session);
 
-  // initialize the shit that is used for all drawing on the screen
-  _image_control = new otk::ImageControl(_info, true);
-  _image_control->installRootColormap();
-  _root_cmap_installed = True;
-
-  // initialize the screen's style
-  _style.setImageControl(_image_control);
+  // XXX: initialize the screen's style
+  /*
   otk::ustring stylepath;
   python_get_string("theme", &stylepath);
   otk::Configuration sconfig(false);
@@ -92,6 +88,7 @@ Screen::Screen(int screen)
     }
   }
   _style.load(sconfig);
+  */
 
   // set up notification of netwm support
   changeSupportedAtoms();
@@ -157,8 +154,6 @@ Screen::~Screen()
 
   XDestroyWindow(**otk::display, _focuswindow);
   XDestroyWindow(**otk::display, _supportwindow);
-
-  delete _image_control;
 }
 
 
@@ -599,7 +594,7 @@ void Screen::lowerWindow(Client *client)
   assert(!_stacking.empty()); // this would be bad
 
   Client::List::iterator it = --_stacking.end();
-  Client::List::const_iterator end = _stacking.begin();
+  const Client::List::iterator end = _stacking.begin();
 
   for (; it != end && (*it)->layer() < client->layer(); --it);
   if (*it == client) return;          // already the bottom, return
@@ -624,7 +619,7 @@ void Screen::raiseWindow(Client *client)
   _stacking.remove(client);
   
   Client::List::iterator it = _stacking.begin();
-  Client::List::const_iterator end = _stacking.end();
+  const Client::List::iterator end = _stacking.end();
 
   // the stacking list is from highest to lowest
   for (; it != end && (*it)->layer() > client->layer(); ++it);