external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-20 03:35:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: don't assume *all* modules have a single, simple, content particle

Browse source
This commit is contained in:
Daniel Eklöf 2018-11-17 22:43:51 +01:00
parent 6bd698fbc8
commit 97028ae28c
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
config.c
View file

@ -189,6 +189,30 @@ particle_from_config(const struct yml_node *node, const struct font *parent_font
assert(false); assert(false);
} }
static struct module *
module_label_from_config(const struct yml_node *node, const struct font *parent_font)
{
const struct yml_node *c = yml_get_value(node, "content");
assert(c != NULL);
return module_label(particle_from_config(c, parent_font));
}
static struct module *
module_clock_from_config(const struct yml_node *node, const struct font *parent_font)
{
const struct yml_node *c = yml_get_value(node, "content");
assert(c != NULL);
return module_clock(particle_from_config(c, parent_font));
}
static struct module *
module_xwindow_from_config(const struct yml_node *node, const struct font *parent_font)
{
const struct yml_node *c = yml_get_value(node, "content");
assert(c != NULL);
return module_xwindow(particle_from_config(c, parent_font));
}
struct bar * struct bar *
conf_to_bar(const struct yml_node *bar) conf_to_bar(const struct yml_node *bar)
{ {
@ -279,20 +303,16 @@ conf_to_bar(const struct yml_node *bar)
yml_list_next(&it), idx++) yml_list_next(&it), idx++)
{ {
const struct yml_node *n = yml_get_value(it.node, "module"); const struct yml_node *n = yml_get_value(it.node, "module");
assert(n != NULL); assert(n != NULL);
const struct yml_node *c = yml_get_value(it.node, "content");
assert(c != NULL);
const char *mod_name = yml_value_as_string(n); const char *mod_name = yml_value_as_string(n);
struct particle *content = particle_from_config(c, font);
if (strcmp(mod_name, "label") == 0) if (strcmp(mod_name, "label") == 0)
mods[idx] = module_label(content); mods[idx] = module_label_from_config(it.node, font);
else if (strcmp(mod_name, "clock") == 0) else if (strcmp(mod_name, "clock") == 0)
mods[idx] = module_clock(content); mods[idx] = module_clock_from_config(it.node, font);
else if (strcmp(mod_name, "xwindow") == 0) else if (strcmp(mod_name, "xwindow") == 0)
mods[idx] = module_xwindow(content); mods[idx] = module_xwindow_from_config(it.node, font);
else else
assert(false); assert(false);
} }