From f3721d9d80af82a38a651375e33548633d6f7dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sat, 12 Jan 2019 12:12:14 +0100 Subject: [PATCH] module/i3: export module info through the new module_info struct type --- config-verify.c | 40 ++---------------------- config.c | 35 +++------------------ modules/i3/i3.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++-- modules/i3/i3.h | 12 +------ 4 files changed, 87 insertions(+), 83 deletions(-) diff --git a/config-verify.c b/config-verify.c index 5ed353f..aa4bd11 100644 --- a/config-verify.c +++ b/config-verify.c @@ -12,6 +12,7 @@ #include "modules/backlight/backlight.h" #include "modules/battery/battery.h" #include "modules/clock/clock.h" +#include "modules/i3/i3.h" const char * conf_err_prefix(const keychain_t *chain, const struct yml_node *node) @@ -413,35 +414,6 @@ conf_verify_particle(keychain_t *chain, const struct yml_node *node) } } -static bool -verify_i3_content(keychain_t *chain, const struct yml_node *node) -{ - if (!yml_is_dict(node)) { - LOG_ERR( - "%s: must be a dictionary of workspace-name: particle mappings", - err_prefix(chain, node)); - return false; - } - - for (struct yml_dict_iter it = yml_dict_iter(node); - it.key != NULL; - yml_dict_next(&it)) - { - const char *key = yml_value_as_string(it.key); - if (key == NULL) { - LOG_ERR("%s: key must be a string (a i3 workspace name)", - err_prefix(chain, it.key)); - return false; - } - - if (!conf_verify_particle(chain_push(chain, key), it.value)) - return false; - - chain_pop(chain); - } - - return true; -} static bool verify_module(keychain_t *chain, const struct yml_node *node) @@ -474,14 +446,6 @@ verify_module(keychain_t *chain, const struct yml_node *node) {"anchors", false, NULL}, }; - static const struct attr_info i3[] = { - {"spacing", false, &conf_verify_int}, - {"left-spacing", false, &conf_verify_int}, - {"right-spacing", false, &conf_verify_int}, - {"content", true, &verify_i3_content}, - {"anchors", false, NULL}, - }; - static const struct attr_info network[] = { {"name", true, &conf_verify_string}, {"content", true, &conf_verify_particle}, @@ -515,6 +479,7 @@ verify_module(keychain_t *chain, const struct yml_node *node) {"backlight", &module_backlight}, {"battery", &module_battery}, {"clock", &module_clock}, + {"i3", &module_i3}, }; static const struct { @@ -522,7 +487,6 @@ verify_module(keychain_t *chain, const struct yml_node *node) const struct attr_info *attrs; size_t count; } modules[] = { - {"i3", i3, sizeof(i3) / sizeof(i3[0])}, {"label", label, sizeof(label) / sizeof(label[0])}, {"mpd", mpd, sizeof(mpd) / sizeof(mpd[0])}, {"network", network, sizeof(network) / sizeof(network[0])}, diff --git a/config.c b/config.c index 57a6931..7559384 100644 --- a/config.c +++ b/config.c @@ -376,33 +376,6 @@ module_xwindow_from_config(const struct yml_node *node, const struct font *paren return module_xwindow(conf_to_particle(c, parent_font)); } -static struct module * -module_i3_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 *spacing = yml_get_value(node, "spacing"); - const struct yml_node *left_spacing = yml_get_value(node, "left_spacing"); - const struct yml_node *right_spacing = yml_get_value(node, "right_spacing"); - - int left = spacing != NULL ? yml_value_as_int(spacing) : - left_spacing != NULL ? yml_value_as_int(left_spacing) : 0; - int right = spacing != NULL ? yml_value_as_int(spacing) : - right_spacing != NULL ? yml_value_as_int(right_spacing) : 0; - - struct i3_workspaces workspaces[yml_dict_length(c)]; - - size_t idx = 0; - for (struct yml_dict_iter it = yml_dict_iter(c); - it.key != NULL; - yml_dict_next(&it), idx++) - { - workspaces[idx].name = yml_value_as_string(it.key); - workspaces[idx].content = conf_to_particle(it.value, parent_font); - } - - return module_i3(workspaces, yml_dict_length(c), left, right); -} - static struct module * module_xkb_from_config(const struct yml_node *node, const struct font *parent_font) @@ -552,14 +525,14 @@ conf_to_bar(const struct yml_node *bar) mods[idx] = module_battery.from_conf(m.value, font); else if (strcmp(mod_name, "clock") == 0) mods[idx] = module_clock.from_conf(m.value, font); - + else if (strcmp(mod_name, "i3") == 0) + mods[idx] = module_i3.from_conf(m.value, font); + else if (strcmp(mod_name, "label") == 0) mods[idx] = module_label_from_config(m.value, font); else if (strcmp(mod_name, "xwindow") == 0) 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, "xkb") == 0) + else if (strcmp(mod_name, "xkb") == 0) mods[idx] = module_xkb_from_config(m.value, font); else if (strcmp(mod_name, "mpd") == 0) mods[idx] = module_mpd_from_config(m.value, font); diff --git a/modules/i3/i3.c b/modules/i3/i3.c index d55eb50..a7fd3de 100644 --- a/modules/i3/i3.c +++ b/modules/i3/i3.c @@ -21,6 +21,7 @@ #define LOG_ENABLE_DBG 0 #include "../../log.h" #include "../../bar.h" +#include "../../config.h" #include "../../particles/dynlist.h" @@ -611,9 +612,15 @@ content(struct module *mod) particles, particle_count, m->left_spacing, m->right_spacing); } -struct module * -module_i3(struct i3_workspaces workspaces[], size_t workspace_count, - int left_spacing, int right_spacing) +/* Maps workspace name to a content particle. */ +struct i3_workspaces { + const char *name; + struct particle *content; +}; + +static struct module * +i3_new(struct i3_workspaces workspaces[], size_t workspace_count, + int left_spacing, int right_spacing) { struct private *m = malloc(sizeof(*m)); @@ -638,3 +645,73 @@ module_i3(struct i3_workspaces workspaces[], size_t workspace_count, mod->content = &content; return mod; } + +static struct module * +from_conf(const struct yml_node *node, const struct font *parent_font) +{ + const struct yml_node *c = yml_get_value(node, "content"); + const struct yml_node *spacing = yml_get_value(node, "spacing"); + const struct yml_node *left_spacing = yml_get_value(node, "left_spacing"); + const struct yml_node *right_spacing = yml_get_value(node, "right_spacing"); + + int left = spacing != NULL ? yml_value_as_int(spacing) : + left_spacing != NULL ? yml_value_as_int(left_spacing) : 0; + int right = spacing != NULL ? yml_value_as_int(spacing) : + right_spacing != NULL ? yml_value_as_int(right_spacing) : 0; + + struct i3_workspaces workspaces[yml_dict_length(c)]; + + size_t idx = 0; + for (struct yml_dict_iter it = yml_dict_iter(c); + it.key != NULL; + yml_dict_next(&it), idx++) + { + workspaces[idx].name = yml_value_as_string(it.key); + workspaces[idx].content = conf_to_particle(it.value, parent_font); + } + + return i3_new(workspaces, yml_dict_length(c), left, right); +} + +static bool +verify_content(keychain_t *chain, const struct yml_node *node) +{ + if (!yml_is_dict(node)) { + LOG_ERR( + "%s: must be a dictionary of workspace-name: particle mappings", + conf_err_prefix(chain, node)); + return false; + } + + for (struct yml_dict_iter it = yml_dict_iter(node); + it.key != NULL; + yml_dict_next(&it)) + { + const char *key = yml_value_as_string(it.key); + if (key == NULL) { + LOG_ERR("%s: key must be a string (a i3 workspace name)", + conf_err_prefix(chain, it.key)); + return false; + } + + if (!conf_verify_particle(chain_push(chain, key), it.value)) + return false; + + chain_pop(chain); + } + + return true; +} + +const struct module_info module_i3 = { + .from_conf = &from_conf, + .attr_count = 5, + .attrs = { + {"spacing", false, &conf_verify_int}, + {"left-spacing", false, &conf_verify_int}, + {"right-spacing", false, &conf_verify_int}, + {"content", true, &verify_content}, + {"anchors", false, NULL}, + {NULL, false, NULL}, + }, +}; diff --git a/modules/i3/i3.h b/modules/i3/i3.h index 33b323b..de1c0ae 100644 --- a/modules/i3/i3.h +++ b/modules/i3/i3.h @@ -1,14 +1,4 @@ #pragma once - #include "../../module.h" -#include "../../particle.h" -/* Maps workspace name to a content particle. */ -struct i3_workspaces { - const char *name; - struct particle *content; -}; - -struct module *module_i3( - struct i3_workspaces workspaces[], size_t workspace_count, - int left_spacing, int right_spacing); +extern const struct module_info module_i3;