edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of multiple screens and missing screens

Browse source
This commit is contained in:
def 2016-05-07 23:19:46 +02:00
parent 642e7f7671
commit 461a09451d
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/engine/client/backend_sdl.cpp
View file

@ -568,7 +568,8 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
m_NumScreens = SDL_GetNumVideoDisplays(); m_NumScreens = SDL_GetNumVideoDisplays();
if(m_NumScreens > 0) if(m_NumScreens > 0)
{ {
clamp(*Screen, 0, m_NumScreens-1); if(*Screen < 0 || *Screen >= m_NumScreens)
*Screen = 0;
if(SDL_GetDisplayBounds(*Screen, &ScreenPos) != 0) if(SDL_GetDisplayBounds(*Screen, &ScreenPos) != 0)
{ {
dbg_msg("gfx", "unable to retrieve screen information: %s", SDL_GetError()); dbg_msg("gfx", "unable to retrieve screen information: %s", SDL_GetError());
@ -643,8 +644,8 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
m_pWindow = SDL_CreateWindow( m_pWindow = SDL_CreateWindow(
pName, pName,
SDL_WINDOWPOS_UNDEFINED_DISPLAY(g_Config.m_GfxScreen), SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED_DISPLAY(g_Config.m_GfxScreen), SDL_WINDOWPOS_UNDEFINED,
*pWidth, *pWidth,
*pHeight, *pHeight,
SdlFlags); SdlFlags);
@ -656,8 +657,6 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
return -1; return -1;
} }
SetWindowScreen(g_Config.m_GfxScreen);
m_GLContext = SDL_GL_CreateContext(m_pWindow); m_GLContext = SDL_GL_CreateContext(m_pWindow);
if(m_GLContext == NULL) if(m_GLContext == NULL)
@ -667,9 +666,7 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
} }
SDL_GL_GetDrawableSize(m_pWindow, pWidth, pHeight); SDL_GL_GetDrawableSize(m_pWindow, pWidth, pHeight);
SDL_GL_SetSwapInterval(Flags&IGraphicsBackend::INITFLAG_VSYNC ? 1 : 0); SDL_GL_SetSwapInterval(Flags&IGraphicsBackend::INITFLAG_VSYNC ? 1 : 0);
SDL_GL_MakeCurrent(NULL, NULL); SDL_GL_MakeCurrent(NULL, NULL);
// start the command processor // start the command processor
@ -689,6 +686,7 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
WaitForIdle(); WaitForIdle();
SDL_ShowWindow(m_pWindow); SDL_ShowWindow(m_pWindow);
SetWindowScreen(g_Config.m_GfxScreen);
// return // return
return 0; return 0;