From a5dbf902cfd893b97bfbf9f1064f5d9c068b3984 Mon Sep 17 00:00:00 2001
From: MadcowOG <N/A>
Date: Fri, 12 May 2023 14:28:26 -0700
Subject: [PATCH] If monitors on the compositor side are disable, they are
 removed as globals client side. So we need to recreate them after they are
 turned back on. Also, used g_object_unref on PangoFontDescription rather than
 pango_font_description_free which would cause a crash.

---
 src/main.c   | 26 ++++++++++++++++++--------
 src/render.c |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/main.c b/src/main.c
index b470944..f04d6b4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,7 @@ static void fifo_setup(void);
 static void monitor_destroy(struct Monitor *monitor);
 static struct Monitor *monitor_from_name(const char *name);
 struct Monitor *monitor_from_surface(const struct wl_surface *surface);
+static void monitor_initialize(struct Monitor *monitor);
 static void monitor_update(struct Monitor *monitor);
 static void pipe_in(int fd, short mask, void *data);
 static void registry_global_add(void *data, struct wl_registry *registry, uint32_t name,
@@ -195,9 +196,9 @@ void monitor_destroy(struct Monitor *monitor) {
     if (!monitor)
         return;
 
-    wl_list_remove(&monitor->link);
     free(monitor->xdg_name);
-    wl_output_release(monitor->wl_output);
+    if (wl_output_get_version(monitor->wl_output) >= WL_OUTPUT_RELEASE_SINCE_VERSION)
+        wl_output_release(monitor->wl_output);
     list_elements_destroy(monitor->hotspots, free);
     pipeline_destroy(monitor->pipeline);
     bar_destroy(monitor->bar);
@@ -224,6 +225,17 @@ struct Monitor *monitor_from_surface(const struct wl_surface *surface) {
     return NULL;
 }
 
+void monitor_initialize(struct Monitor *monitor) {
+    if (!monitor) return;
+
+    monitor->hotspots = list_create(1);
+    monitor->pipeline = pipeline_create();
+    monitor->bar = bar_create(monitor->hotspots, monitor->pipeline);
+    if (!monitor->pipeline || !monitor->bar)
+        panic("Failed to create a pipline or bar for monitor: %s", monitor->xdg_name);
+    monitor_update(monitor);
+}
+
 void monitor_update(struct Monitor *monitor) {
     if (!monitor)
         return;
@@ -265,6 +277,9 @@ void registry_global_add(void *data, struct wl_registry *registry, uint32_t name
 
         monitor->xdg_output = zxdg_output_manager_v1_get_xdg_output(output_manager, monitor->wl_output);
         zxdg_output_v1_add_listener(monitor->xdg_output, &xdg_output_listener, monitor);
+
+        if (!running) return;
+        monitor_initialize(monitor);
     }
     else if (STRING_EQUAL(interface, wl_seat_interface.name)) {
         struct Seat *seat = ecalloc(1, sizeof(*seat));
@@ -374,12 +389,7 @@ void setup(void) {
 
     struct Monitor *monitor;
     wl_list_for_each(monitor, &monitors, link) {
-        monitor->hotspots = list_create(1);
-        monitor->pipeline = pipeline_create();
-        monitor->bar = bar_create(monitor->hotspots, monitor->pipeline);
-        if (!monitor->pipeline || !monitor->bar)
-            panic("Failed to create a pipline or bar for monitor: %s", monitor->xdg_name);
-        monitor_update(monitor);
+        monitor_initialize(monitor);
     }
 
     if (fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK) < 0)
diff --git a/src/render.c b/src/render.c
index a6ad163..15476b0 100644
--- a/src/render.c
+++ b/src/render.c
@@ -134,7 +134,7 @@ void pipeline_destroy(struct Pipeline *pipeline) {
 
     list_elements_destroy(pipeline->callbacks, free);
     g_object_unref(pipeline->context);
-    g_object_unref(pipeline->font->description);
+    pango_font_description_free(pipeline->font->description);
     free(pipeline->font);
     shm_destroy(pipeline->shm);
     wl_surface_destroy(pipeline->surface);