X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=b6fad4414798ec050ba6aa759a450bc1212989e3;hb=88a1829af8ca41b6e581f209002022b2483b86df;hp=5391b683d5cbec0da588b93a968e780c048cb484;hpb=b6dd2f35e987ab55a904deff37194ee8507c7d7a;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 5391b683..b6fad441 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -204,8 +204,8 @@ struct MouseCursorInfo
 #define KSYM_Back		SDLK_AC_BACK
 #define KSYM_PlayPause		SDLK_AUDIOPLAY
 #if defined(PLATFORM_ANDROID)
-#define KSYM_Rewind		SDLK_AUDIORWND
-#define KSYM_FastForward	SDLK_AUDIOFFWD
+#define KSYM_Rewind		SDLK_AUDIOREWIND
+#define KSYM_FastForward	SDLK_AUDIOFASTFORWARD
 #endif
 #endif
 
@@ -430,6 +430,12 @@ struct MouseCursorInfo
 #define KMOD_Meta		(KMOD_Meta_L    | KMOD_Meta_R)
 #define KMOD_Alt		(KMOD_Alt_L     | KMOD_Alt_R)
 
+/* this only contains "valid" key modifiers (and ignores keys like "NumLock") */
+#define KMOD_Valid		(KMOD_Shift   |	\
+				 KMOD_Control |	\
+				 KMOD_Meta    |	\
+				 KMOD_Alt)
+
 #if defined(TARGET_SDL2)
 #define KMOD_TextInput		(KMOD_Shift | KMOD_Alt_R)
 #endif
@@ -484,7 +490,7 @@ void SDLSetMouseCursor(struct MouseCursorInfo *);
 void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
-void SDLNextEvent(Event *);
+void SDLWaitEvent(Event *);
 void SDLHandleWindowManagerEvent(Event *);
 
 void HandleJoystickEvent(Event *);
@@ -492,6 +498,8 @@ void SDLInitJoysticks(void);
 boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
 boolean SDLCheckJoystickOpened(int);
 void SDLClearJoystickState();
+boolean SDLOpenJoystick(int);
+void SDLCloseJoystick(int);
 
 void PrepareFadeBitmap(int);