rnd-20131212-1-src

[rocksndiamonds.git] / src / libgame / sdl.h

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index c99539b6c3bdcc6615f0195f3c6d0f4137967c3d..5cc375c8e134aa3ca48ea6a434b43cf9818a8213 100644 (file)
--- 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
@@ -393,6 +406,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);