aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-14 00:01:10 (GMT)
committerfluxgen <fluxgen>2002-08-14 00:01:10 (GMT)
commitfdd8313050bb2f36a204e9104dc78c9c268e4d52 (patch)
tree9721ec2562f3939c003ce3fe61d53fedc0410a26 /src/fluxbox.hh
parent76a1c5c161de5142ae468575dcba537f02d31686 (diff)
downloadfluxbox-fdd8313050bb2f36a204e9104dc78c9c268e4d52.zip
fluxbox-fdd8313050bb2f36a204e9104dc78c9c268e4d52.tar.bz2
changed signalhandling to FbTk SignalHandler
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index a8de98c..b6b5beb 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.hh,v 1.24 2002/08/13 21:18:17 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.25 2002/08/14 00:00:16 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -40,12 +40,12 @@
40#include "Slit.hh" 40#include "Slit.hh"
41#endif // SLIT 41#endif // SLIT
42 42
43#include "SignalHandler.hh"
44
43#include <X11/Xlib.h> 45#include <X11/Xlib.h>
44#include <X11/Xresource.h> 46#include <X11/Xresource.h>
45 47
46#ifdef HAVE_STDIO_H 48#include <cstdio>
47# include <stdio.h>
48#endif // HAVE_STDIO_H
49 49
50#ifdef TIME_WITH_SYS_TIME 50#ifdef TIME_WITH_SYS_TIME
51#include <sys/time.h> 51#include <sys/time.h>
@@ -67,7 +67,7 @@
67 main class for the window manager. 67 main class for the window manager.
68 singleton type 68 singleton type
69*/ 69*/
70class Fluxbox : public BaseDisplay, public TimeoutHandler { 70class Fluxbox : public BaseDisplay, public TimeoutHandler, public FbTk::SignalHandler::EventHandler {
71public: 71public:
72 Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0); 72 Fluxbox(int argc, char **argv, const char * dpy_name= 0, const char *rc = 0);
73 virtual ~Fluxbox(); 73 virtual ~Fluxbox();
@@ -147,8 +147,9 @@ public:
147 void reconfigureTabs(); 147 void reconfigureTabs();
148 void rereadMenu(); 148 void rereadMenu();
149 void checkMenu(); 149 void checkMenu();
150 150
151 virtual Bool handleSignal(int); 151 /// handle any signal sent to the application
152 void handleSignal(int signum);
152 153
153 virtual void timeout(); 154 virtual void timeout();
154 155