-/***********************************************************
-* 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"
#include "misc.h"
#include "setup.h"
+#define ENABLE_UNUSED_CODE 0 /* currently unused functions */
-#if defined(TARGET_SDL)
/* ========================================================================= */
/* video functions */
#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;
limit_screen_updates = enable;
}
-static void UpdateScreen(SDL_Rect *rect)
+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)
{
static unsigned int update_screen_delay = 0;
- unsigned int update_screen_delay_value = 20; /* (milliseconds) */
+ 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)
-#if USE_RENDERER
- SDL_Surface *screen = backbuffer->surface;
+ 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 1
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);
{
SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch);
}
-#else
- SDL_UpdateTexture(sdl_texture, NULL, screen->pixels, screen->pitch);
-#endif
+
+ // clear render target buffer
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);
+
+ // 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, NULL, NULL);
+
+ 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, NULL, NULL);
+ }
#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(backbuffer->surface, 1, rect);
+ SDL_UpdateRects(screen, 1, rect);
else
- SDL_UpdateRect(backbuffer->surface, 0, 0, 0, 0);
+ SDL_UpdateRect(screen, 0, 0, 0, 0);
#endif
}
-static void setFullscreenParameters(char *fullscreen_mode_string)
+static void UpdateScreen_WithFrameDelay(SDL_Rect *rect)
{
-#if defined(TARGET_SDL2)
- fullscreen_width = video.width;
- fullscreen_height = video.height;
- fullscreen_xoffset = 0;
- fullscreen_yoffset = 0;
-
-#else
-
- struct ScreenModeInfo *fullscreen_mode;
- int i;
-
- fullscreen_mode = get_screen_mode_from_string(fullscreen_mode_string);
-
- if (fullscreen_mode == NULL)
- return;
-
- 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)
- {
- fullscreen_width = fullscreen_mode->width;
- fullscreen_height = fullscreen_mode->height;
-
- fullscreen_xoffset = (fullscreen_width - video.width) / 2;
- fullscreen_yoffset = (fullscreen_height - video.height) / 2;
+ UpdateScreenExt(rect, TRUE);
+}
- break;
- }
- }
-#endif
+static void UpdateScreen_WithoutFrameDelay(SDL_Rect *rect)
+{
+ UpdateScreenExt(rect, FALSE);
}
static void SDLSetWindowIcon(char *basename)
format1->BytesPerPixel == format2->BytesPerPixel &&
format1->Rmask == format2->Rmask &&
format1->Gmask == format2->Gmask &&
- format1->Bmask == format2->Bmask &&
- format1->Amask == format2->Amask);
+ format1->Bmask == format2->Bmask);
+}
+
+static Pixel SDLGetColorKey(SDL_Surface *surface)
+{
+ Pixel color_key;
+
+ if (SDL_GetColorKey(surface, &color_key) != 0)
+ return -1;
+
+ return color_key;
+}
+
+static boolean SDLHasColorKey(SDL_Surface *surface)
+{
+ return (SDLGetColorKey(surface) != -1);
+}
+
+static boolean SDLHasAlpha(SDL_Surface *surface)
+{
+ SDL_BlendMode blend_mode;
+
+ if (SDL_GetSurfaceBlendMode(surface, &blend_mode) != 0)
+ return FALSE;
+
+ return (blend_mode == SDL_BLENDMODE_BLEND);
+}
+
+static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha)
+{
+ SDL_BlendMode blend_mode = (set ? SDL_BLENDMODE_BLEND : SDL_BLENDMODE_NONE);
+
+ SDL_SetSurfaceBlendMode(surface, blend_mode);
+ SDL_SetSurfaceAlphaMod(surface, alpha);
+}
+
+SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
+{
+ SDL_PixelFormat format;
+ SDL_Surface *new_surface;
+
+ 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;
+ }
+
+ new_surface = SDL_ConvertSurface(surface, &format, 0);
+
+ if (new_surface == NULL)
+ Error(ERR_EXIT, "SDL_ConvertSurface() failed: %s", SDL_GetError());
+
+ return new_surface;
}
boolean SDLSetNativeSurface(SDL_Surface **surface)
if (equalSDLPixelFormat((*surface)->format, backbuffer->surface->format))
return FALSE;
- new_surface = SDL_ConvertSurface(*surface, backbuffer->surface->format, 0);
+ new_surface = SDLGetNativeSurface(*surface);
SDL_FreeSurface(*surface);
return TRUE;
}
-SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
+#else
+
+static Pixel SDLGetColorKey(SDL_Surface *surface)
{
- if (surface == NULL ||
- backbuffer == NULL ||
- backbuffer->surface == NULL)
- return NULL;
+ if ((surface->flags & SDL_SRCCOLORKEY) == 0)
+ return -1;
- return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
+ return surface->format->colorkey;
}
-SDL_Surface *SDL_DisplayFormat(SDL_Surface *surface)
+static boolean SDLHasColorKey(SDL_Surface *surface)
{
- if (surface == NULL ||
- backbuffer == NULL ||
- backbuffer->surface == NULL)
- return NULL;
-
-#if 0
- boolean same_pixel_format =
- equalSDLPixelFormat(surface->format, backbuffer->surface->format);
-
- printf("::: SDL_DisplayFormat: %08x -> %08x [%08x, %08x, %08x -> %08x, %08x, %08x] [%d, %d -> %d, %d] => %s\n",
- surface->format->format,
- backbuffer->surface->format->format,
- surface->format->Rmask,
- surface->format->Gmask,
- surface->format->Bmask,
- backbuffer->surface->format->Rmask,
- backbuffer->surface->format->Gmask,
- backbuffer->surface->format->Bmask,
- surface->format->BitsPerPixel,
- surface->format->BytesPerPixel,
- backbuffer->surface->format->BitsPerPixel,
- backbuffer->surface->format->BytesPerPixel,
- (same_pixel_format ? "SAME" : "DIFF"));
-#endif
+ return (SDLGetColorKey(surface) != -1);
+}
- return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
+static boolean SDLHasAlpha(SDL_Surface *surface)
+{
+ return ((surface->flags & SDL_SRCALPHA) != 0);
}
-#else
+static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha)
+{
+ SDL_SetAlpha(surface, (set ? SDL_SRCALPHA : 0), alpha);
+}
-boolean SDLSetNativeSurface(SDL_Surface **surface)
+SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
{
SDL_Surface *new_surface;
if (surface == NULL)
- return FALSE;
+ return NULL;
- new_surface = SDL_DisplayFormat(*surface);
+ if (!video.initialized)
+ new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS);
+ else if (SDLHasAlpha(surface))
+ new_surface = SDL_DisplayFormatAlpha(surface);
+ else
+ new_surface = SDL_DisplayFormat(surface);
if (new_surface == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+ Error(ERR_EXIT, "%s() failed: %s",
+ (video.initialized ? "SDL_DisplayFormat" : "SDL_ConvertSurface"),
+ SDL_GetError());
+
+ return new_surface;
+}
+
+boolean SDLSetNativeSurface(SDL_Surface **surface)
+{
+ SDL_Surface *new_surface;
+
+ if (surface == NULL ||
+ *surface == NULL ||
+ !video.initialized)
+ return FALSE;
+
+ new_surface = SDLGetNativeSurface(*surface);
SDL_FreeSurface(*surface);
return TRUE;
}
-SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
+#endif
+
+#if defined(TARGET_SDL2)
+static SDL_Texture *SDLCreateTextureFromSurface(SDL_Surface *surface)
{
- SDL_Surface *new_surface = SDL_DisplayFormat(surface);
+ SDL_Texture *texture = SDL_CreateTextureFromSurface(sdl_renderer, surface);
- if (new_surface == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+ if (texture == NULL)
+ Error(ERR_EXIT, "SDL_CreateTextureFromSurface() failed: %s",
+ SDL_GetError());
- return new_surface;
+ return texture;
+}
+#endif
+
+void SDLCreateBitmapTextures(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 = 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
+}
void SDLInitVideoDisplay(void)
{
#endif
}
-void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
- boolean fullscreen)
+void SDLInitVideoBuffer(boolean fullscreen)
{
-#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;
-
- /* default: normal game window size */
- fullscreen_width = video.width;
- fullscreen_height = video.height;
- fullscreen_xoffset = 0;
- fullscreen_yoffset = 0;
-
-#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];
-
- break;
- }
- }
-
- fullscreen_xoffset = (fullscreen_width - video.width) / 2;
- fullscreen_yoffset = (fullscreen_height - video.height) / 2;
-#endif
-
-#if 1
- checked_free(video.fullscreen_modes);
-
- video.fullscreen_modes = NULL;
- video.fullscreen_mode_current = NULL;
-#endif
-
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
-#if defined(TARGET_SDL2)
- int num_displays = SDL_GetNumVideoDisplays();
-
- if (num_displays > 0)
- {
- // currently only display modes of first display supported
- int num_modes = SDL_GetNumDisplayModes(0);
-
- if (num_modes > 0)
- {
- modes = checked_calloc((num_modes + 1) * sizeof(SDL_Rect *));
-
- for (i = 0; i < num_modes; i++)
- {
- SDL_DisplayMode mode;
-
- if (SDL_GetDisplayMode(0, i, &mode) < 0)
- break;
-
- modes[i] = checked_calloc(sizeof(SDL_Rect));
-
- 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));
-
- /* use native video buffer size for fullscreen mode */
- video.fullscreen_modes[0].width = video.width;
- video.fullscreen_modes[0].height = video.height;
-
- video.fullscreen_modes[1].width = -1;
- video.fullscreen_modes[1].height = -1;
- }
- else
- {
- /* in this case, a certain number of screen modes is available */
- int num_modes = 0;
-
- for (i = 0; modes[i] != NULL; i++)
- {
- boolean found_mode = FALSE;
-
- /* screen mode is smaller than video buffer size -- skip it */
- if (modes[i]->w < video.width || modes[i]->h < video.height)
- continue;
-
- 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;
-
- if (found_mode) /* screen mode already stored -- skip it */
- continue;
-
- /* new mode found; add it to list of available fullscreen modes */
-
- num_modes++;
-
- video.fullscreen_modes = checked_realloc(video.fullscreen_modes,
- (num_modes + 1) *
- sizeof(struct ScreenModeInfo));
-
- video.fullscreen_modes[num_modes - 1].width = modes[i]->w;
- video.fullscreen_modes[num_modes - 1].height = modes[i]->h;
-
- video.fullscreen_modes[num_modes].width = -1;
- video.fullscreen_modes[num_modes].height = -1;
- }
-
- if (num_modes == 0)
- {
- /* no appropriate screen modes available => no fullscreen mode support */
- // video.fullscreen_available = FALSE;
- hardware_fullscreen_available = FALSE;
- }
- }
-
- video.fullscreen_available = hardware_fullscreen_available;
-
-#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;
-#endif
+ SDLSetScreenRenderingMode(setup.screen_rendering_mode);
#if defined(TARGET_SDL2)
- if (modes)
- {
- for (i = 0; modes[i] != NULL; i++)
- checked_free(modes[i]);
-
- checked_free(modes);
- }
-#endif
-
-#if 0
- /* set window icon */
- SDLSetWindowIcon(program.sdl_icon_filename);
+ // 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)
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);
}
-static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer,
- boolean fullscreen)
+static boolean SDLCreateScreen(boolean fullscreen)
{
SDL_Surface *new_surface = NULL;
#if defined(TARGET_SDL2)
- static boolean fullscreen_enabled = FALSE;
- 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
#endif
- int width = (fullscreen ? fullscreen_width : video.width);
- int height = (fullscreen ? fullscreen_height : video.height);
+ int width = video.width;
+ int height = video.height;
int surface_flags = (fullscreen ? surface_flags_fullscreen :
surface_flags_window);
#if defined(TARGET_SDL2)
- // store if initial screen mode on game start is fullscreen mode
- if (sdl_window == NULL)
- {
-#if 0
- printf("::: GAME STARTS WITH FULLSCREEN %d\n", fullscreen);
-#endif
+ // store if initial screen mode is fullscreen mode when changing screen size
+ video.fullscreen_initial = fullscreen;
- video.fullscreen_initial = fullscreen;
- }
-
-#if USE_RENDERER
float window_scaling_factor = (float)setup.window_scaling_percent / 100;
-#if !USE_DESKTOP_FULLSCREEN
- float screen_scaling_factor = (fullscreen ? 1 : window_scaling_factor);
-#endif
video.window_width = window_scaling_factor * width;
video.window_height = window_scaling_factor * height;
-#if 0
- 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))
}
}
-#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 0
- /* 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) */
- if (sdl_renderer == NULL)
- sdl_renderer = SDL_CreateRenderer(sdl_window, -1, SDL_RENDERER_SOFTWARE);
-#else
if (sdl_renderer == NULL)
- sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
-#endif
+ sdl_renderer = SDL_CreateRenderer(sdl_window, -1, renderer_flags);
if (sdl_renderer != NULL)
{
// SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, setup.window_scaling_quality);
- sdl_texture = SDL_CreateTexture(sdl_renderer,
- SDL_PIXELFORMAT_ARGB8888,
- SDL_TEXTUREACCESS_STREAMING,
- width, height);
+ 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 != NULL)
+ if (sdl_texture_stream != NULL)
{
-#if 1
// use SDL default values for RGB masks and no alpha channel
new_surface = SDL_CreateRGBSurface(0, width, height, 32, 0,0,0, 0);
-#else
-
-#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
-
-#endif
if (new_surface == NULL)
- Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s",
- SDL_GetError());
+ Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
}
else
{
Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError());
}
-#else
+#else // TARGET_SDL
- if (sdl_window)
- SDL_DestroyWindow(sdl_window);
+ if (gfx.final_screen_bitmap == NULL)
+ gfx.final_screen_bitmap = CreateBitmapStruct();
- sdl_window = SDL_CreateWindow(program.window_title,
- SDL_WINDOWPOS_CENTERED,
- SDL_WINDOWPOS_CENTERED,
- width, height,
- surface_flags);
+ gfx.final_screen_bitmap->width = width;
+ gfx.final_screen_bitmap->height = height;
- if (sdl_window != NULL)
- new_surface = SDL_GetWindowSurface(sdl_window);
+ gfx.final_screen_bitmap->surface =
+ SDL_SetVideoMode(width, height, video.depth, surface_flags);
+
+ if (gfx.final_screen_bitmap->surface != NULL)
+ {
+ new_surface =
+ SDL_CreateRGBSurface(surface_flags, width, height, video.depth, 0,0,0, 0);
+
+ if (new_surface == NULL)
+ Error(ERR_WARN, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
+
+#if 0
+ new_surface = gfx.final_screen_bitmap->surface;
+ gfx.final_screen_bitmap = NULL;
#endif
-#else
- new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags);
+ }
+ else
+ {
+ Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
+ }
#endif
#if defined(TARGET_SDL2)
fullscreen_enabled = fullscreen;
#endif
- return new_surface;
+ if (backbuffer == NULL)
+ backbuffer = CreateBitmapStruct();
+
+ backbuffer->width = video.width;
+ backbuffer->height = video.height;
+
+ if (backbuffer->surface)
+ SDL_FreeSurface(backbuffer->surface);
+
+ backbuffer->surface = new_surface;
+
+ return (new_surface != NULL);
}
-boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
+boolean SDLSetVideoMode(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;
+ boolean success = FALSE;
SetWindowTitle();
- if (*backbuffer == NULL)
- *backbuffer = CreateBitmapStruct();
-
- /* (real bitmap might be larger in fullscreen mode with video offsets) */
- (*backbuffer)->width = video.width;
- (*backbuffer)->height = video.height;
-
if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available)
{
- 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
+ success = SDLCreateScreen(TRUE);
-#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
-
- if (new_surface == NULL)
+ if (!success)
{
- /* switching display to fullscreen mode failed */
- Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
-
- /* do not try it again */
+ /* switching display to fullscreen mode failed -- do not try it again */
video.fullscreen_available = FALSE;
-
- success = FALSE;
}
else
{
- (*backbuffer)->surface = new_surface;
-
video.fullscreen_enabled = TRUE;
- video.fullscreen_mode_current = setup.fullscreen_mode;
-
- success = TRUE;
}
}
- if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL)
+ if ((!fullscreen && video.fullscreen_enabled) || !success)
{
- video_xoffset = 0;
- video_yoffset = 0;
-
/* switch display to window mode */
-#if 1
- new_surface = SDLCreateScreen(backbuffer, FALSE);
-#else
-
-#if defined(TARGET_SDL2)
-
-#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);
+ success = SDLCreateScreen(FALSE);
- if (sdl_window != NULL)
- {
- sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
-
- if (sdl_renderer != NULL)
- {
- SDL_RenderSetLogicalSize(sdl_renderer, video.width, video.height);
- SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear");
-
- sdl_texture = SDL_CreateTexture(sdl_renderer,
- SDL_PIXELFORMAT_ARGB8888,
- SDL_TEXTUREACCESS_STREAMING,
- video.width, video.height);
-
- 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
-
- 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());
- }
-
-#else
-
- if (sdl_window)
- SDL_DestroyWindow(sdl_window);
-
- sdl_window = SDL_CreateWindow(program.window_title,
- SDL_WINDOWPOS_CENTERED,
- SDL_WINDOWPOS_CENTERED,
- video.width, video.height,
- surface_flags_window);
-
- if (sdl_window != NULL)
- {
- new_surface = SDL_GetWindowSurface(sdl_window);
-
- // SDL_UpdateWindowSurface(sdl_window); // immediately map window
- // UpdateScreen(NULL); // immediately map window
- }
-#endif
-
-#else
- new_surface = SDL_SetVideoMode(video.width, video.height,
- video.depth, surface_flags_window);
-#endif
-#endif
-
- 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;
int new_window_width = (int)(window_scaling_factor * video.width);
int new_window_height = (int)(window_scaling_factor * video.height);
-#if 0
- Error(ERR_DEBUG, "::: SDLSetWindowScaling(%d) ...", window_scaling_percent);
-#endif
-
SDL_SetWindowSize(sdl_window, new_window_width, new_window_height);
video.window_scaling_percent = window_scaling_percent;
void SDLSetWindowScalingQuality(char *window_scaling_quality)
{
- if (sdl_texture == NULL)
+ SDL_Texture *new_texture;
+
+ if (sdl_texture_stream == NULL)
return;
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, window_scaling_quality);
- SDL_Texture *new_texture = SDL_CreateTexture(sdl_renderer,
- SDL_PIXELFORMAT_ARGB8888,
- SDL_TEXTUREACCESS_STREAMING,
- video.width, video.height);
+ new_texture = SDL_CreateTexture(sdl_renderer,
+ SDL_PIXELFORMAT_ARGB8888,
+ SDL_TEXTUREACCESS_STREAMING,
+ video.width, video.height);
if (new_texture != NULL)
{
- SDL_DestroyTexture(sdl_texture);
+ 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;
- sdl_texture = new_texture;
+ if (new_texture != NULL)
+ {
+ SDL_DestroyTexture(sdl_texture_target);
- SDLRedrawWindow();
+ sdl_texture_target = new_texture;
}
+ SDLRedrawWindow();
+
video.window_scaling_quality = window_scaling_quality;
}
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
-
-#if 0
- Error(ERR_DEBUG, "::: SDL_SetWindowFullscreen(%d) ...", fullscreen);
-#endif
if (SDL_SetWindowFullscreen(sdl_window, flags) == 0)
- video.fullscreen_enabled = fullscreen;
-
-#if 0
- printf("::: SDLSetWindowFullscreen: %d, %d\n",
- fullscreen, video.fullscreen_initial);
-#endif
+ video.fullscreen_enabled = fullscreen_enabled = fullscreen;
-#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);
video.fullscreen_initial = FALSE;
}
+}
+#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(NULL);
+ UpdateScreen_WithoutFrameDelay(NULL);
}
-#endif
void SDLCreateBitmapContent(Bitmap *bitmap, int width, int height,
int depth)
{
-#if 1
SDL_Surface *surface =
SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, depth, 0,0,0, 0);
SDLSetNativeSurface(&surface);
bitmap->surface = surface;
-
-#else
-
- SDL_Surface *surface_tmp, *surface_native;
-
- if ((surface_tmp = SDL_CreateRGBSurface(SURFACE_FLAGS, width, height, depth,
- 0, 0, 0, 0))
- == NULL)
- Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError());
-
- if ((surface_native = SDL_DisplayFormat(surface_tmp)) == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
-
- SDL_FreeSurface(surface_tmp);
-
- new_bitmap->surface = surface_native;
-#endif
}
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,
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;
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(&dst_rect);
- }
+ 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
}
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;
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);
- UpdateScreen(&rect);
- }
-#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;
SDL_Rect dst_rect2;
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_rect2 = dst_rect;
- 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);
}
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);
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);
- UpdateScreen(&dst_rect2);
-#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;
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);
- UpdateScreen(&dst_rect);
-#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,
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;
- }
-
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)
{
{
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 */
/* ========================================================================= */
/* 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 */
/* ========================================================================= */
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);
}
{
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++)
return 0;
}
-#if 1
-
int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst)
{
int x, y, *sax, *say, *csax, *csay;
src->h == 2 * dst->h)
return zoomSurfaceRGBA_scaleDownBy2(src, dst);
-#if 0
- printf("::: zoomSurfaceRGBA: %d, %d -> %d, %d\n",
- src->w, src->h, dst->w, dst->h);
-#endif
-
/* variable setup */
sx = (float) src->w / (float) dst->w;
sy = (float) src->h / (float) dst->h;
return 0;
}
-#else
-
-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 dgap;
-
- /* use specialized zoom function when scaling down to exactly half size */
- if (src->w == 2 * dst->w &&
- src->h == 2 * dst->h)
- 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);
-
- /* allocate memory for row increments */
- sax = (int *)checked_malloc((dst->w + 1) * sizeof(Uint32));
- 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;
- }
-
- csy = 0;
- csay = say;
- for (y = 0; y <= dst->h; y++)
- {
- *csay = csy;
- csay++;
- csy &= 0xffff;
- csy += sy;
- }
-
- /* 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;
-
- csay = say;
- for (y = 0; y < dst->h; y++)
- {
- sp = csp;
- csax = sax;
-
- for (x = 0; x < dst->w; x++)
- {
- /* draw */
- *dp = *sp;
-
- /* advance source pointers */
- csax++;
- sp += (*csax >> 16);
-
- /* advance destination pointer */
- dp++;
- }
-
- /* advance source pointer */
- csay++;
- csp = (tColorRGBA *) ((Uint8 *) csp + (*csay >> 16) * src->pitch);
-
- /* advance destination pointers */
- dp = (tColorRGBA *) ((Uint8 *) dp + dgap);
- }
-
- free(sax);
- free(say);
-
- return 0;
-}
-
-#endif
-
/*
-----------------------------------------------------------------------------
8 bit zoomer
return zoom_dst;
}
-#if 1
-
-Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
+static void SetOpaqueBitmapSurface(Bitmap *bitmap)
{
-#if 1
-
- Bitmap *dst_bitmap = CreateBitmapStruct();
- SDL_Surface **dst_surface = &dst_bitmap->surface;
-
- dst_width = MAX(1, dst_width); /* prevent zero bitmap width */
- dst_height = MAX(1, dst_height); /* prevent zero bitmap height */
-
- dst_bitmap->width = dst_width;
- dst_bitmap->height = dst_height;
+ if (bitmap == NULL)
+ return;
- /* create zoomed temporary surface from source surface */
- *dst_surface = zoomSurface(src_bitmap->surface, dst_width, dst_height);
+ if (bitmap->surface)
+ SDL_FreeSurface(bitmap->surface);
- /* create native format destination surface from zoomed temporary surface */
- SDLSetNativeSurface(dst_surface);
+ if ((bitmap->surface = SDLGetNativeSurface(bitmap->surface_masked)) == NULL)
+ Error(ERR_EXIT, "SDL_DisplayFormat() failed");
- return dst_bitmap;
+ /* remove alpha channel from native non-transparent surface, if defined */
+ SDLSetAlpha(bitmap->surface, FALSE, 0);
-#else
+ /* remove transparent color from native non-transparent surface, if defined */
+ SDL_SetColorKey(bitmap->surface, UNSET_TRANSPARENT_PIXEL, 0);
+}
+Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
+{
Bitmap *dst_bitmap = CreateBitmapStruct();
- SDL_Surface *sdl_surface_tmp;
+ SDL_Surface **dst_surface = &dst_bitmap->surface_masked;
dst_width = MAX(1, dst_width); /* prevent zero bitmap width */
dst_height = MAX(1, dst_height); /* prevent zero bitmap height */
dst_bitmap->width = dst_width;
dst_bitmap->height = dst_height;
- print_timestamp_init("SDLZoomBitmap");
-
/* create zoomed temporary surface from source surface */
- sdl_surface_tmp = zoomSurface(src_bitmap->surface, dst_width, dst_height);
- print_timestamp_time("zoomSurface");
+ *dst_surface = zoomSurface(src_bitmap->surface_masked, dst_width, dst_height);
/* create native format destination surface from zoomed temporary surface */
- dst_bitmap->surface = SDL_DisplayFormat(sdl_surface_tmp);
- print_timestamp_time("SDL_DisplayFormat");
+ SDLSetNativeSurface(dst_surface);
- /* free temporary surface */
- SDL_FreeSurface(sdl_surface_tmp);
- print_timestamp_time("SDL_FreeSurface");
+ /* 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));
- print_timestamp_done("SDLZoomBitmap");
+ /* create native non-transparent surface for opaque blitting */
+ SetOpaqueBitmapSurface(dst_bitmap);
return dst_bitmap;
-
-#endif
-}
-
-#else
-
-void SDLZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap)
-{
- SDL_Surface *sdl_surface_tmp;
- int dst_width = dst_bitmap->width;
- int dst_height = dst_bitmap->height;
-
- print_timestamp_init("SDLZoomBitmap");
-
- /* throw away old destination surface */
- SDL_FreeSurface(dst_bitmap->surface);
- print_timestamp_time("SDL_FreeSurface");
-
- /* create zoomed temporary surface from source surface */
- sdl_surface_tmp = zoomSurface(src_bitmap->surface, dst_width, dst_height);
- print_timestamp_time("zoomSurface");
-
- /* create native format destination surface from zoomed temporary surface */
- dst_bitmap->surface = SDL_DisplayFormat(sdl_surface_tmp);
- print_timestamp_time("SDL_DisplayFormat");
-
- /* free temporary surface */
- SDL_FreeSurface(sdl_surface_tmp);
- print_timestamp_time("SDL_FreeSurface");
-
- print_timestamp_done("SDLZoomBitmap");
}
-#endif
-
/* ========================================================================= */
/* load image to bitmap */
UPDATE_BUSY_STATE();
/* create native non-transparent surface for current image */
-#if 1
if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
{
SetError("SDL_DisplayFormat(): %s", SDL_GetError());
return NULL;
}
-#else
- if ((new_bitmap->surface = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
- return NULL;
- }
-#endif
+ /* 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)");
UPDATE_BUSY_STATE();
+ /* 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));
+
/* 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 1
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
{
SetError("SDL_DisplayFormat(): %s", SDL_GetError());
return NULL;
}
-#else
- if ((new_bitmap->surface_masked = SDL_DisplayFormat(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
-#endif
print_timestamp_time("SDL_DisplayFormat (masked)");
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);
#endif
}
#endif
+#endif
}
return TRUE;
}
-
-#endif /* TARGET_SDL */