isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 20:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Rename sp to something a bit more handy

Browse Source 
We also want to create a socketpair for -displayfd instead
of using signals.
This commit is contained in:
Jasper St. Pierre 2014-04-17 15:37:53 -04:00
parent 72b1a2837d
commit 745134e066
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -396,7 +396,7 @@ gboolean
meta_xwayland_start (MetaXWaylandManager *manager, meta_xwayland_start (MetaXWaylandManager *manager,
struct wl_display *wl_display) struct wl_display *wl_display)
{ {
int sp[2]; int xwayland_client_fd[2];
int fd; int fd;
if (!choose_xdisplay (manager)) if (!choose_xdisplay (manager))
@ -404,9 +404,9 @@ meta_xwayland_start (MetaXWaylandManager *manager,
/* We want xwayland to be a wayland client so we make a socketpair to setup a /* We want xwayland to be a wayland client so we make a socketpair to setup a
* wayland protocol connection. */ * wayland protocol connection. */
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sp) < 0) if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, xwayland_client_fd) < 0)
{ {
g_warning ("socketpair failed\n"); g_warning ("xwayland_client_fd socketpair failed\n");
unlink (manager->lockfile); unlink (manager->lockfile);
return 1; return 1;
} }
@ -418,7 +418,7 @@ meta_xwayland_start (MetaXWaylandManager *manager,
/* We passed SOCK_CLOEXEC, so dup the FD so it isn't /* We passed SOCK_CLOEXEC, so dup the FD so it isn't
* closed on exec.. */ * closed on exec.. */
fd = dup (sp[1]); fd = dup (xwayland_client_fd[1]);
snprintf (socket_fd, sizeof (socket_fd), "%d", fd); snprintf (socket_fd, sizeof (socket_fd), "%d", fd);
setenv ("WAYLAND_SOCKET", socket_fd, TRUE); setenv ("WAYLAND_SOCKET", socket_fd, TRUE);
@ -460,7 +460,7 @@ meta_xwayland_start (MetaXWaylandManager *manager,
g_child_watch_add (manager->pid, xserver_died, NULL); g_child_watch_add (manager->pid, xserver_died, NULL);
g_unix_signal_add (SIGUSR1, got_sigusr1, manager); g_unix_signal_add (SIGUSR1, got_sigusr1, manager);
manager->client = wl_client_create (wl_display, sp[0]); manager->client = wl_client_create (wl_display, xwayland_client_fd[0]);
/* We need to run a mainloop until we know xwayland has a binding /* We need to run a mainloop until we know xwayland has a binding
* for our xserver interface at which point we can assume it's * for our xserver interface at which point we can assume it's