X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Frootwindow.cc;h=364f614471d186a562544b7cc9200c677860a490;hb=b34824a4e2ddc0247099fa1b3952de426bfde05b;hp=3fccc44a12418f5a3b3b2ef630fc4f758eee2522;hpb=52cb7bd11ed83a57c4c1affcdac8a1f7d68ae551;p=chaz%2Fopenbox

diff --git a/src/rootwindow.cc b/src/rootwindow.cc
index 3fccc44a..364f6144 100644
--- a/src/rootwindow.cc
+++ b/src/rootwindow.cc
@@ -12,11 +12,12 @@
 namespace ob {
 
 OBRootWindow::OBRootWindow(int screen)
-  : _info(otk::OBDisplay::screenInfo(screen))
+  : OBWidget(OBWidget::Type_Root),
+    _info(otk::OBDisplay::screenInfo(screen))
 {
   updateDesktopNames();
 
-  Openbox::instance->registerHandler(_info->getRootWindow(), this);
+  Openbox::instance->registerHandler(_info->rootWindow(), this);
 }
 
 
@@ -33,7 +34,7 @@ void OBRootWindow::updateDesktopNames()
 
   unsigned long num = (unsigned) -1;
   
-  if (!property->get(_info->getRootWindow(),
+  if (!property->get(_info->rootWindow(),
                      otk::OBProperty::net_desktop_names,
                      otk::OBProperty::utf8, &num, &_names))
     _names.clear();
@@ -87,7 +88,7 @@ void OBRootWindow::setDesktopName(int i, const std::string &name)
   
   otk::OBProperty::StringVect newnames = _names;
   newnames[i] = name;
-  property->set(_info->getRootWindow(), otk::OBProperty::net_desktop_names,
+  property->set(_info->rootWindow(), otk::OBProperty::net_desktop_names,
                 otk::OBProperty::utf8, newnames);
 }
 
@@ -103,8 +104,7 @@ void OBRootWindow::mapRequestHandler(const XMapRequestEvent &e)
   if (client) {
     // XXX: uniconify and/or unshade the window
   } else {
-    Openbox::instance->screen(_info->getScreenNumber())->
-      manageWindow(e.window);
+    Openbox::instance->screen(_info->screen())->manageWindow(e.window);
   }
 }