X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=3b206b265e3ec2f468b859a3f2a2b06ae40fb21b;hp=3bd825fd6fd36c6077ef1bc2de5b8db933b72948;hb=31f32eb8fe7e5e39fb449968afce809c13509099;hpb=7bb765525399cc21e982a9f00f6340ef82eb5da3 diff --git a/src/libgame/system.c b/src/libgame/system.c index 3bd825fd..3b206b26 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -33,6 +33,7 @@ struct OptionInfo options; struct VideoSystemInfo video; struct AudioSystemInfo audio; struct GfxInfo gfx; +struct OverlayInfo overlay; struct ArtworkInfo artwork; struct JoystickInfo joystick; struct SetupInfo setup; @@ -50,6 +51,7 @@ DrawBuffer *drawto = NULL; int button_status = MB_NOT_PRESSED; boolean motion_status = FALSE; +int wheel_steps = DEFAULT_WHEEL_STEPS; #if defined(TARGET_SDL2) boolean keyrepeat_status = TRUE; #endif @@ -63,8 +65,7 @@ int FrameCounter = 0; /* init/close functions */ /* ========================================================================= */ -void InitProgramInfo(char *argv0, char *config_filename, - char *userdata_subdir, char *userdata_subdir_unix, +void InitProgramInfo(char *argv0, char *config_filename, char *userdata_subdir, char *program_title, char *icon_title, char *icon_filename, char *cookie_prefix, int program_version) @@ -75,7 +76,6 @@ void InitProgramInfo(char *argv0, char *config_filename, 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; @@ -120,7 +120,7 @@ void InitExitFunction(void (*exit_function)(int)) program.exit_function = exit_function; /* set signal handlers to custom exit function */ - signal(SIGINT, exit_function); + // signal(SIGINT, exit_function); signal(SIGTERM, exit_function); /* set exit function to automatically cleanup SDL stuff after exit() */ @@ -132,10 +132,6 @@ void InitPlatformDependentStuff(void) // this is initialized in GetOptions(), but may already be used before options.verbose = TRUE; -#if defined(PLATFORM_MACOSX) - updateUserGameDataDir(); -#endif - OpenLogFiles(); #if defined(TARGET_SDL2) @@ -171,8 +167,6 @@ 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 */ } @@ -209,12 +203,26 @@ 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); + +#if defined(TARGET_SDL2) + ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize); +#endif + + ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize); + ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize); + + ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize); + } + gfx.win_xsize = win_xsize; gfx.win_ysize = win_ysize; gfx.background_bitmap_mask = REDRAW_NONE; - - ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); } void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) @@ -239,6 +247,16 @@ void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)) gfx.draw_busy_anim_function = draw_busy_anim_function; } +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 InitGfxCustomArtworkInfo() { gfx.override_level_graphics = FALSE; @@ -253,6 +271,21 @@ void InitGfxOtherSettings() gfx.cursor_mode = CURSOR_DEFAULT; } +void InitOverlayInfo() +{ + overlay.active = FALSE; +} + +void SetOverlayActive(boolean active) +{ + overlay.active = active; +} + +boolean GetOverlayActive() +{ + return overlay.active; +} + void SetDrawDeactivationMask(int draw_deactivation_mask) { gfx.draw_deactivation_mask = draw_deactivation_mask; @@ -346,6 +379,9 @@ void LimitScreenUpdates(boolean enable) void InitVideoDisplay(void) { SDLInitVideoDisplay(); +#if defined(TARGET_SDL2) + SDLSetDisplaySize(); +#endif } void CloseVideoDisplay(void) @@ -361,12 +397,26 @@ 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 = TRUE; @@ -407,7 +457,7 @@ 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) @@ -425,9 +475,9 @@ 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); + Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH); if (*bitmap == NULL) { @@ -501,16 +551,6 @@ 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) { @@ -665,7 +705,7 @@ 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)) { @@ -673,7 +713,7 @@ void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, 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); } @@ -733,6 +773,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) { @@ -830,7 +920,17 @@ void KeyboardAutoRepeatOff(void) boolean SetVideoMode(boolean fullscreen) { - return SDLSetVideoMode(&backbuffer, fullscreen); + return SDLSetVideoMode(fullscreen); +} + +void SetVideoFrameDelay(unsigned int frame_delay_value) +{ + video.frame_delay_value = frame_delay_value; +} + +unsigned int GetVideoFrameDelay() +{ + return video.frame_delay_value; } boolean ChangeVideoModeIfNeeded(boolean fullscreen) @@ -863,7 +963,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; } @@ -890,7 +990,7 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename) if ((new_bitmap = LoadImage(filename)) == NULL) { - Error(ERR_WARN, "LoadImage() failed: %s", GetError()); + Error(ERR_WARN, "LoadImage('%s') failed: %s", basename, GetError()); return; } @@ -907,30 +1007,9 @@ 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 = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height); - - return dst_bitmap; -} - -static void SetMaskedBitmapSurface(Bitmap *bitmap) -{ - 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) @@ -957,8 +1036,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, @@ -1126,12 +1203,6 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor, 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"); @@ -1143,6 +1214,16 @@ 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); @@ -1344,16 +1425,6 @@ 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 -} - boolean PendingEvent(void) { return (SDL_PollEvent(NULL) ? TRUE : FALSE); @@ -1460,6 +1531,38 @@ KeyMod GetKeyModStateFromEvents() return HandleKeyModState(KSYM_UNDEFINED, 0); } +void StartTextInput(int x, int y, int width, int height) +{ +#if defined(TARGET_SDL2) + SDL_StartTextInput(); + +#if defined(HAS_SCREEN_KEYBOARD) + 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 +#endif +} + +void StopTextInput() +{ +#if defined(TARGET_SDL2) + SDL_StopTextInput(); + +#if defined(HAS_SCREEN_KEYBOARD) + if (video.shifted_up) + { + video.shifted_up_pos = 0; + video.shifted_up_delay = SDL_GetTicks(); + video.shifted_up = FALSE; + } +#endif +#endif +} + boolean CheckCloseWindowEvent(ClientMessageEvent *event) { if (event->type != EVENT_CLIENTMESSAGE)