X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=15e86a4afbc7084012132acac0f133577914085f;hp=eec5d192960ac9e784d5232ad8e47ef5ccb90dc1;hb=c38790fcee093efb156366bb4a02dbde55085ca4;hpb=f7165d318c089b77d0a91a77afc44cb8866dc1cc diff --git a/src/libgame/system.c b/src/libgame/system.c index eec5d192..15e86a4a 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -21,18 +21,22 @@ #include "joystick.h" #include "misc.h" -#define ENABLE_UNUSED_CODE 0 /* currently unused functions */ +#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; @@ -42,6 +46,7 @@ LevelDirTree *leveldir_first = NULL; LevelDirTree *leveldir_current = NULL; int level_nr; +struct LevelSetInfo levelset; struct LevelStats level_stats[MAX_LEVELS]; DrawWindow *window = NULL; @@ -50,52 +55,99 @@ DrawBuffer *drawto = NULL; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; -#if defined(TARGET_SDL2) +int wheel_steps = DEFAULT_WHEEL_STEPS; boolean keyrepeat_status = TRUE; -#endif int redraw_mask = REDRAW_NONE; -int redraw_tiles = 0; int FrameCounter = 0; -/* ========================================================================= */ -/* init/close functions */ -/* ========================================================================= */ +// ============================================================================ +// init/close functions +// ============================================================================ -void InitProgramInfo(char *argv0, - char *userdata_subdir, char *userdata_subdir_unix, +void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, char *program_title, char *icon_title, - char *sdl_icon_filename, char *cookie_prefix, - int program_version) + char *icon_filename, char *cookie_prefix, + char *program_version_string, int program_version) { program.command_basepath = getBasePath(argv0); program.command_basename = getBaseName(argv0); + program.config_filename = config_filename; + program.userdata_subdir = userdata_subdir; - program.userdata_subdir_unix = userdata_subdir_unix; program.userdata_path = getUserGameDataDir(); program.program_title = program_title; program.window_title = "(undefined)"; program.icon_title = icon_title; - program.sdl_icon_filename = sdl_icon_filename; + program.icon_filename = icon_filename; program.cookie_prefix = cookie_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_build = VERSION_BUILD(program_version); program.version_ident = program_version; - program.error_filename = getErrorFilename(ERROR_BASENAME); - program.error_file = stderr; + 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 SetWindowTitle(void) { program.window_title = program.window_title_function(); @@ -116,11 +168,11 @@ 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); - /* set exit function to automatically cleanup SDL stuff after exit() */ + // set exit function to automatically cleanup SDL stuff after exit() atexit(SDL_Quit); } @@ -129,17 +181,9 @@ void InitPlatformDependentStuff(void) // this is initialized in GetOptions(), but may already be used before options.verbose = TRUE; -#if defined(PLATFORM_MACOSX) - updateUserGameDataDir(); -#endif - - openErrorFile(); + OpenLogFiles(); -#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 + int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE; if (SDL_Init(sdl_init_flags) < 0) Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); @@ -149,9 +193,7 @@ void InitPlatformDependentStuff(void) void ClosePlatformDependentStuff(void) { -#if defined(PLATFORM_WIN32) - closeErrorFile(); -#endif + CloseLogFiles(); } void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, @@ -170,10 +212,8 @@ void InitGfxFieldInfo(int sx, int sy, int sxsize, int sysize, gfx.field_save_buffer = field_save_buffer; - gfx.drawing_area_changed = FALSE; - - 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) @@ -208,18 +248,30 @@ void InitGfxDoor3Info(int ex, int ey, int exsize, int 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; - - ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); } 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 */ + // 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; } @@ -238,7 +290,22 @@ void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)) gfx.draw_busy_anim_function = draw_busy_anim_function; } -void InitGfxCustomArtworkInfo() +void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int)) +{ + 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; @@ -247,24 +314,150 @@ void InitGfxCustomArtworkInfo() 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; + + overlay.enabled = FALSE; + overlay.active = FALSE; + + 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 SetTileCursorEnabled(boolean enabled) +{ + tile_cursor.enabled = enabled; +} + +void SetTileCursorActive(boolean active) +{ + tile_cursor.active = active; +} + +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) + + 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; } -void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) +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 (background_bitmap_tile == NULL) /* empty background requested */ + if (background_bitmap_tile == NULL) // empty background requested return; if (mask == REDRAW_ALL) @@ -280,50 +473,56 @@ void SetBackgroundBitmap(Bitmap *background_bitmap_tile, int mask) 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 !!! */ + // 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 !!! */ + // 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 !!! */ + // 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) { SDLFillRectangle(bitmap, x, y, width, height, color); + + 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) { SDLCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, mask_mode); + + if (dst_bitmap == backbuffer) + SetRedrawMaskFromArea(dst_x, dst_y, width, height); } void LimitScreenUpdates(boolean enable) @@ -331,9 +530,18 @@ void LimitScreenUpdates(boolean enable) SDLLimitScreenUpdates(enable); } +void InitVideoDefaults(void) +{ + video.default_depth = 32; +} + void InitVideoDisplay(void) { + if (program.headless) + return; + SDLInitVideoDisplay(); + SDLSetDisplaySize(); } void CloseVideoDisplay(void) @@ -349,17 +557,33 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen) 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; video.window_scaling_available = WINDOW_SCALING_STATUS; - SDLInitVideoBuffer(&backbuffer, &window, fullscreen); + video.frame_delay = 0; + video.frame_delay_value = GAME_FRAME_DELAY; + + 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; + + SDLInitVideoBuffer(fullscreen); + + video.initialized = !program.headless; drawto = backbuffer; } -inline static void FreeBitmapPointers(Bitmap *bitmap) +static void FreeBitmapPointers(Bitmap *bitmap) { if (bitmap == NULL) return; @@ -370,8 +594,8 @@ inline static void FreeBitmapPointers(Bitmap *bitmap) 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; @@ -393,14 +617,14 @@ void FreeBitmap(Bitmap *bitmap) Bitmap *CreateBitmapStruct(void) { - return checked_calloc(sizeof(struct SDLSurfaceInfo)); + 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_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); @@ -411,9 +635,21 @@ Bitmap *CreateBitmap(int width, int height, int depth) return new_bitmap; } -void ReCreateBitmap(Bitmap **bitmap, int width, int height, int depth) +void ReCreateBitmap(Bitmap **bitmap, int width, int height) { - Bitmap *new_bitmap = CreateBitmap(width, height, depth); + if (*bitmap != NULL) + { + // 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); + } + + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); if (*bitmap == NULL) { @@ -426,12 +662,36 @@ void ReCreateBitmap(Bitmap **bitmap, int width, int height, int depth) } } -void CloseWindow(DrawWindow *window) +#if 0 +static void CloseWindow(DrawWindow *window) { } +#endif -inline static boolean CheckDrawingArea(int x, int y, int width, int height, - int draw_mask) +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 boolean CheckDrawingArea(int x, int y, int width, int height, + int draw_mask) { if (draw_mask == REDRAW_NONE) return FALSE; @@ -454,6 +714,17 @@ inline static boolean CheckDrawingArea(int x, int y, int width, int height, return FALSE; } +boolean DrawingDeactivatedField(void) +{ + if (program.headless) + return TRUE; + + if (gfx.draw_deactivation_mask & REDRAW_FIELD) + return TRUE; + + return FALSE; +} + boolean DrawingDeactivated(int x, int y, int width, int height) { return CheckDrawingArea(x, y, width, height, gfx.draw_deactivation_mask); @@ -465,22 +736,12 @@ boolean DrawingOnBackground(int x, int y) CheckDrawingArea(x, y, 1, 1, gfx.draw_background_mask)); } -boolean DrawingAreaChanged() -{ - int drawing_area_changed = gfx.drawing_area_changed; - - // reset flag for change of drawing area after querying it - gfx.drawing_area_changed = FALSE; - - return drawing_area_changed; -} - 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 */ + 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); @@ -495,7 +756,7 @@ static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, clip_height = bitmap->height; } - /* skip if rectangle completely outside bitmap */ + // skip if rectangle completely outside bitmap if (*x + *width <= clip_x || *y + *height <= clip_y || @@ -503,7 +764,7 @@ static boolean InClippedRectangle(Bitmap *bitmap, int *x, int *y, *y >= clip_y + clip_height) return FALSE; - /* clip if rectangle overlaps bitmap */ + // clip if rectangle overlaps bitmap if (*x < clip_x) { @@ -535,6 +796,9 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, int dst_x_unclipped = dst_x; int dst_y_unclipped = dst_y; + if (program.headless) + return; + if (src_bitmap == NULL || dst_bitmap == NULL) return; @@ -545,35 +809,34 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, !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 */ + // 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 !!! */ + // !!! 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 !!! */ + // !!! 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 */ + // 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 ... */ + // 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 */ + // ... and allow for later re-adjustments due to custom artwork bitmaps if (src_bitmap->width > tmp_bitmap_xsize || src_bitmap->height > tmp_bitmap_ysize) { @@ -596,7 +859,6 @@ void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap, return; } -#endif sysCopyArea(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y, BLIT_OPAQUE); @@ -629,15 +891,15 @@ void BlitBitmapTiled(Bitmap *src_bitmap, Bitmap *dst_bitmap, } } -void FadeRectangle(Bitmap *bitmap_cross, 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)) { - /* (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) */ + // (use destination bitmap "backbuffer" -- "bitmap_cross" may be undefined) if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE)) return; - SDLFadeRectangle(bitmap_cross, x, y, width, height, + SDLFadeRectangle(x, y, width, height, fade_mode, fade_delay, post_delay, draw_border_function); } @@ -684,11 +946,11 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, { 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 */ + // draw foreground BlitBitmapMasked(src_bitmap, dst_bitmap, src_x, src_y, width, height, dst_x, dst_y); } @@ -697,6 +959,56 @@ void BlitBitmapOnBackground(Bitmap *src_bitmap, Bitmap *dst_bitmap, dst_x, dst_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) { @@ -709,11 +1021,14 @@ void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_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) +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; + if (program.headless) + return; + for (x = 0; x < line_width; x++) { for (y = 0; y < line_width; y++) @@ -749,6 +1064,9 @@ void DrawLines(Bitmap *bitmap, struct XY *points, int num_points, Pixel pixel) 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; @@ -759,6 +1077,9 @@ Pixel GetPixel(Bitmap *bitmap, int x, int y) Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r, unsigned int color_g, unsigned int color_b) { + if (program.headless) + return BLACK_PIXEL; + return SDL_MapRGB(bitmap->surface->format, color_r, color_g, color_b); } @@ -773,33 +1094,27 @@ Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color) void KeyboardAutoRepeatOn(void) { -#if defined(TARGET_SDL2) keyrepeat_status = TRUE; -#else - SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2, - SDL_DEFAULT_REPEAT_INTERVAL / 2); - SDL_EnableUNICODE(1); -#endif } void KeyboardAutoRepeatOff(void) { -#if defined(TARGET_SDL2) keyrepeat_status = FALSE; -#else - SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL); - SDL_EnableUNICODE(0); -#endif } -boolean PointerInWindow(DrawWindow *window) +boolean SetVideoMode(boolean fullscreen) { - return TRUE; + return SDLSetVideoMode(fullscreen); } -boolean SetVideoMode(boolean fullscreen) +void SetVideoFrameDelay(unsigned int frame_delay_value) { - return SDLSetVideoMode(&backbuffer, fullscreen); + video.frame_delay_value = frame_delay_value; +} + +unsigned int GetVideoFrameDelay(void) +{ + return video.frame_delay_value; } boolean ChangeVideoModeIfNeeded(boolean fullscreen) @@ -832,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; } @@ -842,7 +1157,7 @@ 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; @@ -850,16 +1165,16 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) 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; } @@ -876,30 +1191,9 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) free(new_bitmap); } -Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) -{ - Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height); - - return dst_bitmap; -} - -static void SetMaskedBitmapSurface(Bitmap *bitmap) +static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height) { - if (bitmap == NULL) - return; - - SDL_Surface *surface = bitmap->surface; - - if (bitmap->surface_masked) - SDL_FreeSurface(bitmap->surface_masked); - - SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL, - SDL_MapRGB(surface->format, 0x00, 0x00, 0x00)); - - if ((bitmap->surface_masked = SDLGetNativeSurface(surface)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed"); - - SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0); + return SDLZoomBitmap(src_bitmap, zoom_width, zoom_height); } void ReCreateGameTileSizeBitmap(Bitmap **bitmaps) @@ -926,8 +1220,6 @@ void ReCreateGameTileSizeBitmap(Bitmap **bitmaps) bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new; bitmaps[IMG_BITMAP_GAME] = bitmap_new; - - SetMaskedBitmapSurface(bitmap_new); } static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, @@ -958,12 +1250,12 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, old_width = old_bitmap->width; old_height = old_bitmap->height; - /* calculate new image dimensions for final image size */ + // 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) */ + // 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 @@ -978,10 +1270,10 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, if (create_small_bitmaps) { - /* check if we have a non-gameplay tile size image */ + // check if we have a non-gameplay tile size image if (tile_size != gfx.game_tile_size) { - /* get image with gameplay 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; @@ -995,10 +1287,10 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); } - /* check if we have a non-standard tile size image */ + // check if we have a non-standard tile size image if (tile_size != gfx.standard_tile_size) { - /* get image with 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; @@ -1014,7 +1306,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); } - /* calculate new image dimensions for small images */ + // calculate new image dimensions for small images width_2 = width_1 / 2; height_2 = height_1 / 2; width_4 = width_1 / 4; @@ -1026,7 +1318,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, width_32 = width_1 / 32; height_32 = height_1 / 32; - /* get image with 1/2 of normal size (for use in the level editor) */ + // 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 @@ -1034,7 +1326,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/4 of normal size (for use in the level editor) */ + // 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 @@ -1042,7 +1334,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/8 of normal size (for use on the preview screen) */ + // 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 @@ -1050,7 +1342,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/16 of normal size (for use on the preview screen) */ + // 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 @@ -1058,7 +1350,7 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, UPDATE_BUSY_STATE(); - /* get image with 1/32 of normal size (for use on the preview screen) */ + // 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 @@ -1088,19 +1380,19 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, 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; } - // create corresponding bitmaps for masked blitting - for (i = 0; i < NUM_IMG_BITMAPS; i++) - if (bitmaps[i] != NULL && - bitmaps[i] != old_bitmap) - SetMaskedBitmapSurface(bitmaps[i]); - UPDATE_BUSY_STATE(); print_timestamp_done("CreateScaledBitmaps"); @@ -1112,30 +1404,40 @@ void CreateBitmapWithSmallBitmaps(Bitmap **bitmaps, int zoom_factor, 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]); +} + 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 */ +// XPM image definitions static const char *cursor_image_none[] = { - /* 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 " ", " ", " ", @@ -1153,22 +1455,22 @@ static const char *cursor_image_none[] = " ", " ", - /* hot spot */ + // hot spot "0,0" }; #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 ", @@ -1186,13 +1488,13 @@ static const char *cursor_image_dot[] = " ", " ", - /* 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 :-) */ +// 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 @@ -1262,16 +1564,18 @@ void SetMouseCursor(int mode) mode == CURSOR_PLAYFIELD ? cursor_playfield : NULL); SDLSetMouseCursor(cursor_new); + + gfx.cursor_mode = mode; } -/* ========================================================================= */ -/* audio functions */ -/* ========================================================================= */ +// ============================================================================ +// audio functions +// ============================================================================ 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; @@ -1307,68 +1611,42 @@ void SetAudioMode(boolean enabled) } -/* ========================================================================= */ -/* event functions */ -/* ========================================================================= */ - -void InitEventFilter(EventFilter filter_function) -{ - /* set event filter to filter out certain events */ -#if defined(TARGET_SDL2) - SDL_SetEventFilter(filter_function, NULL); -#else - SDL_SetEventFilter(filter_function); -#endif -} +// ============================================================================ +// event functions +// ============================================================================ boolean PendingEvent(void) { return (SDL_PollEvent(NULL) ? TRUE : FALSE); } -void NextEvent(Event *event) +void WaitEvent(Event *event) { - SDLNextEvent(event); + SDLWaitEvent(event); } void PeekEvent(Event *event) { -#if defined(TARGET_SDL2) SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_FIRSTEVENT, SDL_LASTEVENT); -#else - SDL_PeepEvents(event, 1, SDL_PEEKEVENT, SDL_ALLEVENTS); -#endif +} + +void CheckQuitEvent(void) +{ + if (SDL_QuitRequested()) + program.exit_function(0); } Key GetEventKey(KeyEvent *event, boolean with_modifiers) { -#if defined(TARGET_SDL2) - /* key up/down events in SDL2 do not return text characters anymore */ + // 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, - (int)SDL_GetModState()); -#endif - - if (with_modifiers && - event->keysym.unicode > 0x0000 && - event->keysym.unicode < 0x2000) - return event->keysym.unicode; - else - return event->keysym.sym; - -#endif } KeyMod HandleKeyModState(Key key, int key_status) { static KeyMod current_modifiers = KMOD_None; - 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; @@ -1411,12 +1689,12 @@ KeyMod HandleKeyModState(Key key, int key_status) return current_modifiers; } -KeyMod GetKeyModState() +KeyMod GetKeyModState(void) { return (KeyMod)SDL_GetModState(); } -KeyMod GetKeyModStateFromEvents() +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 @@ -1427,31 +1705,65 @@ KeyMod GetKeyModStateFromEvents() return HandleKeyModState(KSYM_UNDEFINED, 0); } -boolean CheckCloseWindowEvent(ClientMessageEvent *event) +void StartTextInput(int x, int y, int width, int height) { - if (event->type != EVENT_CLIENTMESSAGE) - return FALSE; +#if defined(HAS_SCREEN_KEYBOARD) + SDL_StartTextInput(); - return TRUE; /* the only possible message here is SDL_QUIT */ + 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 } +void StopTextInput(void) +{ +#if defined(HAS_SCREEN_KEYBOARD) + SDL_StopTextInput(); -/* ========================================================================= */ -/* joystick functions */ -/* ========================================================================= */ + if (video.shifted_up) + { + video.shifted_up_pos = 0; + video.shifted_up_delay = SDL_GetTicks(); + video.shifted_up = FALSE; + } +#endif +} -void InitJoysticks() +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 +// ============================================================================ + +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 < MAX_PLAYERS; i++) - joystick.fd[i] = -1; /* joystick device closed */ + joystick.nr[i] = -1; // no joystick configured SDLInitJoysticks(); } @@ -1460,3 +1772,13 @@ boolean ReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2) { return SDLReadJoystick(nr, x, y, b1, b2); } + +boolean CheckJoystickOpened(int nr) +{ + return SDLCheckJoystickOpened(nr); +} + +void ClearJoystickState(void) +{ + SDLClearJoystickState(); +}