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

wayland/client: Keep track of wl_client aliveness

Browse Source 
Clear the wl_client pointer if the client is destroyed, and emit new
signal if it happened.

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

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

@ -43,6 +43,15 @@
#include "wayland/meta-wayland-types.h" #include "wayland/meta-wayland-types.h"
#include "wayland/meta-window-wayland.h" #include "wayland/meta-window-wayland.h"
enum
{
CLIENT_DESTROYED,
N_SIGNALS
};
static guint signals[N_SIGNALS];
struct _MetaWaylandClient struct _MetaWaylandClient
{ {
GObject parent_instance; GObject parent_instance;
@ -54,6 +63,7 @@ struct _MetaWaylandClient
gboolean process_running; gboolean process_running;
gboolean process_launched; gboolean process_launched;
struct wl_client *wayland_client; struct wl_client *wayland_client;
struct wl_listener client_destroy_listener;
}; };
G_DEFINE_TYPE (MetaWaylandClient, meta_wayland_client, G_TYPE_OBJECT) G_DEFINE_TYPE (MetaWaylandClient, meta_wayland_client, G_TYPE_OBJECT)
@ -63,6 +73,7 @@ meta_wayland_client_dispose (GObject *object)
{ {
MetaWaylandClient *client = META_WAYLAND_CLIENT (object); MetaWaylandClient *client = META_WAYLAND_CLIENT (object);
g_clear_pointer (&client->wayland_client, wl_client_destroy);
g_cancellable_cancel (client->died_cancellable); g_cancellable_cancel (client->died_cancellable);
g_clear_object (&client->died_cancellable); g_clear_object (&client->died_cancellable);
g_clear_object (&client->launcher); g_clear_object (&client->launcher);
@ -77,6 +88,13 @@ meta_wayland_client_class_init (MetaWaylandClientClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = meta_wayland_client_dispose; object_class->dispose = meta_wayland_client_dispose;
signals[CLIENT_DESTROYED] = g_signal_new ("client-destroyed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
NULL,
G_TYPE_NONE, 0);
} }
static void static void
@ -148,6 +166,28 @@ meta_wayland_client_new (MetaContext *context,
return client; return client;
} }
static void
client_destroyed_cb (struct wl_listener *listener,
void *user_data)
{
MetaWaylandClient *client = wl_container_of (listener, client,
client_destroy_listener);
client->wayland_client = NULL;
g_signal_emit (client, signals[CLIENT_DESTROYED], 0);
}
static void
set_wayland_client (MetaWaylandClient *client,
struct wl_client *wayland_client)
{
client->wayland_client = wayland_client;
client->client_destroy_listener.notify = client_destroyed_cb;
wl_client_add_destroy_listener (wayland_client,
&client->client_destroy_listener);
}
/** /**
* meta_wayland_client_spawnv: * meta_wayland_client_spawnv:
* @client: a #MetaWaylandClient * @client: a #MetaWaylandClient
@ -220,8 +260,9 @@ meta_wayland_client_spawnv (MetaWaylandClient *client,
if (subprocess == NULL) if (subprocess == NULL)
return NULL; return NULL;
set_wayland_client (client, wayland_client);
client->subprocess = subprocess; client->subprocess = subprocess;
client->wayland_client = wayland_client;
client->process_running = TRUE; client->process_running = TRUE;
client->died_cancellable = g_cancellable_new (); client->died_cancellable = g_cancellable_new ();
g_subprocess_wait_async (client->subprocess, g_subprocess_wait_async (client->subprocess,