projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed displaying FPS by cheat code ':fps' instead of always in debug mode
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index 60a8411f4ffb66c1793d58edc7ff2e448325b88b..075b99bbe5d5d4fbd503cd54e02f670eeeb2a702 100644
(file)
--- a/
src/libgame/sdl.h
+++ b/
src/libgame/sdl.h
@@
-199,8
+199,14
@@
struct MouseCursorInfo
#define KSYM_Page_Down SDLK_PAGEDOWN
#if defined(TARGET_SDL2)
#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_Menu SDLK_MENU
#define KSYM_Back SDLK_AC_BACK
+#define KSYM_PlayPause SDLK_AUDIOPLAY
+#if defined(PLATFORM_ANDROID)
+#define KSYM_Rewind SDLK_AUDIOREWIND
+#define KSYM_FastForward SDLK_AUDIOFASTFORWARD
+#endif
#endif
#define KSYM_space SDLK_SPACE
#endif
#define KSYM_space SDLK_SPACE
@@
-424,6
+430,12
@@
struct MouseCursorInfo
#define KMOD_Meta (KMOD_Meta_L | KMOD_Meta_R)
#define KMOD_Alt (KMOD_Alt_L | KMOD_Alt_R)
#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
#if defined(TARGET_SDL2)
#define KMOD_TextInput (KMOD_Shift | KMOD_Alt_R)
#endif
@@
-440,6
+452,10
@@
SDL_Surface *SDL_DisplayFormat(SDL_Surface *);
void SDLSetWindowScaling(int);
void SDLSetWindowScalingQuality(char *);
void SDLSetWindowFullscreen(boolean);
void SDLSetWindowScaling(int);
void SDLSetWindowScalingQuality(char *);
void SDLSetWindowFullscreen(boolean);
+void SDLSetDisplaySize(void);
+void SDLSetScreenSizeAndOffsets(int, int);
+void SDLSetScreenSizeForRenderer(int, int);
+void SDLSetScreenProperties(void);
#endif
void SDLSetScreenRenderingMode(char *);
#endif
void SDLSetScreenRenderingMode(char *);
@@
-480,6
+496,10
@@
void SDLHandleWindowManagerEvent(Event *);
void HandleJoystickEvent(Event *);
void SDLInitJoysticks(void);
boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
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);
void PrepareFadeBitmap(int);