X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=31de93da084907c5cb7871d98d74433822ee35bf;hb=a9e8a4cac51cb2856f339d84bab5e07e8be75037;hp=35d6a2411c3c7af8edd90677d04cf1630c550f15;hpb=8e4eb47925648cd84d134dfe05ca7fb30727dc24;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 35d6a241..31de93da 100644
--- 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,13 +17,13 @@
 #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
 
 // definitions needed for "system.c"
 
-#define SURFACE_FLAGS		(0)
+#define SURFACE_FLAGS		(SDL_WINDOW_RESIZABLE)
 
 #define SET_TRANSPARENT_PIXEL	(SDL_TRUE)
 #define UNSET_TRANSPARENT_PIXEL	(SDL_FALSE)
@@ -75,6 +75,10 @@ struct SDLSurfaceInfo
   char *source_filename;
 
   int width, height;
+
+  int alpha[2][2];		// [surface|texture][opaque|masked]
+  int alpha_next_blit;
+
   SDL_Surface *surface;
   SDL_Surface *surface_masked;
   SDL_Texture *texture;
@@ -350,6 +354,21 @@ 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 ||		\
+				 (k) == KSYM_Odiaeresis ||		\
+				 (k) == KSYM_Udiaeresis ||		\
+				 (k) == KSYM_adiaeresis ||		\
+				 (k) == KSYM_odiaeresis ||		\
+				 (k) == KSYM_udiaeresis)
+
 #define KMOD_None		KMOD_NONE
 #define KMOD_Shift_L		KMOD_LSHIFT
 #define KMOD_Shift_R		KMOD_RSHIFT
@@ -373,8 +392,11 @@ typedef struct UserEventInfo	UserEvent;
 
 #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 *);
@@ -410,7 +432,6 @@ void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
 Pixel SDLGetPixel(Bitmap *, int, int);
 void SDLPutPixel(Bitmap *, int, int, Pixel);
 
-void SDLInvertArea(Bitmap *, int, int, int, int, Uint32);
 void SDLCopyInverseMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
 
 Bitmap *SDLZoomBitmap(Bitmap *, int, int);
@@ -423,7 +444,7 @@ void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
 void SDLWaitEvent(Event *);
-void SDLCorrectMouseEventXY(int *, int *);
+void SDLCorrectRawMousePosition(int *, int *);
 
 void HandleJoystickEvent(Event *);
 void SDLInitJoysticks(void);