From bc0174d8490188fdd10afc2c6a4aa8b7c86268aa Mon Sep 17 00:00:00 2001
From: tokyo4j <hrak1529@gmail.com>
Date: Wed, 17 Apr 2024 18:09:01 +0900
Subject: [PATCH] workspaces: react to Reconfigure

Changes in `<desktops><names>` or `<desktop><number="" prefix="">` required
restarting labwc to take effect.

This commit adds `workspaces_reconfigure()` to update `server->workspaces` on
Reconfigure.
---
 include/workspaces.h |  1 +
 src/server.c         |  1 +
 src/workspaces.c     | 85 +++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/include/workspaces.h b/include/workspaces.h
index 997865f2..a558a00e 100644
--- a/include/workspaces.h
+++ b/include/workspaces.h
@@ -27,5 +27,6 @@ void workspaces_destroy(struct server *server);
 void workspaces_osd_hide(struct seat *seat);
 struct workspace *workspaces_find(struct workspace *anchor, const char *name,
 	bool wrap);
+void workspaces_reconfigure(struct server *server);
 
 #endif /* LABWC_WORKSPACES_H */
diff --git a/src/server.c b/src/server.c
index 9c79d90d..58b95e55 100644
--- a/src/server.c
+++ b/src/server.c
@@ -63,6 +63,7 @@ reload_config_and_theme(struct server *server)
 	regions_reconfigure(server);
 	resize_indicator_reconfigure(server);
 	kde_server_decoration_update_default();
+	workspaces_reconfigure(server);
 }
 
 static int
diff --git a/src/workspaces.c b/src/workspaces.c
index fc8c26a9..0fcef01a 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -388,15 +388,92 @@ workspaces_find(struct workspace *anchor, const char *name, bool wrap)
 	return NULL;
 }
 
+static void
+destroy_workspace(struct workspace *workspace)
+{
+	wlr_scene_node_destroy(&workspace->tree->node);
+	zfree(workspace->name);
+	wl_list_remove(&workspace->link);
+	free(workspace);
+}
+
+void
+workspaces_reconfigure(struct server *server)
+{
+	/*
+	 * Compare actual workspace list with the new desired configuration to:
+	 *   - Update names
+	 *   - Add workspaces if more workspaces are desired
+	 *   - Destroy workspaces if fewer workspace are desired
+	 */
+
+	struct wl_list *actual_workspace_link = server->workspaces.next;
+
+	struct workspace *configured_workspace;
+	wl_list_for_each(configured_workspace,
+			&rc.workspace_config.workspaces, link) {
+		struct workspace *actual_workspace = wl_container_of(
+			actual_workspace_link, actual_workspace, link);
+
+		if (actual_workspace_link == &server->workspaces) {
+			/* # of configured workspaces increased */
+			wlr_log(WLR_DEBUG, "Adding workspace \"%s\"",
+				configured_workspace->name);
+			add_workspace(server, configured_workspace->name);
+			continue;
+		}
+		if (strcmp(actual_workspace->name, configured_workspace->name)) {
+			/* Workspace is renamed */
+			wlr_log(WLR_DEBUG, "Renaming workspace \"%s\" to \"%s\"",
+				actual_workspace->name, configured_workspace->name);
+			free(actual_workspace->name);
+			actual_workspace->name = xstrdup(configured_workspace->name);
+		}
+		actual_workspace_link = actual_workspace_link->next;
+	}
+
+	if (actual_workspace_link == &server->workspaces) {
+		return;
+	}
+
+	/* # of configured workspaces decreased */
+	overlay_hide(&server->seat);
+	struct workspace *first_workspace =
+		wl_container_of(server->workspaces.next, first_workspace, link);
+
+	while (actual_workspace_link != &server->workspaces) {
+		struct workspace *actual_workspace = wl_container_of(
+			actual_workspace_link, actual_workspace, link);
+
+		wlr_log(WLR_DEBUG, "Destroying workspace \"%s\"",
+			actual_workspace->name);
+
+		struct view *view;
+		wl_list_for_each(view, &server->views, link) {
+			if (view->workspace == actual_workspace) {
+				view_move_to_workspace(view, first_workspace);
+			}
+		}
+
+		if (server->workspace_current == actual_workspace) {
+			workspaces_switch_to(first_workspace,
+				/* update_focus */ true);
+		}
+		if (server->workspace_last == actual_workspace) {
+			server->workspace_last = first_workspace;
+		}
+
+		actual_workspace_link = actual_workspace_link->next;
+		destroy_workspace(actual_workspace);
+	}
+}
+
 void
 workspaces_destroy(struct server *server)
 {
 	struct workspace *workspace, *tmp;
 	wl_list_for_each_safe(workspace, tmp, &server->workspaces, link) {
-		wlr_scene_node_destroy(&workspace->tree->node);
-		zfree(workspace->name);
-		wl_list_remove(&workspace->link);
-		free(workspace);
+		destroy_workspace(workspace);
 	}
 	assert(wl_list_empty(&server->workspaces));
 }