set the desktop number before the number of desktops

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index ccab162a60c64146caec6d501a9df257ef8a015c..727b403ebbe8c543bf55ef36f1c0b8b9c171e6f3 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -35,15 +35,6 @@ extern "C" {
 #  include <fcntl.h>
 #endif // HAVE_FCNTL_H
 
-#ifdef    HAVE_UNISTD_H
-#  include <sys/types.h>
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#ifdef    HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif // HAVE_SYS_SELECT_H
-
 #ifdef    HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
 #endif // HAVE_SYS_WAIT_H
@@ -106,6 +97,7 @@ Openbox::Openbox(int argc, char **argv)
   _scriptfilepath = otk::expandTilde("~/.openbox/user.py");
   _focused_client = 0;
   _sync = false;
+  _single = false;
 
   parseCommandLine(argc, argv);
 
@@ -156,21 +148,29 @@ Openbox::Openbox(int argc, char **argv)
     python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
 
   // initialize all the screens
+  _focused_screen = 0;
+
   for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
     Screen *screen;
+    // in single mode skip the screens we don't want to manage
     if (_single && i != DefaultScreen(**otk::display)) {
       _screens.push_back(0);
       continue;
     }
+    // try manage the screen
     screen = new Screen(i);
-    if (screen->managed())
+    if (screen->managed()) {
       _screens.push_back(screen);
-    else {
+      if (!_focused_screen) // set this to the first screen managed
+        _focused_screen = screen;
+    } else {
       delete screen;
       _screens.push_back(0);
     }
   }
 
+  assert(_focused_screen);
+
   if (_screens.empty()) {
     printf(_("No screens were found without a window manager. Exiting.\n"));
     ::exit(1);
@@ -185,7 +185,6 @@ Openbox::Openbox(int argc, char **argv)
   _bindings->grabKeys(true);
 
   // set up input focus
-  _focused_screen = _screens[0];
   setFocusedClient(0);
   
   _state = State_Normal; // done starting
@@ -196,8 +195,6 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  int first_screen = _screens.front()->number();
-  
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
 
   delete _bindings;
@@ -212,22 +209,10 @@ Openbox::~Openbox()
   // this tends to block.. i honestly am not sure why. causing an x error in
   // the shutdown process unblocks it. blackbox simply did a ::exit(0), so
   // all im gunna do is the same.
-  //otk::display->destroy();
+  //delete _display;
 
   otk::Timer::destroy();
   otk::RenderColor::destroy();
-
-  if (_restart) {
-    if (!_restart_prog.empty()) {
-      otk::putenv(otk::display->screenInfo(first_screen)->displayString());
-      execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL); 
-      perror(_restart_prog.c_str());
-    }
-    
-    // fall back in case the above execlp doesn't work
-    execvp(_argv[0], _argv);
-    execvp(otk::basename(_argv[0]).c_str(), _argv);
-  }
 }