/* video functions */
/* ========================================================================= */
-/* functions from SGE library */
-void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32);
+/* SDL internal variables */
+#if defined(TARGET_SDL2)
+static SDL_Window *sdl_window = NULL;
+// SDL_Window *sdl_window = NULL;
+// static SDL_Renderer *sdl_renderer = NULL;
+#endif
/* stuff needed to work around SDL/Windows fullscreen drawing bug */
static int fullscreen_width;
static int video_xoffset;
static int video_yoffset;
+/* functions from SGE library */
+void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32);
+
static void setFullscreenParameters(char *fullscreen_mode_string)
{
struct ScreenModeInfo *fullscreen_mode;
}
/* set transparent color */
- SDL_SetColorKey(surface, SDL_SRCCOLORKEY,
+ SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL,
SDL_MapRGB(surface->format, 0x00, 0x00, 0x00));
+#if defined(TARGET_SDL2)
+ SDL_SetWindowIcon(sdl_window, surface);
+#else
SDL_WM_SetIcon(surface, NULL);
#endif
+#endif
}
+#if defined(TARGET_SDL2)
+SDL_Surface *SDL_DisplayFormat(SDL_Surface *surface)
+{
+ if (backbuffer == NULL ||
+ backbuffer->surface == NULL)
+ return NULL;
+
+ return SDL_ConvertSurface(surface, backbuffer->surface->format, 0);
+}
+#endif
+
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
}
void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
fullscreen_xoffset = (fullscreen_width - video.width) / 2;
fullscreen_yoffset = (fullscreen_height - video.height) / 2;
+#if 1
+ checked_free(video.fullscreen_modes);
+
+ video.fullscreen_modes = NULL;
+ video.fullscreen_mode_current = NULL;
+#endif
+
+#if !defined(TARGET_SDL2)
/* get available hardware supported fullscreen modes */
modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE);
+#else
+ // (for now, no display modes in SDL2 -- change this later)
+ modes = NULL;
+#endif
if (modes == NULL)
{
}
}
+#if 0
/* set window icon */
SDLSetWindowIcon(program.sdl_icon_filename);
+#endif
/* open SDL video output device (window or fullscreen mode) */
if (!SDLSetVideoMode(backbuffer, fullscreen))
Error(ERR_EXIT, "setting video mode failed");
+#if 1
+ /* set window icon */
+ SDLSetWindowIcon(program.sdl_icon_filename);
+#endif
+
/* set window and icon title */
+#if defined(TARGET_SDL2)
+ SDL_SetWindowTitle(sdl_window, program.window_title);
+#else
SDL_WM_SetCaption(program.window_title, program.window_title);
+#endif
/* SDL cannot directly draw to the visible video framebuffer like X11,
but always uses a backbuffer, which is then blitted to the visible
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
}
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
{
boolean success = TRUE;
+#if defined(TARGET_SDL2)
+ int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN;
+ int surface_flags_window = SURFACE_FLAGS;
+#else
int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN;
int surface_flags_window = SURFACE_FLAGS;
+#endif
SDL_Surface *new_surface = NULL;
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_yoffset = fullscreen_yoffset;
/* switch display to fullscreen mode, if available */
- if ((new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height,
- video.depth, surface_flags_fullscreen))
- == NULL)
+#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
+ }
+#else
+ new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height,
+ video.depth, surface_flags_fullscreen);
+#endif
+
+ if (new_surface == NULL)
{
/* switching display to fullscreen mode failed */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
video_yoffset = 0;
/* switch display to window mode */
- if ((new_surface = SDL_SetVideoMode(video.width, video.height,
- video.depth, surface_flags_window))
- == NULL)
+#if defined(TARGET_SDL2)
+ 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
+ }
+#else
+ new_surface = SDL_SetVideoMode(video.width, video.height,
+ video.depth, surface_flags_window);
+#endif
+
+ if (new_surface == NULL)
{
/* switching display to window mode failed -- should not happen */
Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError());
(*backbuffer)->surface = new_surface;
video.fullscreen_enabled = FALSE;
+
success = TRUE;
}
}
-
#if 1
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
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);
+ }
+#else
if (dst_bitmap == window)
SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height);
+#endif
}
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);
+ }
+#else
if (dst_bitmap == window)
SDL_UpdateRect(backbuffer->surface, x, y, width, height);
+#endif
}
void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
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);
+
+ initialization_needed = TRUE;
+ }
+
src_rect.x = src_x;
src_rect.y = src_y;
src_rect.w = width;
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 */
flags |= SDL_HWSURFACE;
else
flags |= SDL_SWSURFACE;
+#endif
/* create surface for temporary copy of screen buffer (source) */
if ((surface_source =
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
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);
+#else
SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height);
+#endif
}
}
}
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
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
if (draw_border_function != NULL)
#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);
+#else
SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height);
+#endif
#else
SDL_Flip(surface_screen);
#endif
{
int x, y;
tColorRGBA *sp, *csp, *dp;
- int sgap, dgap;
+#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++)
{
int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy;
tColorRGBA *sp, *csp, *dp;
- int sgap, dgap;
+#if 0
+ int sgap;
+#endif
+ int dgap;
/* use specialized zoom function when scaling down to exactly half size */
if (src->w == 2 * dst->w &&
/* 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;
Bitmap *new_bitmap = CreateBitmapStruct();
SDL_Surface *sdl_image_tmp;
+ print_timestamp_init("SDLLoadImage");
+
+ print_timestamp_time(getBaseNamePtr(filename));
+
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
{
return NULL;
}
+ print_timestamp_time("IMG_Load");
+
UPDATE_BUSY_STATE();
/* create native non-transparent surface for current image */
return NULL;
}
+ print_timestamp_time("SDL_DisplayFormat (opaque)");
+
UPDATE_BUSY_STATE();
/* create native transparent surface for current image */
- SDL_SetColorKey(sdl_image_tmp, SDL_SRCCOLORKEY,
+ 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)
{
return NULL;
}
+ print_timestamp_time("SDL_DisplayFormat (masked)");
+
UPDATE_BUSY_STATE();
/* free temporary surface */
new_bitmap->width = new_bitmap->surface->w;
new_bitmap->height = new_bitmap->surface->h;
+ print_timestamp_done("SDLLoadImage");
+
return new_bitmap;
}
void SDLOpenAudio(void)
{
+#if !defined(TARGET_SDL2)
if (!strEqual(setup.system.sdl_audiodriver, ARG_DEFAULT))
SDL_putenv(getStringCat2("SDL_AUDIODRIVER=", setup.system.sdl_audiodriver));
+#endif
if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
{
return;
SDL_JoystickClose(sdl_joystick[nr]);
+
+ sdl_joystick[nr] = NULL;
}
static boolean SDLCheckJoystickOpened(int nr)
if (nr < 0 || nr > MAX_PLAYERS)
return FALSE;
+#if defined(TARGET_SDL2)
+ return (sdl_joystick[nr] != NULL ? TRUE : FALSE);
+#else
return (SDL_JoystickOpened(nr) ? TRUE : FALSE);
+#endif
}
void HandleJoystickEvent(Event *event)
{
sdl_joystick_subsystem_initialized = TRUE;
- if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+ if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
{
Error(ERR_EXIT, "SDL_Init() failed: %s", SDL_GetError());
return;
projects / rocksndiamonds.git / blobdiff