aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-08-14 00:01:57 (GMT)
committerfluxgen <fluxgen>2002-08-14 00:01:57 (GMT)
commitc87d64e19a6d061b03bb6722595571e6c068a333 (patch)
tree187873c66b67eb2eb34f606f110347f8c29ae9b1
parentfdd8313050bb2f36a204e9104dc78c9c268e4d52 (diff)
downloadfluxbox-c87d64e19a6d061b03bb6722595571e6c068a333.zip
fluxbox-c87d64e19a6d061b03bb6722595571e6c068a333.tar.bz2
first
-rw-r--r--src/SignalHandler.cc75
-rw-r--r--src/SignalHandler.hh69
-rw-r--r--src/tests/signaltest.cc75
3 files changed, 219 insertions, 0 deletions
diff --git a/src/SignalHandler.cc b/src/SignalHandler.cc
new file mode 100644
index 0000000..67f83fa
--- /dev/null
+++ b/src/SignalHandler.cc
@@ -0,0 +1,75 @@
1// SignalHandler.cc for Fluxbox Window Manager
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22// $Id: SignalHandler.cc,v 1.1 2002/08/13 23:57:04 fluxgen Exp $
23
24#include "SignalHandler.hh"
25
26namespace FbTk {
27
28SignalHandler::EventHandler *SignalHandler::s_signal_handler[NSIG];
29
30SignalHandler::SignalHandler() {
31 // clear signal list
32 for (int i=0; i < NSIG; ++i)
33 s_signal_handler[i] = 0;
34}
35
36SignalHandler *SignalHandler::instance() {
37 static SignalHandler singleton;
38 return &singleton;
39}
40
41bool SignalHandler::registerHandler(int signum, EventHandler *eh, EventHandler **oldhandler_ret) {
42 // must be less than NSIG
43 if (signum >= NSIG)
44 return false;
45
46 // get old signal handler for this signum
47 if (oldhandler_ret != 0)
48 *oldhandler_ret = s_signal_handler[signum];
49
50 struct sigaction sa;
51 // set callback
52 sa.sa_handler = SignalHandler::handleSignal;
53 sigemptyset (&sa.sa_mask);
54 sa.sa_flags = 0;
55
56 if (sigaction(signum, &sa, 0) == -1)
57 return false;
58
59 s_signal_handler[signum] = eh;
60
61 return true;
62}
63
64void SignalHandler::removeHandler(int signum) {
65 if (signum < NSIG)
66 s_signal_handler[signum] = 0; // clear handler pointer
67}
68
69void SignalHandler::handleSignal(int signum) {
70 // make sure we got a handler for this signal
71 if (s_signal_handler[signum] != 0)
72 s_signal_handler[signum]->handleSignal(signum);
73}
74
75};
diff --git a/src/SignalHandler.hh b/src/SignalHandler.hh
new file mode 100644
index 0000000..81eec9f
--- /dev/null
+++ b/src/SignalHandler.hh
@@ -0,0 +1,69 @@
1// SignalHandler.hh for Fluxbox Window Manager
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22// $Id: SignalHandler.hh,v 1.1 2002/08/13 23:57:04 fluxgen Exp $
23
24#ifndef FBTK_SIGNALHANDLER_HH
25#define FBTK_SIGNALHANDLER_HH
26
27#include <signal.h>
28
29namespace FbTk {
30
31/**
32 Handles system signals, singleton.
33*/
34class SignalHandler {
35public:
36 /**
37 Inherit this class to handle signals.
38 */
39 class EventHandler {
40 public:
41 virtual void handleSignal(int signum) = 0;
42 };
43
44 /// get singleton object
45 static SignalHandler *instance();
46 /**
47 Register an event handler
48 @return true on success else false
49 @param signum signal number
50 @param eh event handler
51 @param oldhandler_ret return handler to old sighandler
52 */
53 bool registerHandler(int signum, EventHandler *eh, EventHandler **oldhandler_ret = 0);
54 /**
55 removes the signum handler
56 @param signum signal number
57 */
58 void removeHandler(int signum);
59private:
60 SignalHandler();
61
62 static void handleSignal(int signum);
63
64 static EventHandler *s_signal_handler[NSIG]; ///< NSIG defined in signal.h
65};
66
67}; // end namespace FbTk
68
69#endif // FBTK_SIGNALHANDLER_HH
diff --git a/src/tests/signaltest.cc b/src/tests/signaltest.cc
new file mode 100644
index 0000000..7d0b53a
--- /dev/null
+++ b/src/tests/signaltest.cc
@@ -0,0 +1,75 @@
1// signaltest.cc for testing signal handler in fluxbox
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
3//
4// Permission is hereby granted, free of charge, to any person obtaining a
5// copy of this software and associated documentation files (the "Software"),
6// to deal in the Software without restriction, including without limitation
7// the rights to use, copy, modify, merge, publish, distribute, sublicense,
8// and/or sell copies of the Software, and to permit persons to whom the
9// Software is furnished to do so, subject to the following conditions:
10//
11// The above copyright notice and this permission notice shall be included in
12// all copies or substantial portions of the Software.
13//
14// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
17// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE.
21
22#include "../SignalHandler.hh"
23
24#include <iostream>
25
26using namespace std;
27using namespace FbTk;
28
29class IntSig:public SignalHandler::EventHandler {
30public:
31 void handleSignal(int signum) {
32 assert(signum == SIGINT);
33 cerr<<"Signal SIGINT!"<<endl;
34 exit(0);
35 }
36};
37
38class AllSig:public SignalHandler::EventHandler {
39public:
40 void handleSignal(int signum) {
41 switch (signum) {
42 case SIGTERM:
43 cerr<<"SIGTERM";
44 break;
45 case SIGUSR1:
46 cerr<<"SIGUSR1";
47 break;
48 case SIGUSR2:
49 cerr<<"SIGUSR2";
50 break;
51 default:
52 cerr<<"signum = "<<signum;
53 }
54 cerr<<endl;
55 if (signum == SIGTERM)
56 exit(1); // end program
57 }
58};
59
60int main(int argc, char **argv) {
61 SignalHandler *sigh = SignalHandler::instance();
62 IntSig handler;
63 AllSig allhand;
64
65 sigh->registerHandler(SIGINT, &handler);
66 sigh->registerHandler(SIGTERM, &allhand);
67 sigh->registerHandler(SIGUSR1, &allhand);
68 sigh->registerHandler(SIGUSR2, &allhand);
69 cerr<<"Send signals to me :)"<<endl;
70 while (1) {
71
72 }
73}
74
75