reprap: c3 update

[simavr] / examples / board_reprap / src / c3 / c3cairo.c

diff --git a/examples/board_reprap/src/c3/c3cairo.c b/examples/board_reprap/src/c3/c3cairo.c
index 6472b62..88fa4d9 100644 (file)
--- a/examples/board_reprap/src/c3/c3cairo.c
+++ b/examples/board_reprap/src/c3/c3cairo.c
@@ -21,21 +21,80 @@
 
 
 #include "c3/c3cairo.h"
+#include "c3/c3driver_geometry.h"
+
+void
+_c3cairo_dispose(
+               c3geometry_p g,
+               const c3driver_geometry_t * d)
+{
+       c3cairo_p c = (c3cairo_p)g;
+
+       if (c->cr)
+               cairo_destroy(c->cr);
+       if (c->surface)
+               cairo_surface_destroy(c->surface);
+       C3_DRIVER_INHERITED(g, d, dispose);
+}
+
+static void
+_c3cairo_prepare(
+               c3geometry_p g,
+               const struct c3driver_geometry_t *d)
+{
+       C3_DRIVER_INHERITED(g, d, prepare);
+}
+
+const c3driver_geometry_t c3cairo_base_driver = {
+       .dispose = _c3cairo_dispose,
+       .prepare = _c3cairo_prepare,
+};
+const c3driver_geometry_t c3texture_driver;
+const c3driver_geometry_t c3geometry_driver;
 
 c3cairo_p
 c3cairo_new(
-               c3object_p parent)
+               struct c3object_t * parent)
 {
        c3cairo_p res = malloc(sizeof(*res));
-       memset(res, 0, sizeof(*res));
        return c3cairo_init(res, parent);
 }
 
 c3cairo_p
 c3cairo_init(
                c3cairo_p o,
-               c3object_p parent)
+               struct c3object_t * parent)
 {
-       c3object_init(&o->object, parent);
+       memset(o, 0, sizeof(*o));
+       c3texture_init(&o->tex, parent);
+
+       static const c3driver_geometry_t * list[] = {
+                       &c3cairo_base_driver, &c3texture_driver, &c3geometry_driver, NULL,
+       };
+       ((c3geometry_p)o)->driver = list;
+
        return o;
 }
+
+c3cairo_p
+c3cairo_new_offscreen(
+               struct c3object_t * parent,
+               int w, int h)
+{
+       c3cairo_p o = c3cairo_new(parent);
+
+       o->surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
+       o->cr = cairo_create(o->surface);
+
+       c3pixels_init(&o->tex.pixels, w, h, 4,
+                       cairo_image_surface_get_stride(o->surface),
+                       cairo_image_surface_get_data(o->surface));
+
+       return o;
+}
+
+#if 0
+cairo_surface_destroy(_surface);
+else
+cairo_surface_finish(_surface);
+#endif