From 1bc38cf97875ce46da5e3080729603f6f25c5d98 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Mon, 28 Oct 2024 15:37:27 +0100 Subject: move wayland-glib into its own lib --- lib/river/src/river.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'lib/river/src/river.c') diff --git a/lib/river/src/river.c b/lib/river/src/river.c index 124cb20..b2e5cbe 100644 --- a/lib/river/src/river.c +++ b/lib/river/src/river.c @@ -6,7 +6,8 @@ #include "river-control-unstable-v1-client.h" #include "river-private.h" #include "river-status-unstable-v1-client.h" -#include "wayland-source.h" +// #include "wayland-source.h" +#include struct _AstalRiverRiver { GObject parent_instance; @@ -22,7 +23,8 @@ typedef struct { struct wl_registry* wl_registry; struct wl_seat* seat; struct wl_display* display; - WLSource* wl_source; + // WLSource* wl_source; + WlSourceWlSource* wl_source; struct zriver_status_manager_v1* river_status_manager; struct zriver_control_v1* river_control; struct zriver_seat_status_v1* river_seat_status; @@ -340,7 +342,8 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl if (priv->init) return TRUE; - priv->wl_source = wl_source_new(NULL, NULL); + // priv->wl_source = wl_source_new(NULL, NULL); + priv->wl_source = wl_source_wl_source_new(); if (priv->wl_source == NULL) { g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, @@ -348,7 +351,8 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl return FALSE; } - priv->display = wl_source_get_display(priv->wl_source); + // priv->display = wl_source_get_display(priv->wl_source); + priv->display = priv->wl_source->display; priv->wl_registry = wl_display_get_registry(priv->display); wl_registry_add_listener(priv->wl_registry, ®istry_listener, self); @@ -449,7 +453,8 @@ static void astal_river_river_finalize(GObject* object) { if (priv->seat != NULL) wl_seat_destroy(priv->seat); if (priv->display != NULL) wl_display_flush(priv->display); - if (priv->wl_source != NULL) wl_source_free(priv->wl_source); + // if (priv->wl_source != NULL) wl_source_free(priv->wl_source); + if (priv->wl_source != NULL) g_source_unref((GSource*)(priv->wl_source)); g_free(self->focused_view); g_free(self->focused_output); -- cgit v1.2.3 From 5ed7a1416c2532188a7e01fead3842602fdb670f Mon Sep 17 00:00:00 2001 From: kotontrion Date: Fri, 20 Dec 2024 09:47:59 +0100 Subject: wayland-glib: rename namespace --- lib/river/src/river.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'lib/river/src/river.c') diff --git a/lib/river/src/river.c b/lib/river/src/river.c index b2e5cbe..6f94c9c 100644 --- a/lib/river/src/river.c +++ b/lib/river/src/river.c @@ -23,8 +23,7 @@ typedef struct { struct wl_registry* wl_registry; struct wl_seat* seat; struct wl_display* display; - // WLSource* wl_source; - WlSourceWlSource* wl_source; + WlGlibWlSource* wl_source; struct zriver_status_manager_v1* river_status_manager; struct zriver_control_v1* river_control; struct zriver_seat_status_v1* river_seat_status; @@ -342,8 +341,7 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl if (priv->init) return TRUE; - // priv->wl_source = wl_source_new(NULL, NULL); - priv->wl_source = wl_source_wl_source_new(); + priv->wl_source = wl_glib_wl_source_new(); if (priv->wl_source == NULL) { g_set_error_literal(error, G_IO_ERROR, G_IO_ERROR_FAILED, @@ -351,7 +349,6 @@ static gboolean astal_river_river_initable_init(GInitable* initable, GCancellabl return FALSE; } - // priv->display = wl_source_get_display(priv->wl_source); priv->display = priv->wl_source->display; priv->wl_registry = wl_display_get_registry(priv->display); -- cgit v1.2.3