brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/xdg-output: Fix xdg-output v3 support

Browse Source 
When using xdg-output v3 or later, the Wayland compositor does not send
xdg_output.done events which are deprecated.

Instead, it should send a wl_output.done event for the matching
wl_output.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/771
This commit is contained in:
Olivier Fourdan 2019-09-03 13:46:37 +02:00 committed by Jonas Ådahl
parent 854feafa83
commit be4131b3c4
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wayland/meta-wayland-outputs.c
View File

@ -624,12 +624,6 @@ send_xdg_output_events (struct wl_resource *resource,
zxdg_output_v1_send_description (resource, description); zxdg_output_v1_send_description (resource, description);
} }
if (need_all_events && version < NO_XDG_OUTPUT_DONE_SINCE_VERSION)
{
zxdg_output_v1_send_done (resource);
need_done = FALSE;
}
if (pending_done_event && need_done) if (pending_done_event && need_done)
*pending_done_event = TRUE; *pending_done_event = TRUE;
} }
@ -642,6 +636,8 @@ meta_xdg_output_manager_get_xdg_output (struct wl_client *client,
{ {
struct wl_resource *xdg_output_resource; struct wl_resource *xdg_output_resource;
MetaWaylandOutput *wayland_output; MetaWaylandOutput *wayland_output;
int xdg_output_version;
int wl_output_version;
xdg_output_resource = wl_resource_create (client, xdg_output_resource = wl_resource_create (client,
&zxdg_output_v1_interface, &zxdg_output_v1_interface,
@ -666,6 +662,14 @@ meta_xdg_output_manager_get_xdg_output (struct wl_client *client,
wayland_output, wayland_output,
wayland_output->logical_monitor, wayland_output->logical_monitor,
TRUE, NULL); TRUE, NULL);
xdg_output_version = wl_resource_get_version (xdg_output_resource);
wl_output_version = wl_resource_get_version (output);
if (xdg_output_version < NO_XDG_OUTPUT_DONE_SINCE_VERSION)
zxdg_output_v1_send_done (xdg_output_resource);
else if (wl_output_version >= WL_OUTPUT_DONE_SINCE_VERSION)
wl_output_send_done (output);
} }
static void static void