exposable: add a "common" constructor and default destructor

This commit is contained in:
Daniel Eklöf 2018-12-29 12:51:31 +01:00
parent acda1a4b21
commit e8d8bf70d3
6 changed files with 59 additions and 33 deletions

View file

@ -11,6 +11,15 @@ struct private {
struct rgba foreground;
};
static void
exposable_destroy(struct exposable *exposable)
{
struct private *e = exposable->private;
free(e->text);
free(e);
exposable_default_destroy(exposable);
}
static int
begin_expose(struct exposable *exposable, cairo_t *cr)
{
@ -68,15 +77,6 @@ expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
}
static void
exposable_destroy(struct exposable *exposable)
{
struct private *e = exposable->private;
free(e->text);
free(e);
free(exposable);
}
struct sbuf {
char *s;
size_t size;
@ -164,8 +164,7 @@ instantiate(const struct particle *particle, const struct tag_set *tags)
e->font = p->font;
e->foreground = p->foreground;
struct exposable *exposable = malloc(sizeof(*exposable));
exposable->particle = particle;
struct exposable *exposable = exposable_common_new(particle, NULL);
exposable->private = e;
exposable->destroy = &exposable_destroy;
exposable->begin_expose = &begin_expose;