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

wayland/client: Put wl_client creator in helper

Browse Source 
Will be used to create clients in other way than a subprocess launcher
and WAYLAND_SOCKET environment variable.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2810>
This commit is contained in:
Jonas Ådahl 2023-01-26 22:48:53 +01:00 committed by Marge Bot
parent ff56305e6f
commit 3042f56450
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/wayland/meta-wayland-client.c
View File

@ -166,6 +166,30 @@ meta_wayland_client_new (MetaContext *context,
return client; return client;
} }
static gboolean
init_wayland_client (MetaWaylandClient *client,
struct wl_client **wayland_client,
int *fd,
GError **error)
{
MetaWaylandCompositor *compositor;
int client_fd[2];
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, client_fd) < 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Failed to create a socket pair for the wayland client.");
return FALSE;
}
compositor = meta_context_get_wayland_compositor (client->context);
*wayland_client = wl_client_create (compositor->wayland_display, client_fd[0]);
*fd = client_fd[1];
return TRUE;
}
static void static void
client_destroyed_cb (struct wl_listener *listener, client_destroyed_cb (struct wl_listener *listener,
void *user_data) void *user_data)
@ -209,10 +233,9 @@ meta_wayland_client_spawnv (MetaWaylandClient *client,
const char * const *argv, const char * const *argv,
GError **error) GError **error)
{ {
int client_fd[2];
GSubprocess *subprocess; GSubprocess *subprocess;
struct wl_client *wayland_client; struct wl_client *wayland_client;
MetaWaylandCompositor *compositor; int fd;
g_return_val_if_fail (error == NULL || *error == NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL);
g_return_val_if_fail (argv != NULL && g_return_val_if_fail (argv != NULL &&
@ -238,21 +261,13 @@ meta_wayland_client_spawnv (MetaWaylandClient *client,
return NULL; return NULL;
} }
if (socketpair (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, client_fd) < 0) if (!init_wayland_client (client, &wayland_client, &fd, error))
{
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"Failed to create a socket pair for the wayland client.");
return NULL; return NULL;
}
compositor = meta_context_get_wayland_compositor (client->context); g_subprocess_launcher_take_fd (client->launcher, fd, 3);
g_subprocess_launcher_take_fd (client->launcher, client_fd[1], 3);
g_subprocess_launcher_setenv (client->launcher, "WAYLAND_SOCKET", "3", TRUE); g_subprocess_launcher_setenv (client->launcher, "WAYLAND_SOCKET", "3", TRUE);
g_subprocess_launcher_set_child_setup (client->launcher, g_subprocess_launcher_set_child_setup (client->launcher,
child_setup, display, NULL); child_setup, display, NULL);
wayland_client = wl_client_create (compositor->wayland_display, client_fd[0]);
subprocess = g_subprocess_launcher_spawnv (client->launcher, argv, error); subprocess = g_subprocess_launcher_spawnv (client->launcher, argv, error);
g_clear_object (&client->launcher); g_clear_object (&client->launcher);
client->process_launched = TRUE; client->process_launched = TRUE;