encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wayland: Minor fixes for old compilers

This commit is contained in:
Ethan Lee 2022-03-24 15:32:25 -04:00
parent b4d28085bf
commit ee52ad08cd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,7 +640,8 @@ Wayland_free_display(uint32_t id)
static void static void
Wayland_init_xdg_output(SDL_VideoData *d) Wayland_init_xdg_output(SDL_VideoData *d)
{ {
for (SDL_WaylandOutputData *node = (SDL_WaylandOutputData*)d->output_list; node != NULL; node = (SDL_WaylandOutputData*)node->next) { SDL_WaylandOutputData *node;
for (node = (SDL_WaylandOutputData*)d->output_list; node != NULL; node = (SDL_WaylandOutputData*)node->next) {
node->xdg_output = zxdg_output_manager_v1_get_xdg_output(node->videodata->xdg_output_manager, node->output); node->xdg_output = zxdg_output_manager_v1_get_xdg_output(node->videodata->xdg_output_manager, node->output);
zxdg_output_v1_add_listener(node->xdg_output, &xdg_output_listener, node); zxdg_output_v1_add_listener(node->xdg_output, &xdg_output_listener, node);
} }

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

@ -47,6 +47,8 @@ typedef struct {
int size; int size;
} SDL_WaylandCursorTheme; } SDL_WaylandCursorTheme;
typedef struct SDL_WaylandOutputData SDL_WaylandOutputData;
typedef struct { typedef struct {
SDL_bool initializing; SDL_bool initializing;
struct wl_display *display; struct wl_display *display;
@ -80,7 +82,7 @@ typedef struct {
struct xkb_context *xkb_context; struct xkb_context *xkb_context;
struct SDL_WaylandInput *input; struct SDL_WaylandInput *input;
struct SDL_WaylandTabletManager *tablet_manager; struct SDL_WaylandTabletManager *tablet_manager;
struct SDL_WaylandOutputData *output_list; SDL_WaylandOutputData *output_list;
#ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
struct SDL_WaylandTouch *touch; struct SDL_WaylandTouch *touch;
@ -93,7 +95,7 @@ typedef struct {
int relative_mouse_mode; int relative_mouse_mode;
} SDL_VideoData; } SDL_VideoData;
typedef struct { struct SDL_WaylandOutputData {
SDL_VideoData *videodata; SDL_VideoData *videodata;
struct wl_output *output; struct wl_output *output;
struct zxdg_output_v1 *xdg_output; struct zxdg_output_v1 *xdg_output;
@ -106,8 +108,8 @@ typedef struct {
int index; int index;
SDL_VideoDisplay placeholder; SDL_VideoDisplay placeholder;
int wl_output_done_count; int wl_output_done_count;
struct SDL_WaylandOutputData *next; SDL_WaylandOutputData *next;
} SDL_WaylandOutputData; };
/* Needed here to get wl_surface declaration, fixes GitHub#4594 */ /* Needed here to get wl_surface declaration, fixes GitHub#4594 */
#include "SDL_waylanddyn.h" #include "SDL_waylanddyn.h"