mirrors
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Don't crash when the properties of already existing wl_output change

This commit is contained in:
Sebastian Krzyszkowiak 2021-02-01 08:57:39 -08:00
parent cef198c9cb
commit e862856e6f
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/wayland/SDL_waylandvideo.c
View File

@ -273,11 +273,15 @@ static void
display_handle_done(void *data, display_handle_done(void *data,
struct wl_output *output) struct wl_output *output)
{ {
/* !!! FIXME: this will fail on any further property changes! */
SDL_VideoDisplay *display = data; SDL_VideoDisplay *display = data;
SDL_WaylandOutputData* driverdata = display->driverdata; SDL_WaylandOutputData* driverdata = display->driverdata;
SDL_DisplayMode mode; SDL_DisplayMode mode;
if (driverdata->done)
return;
driverdata->done = SDL_TRUE;
SDL_zero(mode); SDL_zero(mode);
mode.format = SDL_PIXELFORMAT_RGB888; mode.format = SDL_PIXELFORMAT_RGB888;
mode.w = driverdata->width / driverdata->scale_factor; mode.w = driverdata->width / driverdata->scale_factor;
@ -293,9 +297,7 @@ display_handle_done(void *data,
display->desktop_mode = mode; display->desktop_mode = mode;
SDL_AddVideoDisplay(display, SDL_FALSE); SDL_AddVideoDisplay(display, SDL_FALSE);
wl_output_set_user_data(output, display->driverdata);
SDL_free(display->name); SDL_free(display->name);
SDL_free(display);
} }
static void static void
@ -335,6 +337,7 @@ Wayland_add_display(SDL_VideoData *d, uint32_t id)
data = SDL_malloc(sizeof *data); data = SDL_malloc(sizeof *data);
data->output = output; data->output = output;
data->scale_factor = 1.0; data->scale_factor = 1.0;
data->done = SDL_FALSE;
display->driverdata = data; display->driverdata = data;
wl_output_add_listener(output, &output_listener, display); wl_output_add_listener(output, &output_listener, display);

2
src/video/wayland/SDL_waylandvideo.h
View File

@ -20,6 +20,7 @@
*/ */
#include "../../SDL_internal.h" #include "../../SDL_internal.h"
#include "SDL_stdinc.h"
#ifndef SDL_waylandvideo_h_ #ifndef SDL_waylandvideo_h_
#define SDL_waylandvideo_h_ #define SDL_waylandvideo_h_
@ -91,6 +92,7 @@ typedef struct {
struct wl_output *output; struct wl_output *output;
float scale_factor; float scale_factor;
int width, height, refresh, transform; int width, height, refresh, transform;
SDL_bool done;
} SDL_WaylandOutputData; } SDL_WaylandOutputData;
#endif /* SDL_waylandvideo_h_ */ #endif /* SDL_waylandvideo_h_ */

8
src/video/wayland/SDL_waylandwindow.c
View File

@ -414,11 +414,15 @@ update_scale_factor(SDL_WindowData *window) {
} }
if (FULLSCREEN_VISIBLE(window->sdlwindow) && window->sdlwindow->fullscreen_mode.driverdata) { if (FULLSCREEN_VISIBLE(window->sdlwindow) && window->sdlwindow->fullscreen_mode.driverdata) {
new_factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->sdlwindow->fullscreen_mode.driverdata)))->scale_factor; SDL_VideoDisplay *display = wl_output_get_user_data(window->sdlwindow->fullscreen_mode.driverdata);
SDL_WaylandOutputData* driverdata = display->driverdata;
new_factor = driverdata->scale_factor;
} }
for (i = 0; i < window->num_outputs; i++) { for (i = 0; i < window->num_outputs; i++) {
float factor = ((SDL_WaylandOutputData*)(wl_output_get_user_data(window->outputs[i])))->scale_factor; SDL_VideoDisplay *display = wl_output_get_user_data(window->outputs[i]);
SDL_WaylandOutputData* driverdata = display->driverdata;
float factor = driverdata->scale_factor;
if (factor > new_factor) { if (factor > new_factor) {
new_factor = factor; new_factor = factor;
} }