Mercurial > sdl-ios-xcode
annotate src/events/SDL_active.c @ 1199:2d6dc7de1145
From: Mike Frysinger <vapier@gentoo.org>
To: sdl@libsdl.org
Date: Sun, 11 Dec 2005 22:57:37 -0500
Subject: [SDL] exec stack in libsdl update
i posted back in September a patch to remove executable stacks:
http://www.devolution.com/pipermail/sdl/2005-September/070626.html
later in November, a similar patch was merged it seems:
http://www.libsdl.org/cgi/cvsweb.cgi/SDL12/src/hermes/mmx_main.asm
however, this lacks the additional output format checks that i posted in my
patch ... this isnt a problem if the hermes asm code is only ever used to
produce ELF objects, but if this is not true, then the additional checks in
my original patch will need to be merged
-mike
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Mon, 12 Dec 2005 09:13:12 +0000 |
| parents | 28ac87a38c17 |
| children | c9b51268668f |
| 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 /* Application focus/iconification handling code for SDL */ | |
| 29 | |
| 30 #include <stdio.h> | |
| 31 #include <string.h> | |
| 32 | |
| 33 #include "SDL_events.h" | |
| 34 #include "SDL_events_c.h" | |
| 35 | |
| 36 | |
| 37 /* These are static for our active event handling code */ | |
| 38 static Uint8 SDL_appstate = 0; | |
| 39 | |
| 40 /* Public functions */ | |
| 41 int SDL_AppActiveInit(void) | |
| 42 { | |
| 43 /* Start completely active */ | |
| 44 SDL_appstate = (SDL_APPACTIVE|SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS); | |
| 45 | |
| 46 /* That's it! */ | |
| 47 return(0); | |
| 48 } | |
|
1123
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
49 void SDL_AppActiveQuit(void) |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
50 { |
|
28ac87a38c17
Date: Fri, 08 Jul 2005 22:43:48 +0200 (CEST)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
51 } |
| 0 | 52 |
| 53 Uint8 SDL_GetAppState(void) | |
| 54 { | |
| 55 return(SDL_appstate); | |
| 56 } | |
| 57 | |
| 58 /* This is global for SDL_eventloop.c */ | |
| 59 int SDL_PrivateAppActive(Uint8 gain, Uint8 state) | |
| 60 { | |
| 61 int posted; | |
| 62 Uint8 new_state; | |
| 63 | |
| 64 /* Modify the current state with the given mask */ | |
| 65 if ( gain ) { | |
| 66 new_state = (SDL_appstate | state); | |
| 67 } else { | |
| 68 new_state = (SDL_appstate & ~state); | |
| 69 } | |
| 70 | |
| 71 /* Drop events that don't change state */ | |
| 72 if ( new_state == SDL_appstate ) { | |
| 73 return(0); | |
| 74 } | |
| 75 | |
| 76 /* Update internal active state */ | |
| 77 SDL_appstate = new_state; | |
| 78 | |
| 79 /* Post the event, if desired */ | |
| 80 posted = 0; | |
| 81 if ( SDL_ProcessEvents[SDL_ACTIVEEVENT] == SDL_ENABLE ) { | |
| 82 SDL_Event event; | |
| 83 memset(&event, 0, sizeof(event)); | |
| 84 event.type = SDL_ACTIVEEVENT; | |
| 85 event.active.gain = gain; | |
| 86 event.active.state = state; | |
| 87 if ( (SDL_EventOK == NULL) || (*SDL_EventOK)(&event) ) { | |
| 88 posted = 1; | |
| 89 SDL_PushEvent(&event); | |
| 90 } | |
| 91 } | |
| 92 | |
| 93 /* If we lost keyboard focus, post key-up events */ | |
| 94 if ( (state & SDL_APPINPUTFOCUS) && !gain ) { | |
| 95 SDL_ResetKeyboard(); | |
| 96 } | |
| 97 return(posted); | |
| 98 } |