X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=b6cdf649725b3fd08feccd44f152430e4a3069ca;hp=96adfcfebc88f2a50b5dd10670c805136593e617;hb=c38790fcee093efb156366bb4a02dbde55085ca4;hpb=34ca525d659f14cec647449f4be8ee009a5bc267 diff --git a/src/libgame/system.c b/src/libgame/system.c index 96adfcfe..15e86a4a 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -1,53 +1,53 @@ -/*********************************************************** -* 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 */ -/* ========================================================================= */ +// ============================================================================ +// exported variables +// ============================================================================ struct ProgramInfo program; +struct NetworkInfo network; +struct RuntimeInfo runtime; struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +struct TileCursorInfo tile_cursor; +struct OverlayInfo overlay; 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 LevelSetInfo levelset; +struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; DrawBuffer *backbuffer = NULL; @@ -55,76 +55,145 @@ DrawBuffer *drawto = NULL; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; +int wheel_steps = DEFAULT_WHEEL_STEPS; +boolean keyrepeat_status = TRUE; int redraw_mask = REDRAW_NONE; -int redraw_tiles = 0; int FrameCounter = 0; -/* ========================================================================= */ -/* init/close functions */ -/* ========================================================================= */ +// ============================================================================ +// init/close functions +// ============================================================================ -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_cursor_filename, - char *cookie_prefix, char *filename_prefix, - int program_version) +void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, + char *program_title, char *icon_title, + char *icon_filename, char *cookie_prefix, + char *program_version_string, 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.userdata_directory = userdata_directory; program.program_title = program_title; - program.window_title = window_title; + program.window_title = "(undefined)"; program.icon_title = icon_title; - program.x11_icon_filename = x11_icon_filename; - program.x11_iconmask_filename = x11_iconmask_filename; - program.msdos_cursor_filename = msdos_cursor_filename; + + program.icon_filename = icon_filename; program.cookie_prefix = cookie_prefix; - program.filename_prefix = filename_prefix; + program.version_super = VERSION_SUPER(program_version); program.version_major = VERSION_MAJOR(program_version); program.version_minor = VERSION_MINOR(program_version); program.version_patch = VERSION_PATCH(program_version); + program.version_ident = program_version; + + program.version_string = program_version_string; + + 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; + + program.headless = FALSE; +} + +void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly, + char *server_host, int server_port) +{ + network.enabled = enabled; + network.connected = connected; + network.serveronly = serveronly; + + network.server_host = server_host; + network.server_port = server_port; +} + +void InitRuntimeInfo() +{ + runtime.uses_touch_device = FALSE; +} + +void InitScoresInfo(void) +{ + char *global_scores_dir = getPath2(getCommonDataDir(), SCORES_DIRECTORY); + + program.global_scores = directoryExists(global_scores_dir); + program.many_scores_per_name = !program.global_scores; + +#if 0 + if (options.debug) + { + if (program.global_scores) + { + Error(ERR_DEBUG, "Using global, multi-user scores directory '%s'.", + global_scores_dir); + Error(ERR_DEBUG, "Remove to enable single-user scores directory."); + Error(ERR_DEBUG, "(This enables multipe score entries per user.)"); + } + else + { + Error(ERR_DEBUG, "Using private, single-user scores directory."); + } + } +#endif + + free(global_scores_dir); +} + +void SetWindowTitle(void) +{ + 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)) { program.exit_function = exit_function; - /* set signal handlers to custom exit function */ - signal(SIGINT, 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() */ + // set exit function to automatically cleanup SDL stuff after exit() atexit(SDL_Quit); -#endif } void InitPlatformDependentStuff(void) { -#if defined(PLATFORM_MSDOS) - _fmode = O_BINARY; - initErrorFile(); -#endif + // this is initialized in GetOptions(), but may already be used before + options.verbose = TRUE; + + OpenLogFiles(); + + int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE; -#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 + + SDLNet_Init(); } void ClosePlatformDependentStuff(void) { -#if defined(PLATFORM_MSDOS) - dumpErrorFile(); -#endif + CloseLogFiles(); } void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, @@ -143,11 +212,14 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int 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 +} - 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) @@ -166,217 +238,364 @@ 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); + + ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize); + + 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 */ + // 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; + gfx.draw_global_anim_function = draw_global_anim_function; +} + +void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int)) +{ + gfx.draw_global_border_function = draw_global_border_function; +} + +void InitGfxDrawTileCursorFunction(void (*draw_tile_cursor_function)(int)) +{ + gfx.draw_tile_cursor_function = draw_tile_cursor_function; +} + +void InitGfxCustomArtworkInfo(void) +{ + gfx.override_level_graphics = FALSE; + gfx.override_level_sounds = FALSE; + gfx.override_level_music = FALSE; + + gfx.draw_init_text = TRUE; +} + +void InitGfxOtherSettings(void) +{ + gfx.cursor_mode = CURSOR_DEFAULT; + gfx.mouse_x = 0; + gfx.mouse_y = 0; +} + +void InitTileCursorInfo(void) +{ + tile_cursor.enabled = FALSE; + tile_cursor.active = FALSE; + tile_cursor.moving = FALSE; + + tile_cursor.xpos = 0; + tile_cursor.ypos = 0; + tile_cursor.x = 0; + tile_cursor.y = 0; + tile_cursor.target_x = 0; + tile_cursor.target_y = 0; + + tile_cursor.sx = 0; + tile_cursor.sy = 0; +} + +void InitOverlayInfo(void) +{ + int nr = GRID_ACTIVE_NR(); 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); + overlay.enabled = FALSE; + overlay.active = FALSE; - BlitBitmap(tile, bitmap, 0, 0, draw_xsize, draw_ysize, draw_x, draw_y); - } - } + overlay.show_grid = FALSE; + + overlay.grid_xsize = setup.touch.grid_xsize[nr]; + overlay.grid_ysize = setup.touch.grid_ysize[nr]; + + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + overlay.grid_button[x][y] = setup.touch.grid_button[nr][x][y]; + + overlay.grid_button_highlight = CHAR_GRID_BUTTON_NONE; + overlay.grid_button_action = JOY_NO_ACTION; + +#if defined(USE_TOUCH_INPUT_OVERLAY) + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) + overlay.enabled = TRUE; +#endif } -void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +void SetTileCursorEnabled(boolean enabled) { - static Bitmap *main_bitmap_tile = NULL; - static Bitmap *door_bitmap_tile = NULL; + tile_cursor.enabled = enabled; +} - if (mask == REDRAW_FIELD) - { - if (background_bitmap_tile == main_bitmap_tile) - return; /* main background tile has not changed */ +void SetTileCursorActive(boolean active) +{ + tile_cursor.active = active; +} - 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 SetTileCursorTargetXY(int x, int y) +{ + // delayed placement of tile selection cursor at target position + // (tile cursor will be moved to target position step by step) - door_bitmap_tile = background_bitmap_tile; - } - else /* should not happen */ - return; + tile_cursor.xpos = x; + tile_cursor.ypos = y; + tile_cursor.target_x = tile_cursor.sx + x * gfx.game_tile_size; + tile_cursor.target_y = tile_cursor.sy + y * gfx.game_tile_size; + + tile_cursor.moving = TRUE; +} + +void SetTileCursorXY(int x, int y) +{ + // immediate placement of tile selection cursor at target position + + SetTileCursorTargetXY(x, y); + + tile_cursor.x = tile_cursor.target_x; + tile_cursor.y = tile_cursor.target_y; + + tile_cursor.moving = FALSE; +} + +void SetTileCursorSXSY(int sx, int sy) +{ + tile_cursor.sx = sx; + tile_cursor.sy = sy; +} + +void SetOverlayEnabled(boolean enabled) +{ + overlay.enabled = enabled; +} + +void SetOverlayActive(boolean active) +{ + overlay.active = active; +} + +void SetOverlayShowGrid(boolean show_grid) +{ + overlay.show_grid = show_grid; + + SetOverlayActive(show_grid); + + if (show_grid) + SetOverlayEnabled(TRUE); +} + +boolean GetOverlayEnabled(void) +{ + return overlay.enabled; +} + +boolean GetOverlayActive(void) +{ + return overlay.active; +} + +void SetDrawDeactivationMask(int draw_deactivation_mask) +{ + gfx.draw_deactivation_mask = draw_deactivation_mask; +} + +int GetDrawDeactivationMask(void) +{ + return gfx.draw_deactivation_mask; +} + +void SetDrawBackgroundMask(int draw_background_mask) +{ + gfx.draw_background_mask = draw_background_mask; +} - if (background_bitmap_tile) +static 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 */ + 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); } -/* ========================================================================= */ -/* video functions */ -/* ========================================================================= */ +// ============================================================================ +// video functions +// ============================================================================ -inline static int GetRealDepth(int depth) +static int GetRealDepth(int depth) { return (depth == DEFAULT_DEPTH ? video.default_depth : depth); } -inline static void sysFillRectangle(Bitmap *bitmap, int x, int y, - int width, int height, Pixel color) +static void sysFillRectangle(Bitmap *bitmap, int x, int y, + int width, int height, Pixel color) { -#if defined(TARGET_SDL) SDLFillRectangle(bitmap, x, y, width, height, color); -#else - X11FillRectangle(bitmap, x, y, width, height, color); -#endif + + if (bitmap == backbuffer) + SetRedrawMaskFromArea(x, y, width, height); } -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) +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) { -#if defined(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 + + if (dst_bitmap == backbuffer) + SetRedrawMaskFromArea(dst_x, dst_y, width, height); } -inline void InitVideoDisplay(void) +void LimitScreenUpdates(boolean enable) { -#if defined(TARGET_SDL) + SDLLimitScreenUpdates(enable); +} + +void InitVideoDefaults(void) +{ + video.default_depth = 32; +} + +void InitVideoDisplay(void) +{ + if (program.headless) + return; + SDLInitVideoDisplay(); -#else - X11InitVideoDisplay(); -#endif + SDLSetDisplaySize(); } -inline void CloseVideoDisplay(void) +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) +void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) { video.width = width; video.height = height; video.depth = GetRealDepth(depth); + + video.screen_width = width; + video.screen_height = height; + video.screen_xoffset = 0; + video.screen_yoffset = 0; + video.fullscreen_available = FULLSCREEN_STATUS; video.fullscreen_enabled = FALSE; -#if defined(TARGET_SDL) - SDLInitVideoBuffer(backbuffer, window, fullscreen); -#else - X11InitVideoBuffer(backbuffer, window); -#endif -} + video.window_scaling_available = WINDOW_SCALING_STATUS; -inline Bitmap *CreateBitmapStruct(void) -{ -#if defined(TARGET_SDL) - return checked_calloc(sizeof(struct SDLSurfaceInfo)); -#else - return checked_calloc(sizeof(struct X11DrawableInfo)); -#endif -} + video.frame_delay = 0; + video.frame_delay_value = GAME_FRAME_DELAY; -inline Bitmap *CreateBitmap(int width, int height, int depth) -{ - Bitmap *new_bitmap = CreateBitmapStruct(); - int real_depth = GetRealDepth(depth); + video.shifted_up = FALSE; + video.shifted_up_pos = 0; + video.shifted_up_pos_last = 0; + video.shifted_up_delay = 0; + video.shifted_up_delay_value = ONE_SECOND_DELAY / 4; -#if defined(TARGET_SDL) - SDLCreateBitmapContent(new_bitmap, width, height, real_depth); -#else - X11CreateBitmapContent(new_bitmap, width, height, real_depth); -#endif + SDLInitVideoBuffer(fullscreen); - new_bitmap->width = width; - new_bitmap->height = height; + video.initialized = !program.headless; - return new_bitmap; + drawto = backbuffer; } -inline static void FreeBitmapPointers(Bitmap *bitmap) +static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; -#if defined(TARGET_SDL) SDLFreeBitmapPointers(bitmap); -#else - X11FreeBitmapPointers(bitmap); -#endif - if (bitmap->source_filename) - free(bitmap->source_filename); + checked_free(bitmap->source_filename); bitmap->source_filename = NULL; } -inline static void TransferBitmapPointers(Bitmap *src_bitmap, - Bitmap *dst_bitmap) +static void TransferBitmapPointers(Bitmap *src_bitmap, + Bitmap *dst_bitmap) { if (src_bitmap == NULL || dst_bitmap == NULL) return; @@ -386,7 +605,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; @@ -396,21 +615,83 @@ 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) +{ + 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) { -#if defined(TARGET_X11) - if (window->drawable) + if (*bitmap != NULL) { - XUnmapWindow(display, window->drawable); - XDestroyWindow(display, window->drawable); + // if new bitmap size fits into old one, no need to re-create it + if (width <= (*bitmap)->width && + height <= (*bitmap)->height) + return; + + // else adjust size so that old and new bitmap size fit into it + width = MAX(width, (*bitmap)->width); + height = MAX(height, (*bitmap)->height); } - if (window->gc) - XFreeGC(display, window->gc); + + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); + + if (*bitmap == NULL) + { + *bitmap = new_bitmap; + } + else + { + TransferBitmapPointers(new_bitmap, *bitmap); + free(new_bitmap); + } +} + +#if 0 +static void CloseWindow(DrawWindow *window) +{ +} #endif + +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; } -static inline boolean CheckDrawingArea(int x, int y, int width, int height, - int draw_mask) +static boolean CheckDrawingArea(int x, int y, int width, int height, + int draw_mask) { if (draw_mask == REDRAW_NONE) return FALSE; @@ -418,56 +699,229 @@ 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; +} + +boolean DrawingDeactivatedField(void) +{ + if (program.headless) + return TRUE; + + if (gfx.draw_deactivation_mask & REDRAW_FIELD) 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); +boolean DrawingDeactivated(int x, int y, int width, int height) +{ + return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask); +} + +boolean DrawingOnBackground(int x, int y) +{ + return (CheckDrawingArea(x, y, 1, 1, gfx.background_bitmap_mask) && + CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask)); +} + +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 (program.headless) + return; + + if (src_bitmap == NULL || dst_bitmap == NULL) + return; + + if (DrawingDeactivated(dst_x, dst_y, width, height)) + return; + + 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; + + // !!! 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; + } + + sysCopyArea(src_bitmap, dst_bitmap, + src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); } -inline boolean DrawingOnBackground(int x, int y) +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) { - return ((gfx.draw_background_mask & gfx.background_bitmap_mask) && - CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask)); + 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; + + 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 BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, - int src_x, int src_y, int width, int height, - int dst_x, int dst_y) +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 (DrawingDeactivated(dst_x, dst_y, width, height)) + // (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) + if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE)) return; - sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, - dst_x, dst_y, BLIT_OPAQUE); + SDLFadeRectangle(x, y, width, height, + fade_mode, fade_delay, post_delay, draw_border_function); } -inline void FillRectangle(Bitmap *bitmap, int x, int y, int width, int height, - Pixel color) +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; + sysFillRectangle(bitmap, x, y, width, height, color); } -inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) +void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height) { FillRectangle(bitmap, x, y, width, height, BLACK_PIXEL); } -inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, - int width, int height) +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); @@ -475,44 +929,9 @@ inline void ClearRectangleOnBackground(Bitmap *bitmap, int x, int y, ClearRectangle(bitmap, x, y, width, height); } -#if 0 -#ifndef TARGET_SDL -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) -{ -#if defined(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 -} - -inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y) -{ -#if defined(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 -} - -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; @@ -521,20 +940,17 @@ inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, 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(dst_x, dst_y)) { - /* draw background */ + // 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); + // draw foreground BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y); } @@ -543,25 +959,79 @@ 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) +{ + if (bitmap == NULL) + return; + + SDLBlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y, + BLIT_OPAQUE); +} + +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) { -#if defined(TARGET_SDL) SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); -#else - X11DrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, WHITE_PIXEL); -#endif } -#if !defined(TARGET_X11_NATIVE) -inline void DrawLine(Bitmap *bitmap, int from_x, int from_y, +static 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); -#endif } -inline Pixel GetPixel(Bitmap *bitmap, int x, int y) +Pixel GetPixel(Bitmap *bitmap, int x, int y) { + if (program.headless) + return BLACK_PIXEL; + if (x < 0 || x >= bitmap->width || y < 0 || y >= bitmap->height) return BLACK_PIXEL; -#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) +Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, + unsigned int color_g, unsigned int color_b) { -#if defined(TARGET_SDL) + if (program.headless) + return BLACK_PIXEL; + 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) +Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) { unsigned int color_r = (color >> 16) & 0xff; unsigned int color_g = (color >> 8) & 0xff; @@ -641,90 +1092,36 @@ 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) +void KeyboardAutoRepeatOn(void) { -#ifndef TARGET_SDL - XSync(display, FALSE); -#endif + keyrepeat_status = TRUE; } -inline void KeyboardAutoRepeatOn(void) +void KeyboardAutoRepeatOff(void) { -#if defined(TARGET_SDL) - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, - SDL_DEFAULT_REPEAT_INTERVAL / 2); - SDL_EnableUNICODE(1); -#else - if (display) - XAutoRepeatOn(display); -#endif + keyrepeat_status = FALSE; } -inline void KeyboardAutoRepeatOff(void) +boolean SetVideoMode(boolean fullscreen) { -#if defined(TARGET_SDL) - SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); - SDL_EnableUNICODE(0); -#else - if (display) - XAutoRepeatOff(display); -#endif + return SDLSetVideoMode(fullscreen); } -inline boolean PointerInWindow(DrawWindow *window) +void SetVideoFrameDelay(unsigned int frame_delay_value) { -#if defined(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 + video.frame_delay_value = frame_delay_value; } -inline boolean SetVideoMode(boolean fullscreen) +unsigned int GetVideoFrameDelay(void) { -#if defined(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; - } - - return success; -#endif + return video.frame_delay_value; } -inline boolean ChangeVideoModeIfNeeded(boolean fullscreen) +boolean ChangeVideoModeIfNeeded(boolean fullscreen) { -#if defined(TARGET_SDL) if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)|| (!fullscreen && video.fullscreen_enabled)) fullscreen = SetVideoMode(fullscreen); -#endif return fullscreen; } @@ -733,11 +1130,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); @@ -754,7 +1147,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; } @@ -764,24 +1157,24 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) char *filename = getCustomImageFilename(basename); Bitmap *new_bitmap; - if (filename == NULL) /* (should never happen) */ + if (filename == NULL) // (should never happen) { Error(ERR_WARN, "ReloadCustomImage(): cannot find file '%s'", 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 - and a fallback to the existing image is done. */ + // 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) { - Error(ERR_WARN, "LoadImage() failed: %s", GetError()); + Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError()); return; } @@ -798,78 +1191,286 @@ 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) { - 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 dst_bitmap; + return SDLZoomBitmap(src_bitmap, zoom_width, zoom_height); } -void CreateBitmapWithSmallBitmaps(Bitmap *src_bitmap) +void ReCreateGameTileSizeBitmap(Bitmap **bitmaps) { - Bitmap *tmp_bitmap, *tmp_bitmap_2, *tmp_bitmap_8; - int src_width, src_height; - int tmp_width, tmp_height; + if (bitmaps[IMG_BITMAP_CUSTOM]) + { + FreeBitmap(bitmaps[IMG_BITMAP_CUSTOM]); + + bitmaps[IMG_BITMAP_CUSTOM] = NULL; + } - src_width = src_bitmap->width; - src_height = src_bitmap->height; + if (gfx.game_tile_size == gfx.standard_tile_size) + { + bitmaps[IMG_BITMAP_GAME] = bitmaps[IMG_BITMAP_STANDARD]; - tmp_width = src_width; - tmp_height = src_height + (src_height + 1) / 2; /* prevent odd height */ + return; + } - tmp_bitmap = CreateBitmap(tmp_width, tmp_height, DEFAULT_DEPTH); + 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; - tmp_bitmap_2 = ZoomBitmap(src_bitmap, src_width / 2, src_height / 2); - tmp_bitmap_8 = ZoomBitmap(src_bitmap, src_width / 8, src_height / 8); + print_timestamp_init("CreateScaledBitmaps"); - 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); + old_width = old_bitmap->width; + old_height = old_bitmap->height; - FreeBitmap(tmp_bitmap_2); - FreeBitmap(tmp_bitmap_8); + // calculate new image dimensions for final image size + width_final = old_width * zoom_factor; + height_final = old_height * zoom_factor; -#if defined(TARGET_SDL) - /* !!! what about the old src_bitmap->surface ??? FIX ME !!! */ - src_bitmap->surface = tmp_bitmap->surface; - tmp_bitmap->surface = NULL; -#else - /* !!! see above !!! */ - src_bitmap->drawable = tmp_bitmap->drawable; - tmp_bitmap->drawable = None; -#endif + // 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) + { + // copy image filename from old to new standard sized bitmap + bitmaps[IMG_BITMAP_STANDARD]->source_filename = + getStringCopy(old_bitmap->source_filename); + + FreeBitmap(old_bitmap); + } + } + else + { + bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1; + } + + UPDATE_BUSY_STATE(); - src_bitmap->height = tmp_bitmap->height; + 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) +{ + SDLCreateBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]); +} + +void FreeBitmapTextures(Bitmap **bitmaps) +{ + SDLFreeBitmapTextures(bitmaps[IMG_BITMAP_STANDARD]); +} - FreeBitmap(tmp_bitmap); +void ScaleBitmap(Bitmap **bitmaps, int zoom_factor) +{ + CreateScaledBitmaps(bitmaps, zoom_factor, 0, FALSE); } -/* ------------------------------------------------------------------------- */ -/* mouse pointer functions */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// 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 !defined(PLATFORM_MSDOS) -/* XPM */ -static const char *cursor_image_playfield[] = +#if USE_ONE_PIXEL_PLAYFIELD_MOUSEPOINTER +static const char *cursor_image_dot[] = { - /* width height num_colors chars_per_pixel */ + // width height num_colors chars_per_pixel " 16 16 3 1", - /* colors */ + // colors "X c #000000", ". c #ffffff", " c None", - /* pixels */ + // pixels " X ", "X.X ", " X ", @@ -887,15 +1488,17 @@ static const char *cursor_image_playfield[] = " ", " ", - /* hot spot */ + // hot spot "1,1" }; +static const char **cursor_image_playfield = cursor_image_dot; +#else +// 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 -#if defined(TARGET_SDL) static const int cursor_bit_order = BIT_ORDER_MSB; -#elif defined(TARGET_X11_NATIVE) -static const int cursor_bit_order = BIT_ORDER_LSB; -#endif static struct MouseCursorInfo *get_cursor_from_image(const char **image) { @@ -909,9 +1512,9 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) sscanf(image[0], " %d %d ", &cursor->width, &cursor->height); i = -1; - for (y=0; y < cursor->width; y++) + for (y = 0; y < cursor->width; y++) { - for (x=0; x < cursor->height; x++) + for (x = 0; x < cursor->height; x++) { int bit_nr = x % 8; int bit_mask = 0x01 << (bit_order_msb ? 7 - bit_nr : bit_nr ); @@ -943,32 +1546,36 @@ static struct MouseCursorInfo *get_cursor_from_image(const char **image) return cursor; } -#endif /* !PLATFORM_MSDOS */ void SetMouseCursor(int mode) { -#if !defined(PLATFORM_MSDOS) + 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); -#if defined(TARGET_SDL) - SDLSetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); -#elif defined(TARGET_X11_NATIVE) - X11SetMouseCursor(mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); -#endif -#endif + cursor_new = (mode == CURSOR_DEFAULT ? NULL : + mode == CURSOR_NONE ? cursor_none : + mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); + + SDLSetMouseCursor(cursor_new); + + gfx.cursor_mode = mode; } -/* ========================================================================= */ -/* audio functions */ -/* ========================================================================= */ +// ============================================================================ +// audio functions +// ============================================================================ -inline void OpenAudio(void) +void OpenAudio(void) { - /* always start with reliable default values */ + // always start with reliable default values audio.sound_available = FALSE; audio.music_available = FALSE; audio.loops_available = FALSE; @@ -985,29 +1592,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; @@ -1016,72 +1611,42 @@ inline void SetAudioMode(boolean enabled) } -/* ========================================================================= */ -/* event functions */ -/* ========================================================================= */ +// ============================================================================ +// event functions +// ============================================================================ -inline void InitEventFilter(EventFilter filter_function) +boolean PendingEvent(void) { -#if defined(TARGET_SDL) - /* set event filter to filter out certain events */ - SDL_SetEventFilter(filter_function); -#endif + return (SDL_PollEvent(NULL) ? TRUE : FALSE); } -inline boolean PendingEvent(void) +void WaitEvent(Event *event) { -#if defined(TARGET_SDL) - return (SDL_PollEvent(NULL) ? TRUE : FALSE); -#else - return (XPending(display) ? TRUE : FALSE); -#endif + SDLWaitEvent(event); } -inline void NextEvent(Event *event) +void PeekEvent(Event *event) { -#if defined(TARGET_SDL) - SDLNextEvent(event); -#else - XNextEvent(display, event); -#endif + SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT); } -inline Key GetEventKey(KeyEvent *event, boolean with_modifiers) +void CheckQuitEvent(void) { -#if defined(TARGET_SDL) -#if 0 - printf("unicode == '%d', sym == '%d', mod == '0x%04x'\n", - (int)event->keysym.unicode, - (int)event->keysym.sym, - (int)SDL_GetModState()); -#endif - - if (with_modifiers && - event->keysym.unicode > 0x0000 && - event->keysym.unicode < 0x2000) - 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 (SDL_QuitRequested()) + program.exit_function(0); +} - if (with_modifiers) - return XLookupKeysym(event, event->state); - else - return XLookupKeysym(event, 0); -#endif +Key GetEventKey(KeyEvent *event, boolean with_modifiers) +{ + // key up/down events in SDL2 do not return text characters anymore + return event->keysym.sym; } -inline KeyMod HandleKeyModState(Key key, int key_status) +KeyMod HandleKeyModState(Key key, int key_status) { static KeyMod current_modifiers = KMOD_None; -#if !defined(TARGET_SDL) - if (key != KSYM_UNDEFINED) /* new key => check for modifier key change */ + if (key != KSYM_UNDEFINED) // new key => check for modifier key change { KeyMod new_modifier = KMOD_None; @@ -1120,70 +1685,100 @@ inline KeyMod HandleKeyModState(Key key, int key_status) else current_modifiers &= ~new_modifier; } -#endif return current_modifiers; } -inline KeyMod GetKeyModState() +KeyMod GetKeyModState(void) { -#if defined(TARGET_SDL) return (KeyMod)SDL_GetModState(); -#else +} + +KeyMod GetKeyModStateFromEvents(void) +{ + /* 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, int width, int height) +{ +#if defined(HAS_SCREEN_KEYBOARD) + SDL_StartTextInput(); + + if (y + height > SCREEN_KEYBOARD_POS(video.height)) + { + video.shifted_up_pos = y + height - SCREEN_KEYBOARD_POS(video.height); + video.shifted_up_delay = SDL_GetTicks(); + video.shifted_up = TRUE; + } #endif } -inline boolean CheckCloseWindowEvent(ClientMessageEvent *event) +void StopTextInput(void) { - if (event->type != EVENT_CLIENTMESSAGE) - return FALSE; +#if defined(HAS_SCREEN_KEYBOARD) + SDL_StopTextInput(); -#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; + if (video.shifted_up) + { + video.shifted_up_pos = 0; + video.shifted_up_delay = SDL_GetTicks(); + video.shifted_up = FALSE; + } #endif +} - return FALSE; +void PushUserEvent(int code, int value1, int value2) +{ + UserEvent event; + + SDL_memset(&event, 0, sizeof(event)); + + event.type = EVENT_USER; + event.code = code; + event.value1 = value1; + event.value2 = value2; + + SDL_PushEvent((SDL_Event *)&event); } -/* ========================================================================= */ -/* joystick functions */ -/* ========================================================================= */ +// ============================================================================ +// joystick functions +// ============================================================================ -inline void InitJoysticks() +void InitJoysticks(void) { int i; #if defined(NO_JOYSTICK) - return; /* joysticks generally deactivated by compile-time directive */ + return; // joysticks generally deactivated by compile-time directive #endif - /* always start with reliable default values */ + // always start with reliable default values joystick.status = JOYSTICK_NOT_AVAILABLE; - for (i=0; i