X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=adcc58ff4972e98c6c473ccb9548f1f0b094f05e;hp=1fbafd7818052124b5e0b17847bfc5a35f1d6258;hb=6c674ccdd458314ced75459649c6acf1489b6056;hpb=3d52a86d358f5b1a4b36b80df5d659bce1f5a3a6 diff --git a/src/libgame/system.c b/src/libgame/system.c index 1fbafd78..df401b5a 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,31 +1,28 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* system.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// system.c +// ============================================================================ #include #include #include "platform.h" -#if defined(PLATFORM_MSDOS) -#include -#endif - #include "system.h" +#include "image.h" #include "sound.h" #include "setup.h" #include "joystick.h" #include "misc.h" +#define ENABLE_UNUSED_CODE 0 /* currently unused functions */ + /* ========================================================================= */ /* exported variables */ @@ -36,20 +33,16 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; -struct FontInfo font; -struct AnimInfo anim; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; +LevelDirTree *leveldir_first_all = NULL; LevelDirTree *leveldir_first = NULL; LevelDirTree *leveldir_current = NULL; int level_nr; -Display *display = NULL; -Visual *visual = NULL; -int screen = 0; -Colormap cmap = None; +struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; DrawBuffer *backbuffer = NULL; @@ -57,9 +50,12 @@ DrawBuffer *drawto = NULL; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; +int wheel_steps = DEFAULT_WHEEL_STEPS; +#if defined(TARGET_SDL2) +boolean keyrepeat_status = TRUE; +#endif int redraw_mask = REDRAW_NONE; -int redraw_tiles = 0; int FrameCounter = 0; @@ -68,10 +64,54 @@ int FrameCounter = 0; /* init/close functions */ /* ========================================================================= */ -void InitCommandName(char *argv0) +void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, + char *program_title, char *icon_title, + char *icon_filename, char *cookie_prefix, + int program_version) { - program.command_basename = - (strrchr(argv0, '/') ? strrchr(argv0, '/') + 1 : argv0); + program.command_basepath = getBasePath(argv0); + program.command_basename = getBaseName(argv0); + + program.config_filename = config_filename; + + program.userdata_subdir = userdata_subdir; + program.userdata_path = getUserGameDataDir(); + + program.program_title = program_title; + program.window_title = "(undefined)"; + program.icon_title = icon_title; + + program.icon_filename = icon_filename; + + program.cookie_prefix = cookie_prefix; + + program.version_major = VERSION_MAJOR(program_version); + program.version_minor = VERSION_MINOR(program_version); + program.version_patch = VERSION_PATCH(program_version); + program.version_build = VERSION_BUILD(program_version); + program.version_ident = program_version; + + program.log_filename[LOG_OUT_ID] = getLogFilename(LOG_OUT_BASENAME); + program.log_filename[LOG_ERR_ID] = getLogFilename(LOG_ERR_BASENAME); + program.log_file[LOG_OUT_ID] = program.log_file_default[LOG_OUT_ID] = stdout; + program.log_file[LOG_ERR_ID] = program.log_file_default[LOG_ERR_ID] = stderr; +} + +void SetWindowTitle() +{ + program.window_title = program.window_title_function(); + + SDLSetWindowTitle(); +} + +void InitWindowTitleFunction(char *(*window_title_function)(void)) +{ + program.window_title_function = window_title_function; +} + +void InitExitMessageFunction(void (*exit_message_function)(char *, va_list)) +{ + program.exit_message_function = exit_message_function; } void InitExitFunction(void (*exit_function)(int)) @@ -79,73 +119,41 @@ void InitExitFunction(void (*exit_function)(int)) program.exit_function = exit_function; /* set signal handlers to custom exit function */ - signal(SIGINT, 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) +void InitPlatformDependentStuff(void) { -#if defined(PLATFORM_MSDOS) - _fmode = O_BINARY; -#endif + // this is initialized in GetOptions(), but may already be used before + options.verbose = TRUE; -#if !defined(PLATFORM_UNIX) - program.userdata_directory = "userdata"; -#endif + OpenLogFiles(); -#if defined(PLATFORM_MSDOS) - initErrorFile(); +#if defined(TARGET_SDL2) + int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE; +#else + int sdl_init_flags = SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE; #endif -#if defined(TARGET_SDL) - if (SDL_Init(SDL_INIT_EVENTTHREAD | SDL_INIT_NOPARACHUTE) < 0) + if (SDL_Init(sdl_init_flags) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); -#endif -} -void ClosePlatformDependantStuff(void) -{ -#if defined(PLATFORM_MSDOS) - dumpErrorFile(); -#endif + SDLNet_Init(); } -void InitProgramInfo(char *unix_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) +void ClosePlatformDependentStuff(void) { -#if defined(PLATFORM_UNIX) - program.userdata_directory = unix_userdata_directory; -#else - program.userdata_directory = "userdata"; -#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; - - 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); + CloseLogFiles(); } 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; @@ -156,13 +164,18 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.full_sxsize = full_sxsize; gfx.full_sysize = full_sysize; - gfx.background_bitmap = NULL; - gfx.background_bitmap_mask = REDRAW_NONE; + gfx.field_save_buffer = field_save_buffer; SetDrawDeactivationMask(REDRAW_NONE); /* do not deactivate drawing */ SetDrawBackgroundMask(REDRAW_NONE); /* deactivate masked drawing */ } +void InitGfxTileSizeInfo(int game_tile_size, int standard_tile_size) +{ + gfx.game_tile_size = game_tile_size; + gfx.standard_tile_size = standard_tile_size; +} + void InitGfxDoor1Info(int dx, int dy, int dxsize, int dysize) { gfx.dx = dx; @@ -179,99 +192,136 @@ void InitGfxDoor2Info(int vx, int vy, int vxsize, int vysize) gfx.vysize = vysize; } +void InitGfxDoor3Info(int ex, int ey, int exsize, int eysize) +{ + gfx.ex = ex; + gfx.ey = ey; + gfx.exsize = exsize; + gfx.eysize = eysize; +} + +void InitGfxWindowInfo(int win_xsize, int win_ysize) +{ + if (win_xsize != gfx.win_xsize || win_ysize != gfx.win_ysize) + { + ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize); + +#if defined(TARGET_SDL2) + ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize); +#endif + + ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize); + + ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize); + } + + gfx.win_xsize = win_xsize; + gfx.win_ysize = win_ysize; + + gfx.background_bitmap_mask = REDRAW_NONE; +} + void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) { /* currently only used by MSDOS code to alloc VRAM buffer, if available */ + /* 2009-03-24: also (temporarily?) used for overlapping blit workaround */ gfx.scrollbuffer_width = scrollbuffer_width; gfx.scrollbuffer_height = scrollbuffer_height; } -void SetDrawDeactivationMask(int draw_deactivation_mask) +void InitGfxClipRegion(boolean enabled, int x, int y, int width, int height) { - gfx.draw_deactivation_mask = draw_deactivation_mask; + gfx.clipping_enabled = enabled; + gfx.clip_x = x; + gfx.clip_y = y; + gfx.clip_width = width; + gfx.clip_height = height; } -void SetDrawBackgroundMask(int draw_background_mask) +void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)) { - gfx.draw_background_mask = draw_background_mask; + gfx.draw_busy_anim_function = draw_busy_anim_function; } -static void DrawBitmapFromTile(Bitmap *bitmap, Bitmap *tile, - int dest_x, int dest_y, int width, int height) +void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int)) { - 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); + gfx.draw_global_anim_function = draw_global_anim_function; +} - BlitBitmap(tile, bitmap, 0, 0, draw_xsize, draw_ysize, draw_x, draw_y); - } - } +void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int)) +{ + gfx.draw_global_border_function = draw_global_border_function; } -void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +void InitGfxCustomArtworkInfo() { - static Bitmap *main_bitmap_tile = NULL; - static Bitmap *door_bitmap_tile = NULL; + gfx.override_level_graphics = FALSE; + gfx.override_level_sounds = FALSE; + gfx.override_level_music = FALSE; - if (mask == REDRAW_FIELD) - { - if (background_bitmap_tile == main_bitmap_tile) - return; /* main background tile has not changed */ + gfx.draw_init_text = TRUE; +} - 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 */ +void InitGfxOtherSettings() +{ + gfx.cursor_mode = CURSOR_DEFAULT; +} - door_bitmap_tile = background_bitmap_tile; - } - else /* should not happen */ - return; +void SetDrawDeactivationMask(int draw_deactivation_mask) +{ + gfx.draw_deactivation_mask = draw_deactivation_mask; +} - if (background_bitmap_tile) +void SetDrawBackgroundMask(int draw_background_mask) +{ + gfx.draw_background_mask = draw_background_mask; +} + +void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +{ + if (background_bitmap_tile != NULL) 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); + if (mask == REDRAW_ALL) + BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0, + 0, 0, video.width, video.height); + else if (mask == REDRAW_FIELD) + BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0, + gfx.real_sx, gfx.real_sy, gfx.full_sxsize, gfx.full_sysize); + else if (mask == REDRAW_DOOR_1) + BlitBitmapTiled(background_bitmap_tile, gfx.background_bitmap, 0, 0, 0, 0, + gfx.dx, gfx.dy, gfx.dxsize, gfx.dysize); +} + +void SetWindowBackgroundBitmap(Bitmap *background_bitmap_tile) +{ + /* remove every mask before setting mask for window */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ + SetBackgroundBitmap(NULL, 0xffff); /* !!! FIX THIS !!! */ + SetBackgroundBitmap(background_bitmap_tile, REDRAW_ALL); } void SetMainBackgroundBitmap(Bitmap *background_bitmap_tile) { + /* remove window area mask before setting mask for main area */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ + SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ SetBackgroundBitmap(background_bitmap_tile, REDRAW_FIELD); } void SetDoorBackgroundBitmap(Bitmap *background_bitmap_tile) { + /* remove window area mask before setting mask for door area */ + /* (!!! TO BE FIXED: The whole REDRAW_* system really sucks! !!!) */ + SetBackgroundBitmap(NULL, REDRAW_ALL); /* !!! FIX THIS !!! */ SetBackgroundBitmap(background_bitmap_tile, REDRAW_DOOR_1); } @@ -285,96 +335,64 @@ 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) { -#if defined(TARGET_SDL) - SDLInitVideoDisplay(); -#else - X11InitVideoDisplay(); -#endif + SDLFillRectangle(bitmap, x, y, width, height, color); + + if (bitmap == backbuffer) + SetRedrawMaskFromArea(x, y, width, height); } -inline void CloseVideoDisplay(void) +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) { - KeyboardAutoRepeatOn(); + SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y, mask_mode); -#if defined(TARGET_SDL) - SDL_QuitSubSystem(SDL_INIT_VIDEO); -#else - - if (display) - XCloseDisplay(display); -#endif + if (dst_bitmap == backbuffer) + SetRedrawMaskFromArea(dst_x, dst_y, width, height); } -inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, - int width, int height, int depth, - boolean fullscreen) +void LimitScreenUpdates(boolean enable) { - video.width = width; - video.height = height; - video.depth = GetRealDepth(depth); - video.fullscreen_available = FULLSCREEN_STATUS; - video.fullscreen_enabled = FALSE; - -#ifdef TARGET_SDL - SDLInitVideoBuffer(backbuffer, window, fullscreen); -#else - X11InitVideoBuffer(backbuffer, window); -#endif + SDLLimitScreenUpdates(enable); } -inline Bitmap *CreateBitmapStruct(void) +void InitVideoDisplay(void) { -#ifdef TARGET_SDL - return checked_calloc(sizeof(struct SDLSurfaceInfo)); -#else - return checked_calloc(sizeof(struct X11DrawableInfo)); -#endif + SDLInitVideoDisplay(); } -inline Bitmap *CreateBitmap(int width, int height, int depth) +void CloseVideoDisplay(void) { - Bitmap *new_bitmap = CreateBitmapStruct(); - int real_depth = GetRealDepth(depth); - -#ifdef TARGET_SDL - SDL_Surface *surface_tmp, *surface_native; - - if ((surface_tmp = SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, - real_depth, 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - if ((surface_native = SDL_DisplayFormat(surface_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + KeyboardAutoRepeatOn(); - SDL_FreeSurface(surface_tmp); + SDL_QuitSubSystem(SDL_INIT_VIDEO); +} - new_bitmap->surface = surface_native; -#else - Pixmap pixmap; +void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) +{ + video.width = width; + video.height = height; + video.depth = GetRealDepth(depth); - if ((pixmap = XCreatePixmap(display, window->drawable, - width, height, real_depth)) - == None) - Error(ERR_EXIT, "cannot create pixmap"); + video.fullscreen_available = FULLSCREEN_STATUS; + video.fullscreen_enabled = FALSE; - new_bitmap->drawable = pixmap; + video.window_scaling_available = WINDOW_SCALING_STATUS; - if (window == NULL) - Error(ERR_EXIT, "Window GC needed for Bitmap -- create Window first"); + video.frame_delay = 0; + video.frame_delay_value = GAME_FRAME_DELAY; - new_bitmap->gc = window->gc; + video.shifted_up = FALSE; - new_bitmap->line_gc[0] = window->line_gc[0]; - new_bitmap->line_gc[1] = window->line_gc[1]; -#endif + SDLInitVideoBuffer(fullscreen); - new_bitmap->width = width; - new_bitmap->height = height; + video.initialized = TRUE; - return new_bitmap; + drawto = backbuffer; } inline static void FreeBitmapPointers(Bitmap *bitmap) @@ -382,33 +400,9 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) if (bitmap == NULL) return; -#ifdef TARGET_SDL - if (bitmap->surface) - 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 correspondig 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 + SDLFreeBitmapPointers(bitmap); - if (bitmap->source_filename) - free(bitmap->source_filename); + checked_free(bitmap->source_filename); bitmap->source_filename = NULL; } @@ -423,7 +417,7 @@ inline static void TransferBitmapPointers(Bitmap *src_bitmap, *dst_bitmap = *src_bitmap; } -inline void FreeBitmap(Bitmap *bitmap) +void FreeBitmap(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -433,20 +427,68 @@ inline void FreeBitmap(Bitmap *bitmap) free(bitmap); } -inline void CloseWindow(DrawWindow *window) +Bitmap *CreateBitmapStruct(void) +{ + return checked_calloc(sizeof(Bitmap)); +} + +Bitmap *CreateBitmap(int width, int height, int depth) { -#ifdef TARGET_X11 - if (window->drawable) + Bitmap *new_bitmap = CreateBitmapStruct(); + int real_width = MAX(1, width); /* prevent zero bitmap width */ + int real_height = MAX(1, height); /* prevent zero bitmap height */ + int real_depth = GetRealDepth(depth); + + SDLCreateBitmapContent(new_bitmap, real_width, real_height, real_depth); + + new_bitmap->width = real_width; + new_bitmap->height = real_height; + + return new_bitmap; +} + +void ReCreateBitmap(Bitmap **bitmap, int width, int height) +{ + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); + + if (*bitmap == NULL) { - XUnmapWindow(display, window->drawable); - XDestroyWindow(display, window->drawable); + *bitmap = new_bitmap; + } + else + { + TransferBitmapPointers(new_bitmap, *bitmap); + free(new_bitmap); } - if (window->gc) - XFreeGC(display, window->gc); -#endif } -static inline boolean CheckDrawingArea(int x, int y, int width, int height, +void CloseWindow(DrawWindow *window) +{ +} + +void SetRedrawMaskFromArea(int x, int y, int width, int height) +{ + int x1 = x; + int y1 = y; + int x2 = x + width - 1; + int y2 = y + height - 1; + + if (width == 0 || height == 0) + return; + + if (IN_GFX_FIELD_FULL(x1, y1) && IN_GFX_FIELD_FULL(x2, y2)) + redraw_mask |= REDRAW_FIELD; + else if (IN_GFX_DOOR_1(x1, y1) && IN_GFX_DOOR_1(x2, y2)) + redraw_mask |= REDRAW_DOOR_1; + else if (IN_GFX_DOOR_2(x1, y1) && IN_GFX_DOOR_2(x2, y2)) + redraw_mask |= REDRAW_DOOR_2; + else if (IN_GFX_DOOR_3(x1, y1) && IN_GFX_DOOR_3(x2, y2)) + redraw_mask |= REDRAW_DOOR_3; + else + redraw_mask = REDRAW_ALL; +} + +inline static boolean CheckDrawingArea(int x, int y, int width, int height, int draw_mask) { if (draw_mask == REDRAW_NONE) @@ -455,132 +497,246 @@ static inline boolean CheckDrawingArea(int x, int y, int width, int height, if (draw_mask & REDRAW_ALL) return TRUE; - if ((draw_mask & REDRAW_FIELD) && x < gfx.real_sx + gfx.full_sxsize) + if ((draw_mask & REDRAW_FIELD) && IN_GFX_FIELD_FULL(x, y)) return TRUE; - if ((draw_mask & REDRAW_DOOR_1) && x >= gfx.dx && y < gfx.dy + gfx.dysize) + if ((draw_mask & REDRAW_DOOR_1) && IN_GFX_DOOR_1(x, y)) return TRUE; - if ((draw_mask & REDRAW_DOOR_2) && x >= gfx.dx && y >= gfx.vy) + if ((draw_mask & REDRAW_DOOR_2) && IN_GFX_DOOR_2(x, y)) + return TRUE; + + if ((draw_mask & REDRAW_DOOR_3) && IN_GFX_DOOR_3(x, y)) return TRUE; return FALSE; } -inline boolean DrawingDeactivated(int x, int y, int width, int height) +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) +boolean DrawingOnBackground(int x, int y) { - return ((gfx.draw_background_mask & gfx.background_bitmap_mask) && + return (CheckDrawingArea(x, y, 1, 1, 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) +static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, + int *width, int *height, boolean is_dest) { + int clip_x, clip_y, clip_width, clip_height; + + if (gfx.clipping_enabled && is_dest) /* only clip destination bitmap */ + { + clip_x = MIN(MAX(0, gfx.clip_x), bitmap->width); + clip_y = MIN(MAX(0, gfx.clip_y), bitmap->height); + clip_width = MIN(MAX(0, gfx.clip_width), bitmap->width - clip_x); + clip_height = MIN(MAX(0, gfx.clip_height), bitmap->height - clip_y); + } + else + { + clip_x = 0; + clip_y = 0; + clip_width = bitmap->width; + clip_height = bitmap->height; + } + + /* skip if rectangle completely outside bitmap */ + + if (*x + *width <= clip_x || + *y + *height <= clip_y || + *x >= clip_x + clip_width || + *y >= clip_y + clip_height) + return FALSE; + + /* clip if rectangle overlaps bitmap */ + + if (*x < clip_x) + { + *width -= clip_x - *x; + *x = clip_x; + } + else if (*x + *width > clip_x + clip_width) + { + *width = clip_x + clip_width - *x; + } + + if (*y < clip_y) + { + *height -= clip_y - *y; + *y = clip_y; + } + else if (*y + *height > clip_y + clip_height) + { + *height = clip_y + clip_height - *y; + } + + return TRUE; +} + +void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) +{ + int dst_x_unclipped = dst_x; + int dst_y_unclipped = dst_y; + + if (src_bitmap == NULL || dst_bitmap == NULL) + return; + if (DrawingDeactivated(dst_x, dst_y, width, height)) return; -#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); + if (!InClippedRectangle(src_bitmap, &src_x, &src_y, &width, &height, FALSE) || + !InClippedRectangle(dst_bitmap, &dst_x, &dst_y, &width, &height, TRUE)) + return; + + /* source x/y might need adjustment if destination x/y was clipped top/left */ + src_x += dst_x - dst_x_unclipped; + src_y += dst_y - dst_y_unclipped; + +#if defined(TARGET_SDL2) + /* !!! 2013-12-11: An "old friend" is back. Same bug in SDL2 2.0.1 !!! */ + /* !!! 2009-03-30: Fixed by using self-compiled, patched SDL.dll !!! */ + /* (This bug still exists in the actual (as of 2009-06-15) version 1.2.13, + but is already fixed in SVN and should therefore finally be fixed with + the next official SDL release, which is probably version 1.2.14.) */ + /* !!! 2009-03-24: It seems that this problem still exists in 1.2.12 !!! */ + + if (src_bitmap == dst_bitmap) + { + /* needed when blitting directly to same bitmap -- should not be needed with + recent SDL libraries, but apparently does not work in 1.2.11 directly */ + + static Bitmap *tmp_bitmap = NULL; + static int tmp_bitmap_xsize = 0; + static int tmp_bitmap_ysize = 0; + + /* start with largest static bitmaps for initial bitmap size ... */ + if (tmp_bitmap_xsize == 0 && tmp_bitmap_ysize == 0) + { + tmp_bitmap_xsize = MAX(gfx.win_xsize, gfx.scrollbuffer_width); + tmp_bitmap_ysize = MAX(gfx.win_ysize, gfx.scrollbuffer_height); + } + + /* ... and allow for later re-adjustments due to custom artwork bitmaps */ + if (src_bitmap->width > tmp_bitmap_xsize || + src_bitmap->height > tmp_bitmap_ysize) + { + tmp_bitmap_xsize = MAX(tmp_bitmap_xsize, src_bitmap->width); + tmp_bitmap_ysize = MAX(tmp_bitmap_ysize, src_bitmap->height); + + FreeBitmap(tmp_bitmap); + + tmp_bitmap = NULL; + } + + if (tmp_bitmap == NULL) + tmp_bitmap = CreateBitmap(tmp_bitmap_xsize, tmp_bitmap_ysize, + DEFAULT_DEPTH); + + sysCopyArea(src_bitmap, tmp_bitmap, + src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); + sysCopyArea(tmp_bitmap, dst_bitmap, + dst_x, dst_y, width, height, dst_x, dst_y, BLIT_OPAQUE); + + return; + } #endif + + 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) +void BlitBitmapTiled(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int src_width, int src_height, + int dst_x, int dst_y, int dst_width, int dst_height) { - if (DrawingDeactivated(x, y, width, height)) - return; + int src_xsize = (src_width == 0 ? src_bitmap->width : src_width); + int src_ysize = (src_height == 0 ? src_bitmap->height : src_height); + int dst_xsize = dst_width; + int dst_ysize = dst_height; + int src_xsteps = (dst_xsize + src_xsize - 1) / src_xsize; + int src_ysteps = (dst_ysize + src_ysize - 1) / src_ysize; + int x, y; -#ifdef TARGET_SDL - SDLFillRectangle(bitmap, x, y, width, height, 0x000000); -#else - XFillRectangle(display, bitmap->drawable, bitmap->gc, x, y, width, height); -#endif + for (y = 0; y < src_ysteps; y++) + { + for (x = 0; x < src_xsteps; x++) + { + int draw_x = dst_x + x * src_xsize; + int draw_y = dst_y + y * src_ysize; + int draw_xsize = MIN(src_xsize, dst_xsize - x * src_xsize); + int draw_ysize = MIN(src_ysize, dst_ysize - y * src_ysize); + + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, draw_xsize, draw_ysize, + draw_x, draw_y); + } + } } -inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, - int width, int height) +void FadeRectangle(int x, int y, int width, int height, + int fade_mode, int fade_delay, int post_delay, + void (*draw_border_function)(void)) { - if (DrawingOnBackground(x, y)) - BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y); - else - ClearRectangle(bitmap, x, y, width, height); + /* (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) */ + if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE)) + return; + + SDLFadeRectangle(x, y, width, height, + fade_mode, fade_delay, post_delay, draw_border_function); } -#if 0 -#ifndef TARGET_SDL -static GC last_clip_gc = 0; /* needed for XCopyArea() through clip mask */ -#endif -#endif +void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height, + Pixel color) +{ + if (DrawingDeactivated(x, y, width, height)) + return; + + if (!InClippedRectangle(bitmap, &x, &y, &width, &height, TRUE)) + return; -inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap) + sysFillRectangle(bitmap, x, y, width, height, color); +} + +void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) { -#ifdef TARGET_X11 - if (clip_gc) - { - bitmap->clip_gc = clip_gc; - XSetClipMask(display, bitmap->clip_gc, clip_pixmap); - } -#if 0 - last_clip_gc = clip_gc; -#endif -#endif + FillRectangle(bitmap, x, y, width, height, BLACK_PIXEL); } -inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) +void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, + int width, int height) { -#ifdef TARGET_X11 - if (clip_gc) - { - bitmap->clip_gc = clip_gc; - XSetClipOrigin(display, bitmap->clip_gc, clip_x, clip_y); - } -#if 0 - last_clip_gc = clip_gc; -#endif -#endif + if (DrawingOnBackground(x, y)) + BlitBitmap(gfx.background_bitmap, bitmap, x, y, width, height, x, y); + else + ClearRectangle(bitmap, x, y, width, height); } -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) +void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) { if (DrawingDeactivated(dst_x, dst_y, width, height)) return; -#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 + sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, + dst_x, dst_y, BLIT_MASKED); } -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) +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(src_x, src_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); } @@ -589,27 +745,76 @@ inline void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, dst_x, dst_y); } -inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, - int to_x, int to_y) +void BlitTexture(Bitmap *bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) { -#ifdef TARGET_SDL - 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 (bitmap == NULL) + return; + + SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y, + BLIT_OPAQUE); } -#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) +void BlitTextureMasked(Bitmap *bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) +{ + if (bitmap == NULL) + return; + + SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y, + BLIT_MASKED); +} + +void BlitToScreen(Bitmap *bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) +{ + if (bitmap == NULL) + return; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP) + BlitBitmap(bitmap, gfx.final_screen_bitmap, src_x, src_y, + width, height, dst_x, dst_y); + else + BlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y); +} + +void BlitToScreenMasked(Bitmap *bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) +{ + if (bitmap == NULL) + return; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP) + BlitBitmapMasked(bitmap, gfx.final_screen_bitmap, src_x, src_y, + width, height, dst_x, dst_y); + else + BlitTextureMasked(bitmap, src_x, src_y, width, height, dst_x, dst_y); +} + +void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y) +{ + SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, BLACK_PIXEL); +} + +void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y, + int to_x, int to_y) +{ + SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); +} + +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) +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); - /* - XSetForeground(display, gc, BlackPixel(display, screen)); - */ -#endif } -inline Pixel GetPixel(Bitmap *bitmap, int x, int y) +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 - unsigned long pixel_value; - XImage *pixel_image; - - pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1, - AllPlanes, ZPixmap); - pixel_value = XGetPixel(pixel_image, 0, 0); - - XDestroyImage(pixel_image); + if (x < 0 || x >= bitmap->width || + y < 0 || y >= bitmap->height) + return BLACK_PIXEL; - return pixel_value; -#endif + return SDLGetPixel(bitmap, x, y); } -inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, - unsigned int color_g, unsigned int color_b) +Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, + unsigned int color_g, unsigned int color_b) { - Pixel pixel; - -#if defined(TARGET_SDL) - pixel = SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); -#elif defined(TARGET_ALLEGRO) - pixel = AllegroAllocColorCell(color_r << 8, color_g << 8, color_b << 8); -#elif defined(TARGET_X11_NATIVE) - XColor xcolor; - - xcolor.flags = DoRed | DoGreen | DoBlue; - xcolor.red = (color_r << 8); - xcolor.green = (color_g << 8); - xcolor.blue = (color_b << 8); - XAllocColor(display, cmap, &xcolor); - pixel = xcolor.pixel; -#endif - - return pixel; + return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); } -inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) +Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) { unsigned int color_r = (color >> 16) & 0xff; unsigned int color_g = (color >> 8) & 0xff; @@ -708,90 +869,47 @@ inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) return GetPixelFromRGB(bitmap, color_r, color_g, color_b); } -/* execute all pending screen drawing operations */ -inline void FlushDisplay(void) -{ -#ifndef TARGET_SDL - XFlush(display); -#endif -} - -/* execute and wait for all pending screen drawing operations */ -inline void SyncDisplay(void) -{ -#ifndef TARGET_SDL - XSync(display, FALSE); -#endif -} - -inline void KeyboardAutoRepeatOn(void) +void KeyboardAutoRepeatOn(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL2) + keyrepeat_status = TRUE; +#else SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, SDL_DEFAULT_REPEAT_INTERVAL / 2); SDL_EnableUNICODE(1); -#else - if (display) - XAutoRepeatOn(display); #endif } -inline void KeyboardAutoRepeatOff(void) +void KeyboardAutoRepeatOff(void) { -#ifdef TARGET_SDL +#if defined(TARGET_SDL2) + keyrepeat_status = FALSE; +#else SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); SDL_EnableUNICODE(0); -#else - if (display) - XAutoRepeatOff(display); #endif } -inline boolean PointerInWindow(DrawWindow *window) +boolean SetVideoMode(boolean fullscreen) { -#ifdef TARGET_SDL - return TRUE; -#else - Window root, child; - int root_x, root_y; - unsigned int mask; - int win_x, win_y; - - /* if XQueryPointer() returns False, the pointer - is not on the same screen as the specified window */ - return XQueryPointer(display, window->drawable, &root, &child, - &root_x, &root_y, &win_x, &win_y, &mask); -#endif + return SDLSetVideoMode(fullscreen); } -inline boolean SetVideoMode(boolean fullscreen) +void SetVideoFrameDelay(unsigned int frame_delay_value) { -#ifdef TARGET_SDL - return SDLSetVideoMode(&backbuffer, fullscreen); -#else - boolean success = TRUE; - - if (fullscreen && video.fullscreen_available) - { - Error(ERR_WARN, "fullscreen not available in X11 version"); - - /* display error message only once */ - video.fullscreen_available = FALSE; - - success = FALSE; - } + video.frame_delay_value = frame_delay_value; +} - return success; -#endif +unsigned int GetVideoFrameDelay() +{ + return video.frame_delay_value; } -inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) +boolean ChangeVideoModeIfNeeded(boolean fullscreen) { -#ifdef TARGET_SDL if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)|| (!fullscreen && video.fullscreen_enabled)) fullscreen = SetVideoMode(fullscreen); -#endif return fullscreen; } @@ -800,11 +918,7 @@ Bitmap *LoadImage(char *filename) { Bitmap *new_bitmap; -#if defined(TARGET_SDL) new_bitmap = SDLLoadImage(filename); -#else - new_bitmap = X11LoadImage(filename); -#endif if (new_bitmap) new_bitmap->source_filename = getStringCopy(filename); @@ -821,7 +935,7 @@ Bitmap *LoadCustomImage(char *basename) Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename); if ((new_bitmap = LoadImage(filename)) == NULL) - Error(ERR_EXIT, "LoadImage() failed: %s", GetError()); + Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError()); return new_bitmap; } @@ -837,7 +951,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) return; } - if (strcmp(filename, bitmap->source_filename) == 0) + if (strEqual(filename, bitmap->source_filename)) { /* 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 @@ -848,7 +962,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) if ((new_bitmap = LoadImage(filename)) == NULL) { - Error(ERR_WARN, "LoadImage() failed: %s", GetError()); + Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError()); return; } @@ -865,17 +979,375 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) free(new_bitmap); } -Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) +static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) +{ + return SDLZoomBitmap(src_bitmap, zoom_width, zoom_height); +} + +void ReCreateGameTileSizeBitmap(Bitmap **bitmaps) +{ + if (bitmaps[IMG_BITMAP_CUSTOM]) + { + FreeBitmap(bitmaps[IMG_BITMAP_CUSTOM]); + + bitmaps[IMG_BITMAP_CUSTOM] = NULL; + } + + if (gfx.game_tile_size == gfx.standard_tile_size) + { + bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD]; + + return; + } + + Bitmap *bitmap = bitmaps[IMG_BITMAP_STANDARD]; + int width = bitmap->width * gfx.game_tile_size / gfx.standard_tile_size;; + int height = bitmap->height * gfx.game_tile_size / gfx.standard_tile_size;; + + Bitmap *bitmap_new = ZoomBitmap(bitmap, width, height); + + bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new; + bitmaps[IMG_BITMAP_GAME] = bitmap_new; +} + +static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, + int tile_size, boolean create_small_bitmaps) +{ + Bitmap *old_bitmap = bitmaps[IMG_BITMAP_STANDARD]; + Bitmap *tmp_bitmap_final = NULL; + Bitmap *tmp_bitmap_0 = NULL; + Bitmap *tmp_bitmap_1 = NULL; + Bitmap *tmp_bitmap_2 = NULL; + Bitmap *tmp_bitmap_4 = NULL; + Bitmap *tmp_bitmap_8 = NULL; + Bitmap *tmp_bitmap_16 = NULL; + Bitmap *tmp_bitmap_32 = NULL; + int width_final, height_final; + int width_0, height_0; + int width_1, height_1; + int width_2, height_2; + int width_4, height_4; + int width_8, height_8; + int width_16, height_16; + int width_32, height_32; + int old_width, old_height; + int i; + + print_timestamp_init("CreateScaledBitmaps"); + + old_width = old_bitmap->width; + old_height = old_bitmap->height; + + /* calculate new image dimensions for final image size */ + width_final = old_width * zoom_factor; + height_final = old_height * zoom_factor; + + /* get image with final size (this might require scaling up) */ + /* ("final" size may result in non-standard tile size image) */ + if (zoom_factor != 1) + tmp_bitmap_final = ZoomBitmap(old_bitmap, width_final, height_final); + else + tmp_bitmap_final = old_bitmap; + + UPDATE_BUSY_STATE(); + + width_0 = width_1 = width_final; + height_0 = height_1 = height_final; + + tmp_bitmap_0 = tmp_bitmap_1 = tmp_bitmap_final; + + if (create_small_bitmaps) + { + /* check if we have a non-gameplay tile size image */ + if (tile_size != gfx.game_tile_size) + { + /* get image with gameplay tile size */ + width_0 = width_final * gfx.game_tile_size / tile_size; + height_0 = height_final * gfx.game_tile_size / tile_size; + + if (width_0 == old_width) + tmp_bitmap_0 = old_bitmap; + else if (width_0 == width_final) + tmp_bitmap_0 = tmp_bitmap_final; + else + tmp_bitmap_0 = ZoomBitmap(old_bitmap, width_0, height_0); + + UPDATE_BUSY_STATE(); + } + + /* check if we have a non-standard tile size image */ + if (tile_size != gfx.standard_tile_size) + { + /* get image with standard tile size */ + width_1 = width_final * gfx.standard_tile_size / tile_size; + height_1 = height_final * gfx.standard_tile_size / tile_size; + + if (width_1 == old_width) + tmp_bitmap_1 = old_bitmap; + else if (width_1 == width_final) + tmp_bitmap_1 = tmp_bitmap_final; + else if (width_1 == width_0) + tmp_bitmap_1 = tmp_bitmap_0; + else + tmp_bitmap_1 = ZoomBitmap(old_bitmap, width_1, height_1); + + UPDATE_BUSY_STATE(); + } + + /* calculate new image dimensions for small images */ + width_2 = width_1 / 2; + height_2 = height_1 / 2; + width_4 = width_1 / 4; + height_4 = height_1 / 4; + width_8 = width_1 / 8; + height_8 = height_1 / 8; + width_16 = width_1 / 16; + height_16 = height_1 / 16; + width_32 = width_1 / 32; + height_32 = height_1 / 32; + + /* get image with 1/2 of normal size (for use in the level editor) */ + if (width_2 == old_width) + tmp_bitmap_2 = old_bitmap; + else + tmp_bitmap_2 = ZoomBitmap(tmp_bitmap_1, width_2, height_2); + + UPDATE_BUSY_STATE(); + + /* get image with 1/4 of normal size (for use in the level editor) */ + if (width_4 == old_width) + tmp_bitmap_4 = old_bitmap; + else + tmp_bitmap_4 = ZoomBitmap(tmp_bitmap_2, width_4, height_4); + + UPDATE_BUSY_STATE(); + + /* get image with 1/8 of normal size (for use on the preview screen) */ + if (width_8 == old_width) + tmp_bitmap_8 = old_bitmap; + else + tmp_bitmap_8 = ZoomBitmap(tmp_bitmap_4, width_8, height_8); + + UPDATE_BUSY_STATE(); + + /* get image with 1/16 of normal size (for use on the preview screen) */ + if (width_16 == old_width) + tmp_bitmap_16 = old_bitmap; + else + tmp_bitmap_16 = ZoomBitmap(tmp_bitmap_8, width_16, height_16); + + UPDATE_BUSY_STATE(); + + /* get image with 1/32 of normal size (for use on the preview screen) */ + if (width_32 == old_width) + tmp_bitmap_32 = old_bitmap; + else + tmp_bitmap_32 = ZoomBitmap(tmp_bitmap_16, width_32, height_32); + + UPDATE_BUSY_STATE(); + + bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1; + bitmaps[IMG_BITMAP_16x16] = tmp_bitmap_2; + bitmaps[IMG_BITMAP_8x8] = tmp_bitmap_4; + bitmaps[IMG_BITMAP_4x4] = tmp_bitmap_8; + bitmaps[IMG_BITMAP_2x2] = tmp_bitmap_16; + bitmaps[IMG_BITMAP_1x1] = tmp_bitmap_32; + + if (width_0 != width_1) + bitmaps[IMG_BITMAP_CUSTOM] = tmp_bitmap_0; + + if (bitmaps[IMG_BITMAP_CUSTOM]) + bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_CUSTOM]; + else + bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD]; + + boolean free_old_bitmap = TRUE; + + for (i = 0; i < NUM_IMG_BITMAPS; i++) + if (bitmaps[i] == old_bitmap) + free_old_bitmap = FALSE; + + if (free_old_bitmap) + FreeBitmap(old_bitmap); + } + else + { + bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1; + } + + UPDATE_BUSY_STATE(); + + print_timestamp_done("CreateScaledBitmaps"); +} + +void CreateBitmapWithSmallBitmaps(Bitmap **bitmaps, int zoom_factor, + int tile_size) +{ + CreateScaledBitmaps(bitmaps, zoom_factor, tile_size, TRUE); +} + +void CreateBitmapTextures(Bitmap **bitmaps) { - Bitmap *dst_bitmap = CreateBitmap(zoom_width, zoom_height, DEFAULT_DEPTH); + SDLCreateBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]); +} + +void FreeBitmapTextures(Bitmap **bitmaps) +{ + SDLFreeBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]); +} + +void ScaleBitmap(Bitmap **bitmaps, int zoom_factor) +{ + CreateScaledBitmaps(bitmaps, zoom_factor, 0, FALSE); +} -#if defined(TARGET_SDL) - SDLZoomBitmap(src_bitmap, dst_bitmap); + +/* ------------------------------------------------------------------------- */ +/* mouse pointer functions */ +/* ------------------------------------------------------------------------- */ + +#define USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER 0 + +/* XPM image definitions */ +static const char *cursor_image_none[] = +{ + /* width height num_colors chars_per_pixel */ + " 16 16 3 1", + + /* colors */ + "X c #000000", + ". c #ffffff", + " c None", + + /* pixels */ + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + + /* hot spot */ + "0,0" +}; + +#if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER +static const char *cursor_image_dot[] = +{ + /* width height num_colors chars_per_pixel */ + " 16 16 3 1", + + /* colors */ + "X c #000000", + ". c #ffffff", + " c None", + + /* pixels */ + " X ", + "X.X ", + " X ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + " ", + + /* hot spot */ + "1,1" +}; +static const char **cursor_image_playfield = cursor_image_dot; #else - X11ZoomBitmap(src_bitmap, dst_bitmap); +/* some people complained about a "white dot" on the screen and thought it + was a graphical error... OK, let's just remove the whole pointer :-) */ +static const char **cursor_image_playfield = cursor_image_none; #endif - return dst_bitmap; +static const int cursor_bit_order = BIT_ORDER_MSB; + +static struct MouseCursorInfo *get_cursor_from_image(const char **image) +{ + struct MouseCursorInfo *cursor; + boolean bit_order_msb = (cursor_bit_order == BIT_ORDER_MSB); + int header_lines = 4; + int x, y, i; + + cursor = checked_calloc(sizeof(struct MouseCursorInfo)); + + sscanf(image[0], " %d %d ", &cursor->width, &cursor->height); + + i = -1; + for (y = 0; y < cursor->width; y++) + { + for (x = 0; x < cursor->height; x++) + { + int bit_nr = x % 8; + int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr ); + + if (bit_nr == 0) + { + i++; + cursor->data[i] = cursor->mask[i] = 0; + } + + switch (image[header_lines + y][x]) + { + case 'X': + cursor->data[i] |= bit_mask; + cursor->mask[i] |= bit_mask; + break; + + case '.': + cursor->mask[i] |= bit_mask; + break; + + case ' ': + break; + } + } + } + + sscanf(image[header_lines + y], "%d,%d", &cursor->hot_x, &cursor->hot_y); + + return cursor; +} + +void SetMouseCursor(int mode) +{ + static struct MouseCursorInfo *cursor_none = NULL; + static struct MouseCursorInfo *cursor_playfield = NULL; + struct MouseCursorInfo *cursor_new; + + if (cursor_none == NULL) + cursor_none = get_cursor_from_image(cursor_image_none); + + if (cursor_playfield == NULL) + cursor_playfield = get_cursor_from_image(cursor_image_playfield); + + cursor_new = (mode == CURSOR_DEFAULT ? NULL : + mode == CURSOR_NONE ? cursor_none : + mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); + + SDLSetMouseCursor(cursor_new); + + gfx.cursor_mode = mode; } @@ -883,7 +1355,7 @@ Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) /* audio functions */ /* ========================================================================= */ -inline void OpenAudio(void) +void OpenAudio(void) { /* always start with reliable default values */ audio.sound_available = FALSE; @@ -894,7 +1366,7 @@ inline void OpenAudio(void) audio.sound_deactivated = FALSE; audio.mixer_pipe[0] = audio.mixer_pipe[1] = 0; - audio.mixer_pid = -1; + audio.mixer_pid = 0; audio.device_name = NULL; audio.device_fd = -1; @@ -902,29 +1374,17 @@ inline void OpenAudio(void) 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) +void CloseAudio(void) { -#if defined(TARGET_SDL) SDLCloseAudio(); -#elif defined(PLATFORM_UNIX) - UnixCloseAudio(); -#elif defined(PLATFORM_MSDOS) - MSDOSCloseAudio(); -#endif audio.sound_enabled = FALSE; } -inline void SetAudioMode(boolean enabled) +void SetAudioMode(boolean enabled) { if (!audio.sound_available) return; @@ -937,36 +1397,43 @@ inline void SetAudioMode(boolean enabled) /* event functions */ /* ========================================================================= */ -inline void InitEventFilter(EventFilter filter_function) +void InitEventFilter(EventFilter filter_function) { -#ifdef TARGET_SDL /* set event filter to filter out certain events */ +#if defined(TARGET_SDL2) + SDL_SetEventFilter(filter_function, NULL); +#else SDL_SetEventFilter(filter_function); #endif } -inline boolean PendingEvent(void) +boolean PendingEvent(void) { -#ifdef TARGET_SDL return (SDL_PollEvent(NULL) ? TRUE : FALSE); -#else - return (XPending(display) ? TRUE : FALSE); -#endif } -inline void NextEvent(Event *event) +void NextEvent(Event *event) { -#ifdef TARGET_SDL SDLNextEvent(event); +} + +void PeekEvent(Event *event) +{ +#if defined(TARGET_SDL2) + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT); #else - XNextEvent(display, event); + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); #endif } -inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) +Key GetEventKey(KeyEvent *event, boolean with_modifiers) { -#ifdef TARGET_SDL -#if 0 +#if defined(TARGET_SDL2) + /* key up/down events in SDL2 do not return text characters anymore */ + return event->keysym.sym; +#else + +#if ENABLE_UNUSED_CODE printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", (int)event->keysym.unicode, (int)event->keysym.sym, @@ -979,34 +1446,102 @@ inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) return event->keysym.unicode; else return event->keysym.sym; -#else -#if 0 - printf("with modifiers == '0x%04x', without modifiers == '0x%04x'\n", - (int)XLookupKeysym(event, event->state), - (int)XLookupKeysym(event, 0)); + #endif +} - if (with_modifiers) - return XLookupKeysym(event, event->state); - else - return XLookupKeysym(event, 0); +KeyMod HandleKeyModState(Key key, int key_status) +{ + static KeyMod current_modifiers = KMOD_None; + + if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */ + { + KeyMod new_modifier = KMOD_None; + + switch(key) + { + case KSYM_Shift_L: + new_modifier = KMOD_Shift_L; + break; + case KSYM_Shift_R: + new_modifier = KMOD_Shift_R; + break; + case KSYM_Control_L: + new_modifier = KMOD_Control_L; + break; + case KSYM_Control_R: + new_modifier = KMOD_Control_R; + break; + case KSYM_Meta_L: + new_modifier = KMOD_Meta_L; + break; + case KSYM_Meta_R: + new_modifier = KMOD_Meta_R; + break; + case KSYM_Alt_L: + new_modifier = KMOD_Alt_L; + break; + case KSYM_Alt_R: + new_modifier = KMOD_Alt_R; + break; + default: + break; + } + + if (key_status == KEY_PRESSED) + current_modifiers |= new_modifier; + else + current_modifiers &= ~new_modifier; + } + + return current_modifiers; +} + +KeyMod GetKeyModState() +{ + return (KeyMod)SDL_GetModState(); +} + +KeyMod GetKeyModStateFromEvents() +{ + /* always use key modifier state as tracked from key events (this is needed + if the modifier key event was injected into the event queue, but the key + was not really pressed on keyboard -- SDL_GetModState() seems to directly + query the keys as held pressed on the keyboard) -- this case is currently + only used to filter out clipboard insert events from "True X-Mouse" tool */ + + return HandleKeyModState(KSYM_UNDEFINED, 0); +} + +void StartTextInput(int x, int y) +{ +#if defined(TARGET_SDL2) + SDL_StartTextInput(); + +#if defined(HAS_SCREEN_KEYBOARD) + if (y > video.height / 2) + video.shifted_up = TRUE; +#endif +#endif +} + +void StopTextInput() +{ +#if defined(TARGET_SDL2) + SDL_StopTextInput(); + +#if defined(HAS_SCREEN_KEYBOARD) + video.shifted_up = FALSE; +#endif #endif } -inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) +boolean CheckCloseWindowEvent(ClientMessageEvent *event) { if (event->type != EVENT_CLIENTMESSAGE) return FALSE; -#if defined(TARGET_SDL) return TRUE; /* the only possible message here is SDL_QUIT */ -#elif defined(PLATFORM_UNIX) - if ((event->window == window->drawable) && - (event->data.l[0] == XInternAtom(display, "WM_DELETE_WINDOW", FALSE))) - return TRUE; -#endif - - return FALSE; } @@ -1014,35 +1549,23 @@ inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) /* joystick functions */ /* ========================================================================= */ -inline void InitJoysticks() +void InitJoysticks() { int i; -#ifdef NO_JOYSTICK +#if defined(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