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

rcxml: ignore duplicated buttons in <titlebar><layout>

Browse source 
...rather than ignoring the whole <titlebar><layout>.
This commit is contained in:
tokyo4j 2025-01-12 16:16:16 +09:00 • committed by Hiroaki Yamamoto
parent 925360ffba
commit f082dd7c25
1 changed files with 11 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/config/rcxml.c
View file

@ -147,7 +147,7 @@ parse_window_type(const char *type)
* desk D All-desktops toggle (aka omnipresent) * desk D All-desktops toggle (aka omnipresent)
*/ */
static void static void
fill_section(const char *content, struct wl_list *list) fill_section(const char *content, struct wl_list *list, uint32_t *found_buttons)
{ {
gchar **identifiers = g_strsplit(content, ",", -1); gchar **identifiers = g_strsplit(content, ",", -1);
for (size_t i = 0; identifiers[i]; ++i) { for (size_t i = 0; identifiers[i]; ++i) {
@ -178,6 +178,14 @@ fill_section(const char *content, struct wl_list *list)
assert(type != LAB_SSD_NONE); assert(type != LAB_SSD_NONE);
if (*found_buttons & (1 << type)) {
wlr_log(WLR_ERROR, "ignoring duplicated button type '%s'",
identifier);
continue;
}
*found_buttons |= (1 << type);
struct title_button *item = znew(*item); struct title_button *item = znew(*item);
item->type = type; item->type = type;
wl_list_append(list, &item->link); wl_list_append(list, &item->link);
@ -185,61 +193,9 @@ fill_section(const char *content, struct wl_list *list)
g_strfreev(identifiers); g_strfreev(identifiers);
} }
static int
compare_strings(const void *a, const void *b)
{
char * const *str1 = a;
char * const *str2 = b;
return strcmp(*str1, *str2);
}
static bool
contains_duplicates(char *content)
{
bool ret = false;
/*
* The string typically looks like: 'menu:iconfiy,max,close' so we have
* to split on both ':' and ','.
*/
gchar **idents = g_strsplit_set(content, ",:", -1);
/*
* We've got to have at least two for duplicates to exist. Bailing out
* early here also enables the below algorithm which just iterates and
* checks if previous item is the same.
*/
if (g_strv_length(idents) <= 1) {
goto out;
}
qsort(idents, g_strv_length(idents), sizeof(gchar *), compare_strings);
for (size_t i = 1; idents[i]; ++i) {
if (string_null_or_empty(idents[i])) {
continue;
}
if (!strcmp(idents[i], idents[i-1])) {
ret = true;
wlr_log(WLR_ERROR,
"titleLayout identifier '%s' is a duplicate",
idents[i]);
break;
}
}
out:
g_strfreev(idents);
return ret;
}
static void static void
fill_title_layout(char *content) fill_title_layout(char *content)
{ {
if (contains_duplicates(content)) {
wlr_log(WLR_ERROR, "titleLayout contains duplicates");
return;
}
struct wl_list *sections[] = { struct wl_list *sections[] = {
&rc.title_buttons_left, &rc.title_buttons_left,
&rc.title_buttons_right, &rc.title_buttons_right,
@ -252,8 +208,9 @@ fill_title_layout(char *content)
goto err; goto err;
} }
uint32_t found_buttons = 0;
for (size_t i = 0; parts[i]; ++i) { for (size_t i = 0; parts[i]; ++i) {
fill_section(parts[i], sections[i]); fill_section(parts[i], sections[i], &found_buttons);
} }
rc.title_layout_loaded = true; rc.title_layout_loaded = true;