X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=6f130bb1bea70b6492cd1f91ef3596e4deed101b;hb=070915c688903880c053bc444cc7f161fdebd91d;hp=c99539b6c3bdcc6615f0195f3c6d0f4137967c3d;hpb=3ae70b9d27b4b2c038f35b0aa5985c368542a486;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index c99539b6..6f130bb1 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -25,7 +25,11 @@
 
 /* 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)
@@ -35,13 +39,14 @@
 #define UNSET_TRANSPARENT_PIXEL	(0)
 #endif
 
-#if defined(TARGET_SDL2)
-#define SDL_DisplayFormat(s)	(s)
-#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
@@ -66,6 +71,9 @@ typedef unsigned int		KeyMod;
 typedef SDL_Event		Event;
 typedef SDL_MouseButtonEvent	ButtonEvent;
 typedef SDL_MouseMotionEvent	MotionEvent;
+#if defined(TARGET_SDL2)
+typedef SDL_TouchFingerEvent	FingerEvent;
+#endif
 typedef SDL_KeyboardEvent	KeyEvent;
 typedef SDL_Event		ExposeEvent;
 typedef SDL_Event		FocusChangeEvent;
@@ -111,6 +119,11 @@ struct MouseCursorInfo
 #define EVENT_BUTTONPRESS	SDL_MOUSEBUTTONDOWN
 #define EVENT_BUTTONRELEASE	SDL_MOUSEBUTTONUP
 #define EVENT_MOTIONNOTIFY	SDL_MOUSEMOTION
+#if defined(TARGET_SDL2)
+#define	EVENT_FINGERPRESS	SDL_FINGERDOWN
+#define EVENT_FINGERRELEASE	SDL_FINGERUP
+#define EVENT_FINGERMOTION	SDL_FINGERMOTION
+#endif
 #define EVENT_KEYPRESS		SDL_KEYDOWN
 #define EVENT_KEYRELEASE	SDL_KEYUP
 #define EVENT_EXPOSE		SDL_USEREVENT + 0
@@ -172,7 +185,11 @@ struct MouseCursorInfo
 #define KSYM_End		SDLK_END
 #define KSYM_Page_Up		SDLK_PAGEUP
 #define KSYM_Page_Down		SDLK_PAGEDOWN
+
+#if defined(TARGET_SDL2)
 #define KSYM_Menu		SDLK_MENU
+#define KSYM_Back		SDLK_AC_BACK
+#endif
 
 #define KSYM_space		SDLK_SPACE
 #define KSYM_exclam		SDLK_EXCLAIM
@@ -393,6 +410,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);