mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-11 13:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Fix libdecor incompatible pointer types

Browse Source
This commit is contained in:
Frank Praznik
2025-10-28 11:43:45 -04:00
parent 2d14a237dc
commit 3383436068
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video/wayland/SDL_waylandsym.h
View File

@@ -175,10 +175,10 @@ SDL_WAYLAND_SYM(xkb_mod_mask_t, xkb_keymap_mod_get_mask, (struct xkb_keymap *, c
#ifdef HAVE_LIBDECOR_H #ifdef HAVE_LIBDECOR_H
SDL_WAYLAND_MODULE(WAYLAND_LIBDECOR) SDL_WAYLAND_MODULE(WAYLAND_LIBDECOR)
SDL_WAYLAND_SYM(void, libdecor_unref, (struct libdecor *)) SDL_WAYLAND_SYM(void, libdecor_unref, (struct libdecor *))
SDL_WAYLAND_SYM(struct libdecor *, libdecor_new, (struct wl_display *, struct libdecor_interface *)) SDL_WAYLAND_SYM(struct libdecor *, libdecor_new, (struct wl_display *, const struct libdecor_interface *))
SDL_WAYLAND_SYM(struct libdecor_frame *, libdecor_decorate, (struct libdecor *,\ SDL_WAYLAND_SYM(struct libdecor_frame *, libdecor_decorate, (struct libdecor *,\
struct wl_surface *,\ struct wl_surface *,\
struct libdecor_frame_interface *,\ const struct libdecor_frame_interface *,\
void *)) void *))
SDL_WAYLAND_SYM(void, libdecor_frame_unref, (struct libdecor_frame *)) SDL_WAYLAND_SYM(void, libdecor_frame_unref, (struct libdecor_frame *))
SDL_WAYLAND_SYM(void, libdecor_frame_set_title, (struct libdecor_frame *, const char *)) SDL_WAYLAND_SYM(void, libdecor_frame_set_title, (struct libdecor_frame *, const char *))

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

@@ -1476,17 +1476,13 @@ static void decoration_dismiss_popup(struct libdecor_frame *frame, const char *s
// NOP // NOP
} }
#if SDL_LIBDECOR_CHECK_VERSION(0, 3, 0)
static void decoration_frame_bounds(struct libdecor_frame *frame, int width, int height, void *user_data) static void decoration_frame_bounds(struct libdecor_frame *frame, int width, int height, void *user_data)
{ {
SDL_WindowData *window = (SDL_WindowData *)user_data; SDL_WindowData *window = (SDL_WindowData *)user_data;
window->toplevel_bounds.width = width; window->toplevel_bounds.width = width;
window->toplevel_bounds.height = height; window->toplevel_bounds.height = height;
} }
#if SDL_LIBDECOR_CHECK_VERSION(0, 3, 0)
#define FRAME_BOUNDS_FUNC_CAST(func) func
#else
#define FRAME_BOUNDS_FUNC_CAST(func) (void(*)(void))func
#endif #endif
static struct libdecor_frame_interface libdecor_frame_interface = { static struct libdecor_frame_interface libdecor_frame_interface = {
@@ -1494,7 +1490,9 @@ static struct libdecor_frame_interface libdecor_frame_interface = {
decoration_frame_close, decoration_frame_close,
decoration_frame_commit, decoration_frame_commit,
decoration_dismiss_popup, decoration_dismiss_popup,
FRAME_BOUNDS_FUNC_CAST(decoration_frame_bounds) #if SDL_LIBDECOR_CHECK_VERSION(0, 3, 0)
decoration_frame_bounds
#endif
}; };
#endif #endif