1 files changed, 68 insertions, 94 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 015bb62..3658e50 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -168,11 +168,38 @@ int handleXErrors(Display *d, XErrorEvent *e) {
 //            kill(0, 2);
     }
 #endif // !DEBUG
-
     return False;
 }
 
 
+int handleXIOErrors(Display* d) {
+    cerr << "Fluxbox: XIOError: lost connection to display.\n";
+    exit(1);
+}
+
+
+
+class KeyReloadHelper {
+public:
+    void reload() {
+        Fluxbox* f = Fluxbox::instance();
+        Keys* k = (f ? f->keys() : 0);
+        if (k) {
+            XRefreshKeyboardMapping(&(this->xmapping));
+            FbTk::KeyUtil::instance().init();
+            k->regrab();
+        }
+    }
+
+    XMappingEvent xmapping;
+};
+
+KeyReloadHelper s_key_reloader;
+
+typedef FbTk::SimpleCommand<KeyReloadHelper> KeyReloadHelperCmd;
+typedef FbTk::SimpleCommand<Fluxbox> FluxboxCmd;
+
+
 
 /* functor to call a memberfunction with by a reference argument
    other places needs this helper as well it should be moved
@@ -281,21 +308,8 @@ Fluxbox::Fluxbox(int argc, char **argv,
     s_kwm2_dockwindow = XInternAtom(disp,
                                     "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False);
     // setup X error handler
-    XSetErrorHandler((XErrorHandler) handleXErrors);
-
-    //catch system signals
-    SignalHandler &sigh = SignalHandler::instance();
-    sigh.registerHandler(SIGSEGV, this);
-    sigh.registerHandler(SIGFPE, this);
-    sigh.registerHandler(SIGTERM, this);
-    sigh.registerHandler(SIGINT, this);
-#ifndef _WIN32
-    sigh.registerHandler(SIGPIPE, this); // e.g. output sent to grep
-    sigh.registerHandler(SIGCHLD, this);
-    sigh.registerHandler(SIGHUP, this);
-    sigh.registerHandler(SIGUSR1, this);
-    sigh.registerHandler(SIGUSR2, this);
-#endif
+    XSetErrorHandler(handleXErrors);
+    XSetIOErrorHandler(handleXIOErrors);
 
     //
     // setup timer
@@ -303,11 +317,21 @@ Fluxbox::Fluxbox(int argc, char **argv,
     // Because when the command is executed we shouldn't do reconfig directly
     // because it could affect ongoing menu stuff so we need to reconfig in
     // the next event "round".
-    FbTk::RefCount<FbTk::Command<void> > reconfig_cmd(new FbTk::SimpleCommand<Fluxbox>(*this, &Fluxbox::timed_reconfigure));
+    FluxboxCmd* reconfig_cmd = new FluxboxCmd(*this, &Fluxbox::timed_reconfigure);
     m_reconfig_timer.setTimeout(1);
-    m_reconfig_timer.setCommand(reconfig_cmd);
+    m_reconfig_timer.setCommand(FbTk::RefCount<FbTk::Command<void> >(reconfig_cmd));
     m_reconfig_timer.fireOnce(true);
 
+    // xmodmap and other tools send a lot of MappingNotify events under some
+    // circumstances ("keysym comma = comma semicolon" creates 4 or 5).
+    // reloading the keys-file for every one of them is unclever. we postpone
+    // the reload() via a timer.
+    KeyReloadHelperCmd* rh_cmd = 
+        new KeyReloadHelperCmd(s_key_reloader, &KeyReloadHelper::reload);
+    m_key_reload_timer.setTimeout(250 * FbTk::FbTime::IN_MILLISECONDS);
+    m_key_reload_timer.setCommand(FbTk::RefCount<FbTk::Command<void> >(rh_cmd));
+    m_key_reload_timer.fireOnce(true);
+
     if (xsync)
         XSynchronize(disp, True);
 
@@ -638,20 +662,12 @@ void Fluxbox::handleEvent(XEvent * const e) {
 
         if (! winclient) {
             BScreen *screen = 0;
-            int screen_num;
             XWindowAttributes attr;
             // find screen
             if (XGetWindowAttributes(display(),
                                      e->xmaprequest.window,
                                      &attr) && attr.screen != 0) {
-                screen_num = XScreenNumberOfScreen(attr.screen);
-
-                // find screen
-                ScreenList::iterator screen_it = find_if(m_screen_list.begin(),
-                                                         m_screen_list.end(),
-                                                         FbTk::CompareEqual<BScreen>(&BScreen::screenNumber, screen_num));
-                if (screen_it != m_screen_list.end())
-                    screen = *screen_it;
+                screen = findScreen(XScreenNumberOfScreen(attr.screen));
             }
             // try with parent if we failed to find screen num
             if (screen == 0)
@@ -675,21 +691,18 @@ void Fluxbox::handleEvent(XEvent * const e) {
         break;
     case UnmapNotify:
         handleUnmapNotify(e->xunmap);
-        break;
-    case MappingNotify:
-        // Update stored modifier mapping
-        fbdbg<<"MappingNotify"<<endl;
+        break;
+    case MappingNotify: // Update stored modifier mapping
 
         if (e->xmapping.request == MappingKeyboard
             || e->xmapping.request == MappingModifier) {
-            XRefreshKeyboardMapping(&e->xmapping);
-            FbTk::KeyUtil::instance().init(); // reinitialise the key utils
-            // reconfigure keys (if the mapping changes, they don't otherwise update
-            m_key->regrab();
+
+            s_key_reloader.xmapping = e->xmapping;
+            m_key_reload_timer.start();
         }
         break;
     case CreateNotify:
-        break;
+        break;
     case DestroyNotify: {
         WinClient *winclient = searchWindow(e->xdestroywindow.window);
         if (winclient != 0) {
@@ -887,58 +900,6 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
     }
 }
 
-/// handle system signals
-void Fluxbox::handleSignal(int signum) {
-    _FB_USES_NLS;
-
-    static int re_enter = 0;
-
-    switch (signum) {
-#ifndef _WIN32
-    case SIGCHLD: // we don't want the child process to kill us
-        // more than one process may have terminated
-        while (waitpid(-1, 0, WNOHANG | WUNTRACED) > 0);
-        break;
-    case SIGHUP:
-        restart();
-        break;
-    case SIGUSR1:
-        load_rc();
-        break;
-    case SIGUSR2:
-        reconfigure();
-        break;
-#endif
-    case SIGSEGV:
-        abort();
-        break;
-    case SIGFPE:
-    case SIGINT:
-#ifndef _WIN32
-    case SIGPIPE:
-#endif
-    case SIGTERM:
-        shutdown();
-        break;
-    default:
-        fprintf(stderr,
-                _FB_CONSOLETEXT(BaseDisplay, SignalCaught, "%s:      signal %d caught\n", "signal catch debug message. Include %s for Command<void> and %d for signal number").c_str(),
-                m_argv[0], signum);
-
-        if (! m_starting && ! re_enter) {
-            re_enter = 1;
-            cerr<<_FB_CONSOLETEXT(BaseDisplay, ShuttingDown, "Shutting Down\n", "Quitting because of signal, end with newline");
-            shutdown();
-        }
-
-
-        cerr<<_FB_CONSOLETEXT(BaseDisplay, Aborting, "Aborting... dumping core\n", "Aboring and dumping core, end with newline");
-        abort();
-        break;
-    }
-}
-
-
 void Fluxbox::windowDied(Focusable &focusable) {
     FluxboxWindow *fbwin = focusable.fbwindow();
 
@@ -1113,18 +1074,30 @@ void Fluxbox::restart(const char *prog) {
     }
 }
 
-/// prepares fluxbox for a shutdown
-void Fluxbox::shutdown() {
+// prepares fluxbox for a shutdown. when x_wants_down is != 0 we assume that
+// the xserver is about to shutdown or is in the midst of shutting down
+// already. trying to cleanup over a shaky xserver connection is pointless and
+// might lead to hangups.
+void Fluxbox::shutdown(int x_wants_down) {
     if (m_shutdown)
         return;
 
+    Display *dpy = FbTk::App::instance()->display();
     m_shutdown = true;
 
-    XSetInputFocus(FbTk::App::instance()->display(), PointerRoot, None, CurrentTime);
+#ifdef HAVE_ALARM
+    // give ourself 2 seconds (randomly picked randon number) to shutdown
+    // and then try to reenter signal handling. a bad race condition might
+    // lead to an inifite loop and this is some kind of last resort
+    alarm(2);
+#endif
 
-    STLUtil::forAll(m_screen_list, mem_fun(&BScreen::shutdown));
+    XSetInputFocus(dpy, PointerRoot, None, CurrentTime);
 
-    sync(false);
+    if (x_wants_down == 0) {
+        STLUtil::forAll(m_screen_list, mem_fun(&BScreen::shutdown));
+        sync(false);
+    }
 }
 
 /// saves resources
@@ -1279,6 +1252,7 @@ void Fluxbox::load_rc(BScreen &screen) {
 }
 
 void Fluxbox::reconfigure() {
+    m_key_reload_timer.stop();
     load_rc();
     m_reconfigure_wait = true;
     m_reconfig_timer.start();
@@ -1350,7 +1324,7 @@ bool Fluxbox::validateClient(const WinClient *client) const {
     WinClientMap::const_iterator it =
         find_if(m_window_search.begin(),
                 m_window_search.end(),
-                Compose(bind2nd(equal_to<WinClient *>(), client),
+                Compose(bind2nd(equal_to<const WinClient *>(), client),
                         Select2nd<WinClientMap::value_type>()));
     return it != m_window_search.end();
 }