X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=d7c6243c1305fd4aa16e9a7a07c7c5a32ae0cf6e;hb=c3e9cc5a7524e88ca789982a803b805272448c0b;hp=14872400f7051788b34cfa28172e3e1d26b91879;hpb=835e565490c1502920280c77eed9bb65fa932164;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 14872400..d7c6243c 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 *);
@@ -497,4 +503,6 @@ void SDLCloseJoystick(int);
 
 void PrepareFadeBitmap(int);
 
+void Delay_WithScreenUpdates(unsigned int);
+
 #endif /* SDL_H */