X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.h;h=625b89e6fb756d90ab2ea62fdb762e6ec2f67526;hb=e05dda5c8cc6687dcbc59e182a81aed627e262d0;hp=9c48d515b8ce2ec9cd3b1707c82db6d0197f4b9e;hpb=ff56a43aa3799aa3357f4deca4d6482fc25a6a41;p=rocksndiamonds.git

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 9c48d515..625b89e6 100644
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -1,7 +1,7 @@
 /***********************************************************
 * Artsoft Retro-Game Library                               *
 *----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment                      *
+* (c) 1994-2006 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -14,31 +14,36 @@
 #ifndef SDL_H
 #define SDL_H
 
-#include "SDL.h"
-#include "SDL_image.h"
-#include "SDL_mixer.h"
+#include <SDL.h>
+#include <SDL_image.h>
+#include <SDL_mixer.h>
+#include <SDL_net.h>
+#include <SDL_thread.h>
 
 
 /* definitions needed for "system.c" */
 
 #define SURFACE_FLAGS		(SDL_SWSURFACE)
 
-#define SDLCOPYAREA_OPAQUE	0
-#define SDLCOPYAREA_MASKED	1
-
 /* system dependent definitions */
 
 #define TARGET_STRING		"SDL"
 #define FULLSCREEN_STATUS	FULLSCREEN_AVAILABLE
 
+#define CURSOR_MAX_WIDTH	32
+#define CURSOR_MAX_HEIGHT	32
+
 
 /* SDL type definitions */
 
-typedef struct SDLSurfaceInfo  *Bitmap;
-typedef struct SDLSurfaceInfo  *DrawBuffer;
-typedef struct SDLSurfaceInfo  *DrawWindow;
+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;
@@ -59,17 +64,32 @@ typedef int			Colormap;
 
 struct SDLSurfaceInfo
 {
+  char *source_filename;
+
+  int width, height;
   SDL_Surface *surface;
   SDL_Surface *surface_masked;
   GC gc;
   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];
+};
+
 
 /* SDL symbol definitions */
 
 #define None			0L
 
+#define BLACK_PIXEL		0x000000
+#define WHITE_PIXEL		0xffffff
+
 #define EVENT_BUTTONPRESS	SDL_MOUSEBUTTONDOWN
 #define EVENT_BUTTONRELEASE	SDL_MOUSEBUTTONUP
 #define EVENT_MOTIONNOTIFY	SDL_MOUSEMOTION
@@ -305,17 +325,57 @@ struct SDLSurfaceInfo
 #define KSYM_F23		KSYM_UNDEFINED
 #define KSYM_F24		KSYM_UNDEFINED
 
+#define KSYM_FKEY_FIRST		KSYM_F1
+#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 */
 
-inline void SDLInitVideoDisplay(void);
-inline void SDLInitVideoBuffer(DrawBuffer *, DrawWindow *, boolean);
-inline boolean SDLSetVideoMode(DrawBuffer *, boolean);
-inline void SDLCopyArea(Bitmap, Bitmap, int, int, int, int, int, int, int);
-inline void SDLFillRectangle(Bitmap, int, int, int, int, unsigned int);
-inline void SDLDrawSimpleLine(SDL_Surface *, int, int, int, int, unsigned int);
+void SDLInitVideoDisplay(void);
+void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
+boolean SDLSetVideoMode(DrawBuffer **, boolean);
+void SDLCreateBitmapContent(Bitmap *, int, int, int);
+void SDLFreeBitmapPointers(Bitmap *);
+void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
+void SDLFillRectangle(Bitmap *, int, int, int, int, Uint32);
+void SDLFadeRectangle(Bitmap *, int, int, int, int, int, int, int);
+void SDLDrawSimpleLine(Bitmap *, int, int, int, int, Uint32);
+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);
+
+void SDLZoomBitmap(Bitmap *, Bitmap *);
+
+Bitmap *SDLLoadImage(char *);
+
+void SDLSetMouseCursor(struct MouseCursorInfo *);
+
+void SDLOpenAudio(void);
+void SDLCloseAudio(void);
+
+void SDLNextEvent(Event *);
 
-inline boolean SDLOpenAudio(void);
-inline void SDLCloseAudio(void);
+void HandleJoystickEvent(Event *);
+void SDLInitJoysticks(void);
+boolean SDLReadJoystick(int, int *, int *, boolean *, boolean *);
 
 #endif /* SDL_H */