* Merge of ioq3-r1112

1 files changed, 21 insertions, 18 deletions

diff --git a/src/SDL12/include/SDL_events.h b/src/SDL12/include/SDL_events.h
index bdcf9a81..9fe918c7 100644
--- a/src/SDL12/include/SDL_events.h
+++ b/src/SDL12/include/SDL_events.h
@@ -1,36 +1,32 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2004 Sam Lantinga
+    Copyright (C) 1997-2006 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
+    modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
+    Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
     Sam Lantinga
     slouken@libsdl.org
 */
 
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id: SDL_events.h,v 1.11 2004/08/20 18:57:01 slouken Exp $";
-#endif
-
 /* Include file for SDL event handling */
 
 #ifndef _SDL_events_h
 #define _SDL_events_h
 
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
 #include "SDL_active.h"
 #include "SDL_keyboard.h"
 #include "SDL_mouse.h"
@@ -43,8 +39,13 @@ static char rcsid =
 extern "C" {
 #endif
 
+/* General keyboard/mouse state definitions */
+#define SDL_RELEASED	0
+#define SDL_PRESSED	1
+
 /* Event enumerations */
-enum { SDL_NOEVENT = 0,			/* Unused (do not remove) */
+typedef enum {
+       SDL_NOEVENT = 0,			/* Unused (do not remove) */
        SDL_ACTIVEEVENT,			/* Application loses/gains visibility */
        SDL_KEYDOWN,			/* Keys pressed */
        SDL_KEYUP,			/* Keys released */
@@ -74,14 +75,16 @@ enum { SDL_NOEVENT = 0,			/* Unused (do not remove) */
 	  It is the number of bits in the event mask datatype -- Uint32
         */
        SDL_NUMEVENTS = 32
-};
+} SDL_EventType;
 
 /* Predefined event masks */
 #define SDL_EVENTMASK(X)	(1<<(X))
-enum {
+typedef enum {
 	SDL_ACTIVEEVENTMASK	= SDL_EVENTMASK(SDL_ACTIVEEVENT),
 	SDL_KEYDOWNMASK		= SDL_EVENTMASK(SDL_KEYDOWN),
 	SDL_KEYUPMASK		= SDL_EVENTMASK(SDL_KEYUP),
+	SDL_KEYEVENTMASK	= SDL_EVENTMASK(SDL_KEYDOWN)|
+	                          SDL_EVENTMASK(SDL_KEYUP),
 	SDL_MOUSEMOTIONMASK	= SDL_EVENTMASK(SDL_MOUSEMOTION),
 	SDL_MOUSEBUTTONDOWNMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONDOWN),
 	SDL_MOUSEBUTTONUPMASK	= SDL_EVENTMASK(SDL_MOUSEBUTTONUP),
@@ -102,7 +105,7 @@ enum {
 	SDL_VIDEOEXPOSEMASK	= SDL_EVENTMASK(SDL_VIDEOEXPOSE),
 	SDL_QUITMASK		= SDL_EVENTMASK(SDL_QUIT),
 	SDL_SYSWMEVENTMASK	= SDL_EVENTMASK(SDL_SYSWMEVENT)
-};
+} SDL_EventMask ;
 #define SDL_ALLEVENTS		0xFFFFFFFF
 
 /* Application visibility event structure */
@@ -214,7 +217,7 @@ typedef struct SDL_SysWMEvent {
 } SDL_SysWMEvent;
 
 /* General event structure */
-typedef union {
+typedef union SDL_Event {
 	Uint8 type;
 	SDL_ActiveEvent active;
 	SDL_KeyboardEvent key;