Fix race condition on shutdown

This commit fixes primarily a race condition that occurs when xinit(1) shuts
down: by not acting properly fluxbox gets caught in an infinite loop. It
caused bug #1100.

xinit(1) sends a SIGHUP signal to all processes. fluxbox tries to shutdown
itself properly by shutting down workspaces and screens. While doing that, the
Xserver might be gone already. Additionally, fluxbox used to restart() itself
on SIGHUP, which is clearly not the right thing to do when xinit(1) is about
to end the session.

So, fluxbox does this:

* handling SIGHUP now shuts down fluxbox without clearing workspaces and
  screens.

* A 2 second alarm() is triggered in Fluxbox::shutdown() as a last resort

* XSetIOErrorHandler() is used to recognize the disconnect from the xserver.

* SIGUSR1 is for restarting fluxbox, SIGUSR2 for reloading the config

* FbTk/SignalHandler.cc/hh is gone; this unused abstraction served currently
  no real purpose. Signal handling is now done in main.cc

* Unrelated to the issue itself src/main.cc was trimmed down quite a bit and
  the code (responsible for handling the command line interface) was moved to
  src/cli*

3 files changed, 0 insertions, 260 deletions

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 6b3809d..b6678ce 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS= -I$(top_srcdir)/src
 noinst_PROGRAMS= \
          testTexture \
          testFont \
-         testSignals \
          testKeys \
          testDemandAttention \
          testFullscreen \
@@ -12,7 +11,6 @@ noinst_PROGRAMS= \
 
 testTexture_SOURCES         = texturetest.cc
 testFont_SOURCES            = testFont.cc
-testSignals_SOURCES         = testSignals.cc
 testKeys_SOURCES            = testKeys.cc
 testDemandAttention_SOURCES = testDemandAttention.cc
 #testResource_SOURCES        = Resourcetest.cc
