changed some platform-related preprocessor definition names

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

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index acdafd5b8eb2f8327bef9b82658524ff361fcedf..a45e68ec89ecd1d0898471943e14c55ae16275f1 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //                         Holger Schemel
 //                 info@artsoft.org
-//                 http://www.artsoft.org/
+//                 https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // sdl.h
 // ============================================================================
@@ -17,7 +17,7 @@
 #include <SDL_mixer.h>
 #include <SDL_net.h>
 #include <SDL_thread.h>
-#if defined(PLATFORM_WIN32)
+#if defined(PLATFORM_WINDOWS)
 #include <SDL_syswm.h>
 #endif
 
@@ -350,6 +350,12 @@ typedef struct UserEventInfo       UserEvent;
 #define KSYM_FKEY_LAST         KSYM_F12
 #define KSYM_NUM_FKEYS         (KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
 
+#define KSYM_RAW(k)            (((k) >= KSYM_a &&                      \
+                                 (k) <= KSYM_z)        ||              \
+                                ((k) >= KSYM_0 &&                      \
+                                 (k) <= KSYM_9)        ||              \
+                                (k) == KSYM_space)
+
 #define KSYM_PRINTABLE(k)      (((k) >= KSYM_space &&                  \
                                  (k) <= KSYM_z)        ||              \
                                 (k) == KSYM_Adiaeresis ||              \
@@ -380,8 +386,13 @@ typedef struct UserEventInfo       UserEvent;
                                 KMOD_Meta    | \
                                 KMOD_Alt)
 
+#define KMOD_TextInput         (KMOD_Shift | KMOD_Alt_R)
+
+
 // SDL function definitions
 
+void SDLSetAlpha(SDL_Surface *, boolean, int);
+const char *SDLGetRendererName(void);
 boolean SDLSetNativeSurface(SDL_Surface **);
 SDL_Surface *SDLGetNativeSurface(SDL_Surface *);
 void SDLCreateBitmapTextures(Bitmap *);