X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsdl.c;h=b6fd5b407b2ec9dbfcfe9f0d0af3e49c9d1ddaa7;hb=6a8e3d4379f0a7421e046ca86168ce1581862a1f;hp=734307d55709d84060e2894492bb298b7eacd81d;hpb=faad97c450f035fb84748e8ca72048e53c92de78;p=rocksndiamonds.git diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c index 734307d5..b6fd5b40 100644 --- a/src/libgame/sdl.c +++ b/src/libgame/sdl.c @@ -30,7 +30,7 @@ static SDL_Window *sdl_window = NULL; static SDL_Renderer *sdl_renderer = NULL; static SDL_Texture *sdl_texture = NULL; -#define USE_RENDERER 1 +#define USE_RENDERER TRUE #endif /* stuff needed to work around SDL/Windows fullscreen drawing bug */ @@ -40,13 +40,31 @@ static int fullscreen_xoffset; static int fullscreen_yoffset; static int video_xoffset; static int video_yoffset; +static boolean limit_screen_updates = FALSE; + /* functions from SGE library */ void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32); -#if defined(TARGET_SDL2) +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; @@ -79,8 +97,14 @@ static void UpdateScreen(SDL_Rect *rect) 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) { @@ -197,6 +221,7 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, }; #endif SDL_Rect **modes = NULL; + boolean hardware_fullscreen_available = TRUE; int i, j; /* default: normal game window size */ @@ -206,6 +231,7 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, fullscreen_yoffset = 0; #if !defined(TARGET_SDL2) + /* determine required standard fullscreen mode for game screen size */ for (i = 0; screen_xy[i][0] != -1; i++) { if (screen_xy[i][0] >= video.width && screen_xy[i][1] >= video.height) @@ -228,6 +254,9 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, 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(); @@ -254,17 +283,16 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, } } } - #else - /* get available hardware supported fullscreen modes */ modes = SDL_ListModes(NULL, SDL_FULLSCREEN | SDL_HWSURFACE); #endif if (modes == NULL) { - /* no screen modes available => no fullscreen mode support */ - video.fullscreen_available = FALSE; + /* no hardware screen modes available => no fullscreen mode support */ + // video.fullscreen_available = FALSE; + hardware_fullscreen_available = FALSE; } else if (modes == (SDL_Rect **)-1) { @@ -318,10 +346,19 @@ void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window, if (num_modes == 0) { /* no appropriate screen modes available => no fullscreen mode support */ - video.fullscreen_available = FALSE; + // 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) { @@ -380,17 +417,17 @@ static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, { SDL_Surface *new_surface = NULL; - int surface_flags_window = SURFACE_FLAGS; #if defined(TARGET_SDL2) - -#if 1 + 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 - // (never used with SDL2 now) int surface_flags_fullscreen = SURFACE_FLAGS | SDL_WINDOW_FULLSCREEN; #endif #else + int surface_flags_window = SURFACE_FLAGS; int surface_flags_fullscreen = SURFACE_FLAGS | SDL_FULLSCREEN; #endif @@ -399,38 +436,102 @@ static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, 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) + { +#if 0 + printf("::: GAME STARTS WITH FULLSCREEN %d\n", fullscreen); +#endif + + video.fullscreen_initial = fullscreen; + } + #if USE_RENDERER - float scale_factor = 1.2; + float window_scaling_factor = (float)setup.window_scaling_percent / 100; +#if !USE_DESKTOP_FULLSCREEN + float screen_scaling_factor = (fullscreen ? 1 : window_scaling_factor); +#endif + + video.window_width = window_scaling_factor * width; + video.window_height = window_scaling_factor * height; + +#if 0 + printf("::: use window scaling factor %f\n", screen_scaling_factor); +#endif if ((*backbuffer)->surface) + { SDL_FreeSurface((*backbuffer)->surface); + (*backbuffer)->surface = NULL; + } if (sdl_texture) + { SDL_DestroyTexture(sdl_texture); + sdl_texture = NULL; + } - if (sdl_renderer) - SDL_DestroyRenderer(sdl_renderer); + if (!(fullscreen && fullscreen_enabled)) + { + if (sdl_renderer) + { + SDL_DestroyRenderer(sdl_renderer); + sdl_renderer = NULL; + } - if (sdl_window) - SDL_DestroyWindow(sdl_window); + if (sdl_window) + { + SDL_DestroyWindow(sdl_window); + sdl_window = NULL; + } + } - sdl_window = SDL_CreateWindow(program.window_title, - SDL_WINDOWPOS_CENTERED, - SDL_WINDOWPOS_CENTERED, - (int)(scale_factor * width), - (int)(scale_factor * height), - surface_flags); +#if 0 + Error(ERR_INFO, "::: checking 'sdl_window' ..."); + + if (sdl_window == NULL) + Error(ERR_INFO, "::: calling SDL_CreateWindow() [%d, %d, %d] ...", + setup.fullscreen, fullscreen, fullscreen_enabled); +#endif + + if (sdl_window == NULL) + sdl_window = SDL_CreateWindow(program.window_title, + SDL_WINDOWPOS_CENTERED, + SDL_WINDOWPOS_CENTERED, +#if USE_DESKTOP_FULLSCREEN + video.window_width, + video.window_height, +#else + (int)(screen_scaling_factor * width), + (int)(screen_scaling_factor * height), +#endif + surface_flags); if (sdl_window != NULL) { - sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0); +#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 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, "linear"); + SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, setup.window_scaling_quality); sdl_texture = SDL_CreateTexture(sdl_renderer, SDL_PIXELFORMAT_ARGB8888, @@ -493,6 +594,12 @@ static SDL_Surface *SDLCreateScreen(DrawBuffer **backbuffer, new_surface = SDL_SetVideoMode(width, height, video.depth, surface_flags); #endif +#if defined(TARGET_SDL2) + // store fullscreen state ("video.fullscreen_enabled" may not reflect this!) + if (new_surface != NULL) + fullscreen_enabled = fullscreen; +#endif + return new_surface; } @@ -512,6 +619,8 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) #endif SDL_Surface *new_surface = NULL; + SetWindowTitle(); + if (*backbuffer == NULL) *backbuffer = CreateBitmapStruct(); @@ -584,7 +693,7 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) #if defined(TARGET_SDL2) #if USE_RENDERER - float scale_factor = 1.2; + float screen_scaling_factor = 1.2; int test_fullscreen = 0; int surface_flags = (test_fullscreen ? surface_flags_fullscreen : surface_flags_window); @@ -604,8 +713,8 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) sdl_window = SDL_CreateWindow(program.window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, - (int)(scale_factor * video.width), - (int)(scale_factor * video.height), + (int)(screen_scaling_factor * video.width), + (int)(screen_scaling_factor * video.height), surface_flags); if (sdl_window != NULL) @@ -697,13 +806,16 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) (*backbuffer)->surface = new_surface; video.fullscreen_enabled = FALSE; + video.window_scaling_percent = setup.window_scaling_percent; + video.window_scaling_quality = setup.window_scaling_quality; success = TRUE; } } #if defined(TARGET_SDL2) - UpdateScreen(NULL); // map window + SDLRedrawWindow(); // map window + // UpdateScreen(NULL); // map window #endif #if 1 @@ -713,13 +825,26 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) { SDL_SysWMinfo wminfo; HWND hwnd; + boolean wminfo_success = FALSE; SDL_VERSION(&wminfo.version); - SDL_GetWMInfo(&wminfo); +#if defined(TARGET_SDL2) + if (sdl_window) + wminfo_success = SDL_GetWindowWMInfo(sdl_window, &wminfo); +#else + wminfo_success = (SDL_GetWMInfo(&wminfo) == 1); +#endif - hwnd = wminfo.window; + if (wminfo_success) + { +#if defined(TARGET_SDL2) + hwnd = wminfo.info.win.window; +#else + hwnd = wminfo.window; +#endif - DragAcceptFiles(hwnd, TRUE); + DragAcceptFiles(hwnd, TRUE); + } } #endif #endif @@ -727,6 +852,104 @@ boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen) return success; } +void SDLSetWindowTitle() +{ +#if defined(TARGET_SDL2) + SDL_SetWindowTitle(sdl_window, program.window_title); +#else + SDL_WM_SetCaption(program.window_title, program.window_title); +#endif +} + +#if defined(TARGET_SDL2) +void SDLSetWindowScaling(int window_scaling_percent) +{ + if (sdl_window == NULL) + return; + + float window_scaling_factor = (float)window_scaling_percent / 100; + int new_window_width = (int)(window_scaling_factor * video.width); + int new_window_height = (int)(window_scaling_factor * video.height); + +#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 (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) + { + SDL_DestroyTexture(sdl_texture); + + sdl_texture = new_texture; + + SDLRedrawWindow(); + } + + 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 *new_bitmap, int width, int height, int depth) { @@ -799,7 +1022,10 @@ void SDLCopyArea(Bitmap *src_bitmap, Bitmap *dst_bitmap, } #else if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height); + { + // SDL_UpdateRect(backbuffer->surface, dst_x, dst_y, width, height); + UpdateScreen(&dst_rect); + } #endif } @@ -831,7 +1057,10 @@ void SDLFillRectangle(Bitmap *dst_bitmap, int x, int y, int width, int height, } #else if (dst_bitmap == window) - SDL_UpdateRect(backbuffer->surface, x, y, width, height); + { + // SDL_UpdateRect(backbuffer->surface, x, y, width, height); + UpdateScreen(&rect); + } #endif } @@ -846,9 +1075,7 @@ 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; @@ -877,9 +1104,7 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, dst_rect.w = width; /* (ignored) */ dst_rect.h = height; /* (ignored) */ -#if defined(TARGET_SDL2) dst_rect2 = dst_rect; -#endif if (initialization_needed) { @@ -1080,7 +1305,8 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect2, 1); UpdateScreen(&dst_rect2); #else - SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); + // SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); + UpdateScreen(&dst_rect2); #endif } } @@ -1119,7 +1345,8 @@ void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, // SDL_UpdateWindowSurfaceRects(sdl_window, &dst_rect, 1); UpdateScreen(&dst_rect); #else - SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); + // SDL_UpdateRect(surface_screen, dst_x, dst_y, width, height); + UpdateScreen(&dst_rect); #endif #else SDL_Flip(surface_screen); @@ -2307,9 +2534,17 @@ void SDLHandleWindowManagerEvent(Event *event) 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"); @@ -2326,7 +2561,11 @@ void SDLHandleWindowManagerEvent(Event *event) printf("::: - '%s'\n", buffer); } +#if defined(TARGET_SDL2) + DragFinish((HDROP)syswmmsg->msg.win.wParam); +#else DragFinish((HDROP)syswmmsg->wParam); +#endif } #endif }