external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-06-16 00:05:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particle/empty: expose info through the new struct particle_info struct

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-12 22:48:23 +01:00
parent c2db518a4f
commit 0f8f21510a
4 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
config-verify.c
View file

@ -9,6 +9,8 @@
#include "plugin.h"
#include "tllist.h"
#include "particles/empty.h"
const char *
conf_err_prefix(const keychain_t *chain, const struct yml_node *node)
{
@ -315,10 +317,6 @@ conf_verify_particle_dictionary(keychain_t *chain, const struct yml_node *node)
{"right-margin", false, &conf_verify_int}, \
{"on-click", false, &conf_verify_string},
static const struct attr_info empty[] = {
COMMON_ATTRS
};
static const struct attr_info list[] = {
{"items", true, &verify_list_items},
{"spacing", false, &conf_verify_int},
@ -363,12 +361,18 @@ conf_verify_particle_dictionary(keychain_t *chain, const struct yml_node *node)
#undef COMMON_ATTRS
static const struct {
const char *name;
const struct particle_info *info;
} particles_v2[] = {
{"empty", &particle_empty},
};
static const struct {
const char *name;
const struct attr_info *attrs;
size_t count;
} particles[] = {
{"empty", empty, sizeof(empty) / sizeof(empty[0])},
{"list", list, sizeof(list) / sizeof(list[0])},
{"map", map, sizeof(map) / sizeof(map[0])},
{"progress-bar", progress_bar, sizeof(progress_bar) / sizeof(progress_bar[0])},
@ -376,6 +380,21 @@ conf_verify_particle_dictionary(keychain_t *chain, const struct yml_node *node)
{"string", string, sizeof(string) / sizeof(string[0])},
};
for (size_t i = 0; i < sizeof(particles_v2) / sizeof(particles_v2[0]); i++) {
if (strcmp(particles_v2[i].name, particle_name) != 0)
continue;
if (!conf_verify_dict(chain_push(chain, particle_name), values,
particles_v2[i].info->attrs,
particles_v2[i].info->attr_count))
{
return false;
}
chain_pop(chain);
return true;
}
for (size_t i = 0; i < sizeof(particles) / sizeof(particles[0]); i++) {
if (strcmp(particles[i].name, particle_name) != 0)
continue;