X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=fc05cb7063ad22ebbe4d8c88c66ab51b8a7d62d9;hb=ea6e4698905d7440a265e323d03cf13fc323c44b;hp=d574cd6be713c63059c7b2c96541df18be8a0797;hpb=34ed45c14d923459972fecf7a3b46f44d7e03670;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index d574cd6b..fc05cb70 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -17,6 +17,8 @@
 #include "SDL.h"
 #include "SDL_image.h"
 #include "SDL_mixer.h"
+#include "SDL_net.h"
+#include "SDL_thread.h"
 
 
 /* definitions needed for "system.c" */
@@ -28,6 +30,9 @@
 #define TARGET_STRING		"SDL"
 #define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
 
+#define CURSOR_MAX_WIDTH	32
+#define CURSOR_MAX_HEIGHT	32
+
 
 /* SDL type definitions */
 
@@ -35,8 +40,10 @@ typedef struct SDLSurfaceInfo	Bitmap;
 typedef struct SDLSurfaceInfo	DrawBuffer;
 typedef struct SDLSurfaceInfo	DrawWindow;
 typedef Uint32			Pixel;
+typedef SDL_Cursor	       *Cursor;
 
 typedef SDLKey			Key;
+typedef unsigned int		KeyMod;
 
 typedef SDL_Event		Event;
 typedef SDL_MouseButtonEvent	ButtonEvent;
@@ -66,6 +73,15 @@ struct SDLSurfaceInfo
   GC stored_clip_gc;
 };
 
+struct MouseCursorInfo
+{
+  int width, height;
+  int hot_x, hot_y;
+
+  char data[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
+  char mask[CURSOR_MAX_WIDTH * CURSOR_MAX_HEIGHT / 8];
+};
+
 struct XY
 {
   short x, y;
@@ -76,8 +92,8 @@ struct XY
 
 #define None			0L
 
-#define BlackPixel(d, s)	0x000000
-#define WhitePixel(d, s)	0xffffff
+#define BLACK_PIXEL		0x000000
+#define WHITE_PIXEL		0xffffff
 
 #define EVENT_BUTTONPRESS	SDL_MOUSEBUTTONDOWN
 #define EVENT_BUTTONRELEASE	SDL_MOUSEBUTTONUP
@@ -318,6 +334,21 @@ struct XY
 #define KSYM_FKEY_LAST		KSYM_F15
 #define KSYM_NUM_FKEYS		(KSYM_FKEY_LAST - KSYM_FKEY_FIRST + 1)
 
+#define KMOD_None		None
+#define KMOD_Shift_L		KMOD_LSHIFT
+#define KMOD_Shift_R		KMOD_RSHIFT
+#define KMOD_Control_L		KMOD_LCTRL
+#define KMOD_Control_R		KMOD_RCTRL
+#define KMOD_Meta_L		KMOD_LMETA
+#define KMOD_Meta_R		KMOD_RMETA
+#define KMOD_Alt_L		KMOD_LALT
+#define KMOD_Alt_R		KMOD_RALT
+
+#define KMOD_Shift		(KMOD_Shift_L   | KMOD_Shift_R)
+#define KMOD_Control		(KMOD_Control_L | KMOD_Control_R)
+#define KMOD_Meta		(KMOD_Meta_L    | KMOD_Meta_R)
+#define KMOD_Alt		(KMOD_Alt_L     | KMOD_Alt_R)
+
 
 /* SDL function definitions */
 
@@ -331,11 +362,18 @@ inline void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32);
 inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, Uint32);
 inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
 inline Pixel SDLGetPixel(Bitmap *, int, int);
+inline void SDLPutPixel(Bitmap *, int, int, Pixel);
+
+inline void SDLInvertArea(Bitmap *, int, int, int, int, Uint32);
+inline void SDLCopyInverseMasked(Bitmap *, Bitmap *, int, int, int, int,
+				 int, int);
 
 void SDLZoomBitmap(Bitmap *, Bitmap *);
 
 Bitmap *SDLLoadImage(char *);
 
+void SDLSetMouseCursor(struct MouseCursorInfo *);
+
 inline void SDLOpenAudio(void);
 inline void SDLCloseAudio(void);