aboutsummaryrefslogtreecommitdiff
path: root/src/config.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/config.c')
-rw-r--r--src/config.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c
index 1488a55..77f6732 100644
--- a/src/config.c
+++ b/src/config.c
@@ -32,6 +32,7 @@ static const config_entry_t config_entries[] = {
{ "font", CONFIG_STRING, offsetof(config_t, font) },
{ "monitor", CONFIG_STRING, offsetof(config_t, monitor) },
{ "override_redirect", CONFIG_BOOL, offsetof(config_t, override_redirect) },
+ { "background", CONFIG_COLOR, offsetof(config_t, background) },
};
static bool config_read_string(const char *value, char **result)
@@ -242,7 +243,7 @@ static bool config_entry(config_t *config, int line, const char *section, const
void config_init(config_t *config)
{
const config_t config_default = {
- .block = {
+ .main_block = {
.label = "main_block",
.color = color_rgb(100, 100, 100),
.type = BLOCK_GROUP,
@@ -255,7 +256,7 @@ void config_init(config_t *config)
};
memcpy(config, &config_default, sizeof(config_t));
- block_copy(&config->block, &config_default.block);
+ block_copy(&config->main_block, &config_default.main_block);
config->font = strcopy(config_default.font);
config->monitor = strcopy(config_default.monitor);
@@ -301,7 +302,11 @@ void config_read(config_t *config, FILE *file)
void config_free(config_t *config)
{
+ block_free(&config->main_block);
+
+ for (int i = 0; i < config->n_blocks; i++)
+ block_free(&config->blocks[i]);
+
free(config->font);
free(config->monitor);
- block_free(&config->block);
}