X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=661bf6fb7546aeb8611b974ae74b478e50a3c812;hp=60b40b3a29568bdebf76b1fb6ea592803031432c;hb=bf9e47bb97f16c998644758a383209fa4d4fc87b;hpb=5208004f5801d92d705032715eb063b8412613f2 diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 60b40b3a..661bf6fb 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -129,6 +129,56 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); } + int xoff = video.screen_xoffset; + int yoff = video.screen_yoffset; + SDL_Rect dst_rect_screen = { xoff, yoff, video.width, video.height }; + SDL_Rect *src_rect1 = NULL, *dst_rect1 = NULL; + SDL_Rect *src_rect2 = NULL, *dst_rect2 = NULL; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) + dst_rect2 = &dst_rect_screen; + else + dst_rect1 = &dst_rect_screen; + +#if defined(HAS_SCREEN_KEYBOARD) + if (video.shifted_up || video.shifted_up_delay) + { + int time_current = SDL_GetTicks(); + int pos = video.shifted_up_pos; + int pos_last = video.shifted_up_pos_last; + + if (!DelayReachedExt(&video.shifted_up_delay, video.shifted_up_delay_value, + time_current)) + { + int delay = time_current - video.shifted_up_delay; + int delay_value = video.shifted_up_delay_value; + + pos = pos_last + (pos - pos_last) * delay / delay_value; + } + else + { + video.shifted_up_pos_last = pos; + video.shifted_up_delay = 0; + } + + SDL_Rect src_rect_up = { 0, pos, video.width, video.height - pos }; + SDL_Rect dst_rect_up = { xoff, yoff, video.width, video.height - pos }; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) + { + src_rect2 = &src_rect_up; + dst_rect2 = &dst_rect_up; + } + else + { + src_rect1 = &src_rect_up; + dst_rect1 = &dst_rect_up; + } + } +#endif + // clear render target buffer SDL_RenderClear(sdl_renderer); @@ -139,7 +189,7 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) // copy backbuffer texture to render target buffer if (video.screen_rendering_mode != SPECIAL_RENDERING_TARGET) - SDL_RenderCopy(sdl_renderer, sdl_texture_stream, NULL, NULL); + SDL_RenderCopy(sdl_renderer, sdl_texture_stream, src_rect1, dst_rect1); if (video.screen_rendering_mode != SPECIAL_RENDERING_BITMAP) FinalizeScreen(DRAW_TO_SCREEN); @@ -149,7 +199,7 @@ static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) { SDL_SetRenderTarget(sdl_renderer, NULL); - SDL_RenderCopy(sdl_renderer, sdl_texture_target, NULL, NULL); + SDL_RenderCopy(sdl_renderer, sdl_texture_target, src_rect2, dst_rect2); } #endif @@ -512,14 +562,18 @@ static boolean SDLCreateScreen(boolean fullscreen) #endif #endif + SDLSetScreenSizeAndOffsets(video.width, video.height); + int width = video.width; int height = video.height; + int screen_width = video.screen_width; + int screen_height = video.screen_height; int surface_flags = (fullscreen ? surface_flags_fullscreen : surface_flags_window); // default window size is unscaled - video.window_width = video.width; - video.window_height = video.height; + video.window_width = screen_width; + video.window_height = screen_height; #if defined(TARGET_SDL2) @@ -528,8 +582,8 @@ static boolean SDLCreateScreen(boolean fullscreen) float window_scaling_factor = (float)setup.window_scaling_percent / 100; - video.window_width = window_scaling_factor * width; - video.window_height = window_scaling_factor * height; + video.window_width = window_scaling_factor * screen_width; + video.window_height = window_scaling_factor * screen_height; if (sdl_texture_stream) { @@ -573,7 +627,7 @@ static boolean SDLCreateScreen(boolean fullscreen) if (sdl_renderer != NULL) { - SDL_RenderSetLogicalSize(sdl_renderer, width, height); + SDL_RenderSetLogicalSize(sdl_renderer, screen_width, screen_height); // SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, setup.window_scaling_quality); @@ -759,8 +813,8 @@ void SDLSetWindowScaling(int window_scaling_percent) return; float window_scaling_factor = (float)window_scaling_percent / 100; - int new_window_width = (int)(window_scaling_factor * video.width); - int new_window_height = (int)(window_scaling_factor * video.height); + int new_window_width = (int)(window_scaling_factor * video.screen_width); + int new_window_height = (int)(window_scaling_factor * video.screen_height); SDL_SetWindowSize(sdl_window, new_window_width, new_window_height); @@ -832,6 +886,67 @@ void SDLSetWindowFullscreen(boolean fullscreen) video.fullscreen_initial = FALSE; } } + +void SDLSetDisplaySize() +{ + SDL_Rect display_bounds; + + SDL_GetDisplayBounds(0, &display_bounds); + + video.display_width = display_bounds.w; + video.display_height = display_bounds.h; + +#if 0 + Error(ERR_DEBUG, "SDL real screen size: %d x %d", + video.display_width, video.display_height); +#endif +} + +void SDLSetScreenSizeAndOffsets(int width, int height) +{ + // set default video screen size and offsets + video.screen_width = width; + video.screen_height = height; + video.screen_xoffset = 0; + video.screen_yoffset = 0; + +#if defined(PLATFORM_ANDROID) + float ratio_video = (float) width / height; + float ratio_display = (float) video.display_width / video.display_height; + + if (ratio_video != ratio_display) + { + // adjust drawable screen size to cover the whole device display + + if (ratio_video < ratio_display) + video.screen_width *= ratio_display / ratio_video; + else + video.screen_height *= ratio_video / ratio_display; + + video.screen_xoffset = (video.screen_width - width) / 2; + video.screen_yoffset = (video.screen_height - height) / 2; + +#if 0 + Error(ERR_DEBUG, "Changing screen from %dx%d to %dx%d (%.2f to %.2f)", + width, height, + video.screen_width, video.screen_height, + ratio_video, ratio_display); +#endif + } +#endif +} + +void SDLSetScreenSizeForRenderer(int width, int height) +{ + SDL_RenderSetLogicalSize(sdl_renderer, width, height); +} + +void SDLSetScreenProperties() +{ + SDLSetScreenSizeAndOffsets(video.width, video.height); + SDLSetScreenSizeForRenderer(video.screen_width, video.screen_height); +} + #endif void SDLSetScreenRenderingMode(char *screen_rendering_mode) @@ -2180,28 +2295,30 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) return zoom_dst; } -static void SetOpaqueBitmapSurface(Bitmap *bitmap) +static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface) { - if (bitmap == NULL) - return; + SDL_Surface *new_surface; - if (bitmap->surface) - SDL_FreeSurface(bitmap->surface); + if (surface == NULL) + return NULL; - if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed"); + if ((new_surface = SDLGetNativeSurface(surface)) == NULL) + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); /* remove alpha channel from native non-transparent surface, if defined */ - SDLSetAlpha(bitmap->surface, FALSE, 0); + SDLSetAlpha(new_surface, FALSE, 0); /* remove transparent color from native non-transparent surface, if defined */ - SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0); + SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0); + + return new_surface; } Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) { Bitmap *dst_bitmap = CreateBitmapStruct(); - SDL_Surface **dst_surface = &dst_bitmap->surface_masked; + SDL_Surface *src_surface = src_bitmap->surface_masked; + SDL_Surface *dst_surface; dst_width = MAX(1, dst_width); /* prevent zero bitmap width */ dst_height = MAX(1, dst_height); /* prevent zero bitmap height */ @@ -2210,18 +2327,21 @@ Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) dst_bitmap->height = dst_height; /* create zoomed temporary surface from source surface */ - *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height); + dst_surface = zoomSurface(src_surface, dst_width, dst_height); /* create native format destination surface from zoomed temporary surface */ - SDLSetNativeSurface(dst_surface); + SDLSetNativeSurface(&dst_surface); /* set color key for zoomed surface from source surface, if defined */ - if (SDLHasColorKey(src_bitmap->surface_masked)) - SDL_SetColorKey(*dst_surface, SET_TRANSPARENT_PIXEL, - SDLGetColorKey(src_bitmap->surface_masked)); + if (SDLHasColorKey(src_surface)) + SDL_SetColorKey(dst_surface, SET_TRANSPARENT_PIXEL, + SDLGetColorKey(src_surface)); /* create native non-transparent surface for opaque blitting */ - SetOpaqueBitmapSurface(dst_bitmap); + dst_bitmap->surface = SDLGetOpaqueSurface(dst_surface); + + /* set native transparent surface for masked blitting */ + dst_bitmap->surface_masked = dst_surface; return dst_bitmap; } @@ -2242,31 +2362,17 @@ Bitmap *SDLLoadImage(char *filename) /* load image to temporary surface */ if ((sdl_image_tmp = IMG_Load(filename)) == NULL) - { - SetError("IMG_Load(): %s", SDL_GetError()); - - return NULL; - } + Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError()); print_timestamp_time("IMG_Load"); UPDATE_BUSY_STATE(); /* create native non-transparent surface for current image */ - if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); + if ((new_bitmap->surface = SDLGetOpaqueSurface(sdl_image_tmp)) == NULL) + Error(ERR_EXIT, "SDLGetOpaqueSurface() failed"); - return NULL; - } - - /* remove alpha channel from native non-transparent surface, if defined */ - SDLSetAlpha(new_bitmap->surface, FALSE, 0); - - /* remove transparent color from native non-transparent surface, if defined */ - SDL_SetColorKey(new_bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0); - - print_timestamp_time("SDL_DisplayFormat (opaque)"); + print_timestamp_time("SDLGetNativeSurface (opaque)"); UPDATE_BUSY_STATE(); @@ -2278,13 +2384,9 @@ Bitmap *SDLLoadImage(char *filename) /* create native transparent surface for current image */ if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); - - return NULL; - } + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); - print_timestamp_time("SDL_DisplayFormat (masked)"); + print_timestamp_time("SDLGetNativeSurface (masked)"); UPDATE_BUSY_STATE();