X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=d61e0b26b9f0ec6966a9986b2743edd61dd3fd95;hb=HEAD;hp=9fb16338fefba1760664a21e7ade264a1a190161;hpb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 9fb16338..05f99982 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/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
 
@@ -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,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 +390,12 @@ 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 *);
@@ -408,6 +422,7 @@ void SDLInitVideoBuffer(boolean);
 boolean SDLSetVideoMode(boolean);
 void SDLCreateBitmapContent(Bitmap *, int, int, int);
 void SDLFreeBitmapPointers(Bitmap *);
+void SDLBlitSurface(SDL_Surface *, SDL_Surface *, int, int, int, int, int, int);
 void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
 void SDLBlitTexture(Bitmap *, int, int, int, int, int, int, int);
 void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32);
@@ -418,7 +433,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);