X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=0143a3eb4e6365378a9f3f72211bfd8596e18a8a;hb=4147215afa51dd79cbc474a79478deff4ca9ad71;hp=5e53fb0632ab4860ee430c147128865222c227df;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 5e53fb06..0143a3eb 100644
--- 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);
 
@@ -196,8 +188,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 +202,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);
-  }
 }
 
 
@@ -298,7 +276,7 @@ void Openbox::showHelp()
   -rc <string>       use alternate resource file.\n\
   -menu <string>     use alternate menu file.\n\
   -script <string>   use alternate startup script file.\n\
-  -sync              run in synchronous mode (for debugging).\n\
+  -sync              run in synchronous mode (for debugging X errors).\n\
   -version           display version and exit.\n\
   -help              display this help text and exit.\n\n"), _argv[0]);