better reparent handling, dont fux with the event stack..

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index e9d1250088d65aa1e71068a1a15f7a4060b8f051..dda528483f15630460b60474e71730a8838ac7f1 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -58,19 +58,19 @@ Openbox *Openbox::instance  = (Openbox *) 0;
 void Openbox::signalHandler(int signal)
 {
   switch (signal) {
-  case SIGHUP:
-    // XXX: Do something with HUP? Really shouldn't, we get this when X shuts
-    //      down and hangs-up on us. we also get a SIGPIPE.
-    printf("Caught HUP signal. Restarting.\n");
+  case SIGUSR1:
+    printf("Caught SIGUSR1 signal. Restarting.\n");
     instance->restart();
     break;
-    
+
+  case SIGHUP:
   case SIGINT:
   case SIGTERM:
   case SIGPIPE:
     printf("Caught signal %d. Exiting.\n", signal);
     instance->shutdown();
     break;
+
   case SIGFPE:
   case SIGSEGV:
     printf("Caught signal %d. Aborting and dumping core.\n", signal);
@@ -110,6 +110,7 @@ Openbox::Openbox(int argc, char **argv)
   action.sa_handler = Openbox::signalHandler;
   action.sa_mask = sigset_t();
   action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
+  sigaction(SIGUSR1, &action, (struct sigaction *) 0);
   sigaction(SIGPIPE, &action, (struct sigaction *) 0);
   sigaction(SIGSEGV, &action, (struct sigaction *) 0);
   sigaction(SIGFPE, &action, (struct sigaction *) 0);
@@ -305,7 +306,7 @@ void Openbox::showHelp()
 void Openbox::eventLoop()
 {
   while (!_shutdown) {
-    _timermanager.fire();
+    _timermanager.fire(!_sync); // wait if not in sync mode
     dispatchEvents(); // from OtkEventDispatcher
     XFlush(otk::OBDisplay::display); // flush here before we go wait for timers
   }
@@ -358,6 +359,13 @@ void Openbox::setFocusedClient(OBClient *c)
                    otk::OBProperty::Atom_Window,
                    (c && _focused_screen == *it) ? c->window() : None);
   }
+
+  // call the python Focus callbacks
+  EventData *data = new_event_data(_focused_screen->number(),
+                                   c ? c->window() : 0,
+                                   EventFocus, 0);
+  Openbox::instance->bindings()->fireEvent(data);
+  Py_XDECREF((PyObject*)data);
 }
 
 void Openbox::execute(int screen, const std::string &bin)