X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=3afecaf918c2e7bd991e3ec36e335cad334a65b3;hp=a9fd895907da1116f0c2af362c91c439fabd3ea8;hb=25c22434b11938e230719d6f73df4ed7813570be;hpb=68d1418be737276c8214780106399c0dae588d1c diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index a9fd8959..3afecaf9 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* sdl.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// sdl.c +// ============================================================================ #include "system.h" #include "sound.h" @@ -17,8 +15,8 @@ #include "misc.h" #include "setup.h" +#define ENABLE_UNUSED_CODE 0 /* currently unused functions */ -#if defined(TARGET_SDL) /* ========================================================================= */ /* video functions */ @@ -28,37 +26,105 @@ #if defined(TARGET_SDL2) static SDL_Window *sdl_window = NULL; static SDL_Renderer *sdl_renderer = NULL; -static SDL_Texture *sdl_texture = NULL; - -#define USE_RENDERER TRUE +static SDL_Texture *sdl_texture_stream = NULL; +static SDL_Texture *sdl_texture_target = NULL; +static boolean fullscreen_enabled = FALSE; #endif -/* stuff needed to work around SDL/Windows fullscreen drawing bug */ -static int fullscreen_width; -static int fullscreen_height; -static int fullscreen_xoffset; -static int fullscreen_yoffset; -static int video_xoffset; -static int video_yoffset; +static boolean limit_screen_updates = FALSE; + /* functions from SGE library */ void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32); -#if defined(TARGET_SDL2) -static void UpdateScreen(SDL_Rect *rect) +#if defined(USE_TOUCH_INPUT_OVERLAY) +/* functions to draw overlay graphics for touch device input */ +static void DrawTouchInputOverlay(); +#endif + +void SDLLimitScreenUpdates(boolean enable) +{ + limit_screen_updates = enable; +} + +static void FinalizeScreen(int draw_target) +{ + // copy global animations to render target buffer, if defined (below border) + if (gfx.draw_global_anim_function != NULL) + gfx.draw_global_anim_function(draw_target, DRAW_GLOBAL_ANIM_STAGE_1); + + // copy global masked border to render target buffer, if defined + if (gfx.draw_global_border_function != NULL) + gfx.draw_global_border_function(draw_target); + + // copy global animations to render target buffer, if defined (above border) + if (gfx.draw_global_anim_function != NULL) + gfx.draw_global_anim_function(draw_target, DRAW_GLOBAL_ANIM_STAGE_2); +} + +static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay) { -#if USE_RENDERER + static unsigned int update_screen_delay = 0; + unsigned int update_screen_delay_value = 50; /* (milliseconds) */ SDL_Surface *screen = backbuffer->surface; -#if 1 + if (limit_screen_updates && + !DelayReached(&update_screen_delay, update_screen_delay_value)) + return; + + LimitScreenUpdates(FALSE); + +#if 0 + { + static int LastFrameCounter = 0; + boolean changed = (FrameCounter != LastFrameCounter); + + printf("::: FrameCounter == %d [%s]\n", FrameCounter, + (changed ? "-" : "SAME FRAME UPDATED")); + + LastFrameCounter = FrameCounter; + + /* + if (FrameCounter % 2) + return; + */ + } +#endif + + if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP && + gfx.final_screen_bitmap != NULL) // may not be initialized yet + { + // draw global animations using bitmaps instead of using textures + // to prevent texture scaling artefacts (this is potentially slower) + + BlitBitmap(backbuffer, gfx.final_screen_bitmap, 0, 0, + gfx.win_xsize, gfx.win_ysize, 0, 0); + + FinalizeScreen(DRAW_TO_SCREEN); + + screen = gfx.final_screen_bitmap->surface; + + // force full window redraw + rect = NULL; + } + +#if defined(TARGET_SDL2) + SDL_Texture *sdl_texture = sdl_texture_stream; + + // deactivate use of target texture if render targets are not supported + if ((video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) && + sdl_texture_target == NULL) + video.screen_rendering_mode = SPECIAL_RENDERING_OFF; + + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET) + sdl_texture = sdl_texture_target; + if (rect) { int bytes_x = screen->pitch / video.width; int bytes_y = screen->pitch; - if (video.fullscreen_enabled) - bytes_x = screen->pitch / fullscreen_width; - SDL_UpdateTexture(sdl_texture, rect, screen->pixels + rect->x * bytes_x + rect->y * bytes_y, screen->pitch); @@ -67,54 +133,110 @@ static void UpdateScreen(SDL_Rect *rect) { SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); } -#else - SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch); -#endif - SDL_RenderClear(sdl_renderer); - SDL_RenderCopy(sdl_renderer, sdl_texture, NULL, NULL); - SDL_RenderPresent(sdl_renderer); -#else - if (rect) - SDL_UpdateWindowSurfaceRects(sdl_window, rect, 1); - else - SDL_UpdateWindowSurface(sdl_window); -#endif -} -#endif -static void setFullscreenParameters(char *fullscreen_mode_string) -{ -#if defined(TARGET_SDL2) - fullscreen_width = video.width; - fullscreen_height = video.height; - fullscreen_xoffset = 0; - fullscreen_yoffset = 0; + 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; -#else - - struct ScreenModeInfo *fullscreen_mode; - int i; + 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; - fullscreen_mode = get_screen_mode_from_string(fullscreen_mode_string); +#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 (fullscreen_mode == NULL) - return; + 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; - for (i = 0; video.fullscreen_modes[i].width != -1; i++) - { - if (fullscreen_mode->width == video.fullscreen_modes[i].width && - fullscreen_mode->height == video.fullscreen_modes[i].height) + pos = pos_last + (pos - pos_last) * delay / delay_value; + } + else { - fullscreen_width = fullscreen_mode->width; - fullscreen_height = fullscreen_mode->height; + video.shifted_up_pos_last = pos; + video.shifted_up_delay = 0; + } - fullscreen_xoffset = (fullscreen_width - video.width) / 2; - fullscreen_yoffset = (fullscreen_height - video.height) / 2; + SDL_Rect src_rect_up = { 0, pos, video.width, video.height - pos }; + SDL_Rect dst_rect_up = { xoff, yoff, video.width, video.height - pos }; - break; + 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); + + // set renderer to use target texture for rendering + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) + SDL_SetRenderTarget(sdl_renderer, sdl_texture_target); + + // copy backbuffer texture to render target buffer + if (video.screen_rendering_mode != SPECIAL_RENDERING_TARGET) + SDL_RenderCopy(sdl_renderer, sdl_texture_stream, src_rect1, dst_rect1); + + if (video.screen_rendering_mode != SPECIAL_RENDERING_BITMAP) + FinalizeScreen(DRAW_TO_SCREEN); + + // when using target texture, copy it to screen buffer + if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET || + video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) + { + SDL_SetRenderTarget(sdl_renderer, NULL); + SDL_RenderCopy(sdl_renderer, sdl_texture_target, src_rect2, dst_rect2); + } + +#if defined(USE_TOUCH_INPUT_OVERLAY) + // draw overlay graphics for touch device input, if needed + DrawTouchInputOverlay(); +#endif + +#endif + + // global synchronization point of the game to align video frame delay + if (with_frame_delay) + WaitUntilDelayReached(&video.frame_delay, video.frame_delay_value); + +#if defined(TARGET_SDL2) + // show render target buffer on screen + SDL_RenderPresent(sdl_renderer); +#else // TARGET_SDL + if (rect) + SDL_UpdateRects(screen, 1, rect); + else + SDL_UpdateRect(screen, 0, 0, 0, 0); +#endif +} + +static void UpdateScreen_WithFrameDelay(SDL_Rect *rect) +{ + UpdateScreenExt(rect, TRUE); +} + +static void UpdateScreen_WithoutFrameDelay(SDL_Rect *rect) +{ + UpdateScreenExt(rect, FALSE); } static void SDLSetWindowIcon(char *basename) @@ -153,211 +275,261 @@ static void SDLSetWindowIcon(char *basename) } #if defined(TARGET_SDL2) -SDL_Surface *SDL_DisplayFormat(SDL_Surface *surface) + +static boolean equalSDLPixelFormat(SDL_PixelFormat *format1, + SDL_PixelFormat *format2) { - if (backbuffer == NULL || - backbuffer->surface == NULL) - return NULL; + return (format1->format == format2->format && + format1->BitsPerPixel == format2->BitsPerPixel && + format1->BytesPerPixel == format2->BytesPerPixel && + format1->Rmask == format2->Rmask && + format1->Gmask == format2->Gmask && + format1->Bmask == format2->Bmask); +} + +static Pixel SDLGetColorKey(SDL_Surface *surface) +{ + Pixel color_key; - return SDL_ConvertSurface(surface, backbuffer->surface->format, 0); + if (SDL_GetColorKey(surface, &color_key) != 0) + return -1; + + return color_key; } -#endif -void SDLInitVideoDisplay(void) +static boolean SDLHasColorKey(SDL_Surface *surface) { -#if !defined(TARGET_SDL2) - if (!strEqual(setup.system.sdl_videodriver, ARG_DEFAULT)) - SDL_putenv(getStringCat2("SDL_VIDEODRIVER=", setup.system.sdl_videodriver)); + return (SDLGetColorKey(surface) != -1); +} - SDL_putenv("SDL_VIDEO_CENTERED=1"); -#endif +static boolean SDLHasAlpha(SDL_Surface *surface) +{ + SDL_BlendMode blend_mode; - /* initialize SDL video */ - if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) - Error(ERR_EXIT, "SDL_InitSubSystem() failed: %s", SDL_GetError()); + if (SDL_GetSurfaceBlendMode(surface, &blend_mode) != 0) + return FALSE; - /* set default SDL depth */ -#if !defined(TARGET_SDL2) - video.default_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel; -#else - video.default_depth = 32; // (how to determine video depth in SDL2?) -#endif + return (blend_mode == SDL_BLENDMODE_BLEND); } -void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, - boolean fullscreen) +static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha) { -#if !defined(TARGET_SDL2) - static int screen_xy[][2] = - { - { 640, 480 }, - { 800, 600 }, - { 1024, 768 }, - { -1, -1 } - }; -#endif - SDL_Rect **modes = NULL; - boolean hardware_fullscreen_available = TRUE; - int i, j; + SDL_BlendMode blend_mode = (set ? SDL_BLENDMODE_BLEND : SDL_BLENDMODE_NONE); - /* default: normal game window size */ - fullscreen_width = video.width; - fullscreen_height = video.height; - fullscreen_xoffset = 0; - fullscreen_yoffset = 0; + SDL_SetSurfaceBlendMode(surface, blend_mode); + SDL_SetSurfaceAlphaMod(surface, alpha); +} -#if !defined(TARGET_SDL2) - /* determine required standard fullscreen mode for game screen size */ - for (i = 0; screen_xy[i][0] != -1; i++) - { - if (screen_xy[i][0] >= video.width && screen_xy[i][1] >= video.height) - { - fullscreen_width = screen_xy[i][0]; - fullscreen_height = screen_xy[i][1]; +SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) +{ + SDL_PixelFormat format; + SDL_Surface *new_surface; - break; - } + if (surface == NULL) + return NULL; + + if (backbuffer && backbuffer->surface) + { + format = *backbuffer->surface->format; + format.Amask = surface->format->Amask; // keep alpha channel + } + else + { + format = *surface->format; } - fullscreen_xoffset = (fullscreen_width - video.width) / 2; - fullscreen_yoffset = (fullscreen_height - video.height) / 2; -#endif + new_surface = SDL_ConvertSurface(surface, &format, 0); -#if 1 - checked_free(video.fullscreen_modes); + if (new_surface == NULL) + Error(ERR_EXIT, "SDL_ConvertSurface() failed: %s", SDL_GetError()); - video.fullscreen_modes = NULL; - video.fullscreen_mode_current = NULL; -#endif + return new_surface; +} - video.window_scaling_percent = setup.window_scaling_percent; +boolean SDLSetNativeSurface(SDL_Surface **surface) +{ + SDL_Surface *new_surface; -#if defined(TARGET_SDL2) - int num_displays = SDL_GetNumVideoDisplays(); + if (surface == NULL || + *surface == NULL || + backbuffer == NULL || + backbuffer->surface == NULL) + return FALSE; - if (num_displays > 0) - { - // currently only display modes of first display supported - int num_modes = SDL_GetNumDisplayModes(0); + // if pixel format already optimized for destination surface, do nothing + if (equalSDLPixelFormat((*surface)->format, backbuffer->surface->format)) + return FALSE; - if (num_modes > 0) - { - modes = checked_calloc((num_modes + 1) * sizeof(SDL_Rect *)); + new_surface = SDLGetNativeSurface(*surface); - for (i = 0; i < num_modes; i++) - { - SDL_DisplayMode mode; + SDL_FreeSurface(*surface); - if (SDL_GetDisplayMode(0, i, &mode) < 0) - break; + *surface = new_surface; - modes[i] = checked_calloc(sizeof(SDL_Rect)); + return TRUE; +} - modes[i]->w = mode.w; - modes[i]->h = mode.h; - } - } - } #else - /* get available hardware supported fullscreen modes */ - modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); -#endif - if (modes == NULL) - { - /* no hardware screen modes available => no fullscreen mode support */ - // video.fullscreen_available = FALSE; - hardware_fullscreen_available = FALSE; - } - else if (modes == (SDL_Rect **)-1) - { - /* fullscreen resolution is not restricted -- all resolutions available */ - video.fullscreen_modes = checked_calloc(2 * sizeof(struct ScreenModeInfo)); +static Pixel SDLGetColorKey(SDL_Surface *surface) +{ + if ((surface->flags & SDL_SRCCOLORKEY) == 0) + return -1; - /* use native video buffer size for fullscreen mode */ - video.fullscreen_modes[0].width = video.width; - video.fullscreen_modes[0].height = video.height; + return surface->format->colorkey; +} - video.fullscreen_modes[1].width = -1; - video.fullscreen_modes[1].height = -1; - } +static boolean SDLHasColorKey(SDL_Surface *surface) +{ + return (SDLGetColorKey(surface) != -1); +} + +static boolean SDLHasAlpha(SDL_Surface *surface) +{ + return ((surface->flags & SDL_SRCALPHA) != 0); +} + +static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha) +{ + SDL_SetAlpha(surface, (set ? SDL_SRCALPHA : 0), alpha); +} + +SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL) + return NULL; + + if (!video.initialized) + new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS); + else if (SDLHasAlpha(surface)) + new_surface = SDL_DisplayFormatAlpha(surface); else - { - /* in this case, a certain number of screen modes is available */ - int num_modes = 0; + new_surface = SDL_DisplayFormat(surface); - for (i = 0; modes[i] != NULL; i++) - { - boolean found_mode = FALSE; + if (new_surface == NULL) + Error(ERR_EXIT, "%s() failed: %s", + (video.initialized ? "SDL_DisplayFormat" : "SDL_ConvertSurface"), + SDL_GetError()); - /* screen mode is smaller than video buffer size -- skip it */ - if (modes[i]->w < video.width || modes[i]->h < video.height) - continue; + return new_surface; +} - if (video.fullscreen_modes != NULL) - for (j = 0; video.fullscreen_modes[j].width != -1; j++) - if (modes[i]->w == video.fullscreen_modes[j].width && - modes[i]->h == video.fullscreen_modes[j].height) - found_mode = TRUE; +boolean SDLSetNativeSurface(SDL_Surface **surface) +{ + SDL_Surface *new_surface; - if (found_mode) /* screen mode already stored -- skip it */ - continue; + if (surface == NULL || + *surface == NULL || + !video.initialized) + return FALSE; - /* new mode found; add it to list of available fullscreen modes */ + new_surface = SDLGetNativeSurface(*surface); - num_modes++; + SDL_FreeSurface(*surface); - video.fullscreen_modes = checked_realloc(video.fullscreen_modes, - (num_modes + 1) * - sizeof(struct ScreenModeInfo)); + *surface = new_surface; - video.fullscreen_modes[num_modes - 1].width = modes[i]->w; - video.fullscreen_modes[num_modes - 1].height = modes[i]->h; + return TRUE; +} - video.fullscreen_modes[num_modes].width = -1; - video.fullscreen_modes[num_modes].height = -1; - } +#endif - if (num_modes == 0) - { - /* no appropriate screen modes available => no fullscreen mode support */ - // video.fullscreen_available = FALSE; - hardware_fullscreen_available = FALSE; - } - } +#if defined(TARGET_SDL2) +static SDL_Texture *SDLCreateTextureFromSurface(SDL_Surface *surface) +{ + if (program.headless) + return NULL; - video.fullscreen_available = hardware_fullscreen_available; + SDL_Texture *texture = SDL_CreateTextureFromSurface(sdl_renderer, surface); -#if USE_DESKTOP_FULLSCREEN - // in SDL 2.0, there is always support for desktop fullscreen mode - // (in SDL 1.2, there is only support for "real" fullscreen mode) - video.fullscreen_available = TRUE; + if (texture == NULL) + Error(ERR_EXIT, "SDL_CreateTextureFromSurface() failed: %s", + SDL_GetError()); + + return texture; +} #endif +void SDLCreateBitmapTextures(Bitmap *bitmap) +{ #if defined(TARGET_SDL2) - if (modes) - { - for (i = 0; modes[i] != NULL; i++) - checked_free(modes[i]); + if (bitmap == NULL) + return; - checked_free(modes); - } + if (bitmap->texture) + SDL_DestroyTexture(bitmap->texture); + if (bitmap->texture_masked) + SDL_DestroyTexture(bitmap->texture_masked); + + bitmap->texture = SDLCreateTextureFromSurface(bitmap->surface); + bitmap->texture_masked = SDLCreateTextureFromSurface(bitmap->surface_masked); +#endif +} + +void SDLFreeBitmapTextures(Bitmap *bitmap) +{ +#if defined(TARGET_SDL2) + if (bitmap == NULL) + return; + + if (bitmap->texture) + SDL_DestroyTexture(bitmap->texture); + if (bitmap->texture_masked) + SDL_DestroyTexture(bitmap->texture_masked); + + bitmap->texture = NULL; + bitmap->texture_masked = NULL; #endif +} -#if 0 - /* set window icon */ - SDLSetWindowIcon(program.sdl_icon_filename); +void SDLInitVideoDisplay(void) +{ +#if !defined(TARGET_SDL2) + if (!strEqual(setup.system.sdl_videodriver, ARG_DEFAULT)) + SDL_putenv(getStringCat2("SDL_VIDEODRIVER=", setup.system.sdl_videodriver)); + + SDL_putenv("SDL_VIDEO_CENTERED=1"); +#endif + + /* initialize SDL video */ + if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) + Error(ERR_EXIT, "SDL_InitSubSystem() failed: %s", SDL_GetError()); + + /* set default SDL depth */ +#if !defined(TARGET_SDL2) + video.default_depth = SDL_GetVideoInfo()->vfmt->BitsPerPixel; +#else + video.default_depth = 32; // (how to determine video depth in SDL2?) +#endif +} + +inline static void SDLInitVideoBuffer_VideoBuffer(boolean fullscreen) +{ + if (program.headless) + return; + + video.window_scaling_percent = setup.window_scaling_percent; + video.window_scaling_quality = setup.window_scaling_quality; + + SDLSetScreenRenderingMode(setup.screen_rendering_mode); + +#if defined(TARGET_SDL2) + // SDL 2.0: support for (desktop) fullscreen mode available + video.fullscreen_available = TRUE; +#else + // SDL 1.2: no support for fullscreen mode in R'n'D anymore + video.fullscreen_available = FALSE; #endif /* open SDL video output device (window or fullscreen mode) */ - if (!SDLSetVideoMode(backbuffer, fullscreen)) + if (!SDLSetVideoMode(fullscreen)) Error(ERR_EXIT, "setting video mode failed"); -#if 1 /* !!! SDL2 can only set the window icon if the window already exists !!! */ /* set window icon */ - SDLSetWindowIcon(program.sdl_icon_filename); -#endif + SDLSetWindowIcon(program.icon_filename); /* set window and icon title */ #if defined(TARGET_SDL2) @@ -365,7 +537,10 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, #else SDL_WM_SetCaption(program.window_title, program.window_title); #endif +} +inline static void SDLInitVideoBuffer_DrawBuffer() +{ /* SDL cannot directly draw to the visible video framebuffer like X11, but always uses a backbuffer, which is then blitted to the visible video framebuffer with 'SDL_UpdateRect' (or replaced with the current @@ -380,72 +555,76 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, should never be drawn to directly, it would do no harm nevertheless. */ /* create additional (symbolic) buffer for double-buffering */ -#if 1 - ReCreateBitmap(window, video.width, video.height, video.depth); -#else - *window = CreateBitmap(video.width, video.height, video.depth); -#endif + ReCreateBitmap(&window, video.width, video.height); + + /* create dummy drawing buffer for headless mode, if needed */ + if (program.headless) + ReCreateBitmap(&backbuffer, video.width, video.height); } -static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, - boolean fullscreen) +void SDLInitVideoBuffer(boolean fullscreen) +{ + SDLInitVideoBuffer_VideoBuffer(fullscreen); + SDLInitVideoBuffer_DrawBuffer(); +} + +static boolean SDLCreateScreen(boolean fullscreen) { SDL_Surface *new_surface = NULL; - static boolean fullscreen_enabled = FALSE; #if defined(TARGET_SDL2) - int surface_flags_window = SURFACE_FLAGS | SDL_WINDOW_RESIZABLE; -#if USE_DESKTOP_FULLSCREEN + int surface_flags_window = SURFACE_FLAGS | SDL_WINDOW_RESIZABLE; int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN_DESKTOP; #else - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; + int surface_flags_window = SURFACE_FLAGS; + int surface_flags_fullscreen = SURFACE_FLAGS; // (no fullscreen in SDL 1.2) #endif +#if defined(TARGET_SDL2) +#if 1 + int renderer_flags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE; #else - int surface_flags_window = SURFACE_FLAGS; - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; + /* If SDL_CreateRenderer() is called from within a VirtualBox Windows VM + _without_ enabling 2D/3D acceleration and/or guest additions installed, + it will crash if flags are *not* set to SDL_RENDERER_SOFTWARE (because + it will try to use accelerated graphics and apparently fails miserably) */ + int renderer_flags = SDL_RENDERER_SOFTWARE; +#endif + + SDLSetScreenSizeAndOffsets(video.width, video.height); #endif - int width = (fullscreen ? fullscreen_width : video.width); - int height = (fullscreen ? fullscreen_height : 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) - // store if initial screen mode on game start is fullscreen mode - if (sdl_window == NULL) - { - printf("::: GAME STARTS WITH FULLSCREEN %d\n", fullscreen); - - video.fullscreen_initial = fullscreen; - } + // store if initial screen mode is fullscreen mode when changing screen size + video.fullscreen_initial = fullscreen; -#if USE_RENDERER float window_scaling_factor = (float)setup.window_scaling_percent / 100; - float screen_scaling_factor = (fullscreen ? 1 : window_scaling_factor); - 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 1 - printf("::: use window scaling factor %f\n", screen_scaling_factor); -#endif - - if ((*backbuffer)->surface) + if (sdl_texture_stream) { - SDL_FreeSurface((*backbuffer)->surface); - (*backbuffer)->surface = NULL; + SDL_DestroyTexture(sdl_texture_stream); + sdl_texture_stream = NULL; } - if (sdl_texture) + if (sdl_texture_target) { - SDL_DestroyTexture(sdl_texture); - sdl_texture = NULL; + SDL_DestroyTexture(sdl_texture_target); + sdl_texture_target = NULL; } if (!(fullscreen && fullscreen_enabled)) @@ -463,63 +642,43 @@ static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, } } -#if 0 - Error(ERR_INFO, "::: checking 'sdl_window' ..."); - - if (sdl_window == NULL) - Error(ERR_INFO, "::: calling SDL_CreateWindow() [%d, %d, %d] ...", - setup.fullscreen, fullscreen, fullscreen_enabled); -#endif - if (sdl_window == NULL) sdl_window = SDL_CreateWindow(program.window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, -#if USE_DESKTOP_FULLSCREEN video.window_width, video.window_height, -#else - (int)(screen_scaling_factor * width), - (int)(screen_scaling_factor * height), -#endif surface_flags); if (sdl_window != NULL) { if (sdl_renderer == NULL) - sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0); + sdl_renderer = SDL_CreateRenderer(sdl_window, -1, renderer_flags); if (sdl_renderer != NULL) { - SDL_RenderSetLogicalSize(sdl_renderer, width, height); - SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); - - sdl_texture = SDL_CreateTexture(sdl_renderer, - SDL_PIXELFORMAT_ARGB8888, - SDL_TEXTUREACCESS_STREAMING, - width, height); - - if (sdl_texture != NULL) + 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); + + sdl_texture_stream = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_STREAMING, + width, height); + + if (SDL_RenderTargetSupported(sdl_renderer)) + sdl_texture_target = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_TARGET, + width, height); + + if (sdl_texture_stream != NULL) { -#if 1 - // (do not use alpha channel) - new_surface = SDL_CreateRGBSurface(0, width, height, 32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0x00000000); -#else - // (this uses an alpha channel, which we don't want here) - new_surface = SDL_CreateRGBSurface(0, width, height, 32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); -#endif + // use SDL default values for RGB masks and no alpha channel + new_surface = SDL_CreateRGBSurface(0, width, height, 32, 0,0,0, 0); if (new_surface == NULL) - Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", - SDL_GetError()); + Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); } else { @@ -536,258 +695,131 @@ static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError()); } -#else - - if (sdl_window) - SDL_DestroyWindow(sdl_window); - - sdl_window = SDL_CreateWindow(program.window_title, - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - width, height, - surface_flags); - - if (sdl_window != NULL) - new_surface = SDL_GetWindowSurface(sdl_window); -#endif - -#else - new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags); -#endif - - // store fullscreen state ("video.fullscreen_enabled" may not reflect this!) - if (new_surface != NULL) - fullscreen_enabled = fullscreen; - - return new_surface; -} +#else // TARGET_SDL -boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) -{ - boolean success = TRUE; -#if 1 -#else -#if defined(TARGET_SDL2) - // int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN_DESKTOP; - int surface_flags_window = SURFACE_FLAGS; -#else - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; - int surface_flags_window = SURFACE_FLAGS; -#endif -#endif - SDL_Surface *new_surface = NULL; + if (gfx.final_screen_bitmap == NULL) + gfx.final_screen_bitmap = CreateBitmapStruct(); - if (*backbuffer == NULL) - *backbuffer = CreateBitmapStruct(); + gfx.final_screen_bitmap->width = width; + gfx.final_screen_bitmap->height = height; - /* (real bitmap might be larger in fullscreen mode with video offsets) */ - (*backbuffer)->width = video.width; - (*backbuffer)->height = video.height; + gfx.final_screen_bitmap->surface = + SDL_SetVideoMode(width, height, video.depth, surface_flags); - if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available) + if (gfx.final_screen_bitmap->surface != NULL) { - setFullscreenParameters(setup.fullscreen_mode); - - video_xoffset = fullscreen_xoffset; - video_yoffset = fullscreen_yoffset; - - /* switch display to fullscreen mode, if available */ -#if 1 - new_surface = SDLCreateScreen(backbuffer, TRUE); -#else - -#if defined(TARGET_SDL2) - sdl_window = SDL_CreateWindow(program.window_title, - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - fullscreen_width, fullscreen_height, - surface_flags_fullscreen); - if (sdl_window != NULL) - { - new_surface = SDL_GetWindowSurface(sdl_window); - - // SDL_UpdateWindowSurface(sdl_window); // immediately map window - // UpdateScreen(NULL); // immediately map window - } -#else - new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height, - video.depth, surface_flags_fullscreen); -#endif -#endif + new_surface = + SDL_CreateRGBSurface(surface_flags, width, height, video.depth, 0,0,0, 0); if (new_surface == NULL) - { - /* switching display to fullscreen mode failed */ - Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); - - /* do not try it again */ - video.fullscreen_available = FALSE; - - success = FALSE; - } - else - { - (*backbuffer)->surface = new_surface; + Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - video.fullscreen_enabled = TRUE; - video.fullscreen_mode_current = setup.fullscreen_mode; +#if 0 + new_surface = gfx.final_screen_bitmap->surface; + gfx.final_screen_bitmap = NULL; +#endif - success = TRUE; - } } - - if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL) + else { - video_xoffset = 0; - video_yoffset = 0; - - /* switch display to window mode */ -#if 1 - new_surface = SDLCreateScreen(backbuffer, FALSE); -#else + Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); + } +#endif #if defined(TARGET_SDL2) + // store fullscreen state ("video.fullscreen_enabled" may not reflect this!) + if (new_surface != NULL) + fullscreen_enabled = fullscreen; +#endif -#if USE_RENDERER - float screen_scaling_factor = 1.2; - int test_fullscreen = 0; - int surface_flags = (test_fullscreen ? surface_flags_fullscreen : - surface_flags_window); - - if ((*backbuffer)->surface) - SDL_FreeSurface((*backbuffer)->surface); - - if (sdl_texture) - SDL_DestroyTexture(sdl_texture); - - if (sdl_renderer) - SDL_DestroyRenderer(sdl_renderer); - - if (sdl_window) - SDL_DestroyWindow(sdl_window); - - sdl_window = SDL_CreateWindow(program.window_title, - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - (int)(screen_scaling_factor * video.width), - (int)(screen_scaling_factor * video.height), - surface_flags); - - if (sdl_window != NULL) - { - sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0); + if (backbuffer == NULL) + backbuffer = CreateBitmapStruct(); - if (sdl_renderer != NULL) - { - SDL_RenderSetLogicalSize(sdl_renderer, video.width, video.height); - SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); + backbuffer->width = video.width; + backbuffer->height = video.height; - sdl_texture = SDL_CreateTexture(sdl_renderer, - SDL_PIXELFORMAT_ARGB8888, - SDL_TEXTUREACCESS_STREAMING, - video.width, video.height); + if (backbuffer->surface) + SDL_FreeSurface(backbuffer->surface); - if (sdl_texture != NULL) - { -#if 1 - // (do not use alpha channel) - new_surface = SDL_CreateRGBSurface(0, video.width, video.height, 32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0x00000000); -#else - // (this uses an alpha channel, which we don't want here) - new_surface = SDL_CreateRGBSurface(0, video.width, video.height, 32, - 0x00FF0000, - 0x0000FF00, - 0x000000FF, - 0xFF000000); -#endif + backbuffer->surface = new_surface; - if (new_surface == NULL) - Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", - SDL_GetError()); - } - else - { - Error(ERR_WARN, "SDL_CreateTexture() failed: %s", SDL_GetError()); - } - } - else - { - Error(ERR_WARN, "SDL_CreateRenderer() failed: %s", SDL_GetError()); - } - } - else - { - Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError()); - } + return (new_surface != NULL); +} -#else +boolean SDLSetVideoMode(boolean fullscreen) +{ + boolean success = FALSE; - if (sdl_window) - SDL_DestroyWindow(sdl_window); + SetWindowTitle(); - sdl_window = SDL_CreateWindow(program.window_title, - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - video.width, video.height, - surface_flags_window); + if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available) + { + /* switch display to fullscreen mode, if available */ + success = SDLCreateScreen(TRUE); - if (sdl_window != NULL) + if (!success) { - new_surface = SDL_GetWindowSurface(sdl_window); - - // SDL_UpdateWindowSurface(sdl_window); // immediately map window - // UpdateScreen(NULL); // immediately map window + /* switching display to fullscreen mode failed -- do not try it again */ + video.fullscreen_available = FALSE; } -#endif + else + { + video.fullscreen_enabled = TRUE; + } + } -#else - new_surface = SDL_SetVideoMode(video.width, video.height, - video.depth, surface_flags_window); -#endif -#endif + if ((!fullscreen && video.fullscreen_enabled) || !success) + { + /* switch display to window mode */ + success = SDLCreateScreen(FALSE); - if (new_surface == NULL) + if (!success) { /* switching display to window mode failed -- should not happen */ - Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); - - success = FALSE; } else { - (*backbuffer)->surface = new_surface; - video.fullscreen_enabled = FALSE; video.window_scaling_percent = setup.window_scaling_percent; + video.window_scaling_quality = setup.window_scaling_quality; - success = TRUE; + SDLSetScreenRenderingMode(setup.screen_rendering_mode); } } #if defined(TARGET_SDL2) SDLRedrawWindow(); // map window - // UpdateScreen(NULL); // map window #endif -#if 1 +#ifdef DEBUG +#if defined(PLATFORM_WIN32) + // experimental drag and drop code + SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE); -#if defined(PLATFORM_WIN32) { SDL_SysWMinfo wminfo; HWND hwnd; + boolean wminfo_success = FALSE; SDL_VERSION(&wminfo.version); - SDL_GetWMInfo(&wminfo); +#if defined(TARGET_SDL2) + if (sdl_window) + wminfo_success = SDL_GetWindowWMInfo(sdl_window, &wminfo); +#else + wminfo_success = (SDL_GetWMInfo(&wminfo) == 1); +#endif - hwnd = wminfo.window; + if (wminfo_success) + { +#if defined(TARGET_SDL2) + hwnd = wminfo.info.win.window; +#else + hwnd = wminfo.window; +#endif - DragAcceptFiles(hwnd, TRUE); + DragAcceptFiles(hwnd, TRUE); + } } #endif #endif @@ -795,6 +827,15 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) return success; } +void SDLSetWindowTitle() +{ +#if defined(TARGET_SDL2) + SDL_SetWindowTitle(sdl_window, program.window_title); +#else + SDL_WM_SetCaption(program.window_title, program.window_title); +#endif +} + #if defined(TARGET_SDL2) void SDLSetWindowScaling(int window_scaling_percent) { @@ -802,16 +843,57 @@ 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); - - Error(ERR_DEBUG, "::: SDLSetWindowScaling(%d) ...", window_scaling_percent); + 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); video.window_scaling_percent = window_scaling_percent; video.window_width = new_window_width; video.window_height = new_window_height; + + SetWindowTitle(); +} + +void SDLSetWindowScalingQuality(char *window_scaling_quality) +{ + SDL_Texture *new_texture; + + if (sdl_texture_stream == NULL) + return; + + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, window_scaling_quality); + + new_texture = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_STREAMING, + video.width, video.height); + + if (new_texture != NULL) + { + SDL_DestroyTexture(sdl_texture_stream); + + sdl_texture_stream = new_texture; + } + + if (SDL_RenderTargetSupported(sdl_renderer)) + new_texture = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_TARGET, + video.width, video.height); + else + new_texture = NULL; + + if (new_texture != NULL) + { + SDL_DestroyTexture(sdl_texture_target); + + sdl_texture_target = new_texture; + } + + SDLRedrawWindow(); + + video.window_scaling_quality = window_scaling_quality; } void SDLSetWindowFullscreen(boolean fullscreen) @@ -819,22 +901,12 @@ void SDLSetWindowFullscreen(boolean fullscreen) if (sdl_window == NULL) return; -#if USE_DESKTOP_FULLSCREEN int flags = (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); -#else - int flags = (fullscreen ? SDL_WINDOW_FULLSCREEN : 0); -#endif - - Error(ERR_DEBUG, "::: SDL_SetWindowFullscreen(%d) ...", fullscreen); if (SDL_SetWindowFullscreen(sdl_window, flags) == 0) - video.fullscreen_enabled = fullscreen; + video.fullscreen_enabled = fullscreen_enabled = fullscreen; - printf("::: SDLSetWindowFullscreen: %d, %d\n", - fullscreen, video.fullscreen_initial); - -#if 1 - // if game started in fullscreen mode, window will also get fullscreen size + // if screen size was changed in fullscreen mode, correct desktop window size if (!fullscreen && video.fullscreen_initial) { SDLSetWindowScaling(setup.window_scaling_percent); @@ -843,31 +915,105 @@ 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(USE_COMPLETE_DISPLAY) + 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 SDLRedrawWindow() +void SDLSetScreenSizeForRenderer(int width, int height) +{ + SDL_RenderSetLogicalSize(sdl_renderer, width, height); +} + +void SDLSetScreenProperties() { - UpdateScreen(NULL); + SDLSetScreenSizeAndOffsets(video.width, video.height); + SDLSetScreenSizeForRenderer(video.screen_width, video.screen_height); } + +#endif + +void SDLSetScreenRenderingMode(char *screen_rendering_mode) +{ +#if defined(TARGET_SDL2) + video.screen_rendering_mode = + (strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_BITMAP) ? + SPECIAL_RENDERING_BITMAP : + strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_TARGET) ? + SPECIAL_RENDERING_TARGET: + strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_DOUBLE) ? + SPECIAL_RENDERING_DOUBLE : SPECIAL_RENDERING_OFF); +#else + video.screen_rendering_mode = SPECIAL_RENDERING_BITMAP; #endif +} + +void SDLRedrawWindow() +{ + UpdateScreen_WithoutFrameDelay(NULL); +} -void SDLCreateBitmapContent(Bitmap *new_bitmap, int width, int height, +void SDLCreateBitmapContent(Bitmap *bitmap, int width, int height, int depth) { - SDL_Surface *surface_tmp, *surface_native; + if (program.headless) + return; - if ((surface_tmp = SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, depth, - 0, 0, 0, 0)) - == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); + SDL_Surface *surface = + SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, depth, 0,0,0, 0); - if ((surface_native = SDL_DisplayFormat(surface_tmp)) == NULL) - Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + if (surface == NULL) + Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - SDL_FreeSurface(surface_tmp); + SDLSetNativeSurface(&surface); - new_bitmap->surface = surface_native; + bitmap->surface = surface; } void SDLFreeBitmapPointers(Bitmap *bitmap) @@ -876,8 +1022,19 @@ void SDLFreeBitmapPointers(Bitmap *bitmap) SDL_FreeSurface(bitmap->surface); if (bitmap->surface_masked) SDL_FreeSurface(bitmap->surface_masked); + bitmap->surface = NULL; bitmap->surface_masked = NULL; + +#if defined(TARGET_SDL2) + if (bitmap->texture) + SDL_DestroyTexture(bitmap->texture); + if (bitmap->texture_masked) + SDL_DestroyTexture(bitmap->texture_masked); + + bitmap->texture = NULL; + bitmap->texture_masked = NULL; +#endif } void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, @@ -887,23 +1044,11 @@ void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap); SDL_Rect src_rect, dst_rect; - if (src_bitmap == backbuffer) - { - src_x += video_xoffset; - src_y += video_yoffset; - } - src_rect.x = src_x; src_rect.y = src_y; src_rect.w = width; src_rect.h = height; - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - dst_x += video_xoffset; - dst_y += video_yoffset; - } - dst_rect.x = dst_x; dst_rect.y = dst_y; dst_rect.w = width; @@ -915,16 +1060,36 @@ void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, src_bitmap->surface_masked : src_bitmap->surface), &src_rect, real_dst_bitmap->surface, &dst_rect); -#if defined(TARGET_SDL2) - if (dst_bitmap == window) - { - // SDL_UpdateWindowSurface(sdl_window); - // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect, 1); - UpdateScreen(&dst_rect); - } -#else if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height); + UpdateScreen_WithFrameDelay(&dst_rect); +} + +void SDLBlitTexture(Bitmap *bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y, int mask_mode) +{ +#if defined(TARGET_SDL2) + SDL_Texture *texture; + SDL_Rect src_rect; + SDL_Rect dst_rect; + + texture = + (mask_mode == BLIT_MASKED ? bitmap->texture_masked : bitmap->texture); + + if (texture == NULL) + return; + + src_rect.x = src_x; + src_rect.y = src_y; + src_rect.w = width; + src_rect.h = height; + + dst_rect.x = dst_x; + dst_rect.y = dst_y; + dst_rect.w = width; + dst_rect.h = height; + + SDL_RenderCopy(sdl_renderer, texture, &src_rect, &dst_rect); #endif } @@ -934,12 +1099,6 @@ void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height, Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap); SDL_Rect rect; - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - x += video_xoffset; - y += video_yoffset; - } - rect.x = x; rect.y = y; rect.w = width; @@ -947,136 +1106,77 @@ void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height, SDL_FillRect(real_dst_bitmap->surface, &rect, color); -#if defined(TARGET_SDL2) - if (dst_bitmap == window) - { - // SDL_UpdateWindowSurface(sdl_window); - // SDL_UpdateWindowSurfaceRects(sdl_window, &rect, 1); - UpdateScreen(&rect); - } -#else if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, x, y, width, height); -#endif + UpdateScreen_WithFrameDelay(&rect); +} + +void PrepareFadeBitmap(int draw_target) +{ + Bitmap *fade_bitmap = + (draw_target == DRAW_TO_FADE_SOURCE ? gfx.fade_bitmap_source : + draw_target == DRAW_TO_FADE_TARGET ? gfx.fade_bitmap_target : NULL); + + if (fade_bitmap == NULL) + return; + + // copy backbuffer to fading buffer + BlitBitmap(backbuffer, fade_bitmap, 0, 0, gfx.win_xsize, gfx.win_ysize, 0, 0); + + // add border and animations to fading buffer + FinalizeScreen(draw_target); } -void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, +void SDLFadeRectangle(int x, int y, int width, int height, int fade_mode, int fade_delay, int post_delay, void (*draw_border_function)(void)) { - static boolean initialization_needed = TRUE; - static SDL_Surface *surface_source = NULL; - static SDL_Surface *surface_target = NULL; - static SDL_Surface *surface_black = NULL; + SDL_Surface *surface_backup = gfx.fade_bitmap_backup->surface; + SDL_Surface *surface_source = gfx.fade_bitmap_source->surface; + SDL_Surface *surface_target = gfx.fade_bitmap_target->surface; + SDL_Surface *surface_black = gfx.fade_bitmap_black->surface; SDL_Surface *surface_screen = backbuffer->surface; - SDL_Surface *surface_cross = (bitmap_cross ? bitmap_cross->surface : NULL); SDL_Rect src_rect, dst_rect; -#if defined(TARGET_SDL2) SDL_Rect dst_rect2; -#endif int src_x = x, src_y = y; int dst_x = x, dst_y = y; unsigned int time_last, time_current; - /* check if screen size has changed */ - if (surface_source != NULL && (video.width != surface_source->w || - video.height != surface_source->h)) - { - SDL_FreeSurface(surface_source); - SDL_FreeSurface(surface_target); - SDL_FreeSurface(surface_black); + // store function for drawing global masked border + void (*draw_global_border_function)(int) = gfx.draw_global_border_function; - initialization_needed = TRUE; - } + // deactivate drawing of global border while fading, if needed + if (draw_border_function == NULL) + gfx.draw_global_border_function = NULL; src_rect.x = src_x; src_rect.y = src_y; src_rect.w = width; src_rect.h = height; - dst_x += video_xoffset; - dst_y += video_yoffset; - dst_rect.x = dst_x; dst_rect.y = dst_y; dst_rect.w = width; /* (ignored) */ dst_rect.h = height; /* (ignored) */ -#if defined(TARGET_SDL2) dst_rect2 = dst_rect; -#endif - - if (initialization_needed) - { -#if defined(TARGET_SDL2) - unsigned int flags = 0; -#else - unsigned int flags = SDL_SRCALPHA; - /* use same surface type as screen surface */ - if ((surface_screen->flags & SDL_HWSURFACE)) - flags |= SDL_HWSURFACE; - else - flags |= SDL_SWSURFACE; -#endif - - /* create surface for temporary copy of screen buffer (source) */ - if ((surface_source = - SDL_CreateRGBSurface(flags, - video.width, - video.height, - surface_screen->format->BitsPerPixel, - surface_screen->format->Rmask, - surface_screen->format->Gmask, - surface_screen->format->Bmask, - surface_screen->format->Amask)) == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - /* create surface for cross-fading screen buffer (target) */ - if ((surface_target = - SDL_CreateRGBSurface(flags, - video.width, - video.height, - surface_screen->format->BitsPerPixel, - surface_screen->format->Rmask, - surface_screen->format->Gmask, - surface_screen->format->Bmask, - surface_screen->format->Amask)) == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - /* create black surface for fading from/to black */ - if ((surface_black = - SDL_CreateRGBSurface(flags, - video.width, - video.height, - surface_screen->format->BitsPerPixel, - surface_screen->format->Rmask, - surface_screen->format->Gmask, - surface_screen->format->Bmask, - surface_screen->format->Amask)) == NULL) - Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); - - /* completely fill the surface with black color pixels */ - SDL_FillRect(surface_black, NULL, - SDL_MapRGB(surface_screen->format, 0, 0, 0)); - - initialization_needed = FALSE; - } + // before fading in, store backbuffer (without animation graphics) + if (fade_mode & (FADE_TYPE_FADE_IN | FADE_TYPE_TRANSFORM)) + SDL_BlitSurface(surface_screen, &dst_rect, surface_backup, &src_rect); /* copy source and target surfaces to temporary surfaces for fading */ if (fade_mode & FADE_TYPE_TRANSFORM) { - SDL_BlitSurface(surface_cross, &src_rect, surface_source, &src_rect); - SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect); + // (source and target fading buffer already prepared) } else if (fade_mode & FADE_TYPE_FADE_IN) { + // (target fading buffer already prepared) SDL_BlitSurface(surface_black, &src_rect, surface_source, &src_rect); - SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect); } else /* FADE_TYPE_FADE_OUT */ { - SDL_BlitSurface(surface_screen, &dst_rect, surface_source, &src_rect); + // (source fading buffer already prepared) SDL_BlitSurface(surface_black, &src_rect, surface_target, &src_rect); } @@ -1094,11 +1194,8 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, int i; SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); -#if defined(TARGET_SDL2) - SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_NONE); -#else - SDL_SetAlpha(surface_target, 0, 0); /* disable alpha blending */ -#endif + + SDLSetAlpha(surface_target, FALSE, 0); /* disable alpha blending */ ypos[0] = -GetSimpleRandom(16); @@ -1200,17 +1297,66 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, if (draw_border_function != NULL) draw_border_function(); -#if defined(TARGET_SDL2) - // SDL_UpdateWindowSurface(sdl_window); - // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect2, 1); - UpdateScreen(&dst_rect2); -#else - SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); -#endif + UpdateScreen_WithFrameDelay(&dst_rect2); } } } - else + else if (fade_mode == FADE_MODE_CURTAIN) + { + float xx; + int xx_final; + int xx_size = width / 2; + + SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect); + + SDLSetAlpha(surface_source, FALSE, 0); /* disable alpha blending */ + + for (xx = 0; xx < xx_size;) + { + time_last = time_current; + time_current = SDL_GetTicks(); + xx += xx_size * ((float)(time_current - time_last) / fade_delay); + xx_final = MIN(MAX(0, xx), xx_size); + + src_rect.x = src_x; + src_rect.y = src_y; + src_rect.w = width; + src_rect.h = height; + + dst_rect.x = dst_x; + dst_rect.y = dst_y; + + /* draw new (target) image to screen buffer */ + SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect); + + if (xx_final < xx_size) + { + src_rect.w = xx_size - xx_final; + src_rect.h = height; + + /* draw old (source) image to screen buffer (left side) */ + + src_rect.x = src_x + xx_final; + dst_rect.x = dst_x; + + SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); + + /* draw old (source) image to screen buffer (right side) */ + + src_rect.x = src_x + xx_size; + dst_rect.x = dst_x + xx_size + xx_final; + + SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); + } + + if (draw_border_function != NULL) + draw_border_function(); + + /* only update the region of the screen that is affected from fading */ + UpdateScreen_WithFrameDelay(&dst_rect2); + } + } + else /* fading in, fading out or cross-fading */ { float alpha; int alpha_final; @@ -1226,33 +1372,39 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect); /* draw new (target) image to screen buffer using alpha blending */ -#if defined(TARGET_SDL2) - SDL_SetSurfaceAlphaMod(surface_target, alpha_final); - SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_BLEND); -#else - SDL_SetAlpha(surface_target, SDL_SRCALPHA, alpha_final); -#endif + SDLSetAlpha(surface_target, TRUE, alpha_final); SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect); if (draw_border_function != NULL) draw_border_function(); -#if 1 /* only update the region of the screen that is affected from fading */ -#if defined(TARGET_SDL2) - // SDL_UpdateWindowSurface(sdl_window); - // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect, 1); - UpdateScreen(&dst_rect); -#else - SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); -#endif -#else - SDL_Flip(surface_screen); -#endif + UpdateScreen_WithFrameDelay(&dst_rect); + } + } + + if (post_delay > 0) + { + unsigned int time_post_delay; + + time_current = SDL_GetTicks(); + time_post_delay = time_current + post_delay; + + while (time_current < time_post_delay) + { + // updating the screen contains waiting for frame delay (non-busy) + UpdateScreen_WithFrameDelay(NULL); + + time_current = SDL_GetTicks(); } } - Delay(post_delay); + // restore function for drawing global masked border + gfx.draw_global_border_function = draw_global_border_function; + + // after fading in, restore backbuffer (without animation graphics) + if (fade_mode & (FADE_TYPE_FADE_IN | FADE_TYPE_TRANSFORM)) + SDL_BlitSurface(surface_backup, &dst_rect, surface_screen, &src_rect); } void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y, @@ -1272,30 +1424,16 @@ void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y, rect.w = (to_x - from_x + 1); rect.h = (to_y - from_y + 1); - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - rect.x += video_xoffset; - rect.y += video_yoffset; - } - SDL_FillRect(surface, &rect, color); } void SDLDrawLine(Bitmap *dst_bitmap, int from_x, int from_y, - int to_x, int to_y, Uint32 color) -{ - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - from_x += video_xoffset; - from_y += video_yoffset; - to_x += video_xoffset; - to_y += video_yoffset; - } - + int to_x, int to_y, Uint32 color) +{ sge_Line(dst_bitmap->surface, from_x, from_y, to_x, to_y, color); } -#if 0 +#if ENABLE_UNUSED_CODE void SDLDrawLines(SDL_Surface *surface, struct XY *points, int num_points, Uint32 color) { @@ -1329,12 +1467,6 @@ Pixel SDLGetPixel(Bitmap *src_bitmap, int x, int y) { SDL_Surface *surface = src_bitmap->surface; - if (src_bitmap == backbuffer || src_bitmap == window) - { - x += video_xoffset; - y += video_yoffset; - } - switch (surface->format->BytesPerPixel) { case 1: /* assuming 8-bpp */ @@ -1380,7 +1512,7 @@ Pixel SDLGetPixel(Bitmap *src_bitmap, int x, int y) /* ========================================================================= */ /* The following functions were taken from the SGE library */ -/* (SDL Graphics Extension Library) by Anders Lindström */ +/* (SDL Graphics Extension Library) by Anders Lindström */ /* http://www.etek.chalmers.se/~e8cal1/sge/index.html */ /* ========================================================================= */ @@ -1826,12 +1958,6 @@ void sge_LineRGB(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, void SDLPutPixel(Bitmap *dst_bitmap, int x, int y, Pixel pixel) { - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - x += video_xoffset; - y += video_yoffset; - } - sge_PutPixel(dst_bitmap->surface, x, y, pixel); } @@ -1903,17 +2029,11 @@ int zoomSurfaceRGBA_scaleDownBy2(SDL_Surface *src, SDL_Surface *dst) { int x, y; tColorRGBA *sp, *csp, *dp; -#if 0 - int sgap; -#endif int dgap; /* pointer setup */ sp = csp = (tColorRGBA *) src->pixels; dp = (tColorRGBA *) dst->pixels; -#if 0 - sgap = src->pitch - src->w * 4; -#endif dgap = dst->pitch - dst->w * 4; for (y = 0; y < dst->h; y++) @@ -1958,11 +2078,9 @@ int zoomSurfaceRGBA_scaleDownBy2(SDL_Surface *src, SDL_Surface *dst) int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) { - int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy; - tColorRGBA *sp, *csp, *dp; -#if 0 - int sgap; -#endif + int x, y, *sax, *say, *csax, *csay; + float sx, sy; + tColorRGBA *sp, *csp, *csp0, *dp; int dgap; /* use specialized zoom function when scaling down to exactly half size */ @@ -1971,40 +2089,23 @@ int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) return zoomSurfaceRGBA_scaleDownBy2(src, dst); /* variable setup */ - sx = (int) (65536.0 * (float) src->w / (float) dst->w); - sy = (int) (65536.0 * (float) src->h / (float) dst->h); + sx = (float) src->w / (float) dst->w; + sy = (float) src->h / (float) dst->h; /* allocate memory for row increments */ - sax = (int *)checked_malloc((dst->w + 1) * sizeof(Uint32)); - say = (int *)checked_malloc((dst->h + 1) * sizeof(Uint32)); + csax = sax = (int *)checked_malloc((dst->w + 1) * sizeof(Uint32)); + csay = say = (int *)checked_malloc((dst->h + 1) * sizeof(Uint32)); /* precalculate row increments */ - csx = 0; - csax = sax; for (x = 0; x <= dst->w; x++) - { - *csax = csx; - csax++; - csx &= 0xffff; - csx += sx; - } + *csax++ = (int)(sx * x); - csy = 0; - csay = say; for (y = 0; y <= dst->h; y++) - { - *csay = csy; - csay++; - csy &= 0xffff; - csy += sy; - } + *csay++ = (int)(sy * y); /* pointer setup */ - sp = csp = (tColorRGBA *) src->pixels; + sp = csp = csp0 = (tColorRGBA *) src->pixels; dp = (tColorRGBA *) dst->pixels; -#if 0 - sgap = src->pitch - src->w * 4; -#endif dgap = dst->pitch - dst->w * 4; csay = say; @@ -2020,7 +2121,7 @@ int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) /* advance source pointers */ csax++; - sp += (*csax >> 16); + sp = csp + *csax; /* advance destination pointer */ dp++; @@ -2028,7 +2129,7 @@ int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) /* advance source pointer */ csay++; - csp = (tColorRGBA *) ((Uint8 *) csp + (*csay >> 16) * src->pitch); + csp = (tColorRGBA *) ((Uint8 *) csp0 + *csay * src->pitch); /* advance destination pointers */ dp = (tColorRGBA *) ((Uint8 *) dp + dgap); @@ -2170,8 +2271,9 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) else { /* new source surface is 32 bit with a defined RGB ordering */ - zoom_src = SDL_CreateRGBSurface(SDL_SWSURFACE, src->w, src->h, 32, - 0x000000ff, 0x0000ff00, 0x00ff0000, 0); + zoom_src = SDL_CreateRGBSurface(SURFACE_FLAGS, src->w, src->h, 32, + 0x000000ff, 0x0000ff00, 0x00ff0000, + (src->format->Amask ? 0xff000000 : 0)); SDL_BlitSurface(src, NULL, zoom_src, NULL); is_32bit = TRUE; is_converted = TRUE; @@ -2181,15 +2283,16 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) if (is_32bit) { /* target surface is 32 bit with source RGBA/ABGR ordering */ - zoom_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dst_width, dst_height, 32, + zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 32, zoom_src->format->Rmask, zoom_src->format->Gmask, - zoom_src->format->Bmask, 0); + zoom_src->format->Bmask, + zoom_src->format->Amask); } else { /* target surface is 8 bit */ - zoom_dst = SDL_CreateRGBSurface(SDL_SWSURFACE, dst_width, dst_height, 8, + zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 8, 0, 0, 0, 0); } @@ -2225,23 +2328,55 @@ SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) return zoom_dst; } -void SDLZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap) +static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL) + return NULL; + + if ((new_surface = SDLGetNativeSurface(surface)) == NULL) + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); + + /* remove alpha channel from native non-transparent surface, if defined */ + SDLSetAlpha(new_surface, FALSE, 0); + + /* remove transparent color from native non-transparent surface, if defined */ + SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0); + + return new_surface; +} + +Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) { - SDL_Surface *sdl_surface_tmp; - int dst_width = dst_bitmap->width; - int dst_height = dst_bitmap->height; + Bitmap *dst_bitmap = CreateBitmapStruct(); + 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 */ - /* throw away old destination surface */ - SDL_FreeSurface(dst_bitmap->surface); + dst_bitmap->width = dst_width; + dst_bitmap->height = dst_height; /* create zoomed temporary surface from source surface */ - sdl_surface_tmp = zoomSurface(src_bitmap->surface, dst_width, dst_height); + dst_surface = zoomSurface(src_surface, dst_width, dst_height); /* create native format destination surface from zoomed temporary surface */ - dst_bitmap->surface = SDL_DisplayFormat(sdl_surface_tmp); + SDLSetNativeSurface(&dst_surface); - /* free temporary surface */ - SDL_FreeSurface(sdl_surface_tmp); + /* set color key for zoomed surface from source surface, if defined */ + if (SDLHasColorKey(src_surface)) + SDL_SetColorKey(dst_surface, SET_TRANSPARENT_PIXEL, + SDLGetColorKey(src_surface)); + + /* create native non-transparent surface for opaque blitting */ + dst_bitmap->surface = SDLGetOpaqueSurface(dst_surface); + + /* set native transparent surface for masked blitting */ + dst_bitmap->surface_masked = dst_surface; + + return dst_bitmap; } @@ -2254,45 +2389,45 @@ Bitmap *SDLLoadImage(char *filename) Bitmap *new_bitmap = CreateBitmapStruct(); SDL_Surface *sdl_image_tmp; + if (program.headless) + { + /* prevent sanity check warnings at later stage */ + new_bitmap->width = new_bitmap->height = 1; + + return new_bitmap; + } + print_timestamp_init("SDLLoadImage"); print_timestamp_time(getBaseNamePtr(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 = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); - - return NULL; - } + if ((new_bitmap->surface = SDLGetOpaqueSurface(sdl_image_tmp)) == NULL) + Error(ERR_EXIT, "SDLGetOpaqueSurface() failed"); - print_timestamp_time("SDL_DisplayFormat (opaque)"); + print_timestamp_time("SDLGetNativeSurface (opaque)"); UPDATE_BUSY_STATE(); - /* create native transparent surface for current image */ - SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL, - SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00)); - if ((new_bitmap->surface_masked = SDL_DisplayFormat(sdl_image_tmp)) == NULL) - { - SetError("SDL_DisplayFormat(): %s", SDL_GetError()); + /* set black pixel to transparent if no alpha channel / transparent color */ + if (!SDLHasAlpha(sdl_image_tmp) && + !SDLHasColorKey(sdl_image_tmp)) + SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL, + SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00)); - return NULL; - } + /* create native transparent surface for current image */ + if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL) + Error(ERR_EXIT, "SDLGetNativeSurface() failed"); - print_timestamp_time("SDL_DisplayFormat (masked)"); + print_timestamp_time("SDLGetNativeSurface (masked)"); UPDATE_BUSY_STATE(); @@ -2351,6 +2486,9 @@ void SDLSetMouseCursor(struct MouseCursorInfo *cursor_info) void SDLOpenAudio(void) { + if (program.headless) + return; + #if !defined(TARGET_SDL2) if (!strEqual(setup.system.sdl_audiodriver, ARG_DEFAULT)) SDL_putenv(getStringCat2("SDL_AUDIODRIVER=", setup.system.sdl_audiodriver)); @@ -2400,41 +2538,28 @@ void SDLCloseAudio(void) void SDLNextEvent(Event *event) { SDL_WaitEvent(event); - - if (event->type == EVENT_BUTTONPRESS || - event->type == EVENT_BUTTONRELEASE) - { - if (((ButtonEvent *)event)->x > video_xoffset) - ((ButtonEvent *)event)->x -= video_xoffset; - else - ((ButtonEvent *)event)->x = 0; - if (((ButtonEvent *)event)->y > video_yoffset) - ((ButtonEvent *)event)->y -= video_yoffset; - else - ((ButtonEvent *)event)->y = 0; - } - else if (event->type == EVENT_MOTIONNOTIFY) - { - if (((MotionEvent *)event)->x > video_xoffset) - ((MotionEvent *)event)->x -= video_xoffset; - else - ((MotionEvent *)event)->x = 0; - if (((MotionEvent *)event)->y > video_yoffset) - ((MotionEvent *)event)->y -= video_yoffset; - else - ((MotionEvent *)event)->y = 0; - } } void SDLHandleWindowManagerEvent(Event *event) { +#ifdef DEBUG #if defined(PLATFORM_WIN32) + // experimental drag and drop code + SDL_SysWMEvent *syswmevent = (SDL_SysWMEvent *)event; SDL_SysWMmsg *syswmmsg = (SDL_SysWMmsg *)(syswmevent->msg); +#if defined(TARGET_SDL2) + if (syswmmsg->msg.win.msg == WM_DROPFILES) +#else if (syswmmsg->msg == WM_DROPFILES) +#endif { +#if defined(TARGET_SDL2) + HDROP hdrop = (HDROP)syswmmsg->msg.win.wParam; +#else HDROP hdrop = (HDROP)syswmmsg->wParam; +#endif int i, num_files; printf("::: SDL_SYSWMEVENT:\n"); @@ -2451,9 +2576,14 @@ void SDLHandleWindowManagerEvent(Event *event) printf("::: - '%s'\n", buffer); } +#if defined(TARGET_SDL2) + DragFinish((HDROP)syswmmsg->msg.win.wParam); +#else DragFinish((HDROP)syswmmsg->wParam); +#endif } #endif +#endif } @@ -2461,31 +2591,83 @@ void SDLHandleWindowManagerEvent(Event *event) /* joystick functions */ /* ========================================================================= */ -static SDL_Joystick *sdl_joystick[MAX_PLAYERS] = { NULL, NULL, NULL, NULL }; -static int sdl_js_axis[MAX_PLAYERS][2] = { {0, 0}, {0, 0}, {0, 0}, {0, 0} }; -static int sdl_js_button[MAX_PLAYERS][2] = { {0, 0}, {0, 0}, {0, 0}, {0, 0} }; +#if defined(TARGET_SDL2) +static void *sdl_joystick[MAX_PLAYERS]; // game controller or joystick +#else +static SDL_Joystick *sdl_joystick[MAX_PLAYERS]; // only joysticks supported +#endif +static int sdl_js_axis_raw[MAX_PLAYERS][2]; +static int sdl_js_axis[MAX_PLAYERS][2]; +static int sdl_js_button[MAX_PLAYERS][2]; +static boolean sdl_is_controller[MAX_PLAYERS]; + +void SDLClearJoystickState() +{ + int i, j; + + for (i = 0; i < MAX_PLAYERS; i++) + { + for (j = 0; j < 2; j++) + { + sdl_js_axis_raw[i][j] = -1; + sdl_js_axis[i][j] = 0; + sdl_js_button[i][j] = 0; + } + } +} -static boolean SDLOpenJoystick(int nr) +boolean SDLOpenJoystick(int nr) { - if (nr < 0 || nr > MAX_PLAYERS) + if (nr < 0 || nr >= MAX_PLAYERS) return FALSE; - return ((sdl_joystick[nr] = SDL_JoystickOpen(nr)) == NULL ? FALSE : TRUE); +#if defined(TARGET_SDL2) + sdl_is_controller[nr] = SDL_IsGameController(nr); +#else + sdl_is_controller[nr] = FALSE; +#endif + +#if 1 + Error(ERR_DEBUG, "opening joystick %d (%s)", + nr, (sdl_is_controller[nr] ? "game controller" : "joystick")); +#endif + +#if defined(TARGET_SDL2) + if (sdl_is_controller[nr]) + sdl_joystick[nr] = SDL_GameControllerOpen(nr); + else + sdl_joystick[nr] = SDL_JoystickOpen(nr); +#else + sdl_joystick[nr] = SDL_JoystickOpen(nr); +#endif + + return (sdl_joystick[nr] != NULL); } -static void SDLCloseJoystick(int nr) +void SDLCloseJoystick(int nr) { - if (nr < 0 || nr > MAX_PLAYERS) + if (nr < 0 || nr >= MAX_PLAYERS) return; +#if 1 + Error(ERR_DEBUG, "closing joystick %d", nr); +#endif + +#if defined(TARGET_SDL2) + if (sdl_is_controller[nr]) + SDL_GameControllerClose(sdl_joystick[nr]); + else + SDL_JoystickClose(sdl_joystick[nr]); +#else SDL_JoystickClose(sdl_joystick[nr]); +#endif sdl_joystick[nr] = NULL; } -static boolean SDLCheckJoystickOpened(int nr) +boolean SDLCheckJoystickOpened(int nr) { - if (nr < 0 || nr > MAX_PLAYERS) + if (nr < 0 || nr >= MAX_PLAYERS) return FALSE; #if defined(TARGET_SDL2) @@ -2495,23 +2677,164 @@ static boolean SDLCheckJoystickOpened(int nr) #endif } +static void setJoystickAxis(int nr, int axis_id_raw, int axis_value) +{ +#if defined(TARGET_SDL2) + int axis_id = (axis_id_raw == SDL_CONTROLLER_AXIS_LEFTX || + axis_id_raw == SDL_CONTROLLER_AXIS_RIGHTX ? 0 : + axis_id_raw == SDL_CONTROLLER_AXIS_LEFTY || + axis_id_raw == SDL_CONTROLLER_AXIS_RIGHTY ? 1 : -1); +#else + int axis_id = axis_id_raw % 2; +#endif + + if (nr < 0 || nr >= MAX_PLAYERS) + return; + + if (axis_id == -1) + return; + + // prevent (slightly jittering, but centered) axis A from resetting axis B + if (ABS(axis_value) < JOYSTICK_PERCENT * JOYSTICK_MAX_AXIS_POS / 100 && + axis_id_raw != sdl_js_axis_raw[nr][axis_id]) + return; + + sdl_js_axis[nr][axis_id] = axis_value; + sdl_js_axis_raw[nr][axis_id] = axis_id_raw; +} + +static void setJoystickButton(int nr, int button_id_raw, int button_state) +{ +#if defined(TARGET_SDL2) + int button_id = (button_id_raw == SDL_CONTROLLER_BUTTON_A || + button_id_raw == SDL_CONTROLLER_BUTTON_X || + button_id_raw == SDL_CONTROLLER_BUTTON_LEFTSHOULDER || + button_id_raw == SDL_CONTROLLER_BUTTON_LEFTSTICK || + button_id_raw == SDL_CONTROLLER_BUTTON_RIGHTSTICK ? 0 : + button_id_raw == SDL_CONTROLLER_BUTTON_B || + button_id_raw == SDL_CONTROLLER_BUTTON_Y || + button_id_raw == SDL_CONTROLLER_BUTTON_RIGHTSHOULDER ? 1 : + -1); + + if (button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_LEFT) + sdl_js_axis[nr][0] = button_state * JOYSTICK_XLEFT; + else if (button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_RIGHT) + sdl_js_axis[nr][0] = button_state * JOYSTICK_XRIGHT; + else if (button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_UP) + sdl_js_axis[nr][1] = button_state * JOYSTICK_YUPPER; + else if (button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_DOWN) + sdl_js_axis[nr][1] = button_state * JOYSTICK_YLOWER; + + if (button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_LEFT || + button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_RIGHT || + button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_UP || + button_id_raw == SDL_CONTROLLER_BUTTON_DPAD_DOWN) + sdl_js_axis_raw[nr][0] = sdl_js_axis_raw[nr][1] = -1; +#else + int button_id = button_id_raw % 2; +#endif + + if (nr < 0 || nr >= MAX_PLAYERS) + return; + + if (button_id == -1) + return; + + sdl_js_button[nr][button_id] = button_state; +} + void HandleJoystickEvent(Event *event) { switch(event->type) { +#if defined(TARGET_SDL2) + case SDL_CONTROLLERDEVICEADDED: +#if 1 + Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEADDED: device %d added", + event->cdevice.which); +#endif + InitJoysticks(); + break; + + case SDL_CONTROLLERDEVICEREMOVED: +#if 1 + Error(ERR_DEBUG, "SDL_CONTROLLERDEVICEREMOVED: device %d removed", + event->cdevice.which); +#endif + InitJoysticks(); + break; + + case SDL_CONTROLLERAXISMOTION: +#if 1 + Error(ERR_DEBUG, "SDL_CONTROLLERAXISMOTION: device %d, axis %d: %d", + event->caxis.which, event->caxis.axis, event->caxis.value); +#endif + setJoystickAxis(event->caxis.which, + event->caxis.axis, + event->caxis.value); + break; + + case SDL_CONTROLLERBUTTONDOWN: +#if 1 + Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONDOWN: device %d, button %d", + event->cbutton.which, event->cbutton.button); +#endif + setJoystickButton(event->cbutton.which, + event->cbutton.button, + TRUE); + break; + + case SDL_CONTROLLERBUTTONUP: +#if 1 + Error(ERR_DEBUG, "SDL_CONTROLLERBUTTONUP: device %d, button %d", + event->cbutton.which, event->cbutton.button); +#endif + setJoystickButton(event->cbutton.which, + event->cbutton.button, + FALSE); + break; +#endif + case SDL_JOYAXISMOTION: - if (event->jaxis.axis < 2) - sdl_js_axis[event->jaxis.which][event->jaxis.axis]= event->jaxis.value; + if (sdl_is_controller[event->jaxis.which]) + break; + +#if 1 + Error(ERR_DEBUG, "SDL_JOYAXISMOTION: device %d, axis %d: %d", + event->jaxis.which, event->jaxis.axis, event->jaxis.value); +#endif + if (event->jaxis.axis < 4) + setJoystickAxis(event->jaxis.which, + event->jaxis.axis, + event->jaxis.value); break; case SDL_JOYBUTTONDOWN: - if (event->jbutton.button < 2) - sdl_js_button[event->jbutton.which][event->jbutton.button] = TRUE; + if (sdl_is_controller[event->jaxis.which]) + break; + +#if 1 + Error(ERR_DEBUG, "SDL_JOYBUTTONDOWN: device %d, button %d", + event->jbutton.which, event->jbutton.button); +#endif + if (event->jbutton.button < 4) + setJoystickButton(event->jbutton.which, + event->jbutton.button, + TRUE); break; case SDL_JOYBUTTONUP: - if (event->jbutton.button < 2) - sdl_js_button[event->jbutton.which][event->jbutton.button] = FALSE; + if (sdl_is_controller[event->jaxis.which]) + break; + +#if 1 + Error(ERR_DEBUG, "SDL_JOYBUTTONUP: device %d, button %d", + event->jbutton.which, event->jbutton.button); +#endif + if (event->jbutton.button < 4) + setJoystickButton(event->jbutton.which, + event->jbutton.button, + FALSE); break; default: @@ -2523,19 +2846,73 @@ void SDLInitJoysticks() { static boolean sdl_joystick_subsystem_initialized = FALSE; boolean print_warning = !sdl_joystick_subsystem_initialized; +#if defined(TARGET_SDL2) + char *mappings_file_base = getPath2(options.conf_directory, + GAMECONTROLLER_BASENAME); + char *mappings_file_user = getPath2(getUserGameDataDir(), + GAMECONTROLLER_BASENAME); + int num_mappings; +#endif int i; if (!sdl_joystick_subsystem_initialized) { sdl_joystick_subsystem_initialized = TRUE; +#if defined(TARGET_SDL2) + SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); + + if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) < 0) +#else if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) +#endif { Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError()); return; } + +#if defined(TARGET_SDL2) + num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_base); + + if (num_mappings != -1) + Error(ERR_INFO, "%d game controller base mapping(s) added", num_mappings); + else + Error(ERR_WARN, "no game controller base mappings found"); + + num_mappings = SDL_GameControllerAddMappingsFromFile(mappings_file_user); + + if (num_mappings != -1) + Error(ERR_INFO, "%d game controller user mapping(s) added", num_mappings); + else + Error(ERR_WARN, "no game controller user mappings found"); + + Error(ERR_INFO, "%d joystick(s) found:", SDL_NumJoysticks()); + + checked_free(mappings_file_base); + checked_free(mappings_file_user); + + for (i = 0; i < SDL_NumJoysticks(); i++) + { + const char *name, *type; + + if (SDL_IsGameController(i)) + { + name = SDL_GameControllerNameForIndex(i); + type = "game controller"; + } + else + { + name = SDL_JoystickNameForIndex(i); + type = "joystick"; + } + + Error(ERR_INFO, "- joystick %d (%s): '%s'", + i, type, (name ? name : "(Unknown)")); + } +#endif } + /* assign joysticks from configured to connected joystick for all players */ for (i = 0; i < MAX_PLAYERS; i++) { /* get configured joystick for this player */ @@ -2550,29 +2927,24 @@ void SDLInitJoysticks() joystick_nr = -1; } - /* misuse joystick file descriptor variable to store joystick number */ - joystick.fd[i] = joystick_nr; - - if (joystick_nr == -1) - continue; + /* store configured joystick number for each player */ + joystick.nr[i] = joystick_nr; + } + /* now open all connected joysticks (regardless if configured or not) */ + for (i = 0; i < SDL_NumJoysticks(); i++) + { /* this allows subsequent calls to 'InitJoysticks' for re-initialization */ - if (SDLCheckJoystickOpened(joystick_nr)) - SDLCloseJoystick(joystick_nr); - - if (!setup.input[i].use_joystick) - continue; - - if (!SDLOpenJoystick(joystick_nr)) - { - if (print_warning) - Error(ERR_WARN, "cannot open joystick %d", joystick_nr); - - continue; - } + if (SDLCheckJoystickOpened(i)) + SDLCloseJoystick(i); - joystick.status = JOYSTICK_ACTIVATED; + if (SDLOpenJoystick(i)) + joystick.status = JOYSTICK_ACTIVATED; + else if (print_warning) + Error(ERR_WARN, "cannot open joystick %d", i); } + + SDLClearJoystickState(); } boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2) @@ -2593,4 +2965,103 @@ boolean SDLReadJoystick(int nr, int *x, int *y, boolean *b1, boolean *b2) return TRUE; } -#endif /* TARGET_SDL */ + +/* ========================================================================= */ +/* touch input overlay functions */ +/* ========================================================================= */ + +#if defined(USE_TOUCH_INPUT_OVERLAY) +static void DrawTouchInputOverlay() +{ + static SDL_Texture *texture = NULL; + static boolean initialized = FALSE; + static boolean deactivated = TRUE; + static int width = 0, height = 0; + static int alpha_max = SDL_ALPHA_OPAQUE / 2; + static int alpha_step = 5; + static int alpha_last = 0; + static int alpha = 0; + boolean active = (overlay.enabled && overlay.active); + + if (!active && deactivated) + return; + + if (active) + { + if (alpha < alpha_max) + alpha = MIN(alpha + alpha_step, alpha_max); + + deactivated = FALSE; + } + else + { + alpha = MAX(0, alpha - alpha_step); + + if (alpha == 0) + deactivated = TRUE; + } + + if (!initialized) + { + char *basename = "overlay/VirtualButtons.png"; + char *filename = getCustomImageFilename(basename); + + if (filename == NULL) + Error(ERR_EXIT, "LoadCustomImage(): cannot find file '%s'", basename); + + SDL_Surface *surface; + + if ((surface = IMG_Load(filename)) == NULL) + Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError()); + + width = surface->w; + height = surface->h; + + /* set black pixel to transparent if no alpha channel / transparent color */ + if (!SDLHasAlpha(surface) && + !SDLHasColorKey(surface)) + SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL, + SDL_MapRGB(surface->format, 0x00, 0x00, 0x00)); + + if ((texture = SDLCreateTextureFromSurface(surface)) == NULL) + Error(ERR_EXIT, "SDLCreateTextureFromSurface() failed"); + + SDL_FreeSurface(surface); + + SDL_SetTextureBlendMode(texture, SDL_BLENDMODE_BLEND); + SDL_SetTextureAlphaMod(texture, alpha_max); + + initialized = TRUE; + } + + if (alpha != alpha_last) + SDL_SetTextureAlphaMod(texture, alpha); + + alpha_last = alpha; + + float ratio_overlay = (float) width / height; + float ratio_screen = (float) video.screen_width / video.screen_height; + int width_scaled, height_scaled; + int xpos, ypos; + + if (ratio_overlay > ratio_screen) + { + width_scaled = video.screen_width; + height_scaled = video.screen_height * ratio_screen / ratio_overlay; + xpos = 0; + ypos = video.screen_height - height_scaled; + } + else + { + width_scaled = video.screen_width * ratio_overlay / ratio_screen; + height_scaled = video.screen_height; + xpos = (video.screen_width - width_scaled) / 2; + ypos = 0; + } + + SDL_Rect src_rect = { 0, 0, width, height }; + SDL_Rect dst_rect = { xpos, ypos, width_scaled, height_scaled }; + + SDL_RenderCopy(sdl_renderer, texture, &src_rect, &dst_rect); +} +#endif