Actually commit object proxy

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56761 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_proxy.c b/src/lib/canvas/evas_object_proxy.c
new file mode 100644 (file)
index 0000000..3fa91a1
--- /dev/null
+++ b/src/lib/canvas/evas_object_proxy.c
@@ -0,0 +1,349 @@
+#include "evas_common.h"
+#include "evas_private.h"
+
+#include <stdbool.h>
+
+/* Magic number for Proxy objects */
+static const char o_type[] = "proxy";
+
+/* Internal object data */
+typedef struct _Evas_Object_Proxy
+{
+   DATA32   magic;
+
+   Evas_Object *source;
+
+   void *engine_data;
+} Evas_Object_Proxy;
+
+
+/* Helpers */
+static void evas_object_proxy_init(Evas_Object *obj);
+static Evas_Object_Proxy *evas_object_proxy_new(void);
+static void _proxy_unset(Evas_Object *proxy);
+static void _proxy_set(Evas_Object *proxy, Evas_Object *src);
+
+/* Engine Functions */
+static void _proxy_free(Evas_Object *obj);
+static void _proxy_render(Evas_Object *obj, void *output, void *context, void *surface, int x, int y);
+static void _proxy_render_pre(Evas_Object *obj);
+static void _proxy_render_post(Evas_Object *obj);
+static unsigned int _proxy_id_get(Evas_Object *obj);
+static unsigned int _proxy_visual_id_get(Evas_Object *obj);
+static void *_proxy_engine_data_get(Evas_Object *obj);
+
+static int _proxy_is_opaque(Evas_Object *obj);
+static int _proxy_was_opaque(Evas_Object *obj);
+static int _proxy_can_map(Evas_Object *obj);
+
+/*
+   void _proxy_store (Evas_Object *obj);
+   void _proxy_unstore (Evas_Object *obj);
+
+   int  _proxy_is_visible (Evas_Object *obj);
+   int  _proxy_was_visible (Evas_Object *obj);
+
+   int  _proxy_was_opaque (Evas_Object *obj);
+
+   int  _proxy_is_inside (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+   int  _proxy_was_inside (Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+
+   void _proxy_coords_recalc (Evas_Object *obj);
+   void _proxy_scale_update (Evas_Object *obj);
+
+   int _proxy_has_opaque_rect (Evas_Object *obj);
+   int _proxy_get_opaque_rect (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+*/
+
+
+
+static const Evas_Object_Func object_func =
+{
+  /* Required */
+  .free = _proxy_free,
+  .render = _proxy_render,
+  .render_pre = _proxy_render_pre,
+  .render_post = _proxy_render_post,
+
+  .type_id_get = _proxy_id_get,
+  .visual_id_get = _proxy_visual_id_get,
+  .engine_data_get = _proxy_engine_data_get,
+
+  .is_opaque = _proxy_is_opaque,
+  .was_opaque = _proxy_was_opaque,
+
+  /* Optional
+  .store =
+  .unstore =
+
+  .is_visible =
+  .was_visible =
+
+  .is_inside =
+  .was_inside =
+
+  .coords_recalc =
+  .scale_update =
+
+  .has_opaque_rect =
+  .get_opaque_rect =
+  */
+
+  .can_map = _proxy_can_map,
+};
+
+
+EAPI Evas_Object *
+evas_object_proxy_add(Evas *e)
+{
+   Evas_Object *obj;
+   Evas_Object_Proxy *o;
+
+   MAGIC_CHECK(e, Evas, MAGIC_EVAS);
+      return NULL;
+   MAGIC_CHECK_END();
+
+   obj = evas_object_new(e);
+   evas_object_proxy_init(obj);
+   evas_object_inject(obj, e);
+
+   o = obj->object_data;
+
+   /* Do stuff here */
+
+   return obj;
+}
+
+EAPI Eina_Bool
+evas_object_proxy_source_set(Evas_Object *obj, Evas_Object *src)
+{
+   Evas_Object_Proxy *o;
+
+   MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
+   printf("Obj is not an obj\n");
+   return false;
+   MAGIC_CHECK_END();
+   o = obj->object_data;
+   MAGIC_CHECK(o, Evas_Object_Proxy, MAGIC_OBJ_PROXY);
+   printf("Obj is not a proxy\n");
+   return false;
+   MAGIC_CHECK_END();
+
+   if (o->source == src) return true;
+
+   if (o->source)
+     {
+        _proxy_unset(obj);
+     }
+
+   if (src)
+     {
+        _proxy_set(obj, src);
+     }
+
+   return true;
+}
+
+
+/* Internal helpers */
+static void
+evas_object_proxy_init(Evas_Object *obj)
+{
+   obj->object_data = evas_object_proxy_new();
+   obj->cur.color.r =obj->cur.color.g =obj->cur.color.b =obj->cur.color.a = 255;
+   obj->cur.geometry.x = obj->cur.geometry.y = 0;
+   obj->cur.geometry.w = obj->cur.geometry.h = 0;
+   obj->cur.layer = 0;
+   obj->cur.anti_alias = 0;
+   obj->cur.render_op = EVAS_RENDER_BLEND;
+   obj->prev = obj->cur;
+
+   obj->func = &object_func;
+   obj->type = o_type;
+}
+
+static Evas_Object_Proxy *
+evas_object_proxy_new(void)
+{
+   Evas_Object_Proxy *o;
+
+   o = calloc(1,sizeof(Evas_Object_Proxy));
+   o->magic = MAGIC_OBJ_PROXY;
+   o->source = NULL;
+   return o;
+}
+
+
+static void
+_proxy_unset(Evas_Object *proxy)
+{
+   printf("Do proxy object unset\n");
+}
+
+
+static void
+_proxy_set(Evas_Object *proxy, Evas_Object *src)
+{
+   Evas_Object_Proxy *o;
+
+   o = proxy->object_data;
+
+   o->source = src;
+   printf("Set %p\n",src);
+
+
+}
+
+
+
+static void
+_proxy_free(Evas_Object *obj)
+{
+   Evas_Object_Proxy *o;
+
+   o = obj->object_data;
+   MAGIC_CHECK(o, Evas_Object_Proxy, MAGIC_OBJ_PROXY);
+      return;
+   MAGIC_CHECK_END();
+
+   if (o->source) _proxy_unset(obj);
+   o->magic = 0;
+   free(o);
+}
+
+static void
+_proxy_render(Evas_Object *obj, void *output, void *context,
+              void *surface, int x, int y)
+{
+   Evas_Object_Proxy *o;
+   void *pixels;
+   int w,h;
+
+   o = obj->object_data;
+   printf("proxy render\n");
+
+   if (!o->source) return;
+
+   /* Images only essentially */
+   pixels = o->source->func->engine_data_get(o->source);
+   if (!pixels)
+     {
+        printf("No pixels from source: Not drawing\n");
+        return;
+     }
+
+   w = obj->cur.geometry.w;
+   h = obj->cur.geometry.h;
+
+
+   /* If we have a map: Use that */
+   if ((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap))
+     {
+        const Evas_Map_Point *p, *p_end;
+        RGBA_Map_Point pts[4], *pt;
+
+        p = obj->cur.map->points;
+        p_end = p + 4;
+        pt = pts;
+
+        pts[0].px = obj->cur.map->persp.px << FP;
+        pts[0].py = obj->cur.map->persp.py << FP;
+        pts[0].foc = obj->cur.map->persp.foc << FP;
+        pts[0].z0 = obj->cur.map->persp.z0 << FP;
+        // draw geom +x +y
+        for (; p < p_end; p++, pt++)
+          {
+             pt->x = (p->x + x) << FP;
+             pt->y = (p->y + y) << FP;
+             printf("Point %d: %8d,%8d\n",p - obj->cur.map->points,pt->x,pt->y);
+             pt->z = (p->z)     << FP;
+             pt->x3 = p->px << FP;
+             pt->y3 = p->py << FP;
+             pt->u = p->u * FP1;
+             pt->v = p->v * FP1;
+             pt->col = ARGB_JOIN(p->a, p->r, p->g, p->b);
+             printf("Color %8x\n",pt->col);
+          }
+        obj->layer->evas->engine.func->image_map4_draw
+           (output, context, surface, pixels, pts,
+            1/* o->cur.smooth_scale | obj->cur.map->smooth */, 0);
+     }
+   else 
+     {
+        obj->layer->evas->engine.func->image_draw(output, context,
+                                             surface, pixels,
+                                             0, 0,
+                                             w, h, /* FIXME:
+                                             o->cur.image.w,
+                                             o->cur.image.h, */
+                                             obj->cur.geometry.x + /*ix +*/ x,
+                                             obj->cur.geometry.y + /*iy +*/ y,
+                                             w, h,/* was iw,ih */
+                                             1);
+     }
+}
+
+static void
+_proxy_render_pre(Evas_Object *obj)
+{
+   printf("Proxy render pre\n");
+   if (obj->pre_render_done) return;
+   obj->pre_render_done = 1;
+}
+static void
+_proxy_render_post(Evas_Object *obj)
+{
+   printf("proxy render post\n");
+}
+static unsigned int
+_proxy_id_get(Evas_Object *obj)
+{
+   return obj->object_data ? MAGIC_OBJ_PROXY : 0;
+}
+static unsigned int
+_proxy_visual_id_get(Evas_Object *obj)
+{
+   return obj->object_data ? MAGIC_OBJ_PROXY : 0;
+}
+
+static void *
+_proxy_engine_data_get(Evas_Object *obj)
+{
+   return ((Evas_Object_Proxy *)obj->object_data)->engine_data;
+}
+
+
+static int
+_proxy_is_opaque(Evas_Object *obj)
+{
+   /* FIXME: Do color check */
+   if (obj->cur.usemap) return 0;
+
+   return 1;
+}
+
+static int
+_proxy_was_opaque(Evas_Object *obj)
+{
+   /* FIXME: Do color check */
+   if (obj->prev.usemap) return 0;
+   return 1;
+}
+
+
+static int
+_proxy_can_map (Evas_Object *obj)
+{
+   /* Of course it can: that's the bloody point */
+   return 1;
+}
+
+
+
+
+
+
+
+
+
+/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/