wrapper changes

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 49849ea9e26e54b7f1b6130d59879d8c7e8bf023..edee736e32f6a10c0ef5feaff1029774414d6500 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>
@@ -66,7 +67,7 @@ void Openbox::signalHandler(int signal)
     openbox->restart();
     break;
 
-  case SIGCLD:
+  case SIGCHLD:
     wait(NULL);
     break;
 
@@ -121,11 +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(SIGCLD, &action, (struct sigaction *) 0);
+  sigaction(SIGCHLD, &action, (struct sigaction *) 0);
 
-  // anything that died while we were restarting won't give us a SIGCLD
+  // 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();
@@ -148,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
@@ -208,6 +211,7 @@ Openbox::~Openbox()
   //otk::display->destroy();
 
   otk::Timer::destroy();
+  otk::RenderColor::destroy();
 
   if (_restart) {
     if (!_restart_prog.empty()) {