mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-10 08:21:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: allow empty <desktops><prefix>

Browse source
This commit is contained in:
tokyo4j 2025-03-09 01:27:13 +09:00
parent 392db7c04d
commit 6f70598de6
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/config/rcxml.c
View file

@ -941,12 +941,6 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
static uint32_t button_map_from; static uint32_t button_map_from;
if (!nodename) {
return;
}
string_truncate_at_pattern(nodename, ".openbox_config");
string_truncate_at_pattern(nodename, ".labwc_config");
if (getenv("LABWC_DEBUG_CONFIG_NODENAMES")) { if (getenv("LABWC_DEBUG_CONFIG_NODENAMES")) {
printf("%s: %s\n", nodename, content); printf("%s: %s\n", nodename, content);
} }
@ -1282,10 +1276,24 @@ process_node(xmlNode *node, struct parser_state *state)
char *name; char *name;
content = (char *)node->content; content = (char *)node->content;
if (xmlIsBlankNode(node)) { name = nodename(node, buffer, sizeof(buffer));
if (!name) {
return; return;
} }
name = nodename(node, buffer, sizeof(buffer));
string_truncate_at_pattern(name, ".openbox_config");
string_truncate_at_pattern(name, ".labwc_config");
if (xmlIsBlankNode(node)) {
/* Allow empty <desktop><prefix> */
if (!strcasecmp(name, "prefix.desktops")
&& string_null_or_empty(content)) {
content = "";
} else {
return;
}
}
entry(node, name, content, state); entry(node, name, content, state);
} }
@ -1765,6 +1773,7 @@ post_processing(void)
workspace = znew(*workspace); workspace = znew(*workspace);
workspace->name = strdup_printf("%s %d", workspace->name = strdup_printf("%s %d",
rc.workspace_config.prefix, i + 1); rc.workspace_config.prefix, i + 1);
string_strip(workspace->name);
wl_list_append(&rc.workspace_config.workspaces, &workspace->link); wl_list_append(&rc.workspace_config.workspaces, &workspace->link);
} }
} }