*: wire up context-specific setup instances

This is a preparatory commit for cleaning up the existing sloppy
global-ish application of settings during the iterative _setup()
call sequences.

Due to how this has evolved from a very rudimentary thing
enjoying many assumptions about there ever only being a single
module instance being configured by the settings, there's a lot
of weirdness and inconsistency surrounding module setup WRT
changes being applied instantaneously to /all/ existing and
future context's renderings of a given module vs. requiring a new
context be created to realize changes.

This commit doesn't actually change any of that, but puts the
plumbing in place for the setup methods to allocate and
initialize a private struct encapsulating the parsed and
validated setup once the settings are complete.  This opaque
setup pointer will then be provided to the associated
create_context() method as the setup pointer.  Then the created
context can configure itself using the provided setup when
non-NULL, or simply use defaults when NULL.

A future commit will update the setup methods to allocate and
populate their respective setup structs, adding the structs as
needed, as well as updating their create_context() methods to
utilize those setups.

One consequence of these changes when fully realized will be that
every setting change will require a new context be created from
the changed settings for the change to be realized.

For settings appropriately manipulated at runtime the concept of
knobs was introduced but never finished.  That will have to be
finished in the future to enable more immediate/interactive
changing of settings-like values appropriate for interactive
manipulation

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main.c b/src/main.c
index c19b6b5..15bde39 100644
--- a/src/main.c
+++ b/src/main.c
@@ -51,7 +51,9 @@ static rototiller_t		rototiller;
 
 typedef struct setup_t {
 	til_settings_t	*module;
+	void		*module_setup;
 	til_settings_t	*video;
+	void		*video_setup;
 } setup_t;
 
 /* FIXME: this is unnecessarily copy-pasta, i think modules should just be made
@@ -60,7 +62,7 @@ typedef struct setup_t {
  */
 
 /* select video backend if not yet selected, then setup the selected backend. */
-static int setup_video(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc)
+static int setup_video(til_settings_t *settings, til_setting_t **res_setting, const til_setting_desc_t **res_desc, void **res_setup)
 {
 	til_setting_t	*setting;
 	const char	*video;
@@ -101,14 +103,14 @@ static int setup_video(til_settings_t *settings, til_setting_t **res_setting, co
 	if (!strcmp(video, "drm")) {
 		fb_ops = &drm_fb_ops;
 
-		return drm_fb_ops.setup(settings, res_setting, res_desc);
+		return drm_fb_ops.setup(settings, res_setting, res_desc, res_setup);
 	}
 #endif
 #ifdef HAVE_SDL
 	if (!strcmp(video, "sdl")) {
 		fb_ops = &sdl_fb_ops;
 
-		return sdl_fb_ops.setup(settings, res_setting, res_desc);
+		return sdl_fb_ops.setup(settings, res_setting, res_desc, res_setup);
 	}
 #endif
 
@@ -131,13 +133,13 @@ static int setup_from_args(til_args_t *args, setup_t *res_setup)
 	if (!setup.video)
 		goto _err;
 
-	r = setup_interactively(setup.module, til_module_setup, args->use_defaults);
+	r = setup_interactively(setup.module, til_module_setup, args->use_defaults, &setup.module_setup);
 	if (r < 0)
 		goto _err;
 	if (r)
 		changes = 1;
 
-	r = setup_interactively(setup.video, setup_video, args->use_defaults);
+	r = setup_interactively(setup.video, setup_video, args->use_defaults, &setup.video_setup);
 	if (r < 0)
 		goto _err;
 	if (r)
@@ -274,6 +276,7 @@ int main(int argc, const char *argv[])
 						get_ticks(&rototiller.start_tv,
 							&rototiller.start_tv,
 							rototiller.ticks_offset),
+						setup.module_setup,
 						&rototiller.module_context)) < 0,
 		"unable to create module context: %s", strerror(-r));