X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=da72bd490b965805ccff119494ab1c54de77734f;hp=ef68a08e90f408b2658ce2df76c18bed010563ba;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=dfe0a71a9939e0c55bb54dcc92db1749e8e21747 diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index ef68a08e..da72bd49 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -1,20 +1,19 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2001 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 "joystick.h" #include "misc.h" +#include "setup.h" #if defined(TARGET_SDL) @@ -23,11 +22,13 @@ /* video functions */ /* ========================================================================= */ -/* functions from SGE library */ -inline void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32); +/* SDL internal variables */ +#if defined(TARGET_SDL2) +static SDL_Window *sdl_window = NULL; +static SDL_Renderer *sdl_renderer = NULL; +static SDL_Texture *sdl_texture = NULL; -#ifdef PLATFORM_WIN32 -#define FULLSCREEN_BUG +#define USE_RENDERER TRUE #endif /* stuff needed to work around SDL/Windows fullscreen drawing bug */ @@ -37,22 +38,277 @@ 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); + +void SDLLimitScreenUpdates(boolean enable) +{ + limit_screen_updates = enable; +} + +static void UpdateScreen(SDL_Rect *rect) +{ + static unsigned int update_screen_delay = 0; + unsigned int update_screen_delay_value = 20; /* (milliseconds) */ + +#if 1 + if (limit_screen_updates && + !DelayReached(&update_screen_delay, update_screen_delay_value)) + return; + + LimitScreenUpdates(FALSE); +#endif + +#if defined(TARGET_SDL2) +#if USE_RENDERER + SDL_Surface *screen = backbuffer->surface; + +#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); + } + else + { + 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 + +#else // TARGET_SDL + if (rect) + SDL_UpdateRects(backbuffer->surface, 1, rect); + else + SDL_UpdateRect(backbuffer->surface, 0, 0, 0, 0); +#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; + +#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; + + break; + } + } +#endif +} + +static void SDLSetWindowIcon(char *basename) +{ + /* (setting the window icon on Mac OS X would replace the high-quality + dock icon with the currently smaller (and uglier) icon from file) */ + +#if !defined(PLATFORM_MACOSX) + char *filename = getCustomImageFilename(basename); + SDL_Surface *surface; + + if (filename == NULL) + { + Error(ERR_WARN, "SDLSetWindowIcon(): cannot find file '%s'", basename); + + return; + } + + if ((surface = IMG_Load(filename)) == NULL) + { + Error(ERR_WARN, "IMG_Load() failed: %s", SDL_GetError()); + + return; + } + + /* set transparent color */ + SDL_SetColorKey(surface, SET_TRANSPARENT_PIXEL, + SDL_MapRGB(surface->format, 0x00, 0x00, 0x00)); -inline void SDLInitVideoDisplay(void) +#if defined(TARGET_SDL2) + SDL_SetWindowIcon(sdl_window, surface); +#else + SDL_WM_SetIcon(surface, NULL); +#endif +#endif +} + +#if defined(TARGET_SDL2) + +static boolean equalSDLPixelFormat(SDL_PixelFormat *format1, + SDL_PixelFormat *format2) +{ + 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 && + format1->Amask == format2->Amask); +} + +boolean SDLSetNativeSurface(SDL_Surface **surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL || + *surface == NULL || + backbuffer == NULL || + backbuffer->surface == NULL) + return FALSE; + + // if pixel format already optimized for destination surface, do nothing + if (equalSDLPixelFormat((*surface)->format, backbuffer->surface->format)) + return FALSE; + + new_surface = SDL_ConvertSurface(*surface, backbuffer->surface->format, 0); + + SDL_FreeSurface(*surface); + + *surface = new_surface; + + return TRUE; +} + +SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) +{ + if (surface == NULL || + backbuffer == NULL || + backbuffer->surface == NULL) + return NULL; + + return SDL_ConvertSurface(surface, backbuffer->surface->format, 0); +} + +SDL_Surface *SDL_DisplayFormat(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 SDL_ConvertSurface(surface, backbuffer->surface->format, 0); +} + +#else + +boolean SDLSetNativeSurface(SDL_Surface **surface) +{ + SDL_Surface *new_surface; + + if (surface == NULL) + return FALSE; + + new_surface = SDL_DisplayFormat(*surface); + + if (new_surface == NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + + SDL_FreeSurface(*surface); + + *surface = new_surface; + + return TRUE; +} + +SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface) +{ + SDL_Surface *new_surface = SDL_DisplayFormat(surface); + + if (new_surface == NULL) + Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError()); + + return new_surface; +} + +#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 } -inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, - boolean fullscreen) +void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, + boolean fullscreen) { -#ifdef FULLSCREEN_BUG - int i; +#if !defined(TARGET_SDL2) static int screen_xy[][2] = { { 640, 480 }, @@ -61,6 +317,9 @@ inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, { -1, -1 } }; #endif + SDL_Rect **modes = NULL; + boolean hardware_fullscreen_available = TRUE; + int i, j; /* default: normal game window size */ fullscreen_width = video.width; @@ -68,27 +327,166 @@ inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, fullscreen_xoffset = 0; fullscreen_yoffset = 0; -#ifdef FULLSCREEN_BUG - for (i=0; screen_xy[i][0] != -1; i++) +#if !defined(TARGET_SDL2) + /* determine required standard fullscreen mode for game screen size */ + for (i = 0; screen_xy[i][0] != -1; i++) { - if (video.width <= screen_xy[i][0] && video.height <= screen_xy[i][1]) + if (screen_xy[i][0] >= video.width && screen_xy[i][1] >= video.height) { - fullscreen_width = screen_xy[i][0]; + fullscreen_width = screen_xy[i][0]; fullscreen_height = screen_xy[i][1]; + break; } } - fullscreen_xoffset = (fullscreen_width - video.width) / 2; + 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 + +#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); +#endif + /* open SDL video output device (window or fullscreen mode) */ if (!SDLSetVideoMode(backbuffer, 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 + /* 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 @@ -104,751 +502,2180 @@ inline 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 } -inline boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) +static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, + boolean fullscreen) { - boolean success = TRUE; - int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; - int surface_flags_window = SURFACE_FLAGS; SDL_Surface *new_surface = NULL; - if (*backbuffer == NULL) - *backbuffer = CreateBitmapStruct(); +#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_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN_DESKTOP; +#else + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; +#endif - if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available) +#else + int surface_flags_window = SURFACE_FLAGS; + int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; +#endif + + int width = (fullscreen ? fullscreen_width : video.width); + int height = (fullscreen ? fullscreen_height : video.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; + +#if defined(TARGET_SDL2) + + // store if initial screen mode on game start is fullscreen mode + if (sdl_window == NULL) { - video_xoffset = fullscreen_xoffset; - video_yoffset = fullscreen_yoffset; +#if 0 + printf("::: GAME STARTS WITH FULLSCREEN %d\n", fullscreen); +#endif - /* switch display to fullscreen mode, if available */ - if ((new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height, - video.depth, surface_flags_fullscreen)) - == NULL) - { - /* switching display to fullscreen mode failed */ - Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); + video.fullscreen_initial = fullscreen; + } - /* do not try it again */ - video.fullscreen_available = FALSE; - success = FALSE; - } - else - { - (*backbuffer)->surface = new_surface; +#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.fullscreen_enabled = TRUE; - success = TRUE; - } + 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) + { + SDL_FreeSurface((*backbuffer)->surface); + (*backbuffer)->surface = NULL; } - if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL) + if (sdl_texture) { - video_xoffset = 0; - video_yoffset = 0; + SDL_DestroyTexture(sdl_texture); + sdl_texture = NULL; + } - /* switch display to window mode */ - if ((new_surface = SDL_SetVideoMode(video.width, video.height, - video.depth, surface_flags_window)) - == NULL) + if (!(fullscreen && fullscreen_enabled)) + { + if (sdl_renderer) { - /* switching display to window mode failed -- should not happen */ - Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); - - success = FALSE; + SDL_DestroyRenderer(sdl_renderer); + sdl_renderer = NULL; } - else - { - (*backbuffer)->surface = new_surface; - video.fullscreen_enabled = FALSE; - success = TRUE; + if (sdl_window) + { + SDL_DestroyWindow(sdl_window); + sdl_window = NULL; } } - return success; -} - -inline void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, - int src_x, int src_y, - int width, int height, - int dst_x, int dst_y, int copy_mode) -{ - Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap); - SDL_Rect src_rect, dst_rect; +#if 0 + Error(ERR_INFO, "::: checking 'sdl_window' ..."); -#ifdef FULLSCREEN_BUG - if (src_bitmap == backbuffer) - { - src_x += video_xoffset; - src_y += video_yoffset; - } + if (sdl_window == NULL) + Error(ERR_INFO, "::: calling SDL_CreateWindow() [%d, %d, %d] ...", + setup.fullscreen, fullscreen, fullscreen_enabled); #endif - src_rect.x = src_x; - src_rect.y = src_y; - src_rect.w = width; - src_rect.h = height; + 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); -#ifdef FULLSCREEN_BUG - if (dst_bitmap == backbuffer || dst_bitmap == window) + if (sdl_window != NULL) { - dst_x += video_xoffset; - dst_y += video_yoffset; - } +#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 - dst_rect.x = dst_x; - dst_rect.y = dst_y; - dst_rect.w = width; - dst_rect.h = height; + if (sdl_renderer != NULL) + { + SDL_RenderSetLogicalSize(sdl_renderer, width, height); + // SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, setup.window_scaling_quality); - if (src_bitmap != backbuffer || dst_bitmap != window) - SDL_BlitSurface((copy_mode == SDLCOPYAREA_MASKED ? - src_bitmap->surface_masked : src_bitmap->surface), - &src_rect, real_dst_bitmap->surface, &dst_rect); + sdl_texture = SDL_CreateTexture(sdl_renderer, + SDL_PIXELFORMAT_ARGB8888, + SDL_TEXTUREACCESS_STREAMING, + width, height); - if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height); -} + if (sdl_texture != 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 -inline void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, - int width, int height, unsigned int color) -{ - Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap); - SDL_Rect rect; - unsigned int color_r = (color >> 16) && 0xff; - unsigned int color_g = (color >> 8) && 0xff; - unsigned int color_b = (color >> 0) && 0xff; +#endif -#ifdef FULLSCREEN_BUG - if (dst_bitmap == backbuffer || dst_bitmap == window) + 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 { - x += video_xoffset; - y += video_yoffset; + 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 - rect.x = x; - rect.y = y; - rect.w = width; - rect.h = height; +#else + new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags); +#endif - SDL_FillRect(real_dst_bitmap->surface, &rect, - SDL_MapRGB(real_dst_bitmap->surface->format, - color_r, color_g, color_b)); +#if defined(TARGET_SDL2) + // store fullscreen state ("video.fullscreen_enabled" may not reflect this!) + if (new_surface != NULL) + fullscreen_enabled = fullscreen; +#endif - if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, x, y, width, height); + return new_surface; } -inline void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y, - int to_x, int to_y, unsigned int color) +boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) { - SDL_Surface *surface = dst_bitmap->surface; - SDL_Rect rect; - unsigned int color_r = (color >> 16) & 0xff; - unsigned int color_g = (color >> 8) & 0xff; - unsigned int color_b = (color >> 0) & 0xff; + 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 (from_x > to_x) - swap_numbers(&from_x, &to_x); + SetWindowTitle(); - if (from_y > to_y) - swap_numbers(&from_y, &to_y); + if (*backbuffer == NULL) + *backbuffer = CreateBitmapStruct(); - rect.x = from_x; - rect.y = from_y; - rect.w = (to_x - from_x + 1); - rect.h = (to_y - from_y + 1); + /* (real bitmap might be larger in fullscreen mode with video offsets) */ + (*backbuffer)->width = video.width; + (*backbuffer)->height = video.height; -#ifdef FULLSCREEN_BUG - if (dst_bitmap == backbuffer || dst_bitmap == window) + if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available) { - rect.x += video_xoffset; - rect.y += video_yoffset; - } -#endif + setFullscreenParameters(setup.fullscreen_mode); - SDL_FillRect(surface, &rect, - SDL_MapRGB(surface->format, color_r, color_g, color_b)); -} + video_xoffset = fullscreen_xoffset; + video_yoffset = fullscreen_yoffset; -inline void SDLDrawLine(Bitmap *dst_bitmap, int from_x, int from_y, - int to_x, int to_y, Uint32 color) -{ -#ifdef FULLSCREEN_BUG - if (dst_bitmap == backbuffer || dst_bitmap == window) - { - from_x += video_xoffset; - from_y += video_yoffset; - to_x += video_xoffset; - to_y += video_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 - sge_Line(dst_bitmap->surface, from_x, from_y, to_x, to_y, color); -} + if (new_surface == NULL) + { + /* switching display to fullscreen mode failed */ + Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); -#if 0 -inline void SDLDrawLines(SDL_Surface *surface, struct XY *points, - int num_points, Uint32 color) -{ - int i, x, y; - int line_width = 4; + /* do not try it again */ + video.fullscreen_available = FALSE; - for (i=0; isurface = new_surface; - if ((x == 0 && y == 0) || - (x == 0 && y == line_width - 1) || - (x == line_width - 1 && y == 0) || - (x == line_width - 1 && y == line_width - 1)) - continue; + video.fullscreen_enabled = TRUE; + video.fullscreen_mode_current = setup.fullscreen_mode; - sge_Line(surface, points[i].x + dx, points[i].y + dy, - points[i+1].x + dx, points[i+1].y + dy, color); - } + success = TRUE; } } -} -#endif - -inline Pixel SDLGetPixel(Bitmap *dst_bitmap, int x, int y) -{ - SDL_Surface *surface = dst_bitmap->surface; -#ifdef FULLSCREEN_BUG - if (dst_bitmap == backbuffer || dst_bitmap == window) + if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL) { - x += video_xoffset; - y += video_yoffset; - } + 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); + + 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 - switch (surface->format->BytesPerPixel) - { - case 1: /* assuming 8-bpp */ + 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 { - return *((Uint8 *)surface->pixels + y * surface->pitch + x); + Error(ERR_WARN, "SDL_CreateWindow() failed: %s", SDL_GetError()); } - break; - case 2: /* probably 15-bpp or 16-bpp */ +#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) { - return *((Uint16 *)surface->pixels + y * surface->pitch / 2 + x); + new_surface = SDL_GetWindowSurface(sdl_window); + + // SDL_UpdateWindowSurface(sdl_window); // immediately map window + // UpdateScreen(NULL); // immediately map window } - break; +#endif - case 3: /* slow 24-bpp mode; usually not used */ +#else + new_surface = SDL_SetVideoMode(video.width, video.height, + video.depth, surface_flags_window); +#endif +#endif + + if (new_surface == NULL) { - /* does this work? */ - Uint8 *pix = (Uint8 *)surface->pixels + y * surface->pitch + x * 3; - Uint32 color = 0; - int shift; + /* switching display to window mode failed -- should not happen */ + Error(ERR_WARN, "SDL_SetVideoMode() failed: %s", SDL_GetError()); - shift = surface->format->Rshift; - color |= *(pix + shift / 8) >> shift; - shift = surface->format->Gshift; - color |= *(pix + shift / 8) >> shift; - shift = surface->format->Bshift; - color |= *(pix + shift / 8) >> shift; + success = FALSE; + } + else + { + (*backbuffer)->surface = new_surface; - return color; + video.fullscreen_enabled = FALSE; + video.window_scaling_percent = setup.window_scaling_percent; + video.window_scaling_quality = setup.window_scaling_quality; + + success = TRUE; } - break; + } - case 4: /* probably 32-bpp */ +#if defined(TARGET_SDL2) + SDLRedrawWindow(); // map window + // UpdateScreen(NULL); // map window +#endif + +#if 1 + SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE); + +#if defined(PLATFORM_WIN32) + { + SDL_SysWMinfo wminfo; + HWND hwnd; + boolean wminfo_success = FALSE; + + SDL_VERSION(&wminfo.version); +#if defined(TARGET_SDL2) + if (sdl_window) + wminfo_success = SDL_GetWindowWMInfo(sdl_window, &wminfo); +#else + wminfo_success = (SDL_GetWMInfo(&wminfo) == 1); +#endif + + if (wminfo_success) { - return *((Uint32 *)surface->pixels + y * surface->pitch / 4 + x); +#if defined(TARGET_SDL2) + hwnd = wminfo.info.win.window; +#else + hwnd = wminfo.window; +#endif + + DragAcceptFiles(hwnd, TRUE); } - break; } +#endif +#endif - return 0; + 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 +} -/* ========================================================================= */ -/* The following functions have been taken from the SGE library */ -/* (SDL Graphics Extension Library) by Anders Lindström */ -/* http://www.etek.chalmers.se/~e8cal1/sge/index.html */ -/* ========================================================================= */ +#if defined(TARGET_SDL2) +void SDLSetWindowScaling(int window_scaling_percent) +{ + if (sdl_window == NULL) + return; -void _PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) + 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); + +#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; + video.window_width = new_window_width; + video.window_height = new_window_height; + + SetWindowTitle(); +} + +void SDLSetWindowScalingQuality(char *window_scaling_quality) { - if (x >= 0 && x <= surface->w - 1 && y >= 0 && y <= surface->h - 1) + if (sdl_texture == 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); + + if (new_texture != NULL) { - switch (surface->format->BytesPerPixel) - { - case 1: - { - /* Assuming 8-bpp */ - *((Uint8 *)surface->pixels + y*surface->pitch + x) = color; - } - break; + SDL_DestroyTexture(sdl_texture); - case 2: - { - /* Probably 15-bpp or 16-bpp */ - *((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color; - } - break; + sdl_texture = new_texture; - case 3: - { - /* Slow 24-bpp mode, usually not used */ - Uint8 *pix; - int shift; + SDLRedrawWindow(); + } - /* Gack - slow, but endian correct */ - pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3; - shift = surface->format->Rshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Gshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Bshift; - *(pix+shift/8) = color>>shift; - } - break; + video.window_scaling_quality = window_scaling_quality; +} + +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 + +#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 + +#if 1 + // if game started in fullscreen mode, window will also get fullscreen size + if (!fullscreen && video.fullscreen_initial) + { + SDLSetWindowScaling(setup.window_scaling_percent); + SDL_SetWindowPosition(sdl_window, + SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED); + + video.fullscreen_initial = FALSE; + } +#endif +} + +void SDLRedrawWindow() +{ + UpdateScreen(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); + + if (surface == NULL) + Error(ERR_EXIT, "SDL_CreateRGBSurface() failed: %s", SDL_GetError()); + + 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) +{ + if (bitmap->surface) + SDL_FreeSurface(bitmap->surface); + if (bitmap->surface_masked) + SDL_FreeSurface(bitmap->surface_masked); + bitmap->surface = NULL; + bitmap->surface_masked = NULL; +} + +void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y, int mask_mode) +{ + 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; + dst_rect.h = height; + + // if (src_bitmap != backbuffer || dst_bitmap != window) + if (!(src_bitmap == backbuffer && dst_bitmap == window)) + SDL_BlitSurface((mask_mode == BLIT_MASKED ? + 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); + } +#endif +} + +void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height, + Uint32 color) +{ + 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; + rect.h = 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); + UpdateScreen(&rect); + } +#endif +} + +void SDLFadeRectangle(Bitmap *bitmap_cross, 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_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); + + initialization_needed = TRUE; + } + + 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) */ + + 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; + } + + /* 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); + } + else if (fade_mode & FADE_TYPE_FADE_IN) + { + 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); + SDL_BlitSurface(surface_black, &src_rect, surface_target, &src_rect); + } + + time_current = SDL_GetTicks(); + + if (fade_mode == FADE_MODE_MELT) + { + boolean done = FALSE; + int melt_pixels = 2; + int melt_columns = width / melt_pixels; + int ypos[melt_columns]; + int max_steps = height / 8 + 32; + int steps_done = 0; + float steps = 0; + 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); + + for (i = 1 ; i < melt_columns; i++) + { + int r = GetSimpleRandom(3) - 1; /* randomly choose from { -1, 0, -1 } */ + + ypos[i] = ypos[i - 1] + r; + + if (ypos[i] > 0) + ypos[i] = 0; + else + if (ypos[i] == -16) + ypos[i] = -15; + } + + while (!done) + { + int steps_final; + + time_last = time_current; + time_current = SDL_GetTicks(); + steps += max_steps * ((float)(time_current - time_last) / fade_delay); + steps_final = MIN(MAX(0, steps), max_steps); + + steps_done++; + + done = (steps_done >= steps_final); + + for (i = 0 ; i < melt_columns; i++) + { + if (ypos[i] < 0) + { + ypos[i]++; + + done = FALSE; + } + else if (ypos[i] < height) + { + int y1 = 16; + int y2 = 8; + int y3 = 8; + int dy = (ypos[i] < y1) ? ypos[i] + 1 : y2 + GetSimpleRandom(y3); + + if (ypos[i] + dy >= height) + dy = height - ypos[i]; + + /* copy part of (appearing) target surface to upper area */ + src_rect.x = src_x + i * melt_pixels; + // src_rect.y = src_y + ypos[i]; + src_rect.y = src_y; + src_rect.w = melt_pixels; + // src_rect.h = dy; + src_rect.h = ypos[i] + dy; + + dst_rect.x = dst_x + i * melt_pixels; + // dst_rect.y = dst_y + ypos[i]; + dst_rect.y = dst_y; + + if (steps_done >= steps_final) + SDL_BlitSurface(surface_target, &src_rect, + surface_screen, &dst_rect); + + ypos[i] += dy; + + /* copy part of (disappearing) source surface to lower area */ + src_rect.x = src_x + i * melt_pixels; + src_rect.y = src_y; + src_rect.w = melt_pixels; + src_rect.h = height - ypos[i]; + + dst_rect.x = dst_x + i * melt_pixels; + dst_rect.y = dst_y + ypos[i]; + + if (steps_done >= steps_final) + SDL_BlitSurface(surface_source, &src_rect, + surface_screen, &dst_rect); + + done = FALSE; + } + else + { + src_rect.x = src_x + i * melt_pixels; + src_rect.y = src_y; + src_rect.w = melt_pixels; + src_rect.h = height; + + dst_rect.x = dst_x + i * melt_pixels; + dst_rect.y = dst_y; + + if (steps_done >= steps_final) + SDL_BlitSurface(surface_target, &src_rect, + surface_screen, &dst_rect); + } + } + + if (steps_done >= steps_final) + { + 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 + } + } + } + else + { + float alpha; + int alpha_final; + + for (alpha = 0.0; alpha < 255.0;) + { + time_last = time_current; + time_current = SDL_GetTicks(); + alpha += 255 * ((float)(time_current - time_last) / fade_delay); + alpha_final = MIN(MAX(0, alpha), 255); + + /* draw existing (source) image to screen buffer */ + 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) + 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 + } + } + + Delay(post_delay); +} + +void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y, + int to_x, int to_y, Uint32 color) +{ + SDL_Surface *surface = dst_bitmap->surface; + SDL_Rect rect; + + if (from_x > to_x) + swap_numbers(&from_x, &to_x); + + if (from_y > to_y) + swap_numbers(&from_y, &to_y); + + rect.x = from_x; + rect.y = 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 +void SDLDrawLines(SDL_Surface *surface, struct XY *points, + int num_points, Uint32 color) +{ + int i, x, y; + int line_width = 4; + + for (i = 0; i < num_points - 1; i++) + { + for (x = 0; x < line_width; x++) + { + for (y = 0; y < line_width; y++) + { + int dx = x - line_width / 2; + int dy = y - line_width / 2; + + if ((x == 0 && y == 0) || + (x == 0 && y == line_width - 1) || + (x == line_width - 1 && y == 0) || + (x == line_width - 1 && y == line_width - 1)) + continue; + + sge_Line(surface, points[i].x + dx, points[i].y + dy, + points[i+1].x + dx, points[i+1].y + dy, color); + } + } + } +} +#endif + +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 */ + { + return *((Uint8 *)surface->pixels + y * surface->pitch + x); + } + break; + + case 2: /* probably 15-bpp or 16-bpp */ + { + return *((Uint16 *)surface->pixels + y * surface->pitch / 2 + x); + } + break; + + case 3: /* slow 24-bpp mode; usually not used */ + { + /* does this work? */ + Uint8 *pix = (Uint8 *)surface->pixels + y * surface->pitch + x * 3; + Uint32 color = 0; + int shift; + + shift = surface->format->Rshift; + color |= *(pix + shift / 8) >> shift; + shift = surface->format->Gshift; + color |= *(pix + shift / 8) >> shift; + shift = surface->format->Bshift; + color |= *(pix + shift / 8) >> shift; + + return color; + } + break; + + case 4: /* probably 32-bpp */ + { + return *((Uint32 *)surface->pixels + y * surface->pitch / 4 + x); + } + break; + } + + return 0; +} + + +/* ========================================================================= */ +/* The following functions were taken from the SGE library */ +/* (SDL Graphics Extension Library) by Anders Lindström */ +/* http://www.etek.chalmers.se/~e8cal1/sge/index.html */ +/* ========================================================================= */ + +void _PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + if (x >= 0 && x <= surface->w - 1 && y >= 0 && y <= surface->h - 1) + { + switch (surface->format->BytesPerPixel) + { + case 1: + { + /* Assuming 8-bpp */ + *((Uint8 *)surface->pixels + y*surface->pitch + x) = color; + } + break; + + case 2: + { + /* Probably 15-bpp or 16-bpp */ + *((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color; + } + break; + + case 3: + { + /* Slow 24-bpp mode, usually not used */ + Uint8 *pix; + int shift; + + /* Gack - slow, but endian correct */ + pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3; + shift = surface->format->Rshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Gshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Bshift; + *(pix+shift/8) = color>>shift; + } + break; + + case 4: + { + /* Probably 32-bpp */ + *((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color; + } + break; + } + } +} + +void _PutPixelRGB(SDL_Surface *surface, Sint16 x, Sint16 y, + Uint8 R, Uint8 G, Uint8 B) +{ + _PutPixel(surface, x, y, SDL_MapRGB(surface->format, R, G, B)); +} + +void _PutPixel8(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + *((Uint8 *)surface->pixels + y*surface->pitch + x) = color; +} + +void _PutPixel16(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + *((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color; +} + +void _PutPixel24(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + Uint8 *pix; + int shift; + + /* Gack - slow, but endian correct */ + pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3; + shift = surface->format->Rshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Gshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Bshift; + *(pix+shift/8) = color>>shift; +} + +void _PutPixel32(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + *((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color; +} + +void _PutPixelX(SDL_Surface *dest,Sint16 x,Sint16 y,Uint32 color) +{ + switch (dest->format->BytesPerPixel) + { + case 1: + *((Uint8 *)dest->pixels + y*dest->pitch + x) = color; + break; + + case 2: + *((Uint16 *)dest->pixels + y*dest->pitch/2 + x) = color; + break; + + case 3: + _PutPixel24(dest,x,y,color); + break; + + case 4: + *((Uint32 *)dest->pixels + y*dest->pitch/4 + x) = color; + break; + } +} + +void sge_PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +{ + if (SDL_MUSTLOCK(surface)) + { + if (SDL_LockSurface(surface) < 0) + { + return; + } + } + + _PutPixel(surface, x, y, color); + + if (SDL_MUSTLOCK(surface)) + { + SDL_UnlockSurface(surface); + } +} + +void sge_PutPixelRGB(SDL_Surface *surface, Sint16 x, Sint16 y, + Uint8 r, Uint8 g, Uint8 b) +{ + sge_PutPixel(surface, x, y, SDL_MapRGB(surface->format, r, g, b)); +} + +Sint32 sge_CalcYPitch(SDL_Surface *dest, Sint16 y) +{ + if (y >= 0 && y <= dest->h - 1) + { + switch (dest->format->BytesPerPixel) + { + case 1: + return y*dest->pitch; + break; + + case 2: + return y*dest->pitch/2; + break; + + case 3: + return y*dest->pitch; + break; + + case 4: + return y*dest->pitch/4; + break; + } + } + + return -1; +} + +void sge_pPutPixel(SDL_Surface *surface, Sint16 x, Sint32 ypitch, Uint32 color) +{ + if (x >= 0 && x <= surface->w - 1 && ypitch >= 0) + { + switch (surface->format->BytesPerPixel) + { + case 1: + { + /* Assuming 8-bpp */ + *((Uint8 *)surface->pixels + ypitch + x) = color; + } + break; + + case 2: + { + /* Probably 15-bpp or 16-bpp */ + *((Uint16 *)surface->pixels + ypitch + x) = color; + } + break; + + case 3: + { + /* Slow 24-bpp mode, usually not used */ + Uint8 *pix; + int shift; + + /* Gack - slow, but endian correct */ + pix = (Uint8 *)surface->pixels + ypitch + x*3; + shift = surface->format->Rshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Gshift; + *(pix+shift/8) = color>>shift; + shift = surface->format->Bshift; + *(pix+shift/8) = color>>shift; + } + break; + + case 4: + { + /* Probably 32-bpp */ + *((Uint32 *)surface->pixels + ypitch + x) = color; + } + break; + } + } +} + +void sge_HLine(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, + Uint32 Color) +{ + SDL_Rect l; + + if (SDL_MUSTLOCK(Surface)) + { + if (SDL_LockSurface(Surface) < 0) + { + return; + } + } + + if (x1 > x2) + { + Sint16 tmp = x1; + x1 = x2; + x2 = tmp; + } + + /* Do the clipping */ + if (y < 0 || y > Surface->h - 1 || x1 > Surface->w - 1 || x2 < 0) + return; + if (x1 < 0) + x1 = 0; + if (x2 > Surface->w - 1) + x2 = Surface->w - 1; + + l.x = x1; + l.y = y; + l.w = x2 - x1 + 1; + l.h = 1; + + SDL_FillRect(Surface, &l, Color); + + if (SDL_MUSTLOCK(Surface)) + { + SDL_UnlockSurface(Surface); + } +} + +void sge_HLineRGB(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, + Uint8 R, Uint8 G, Uint8 B) +{ + sge_HLine(Surface, x1, x2, y, SDL_MapRGB(Surface->format, R, G, B)); +} + +void _HLine(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, Uint32 Color) +{ + SDL_Rect l; + + if (x1 > x2) + { + Sint16 tmp = x1; + x1 = x2; + x2 = tmp; + } + + /* Do the clipping */ + if (y < 0 || y > Surface->h - 1 || x1 > Surface->w - 1 || x2 < 0) + return; + if (x1 < 0) + x1 = 0; + if (x2 > Surface->w - 1) + x2 = Surface->w - 1; + + l.x = x1; + l.y = y; + l.w = x2 - x1 + 1; + l.h = 1; + + SDL_FillRect(Surface, &l, Color); +} + +void sge_VLine(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, + Uint32 Color) +{ + SDL_Rect l; + + if (SDL_MUSTLOCK(Surface)) + { + if (SDL_LockSurface(Surface) < 0) + { + return; + } + } + + if (y1 > y2) + { + Sint16 tmp = y1; + y1 = y2; + y2 = tmp; + } + + /* Do the clipping */ + if (x < 0 || x > Surface->w - 1 || y1 > Surface->h - 1 || y2 < 0) + return; + if (y1 < 0) + y1 = 0; + if (y2 > Surface->h - 1) + y2 = Surface->h - 1; + + l.x = x; + l.y = y1; + l.w = 1; + l.h = y2 - y1 + 1; + + SDL_FillRect(Surface, &l, Color); + + if (SDL_MUSTLOCK(Surface)) + { + SDL_UnlockSurface(Surface); + } +} + +void sge_VLineRGB(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, + Uint8 R, Uint8 G, Uint8 B) +{ + sge_VLine(Surface, x, y1, y2, SDL_MapRGB(Surface->format, R, G, B)); +} + +void _VLine(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, Uint32 Color) +{ + SDL_Rect l; + + if (y1 > y2) + { + Sint16 tmp = y1; + y1 = y2; + y2 = tmp; + } + + /* Do the clipping */ + if (x < 0 || x > Surface->w - 1 || y1 > Surface->h - 1 || y2 < 0) + return; + if (y1 < 0) + y1 = 0; + if (y2 > Surface->h - 1) + y2 = Surface->h - 1; + + l.x = x; + l.y = y1; + l.w = 1; + l.h = y2 - y1 + 1; + + SDL_FillRect(Surface, &l, Color); +} + +void sge_DoLine(SDL_Surface *Surface, Sint16 x1, Sint16 y1, + Sint16 x2, Sint16 y2, Uint32 Color, + void Callback(SDL_Surface *Surf, Sint16 X, Sint16 Y, + Uint32 Color)) +{ + Sint16 dx, dy, sdx, sdy, x, y, px, py; + + dx = x2 - x1; + dy = y2 - y1; + + sdx = (dx < 0) ? -1 : 1; + sdy = (dy < 0) ? -1 : 1; + + dx = sdx * dx + 1; + dy = sdy * dy + 1; + + x = y = 0; + + px = x1; + py = y1; + + if (dx >= dy) + { + for (x = 0; x < dx; x++) + { + Callback(Surface, px, py, Color); + + y += dy; + if (y >= dx) + { + y -= dx; + py += sdy; + } - case 4: + px += sdx; + } + } + else + { + for (y = 0; y < dy; y++) + { + Callback(Surface, px, py, Color); + + x += dx; + if (x >= dy) { - /* Probably 32-bpp */ - *((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color; + x -= dy; + px += sdx; } - break; + + py += sdy; } } } -void _PutPixelRGB(SDL_Surface *surface, Sint16 x, Sint16 y, - Uint8 R, Uint8 G, Uint8 B) -{ - _PutPixel(surface, x, y, SDL_MapRGB(surface->format, R, G, B)); -} - -void _PutPixel8(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +void sge_DoLineRGB(SDL_Surface *Surface, Sint16 X1, Sint16 Y1, + Sint16 X2, Sint16 Y2, Uint8 R, Uint8 G, Uint8 B, + void Callback(SDL_Surface *Surf, Sint16 X, Sint16 Y, + Uint32 Color)) { - *((Uint8 *)surface->pixels + y*surface->pitch + x) = color; + sge_DoLine(Surface, X1, Y1, X2, Y2, + SDL_MapRGB(Surface->format, R, G, B), Callback); } -void _PutPixel16(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +void sge_Line(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, + Uint32 Color) { - *((Uint16 *)surface->pixels + y*surface->pitch/2 + x) = color; -} + if (SDL_MUSTLOCK(Surface)) + { + if (SDL_LockSurface(Surface) < 0) + return; + } -void _PutPixel24(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) -{ - Uint8 *pix; - int shift; + /* Draw the line */ + sge_DoLine(Surface, x1, y1, x2, y2, Color, _PutPixel); - /* Gack - slow, but endian correct */ - pix = (Uint8 *)surface->pixels + y * surface->pitch + x*3; - shift = surface->format->Rshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Gshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Bshift; - *(pix+shift/8) = color>>shift; + /* unlock the display */ + if (SDL_MUSTLOCK(Surface)) + { + SDL_UnlockSurface(Surface); + } } -void _PutPixel32(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +void sge_LineRGB(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, + Sint16 y2, Uint8 R, Uint8 G, Uint8 B) { - *((Uint32 *)surface->pixels + y*surface->pitch/4 + x) = color; + sge_Line(Surface, x1, y1, x2, y2, SDL_MapRGB(Surface->format, R, G, B)); } -void _PutPixelX(SDL_Surface *dest,Sint16 x,Sint16 y,Uint32 color) +void SDLPutPixel(Bitmap *dst_bitmap, int x, int y, Pixel pixel) { - switch (dest->format->BytesPerPixel) + if (dst_bitmap == backbuffer || dst_bitmap == window) { - case 1: - *((Uint8 *)dest->pixels + y*dest->pitch + x) = color; - break; + x += video_xoffset; + y += video_yoffset; + } - case 2: - *((Uint16 *)dest->pixels + y*dest->pitch/2 + x) = color; - break; + sge_PutPixel(dst_bitmap->surface, x, y, pixel); +} - case 3: - _PutPixel24(dest,x,y,color); - break; - case 4: - *((Uint32 *)dest->pixels + y*dest->pitch/4 + x) = color; - break; - } -} +/* + ----------------------------------------------------------------------------- + quick (no, it's slow) and dirty hack to "invert" rectangle inside SDL surface + ----------------------------------------------------------------------------- +*/ -void sge_PutPixel(SDL_Surface *surface, Sint16 x, Sint16 y, Uint32 color) +void SDLInvertArea(Bitmap *bitmap, int src_x, int src_y, + int width, int height, Uint32 color) { - if (SDL_MUSTLOCK(surface)) + int x, y; + + for (y = src_y; y < src_y + height; y++) { - if (SDL_LockSurface(surface) < 0) + for (x = src_x; x < src_x + width; x++) { - return; + Uint32 pixel = SDLGetPixel(bitmap, x, y); + + SDLPutPixel(bitmap, x, y, pixel == BLACK_PIXEL ? color : BLACK_PIXEL); } } +} - _PutPixel(surface, x, y, color); +void SDLCopyInverseMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap, + int src_x, int src_y, int width, int height, + int dst_x, int dst_y) +{ + int x, y; - if (SDL_MUSTLOCK(surface)) + for (y = 0; y < height; y++) { - SDL_UnlockSurface(surface); + for (x = 0; x < width; x++) + { + Uint32 pixel = SDLGetPixel(src_bitmap, src_x + x, src_y + y); + + if (pixel != BLACK_PIXEL) + SDLPutPixel(dst_bitmap, dst_x + x, dst_y + y, BLACK_PIXEL); + } } } -void sge_PutPixelRGB(SDL_Surface *surface, Sint16 x, Sint16 y, - Uint8 R, Uint8 G, Uint8 B) + +/* ========================================================================= */ +/* The following functions were taken from the SDL_gfx library version 2.0.3 */ +/* (Rotozoomer) by Andreas Schiffler */ +/* http://www.ferzkopp.net/Software/SDL_gfx-2.0/index.html */ +/* ========================================================================= */ + +/* + ----------------------------------------------------------------------------- + 32 bit zoomer + + zoomes 32bit RGBA/ABGR 'src' surface to 'dst' surface. + ----------------------------------------------------------------------------- +*/ + +typedef struct { - sge_PutPixel(surface, x, y, SDL_MapRGB(surface->format, R, G, B)); -} + Uint8 r; + Uint8 g; + Uint8 b; + Uint8 a; +} tColorRGBA; -Sint32 sge_CalcYPitch(SDL_Surface *dest, Sint16 y) +int zoomSurfaceRGBA_scaleDownBy2(SDL_Surface *src, SDL_Surface *dst) { - if (y >= 0 && y <= dest->h - 1) - { - switch (dest->format->BytesPerPixel) - { - case 1: - return y*dest->pitch; - break; + int x, y; + tColorRGBA *sp, *csp, *dp; +#if 0 + int sgap; +#endif + int dgap; - case 2: - return y*dest->pitch/2; - break; + /* 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; - case 3: - return y*dest->pitch; - break; + for (y = 0; y < dst->h; y++) + { + sp = csp; - case 4: - return y*dest->pitch/4; - break; + for (x = 0; x < dst->w; x++) + { + tColorRGBA *sp0 = sp; + tColorRGBA *sp1 = (tColorRGBA *) ((Uint8 *) sp + src->pitch); + tColorRGBA *sp00 = &sp0[0]; + tColorRGBA *sp01 = &sp0[1]; + tColorRGBA *sp10 = &sp1[0]; + tColorRGBA *sp11 = &sp1[1]; + tColorRGBA new; + + /* create new color pixel from all four source color pixels */ + new.r = (sp00->r + sp01->r + sp10->r + sp11->r) / 4; + new.g = (sp00->g + sp01->g + sp10->g + sp11->g) / 4; + new.b = (sp00->b + sp01->b + sp10->b + sp11->b) / 4; + new.a = (sp00->a + sp01->a + sp10->a + sp11->a) / 4; + + /* draw */ + *dp = new; + + /* advance source pointers */ + sp += 2; + + /* advance destination pointer */ + dp++; } + + /* advance source pointer */ + csp = (tColorRGBA *) ((Uint8 *) csp + 2 * src->pitch); + + /* advance destination pointers */ + dp = (tColorRGBA *) ((Uint8 *) dp + dgap); } - return -1; + return 0; } -void sge_pPutPixel(SDL_Surface *surface, Sint16 x, Sint32 ypitch, Uint32 color) +#if 1 + +int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) { - if (x >= 0 && x <= surface->w - 1 && ypitch >= 0) + 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 */ + if (src->w == 2 * dst->w && + 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; + + /* allocate memory for row increments */ + csax = sax = (int *)checked_malloc((dst->w + 1) * sizeof(Uint32)); + csay = say = (int *)checked_malloc((dst->h + 1) * sizeof(Uint32)); + + /* precalculate row increments */ + for (x = 0; x <= dst->w; x++) + *csax++ = (int)(sx * x); + + for (y = 0; y <= dst->h; y++) + *csay++ = (int)(sy * y); + + /* pointer setup */ + sp = csp = csp0 = (tColorRGBA *) src->pixels; + dp = (tColorRGBA *) dst->pixels; + dgap = dst->pitch - dst->w * 4; + + csay = say; + for (y = 0; y < dst->h; y++) { - switch (surface->format->BytesPerPixel) + sp = csp; + csax = sax; + + for (x = 0; x < dst->w; x++) { - case 1: - { - /* Assuming 8-bpp */ - *((Uint8 *)surface->pixels + ypitch + x) = color; - } - break; + /* draw */ + *dp = *sp; - case 2: - { - /* Probably 15-bpp or 16-bpp */ - *((Uint16 *)surface->pixels + ypitch + x) = color; - } - break; + /* advance source pointers */ + csax++; + sp = csp + *csax; - case 3: - { - /* Slow 24-bpp mode, usually not used */ - Uint8 *pix; - int shift; + /* advance destination pointer */ + dp++; + } - /* Gack - slow, but endian correct */ - pix = (Uint8 *)surface->pixels + ypitch + x*3; - shift = surface->format->Rshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Gshift; - *(pix+shift/8) = color>>shift; - shift = surface->format->Bshift; - *(pix+shift/8) = color>>shift; - } - break; + /* advance source pointer */ + csay++; + csp = (tColorRGBA *) ((Uint8 *) csp0 + *csay * src->pitch); - case 4: - { - /* Probably 32-bpp */ - *((Uint32 *)surface->pixels + ypitch + x) = color; - } - break; - } + /* advance destination pointers */ + dp = (tColorRGBA *) ((Uint8 *) dp + dgap); } + + free(sax); + free(say); + + return 0; } -void sge_HLine(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, - Uint32 Color) +#else + +int zoomSurfaceRGBA(SDL_Surface *src, SDL_Surface *dst) { - SDL_Rect l; + int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy; + tColorRGBA *sp, *csp, *dp; +#if 0 + int sgap; +#endif + int dgap; - if (SDL_MUSTLOCK(Surface)) + /* 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++) { - if (SDL_LockSurface(Surface) < 0) - { - return; - } + *csax = csx; + csax++; + csx &= 0xffff; + csx += sx; } - if (x1 > x2) + csy = 0; + csay = say; + for (y = 0; y <= dst->h; y++) { - Sint16 tmp = x1; - x1 = x2; - x2 = tmp; + *csay = csy; + csay++; + csy &= 0xffff; + csy += sy; } - /* Do the clipping */ - if (y < 0 || y > Surface->h - 1 || x1 > Surface->w - 1 || x2 < 0) - return; - if (x1 < 0) - x1 = 0; - if (x2 > Surface->w - 1) - x2 = Surface->w - 1; - - l.x = x1; - l.y = y; - l.w = x2 - x1 + 1; - l.h = 1; - - SDL_FillRect(Surface, &l, Color); + /* 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; - if (SDL_MUSTLOCK(Surface)) + csay = say; + for (y = 0; y < dst->h; y++) { - SDL_UnlockSurface(Surface); - } -} + sp = csp; + csax = sax; -void sge_HLineRGB(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, - Uint8 R, Uint8 G, Uint8 B) -{ - sge_HLine(Surface, x1, x2, y, SDL_MapRGB(Surface->format, R, G, B)); -} + for (x = 0; x < dst->w; x++) + { + /* draw */ + *dp = *sp; -void _HLine(SDL_Surface *Surface, Sint16 x1, Sint16 x2, Sint16 y, Uint32 Color) -{ - SDL_Rect l; + /* advance source pointers */ + csax++; + sp += (*csax >> 16); - if (x1 > x2) - { - Sint16 tmp = x1; - x1 = x2; - x2 = tmp; - } + /* advance destination pointer */ + dp++; + } - /* Do the clipping */ - if (y < 0 || y > Surface->h - 1 || x1 > Surface->w - 1 || x2 < 0) - return; - if (x1 < 0) - x1 = 0; - if (x2 > Surface->w - 1) - x2 = Surface->w - 1; + /* advance source pointer */ + csay++; + csp = (tColorRGBA *) ((Uint8 *) csp + (*csay >> 16) * src->pitch); - l.x = x1; - l.y = y; - l.w = x2 - x1 + 1; - l.h = 1; + /* advance destination pointers */ + dp = (tColorRGBA *) ((Uint8 *) dp + dgap); + } - SDL_FillRect(Surface, &l, Color); + free(sax); + free(say); + + return 0; } -void sge_VLine(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, - Uint32 Color) -{ - SDL_Rect l; +#endif - if (SDL_MUSTLOCK(Surface)) +/* + ----------------------------------------------------------------------------- + 8 bit zoomer + + zoomes 8 bit palette/Y 'src' surface to 'dst' surface + ----------------------------------------------------------------------------- +*/ + +int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst) +{ + Uint32 x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy; + Uint8 *sp, *dp, *csp; + int dgap; + + /* variable setup */ + sx = (Uint32) (65536.0 * (float) src->w / (float) dst->w); + sy = (Uint32) (65536.0 * (float) src->h / (float) dst->h); + + /* allocate memory for row increments */ + sax = (Uint32 *)checked_malloc(dst->w * sizeof(Uint32)); + say = (Uint32 *)checked_malloc(dst->h * sizeof(Uint32)); + + /* precalculate row increments */ + csx = 0; + csax = sax; + for (x = 0; x < dst->w; x++) { - if (SDL_LockSurface(Surface) < 0) - { - return; - } + csx += sx; + *csax = (csx >> 16); + csx &= 0xffff; + csax++; } - if (y1 > y2) + csy = 0; + csay = say; + for (y = 0; y < dst->h; y++) { - Sint16 tmp = y1; - y1 = y2; - y2 = tmp; + csy += sy; + *csay = (csy >> 16); + csy &= 0xffff; + csay++; } - /* Do the clipping */ - if (x < 0 || x > Surface->w - 1 || y1 > Surface->h - 1 || y2 < 0) - return; - if (y1 < 0) - y1 = 0; - if (y2 > Surface->h - 1) - y2 = Surface->h - 1; + csx = 0; + csax = sax; + for (x = 0; x < dst->w; x++) + { + csx += (*csax); + csax++; + } - l.x = x; - l.y = y1; - l.w = 1; - l.h = y2 - y1 + 1; + csy = 0; + csay = say; + for (y = 0; y < dst->h; y++) + { + csy += (*csay); + csay++; + } - SDL_FillRect(Surface, &l, Color); + /* pointer setup */ + sp = csp = (Uint8 *) src->pixels; + dp = (Uint8 *) dst->pixels; + dgap = dst->pitch - dst->w; - if (SDL_MUSTLOCK(Surface)) + /* draw */ + csay = say; + for (y = 0; y < dst->h; y++) { - SDL_UnlockSurface(Surface); - } -} + csax = sax; + sp = csp; + for (x = 0; x < dst->w; x++) + { + /* draw */ + *dp = *sp; -void sge_VLineRGB(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, - Uint8 R, Uint8 G, Uint8 B) -{ - sge_VLine(Surface, x, y1, y2, SDL_MapRGB(Surface->format, R, G, B)); -} + /* advance source pointers */ + sp += (*csax); + csax++; -void _VLine(SDL_Surface *Surface, Sint16 x, Sint16 y1, Sint16 y2, Uint32 Color) -{ - SDL_Rect l; + /* advance destination pointer */ + dp++; + } - if (y1 > y2) - { - Sint16 tmp = y1; - y1 = y2; - y2 = tmp; - } + /* advance source pointer (for row) */ + csp += ((*csay) * src->pitch); + csay++; - /* Do the clipping */ - if (x < 0 || x > Surface->w - 1 || y1 > Surface->h - 1 || y2 < 0) - return; - if (y1 < 0) - y1 = 0; - if (y2 > Surface->h - 1) - y2 = Surface->h - 1; + /* advance destination pointers */ + dp += dgap; + } - l.x = x; - l.y = y1; - l.w = 1; - l.h = y2 - y1 + 1; + free(sax); + free(say); - SDL_FillRect(Surface, &l, Color); + return 0; } -void sge_DoLine(SDL_Surface *Surface, Sint16 x1, Sint16 y1, - Sint16 x2, Sint16 y2, Uint32 Color, - void Callback(SDL_Surface *Surf, Sint16 X, Sint16 Y, - Uint32 Color)) -{ - Sint16 dx, dy, sdx, sdy, x, y, px, py; +/* + ----------------------------------------------------------------------------- + zoomSurface() - dx = x2 - x1; - dy = y2 - y1; + Zooms a 32bit or 8bit 'src' surface to newly created 'dst' surface. + 'zoomx' and 'zoomy' are scaling factors for width and height. + If the surface is not 8bit or 32bit RGBA/ABGR it will be converted + into a 32bit RGBA format on the fly. + ----------------------------------------------------------------------------- +*/ - sdx = (dx < 0) ? -1 : 1; - sdy = (dy < 0) ? -1 : 1; +SDL_Surface *zoomSurface(SDL_Surface *src, int dst_width, int dst_height) +{ + SDL_Surface *zoom_src = NULL; + SDL_Surface *zoom_dst = NULL; + boolean is_converted = FALSE; + boolean is_32bit; + int i; - dx = sdx * dx + 1; - dy = sdy * dy + 1; + if (src == NULL) + return NULL; - x = y = 0; + /* determine if source surface is 32 bit or 8 bit */ + is_32bit = (src->format->BitsPerPixel == 32); - px = x1; - py = y1; + if (is_32bit || src->format->BitsPerPixel == 8) + { + /* use source surface 'as is' */ + zoom_src = src; + } + else + { + /* new source surface is 32 bit with a defined RGB ordering */ + zoom_src = SDL_CreateRGBSurface(SURFACE_FLAGS, src->w, src->h, 32, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0); + SDL_BlitSurface(src, NULL, zoom_src, NULL); + is_32bit = TRUE; + is_converted = TRUE; + } - if (dx >= dy) + /* allocate surface to completely contain the zoomed surface */ + if (is_32bit) { - for (x = 0; x < dx; x++) - { - Callback(Surface, px, py, Color); + /* target surface is 32 bit with source RGBA/ABGR ordering */ + zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 32, + zoom_src->format->Rmask, + zoom_src->format->Gmask, + zoom_src->format->Bmask, 0); + } + else + { + /* target surface is 8 bit */ + zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 8, + 0, 0, 0, 0); + } - y += dy; - if (y >= dx) - { - y -= dx; - py += sdy; - } + /* lock source surface */ + SDL_LockSurface(zoom_src); - px += sdx; - } + /* check which kind of surface we have */ + if (is_32bit) + { + /* call the 32 bit transformation routine to do the zooming */ + zoomSurfaceRGBA(zoom_src, zoom_dst); } else { - for (y = 0; y < dy; y++) - { - Callback(Surface, px, py, Color); + /* copy palette */ + for (i = 0; i < zoom_src->format->palette->ncolors; i++) + zoom_dst->format->palette->colors[i] = + zoom_src->format->palette->colors[i]; + zoom_dst->format->palette->ncolors = zoom_src->format->palette->ncolors; + + /* call the 8 bit transformation routine to do the zooming */ + zoomSurfaceY(zoom_src, zoom_dst); + } - x += dx; - if (x >= dy) - { - x -= dy; - px += sdx; - } + /* unlock source surface */ + SDL_UnlockSurface(zoom_src); - py += sdy; - } - } -} + /* free temporary surface */ + if (is_converted) + SDL_FreeSurface(zoom_src); -void sge_DoLineRGB(SDL_Surface *Surface, Sint16 X1, Sint16 Y1, - Sint16 X2, Sint16 Y2, Uint8 R, Uint8 G, Uint8 B, - void Callback(SDL_Surface *Surf, Sint16 X, Sint16 Y, - Uint32 Color)) -{ - sge_DoLine(Surface, X1, Y1, X2, Y2, - SDL_MapRGB(Surface->format, R, G, B), Callback); + /* return destination surface */ + return zoom_dst; } -void sge_Line(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, - Uint32 Color) +#if 1 + +Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height) { - if (SDL_MUSTLOCK(Surface)) - { - if (SDL_LockSurface(Surface) < 0) - return; - } +#if 1 - /* Draw the line */ - sge_DoLine(Surface, x1, y1, x2, y2, Color, _PutPixel); + Bitmap *dst_bitmap = CreateBitmapStruct(); + SDL_Surface **dst_surface = &dst_bitmap->surface; - /* unlock the display */ - if (SDL_MUSTLOCK(Surface)) - { - SDL_UnlockSurface(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; + + /* create zoomed temporary surface from source surface */ + *dst_surface = zoomSurface(src_bitmap->surface, dst_width, dst_height); + + /* create native format destination surface from zoomed temporary surface */ + SDLSetNativeSurface(dst_surface); + + return dst_bitmap; + +#else + + Bitmap *dst_bitmap = CreateBitmapStruct(); + SDL_Surface *sdl_surface_tmp; + + 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"); + + /* 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"); + + return dst_bitmap; + +#endif } -void sge_LineRGB(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, - Sint16 y2, Uint8 R, Uint8 G, Uint8 B) +#else + +void SDLZoomBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap) { - sge_Line(Surface, x1, y1, x2, y2, SDL_MapRGB(Surface->format, R, G, B)); + 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 */ +/* ========================================================================= */ + Bitmap *SDLLoadImage(char *filename) { 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) { SetError("IMG_Load(): %s", SDL_GetError()); + return NULL; } + print_timestamp_time("IMG_Load"); + + 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 + + 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 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)"); + + UPDATE_BUSY_STATE(); /* free temporary surface */ SDL_FreeSurface(sdl_image_tmp); @@ -856,25 +2683,69 @@ Bitmap *SDLLoadImage(char *filename) new_bitmap->width = new_bitmap->surface->w; new_bitmap->height = new_bitmap->surface->h; + print_timestamp_done("SDLLoadImage"); + return new_bitmap; } +/* ------------------------------------------------------------------------- */ +/* custom cursor fuctions */ +/* ------------------------------------------------------------------------- */ + +static SDL_Cursor *create_cursor(struct MouseCursorInfo *cursor_info) +{ + return SDL_CreateCursor(cursor_info->data, cursor_info->mask, + cursor_info->width, cursor_info->height, + cursor_info->hot_x, cursor_info->hot_y); +} + +void SDLSetMouseCursor(struct MouseCursorInfo *cursor_info) +{ + static struct MouseCursorInfo *last_cursor_info = NULL; + static struct MouseCursorInfo *last_cursor_info2 = NULL; + static SDL_Cursor *cursor_default = NULL; + static SDL_Cursor *cursor_current = NULL; + + /* if invoked for the first time, store the SDL default cursor */ + if (cursor_default == NULL) + cursor_default = SDL_GetCursor(); + + /* only create new cursor if cursor info (custom only) has changed */ + if (cursor_info != NULL && cursor_info != last_cursor_info) + { + cursor_current = create_cursor(cursor_info); + last_cursor_info = cursor_info; + } + + /* only set new cursor if cursor info (custom or NULL) has changed */ + if (cursor_info != last_cursor_info2) + SDL_SetCursor(cursor_info ? cursor_current : cursor_default); + + last_cursor_info2 = cursor_info; +} + + /* ========================================================================= */ /* audio functions */ /* ========================================================================= */ -inline void SDLOpenAudio(void) +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) { Error(ERR_WARN, "SDL_InitSubSystem() failed: %s", SDL_GetError()); return; } - if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE, AUDIO_S16, - AUDIO_STEREO_CHANNELS, - DEFAULT_AUDIO_FRAGMENT_SIZE) < 0) + if (Mix_OpenAudio(DEFAULT_AUDIO_SAMPLE_RATE, MIX_DEFAULT_FORMAT, + AUDIO_NUM_CHANNELS_STEREO, + setup.system.audio_fragment_size) < 0) { Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError()); return; @@ -885,22 +2756,15 @@ inline void SDLOpenAudio(void) audio.loops_available = TRUE; audio.sound_enabled = TRUE; - /* determine number of available channels */ - audio.channels = Mix_AllocateChannels(MIX_CHANNELS); - - if (!audio.mods_available) /* reserve first channel for music loops */ - { - if (Mix_ReserveChannels(1) == 1) - audio.music_channel = 0; - else - audio.music_available = FALSE; - } + /* set number of available mixer channels */ + audio.num_channels = Mix_AllocateChannels(NUM_MIXER_CHANNELS); + audio.music_channel = MUSIC_CHANNEL; + audio.first_sound_channel = FIRST_SOUND_CHANNEL; - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_VolumeMusic(SOUND_MAX_VOLUME); + Mixer_InitChannels(); } -inline void SDLCloseAudio(void) +void SDLCloseAudio(void) { Mix_HaltMusic(); Mix_HaltChannel(-1); @@ -914,11 +2778,10 @@ inline void SDLCloseAudio(void) /* event functions */ /* ========================================================================= */ -inline void SDLNextEvent(Event *event) +void SDLNextEvent(Event *event) { SDL_WaitEvent(event); -#ifdef FULLSCREEN_BUG if (event->type == EVENT_BUTTONPRESS || event->type == EVENT_BUTTONRELEASE) { @@ -933,14 +2796,55 @@ inline void SDLNextEvent(Event *event) } else if (event->type == EVENT_MOTIONNOTIFY) { - if (((ButtonEvent *)event)->x > video_xoffset) - ((ButtonEvent *)event)->x -= video_xoffset; + if (((MotionEvent *)event)->x > video_xoffset) + ((MotionEvent *)event)->x -= video_xoffset; else - ((ButtonEvent *)event)->x = 0; - if (((ButtonEvent *)event)->y > video_yoffset) - ((ButtonEvent *)event)->y -= video_yoffset; + ((MotionEvent *)event)->x = 0; + if (((MotionEvent *)event)->y > video_yoffset) + ((MotionEvent *)event)->y -= video_yoffset; else - ((ButtonEvent *)event)->y = 0; + ((MotionEvent *)event)->y = 0; + } +} + +void SDLHandleWindowManagerEvent(Event *event) +{ +#if defined(PLATFORM_WIN32) + 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"); + + num_files = DragQueryFile(hdrop, 0xffffffff, NULL, 0); + + for (i = 0; i < num_files; i++) + { + int buffer_len = DragQueryFile(hdrop, i, NULL, 0); + char buffer[buffer_len + 1]; + + DragQueryFile(hdrop, i, buffer, buffer_len + 1); + + printf("::: - '%s'\n", buffer); + } + +#if defined(TARGET_SDL2) + DragFinish((HDROP)syswmmsg->msg.win.wParam); +#else + DragFinish((HDROP)syswmmsg->wParam); +#endif } #endif } @@ -968,6 +2872,8 @@ static void SDLCloseJoystick(int nr) return; SDL_JoystickClose(sdl_joystick[nr]); + + sdl_joystick[nr] = NULL; } static boolean SDLCheckJoystickOpened(int nr) @@ -975,7 +2881,11 @@ 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) @@ -1005,30 +2915,40 @@ void HandleJoystickEvent(Event *event) void SDLInitJoysticks() { static boolean sdl_joystick_subsystem_initialized = FALSE; + boolean print_warning = !sdl_joystick_subsystem_initialized; int i; if (!sdl_joystick_subsystem_initialized) { 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; } } - for (i=0; i= SDL_NumJoysticks()) + { + if (setup.input[i].use_joystick && print_warning) + Error(ERR_WARN, "cannot find joystick %d", joystick_nr); + joystick_nr = -1; + } /* misuse joystick file descriptor variable to store joystick number */ joystick.fd[i] = joystick_nr; + if (joystick_nr == -1) + continue; + /* this allows subsequent calls to 'InitJoysticks' for re-initialization */ if (SDLCheckJoystickOpened(joystick_nr)) SDLCloseJoystick(joystick_nr); @@ -1038,7 +2958,9 @@ void SDLInitJoysticks() if (!SDLOpenJoystick(joystick_nr)) { - Error(ERR_WARN, "cannot open joystick %d", joystick_nr); + if (print_warning) + Error(ERR_WARN, "cannot open joystick %d", joystick_nr); + continue; }