isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-05-29 01:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/output: Flush clients after creating wl_output global

Browse Source 
In order to give the clients the best chance to bind the wl_output
before we later remove it (for example on fast hot plugs or in the test
suite), flush the client sockets after creating the global.

https://bugzilla.gnome.org/show_bug.cgi?id=730551
This commit is contained in:
Jonas Ådahl 2017-08-18 14:16:22 +08:00
parent 522eec00cd
commit 2a318eb3f2
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,8 @@ static MetaWaylandOutput *
meta_wayland_output_new (MetaWaylandCompositor *compositor, meta_wayland_output_new (MetaWaylandCompositor *compositor,
MetaLogicalMonitor *logical_monitor) MetaLogicalMonitor *logical_monitor)
{ {
MetaWaylandCompositor *wayland_compositor =
meta_wayland_compositor_get_default ();
MetaWaylandOutput *wayland_output; MetaWaylandOutput *wayland_output;
wayland_output = g_object_new (META_TYPE_WAYLAND_OUTPUT, NULL); wayland_output = g_object_new (META_TYPE_WAYLAND_OUTPUT, NULL);
@ -314,6 +316,7 @@ meta_wayland_output_new (MetaWaylandCompositor *compositor,
&wl_output_interface, &wl_output_interface,
META_WL_OUTPUT_VERSION, META_WL_OUTPUT_VERSION,
wayland_output, bind_output); wayland_output, bind_output);
meta_wayland_compositor_flush_clients (wayland_compositor);
meta_wayland_output_set_logical_monitor (wayland_output, logical_monitor); meta_wayland_output_set_logical_monitor (wayland_output, logical_monitor);
return wayland_output; return wayland_output;

6
src/wayland/meta-wayland.c
View File

@ -445,3 +445,9 @@ meta_wayland_compositor_is_shortcuts_inhibited (MetaWaylandCompositor *composito
return FALSE; return FALSE;
} }
void
meta_wayland_compositor_flush_clients (MetaWaylandCompositor *compositor)
{
wl_display_flush_clients (compositor->wayland_display);
}

2
src/wayland/meta-wayland.h
View File

@ -63,5 +63,7 @@ void meta_wayland_compositor_restore_shortcuts (MetaWayl
gboolean meta_wayland_compositor_is_shortcuts_inhibited (MetaWaylandCompositor *compositor, gboolean meta_wayland_compositor_is_shortcuts_inhibited (MetaWaylandCompositor *compositor,
ClutterInputDevice *source); ClutterInputDevice *source);
void meta_wayland_compositor_flush_clients (MetaWaylandCompositor *compositor);
#endif #endif