X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=6436140db239210613b5f299a450b4062754bae9;hb=2c977ae7ffe1e287264989669d2cfd2eb499d4ee;hp=89948118f7ff37cc4721a4fb7048ad2a504463bd;hpb=d8aff44a6a639de83ba8f0957f9f9f17f2a05532;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 89948118..6436140d 100644 --- 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 @@ -43,6 +44,10 @@ extern "C" { # include #endif // HAVE_SYS_SELECT_H +#ifdef HAVE_SYS_WAIT_H +# include +#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(); @@ -196,13 +210,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(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()); }