[mutter/wip/lantw/tests/wayland-Don't-test-file-sealing-on-the-fallback-case: 1/2] xwayland: Don't use abstract socket on non-Linux systems
- From: Ting-Wei Lan <lantw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/lantw/tests/wayland-Don't-test-file-sealing-on-the-fallback-case: 1/2] xwayland: Don't use abstract socket on non-Linux systems
- Date: Sun, 3 May 2020 15:39:53 +0000 (UTC)
commit 819eeeb591695ff7fc0041bf7ca7635b1479af0e
Author: Ting-Wei Lan <lantw src gnome org>
Date: Mon Dec 2 23:27:55 2019 +0800
xwayland: Don't use abstract socket on non-Linux systems
Abstract socket is a Linux-only feature. On operating systems other than
Linux, we can only use the normal UNIX socket.
This patch allows mutter to run as a nested Wayland compositor under
Xorg on FreeBSD.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/954
src/wayland/meta-wayland-private.h | 2 ++
src/wayland/meta-xwayland.c | 28 +++++++++++++++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index e28ca06d6..5c4f6e1f4 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -46,7 +46,9 @@ typedef struct
{
int display_index;
char *lock_file;
+#ifdef __linux__
int abstract_fd;
+#endif
int unix_fd;
char *name;
} MetaXWaylandConnection;
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index ac55599d4..ce7a0b0c6 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -235,6 +235,7 @@ create_lock_file (int display, int *display_out)
return filename;
}
+#ifdef __linux__
static int
bind_to_abstract_socket (int display,
gboolean *fatal)
@@ -274,6 +275,7 @@ bind_to_abstract_socket (int display,
return fd;
}
+#endif
static int
bind_to_unix_socket (int display)
@@ -385,22 +387,31 @@ open_display_sockets (MetaXWaylandManager *manager,
int *unix_fd_out,
gboolean *fatal)
{
- int abstract_fd, unix_fd;
+#ifdef __linux__
+ int abstract_fd;
+#endif
+ int unix_fd;
+#ifdef __linux__
abstract_fd = bind_to_abstract_socket (display_index,
fatal);
if (abstract_fd < 0)
return FALSE;
+#endif
unix_fd = bind_to_unix_socket (display_index);
if (unix_fd < 0)
{
*fatal = FALSE;
+#ifdef __linux__
close (abstract_fd);
+#endif
return FALSE;
}
+#ifdef __linux__
*abstract_fd_out = abstract_fd;
+#endif
*unix_fd_out = unix_fd;
return TRUE;
@@ -617,10 +628,15 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
launcher = g_subprocess_launcher_new (flags);
g_subprocess_launcher_take_fd (launcher, xwayland_client_fd[1], 3);
+#ifdef __linux__
g_subprocess_launcher_take_fd (launcher, manager->public_connection.abstract_fd, 4);
g_subprocess_launcher_take_fd (launcher, manager->public_connection.unix_fd, 5);
g_subprocess_launcher_take_fd (launcher, displayfd[1], 6);
g_subprocess_launcher_take_fd (launcher, manager->private_connection.abstract_fd, 7);
+#else
+ g_subprocess_launcher_take_fd (launcher, manager->public_connection.unix_fd, 4);
+ g_subprocess_launcher_take_fd (launcher, displayfd[1], 5);
+#endif
g_subprocess_launcher_setenv (launcher, "WAYLAND_SOCKET", "3", TRUE);
@@ -632,6 +648,7 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
"-accessx",
"-core",
"-auth", manager->auth_file,
+#ifdef __linux__
"-listen", "4",
"-listen", "5",
"-displayfd", "6",
@@ -640,6 +657,10 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
#else
"-listen", "7",
#endif
+#else /* __linux__ */
+ "-listen", "4",
+ "-displayfd", "5",
+#endif /* __linux__ */
NULL);
if (!manager->proc)
@@ -774,8 +795,13 @@ meta_xwayland_init (MetaXWaylandManager *manager,
if (policy == META_DISPLAY_POLICY_ON_DEMAND)
{
+#ifdef __linux__
g_unix_fd_add (manager->public_connection.abstract_fd, G_IO_IN,
xdisplay_connection_activity_cb, manager);
+#else
+ g_unix_fd_add (manager->public_connection.unix_fd, G_IO_IN,
+ xdisplay_connection_activity_cb, manager);
+#endif
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]