pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

particle/map: new particle; maps a tag value to a particle

Browse source 
This particle is basically a dictionary mapping tag values to
particles.
This commit is contained in:
Daniel Eklöf 2018-12-13 18:58:02 +01:00
parent cc457be4d8
commit 92c9593ff5
4 changed files with 129 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
config.c
View file

@ -10,6 +10,7 @@
#include "particle.h"
#include "particles/string.h"
#include "particles/list.h"
#include "particles/map.h"
#include "module.h"
#include "modules/label/label.h"
@ -155,7 +156,7 @@ particle_list_from_config(const struct yml_node *node,
right_spacing = yml_value_as_int(right_spacing_node);
size_t count = yml_list_length(items_node);
struct particle **parts = calloc(count, sizeof(*parts));
struct particle *parts[count];
size_t idx = 0;
for (struct yml_list_iter it = yml_list_iter(items_node);
@ -168,10 +169,37 @@ particle_list_from_config(const struct yml_node *node,
struct particle *list = particle_list_new(
parts, count, left_spacing, right_spacing, left_margin, right_margin);
free(parts);
return list;
}
static struct particle *
particle_map_from_config(const struct yml_node *node, const struct font *parent_font)
{
const struct yml_node *tag = yml_get_value(node, "tag");
const struct yml_node *values = yml_get_value(node, "values");
assert(yml_is_scalar(tag));
assert(yml_is_dict(values));
printf("MAP tag: %s\n", yml_value_as_string(tag));
struct particle_map particle_map[yml_dict_length(values)];
size_t idx = 0;
for (struct yml_dict_iter it = yml_dict_iter(values);
it.key != NULL;
yml_dict_next(&it), idx++)
{
particle_map[idx].tag_value = yml_value_as_string(it.key);
particle_map[idx].particle = particle_from_config(it.value, parent_font);
assert(particle_map[idx].particle != NULL);
}
return particle_map_new(
yml_value_as_string(tag), particle_map, yml_dict_length(values),
NULL, 0, 0);
}
static struct particle *
particle_from_config(const struct yml_node *node, const struct font *parent_font)
{
@ -185,6 +213,8 @@ particle_from_config(const struct yml_node *node, const struct font *parent_font
return particle_string_from_config(pair.value, parent_font);
else if (strcmp(type, "list") == 0)
return particle_list_from_config(pair.value, parent_font);
else if (strcmp(type, "map") == 0)
return particle_map_from_config(pair.value, parent_font);
else
assert(false);
}