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

wayland: Expose wl_output objects on video displays

Browse Source 
Some protocols take a wl_output object to function, so expose them via a property on the video displays.
This commit is contained in:
Frank Praznik
2025-03-26 12:08:28 -04:00
parent 1f917d5231
commit 8e6eaf12a4
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/SDL3/SDL_video.h
View File

@@ -632,6 +632,10 @@ extern SDL_DECLSPEC SDL_DisplayID SDLCALL SDL_GetPrimaryDisplay(void);
* responsible for any coordinate transformations needed to conform to the
* requested display orientation.
*
* On Wayland:
*
* - `SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER`: the wl_output associated with the display
*
* \param displayID the instance ID of the display to query.
* \returns a valid property ID on success or 0 on failure; call
* SDL_GetError() for more information.
@@ -644,6 +648,7 @@ extern SDL_DECLSPEC SDL_PropertiesID SDLCALL SDL_GetDisplayProperties(SDL_Displa
#define SDL_PROP_DISPLAY_HDR_ENABLED_BOOLEAN "SDL.display.HDR_enabled"
#define SDL_PROP_DISPLAY_KMSDRM_PANEL_ORIENTATION_NUMBER "SDL.display.KMSDRM.panel_orientation"
#define SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER "SDL.display.wayland.wl_output"
/**
* Get the name of a display in UTF-8 encoding.

1
src/video/SDL_video.c
View File

@@ -855,6 +855,7 @@ SDL_DisplayID SDL_AddVideoDisplay(const SDL_VideoDisplay *display, bool send_eve
SDL_copyp(new_display, display);
new_display->id = id;
new_display->device = _this;
new_display->props = display->props;
if (display->name) {
new_display->name = SDL_strdup(display->name);
} else {

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

@@ -1071,6 +1071,9 @@ static void display_handle_done(void *data,
internal->placeholder.current_orientation = internal->orientation;
internal->placeholder.internal = internal;
internal->placeholder.props = SDL_CreateProperties();
SDL_SetPointerProperty(internal->placeholder.props, SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER, internal->output);
// During initialization, the displays will be added after enumeration is complete.
if (!video->initializing) {
internal->display = SDL_AddVideoDisplay(&internal->placeholder, true);