isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Split another part of the initialization sequence out

Browse Source 
This will be used from a SIGUSR1 handler.
This commit is contained in:
Jasper St. Pierre 2014-04-02 10:22:01 -04:00
parent 9653b79a35
commit eb5b54dd8b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wayland/meta-xwayland.c
View File

@ -37,6 +37,9 @@
#include "meta-window-actor-private.h" #include "meta-window-actor-private.h"
#include "xserver-server-protocol.h" #include "xserver-server-protocol.h"
static void
xserver_finished_init (MetaXWaylandManager *manager);
static void static void
associate_window_with_surface (MetaWindow *window, associate_window_with_surface (MetaWindow *window,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
@ -104,12 +107,7 @@ bind_xserver (struct wl_client *client,
* manager. */ * manager. */
wl_client_flush (client); wl_client_flush (client);
/* At this point xwayland is all setup to start accepting xserver_finished_init (manager);
* connections so we can quit the transient initialization mainloop
* and unblock meta_wayland_init() to continue initializing mutter.
* */
g_main_loop_quit (manager->init_loop);
g_clear_pointer (&manager->init_loop, g_main_loop_unref);
} }
static char * static char *
@ -337,6 +335,17 @@ choose_xdisplay (MetaXWaylandManager *manager)
return TRUE; return TRUE;
} }
static void
xserver_finished_init (MetaXWaylandManager *manager)
{
/* At this point xwayland is all setup to start accepting
* connections so we can quit the transient initialization mainloop
* and unblock meta_wayland_init() to continue initializing mutter.
* */
g_main_loop_quit (manager->init_loop);
g_clear_pointer (&manager->init_loop, g_main_loop_unref);
}
gboolean gboolean
meta_xwayland_start (MetaXWaylandManager *manager, meta_xwayland_start (MetaXWaylandManager *manager,
struct wl_display *wl_display) struct wl_display *wl_display)