remove the redundant _size property in OBScreen, and set the geometry root property...

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 9d040e14e786b036f37d2bb9bd94fa73a56b4adf..93570c8cf9e37f59ff80c9ced4aca55ed1318538 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -128,8 +128,19 @@ Openbox::Openbox(int argc, char **argv)
   _cursors.ur_angle = XCreateFontCursor(otk::OBDisplay::display, XC_ur_angle);
 
   // initialize all the screens
-  _screens.push_back(new OBScreen(0));
-  _screens[0]->loadStyle(_config);
+  OBScreen *screen;
+  screen = new OBScreen(0, _config);
+  if (screen->managed()) {
+    _screens.push_back(screen);
+    _screens[0]->manageExisting();
+    // XXX: "change to" the first workspace on the screen to initialize stuff
+  } else
+    delete screen;
+
+  if (_screens.empty()) {
+    printf(_("No screens were found without a window manager. Exiting.\n"));
+    ::exit(1);
+  }
   
   _state = State_Normal; // done starting
 }
@@ -139,10 +150,6 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  // unmanage all windows
-  while (!_clients.empty())
-    _xeventhandler.unmanageWindow(_clients.begin()->second);
-
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
   
   // close the X display