mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: honor no content <desktops><prefix> node

Browse source 
...because users need a way to override the default "Workspace".

Fixes: #2601
This commit is contained in:
Johan Malm 2025-02-28 16:01:07 +00:00 • committed by Hiroaki Yamamoto
parent 9ca0b111f4
commit 4eec0d2fc7
1 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/config/rcxml.c
View file

@ -1025,7 +1025,24 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
return; return;
} }
/* handle the rest */ if (!strcasecmp(nodename, "prefix.desktops")) {
xstrdup_replace(rc.workspace_config.prefix, content ? content : "");
return;
}
/*
* Nodenames where we want to honour !content have to be parsed above
* this point. An example of this is:
*
* <desktops>
* <prefix></prefix>
* </desktops>
*
* In the case of the <prefix> element having content, the node will be
* processed twice; first for the element itself (with no content) and
* then the content itself. In this situation xstrdup_replace() is
* called twice, but the end result is the right one.
*/
if (!content) { if (!content) {
return; return;
} }
@ -1209,8 +1226,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
rc.workspace_config.popuptime = atoi(content); rc.workspace_config.popuptime = atoi(content);
} else if (!strcasecmp(nodename, "number.desktops")) { } else if (!strcasecmp(nodename, "number.desktops")) {
rc.workspace_config.min_nr_workspaces = MAX(1, atoi(content)); rc.workspace_config.min_nr_workspaces = MAX(1, atoi(content));
} else if (!strcasecmp(nodename, "prefix.desktops")) {
xstrdup_replace(rc.workspace_config.prefix, content);
} else if (!strcasecmp(nodename, "popupShow.resize")) { } else if (!strcasecmp(nodename, "popupShow.resize")) {
if (!strcasecmp(content, "Always")) { if (!strcasecmp(content, "Always")) {
rc.resize_indicator = LAB_RESIZE_INDICATOR_ALWAYS; rc.resize_indicator = LAB_RESIZE_INDICATOR_ALWAYS;
@ -1760,13 +1775,20 @@ post_processing(void)
if (!rc.workspace_config.prefix) { if (!rc.workspace_config.prefix) {
rc.workspace_config.prefix = xstrdup(_("Workspace")); rc.workspace_config.prefix = xstrdup(_("Workspace"));
} }
struct buf b = BUF_INIT;
struct workspace *workspace; struct workspace *workspace;
for (int i = nr_workspaces; i < rc.workspace_config.min_nr_workspaces; i++) { for (int i = nr_workspaces; i < rc.workspace_config.min_nr_workspaces; i++) {
workspace = znew(*workspace); workspace = znew(*workspace);
workspace->name = strdup_printf("%s %d", if (!string_null_or_empty(rc.workspace_config.prefix)) {
rc.workspace_config.prefix, i + 1); 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); wl_list_append(&rc.workspace_config.workspaces, &workspace->link);
buf_clear(&b);
} }
buf_reset(&b);
} }
if (rc.workspace_config.popuptime == INT_MIN) { if (rc.workspace_config.popuptime == INT_MIN) {
rc.workspace_config.popuptime = 1000; rc.workspace_config.popuptime = 1000;