From 558f75a54b5fefa288c9874df2bf393973465ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 9 Jan 2019 18:35:50 +0100 Subject: [PATCH] module/particle: remove cairo context from begin_expose() --- bar.c | 6 +++--- module.c | 4 ++-- module.h | 4 ++-- particle.h | 2 +- particles/dynlist.c | 4 ++-- particles/empty.c | 2 +- particles/list.c | 4 ++-- particles/map.c | 4 ++-- particles/progress_bar.c | 4 ++-- particles/ramp.c | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bar.c b/bar.c index 4a715c6..7ebe475 100644 --- a/bar.c +++ b/bar.c @@ -147,7 +147,7 @@ expose(const struct bar *_bar) if (e->exposable != NULL) m->end_expose(m, e); - *e = m->begin_expose(m, bar->cairo); + *e = m->begin_expose(m); } for (size_t i = 0; i < bar->center.count; i++) { @@ -157,7 +157,7 @@ expose(const struct bar *_bar) if (e->exposable != NULL) m->end_expose(m, e); - *e = m->begin_expose(m, bar->cairo); + *e = m->begin_expose(m); } for (size_t i = 0; i < bar->right.count; i++) { @@ -167,7 +167,7 @@ expose(const struct bar *_bar) if (e->exposable != NULL) m->end_expose(m, e); - *e = m->begin_expose(m, bar->cairo); + *e = m->begin_expose(m); } int left_width, center_width, right_width; diff --git a/module.c b/module.c index e28219a..624ccfb 100644 --- a/module.c +++ b/module.c @@ -38,12 +38,12 @@ module_signal_ready(struct module_run_context *ctx) } struct module_expose_context -module_default_begin_expose(struct module *mod, cairo_t *cr) +module_default_begin_expose(struct module *mod) { struct exposable *e = mod->content(mod); return (struct module_expose_context){ .exposable = e, - .width = e->begin_expose(e, cr), + .width = e->begin_expose(e), .private = NULL, }; } diff --git a/module.h b/module.h index 22da8d0..012a2fd 100644 --- a/module.h +++ b/module.h @@ -60,7 +60,7 @@ struct module { * (module_default_*) is good enough. In this case, implement * 'content()' instead (see above). */ - struct module_expose_context (*begin_expose)(struct module *mod, cairo_t *cr); + struct module_expose_context (*begin_expose)(struct module *mod); void (*expose)(const struct module *mod, const struct module_expose_context *ctx, cairo_t *cr, int x, int y, int height); @@ -74,7 +74,7 @@ void module_signal_ready(struct module_run_context *ctx); void module_default_destroy(struct module *mod); struct module_expose_context module_default_begin_expose( - struct module *mod, cairo_t *cr); + struct module *mod); void module_default_expose( const struct module *mod, diff --git a/particle.h b/particle.h index bab485b..c12d7fe 100644 --- a/particle.h +++ b/particle.h @@ -35,7 +35,7 @@ struct exposable { char *on_click; void (*destroy)(struct exposable *exposable); - int (*begin_expose)(struct exposable *exposable, cairo_t *cr); + int (*begin_expose)(struct exposable *exposable); void (*expose)(const struct exposable *exposable, cairo_t *cr, int x, int y, int height); diff --git a/particles/dynlist.c b/particles/dynlist.c index 0ef459a..6144ccb 100644 --- a/particles/dynlist.c +++ b/particles/dynlist.c @@ -30,7 +30,7 @@ dynlist_destroy(struct exposable *exposable) } static int -dynlist_begin_expose(struct exposable *exposable, cairo_t *cr) +dynlist_begin_expose(struct exposable *exposable) { const struct private *e = exposable->private; @@ -38,7 +38,7 @@ dynlist_begin_expose(struct exposable *exposable, cairo_t *cr) for (size_t i = 0; i < e->count; i++) { struct exposable *ee = e->exposables[i]; - e->widths[i] = ee->begin_expose(ee, cr); + e->widths[i] = ee->begin_expose(ee); exposable->width += e->left_spacing + e->widths[i] + e->right_spacing; } diff --git a/particles/empty.c b/particles/empty.c index 7f6d6b9..ead1dfc 100644 --- a/particles/empty.c +++ b/particles/empty.c @@ -3,7 +3,7 @@ #include static int -begin_expose(struct exposable *exposable, cairo_t *cr) +begin_expose(struct exposable *exposable) { exposable->width = exposable->particle->left_margin + exposable->particle->right_margin; diff --git a/particles/list.c b/particles/list.c index f37c2c2..9a9a5e3 100644 --- a/particles/list.c +++ b/particles/list.c @@ -33,7 +33,7 @@ exposable_destroy(struct exposable *exposable) } static int -begin_expose(struct exposable *exposable, cairo_t *cr) +begin_expose(struct exposable *exposable) { const struct eprivate *e = exposable->private; @@ -41,7 +41,7 @@ begin_expose(struct exposable *exposable, cairo_t *cr) for (size_t i = 0; i < e->count; i++) { struct exposable *ee = e->exposables[i]; - e->widths[i] = ee->begin_expose(ee, cr); + e->widths[i] = ee->begin_expose(ee); exposable->width += e->left_spacing + e->widths[i] + e->right_spacing; } diff --git a/particles/map.c b/particles/map.c index 990ec86..5094fb2 100644 --- a/particles/map.c +++ b/particles/map.c @@ -26,13 +26,13 @@ exposable_destroy(struct exposable *exposable) } static int -begin_expose(struct exposable *exposable, cairo_t *cr) +begin_expose(struct exposable *exposable) { struct eprivate *e = exposable->private; exposable->width = ( exposable->particle->left_margin + - e->exposable->begin_expose(e->exposable, cr) + + e->exposable->begin_expose(e->exposable) + exposable->particle->right_margin); return exposable->width; diff --git a/particles/progress_bar.c b/particles/progress_bar.c index 1a40db0..cd4362b 100644 --- a/particles/progress_bar.c +++ b/particles/progress_bar.c @@ -52,7 +52,7 @@ exposable_destroy(struct exposable *exposable) } static int -begin_expose(struct exposable *exposable, cairo_t *cr) +begin_expose(struct exposable *exposable) { struct eprivate *e = exposable->private; @@ -62,7 +62,7 @@ begin_expose(struct exposable *exposable, cairo_t *cr) /* Sub-exposables */ for (size_t i = 0; i < e->count; i++) - exposable->width += e->exposables[i]->begin_expose(e->exposables[i], cr); + exposable->width += e->exposables[i]->begin_expose(e->exposables[i]); return exposable->width; } diff --git a/particles/ramp.c b/particles/ramp.c index 2e9607e..827cecc 100644 --- a/particles/ramp.c +++ b/particles/ramp.c @@ -27,13 +27,13 @@ exposable_destroy(struct exposable *exposable) } static int -begin_expose(struct exposable *exposable, cairo_t *cr) +begin_expose(struct exposable *exposable) { struct eprivate *e = exposable->private; exposable->width = ( exposable->particle->left_margin + - e->exposable->begin_expose(e->exposable, cr) + + e->exposable->begin_expose(e->exposable) + exposable->particle->right_margin); return exposable->width;