X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_sdl.c;h=23e9fe9cab003c16fc8372d5df457e364373d309;hp=6f71d29b5104a0da1d869ad6ee44b4f7ff49c665;hb=HEAD;hpb=e6815ebce187ac7ddcddcdddc5a939df7c778c07 diff --git a/vid_sdl.c b/vid_sdl.c index 6f71d29b..79addbdf 100644 --- a/vid_sdl.c +++ b/vid_sdl.c @@ -59,9 +59,6 @@ static io_connect_t IN_GetIOHandle(void) #endif #endif -#ifdef WIN32 -#define SDL_R_RESTART -#endif // Tell startup code that we have a client int cl_available = true; @@ -72,7 +69,7 @@ static qbool vid_usingmouse = false; static qbool vid_usingmouse_relativeworks = false; // SDL2 workaround for unimplemented RelativeMouse mode static qbool vid_usinghidecursor = false; static qbool vid_hasfocus = false; -static qbool vid_usingvsync = false; +static qbool vid_wmborder_waiting, vid_wmborderless; static SDL_Joystick *vid_sdljoystick = NULL; static SDL_GameController *vid_sdlgamecontroller = NULL; static cvar_t joy_sdl2_trigger_deadzone = {CF_ARCHIVE | CF_CLIENT, "joy_sdl2_trigger_deadzone", "0.5", "deadzone for triggers to be registered as key presses"}; @@ -80,14 +77,8 @@ static cvar_t joy_sdl2_trigger_deadzone = {CF_ARCHIVE | CF_CLIENT, "joy_sdl2_tri static cvar_t *steelstorm_showing_map = NULL; // detect but do not create the cvar static cvar_t *steelstorm_showing_mousecursor = NULL; // detect but do not create the cvar -static int win_half_width = 50; -static int win_half_height = 50; -static int video_bpp; - static SDL_GLContext context; static SDL_Window *window; -static int window_flags; -static vid_mode_t desktop_mode; // Input handling @@ -371,7 +362,7 @@ qbool VID_ShowingKeyboard(void) return SDL_IsTextInputActive() != 0; } -void VID_SetMouse(qbool relative, qbool hidecursor) +static void VID_SetMouse(qbool relative, qbool hidecursor) { #ifndef DP_MOBILETOUCH #ifdef MACOSX @@ -885,8 +876,8 @@ static void IN_Move_TouchScreen_Quake(void) // simple quake controls multitouch[MAXFINGERS-1][0] = SDL_GetMouseState(&x, &y); - multitouch[MAXFINGERS-1][1] = x * 32768 / vid.width; - multitouch[MAXFINGERS-1][2] = y * 32768 / vid.height; + multitouch[MAXFINGERS-1][1] = x * 32768 / vid.mode.width; + multitouch[MAXFINGERS-1][2] = y * 32768 / vid.mode.height; // top of screen is toggleconsole and K_ESCAPE switch(keydest) @@ -987,6 +978,8 @@ void IN_Move( void ) { // have the mouse stuck in the middle, example use: prevent expose effect of beryl during the game when not using // window grabbing. --blub + int win_half_width = vid.mode.width>>1; + int win_half_height = vid.mode.height>>1; // we need 2 frames to initialize the center position if(!stuck) @@ -1016,6 +1009,8 @@ void IN_Move( void ) in_windowmouse_y = y; } + //Con_Printf("Mouse position: in_mouse %f %f in_windowmouse %f %f\n", in_mouse_x, in_mouse_y, in_windowmouse_x, in_windowmouse_y); + VID_BuildJoyState(&joystate); VID_ApplyJoyState(&joystate); } @@ -1024,20 +1019,6 @@ void IN_Move( void ) // Message Handling //// -#ifdef SDL_R_RESTART -static qbool sdl_needs_restart; -static void sdl_start(void) -{ -} -static void sdl_shutdown(void) -{ - sdl_needs_restart = false; -} -static void sdl_newmap(void) -{ -} -#endif - static keynum_t buttonremap[] = { K_MOUSE1, @@ -1059,9 +1040,7 @@ static keynum_t buttonremap[] = }; //#define DEBUGSDLEVENTS - -// SDL2 -void Sys_SendKeyEvents( void ) +void Sys_SDL_HandleEvents(void) { static qbool sound_active = true; int keycode; @@ -1172,22 +1151,48 @@ void Sys_SendKeyEvents( void ) #endif break; case SDL_WINDOWEVENT_MOVED: - break; - case SDL_WINDOWEVENT_RESIZED: - if(vid_resizable.integer < 2) + vid.xPos = event.window.data1; + vid.yPos = event.window.data2; + // Update vid.displayindex (current monitor) as it may have changed + // SDL_GetWindowDisplayIndex() doesn't work if the window manager moves the fullscreen window, but this works: + for (i = 0; i < vid_info_displaycount.integer; ++i) { - vid.width = event.window.data1; - vid.height = event.window.data2; -#ifdef SDL_R_RESTART - // better not call R_Modules_Restart_f from here directly, as this may wreak havoc... - // so, let's better queue it for next frame - if(!sdl_needs_restart) + SDL_Rect displaybounds; + if (SDL_GetDisplayBounds(i, &displaybounds) < 0) { - Cbuf_AddText(cmd_local, "\nr_restart\n"); - sdl_needs_restart = true; + Con_Printf(CON_ERROR "Error getting bounds of display %i: \"%s\"\n", i, SDL_GetError()); + return; + } + if (vid.xPos >= displaybounds.x && vid.xPos < displaybounds.x + displaybounds.w) + if (vid.yPos >= displaybounds.y && vid.yPos < displaybounds.y + displaybounds.h) + { + vid.mode.display = i; + break; } -#endif } + // when the window manager adds/removes the border it's likely to move the SDL window + // we'll need to correct that to (re)align the xhair with the monitor + if (vid_wmborder_waiting) + { + SDL_GetWindowBordersSize(window, &i, NULL, NULL, NULL); + if (!i != vid_wmborderless) // border state changed + { + SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(vid.mode.display), SDL_WINDOWPOS_CENTERED_DISPLAY(vid.mode.display)); + SDL_GetWindowPosition(window, &vid.xPos, &vid.yPos); + vid_wmborder_waiting = false; + } + } + break; + case SDL_WINDOWEVENT_RESIZED: // external events only + if(vid_resizable.integer < 2) + { + //vid.width = event.window.data1; + //vid.height = event.window.data2; + // get the real framebuffer size in case the platform's screen coordinates are DPI scaled + SDL_GL_GetDrawableSize(window, &vid.mode.width, &vid.mode.height); + } + break; + case SDL_WINDOWEVENT_SIZE_CHANGED: // internal and external events break; case SDL_WINDOWEVENT_MINIMIZED: break; @@ -1208,9 +1213,42 @@ void Sys_SendKeyEvents( void ) case SDL_WINDOWEVENT_CLOSE: host.state = host_shutdown; break; + case SDL_WINDOWEVENT_TAKE_FOCUS: + break; + case SDL_WINDOWEVENT_HIT_TEST: + break; + case SDL_WINDOWEVENT_ICCPROF_CHANGED: + break; + case SDL_WINDOWEVENT_DISPLAY_CHANGED: + // this event can't be relied on in fullscreen, see SDL_WINDOWEVENT_MOVED above + vid.mode.display = event.window.data1; + break; } } break; + case SDL_DISPLAYEVENT: // Display hotplugging + switch (event.display.event) + { + case SDL_DISPLAYEVENT_CONNECTED: + Con_Printf(CON_WARN "Display %i connected: %s\n", event.display.display, SDL_GetDisplayName(event.display.display)); +#ifdef __linux__ + Con_Print(CON_WARN "A vid_restart may be necessary!\n"); +#endif + Cvar_SetValueQuick(&vid_info_displaycount, SDL_GetNumVideoDisplays()); + // Ideally we'd call VID_ApplyDisplayMode() to try to switch to the preferred display here, + // but we may need a vid_restart first, see comments in VID_ApplyDisplayMode(). + break; + case SDL_DISPLAYEVENT_DISCONNECTED: + Con_Printf(CON_WARN "Display %i disconnected.\n", event.display.display); +#ifdef __linux__ + Con_Print(CON_WARN "A vid_restart may be necessary!\n"); +#endif + Cvar_SetValueQuick(&vid_info_displaycount, SDL_GetNumVideoDisplays()); + break; + case SDL_DISPLAYEVENT_ORIENTATION: + break; + } + break; case SDL_TEXTEDITING: #ifdef DEBUGSDLEVENTS Con_DPrintf("SDL_Event: SDL_TEXTEDITING - composition = %s, cursor = %d, selection lenght = %d\n", event.edit.text, event.edit.start, event.edit.length); @@ -1290,8 +1328,10 @@ void Sys_SendKeyEvents( void ) break; } + vid_activewindow = !vid_hidden && vid_hasfocus; + // enable/disable sound on focus gain/loss - if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer) + if (vid_activewindow || !snd_mutewhenidle.integer) { if (!sound_active) { @@ -1307,6 +1347,13 @@ void Sys_SendKeyEvents( void ) sound_active = false; } } + + if (!vid_activewindow || key_consoleactive || scr_loading) + VID_SetMouse(false, false); + else if (key_dest == key_menu || key_dest == key_menu_grabbed) + VID_SetMouse(vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer); + else + VID_SetMouse(vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer) && !vid_touchscreen.integer, !vid_touchscreen.integer); } ///////////////// @@ -1325,10 +1372,187 @@ qbool GL_ExtensionSupported(const char *name) return SDL_GL_ExtensionSupported(name); } -static qbool vid_sdl_initjoysticksystem = false; +/// Applies display settings immediately (no vid_restart required). +static void VID_ApplyDisplayMode(const viddef_mode_t *mode) +{ + uint32_t fullscreenwanted; + int displaywanted = bound(0, mode->display, vid_info_displaycount.integer - 1); + SDL_DisplayMode modefinal; + + if (mode->fullscreen) + fullscreenwanted = mode->desktopfullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_FULLSCREEN; + else + fullscreenwanted = 0; + + // moving to another display or switching to windowed + if (vid.mode.display != displaywanted // SDL seems unable to move any fullscreen window to another display + || !fullscreenwanted) + { + if (SDL_SetWindowFullscreen(window, 0) < 0) + { + Con_Printf(CON_ERROR "ERROR: can't deactivate fullscreen on display %i because %s\n", vid.mode.display, SDL_GetError()); + return; + } + vid.mode.desktopfullscreen = vid.mode.fullscreen = false; + Con_DPrintf("Fullscreen deactivated on display %i\n", vid.mode.display); + } + + // switching to windowed + if (!fullscreenwanted) + { + int toppx; + + SDL_SetWindowSize(window, vid.mode.width = mode->width, vid.mode.height = mode->height); + // resizable and borderless set here cos a separate callback would fail if the cvar is changed when the window is fullscreen + SDL_SetWindowResizable(window, vid_resizable.integer ? SDL_TRUE : SDL_FALSE); + SDL_SetWindowBordered(window, (SDL_bool)!vid_borderless.integer); + SDL_GetWindowBordersSize(window, &toppx, NULL, NULL, NULL); + vid_wmborderless = !toppx; + if (vid_borderless.integer != vid_wmborderless) // this is not the state we're looking for + vid_wmborder_waiting = true; + } + + // moving to another display or switching to windowed + if (vid.mode.display != displaywanted || !fullscreenwanted) + { +// SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED_DISPLAY(displaywanted), SDL_WINDOWPOS_CENTERED_DISPLAY(displaywanted)); +// SDL_GetWindowPosition(window, &vid.xPos, &vid.yPos); + + /* bones_was_here BUG: after SDL_DISPLAYEVENT hotplug events, on Xorg + NVIDIA, + * SDL_WINDOWPOS_CENTERED_DISPLAY(displaywanted) may place the window somewhere completely invisible. + * WORKAROUND: manual positioning seems safer: although SDL_GetDisplayBounds() may return outdated values, + * SDL_SetWindowPosition() always placed the window somewhere fully visible, even if it wasn't correct, + * when tested with SDL 2.26.5. + */ + SDL_Rect displaybounds; + if (SDL_GetDisplayBounds(displaywanted, &displaybounds) < 0) + { + Con_Printf(CON_ERROR "Error getting bounds of display %i: \"%s\"\n", displaywanted, SDL_GetError()); + return; + } + vid.xPos = displaybounds.x + 0.5 * (displaybounds.w - vid.mode.width); + vid.yPos = displaybounds.y + 0.5 * (displaybounds.h - vid.mode.height); + SDL_SetWindowPosition(window, vid.xPos, vid.yPos); + + vid.mode.display = displaywanted; + } + + // switching to a fullscreen mode + if (fullscreenwanted) + { + if (fullscreenwanted == SDL_WINDOW_FULLSCREEN) + { + // determine if a modeset is needed and if the requested resolution is supported + SDL_DisplayMode modewanted, modecurrent; + + modewanted.w = mode->width; + modewanted.h = mode->height; + modewanted.format = mode->bitsperpixel == 16 ? SDL_PIXELFORMAT_RGB565 : SDL_PIXELFORMAT_RGB888; + modewanted.refresh_rate = mode->refreshrate; + if (!SDL_GetClosestDisplayMode(displaywanted, &modewanted, &modefinal)) + { + // SDL_GetError() returns a random unrelated error if this fails (in 2.26.5) + Con_Printf(CON_ERROR "Error getting closest mode to %ix%i@%ihz for display %i\n", modewanted.w, modewanted.h, modewanted.refresh_rate, vid.mode.display); + return; + } + if (SDL_GetCurrentDisplayMode(displaywanted, &modecurrent) < 0) + { + Con_Printf(CON_ERROR "Error getting current mode of display %i: \"%s\"\n", vid.mode.display, SDL_GetError()); + return; + } + if (memcmp(&modecurrent, &modefinal, sizeof(modecurrent)) != 0) + { + if (mode->width != modefinal.w || mode->height != modefinal.h) + { + Con_Printf(CON_WARN "Display %i doesn't support resolution %ix%i\n", vid.mode.display, modewanted.w, modewanted.h); + return; + } + if (SDL_SetWindowDisplayMode(window, &modefinal) < 0) + { + Con_Printf(CON_ERROR "Error setting mode %ix%i@%ihz for display %i: \"%s\"\n", modefinal.w, modefinal.h, modefinal.refresh_rate, vid.mode.display, SDL_GetError()); + return; + } + // HACK to work around SDL BUG when switching from a lower to a higher res: + // the display res gets increased but the window size isn't increased + // (unless we do this first; switching to windowed mode first also works). + SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); + } + } + + if (SDL_SetWindowFullscreen(window, fullscreenwanted) < 0) + { + Con_Printf(CON_ERROR "ERROR: can't activate fullscreen on display %i because %s\n", vid.mode.display, SDL_GetError()); + return; + } + // get the real framebuffer size in case the platform's screen coordinates are DPI scaled + SDL_GL_GetDrawableSize(window, &vid.mode.width, &vid.mode.height); + vid.mode.fullscreen = true; + vid.mode.desktopfullscreen = fullscreenwanted == SDL_WINDOW_FULLSCREEN_DESKTOP; + Con_DPrintf("Fullscreen activated on display %i\n", vid.mode.display); + } + + if (!fullscreenwanted || fullscreenwanted == SDL_WINDOW_FULLSCREEN_DESKTOP) + SDL_GetDesktopDisplayMode(displaywanted, &modefinal); + else { /* modefinal was set by SDL_GetClosestDisplayMode */ } + vid.mode.bitsperpixel = SDL_BITSPERPIXEL(modefinal.format); + vid.mode.refreshrate = mode->refreshrate && mode->fullscreen && !mode->desktopfullscreen ? modefinal.refresh_rate : 0; + vid.stencil = mode->bitsperpixel > 16; +} + +static void VID_ApplyDisplayMode_c(cvar_t *var) +{ + viddef_mode_t mode; + + if (!window) + return; + + // Menu designs aren't suitable for instant hardware modesetting + // they make players scroll through a list, setting the cvars at each step. + if (key_dest == key_menu && !key_consoleactive // in menu, console closed + && vid_fullscreen.integer && !vid_desktopfullscreen.integer) // modesetting enabled + return; + + Con_DPrintf("%s: applying %s \"%s\"\n", __func__, var->name, var->string); + + mode.display = vid_display.integer; + mode.fullscreen = vid_fullscreen.integer; + mode.desktopfullscreen = vid_desktopfullscreen.integer; + mode.width = vid_width.integer; + mode.height = vid_height.integer; + mode.bitsperpixel = vid_bitsperpixel.integer; + mode.refreshrate = max(0, vid_refreshrate.integer); + VID_ApplyDisplayMode(&mode); +} + +static void VID_SetVsync_c(cvar_t *var) +{ + signed char vsyncwanted = cls.timedemo ? 0 : bound(-1, vid_vsync.integer, 1); + + if (!context) + return; +/* +Can't check first: on Wayland SDL_GL_GetSwapInterval() may initially return 0 when vsync is on. +On Xorg it returns the correct value. + if (SDL_GL_GetSwapInterval() == vsyncwanted) + return; +*/ + + if (SDL_GL_SetSwapInterval(vsyncwanted) >= 0) + Con_DPrintf("Vsync %s\n", vsyncwanted ? "activated" : "deactivated"); + else + Con_Printf(CON_ERROR "ERROR: can't %s vsync because %s\n", vsyncwanted ? "activate" : "deactivate", SDL_GetError()); +} + +static void VID_SetHints_c(cvar_t *var) +{ + SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, vid_mouse_clickthrough.integer ? "1" : "0"); + SDL_SetHint(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, vid_minimize_on_focus_loss.integer ? "1" : "0"); +} void VID_Init (void) { + SDL_version version; + #ifndef __IPHONEOS__ #ifdef MACOSX Cvar_RegisterVariable(&apple_mouse_noaccel); @@ -1339,15 +1563,38 @@ void VID_Init (void) #endif Cvar_RegisterVariable(&joy_sdl2_trigger_deadzone); -#ifdef SDL_R_RESTART - R_RegisterModule("SDL", sdl_start, sdl_shutdown, sdl_newmap, NULL, NULL); + Cvar_RegisterCallback(&vid_display, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_fullscreen, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_desktopfullscreen, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_width, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_height, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_refreshrate, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_resizable, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_borderless, VID_ApplyDisplayMode_c); + Cvar_RegisterCallback(&vid_vsync, VID_SetVsync_c); + Cvar_RegisterCallback(&vid_mouse_clickthrough, VID_SetHints_c); + Cvar_RegisterCallback(&vid_minimize_on_focus_loss, VID_SetHints_c); + + // DPI scaling prevents use of the native resolution, causing blurry rendering + // and/or mouse cursor problems and/or incorrect render area, so we need to opt-out. + // Must be set before first SDL_INIT_VIDEO. Documented in SDL_hints.h. +#ifdef WIN32 + // make SDL coordinates == hardware pixels + SDL_SetHint(SDL_HINT_WINDOWS_DPI_SCALING, "0"); + // use best available awareness mode + SDL_SetHint(SDL_HINT_WINDOWS_DPI_AWARENESS, "permonitorv2"); #endif if (SDL_Init(SDL_INIT_VIDEO) < 0) Sys_Error ("Failed to init SDL video subsystem: %s", SDL_GetError()); - vid_sdl_initjoysticksystem = SDL_InitSubSystem(SDL_INIT_JOYSTICK) >= 0; - if (!vid_sdl_initjoysticksystem) + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) Con_Printf(CON_ERROR "Failed to init SDL joystick subsystem: %s\n", SDL_GetError()); + + SDL_GetVersion(&version); + Con_Printf("Linked against SDL version %d.%d.%d\n" + "Using SDL library version %d.%d.%d\n", + SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL, + version.major, version.minor, version.patch); } static int vid_sdljoystickindex = -1; @@ -1413,16 +1660,6 @@ void VID_EnableJoystick(qbool enable) Cvar_SetValueQuick(&joy_active, success ? 1 : 0); } -static void VID_OutputVersion(void) -{ - SDL_version version; - SDL_GetVersion(&version); - Con_Printf( "Linked against SDL version %d.%d.%d\n" - "Using SDL library version %d.%d.%d\n", - SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL, - version.major, version.minor, version.patch ); -} - #ifdef WIN32 static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) { @@ -1470,27 +1707,25 @@ static void AdjustWindowBounds(viddef_mode_t *mode, RECT *rect) } #endif -static qbool VID_InitModeGL(viddef_mode_t *mode) +static qbool VID_InitModeGL(const viddef_mode_t *mode) { int windowflags = SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL; - // currently SDL_WINDOWPOS_UNDEFINED behaves exactly like SDL_WINDOWPOS_CENTERED, this might change some day - // https://trello.com/c/j56vUcwZ/81-centered-vs-undefined-window-position - int xPos = SDL_WINDOWPOS_UNDEFINED; - int yPos = SDL_WINDOWPOS_UNDEFINED; int i; #ifndef USE_GLES2 // SDL usually knows best const char *drivername = NULL; #endif - win_half_width = mode->width>>1; - win_half_height = mode->height>>1; + // video display selection (multi-monitor) + Cvar_SetValueQuick(&vid_info_displaycount, SDL_GetNumVideoDisplays()); + vid.mode.display = bound(0, mode->display, vid_info_displaycount.integer - 1); + vid.xPos = SDL_WINDOWPOS_CENTERED_DISPLAY(vid.mode.display); + vid.yPos = SDL_WINDOWPOS_CENTERED_DISPLAY(vid.mode.display); + vid_wmborder_waiting = vid_wmborderless = false; if(vid_resizable.integer) windowflags |= SDL_WINDOW_RESIZABLE; - VID_OutputVersion(); - #ifndef USE_GLES2 // COMMANDLINEOPTION: SDL GL: -gl_driver selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it i = Sys_CheckParm("-gl_driver"); @@ -1510,42 +1745,34 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) windowflags |= SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS; #endif - + // SDL_CreateWindow() supports only width and height modesetting, + // so initially we use desktopfullscreen and perform a modeset later if necessary, + // this way we do only one modeset to apply the full config. if (mode->fullscreen) { - if (vid_desktopfullscreen.integer) - { - vid_mode_t *m = VID_GetDesktopMode(); - mode->width = m->width; - mode->height = m->height; - windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP; - } - else - windowflags |= SDL_WINDOW_FULLSCREEN; + windowflags |= SDL_WINDOW_FULLSCREEN_DESKTOP; + vid.mode.fullscreen = vid.mode.desktopfullscreen = true; } else { if (vid_borderless.integer) windowflags |= SDL_WINDOW_BORDERLESS; -#ifdef WIN32 - if (vid_ignore_taskbar.integer) - { - xPos = SDL_WINDOWPOS_CENTERED; - yPos = SDL_WINDOWPOS_CENTERED; - } else + vid_wmborder_waiting = true; // waiting for border to be added +#ifdef WIN32 + if (!vid_ignore_taskbar.integer) { RECT rect; - AdjustWindowBounds(mode, &rect); - xPos = rect.left; - yPos = rect.top; + AdjustWindowBounds((viddef_mode_t *)mode, &rect); + vid.xPos = rect.left; + vid.xPos = rect.top; + vid_wmborder_waiting = false; } #endif + vid.mode.fullscreen = vid.mode.desktopfullscreen = false; } - - if (vid_mouse_clickthrough.integer) - SDL_SetHint(SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH, "1"); + VID_SetHints_c(NULL); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 8); @@ -1555,7 +1782,10 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24); SDL_GL_SetAttribute (SDL_GL_STENCIL_SIZE, 8); if (mode->stereobuffer) + { SDL_GL_SetAttribute (SDL_GL_STEREO, 1); + vid.mode.stereobuffer = true; + } if (mode->samples > 1) { SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1); @@ -1577,23 +1807,17 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, (gl_debug.integer > 0 ? SDL_GL_CONTEXT_DEBUG_FLAG : 0)); - video_bpp = mode->bitsperpixel; - window_flags = windowflags; - window = SDL_CreateWindow(gamename, xPos, yPos, mode->width, mode->height, windowflags); + window = SDL_CreateWindow(gamename, vid.xPos, vid.yPos, mode->width, mode->height, windowflags); if (window == NULL) { Con_Printf(CON_ERROR "Failed to set video mode to %ix%i: %s\n", mode->width, mode->height, SDL_GetError()); VID_Shutdown(); return false; } - SDL_GetWindowSize(window, &mode->width, &mode->height); + context = SDL_GL_CreateContext(window); if (context == NULL) - { - Con_Printf(CON_ERROR "Failed to initialize OpenGL context: %s\n", SDL_GetError()); - VID_Shutdown(); - return false; - } + Sys_Error("Failed to initialize OpenGL context: %s\n", SDL_GetError()); GL_InitFunctions(); @@ -1608,16 +1832,22 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY); context = SDL_GL_CreateContext(window); if (context == NULL) - { - Con_Printf(CON_ERROR "Failed to initialize OpenGL context: %s\n", SDL_GetError()); - VID_Shutdown(); - return false; - } + Sys_Error("Failed to initialize OpenGL context: %s\n", SDL_GetError()); } #endif - SDL_GL_SetSwapInterval(bound(-1, vid_vsync.integer, 1)); - vid_usingvsync = (vid_vsync.integer != 0); + // apply vid_vsync + Cvar_Callback(&vid_vsync); + + vid_hidden = false; + vid_activewindow = true; + vid_hasfocus = true; + vid_usingmouse = false; + vid_usinghidecursor = false; + + // clear to black (loading plaque will be seen over this) + GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 0); + VID_Finish(); // checks vid_hidden GL_Setup(); @@ -1625,22 +1855,19 @@ static qbool VID_InitModeGL(viddef_mode_t *mode) Cvar_SetQuick(&gl_info_vendor, gl_vendor); Cvar_SetQuick(&gl_info_renderer, gl_renderer); Cvar_SetQuick(&gl_info_version, gl_version); - Cvar_SetQuick(&gl_info_platform, "SDL"); Cvar_SetQuick(&gl_info_driver, drivername ? drivername : ""); - // clear to black (loading plaque will be seen over this) - GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 0); + for (i = 0; i < vid_info_displaycount.integer; ++i) + Con_Printf("Display %i: %s\n", i, SDL_GetDisplayName(i)); + + // Perform any hardware modesetting and update vid.mode + // if modesetting fails desktopfullscreen continues to be used (see above). + VID_ApplyDisplayMode(mode); - vid_hidden = false; - vid_activewindow = false; - vid_hasfocus = true; - vid_usingmouse = false; - vid_usinghidecursor = false; - return true; } -qbool VID_InitMode(viddef_mode_t *mode) +qbool VID_InitMode(const viddef_mode_t *mode) { // GAME_STEELSTORM specific steelstorm_showing_map = Cvar_FindVar(&cvars_all, "steelstorm_showing_map", ~0); @@ -1658,6 +1885,8 @@ void VID_Shutdown (void) VID_EnableJoystick(false); VID_SetMouse(false, false); + SDL_GL_DeleteContext(context); + context = NULL; SDL_DestroyWindow(window); window = NULL; @@ -1666,9 +1895,6 @@ void VID_Shutdown (void) void VID_Finish (void) { - qbool vid_usevsync; - vid_activewindow = !vid_hidden && vid_hasfocus; - VID_UpdateGamma(); if (!vid_hidden) @@ -1680,28 +1906,20 @@ void VID_Finish (void) CHECKGLERROR if (r_speeds.integer == 2 || gl_finish.integer) GL_Finish(); - - vid_usevsync = (vid_vsync.integer && !cls.timedemo); - if (vid_usingvsync != vid_usevsync) - { - vid_usingvsync = vid_usevsync; - if (SDL_GL_SetSwapInterval(vid_usevsync != 0) >= 0) - Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated"); - else - Con_DPrintf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate"); - } SDL_GL_SwapWindow(window); break; } } } -vid_mode_t *VID_GetDesktopMode(void) +vid_mode_t VID_GetDesktopMode(void) { SDL_DisplayMode mode; int bpp; Uint32 rmask, gmask, bmask, amask; - SDL_GetDesktopDisplayMode(0, &mode); + vid_mode_t desktop_mode; + + SDL_GetDesktopDisplayMode(vid.mode.display, &mode); SDL_PixelFormatEnumToMasks(mode.format, &bpp, &rmask, &gmask, &bmask, &amask); desktop_mode.width = mode.w; desktop_mode.height = mode.h; @@ -1709,30 +1927,28 @@ vid_mode_t *VID_GetDesktopMode(void) desktop_mode.refreshrate = mode.refresh_rate; desktop_mode.pixelheight_num = 1; desktop_mode.pixelheight_denom = 1; // SDL does not provide this - // TODO check whether this actually works, or whether we do still need - // a read-window-size-after-entering-desktop-fullscreen hack for - // multiscreen setups. - return &desktop_mode; + return desktop_mode; } size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) { size_t k = 0; int modenum; - int nummodes = SDL_GetNumDisplayModes(0); + int nummodes = SDL_GetNumDisplayModes(vid.mode.display); SDL_DisplayMode mode; for (modenum = 0;modenum < nummodes;modenum++) { if (k >= maxcount) break; - if (SDL_GetDisplayMode(0, modenum, &mode)) + if (SDL_GetDisplayMode(vid.mode.display, modenum, &mode)) continue; modes[k].width = mode.w; modes[k].height = mode.h; - // FIXME bpp? + modes[k].bpp = SDL_BITSPERPIXEL(mode.format); modes[k].refreshrate = mode.refresh_rate; modes[k].pixelheight_num = 1; modes[k].pixelheight_denom = 1; // SDL does not provide this + Con_DPrintf("Display %i mode %i: %ix%i %ibpp %ihz\n", vid.mode.display, modenum, modes[k].width, modes[k].height, modes[k].bpp, modes[k].refreshrate); k++; } return k;