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

xwayland: Split out the code that creates the XWayland sockets

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-01 20:00:59 -04:00
parent af272f2685
commit a44295599c
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,16 +288,11 @@ x_io_error (Display *display)
return 0; return 0;
} }
gboolean static gboolean
meta_xwayland_start (MetaXWaylandManager *manager, choose_xdisplay (MetaXWaylandManager *manager)
struct wl_display *wl_display)
{ {
int display = 0; int display = 0;
char *lockfile = NULL; char *lockfile = NULL;
int sp[2];
pid_t pid;
char **env;
char *fd_string;
do do
{ {
@ -337,6 +332,21 @@ meta_xwayland_start (MetaXWaylandManager *manager,
manager->display_index = display; manager->display_index = display;
manager->lockfile = lockfile; manager->lockfile = lockfile;
return TRUE;
}
gboolean
meta_xwayland_start (MetaXWaylandManager *manager,
struct wl_display *wl_display)
{
int sp[2];
pid_t pid;
char **env;
char *fd_string;
if (!choose_xdisplay (manager))
return FALSE;
wl_global_create (wl_display, &xserver_interface, wl_global_create (wl_display, &xserver_interface,
META_XSERVER_VERSION, META_XSERVER_VERSION,
manager, bind_xserver); manager, bind_xserver);
@ -346,7 +356,7 @@ meta_xwayland_start (MetaXWaylandManager *manager,
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0) if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0)
{ {
g_warning ("socketpair failed\n"); g_warning ("socketpair failed\n");
unlink (lockfile); unlink (manager->lockfile);
return 1; return 1;
} }