X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=71e68331411ba8749ae8b9ee2f5d32558930bd2f;hb=142d88521dfcde187ea315279d79203c00e1b0f3;hp=c30afde6218bd2de29aa07980f4d2a3c9ae2b43b;hpb=38ea4e57bc9b730abf7a15f8cc235465e6f0ad4c;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index c30afde6..71e68331 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment                      *
+* (c) 1994-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -19,15 +19,34 @@
 #include <SDL_mixer.h>
 #include <SDL_net.h>
 #include <SDL_thread.h>
-
+#if defined(PLATFORM_WIN32)
+#include <SDL_syswm.h>
+#endif
 
 /* definitions needed for "system.c" */
 
+#if defined(TARGET_SDL2)
+#define SURFACE_FLAGS		(0)
+#else
 #define SURFACE_FLAGS		(SDL_SWSURFACE)
+#endif
+
+#if defined(TARGET_SDL2)
+#define SET_TRANSPARENT_PIXEL	(SDL_TRUE)
+#define UNSET_TRANSPARENT_PIXEL	(SDL_FALSE)
+#else
+#define SET_TRANSPARENT_PIXEL	(SDL_SRCCOLORKEY)
+#define UNSET_TRANSPARENT_PIXEL	(0)
+#endif
 
 /* system dependent definitions */
 
+#if defined(TARGET_SDL2)
+#define TARGET_STRING		"SDL2"
+#else
 #define TARGET_STRING		"SDL"
+#endif
+
 #define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
 
 #define CURSOR_MAX_WIDTH	32
@@ -42,7 +61,11 @@ typedef struct SDLSurfaceInfo	DrawWindow;
 typedef Uint32			Pixel;
 typedef SDL_Cursor	       *Cursor;
 
+#if defined(TARGET_SDL2)
+typedef SDL_Keycode		Key;
+#else
 typedef SDLKey			Key;
+#endif
 typedef unsigned int		KeyMod;
 
 typedef SDL_Event		Event;
@@ -78,8 +101,8 @@ struct MouseCursorInfo
   int width, height;
   int hot_x, hot_y;
 
-  char data[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
-  char mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
+  byte data[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
+  byte mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
 };
 
 
@@ -130,12 +153,19 @@ struct MouseCursorInfo
 #define KSYM_Shift_R		SDLK_RSHIFT
 #define KSYM_Control_L		SDLK_LCTRL
 #define KSYM_Control_R		SDLK_RCTRL
+#if defined(TARGET_SDL2)
+#define KSYM_Meta_L		SDLK_LGUI
+#define KSYM_Meta_R		SDLK_RGUI
+#else
 #define KSYM_Meta_L		SDLK_LMETA
 #define KSYM_Meta_R		SDLK_RMETA
+#endif
 #define KSYM_Alt_L		SDLK_LALT
 #define KSYM_Alt_R		SDLK_RALT
+#if !defined(TARGET_SDL2)
 #define KSYM_Super_L		SDLK_LSUPER
 #define KSYM_Super_R		SDLK_RSUPER
+#endif
 #define KSYM_Mode_switch	SDLK_MODE
 #define KSYM_Multi_key		SDLK_RCTRL
 
@@ -187,6 +217,8 @@ struct MouseCursorInfo
 #define KSYM_braceright		KSYM_UNDEFINED		/* undefined */
 #define KSYM_asciitilde		KSYM_UNDEFINED		/* undefined */
 
+#if !defined(TARGET_SDL2)
+#define KSYM_degree		SDLK_WORLD_16
 #define KSYM_Adiaeresis		SDLK_WORLD_36
 #define KSYM_Odiaeresis		SDLK_WORLD_54
 #define KSYM_Udiaeresis		SDLK_WORLD_60
@@ -194,6 +226,7 @@ struct MouseCursorInfo
 #define KSYM_odiaeresis		SDLK_WORLD_86
 #define KSYM_udiaeresis		SDLK_WORLD_92
 #define KSYM_ssharp		SDLK_WORLD_63
+#endif
 
 #ifndef SDLK_A
 #define SDLK_A			65
@@ -289,6 +322,18 @@ struct MouseCursorInfo
 #define KSYM_8			SDLK_8
 #define KSYM_9			SDLK_9
 
+#if defined(TARGET_SDL2)
+#define KSYM_KP_0		SDLK_KP_0
+#define KSYM_KP_1		SDLK_KP_1
+#define KSYM_KP_2		SDLK_KP_2
+#define KSYM_KP_3		SDLK_KP_3
+#define KSYM_KP_4		SDLK_KP_4
+#define KSYM_KP_5		SDLK_KP_5
+#define KSYM_KP_6		SDLK_KP_6
+#define KSYM_KP_7		SDLK_KP_7
+#define KSYM_KP_8		SDLK_KP_8
+#define KSYM_KP_9		SDLK_KP_9
+#else
 #define KSYM_KP_0		SDLK_KP0
 #define KSYM_KP_1		SDLK_KP1
 #define KSYM_KP_2		SDLK_KP2
@@ -299,6 +344,7 @@ struct MouseCursorInfo
 #define KSYM_KP_7		SDLK_KP7
 #define KSYM_KP_8		SDLK_KP8
 #define KSYM_KP_9		SDLK_KP9
+#endif
 
 #define KSYM_F1			SDLK_F1
 #define KSYM_F2			SDLK_F2
@@ -334,8 +380,13 @@ struct MouseCursorInfo
 #define KMOD_Shift_R		KMOD_RSHIFT
 #define KMOD_Control_L		KMOD_LCTRL
 #define KMOD_Control_R		KMOD_RCTRL
+#if defined(TARGET_SDL2)
+#define KMOD_Meta_L		KMOD_LGUI
+#define KMOD_Meta_R		KMOD_RGUI
+#else
 #define KMOD_Meta_L		KMOD_LMETA
 #define KMOD_Meta_R		KMOD_RMETA
+#endif
 #define KMOD_Alt_L		KMOD_LALT
 #define KMOD_Alt_R		KMOD_RALT
 
@@ -347,6 +398,10 @@ struct MouseCursorInfo
 
 /* SDL function definitions */
 
+#if defined(TARGET_SDL2)
+SDL_Surface *SDL_DisplayFormat(SDL_Surface *);
+#endif
+
 void SDLInitVideoDisplay(void);
 void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
 boolean SDLSetVideoMode(DrawBuffer **, boolean);
@@ -354,7 +409,8 @@ void SDLCreateBitmapContent(Bitmap *, int, int, int);
 void SDLFreeBitmapPointers(Bitmap *);
 void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
 void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32);
-void SDLFadeScreen(Bitmap *, int, int, int);
+void SDLFadeRectangle(Bitmap *, int, int, int, int, int, int, int,
+		      void (*draw_border_function)(void));
 void SDLDrawSimpleLine(Bitmap *, int, int, int, int, Uint32);
 void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
 Pixel SDLGetPixel(Bitmap *, int, int);
@@ -373,6 +429,7 @@ void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
 void SDLNextEvent(Event *);
+void SDLHandleWindowManagerEvent(Event *);
 
 void HandleJoystickEvent(Event *);
 void SDLInitJoysticks(void);