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

module/battery: export module info through the new module_info struct type

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-12 12:02:41 +01:00
parent 3d36735f88
commit e24923e7cc
4 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config.c
View file

@ -416,20 +416,6 @@ module_i3_from_config(const struct yml_node *node, const struct font *parent_fon
return module_i3(workspaces, yml_dict_length(c), left, right);
}
static struct module *
module_battery_from_config(const struct yml_node *node,
const struct font *parent_font)
{
const struct yml_node *c = yml_get_value(node, "content");
const struct yml_node *name = yml_get_value(node, "name");
const struct yml_node *poll_interval = yml_get_value(node, "poll_interval");
return module_battery(
yml_value_as_string(name),
conf_to_particle(c, parent_font),
poll_interval != NULL ? yml_value_as_int(poll_interval) : 60);
}
static struct module *
module_xkb_from_config(const struct yml_node *node,
const struct font *parent_font)
@ -575,6 +561,8 @@ conf_to_bar(const struct yml_node *bar)
mods[idx] = module_alsa.from_conf(m.value, font);
else if (strcmp(mod_name, "backlight") == 0)
mods[idx] = module_backlight.from_conf(m.value, font);
else if (strcmp(mod_name, "battery") == 0)
mods[idx] = module_battery.from_conf(m.value, font);
else if (strcmp(mod_name, "label") == 0)
mods[idx] = module_label_from_config(m.value, font);
@ -584,8 +572,6 @@ conf_to_bar(const struct yml_node *bar)
mods[idx] = module_xwindow_from_config(m.value, font);
else if (strcmp(mod_name, "i3") == 0)
mods[idx] = module_i3_from_config(m.value, font);
else if (strcmp(mod_name, "battery") == 0)
mods[idx] = module_battery_from_config(m.value, font);
else if (strcmp(mod_name, "xkb") == 0)
mods[idx] = module_xkb_from_config(m.value, font);
else if (strcmp(mod_name, "mpd") == 0)