fixed frame delay debug keys by only allowing 'normal' modifier keys

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

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 838be3ad467ca6e96cbd5293fbb8e3428b740fe8..075b99bbe5d5d4fbd503cd54e02f670eeeb2a702 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -199,12 +199,13 @@ struct MouseCursorInfo
 #define KSYM_Page_Down         SDLK_PAGEDOWN
 
 #if defined(TARGET_SDL2)
+#define KSYM_Select            SDLK_SELECT
 #define KSYM_Menu              SDLK_MENU
 #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
 
@@ -429,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
@@ -490,6 +497,9 @@ void HandleJoystickEvent(Event *);
 void SDLInitJoysticks(void);
 boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
 boolean SDLCheckJoystickOpened(int);
+void SDLClearJoystickState();
+boolean SDLOpenJoystick(int);
+void SDLCloseJoystick(int);
 
 void PrepareFadeBitmap(int);