X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=edee736e32f6a10c0ef5feaff1029774414d6500;hb=3a5d404a081e5510c017a0781d9c1c557811d180;hp=2f08989188759da51d346e2baf51669fdaff0b0d;hpb=cdcc526a0274cace9f542960fe4eee4ddcc23d31;p=chaz%2Fopenbox diff --git a/src/openbox.cc b/src/openbox.cc index 2f089891..edee736e 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -12,7 +12,9 @@ #include "python.hh" #include "otk/property.hh" #include "otk/assassin.hh" +#include "otk/property.hh" #include "otk/util.hh" +#include "otk/rendercolor.hh" extern "C" { #include @@ -42,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) } @@ -61,6 +67,10 @@ void Openbox::signalHandler(int signal) openbox->restart(); break; + case SIGCHLD: + wait(NULL); + break; + case SIGHUP: case SIGINT: case SIGTERM: @@ -112,8 +122,14 @@ 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); - _property = new otk::Property(); + otk::RenderColor::initialize(); + otk::Timer::initialize(); + otk::Property::initialize(); _actions = new Actions(); _bindings = new Bindings(); @@ -134,6 +150,7 @@ Openbox::Openbox(int argc, char **argv) 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"/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 @@ -181,7 +198,6 @@ Openbox::~Openbox() delete _bindings; delete _actions; - delete _property; python_destroy(); @@ -194,12 +210,13 @@ Openbox::~Openbox() // all im gunna do is the same. //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()); } @@ -320,7 +337,7 @@ void Openbox::eventLoop() XFlush(**otk::display); // flush here before we go wait for timers // don't wait if we're to shutdown if (_shutdown) break; - _timermanager.fire(!_sync); // wait if not in sync mode + otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode } } @@ -367,9 +384,9 @@ void Openbox::setFocusedClient(Client *c) for (it = _screens.begin(); it != end; ++it) { int num = (*it)->number(); Window root = otk::display->screenInfo(num)->rootWindow(); - _property->set(root, otk::Property::net_active_window, - otk::Property::Atom_Window, - (c && _focused_screen == *it) ? c->window() : None); + otk::Property::set(root, otk::Property::atoms.net_active_window, + otk::Property::atoms.window, + (c && _focused_screen == *it) ? c->window() : None); } // call the python Focus callbacks