projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140103-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index 71e68331411ba8749ae8b9ee2f5d32558930bd2f..6f130bb1bea70b6492cd1f91ef3596e4deed101b 100644
(file)
--- a/
src/libgame/sdl.h
+++ b/
src/libgame/sdl.h
@@
-71,6
+71,9
@@
typedef unsigned int KeyMod;
typedef SDL_Event Event;
typedef SDL_MouseButtonEvent ButtonEvent;
typedef SDL_MouseMotionEvent MotionEvent;
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;
typedef SDL_KeyboardEvent KeyEvent;
typedef SDL_Event ExposeEvent;
typedef SDL_Event FocusChangeEvent;
@@
-116,6
+119,11
@@
struct MouseCursorInfo
#define EVENT_BUTTONPRESS SDL_MOUSEBUTTONDOWN
#define EVENT_BUTTONRELEASE SDL_MOUSEBUTTONUP
#define EVENT_MOTIONNOTIFY SDL_MOUSEMOTION
#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
#define EVENT_KEYPRESS SDL_KEYDOWN
#define EVENT_KEYRELEASE SDL_KEYUP
#define EVENT_EXPOSE SDL_USEREVENT + 0
@@
-177,7
+185,11
@@
struct MouseCursorInfo
#define KSYM_End SDLK_END
#define KSYM_Page_Up SDLK_PAGEUP
#define KSYM_Page_Down SDLK_PAGEDOWN
#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_Menu SDLK_MENU
+#define KSYM_Back SDLK_AC_BACK
+#endif
#define KSYM_space SDLK_SPACE
#define KSYM_exclam SDLK_EXCLAIM
#define KSYM_space SDLK_SPACE
#define KSYM_exclam SDLK_EXCLAIM