diff --git a/src/tests/signaltest.cc b/src/tests/signaltest.cc
deleted file mode 100644
index 09ebdac..0000000
--- a/src/tests/signaltest.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// signaltest.cc for testing signal handler in fluxbox
-// Copyright (c) 2002 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.        IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-#include "../FbTk/SignalHandler.hh"
-
-#include <iostream>
-#ifdef HAVE_CASSERT
-  #include <cassert>
-#else
-  #include <assert.h>
-#endif
-
-using namespace std;
-using namespace FbTk;
-
-class IntSig:public SignalEventHandler {
-public:
-    void handleSignal(int signum) {
-        assert(signum == SIGINT);
-        cerr<<"Signal SIGINT!"<<endl;
-        exit(0);
-    }
-};
-
-class AllSig:public SignalEventHandler {
-public:
-    void handleSignal(int signum) {
-        switch (signum) {
-        case SIGSEGV:
-            cerr<<"SIGSEGV";
-            break;
-        case SIGTERM:
-            cerr<<"SIGTERM";
-            break;
-        case SIGUSR1:
-            cerr<<"SIGUSR1";
-            break;
-        case SIGUSR2:
-            cerr<<"SIGUSR2";
-            break;
-        default:
-            cerr<<"signum = "<<signum;
-        }
-        cerr<<endl;
-        if (signum == SIGTERM)
-            exit(1); // end program
-    }
-};
-
-int main(int argc, char **argv) {
-    SignalHandler &sigh = SignalHandler::instance();
-    
-    IntSig handler;
-    AllSig allhand;
-        
-    sigh.registerHandler(SIGINT, &handler);
-    sigh.registerHandler(SIGSEGV, &allhand);
-    sigh.registerHandler(SIGTERM, &allhand);
-    sigh.registerHandler(SIGUSR1, &allhand);
-    sigh.registerHandler(SIGUSR2, &allhand);
-
-    cerr<<"Send signals to me :)"<<endl;
-    while (1) {
-        
-    }
-}
-
-
diff --git a/src/tests/testSignals.cc b/src/tests/testSignals.cc
deleted file mode 100644
index d316a62..0000000
--- a/src/tests/testSignals.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <iostream>
-using namespace std;
-
-#include "../FbTk/Signal.hh"
-#include "../FbTk/MemFun.hh"
-
-#include <string>
-
-
-
-struct NoArgument {
-    void operator() () const {
-        cout << "No Argument." << endl;
-    }
-};
-
-struct OneArgument {
-    void operator ()( int value ) {
-        cout << "One argument = " << value << endl;
-    }
-};
-
-struct TwoArguments {
-    template <typename T1, typename T2>
-    void operator ()( const T1& value, const T2& message ) {
-        cout << "Two arguments, (1) = " << value << ", (2) = " << message << endl;
-    }
-};
-
-struct ThreeArguments {
-    void operator ()( int value, const string& message, double value2 ) {
-        cout << "Two arguments, (1) = " << value << ", (2) = " << message
-             << ", (3) = " << value2 << endl;
-    }
-};
-
-struct FunctionClass {
-    FunctionClass() {
-        cout << "FunctionClass created." << endl;
-    }
-    ~FunctionClass() {
-        cout << "FunctionClass deleted." << endl;
-    }
-    void print() {
-        cout << "Printing." << endl;
-    }
-
-    void takeIt( string& str ) {
-        cout << "FunctionClass::takeIt( " << str << " )" << endl;
-    }
-
-    void showMessage( int value, const string& message ) {
-        cout << "(" << value << "): " << message << endl;
-    }
-    void showMessage2( const string& message1, const string& message2) {
-        cout << "(" << message1 << ", " << message2 << ")" << endl;
-    }
-    void threeArgs( int value, const string& str, double pi ) {
-        cout << "(" << value << "): " << str << ", pi = " << pi << endl;
-    }
-
-};
-
-struct Printer {
-    void printInt(int value) {
-        cout << "Int:" << value << endl;
-    }
-    void printString(string value) {
-        cout << "string:" << value << endl;
-    }
-    void printFloat(float value) {
-        cout << "Float:" << value << endl;
-    }
-}; 
-
-int main() {
-    using FbTk::Signal;
-    using FbTk::SignalTracker;
-
-    Signal<> no_arg;
-    no_arg.connect( NoArgument() );
-
-    Signal<int> one_arg;
-    one_arg.connect( OneArgument() );
-
-    Signal<int, const string&> two_args;
-    two_args.connect( TwoArguments() );
-    
-    Signal<int, const string&, double> three_args;
-    three_args.connect( ThreeArguments() );
-
-    // emit test
-    no_arg.emit();
-    one_arg.emit( 10 );
-    two_args.emit( 10, "Message" );
-    three_args.emit( 10, "Three", 3.141592 );
-
-    // test signal tracker
-    {
-        cout << "---- tracker ----" << endl;
-        SignalTracker tracker;
-        // setup two new slots and track them
-        SignalTracker::TrackID id_no_arg = tracker.join( no_arg, NoArgument() );
-        SignalTracker::TrackID id_one_arg = tracker.join( one_arg, OneArgument() );
-
-        // two outputs each from these two signals
-        no_arg.emit();
-        one_arg.emit( 31 );
-
-        // stop tracking id_one_arg, which should keep the slot after this scope,
-        // the id_no_arg connection should be destroyed after this.
-        tracker.leave( id_one_arg );
-        cout << "---- tracker end ----" << endl;
-    }
-
-    // now we should have one output from no_arg and two outputs from one_arg
-    no_arg.emit();
-    one_arg.emit( 2 );
-
-    using FbTk::MemFun;
-    FunctionClass obj;
-    no_arg.clear();
-    no_arg.connect(MemFun(obj, &FunctionClass::print));
-    no_arg.emit();
-
-    string takeThis("Take this");
-    Signal<string&> ref_arg;
-    ref_arg.connect(MemFun(obj, &FunctionClass::takeIt));
-    ref_arg.emit( takeThis );
-
-    two_args.clear();
-    two_args.connect(MemFun(obj, &FunctionClass::showMessage));
-    two_args.emit(10, "This is a message");
-    
-    three_args.clear();
-    three_args.connect(MemFun(obj, &FunctionClass::threeArgs));
-    three_args.emit(9, "nine", 3.141592);
-
-    // Test ignore signals
-    {
-        cout << "----------- Testing ignoring arguments for signal." << endl;
-        using FbTk::MemFunIgnoreArgs;
-        // Create a signal that emits with three arguments, and connect
-        // sinks that takes less than three arguments.
-        Signal<string, string, float> more_args;
-        more_args.connect(MemFunIgnoreArgs(obj, &FunctionClass::print));
-        more_args.connect(MemFunIgnoreArgs(obj, &FunctionClass::takeIt));
-        more_args.connect(MemFunIgnoreArgs(obj, &FunctionClass::showMessage2));
-        more_args.emit("This should be visible for takeIt(string)",
-                       "Visible to the two args function.",
-                       2.9);
-
-    }
-
-    // Test argument selector
-    {
-        using namespace FbTk;
-        Signal<int, string, float> source;
-
-        Printer printer;
-        source.connect(MemFunSelectArg0(printer, &Printer::printInt));
-        source.connect(MemFunSelectArg1(printer, &Printer::printString));
-        source.connect(MemFunSelectArg2(printer, &Printer::printFloat));
-
-        source.emit(10, "hello", 3.141592);
-
-        Signal<string, int> source2;
-        source2.connect(MemFunSelectArg0(printer, &Printer::printString));
-        source2.connect(MemFunSelectArg1(printer, &Printer::printInt));
-        source2.emit("world", 37);
-    }
-}