let clients be remaximized to adjust to new surroundings/struts

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 89948118f7ff37cc4721a4fb7048ad2a504463bd..ccab162a60c64146caec6d501a9df257ef8a015c 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -14,6 +14,7 @@
 #include "otk/assassin.hh"
 #include "otk/property.hh"
 #include "otk/util.hh"
+#include "otk/rendercolor.hh"
 
 extern "C" {
 #include <X11/cursorfont.h>
@@ -43,6 +44,10 @@ extern "C" {
 #  include <sys/select.h>
 #endif // HAVE_SYS_SELECT_H
 
+#ifdef    HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif // HAVE_SYS_WAIT_H
+
 #include "gettext.h"
 #define _(str) gettext(str)
 }
@@ -62,6 +67,10 @@ void Openbox::signalHandler(int signal)
     openbox->restart();
     break;
 
+  case SIGCHLD:
+    wait(NULL);
+    break;
+
   case SIGHUP:
   case SIGINT:
   case SIGTERM:
@@ -113,7 +122,12 @@ Openbox::Openbox(int argc, char **argv)
   sigaction(SIGTERM, &action, (struct sigaction *) 0);
   sigaction(SIGINT, &action, (struct sigaction *) 0);
   sigaction(SIGHUP, &action, (struct sigaction *) 0);
+  sigaction(SIGCHLD, &action, (struct sigaction *) 0);
 
+  // anything that died while we were restarting won't give us a SIGCHLD
+  while (waitpid(-1, NULL, WNOHANG) > 0);
+
+  otk::RenderColor::initialize();
   otk::Timer::initialize();
   otk::Property::initialize();
   _actions = new Actions();
@@ -133,23 +147,28 @@ Openbox::Openbox(int argc, char **argv)
   python_init(argv[0]);
   
   // load config values
-  python_exec(SCRIPTDIR"/config.py"); // load openbox config values
+  //python_exec(SCRIPTDIR"/config.py"); // load openbox config values
   // run all of the python scripts
-  python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks
+  //python_exec(SCRIPTDIR"/builtins.py"); // builtin callbacks
+  //python_exec(SCRIPTDIR"/focus.py"); // focus helpers
   // run the user's script or the system defaults if that fails
   if (!python_exec(_scriptfilepath.c_str()))
     python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
 
   // initialize all the screens
-  Screen *screen;
-  int i = _single ? DefaultScreen(**otk::display) : 0;
-  int max = _single ? i + 1 : ScreenCount(**otk::display);
-  for (; i < max; ++i) {
+  for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
+    Screen *screen;
+    if (_single && i != DefaultScreen(**otk::display)) {
+      _screens.push_back(0);
+      continue;
+    }
     screen = new Screen(i);
     if (screen->managed())
       _screens.push_back(screen);
-    else
+    else {
       delete screen;
+      _screens.push_back(0);
+    }
   }
 
   if (_screens.empty()) {
@@ -196,13 +215,12 @@ Openbox::~Openbox()
   //otk::display->destroy();
 
   otk::Timer::destroy();
+  otk::RenderColor::destroy();
 
   if (_restart) {
     if (!_restart_prog.empty()) {
-      const std::string &dstr =
-        otk::display->screenInfo(first_screen)->displayString();
-      otk::putenv(const_cast<char *>(dstr.c_str()));
-      execlp(_restart_prog.c_str(), _restart_prog.c_str(), NULL);
+      otk::putenv(otk::display->screenInfo(first_screen)->displayString());
+      execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL); 
       perror(_restart_prog.c_str());
     }
     
@@ -280,7 +298,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]);
 
@@ -376,16 +394,9 @@ void Openbox::setFocusedClient(Client *c)
   }
 
   // call the python Focus callbacks
-  EventData data(_focused_screen->number(), c, EventFocus, 0);
+  EventData data(_focused_screen->number(), c, EventAction::Focus, 0);
   _bindings->fireEvent(&data);
 }
 
-void Openbox::execute(int screen, const std::string &bin)
-{
-  if (screen >= ScreenCount(**otk::display))
-    screen = 0;
-  otk::bexec(bin, otk::display->screenInfo(screen)->displayString());
-}
-
 }