summaryrefslogtreecommitdiff
path: root/src/modules/compose
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-03-12 17:29:26 -0800
committerVito Caputo <vcaputo@pengaru.com>2022-03-12 23:22:51 -0800
commit7ff8ef94c05ae6386463b63f3ba25add52340d8b (patch)
tree585b67df6590acac86d287e42a6bffb0bf995639 /src/modules/compose
parent009f16f93b2a055ec0e14751e6d779849f87ab04 (diff)
til_settings: always describe relevant settings
The existing iterative *_setup() interface only described settings not found, quietly accepting usable settings already present in the til_settings_t. This worked fine for the existing interactive text setup thing, but it's especially problematic for providing a GUI setup frontend. This commit makes it so the *_setup() methods always describe undescribed settings they recognize, leaving the setup frontend loop calling into the *_setup() methods to both apply the description validation if wanted and actually tie the description to respective setting returned by the _setup() methods as being related to the returned description. A new helper called til_settings_get_and_describe_value() has been introduced primarily for use of module setup methods to simplify this nonsense, replacing the til_settings_get_value() calls and surrounding logic, but retaining the til_setting_desc_t definitions largely verbatim. This also results in discarding of some ad-hoc til_setting_desc_check() calls, now that there's a centralized place where settings become "described" (setup_interactively in the case of rototiller). Now a GUI frontend (like glimmer) would just provide its own setup_interactively() equivalent for constructing its widgets for a given *_setup() method's chain of returned descs. Whereas in the past this wasn't really feasible unless there was never going to be pre-supplied settings. I suspect the til_setting_desc_check() integration into setup_interactively() needs more work, but I think this is good enough for now and I'm out of spare time for the moment.
Diffstat (limited to 'src/modules/compose')
-rw-r--r--src/modules/compose/compose.c40
1 files changed, 19 insertions, 21 deletions
diff --git a/src/modules/compose/compose.c b/src/modules/compose/compose.c
index bf3f125..81406c1 100644
--- a/src/modules/compose/compose.c
+++ b/src/modules/compose/compose.c
@@ -39,7 +39,7 @@ typedef struct compose_context_t {
static void * compose_create_context(unsigned ticks, unsigned num_cpus);
static void compose_destroy_context(void *context);
static void compose_prepare_frame(void *context, unsigned ticks, unsigned n_cpus, til_fb_fragment_t *fragment, til_fragmenter_t *res_fragmenter);
-static int compose_setup(const til_settings_t *settings, til_setting_desc_t **next_setting);
+static int compose_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc);
static char *compose_default_layers[] = { "drizzle", "stars", "spiro", "plato", NULL };
static char **compose_layers;
@@ -111,32 +111,30 @@ static void compose_prepare_frame(void *context, unsigned ticks, unsigned n_cpus
}
-static int compose_setup(const til_settings_t *settings, til_setting_desc_t **next_setting)
+static int compose_setup(const til_settings_t *settings, const til_setting_t **res_setting, const til_setting_desc_t **res_desc)
{
const char *layers;
-
- layers = til_settings_get_value(settings, "layers");
- if (!layers) {
- int r;
-
- r = til_setting_desc_clone(&(til_setting_desc_t){
- .name = "Colon-Separated List Of Module Layers, In Draw Order",
- .key = "layers",
- .preferred = "drizzle:stars:spiro:plato",
- .annotations = NULL
- }, next_setting);
- if (r < 0)
- return r;
-
- return 1;
- }
+ int r;
+
+ r = til_settings_get_and_describe_value(settings,
+ &(til_setting_desc_t){
+ .name = "Colon-Separated List Of Module Layers, In Draw Order",
+ .key = "layers",
+ .preferred = "drizzle:stars:spiro:plato",
+ .annotations = NULL
+ },
+ &layers,
+ res_setting,
+ res_desc);
+ if (r)
+ return r;
/* turn layers colon-separated list into a null-terminated array of strings */
{
const til_module_t **modules;
- size_t n_modules;
- char *toklayers, *layer;
- int n = 2;
+ size_t n_modules;
+ char *toklayers, *layer;
+ int n = 2;
til_get_modules(&modules, &n_modules);
© All Rights Reserved