mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-18 05:33:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid double use of struct workspace

Browse source 
`struct workspace` was used both for representing an actual workspace
and for an entry of workspace configuration. Avoid it for clarity.
This commit is contained in:
tokyo4j 2026-01-31 01:24:01 +09:00 • committed by Consolatis
parent 4819f47f98
commit 37618a1456
4 changed files with 39 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/config/rcxml.c
View file

@ -1309,9 +1309,9 @@ entry(xmlNode *node, char *nodename, char *content)
" Use <windowSwitcher outlines=\"\" />");
} else if (!strcasecmp(nodename, "name.names.desktops")) {
struct workspace *workspace = znew(*workspace);
workspace->name = xstrdup(content);
wl_list_append(&rc.workspace_config.workspaces, &workspace->link);
struct workspace_config *conf = znew(*conf);
conf->name = xstrdup(content);
wl_list_append(&rc.workspace_config.workspaces, &conf->link);
} else if (!strcasecmp(nodename, "popupTime.desktops")) {
rc.workspace_config.popuptime = atoi(content);
} else if (!strcasecmp(nodename, "initial.desktops")) {
@ -1784,15 +1784,14 @@ post_processing(void)
}
struct buf b = BUF_INIT;
struct workspace *workspace;
for (int i = nr_workspaces; i < rc.workspace_config.min_nr_workspaces; i++) {
workspace = znew(*workspace);
struct workspace_config *conf = znew(*conf);
if (!string_null_or_empty(rc.workspace_config.prefix)) {
buf_add_fmt(&b, "%s ", rc.workspace_config.prefix);
}
buf_add_fmt(&b, "%d", i + 1);
workspace->name = xstrdup(b.data);
wl_list_append(&rc.workspace_config.workspaces, &workspace->link);
conf->name = xstrdup(b.data);
wl_list_append(&rc.workspace_config.workspaces, &conf->link);
buf_clear(&b);
}
buf_reset(&b);
@ -2011,7 +2010,7 @@ rcxml_finish(void)
zfree(l);
}
struct workspace *w, *w_tmp;
struct workspace_config *w, *w_tmp;
wl_list_for_each_safe(w, w_tmp, &rc.workspace_config.workspaces, link) {
wl_list_remove(&w->link);
zfree(w->name);