X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=680ff2d51ff568024693f9b53c4b4ab5536e3d42;hb=e4bf86b0ac3fd50612eee1439beba2fbaaa7cd09;hp=0304be812529fa19b895a5eb9d59bbd11e3db7bb;hpb=94b124e87edbd2e12d7b83f45254fcbfff8554cd;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index 0304be81..680ff2d5 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,18 +1,18 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Artsoft Retro-Game Library * *----------------------------------------------------------* -* ©1995 Artsoft Development * -* Holger Schemel * -* 33659 Bielefeld-Senne * -* Telefon: (0521) 493245 * -* eMail: aeglos@valinor.owl.de * -* aeglos@uni-paderborn.de * -* q99492@pbhrzx.uni-paderborn.de * +* (c) 1994-2002 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* system.c * +* system.c * ***********************************************************/ #include +#include #include "platform.h" @@ -20,9 +20,13 @@ #include #endif -#include "libgame.h" +#include "system.h" +#include "sound.h" +#include "setup.h" +#include "joystick.h" +#include "misc.h" + -#if 0 /* ========================================================================= */ /* exported variables */ /* ========================================================================= */ @@ -32,77 +36,101 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +struct ArtworkInfo artwork; +struct JoystickInfo joystick; +struct SetupInfo setup; -Display *display = NULL; -Visual *visual = NULL; -int screen = 0; -Colormap cmap = None; +LevelDirTree *leveldir_first = NULL; +LevelDirTree *leveldir_current = NULL; +int level_nr; -DrawWindow window = NULL; -DrawBuffer backbuffer = NULL; -DrawBuffer drawto = NULL; +Display *display = NULL; +Visual *visual = NULL; +int screen = 0; +Colormap cmap = None; -int button_status = MB_NOT_PRESSED; -boolean motion_status = FALSE; +DrawWindow *window = NULL; +DrawBuffer *backbuffer = NULL; +DrawBuffer *drawto = NULL; -int redraw_mask = REDRAW_NONE; -int redraw_tiles = 0; +int button_status = MB_NOT_PRESSED; +boolean motion_status = FALSE; -int FrameCounter = 0; +int redraw_mask = REDRAW_NONE; +int redraw_tiles = 0; + +int FrameCounter = 0; -#endif /* ========================================================================= */ -/* init functions */ +/* init/close functions */ /* ========================================================================= */ -void InitCommandName(char *argv0) +void InitProgramInfo(char *argv0, + char *userdata_directory, char *program_title, + char *window_title, char *icon_title, + char *x11_icon_filename, char *x11_iconmask_filename, + char *msdos_pointer_filename, + char *cookie_prefix, char *filename_prefix, + int program_version) { program.command_basename = (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0); + + program.userdata_directory = userdata_directory; + program.program_title = program_title; + program.window_title = window_title; + program.icon_title = icon_title; + program.x11_icon_filename = x11_icon_filename; + program.x11_iconmask_filename = x11_iconmask_filename; + program.msdos_pointer_filename = msdos_pointer_filename; + + program.cookie_prefix = cookie_prefix; + program.filename_prefix = filename_prefix; + + program.version_major = VERSION_MAJOR(program_version); + program.version_minor = VERSION_MINOR(program_version); + program.version_patch = VERSION_PATCH(program_version); } void InitExitFunction(void (*exit_function)(int)) { program.exit_function = exit_function; + + /* set signal handlers to custom exit function */ + signal(SIGINT, exit_function); + signal(SIGTERM, exit_function); + +#if defined(TARGET_SDL) + /* set exit function to automatically cleanup SDL stuff after exit() */ + atexit(SDL_Quit); +#endif } void InitPlatformDependantStuff(void) { #if defined(PLATFORM_MSDOS) _fmode = O_BINARY; + initErrorFile(); +#endif + +#if defined(TARGET_SDL) + if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) + Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); #endif } -void InitProgramInfo(char *unix_userdata_directory, char *program_title, - char *window_title, char *icon_title, - char *x11_icon_basename, char *x11_iconmask_basename, - char *msdos_pointer_basename) +void ClosePlatformDependantStuff(void) { - char *gfx_dir = getPath2(options.ro_base_directory, GRAPHICS_DIRECTORY); - char *x11_icon_filename = getPath2(gfx_dir, x11_icon_basename); - char *x11_iconmask_filename = getPath2(gfx_dir, x11_iconmask_basename); - char *msdos_pointer_filename = getPath2(gfx_dir, msdos_pointer_basename); - - free(gfx_dir); - -#if defined(PLATFORM_UNIX) - program.userdata_directory = unix_userdata_directory; -#else - program.userdata_directory = "userdata"; +#if defined(PLATFORM_MSDOS) + dumpErrorFile(); #endif - - program.program_title = program_title; - program.window_title = window_title; - program.icon_title = icon_title; - program.x11_icon_filename = x11_icon_filename; - program.x11_iconmask_filename = x11_iconmask_filename; - program.msdos_pointer_filename = msdos_pointer_filename; } void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, int real_sx, int real_sy, - int full_sxsize, int full_sysize) + int full_sxsize, int full_sysize, + Bitmap *field_save_buffer) { gfx.sx = sx; gfx.sy = sy; @@ -112,6 +140,14 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.real_sy = real_sy; gfx.full_sxsize = full_sxsize; gfx.full_sysize = full_sysize; + + gfx.field_save_buffer = field_save_buffer; + + gfx.background_bitmap = NULL; + gfx.background_bitmap_mask = REDRAW_NONE; + + SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ + SetDrawBackgroundMask(REDRAW_NONE); /* deactivate masked drawing */ } void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize) @@ -137,6 +173,95 @@ void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) gfx.scrollbuffer_height = scrollbuffer_height; } +void SetDrawDeactivationMask(int draw_deactivation_mask) +{ + gfx.draw_deactivation_mask = draw_deactivation_mask; +} + +void SetDrawBackgroundMask(int draw_background_mask) +{ + gfx.draw_background_mask = draw_background_mask; +} + +static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, + int dest_x, int dest_y, int width, int height) +{ + int bitmap_xsize = width; + int bitmap_ysize = height; + int tile_xsize = tile->width; + int tile_ysize = tile->height; + int tile_xsteps = (bitmap_xsize + tile_xsize - 1) / tile_xsize; + int tile_ysteps = (bitmap_ysize + tile_ysize - 1) / tile_ysize; + int x, y; + + for (y=0; y < tile_ysteps; y++) + { + for (x=0; x < tile_xsteps; x++) + { + int draw_x = dest_x + x * tile_xsize; + int draw_y = dest_y + y * tile_ysize; + int draw_xsize = MIN(tile_xsize, bitmap_xsize - x * tile_xsize); + int draw_ysize = MIN(tile_ysize, bitmap_ysize - y * tile_ysize); + + BlitBitmap(tile, bitmap, 0, 0, draw_xsize, draw_ysize, draw_x, draw_y); + } + } +} + +void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +{ + static Bitmap *main_bitmap_tile = NULL; + static Bitmap *door_bitmap_tile = NULL; + + if (mask == REDRAW_FIELD) + { + if (background_bitmap_tile == main_bitmap_tile) + return; /* main background tile has not changed */ + + main_bitmap_tile = background_bitmap_tile; + } + else if (mask == REDRAW_DOOR_1) + { + if (background_bitmap_tile == door_bitmap_tile) + return; /* main background tile has not changed */ + + door_bitmap_tile = background_bitmap_tile; + } + else /* should not happen */ + return; + + if (background_bitmap_tile) + gfx.background_bitmap_mask |= mask; + else + gfx.background_bitmap_mask &= ~mask; + + if (gfx.background_bitmap == NULL) + gfx.background_bitmap = CreateBitmap(video.width, video.height, + DEFAULT_DEPTH); + + if (background_bitmap_tile == NULL) /* empty background requested */ + return; + + if (mask == REDRAW_FIELD) + DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, + gfx.real_sx, gfx.real_sy, + gfx.full_sxsize, gfx.full_sysize); + else + DrawBitmapFromTile(gfx.background_bitmap, background_bitmap_tile, + gfx.dx, gfx.dy, + gfx.dxsize, gfx.dysize); +} + +void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) +{ + SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD); +} + +void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile) +{ + SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1); +} + /* ========================================================================= */ /* video functions */ @@ -147,16 +272,52 @@ inline static int GetRealDepth(int depth) return (depth == DEFAULT_DEPTH ? video.default_depth : depth); } -inline void InitVideoDisplay(void) +inline static void sysFillRectangle(Bitmap *bitmap, int x, int y, + int width, int height, Pixel color) +{ +#ifdef TARGET_SDL + SDLFillRectangle(bitmap, x, y, width, height, color); +#else + X11FillRectangle(bitmap, x, y, width, height, color); +#endif +} + +inline static void sysCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y, int mask_mode) { #ifdef TARGET_SDL + SDLCopyArea(src_bitmap, dst_bitmap, + src_x, src_y, width, height, dst_x, dst_y, mask_mode); +#else + X11CopyArea(src_bitmap, dst_bitmap, + src_x, src_y, width, height, dst_x, dst_y, mask_mode); +#endif +} + +inline void InitVideoDisplay(void) +{ +#if defined(TARGET_SDL) SDLInitVideoDisplay(); #else X11InitVideoDisplay(); #endif } -inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window, +inline void CloseVideoDisplay(void) +{ + KeyboardAutoRepeatOn(); + +#if defined(TARGET_SDL) + SDL_QuitSubSystem(SDL_INIT_VIDEO); +#else + + if (display) + XCloseDisplay(display); +#endif +} + +inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, int width, int height, int depth, boolean fullscreen) { @@ -173,7 +334,7 @@ inline void InitVideoBuffer(DrawBuffer *backbuffer, DrawWindow *window, #endif } -inline Bitmap CreateBitmapStruct(void) +inline Bitmap *CreateBitmapStruct(void) { #ifdef TARGET_SDL return checked_calloc(sizeof(struct SDLSurfaceInfo)); @@ -182,9 +343,9 @@ inline Bitmap CreateBitmapStruct(void) #endif } -inline Bitmap CreateBitmap(int width, int height, int depth) +inline Bitmap *CreateBitmap(int width, int height, int depth) { - Bitmap new_bitmap = CreateBitmapStruct(); + Bitmap *new_bitmap = CreateBitmapStruct(); int real_depth = GetRealDepth(depth); #ifdef TARGET_SDL @@ -204,21 +365,29 @@ inline Bitmap CreateBitmap(int width, int height, int depth) #else Pixmap pixmap; - if (!(pixmap = XCreatePixmap(display, window->drawable, - width, height, real_depth))) + if ((pixmap = XCreatePixmap(display, window->drawable, + width, height, real_depth)) + == None) Error(ERR_EXIT, "cannot create pixmap"); + new_bitmap->drawable = pixmap; if (window == NULL) Error(ERR_EXIT, "Window GC needed for Bitmap -- create Window first"); + new_bitmap->gc = window->gc; + new_bitmap->line_gc[0] = window->line_gc[0]; + new_bitmap->line_gc[1] = window->line_gc[1]; #endif + new_bitmap->width = width; + new_bitmap->height = height; + return new_bitmap; } -inline void FreeBitmap(Bitmap bitmap) +inline static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -228,19 +397,53 @@ inline void FreeBitmap(Bitmap bitmap) SDL_FreeSurface(bitmap->surface); if (bitmap->surface_masked) SDL_FreeSurface(bitmap->surface_masked); + bitmap->surface = NULL; + bitmap->surface_masked = NULL; #else + /* The X11 version seems to have a memory leak here -- although + "XFreePixmap()" is called, the corresponding memory seems not + to be freed (according to "ps"). The SDL version apparently + does not have this problem. */ + if (bitmap->drawable) XFreePixmap(display, bitmap->drawable); if (bitmap->clip_mask) XFreePixmap(display, bitmap->clip_mask); if (bitmap->stored_clip_gc) XFreeGC(display, bitmap->stored_clip_gc); + /* the other GCs are only pointers to GCs used elsewhere */ + bitmap->drawable = None; + bitmap->clip_mask = None; + bitmap->stored_clip_gc = None; #endif + if (bitmap->source_filename) + free(bitmap->source_filename); + bitmap->source_filename = NULL; +} + +inline static void TransferBitmapPointers(Bitmap *src_bitmap, + Bitmap *dst_bitmap) +{ + if (src_bitmap == NULL || dst_bitmap == NULL) + return; + + FreeBitmapPointers(dst_bitmap); + + *dst_bitmap = *src_bitmap; +} + +inline void FreeBitmap(Bitmap *bitmap) +{ + if (bitmap == NULL) + return; + + FreeBitmapPointers(bitmap); + free(bitmap); } -inline void CloseWindow(DrawWindow window) +inline void CloseWindow(DrawWindow *window) { #ifdef TARGET_X11 if (window->drawable) @@ -253,27 +456,70 @@ inline void CloseWindow(DrawWindow window) #endif } -inline void BlitBitmap(Bitmap src_bitmap, Bitmap dst_bitmap, - int src_x, int src_y, - int width, int height, +static inline boolean CheckDrawingArea(int x, int y, int width, int height, + int draw_mask) +{ + if (draw_mask == REDRAW_NONE) + return FALSE; + + if (draw_mask & REDRAW_ALL) + return TRUE; + + if ((draw_mask & REDRAW_FIELD) && x < gfx.real_sx + gfx.full_sxsize) + return TRUE; + + if ((draw_mask & REDRAW_DOOR_1) && x >= gfx.dx && y < gfx.dy + gfx.dysize) + return TRUE; + + if ((draw_mask & REDRAW_DOOR_2) && x >= gfx.dx && y >= gfx.vy) + return TRUE; + + return FALSE; +} + +inline boolean DrawingDeactivated(int x, int y, int width, int height) +{ + return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask); +} + +inline boolean DrawingOnBackground(int x, int y) +{ + return ((gfx.draw_background_mask & gfx.background_bitmap_mask) && + CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask)); +} + +inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, int dst_x, int dst_y) { -#ifdef TARGET_SDL - SDLCopyArea(src_bitmap, dst_bitmap, - src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_OPAQUE); -#else - XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, - dst_bitmap->gc, src_x, src_y, width, height, dst_x, dst_y); -#endif + if (DrawingDeactivated(dst_x, dst_y, width, height)) + return; + + sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y, BLIT_OPAQUE); } -inline void ClearRectangle(Bitmap bitmap, int x, int y, int width, int height) +inline void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height, + Pixel color) { -#ifdef TARGET_SDL - SDLFillRectangle(bitmap, x, y, width, height, 0x000000); -#else - XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height); -#endif + if (DrawingDeactivated(x, y, width, height)) + return; + + sysFillRectangle(bitmap, x, y, width, height, color); +} + +inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) +{ + FillRectangle(bitmap, x, y, width, height, BlackPixel(display, screen)); +} + +inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, + int width, int height) +{ + if (DrawingOnBackground(x, y)) + BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y); + else + ClearRectangle(bitmap, x, y, width, height); } #if 0 @@ -282,7 +528,7 @@ static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ #endif #endif -inline void SetClipMask(Bitmap bitmap, GC clip_gc, Pixmap clip_pixmap) +inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) { #ifdef TARGET_X11 if (clip_gc) @@ -296,7 +542,7 @@ inline void SetClipMask(Bitmap bitmap, GC clip_gc, Pixmap clip_pixmap) #endif } -inline void SetClipOrigin(Bitmap bitmap, GC clip_gc, int clip_x, int clip_y) +inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) { #ifdef TARGET_X11 if (clip_gc) @@ -310,32 +556,135 @@ inline void SetClipOrigin(Bitmap bitmap, GC clip_gc, int clip_x, int clip_y) #endif } -inline void BlitBitmapMasked(Bitmap src_bitmap, Bitmap dst_bitmap, +inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, int src_x, int src_y, int width, int height, int dst_x, int dst_y) { -#ifdef TARGET_SDL - SDLCopyArea(src_bitmap, dst_bitmap, - src_x, src_y, width, height, dst_x, dst_y, SDLCOPYAREA_MASKED); -#else - XCopyArea(display, src_bitmap->drawable, dst_bitmap->drawable, - src_bitmap->clip_gc, src_x, src_y, width, height, dst_x, dst_y); -#endif + if (DrawingDeactivated(dst_x, dst_y, width, height)) + return; + + sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y, BLIT_MASKED); } -inline void DrawSimpleWhiteLine(Bitmap bitmap, int from_x, int from_y, +inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, + int width, int height, + int dst_x, int dst_y) +{ + if (DrawingOnBackground(dst_x, dst_y)) + { + /* draw background */ + BlitBitmap(gfx.background_bitmap, dst_bitmap, dst_x, dst_y, width, height, + dst_x, dst_y); + + /* draw foreground */ + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y); + } + else + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y); +} + +inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, int to_x, int to_y) { #ifdef TARGET_SDL - SDLDrawSimpleLine(bitmap->surface, from_x, from_y, to_x, to_y, 0xffffff); + SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff); #else XSetForeground(display, bitmap->gc, WhitePixel(display, screen)); XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y); - XSetForeground(display, bitmap->gc, BlackPixel(display, screen)); #endif } +#if !defined(TARGET_X11_NATIVE) +inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y, Pixel pixel, int line_width) +{ + int x, y; + + for (x=0; xdrawable, from_x + dx, from_y + dy, + to_x + dx, to_y + dy, pixel); +#endif + } + } +} +#endif + +inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, + Pixel pixel) +{ +#if !defined(TARGET_X11_NATIVE) + int line_width = 4; + int i; + + for (i=0; isurface, points, num_points, pixel); + */ +#else + XSetForeground(display, bitmap->line_gc[1], pixel); + XDrawLines(display, bitmap->drawable, bitmap->line_gc[1], + (XPoint *)points, num_points, CoordModeOrigin); +#endif +} + +inline Pixel GetPixel(Bitmap *bitmap, int x, int y) +{ +#if defined(TARGET_SDL) + return SDLGetPixel(bitmap, x, y); +#elif defined(TARGET_ALLEGRO) + return AllegroGetPixel(bitmap->drawable, x, y); +#else + return X11GetPixel(bitmap, x, y); +#endif +} + +inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, + unsigned int color_g, unsigned int color_b) +{ +#if defined(TARGET_SDL) + return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); +#elif defined(TARGET_ALLEGRO) + return AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8); +#else + return X11GetPixelFromRGB(color_r, color_g, color_b); +#endif +} + +inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) +{ + unsigned int color_r = (color >> 16) & 0xff; + unsigned int color_g = (color >> 8) & 0xff; + unsigned int color_b = (color >> 0) & 0xff; + + return GetPixelFromRGB(bitmap, color_r, color_g, color_b); +} + /* execute all pending screen drawing operations */ inline void FlushDisplay(void) { @@ -359,7 +708,8 @@ inline void KeyboardAutoRepeatOn(void) SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); #else - XAutoRepeatOn(display); + if (display) + XAutoRepeatOn(display); #endif } @@ -369,11 +719,12 @@ inline void KeyboardAutoRepeatOff(void) SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); #else - XAutoRepeatOff(display); + if (display) + XAutoRepeatOff(display); #endif } -inline boolean PointerInWindow(DrawWindow window) +inline boolean PointerInWindow(DrawWindow *window) { #ifdef TARGET_SDL return TRUE; @@ -422,51 +773,179 @@ inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) return fullscreen; } +Bitmap *LoadImage(char *filename) +{ + Bitmap *new_bitmap; -/* ========================================================================= */ -/* audio functions */ -/* ========================================================================= */ +#if defined(TARGET_SDL) + new_bitmap = SDLLoadImage(filename); +#else + new_bitmap = X11LoadImage(filename); +#endif + + if (new_bitmap) + new_bitmap->source_filename = getStringCopy(filename); + + return new_bitmap; +} -inline boolean OpenAudio(struct AudioSystemInfo *audio) +Bitmap *LoadCustomImage(char *basename) { - audio->sound_available = FALSE; - audio->loops_available = FALSE; - audio->soundserver_pipe[0] = audio->soundserver_pipe[1] = 0; - audio->soundserver_pid = 0; - audio->device_name = NULL; - audio->device_fd = 0; + char *filename = getCustomImageFilename(basename); + Bitmap *new_bitmap; -#if defined(TARGET_SDL) - if (SDLOpenAudio()) + if (filename == NULL) + Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename); + + if ((new_bitmap = LoadImage(filename)) == NULL) + Error(ERR_EXIT, "LoadImage() failed: %s", GetError()); + + return new_bitmap; +} + +void ReloadCustomImage(Bitmap *bitmap, char *basename) +{ + char *filename = getCustomImageFilename(basename); + Bitmap *new_bitmap; + + if (filename == NULL) /* (should never happen) */ { - audio->sound_available = TRUE; - audio->loops_available = TRUE; + Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", basename); + return; } -#elif defined(PLATFORM_MSDOS) - if (MSDOSOpenAudio()) + + if (strcmp(filename, bitmap->source_filename) == 0) + { + /* The old and new image are the same (have the same filename and path). + This usually means that this image does not exist in this graphic set + and a fallback to the existing image is done. */ + + return; + } + + if ((new_bitmap = LoadImage(filename)) == NULL) { - audio->sound_available = TRUE; - audio->loops_available = TRUE; + Error(ERR_WARN, "LoadImage() failed: %s", GetError()); + return; } -#elif defined(PLATFORM_UNIX) - UnixOpenAudio(audio); + + if (bitmap->width != new_bitmap->width || + bitmap->height != new_bitmap->height) + { + Error(ERR_WARN, "ReloadCustomImage: new image '%s' has wrong dimensions", + filename); + FreeBitmap(new_bitmap); + return; + } + + TransferBitmapPointers(new_bitmap, bitmap); + free(new_bitmap); +} + +Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) +{ + Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH); + +#if defined(TARGET_SDL) + SDLZoomBitmap(src_bitmap, dst_bitmap); +#else + X11ZoomBitmap(src_bitmap, dst_bitmap); #endif - return audio->sound_available; + return dst_bitmap; } -inline void CloseAudio(struct AudioSystemInfo *audio) +void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) +{ + Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8; + int src_width, src_height; + int tmp_width, tmp_height; + + src_width = src_bitmap->width; + src_height = src_bitmap->height; + + tmp_width = src_width; + tmp_height = src_height + src_height / 2; + + tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + + tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); + tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + + BlitBitmap(src_bitmap, tmp_bitmap, 0, 0, src_width, src_height, 0, 0); + BlitBitmap(tmp_bitmap_2, tmp_bitmap, 0, 0, src_width / 2, src_height / 2, + 0, src_height); + BlitBitmap(tmp_bitmap_8, tmp_bitmap, 0, 0, src_width / 8, src_height / 8, + 3 * src_width / 4, src_height); + + FreeBitmap(tmp_bitmap_2); + FreeBitmap(tmp_bitmap_8); + +#ifdef TARGET_SDL + src_bitmap->surface = tmp_bitmap->surface; + tmp_bitmap->surface = NULL; +#else + src_bitmap->drawable = tmp_bitmap->drawable; + tmp_bitmap->drawable = None; +#endif + + src_bitmap->height = tmp_bitmap->height; + + FreeBitmap(tmp_bitmap); +} + + +/* ========================================================================= */ +/* audio functions */ +/* ========================================================================= */ + +inline void OpenAudio(void) +{ + /* always start with reliable default values */ + audio.sound_available = FALSE; + audio.music_available = FALSE; + audio.loops_available = FALSE; + + audio.sound_enabled = FALSE; + audio.sound_deactivated = FALSE; + + audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; + audio.mixer_pid = 0; + audio.device_name = NULL; + audio.device_fd = -1; + + audio.num_channels = 0; + audio.music_channel = 0; + audio.first_sound_channel = 0; + +#if defined(TARGET_SDL) + SDLOpenAudio(); +#elif defined(PLATFORM_UNIX) + UnixOpenAudio(); +#elif defined(PLATFORM_MSDOS) + MSDOSOpenAudio(); +#endif +} + +inline void CloseAudio(void) { #if defined(TARGET_SDL) SDLCloseAudio(); +#elif defined(PLATFORM_UNIX) + UnixCloseAudio(); #elif defined(PLATFORM_MSDOS) MSDOSCloseAudio(); -#elif defined(PLATFORM_UNIX) - UnixCloseAudio(audio); #endif - audio->sound_available = FALSE; - audio->loops_available = FALSE; + audio.sound_enabled = FALSE; +} + +inline void SetAudioMode(boolean enabled) +{ + if (!audio.sound_available) + return; + + audio.sound_enabled = enabled; } @@ -494,7 +973,7 @@ inline boolean PendingEvent(void) inline void NextEvent(Event *event) { #ifdef TARGET_SDL - SDL_WaitEvent(event); + SDLNextEvent(event); #else XNextEvent(display, event); #endif @@ -510,7 +989,9 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) (int)SDL_GetModState()); #endif - if (with_modifiers && event->keysym.unicode != 0) + if (with_modifiers && + event->keysym.unicode > 0x0000 && + event->keysym.unicode < 0x2000) return event->keysym.unicode; else return event->keysym.sym; @@ -545,9 +1026,39 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) } -inline void dummy(void) +/* ========================================================================= */ +/* joystick functions */ +/* ========================================================================= */ + +inline void InitJoysticks() { -#ifdef TARGET_SDL -#else + int i; + +#ifdef NO_JOYSTICK + return; /* joysticks generally deactivated by compile-time directive */ +#endif + + /* always start with reliable default values */ + joystick.status = JOYSTICK_NOT_AVAILABLE; + for (i=0; i