changed comments from old to new style (one-line comments only)

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

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index c88b6a82818191f7348d792a094e10c97c4de7fd..58434681112f608d782529a098675d8e4c0f403d 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -21,7 +21,7 @@
 #include <SDL_syswm.h>
 #endif
 
-/* definitions needed for "system.c" */
+// definitions needed for "system.c"
 
 #if defined(TARGET_SDL2)
 #define SURFACE_FLAGS          (0)
@@ -37,7 +37,7 @@
 #define UNSET_TRANSPARENT_PIXEL        (0)
 #endif
 
-/* system dependent definitions */
+// system dependent definitions
 
 #if defined(TARGET_SDL2)
 #define TARGET_STRING          "SDL2"
@@ -60,7 +60,7 @@
 #define CURSOR_MAX_HEIGHT      32
 
 
-/* SDL type definitions */
+// SDL type definitions
 
 typedef struct SDLSurfaceInfo  Bitmap;
 typedef struct SDLSurfaceInfo  DrawBuffer;
@@ -92,7 +92,7 @@ typedef SDL_Event             FocusChangeEvent;
 typedef SDL_Event              ClientMessageEvent;
 
 
-/* structure definitions */
+// structure definitions
 
 struct SDLSurfaceInfo
 {
@@ -117,7 +117,7 @@ struct MouseCursorInfo
 };
 
 
-/* SDL symbol definitions */
+// SDL symbol definitions
 
 #define None                   0L
 
@@ -199,8 +199,14 @@ 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_AUDIOREWIND
+#define KSYM_FastForward       SDLK_AUDIOFASTFORWARD
+#endif
 #endif
 
 #define KSYM_space             SDLK_SPACE
@@ -212,7 +218,7 @@ struct MouseCursorInfo
 #if defined(TARGET_SDL2)
 #define KSYM_percent           SDLK_PERCENT
 #else
-#define KSYM_percent           37                      /* undefined in SDL */
+#define KSYM_percent           37                      // undefined in SDL
 #endif
 
 #define KSYM_ampersand         SDLK_AMPERSAND
@@ -241,11 +247,11 @@ struct MouseCursorInfo
 #define KSYM_underscore                SDLK_UNDERSCORE
 #define KSYM_grave             SDLK_BACKQUOTE
 
-#define KSYM_quoteleft         KSYM_UNDEFINED          /* undefined */
-#define KSYM_braceleft         KSYM_UNDEFINED          /* undefined */
-#define KSYM_bar               KSYM_UNDEFINED          /* undefined */
-#define KSYM_braceright                KSYM_UNDEFINED          /* undefined */
-#define KSYM_asciitilde                KSYM_UNDEFINED          /* undefined */
+#define KSYM_quoteleft         KSYM_UNDEFINED          // undefined
+#define KSYM_braceleft         KSYM_UNDEFINED          // undefined
+#define KSYM_bar               KSYM_UNDEFINED          // undefined
+#define KSYM_braceright                KSYM_UNDEFINED          // undefined
+#define KSYM_asciitilde                KSYM_UNDEFINED          // undefined
 
 #if defined(TARGET_SDL2)
 #define KSYM_degree            176
@@ -424,11 +430,17 @@ 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
 
-/* SDL function definitions */
+// SDL function definitions
 
 boolean SDLSetNativeSurface(SDL_Surface **);
 SDL_Surface *SDLGetNativeSurface(SDL_Surface *);
@@ -447,7 +459,8 @@ void SDLSetScreenProperties(void);
 #endif
 
 void SDLSetScreenRenderingMode(char *);
-void SDLRedrawWindow();
+void SDLSetScreenVsyncMode(char *);
+void SDLRedrawWindow(void);
 void SDLSetWindowTitle(void);
 
 void SDLLimitScreenUpdates(boolean);
@@ -478,13 +491,19 @@ void SDLSetMouseCursor(struct MouseCursorInfo *);
 void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
-void SDLNextEvent(Event *);
+void SDLWaitEvent(Event *);
 void SDLHandleWindowManagerEvent(Event *);
 
 void HandleJoystickEvent(Event *);
 void SDLInitJoysticks(void);
 boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
+boolean SDLCheckJoystickOpened(int);
+void SDLClearJoystickState(void);
+boolean SDLOpenJoystick(int);
+void SDLCloseJoystick(int);
 
 void PrepareFadeBitmap(int);
 
-#endif /* SDL_H */
+void Delay_WithScreenUpdates(unsigned int);
+
+#endif // SDL_H