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

wayland: Fix GetWindowWMInfo for <2.0.15

main
Ethan Lee 2021-07-30 00:22:50 -04:00 committed by Sam Lantinga
parent 585c11c5ae
commit c20ab7dae9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,22 +562,24 @@ Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
info->info.wl.display = data->waylandData->display; info->info.wl.display = data->waylandData->display;
info->info.wl.surface = data->surface; info->info.wl.surface = data->surface;
if (version >= SDL_VERSIONNUM(2, 0, 15)) { if (version >= SDL_VERSIONNUM(2, 0, 15)) {
info->info.wl.egl_window = data->egl_window; info->info.wl.egl_window = data->egl_window;
}
info->info.wl.shell_surface = NULL;
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
if (viddata->shell.libdecor && data->shell_surface.libdecor.frame != NULL) { if (viddata->shell.libdecor && data->shell_surface.libdecor.frame != NULL) {
info->info.wl.xdg_surface = libdecor_frame_get_xdg_surface(data->shell_surface.libdecor.frame); info->info.wl.xdg_surface = libdecor_frame_get_xdg_surface(data->shell_surface.libdecor.frame);
} else } else
#endif #endif
if (viddata->shell.xdg && data->shell_surface.xdg.surface != NULL) { if (viddata->shell.xdg && data->shell_surface.xdg.surface != NULL) {
info->info.wl.xdg_surface = data->shell_surface.xdg.surface; info->info.wl.xdg_surface = data->shell_surface.xdg.surface;
} else { } else {
info->info.wl.xdg_surface = NULL; info->info.wl.xdg_surface = NULL;
}
} }
/* Deprecated in 2.0.16 */
info->info.wl.shell_surface = NULL;
info->subsystem = SDL_SYSWM_WAYLAND; info->subsystem = SDL_SYSWM_WAYLAND;