Another attempt to fix multimonitor issues with SDL backend #2010
Conversation
engine/platform/sdl/vid_sdl.c
Outdated
| @@ -757,34 +778,37 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode ) | |||
|
|
|||
| if( window_mode == WINDOW_MODE_WINDOWED ) | |||
| { | |||
| SDL_Rect r; | |||
| SDL_Rect *display_rects = (SDL_Rect *)malloc( num_displays * sizeof( SDL_Rect )); | |||
There was a problem hiding this comment.
You forgot to free display_rects.
There was a problem hiding this comment.
I'm a little confused: have I done this correctly now?
There was a problem hiding this comment.
No, the memory you allocated with malloc must be deallocated using free, once you don't need it.
There was a problem hiding this comment.
Oh, I see. Should be done now.
OlegAckbar
force-pushed
the
master
branch
2 times, most recently
from
5c459a9 to
b5402f9
Compare
engine/platform/sdl/vid_sdl.c
Outdated
| if( !display_rects ) | ||
| { | ||
| Con_Printf( S_ERROR "Failed to allocate memory for display rects!\n" ); | ||
| SDL_Quit(); |
There was a problem hiding this comment.
Also, it should be Sys_Error, if you want to exit.
But it would be more correct to handle the error if allocating display_rects has failed and just fall back to SDL_WINDOWPOS_UNDEFINED.
engine/platform/sdl/vid_sdl.c
Outdated
| { | ||
| if( SDL_GetDisplayBounds( i, &display_rects[i] ) != 0 ) | ||
| { | ||
| Con_Printf( S_ERROR "Failed to get bounds for display %d! SDL_Error: %s\n", i, SDL_GetError()); |
There was a problem hiding this comment.
You need to handle this error as well.
engine/platform/sdl/vid_sdl.c
Outdated
| } | ||
| free(display_rects); |
There was a problem hiding this comment.
Done. One day I'll get used to this.
… located is instead of display zero
|
I've uploaded one more fix. Previously window position would only be saved in window mode, and display in fullscreen mode would always be dictated by the platform. Now engine will also remember last used display. |
In this PR we will do the next: