diff --git a/bar/bar.c b/bar/bar.c index 33a76a9..df74d7d 100644 --- a/bar/bar.c +++ b/bar/bar.c @@ -97,7 +97,7 @@ expose(const struct bar *_bar) if (e != NULL) e->destroy(e); - bar->left.exps[i] = module_begin_expose(m, bar->cairo); + bar->left.exps[i] = module_begin_expose(m); } for (size_t i = 0; i < bar->center.count; i++) { @@ -107,7 +107,7 @@ expose(const struct bar *_bar) if (e != NULL) e->destroy(e); - bar->center.exps[i] = module_begin_expose(m, bar->cairo); + bar->center.exps[i] = module_begin_expose(m); } for (size_t i = 0; i < bar->right.count; i++) { @@ -117,7 +117,7 @@ expose(const struct bar *_bar) if (e != NULL) e->destroy(e); - bar->right.exps[i] = module_begin_expose(m, bar->cairo); + bar->right.exps[i] = module_begin_expose(m); } int left_width, center_width, right_width; diff --git a/module.c b/module.c index da27f65..1e80c32 100644 --- a/module.c +++ b/module.c @@ -20,9 +20,9 @@ module_default_destroy(struct module *mod) } struct exposable * -module_begin_expose(struct module *mod, cairo_t *cr) +module_begin_expose(struct module *mod) { struct exposable *e = mod->content(mod); - e->begin_expose(e, cr); + e->begin_expose(e); return e; } diff --git a/module.h b/module.h index d75dbf4..ee2b114 100644 --- a/module.h +++ b/module.h @@ -30,7 +30,7 @@ struct module { struct module *module_common_new(void); void module_default_destroy(struct module *mod); -struct exposable *module_begin_expose(struct module *mod, cairo_t *cr); +struct exposable *module_begin_expose(struct module *mod); /* List of attributes *all* modules implement */ #define MODULE_COMMON_ATTRS \ diff --git a/particle.h b/particle.h index 7fbb1f9..210530f 100644 --- a/particle.h +++ b/particle.h @@ -36,7 +36,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 289dece..e6a3636 100644 --- a/particles/dynlist.c +++ b/particles/dynlist.c @@ -31,7 +31,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; @@ -39,7 +39,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 c040814..8b0cb39 100644 --- a/particles/empty.c +++ b/particles/empty.c @@ -6,7 +6,7 @@ #include "../plugin.h" 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 420cebd..a47c468 100644 --- a/particles/list.c +++ b/particles/list.c @@ -36,7 +36,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; @@ -44,7 +44,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 c40632f..a8895cb 100644 --- a/particles/map.c +++ b/particles/map.c @@ -36,13 +36,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 9c1eb6c..762178e 100644 --- a/particles/progress-bar.c +++ b/particles/progress-bar.c @@ -54,7 +54,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; @@ -64,7 +64,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 2e0aebe..1f8ef11 100644 --- a/particles/ramp.c +++ b/particles/ramp.c @@ -30,13 +30,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/string.c b/particles/string.c index e4818dc..3ff0aa7 100644 --- a/particles/string.c +++ b/particles/string.c @@ -35,7 +35,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;