projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added support for main menu titles in level and graphics config file
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.h
diff --git
a/src/libgame/sdl.h
b/src/libgame/sdl.h
index 14872400f7051788b34cfa28172e3e1d26b91879..b6fad4414798ec050ba6aa759a450bc1212989e3 100644
(file)
--- 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_Back SDLK_AC_BACK
#define KSYM_PlayPause SDLK_AUDIOPLAY
#if defined(PLATFORM_ANDROID)
-#define KSYM_Rewind SDLK_AUDIOR
W
ND
-#define KSYM_FastForward SDLK_AUDIOF
FW
D
+#define KSYM_Rewind SDLK_AUDIOR
EWI
ND
+#define KSYM_FastForward SDLK_AUDIOF
ASTFORWAR
D
#endif
#endif
#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)
#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
@@
-484,7
+490,7
@@
void SDLSetMouseCursor(struct MouseCursorInfo *);
void SDLOpenAudio(void);
void SDLCloseAudio(void);
void SDLOpenAudio(void);
void SDLCloseAudio(void);
-void SDL
Nex
tEvent(Event *);
+void SDL
Wai
tEvent(Event *);
void SDLHandleWindowManagerEvent(Event *);
void HandleJoystickEvent(Event *);
void SDLHandleWindowManagerEvent(Event *);
void HandleJoystickEvent(Event *);