geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: Changed output removal in handle_surface_leave() 

No longer needs an extra malloc, handles unexpected cases like the same
output being listed twice.
Ryan C. Gordon 2020-05-28 15:18:41 -04:00
parent ce7ae4ec8d
commit aa259ed52d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,21 +406,22 @@ static void
handle_surface_leave(void *data, struct wl_surface *surface, handle_surface_leave(void *data, struct wl_surface *surface,
struct wl_output *output) { struct wl_output *output) {
SDL_WindowData *window = data; SDL_WindowData *window = data;
int num_outputs = 0;
int i; int i;
if (window->num_outputs > 1) {
struct wl_output **new_outputs = SDL_malloc((window->num_outputs - 1) * sizeof *window->outputs), **iter = new_outputs;
for (i = 0; i < window->num_outputs; i++) { for (i = 0; i < window->num_outputs; i++) {
if (window->outputs[i] != output) { if (window->outputs[i] == output) { /* remove this one */
*iter = window->outputs[i]; if (i == (window->num_outputs-1)) {
iter++; window->outputs[i] = NULL;
}
}
SDL_free(window->outputs);
window->outputs = new_outputs;
window->num_outputs--;
} else { } else {
window->num_outputs = 0; SDL_memmove(&window->outputs[i], &window->outputs[i+1], sizeof (output) * ((window->num_outputs - i) - 1));
}
window->num_outputs--;
i--;
}
}
if (window->num_outputs == 0) {
SDL_free(window->outputs); SDL_free(window->outputs);
window->outputs = NULL; window->outputs = NULL;
} }