libstage: introduce stage_conf_t for stage_new()

stage_new() call sites were getting quite annoying, using compound
literals with designated initializers on a struct makes the call sites
a lot more readable, self-documenting, and often more compact thanks
to the automatic zeroing of omitted members.

I don't particularly like the name, and may switch it later, something
shorter would be nice.

2 files changed, 27 insertions, 8 deletions

diff --git a/src/stage.c b/src/stage.c
index a1d081d..7a088b3 100644
--- a/src/stage.c
+++ b/src/stage.c
@@ -89,22 +89,27 @@ static void _stage_free(stage_t *stage)
 
 /* returns a new stage, attached at the specified layer under parent if supplied */
 /* layer has no effect when parent == NULL */
-stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_prepare_func_t *prepare_func, stage_render_func_t *render_func, stage_free_func_t *free_func, stage_lookup_func_t *lookup_func)
+stage_t * stage_new(const stage_conf_t *conf)
 {
 	stage_t	*stage;
 
-	assert(parent || !layer);
-	assert(layer < STAGE_LAYERS_MAX);
+	assert(conf);
+	assert(conf->parent || !conf->layer);
+	assert(conf->layer < STAGE_LAYERS_MAX);
 
-	stage = _stage_new(name, object, prepare_func, render_func, free_func, lookup_func);
+	stage = _stage_new(conf->name, conf->object, conf->prepare_func, conf->render_func, conf->free_func, conf->lookup_func);
 	if (!stage)
 		return NULL;
 
-	if (parent) {
-		stage->parent = parent;
-		(void) dll_add_pre(&parent->layers[layer], &stage->layer);
+	if (conf->parent) {
+		stage->parent = conf->parent;
+		(void) dll_add_pre(&stage->parent->layers[conf->layer], &stage->layer);
 	}
 
+	stage->alpha = conf->alpha;
+	stage->active = conf->active;
+	stage->locked = conf->locked;
+
 	return stage;
 }
 
diff --git a/src/stage.h b/src/stage.h
index 2b5cc91..86d2311 100644
--- a/src/stage.h
+++ b/src/stage.h
@@ -27,7 +27,21 @@ typedef void (stage_render_func_t)(const stage_t *stage, void *object, float alp
 typedef void (stage_free_func_t)(const stage_t *stage, void *object);
 typedef stage_t * (stage_lookup_func_t)(const stage_t *stage, void *object, void *key);
 
-stage_t * stage_new(stage_t *parent, int layer, const char *name, void *object, stage_prepare_func_t *prepare_func, stage_render_func_t *render_func, stage_free_func_t *free_func, stage_lookup_func_t *lookup_func);
+typedef struct stage_conf_t {
+	stage_t			*parent;
+	int			layer;
+	const char		*name;
+	void			*object;
+	stage_prepare_func_t	*prepare_func;
+	stage_render_func_t	*render_func;
+	stage_free_func_t	*free_func;
+	stage_lookup_func_t	*lookup_func;
+	float			alpha;
+	unsigned		active:1;
+	unsigned		locked:1;
+} stage_conf_t;
+
+stage_t * stage_new(const stage_conf_t *conf);
 void stage_replace(stage_t *stage, const char *name, void *object, stage_prepare_func_t *prepare_func, stage_render_func_t *render_func, stage_free_func_t *free_func, stage_lookup_func_t *lookup_func);
 stage_t * stage_free(stage_t *stage);
 int stage_render(stage_t *stage, void *render_ctxt);