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

oarticles: don't assume particle content is a dictionary

Browse source 
This is done by having each particle implement a top-level verifier
function.
This commit is contained in:
Daniel Eklöf 2019-01-13 12:47:20 +01:00
parent 9944a8f972
commit 8bc6a0b783
8 changed files with 77 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config-verify.c
View file

@ -292,8 +292,10 @@ conf_verify_particle_dictionary(keychain_t *chain, const struct yml_node *node)
return false;
}
assert(info->verify_conf != NULL);
chain_push(chain, particle_name);
if (!conf_verify_dict(chain, values, info->attrs))
if (!info->verify_conf(chain, values))
return false;
chain_pop(chain);

2
particle.h
View file

@ -14,11 +14,11 @@ struct particle;
struct exposable;
struct particle_info {
bool (*verify_conf)(keychain_t *chain, const struct yml_node *node);
struct particle *(*from_conf)(const struct yml_node *node,
const struct font *parent_font,
int left_margin, int right_margin,
const char *on_click_template);
const struct attr_info attrs[];
#define PARTICLE_COMMON_ATTRS_COUNT 5
#define PARTICLE_COMMON_ATTRS \

16
particles/empty.c
View file

@ -48,9 +48,17 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
return empty_new(left_margin, right_margin, on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
PARTICLE_COMMON_ATTRS,
},
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};

16
particles/list.c
View file

@ -198,13 +198,21 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"items", true, &conf_verify_particle_list_items},
{"spacing", false, &conf_verify_int},
{"left-spacing", false, &conf_verify_int},
{"right-spacing", false, &conf_verify_int},
PARTICLE_COMMON_ATTRS,
},
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};

16
particles/map.c
View file

@ -228,12 +228,20 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
default_particle, left_margin, right_margin, on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"tag", true, &conf_verify_string},
{"values", true, &verify_map_values},
{"default", false, &conf_verify_particle},
PARTICLE_COMMON_ATTRS,
},
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};

16
particles/progress-bar.c
View file

@ -257,9 +257,10 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
left_margin, right_margin, on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"tag", true, &conf_verify_string},
{"length", true, &conf_verify_int},
/* TODO: make these optional? Default to empty */
@ -269,5 +270,12 @@ const struct particle_info plugin_info = {
{"empty", true, &conf_verify_particle},
{"indicator", true, &conf_verify_particle},
PARTICLE_COMMON_ATTRS,
},
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};

18
particles/ramp.c
View file

@ -178,11 +178,19 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"tag", true, &conf_verify_string},
{"items", true, &conf_verify_particle_list_items},
PARTICLE_COMMON_ATTRS,
},
PARTICLE_COMMON_ATTRS,
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};

16
particles/string.c
View file

@ -171,13 +171,21 @@ from_conf(const struct yml_node *node, const struct font *parent_font,
fg_color, left_margin, right_margin, on_click_template);
}
const struct particle_info plugin_info = {
.from_conf = &from_conf,
.attrs = {
static bool
verify_conf(keychain_t *chain, const struct yml_node *node)
{
static const struct attr_info attrs[] = {
{"text", true, &conf_verify_string},
{"max", false, &conf_verify_int},
{"font", false, &conf_verify_font},
{"foreground", false, &conf_verify_color},
PARTICLE_COMMON_ATTRS,
},
};
return conf_verify_dict(chain, node, attrs);
}
const struct particle_info plugin_info = {
.verify_conf = &verify_conf,
.from_conf = &from_conf,
};