Mercurial > sdl-ios-xcode
annotate src/events/SDL_quit.c @ 1123:28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
From: Jiri Svoboda
Subject: [SDL] signal handling bug
I encountered the following bug:
SDL doesn't reset signal handlers for SIGTERM and SIGINT, after calling SDL_Quit these remain hooked to the handler in SDL_quit.c, being translated into SDL_QUIT events.
Consequently an application that issues a SDL_Quit and remains running will ignore any SIGTERM or SIGINT., and specifically CTRL-C presses.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 21 Aug 2005 06:18:54 +0000 |
| parents | b8d311d90021 |
| children | 51a8702d8ecd |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* General quit handling code for SDL */ | |
| 29 | |
| 30 #include <stdio.h> | |
| 31 #ifndef NO_SIGNAL_H | |
| 32 #include <signal.h> | |
| 33 #endif | |
| 34 | |
| 35 #include "SDL_events.h" | |
| 36 #include "SDL_events_c.h" | |
| 37 | |
| 38 | |
| 39 #ifndef NO_SIGNAL_H | |
| 40 static void SDL_HandleSIG(int sig) | |
| 41 { | |
| 42 /* Reset the signal handler */ | |
| 43 signal(sig, SDL_HandleSIG); | |
| 44 | |
| 45 /* Signal a quit interrupt */ | |
| 46 SDL_PrivateQuit(); | |
| 47 } | |
| 48 #endif /* NO_SIGNAL_H */ | |
| 49 | |
| 50 /* Public functions */ | |
| 51 int SDL_QuitInit(void) | |
| 52 { | |
| 53 #ifndef NO_SIGNAL_H | |
| 54 void (*ohandler)(int); | |
| 55 | |
| 56 /* Both SIGINT and SIGTERM are translated into quit interrupts */ | |
|
1123
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
57 ohandler = signal(SIGINT, SDL_HandleSIG); |
| 0 | 58 if ( ohandler != SIG_DFL ) |
| 59 signal(SIGINT, ohandler); | |
| 60 ohandler = signal(SIGTERM, SDL_HandleSIG); | |
| 61 if ( ohandler != SIG_DFL ) | |
| 62 signal(SIGTERM, ohandler); | |
| 63 #endif /* NO_SIGNAL_H */ | |
| 64 | |
| 65 /* That's it! */ | |
| 66 return(0); | |
| 67 } | |
|
1123
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
68 void SDL_QuitQuit(void) |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
69 { |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
70 #ifndef NO_SIGNAL_H |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
71 void (*ohandler)(int); |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
72 |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
73 ohandler = signal(SIGINT, SIG_DFL); |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
74 if ( ohandler != SDL_HandleSIG ) |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
75 signal(SIGINT, ohandler); |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
76 ohandler = signal(SIGTERM, SIG_DFL); |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
77 if ( ohandler != SDL_HandleSIG ) |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
78 signal(SIGTERM, ohandler); |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
79 #endif /* NO_SIGNAL_H */ |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
80 } |
| 0 | 81 |
| 82 /* This function returns 1 if it's okay to close the application window */ | |
| 83 int SDL_PrivateQuit(void) | |
| 84 { | |
| 85 int posted; | |
| 86 | |
| 87 posted = 0; | |
| 88 if ( SDL_ProcessEvents[SDL_QUIT] == SDL_ENABLE ) { | |
| 89 SDL_Event event; | |
| 90 event.type = SDL_QUIT; | |
| 91 if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) { | |
| 92 posted = 1; | |
| 93 SDL_PushEvent(&event); | |
| 94 } | |
| 95 } | |
| 96 return(posted); | |
| 97 } |