Evas.Image: Fix legacy proxy API

6 files changed, 191 insertions, 149 deletions

diff --git a/src/lib/evas/canvas/efl_canvas_proxy.c b/src/lib/evas/canvas/efl_canvas_proxy.c
index add2b6a597..af94ec0806 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.c
+++ b/src/lib/evas/canvas/efl_canvas_proxy.c
@@ -3,12 +3,11 @@
 
 #define MY_CLASS EFL_CANVAS_PROXY_CLASS
 
-EOLIAN static Eina_Bool
-_efl_canvas_proxy_source_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Object *eo_src)
+Eina_Bool
+_evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
    Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
-
    if (obj->delete_me && eo_src)
      {
         WRN("Setting deleted object %p as image source %p", eo_src, eo_obj);
@@ -57,15 +56,27 @@ _efl_canvas_proxy_source_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Object *eo_s
    return EINA_TRUE;
 }
 
-EOLIAN static Evas_Object *
-_efl_canvas_proxy_source_get(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED)
+EOLIAN static Eina_Bool
+_efl_canvas_proxy_source_set(Eo *eo_obj, void *pd EINA_UNUSED, Evas_Object *eo_src)
+{
+   return _evas_image_proxy_source_set(eo_obj, eo_src);
+}
+
+Evas_Object *
+_evas_image_proxy_source_get(const Eo *eo_obj)
 {
    Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
    return o->cur->source;
 }
 
-EOLIAN static void
-_efl_canvas_proxy_source_clip_set(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED, Eina_Bool source_clip)
+EOLIAN static Evas_Object *
+_efl_canvas_proxy_source_get(Eo *eo_obj, void *pd EINA_UNUSED)
+{
+   return _evas_image_proxy_source_get(eo_obj);
+}
+
+void
+_evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip)
 {
    Evas_Object_Protected_Data *src_obj;
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
@@ -82,15 +93,27 @@ _efl_canvas_proxy_source_clip_set(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED,
    evas_object_change(o->cur->source, src_obj);
 }
 
-EOLIAN static Eina_Bool
-_efl_canvas_proxy_source_clip_get(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED)
+EOLIAN static void
+_efl_canvas_proxy_source_clip_set(Eo *eo_obj, void *pd EINA_UNUSED, Eina_Bool source_clip)
+{
+   return _evas_image_proxy_source_clip_set(eo_obj, source_clip);
+}
+
+Eina_Bool
+_evas_image_proxy_source_clip_get(const Eo *eo_obj)
 {
    Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
    return o->proxy_src_clip;
 }
 
-EOLIAN static void
-_efl_canvas_proxy_source_events_set(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED, Eina_Bool source_events)
+EOLIAN static Eina_Bool
+_efl_canvas_proxy_source_clip_get(Eo *eo_obj, void *pd EINA_UNUSED)
+{
+   return _evas_image_proxy_source_clip_get(eo_obj);
+}
+
+void
+_evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
    Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
@@ -107,11 +130,144 @@ _efl_canvas_proxy_source_events_set(Eo *eo_obj EINA_UNUSED, void *pd EINA_UNUSED
    //FIXME: Feed mouse events here.
 }
 
-EOLIAN static Eina_Bool
-_efl_canvas_proxy_source_events_get(Eo *eo_obj, void *pd EINA_UNUSED)
+EOLIAN static void
+_efl_canvas_proxy_source_events_set(Eo *eo_obj, void *pd EINA_UNUSED, Eina_Bool repeat)
+{
+   return _evas_image_proxy_source_events_set(eo_obj, repeat);
+}
+
+Eina_Bool
+_evas_image_proxy_source_events_get(const Eo *eo_obj)
 {
    Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
    return obj->proxy->src_events;
 }
 
+EOLIAN static Eina_Bool
+_efl_canvas_proxy_source_events_get(Eo *eo_obj, void *pd EINA_UNUSED)
+{
+   return _evas_image_proxy_source_events_get(eo_obj);
+}
+
+Evas_Object *
+_evas_object_image_source_get(Evas_Object *eo_obj)
+{
+   Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
+   return o->cur->source;
+}
+
+void
+_evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Image_Data *o)
+{
+   Evas_Object_Protected_Data *cur_source;
+
+   if (!o->cur->source) return;
+
+   cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
+
+   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
+     {
+       proxy_source_write->proxies = eina_list_remove(proxy_source_write->proxies,
+                                                      proxy);
+
+       if (eina_list_count(proxy_source_write->proxies) == 0)
+          {
+             if (proxy_source_write->surface)
+               cur_proxy->layer->evas->engine.func->image_free(cur_proxy->layer->evas->engine.data.output,
+                                                               proxy_source_write->surface);
+             proxy_source_write->surface = NULL;
+             proxy_source_write->redraw = EINA_FALSE;
+          }
+
+       if (proxy_source_write->src_invisible)
+         {
+           proxy_source_write->src_invisible = EINA_FALSE;
+           cur_source->changed_src_visible = EINA_TRUE;
+           evas_object_change(o->cur->source, cur_source);
+           evas_object_smart_member_cache_invalidate(o->cur->source, EINA_FALSE,
+                                                     EINA_FALSE, EINA_TRUE);
+         }
+     }
+   EINA_COW_WRITE_END(evas_object_proxy_cow, cur_source->proxy, proxy_source_write);
+
+   if (o->cur->source)
+     {
+        EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
+          state_write->source = NULL;
+        EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
+     }
+
+   if (o->cur->defmap)
+     {
+        EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
+          {
+             evas_map_free(state_write->defmap);
+             state_write->defmap = NULL;
+          }
+        EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
+     }
+
+   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_write)
+     proxy_write->is_proxy = EINA_FALSE;
+   EINA_COW_WRITE_END(evas_object_proxy_cow, cur_proxy->proxy, proxy_write);
+}
+
+void
+_evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
+{
+   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
+   Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
+   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EVAS_IMAGE_CLASS);
+
+   evas_object_image_file_set(eo_proxy, NULL, NULL);
+
+   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy, Evas_Object_Proxy_Data, proxy_write)
+     proxy_write->is_proxy = EINA_TRUE;
+   EINA_COW_WRITE_END(evas_object_proxy_cow, proxy->proxy, proxy_write);
+
+   EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
+     state_write->source = eo_src;
+   EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
+   o->load_error = EVAS_LOAD_ERROR_NONE;
+   o->proxyerror = 0;
+
+   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src_write)
+     {
+        if (!eina_list_data_find(proxy_src_write->proxies, eo_proxy))
+          proxy_src_write->proxies = eina_list_append(proxy_src_write->proxies,
+                                                      eo_proxy);
+        proxy_src_write->redraw = EINA_TRUE;
+     }
+   EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_src_write);
+}
+
+/* Some moron just set a proxy on a proxy.
+ * Give them some pixels.  A random color
+ */
+void
+_evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
+                        int x, int y, Eina_Bool do_async)
+{
+   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, EVAS_IMAGE_CLASS);
+   Evas_Object_Protected_Data *proxy;
+   Evas_Func *func;
+
+   if (!o->proxyerror)
+     {
+        ERR("Using recursive proxies! Don't set a proxy's source as another proxy!");
+        o->proxyerror = 1;
+     }
+
+   proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
+   func = proxy->layer->evas->engine.func;
+   func->context_color_set(output, context, 0, 0, 0, 255);
+   func->context_multiplier_unset(output, context);
+   func->context_render_op_set(output, context, proxy->cur->render_op);
+   func->rectangle_draw(output, context, surface, proxy->cur->geometry.x + x,
+                        proxy->cur->geometry.y + y,
+                        proxy->cur->geometry.w,
+                        proxy->cur->geometry.h,
+                        do_async);
+}
+
 #include "efl_canvas_proxy.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index 6c061c759f..19b16eeed5 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.eo
+++ b/src/lib/evas/canvas/efl_canvas_proxy.eo
@@ -67,7 +67,7 @@ class Efl.Canvas.Proxy (Evas.Image, Efl.Gfx.Base, Efl.Image, Efl.Gfx.Buffer, Efl
          set {}
          get {}
          values {
-            source: bool; [[Whether this object should pass events ($true) or not
+            repeat: bool; [[Whether this object should pass events ($true) or not
                             ($false) to its source.]]
          }
       }
diff --git a/src/lib/evas/canvas/evas_image_private.h b/src/lib/evas/canvas/evas_image_private.h
index 28ae8638bc..68fa686c2d 100644
--- a/src/lib/evas/canvas/evas_image_private.h
+++ b/src/lib/evas/canvas/evas_image_private.h
@@ -146,6 +146,12 @@ void _evas_image_proxy_error(Evas_Object *proxy, void *context, void *output, vo
 void _evas_image_3d_render(Evas *eo_e, Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, Evas_Image_Data *o, Evas_Canvas3D_Scene *scene);
 void _evas_image_3d_set(Evas_Object *eo_obj, Evas_Canvas3D_Scene *scene);
 void _evas_image_3d_unset(Evas_Object *eo_obj, Evas_Object_Protected_Data *image, Evas_Image_Data *o);
+Eina_Bool _evas_image_proxy_source_set(Eo *eo_obj, Evas_Object *eo_src);
+Evas_Object *_evas_image_proxy_source_get(const Eo *eo_obj);
+void _evas_image_proxy_source_clip_set(Eo *eo_obj, Eina_Bool source_clip);
+Eina_Bool _evas_image_proxy_source_clip_get(const Eo *eo_obj);
+void _evas_image_proxy_source_events_set(Eo *eo_obj, Eina_Bool source_events);
+Eina_Bool _evas_image_proxy_source_events_get(const Eo *eo_obj);
 Eina_Bool _evas_image_native_surface_set(Eo *eo_obj, Evas_Native_Surface *surf);
 Evas_Native_Surface *_evas_image_native_surface_get(const Evas_Object *eo_obj);
 
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index f9e6bc49a4..33f375c0be 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1944,120 +1944,6 @@ _evas_canvas_image_max_size_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int *
    return EINA_TRUE;
 }
 
-void
-_evas_image_proxy_unset(Evas_Object *proxy, Evas_Object_Protected_Data *cur_proxy, Evas_Image_Data *o)
-{
-   Evas_Object_Protected_Data *cur_source;
-
-   if (!o->cur->source) return;
-
-   cur_source = eo_data_scope_get(o->cur->source, EVAS_OBJECT_CLASS);
-
-   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_source_write)
-     {
-       proxy_source_write->proxies = eina_list_remove(proxy_source_write->proxies,
-						      proxy);
-
-       if (eina_list_count(proxy_source_write->proxies) == 0)
-          {
-             if (proxy_source_write->surface)
-               cur_proxy->layer->evas->engine.func->image_free(cur_proxy->layer->evas->engine.data.output,
-                                                               proxy_source_write->surface);
-             proxy_source_write->surface = NULL;
-             proxy_source_write->redraw = EINA_FALSE;
-          }
-
-       if (proxy_source_write->src_invisible)
-	 {
-	   proxy_source_write->src_invisible = EINA_FALSE;
-	   cur_source->changed_src_visible = EINA_TRUE;
-	   evas_object_change(o->cur->source, cur_source);
-	   evas_object_smart_member_cache_invalidate(o->cur->source, EINA_FALSE,
-						     EINA_FALSE, EINA_TRUE);
-	 }
-     }
-   EINA_COW_WRITE_END(evas_object_proxy_cow, cur_source->proxy, proxy_source_write);
-
-   if (o->cur->source)
-     {
-        EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
-          state_write->source = NULL;
-        EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
-     }
-
-   if (o->cur->defmap)
-     {
-        EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
-          {
-             evas_map_free(state_write->defmap);
-             state_write->defmap = NULL;
-          }
-        EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
-     }
-
-   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, cur_source->proxy, Evas_Object_Proxy_Data, proxy_write)
-     proxy_write->is_proxy = EINA_FALSE;
-   EINA_COW_WRITE_END(evas_object_proxy_cow, cur_proxy->proxy, proxy_write);
-}
-
-void
-_evas_image_proxy_set(Evas_Object *eo_proxy, Evas_Object *eo_src)
-{
-   Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJECT_CLASS);
-   Evas_Object_Protected_Data *proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, MY_CLASS);
-
-   evas_object_image_file_set(eo_proxy, NULL, NULL);
-
-   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, proxy->proxy, Evas_Object_Proxy_Data, proxy_write)
-     proxy_write->is_proxy = EINA_TRUE;
-   EINA_COW_WRITE_END(evas_object_proxy_cow, proxy->proxy, proxy_write);
-
-   EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
-     state_write->source = eo_src;
-   EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
-   o->load_error = EVAS_LOAD_ERROR_NONE;
-   o->proxyerror = 0;
-
-   EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src->proxy, Evas_Object_Proxy_Data, proxy_src_write)
-     {
-        if (!eina_list_data_find(proxy_src_write->proxies, eo_proxy))
-          proxy_src_write->proxies = eina_list_append(proxy_src_write->proxies,
-                                                      eo_proxy);
-        proxy_src_write->redraw = EINA_TRUE;
-     }
-   EINA_COW_WRITE_END(evas_object_proxy_cow, src->proxy, proxy_src_write);
-}
-
-/* Some moron just set a proxy on a proxy.
- * Give them some pixels.  A random color
- */
-void
-_evas_image_proxy_error(Evas_Object *eo_proxy, void *context, void *output, void *surface,
-             int x, int y, Eina_Bool do_async)
-{
-   Evas_Image_Data *o = eo_data_scope_get(eo_proxy, MY_CLASS);
-   Evas_Object_Protected_Data *proxy;
-   Evas_Func *func;
-
-   if (!o->proxyerror)
-     {
-        ERR("Using recursive proxies! Don't set a proxy's source as another proxy!");
-        o->proxyerror = 1;
-     }
-
-   proxy = eo_data_scope_get(eo_proxy, EVAS_OBJECT_CLASS);
-   func = proxy->layer->evas->engine.func;
-   func->context_color_set(output, context, 0, 0, 0, 255);
-   func->context_multiplier_unset(output, context);
-   func->context_render_op_set(output, context, proxy->cur->render_op);
-   func->rectangle_draw(output, context, surface, proxy->cur->geometry.x + x,
-                        proxy->cur->geometry.y + y,
-                        proxy->cur->geometry.w,
-                        proxy->cur->geometry.h,
-                        do_async);
-}
-
 static void
 evas_object_image_unload(Evas_Object *eo_obj, Eina_Bool dirty)
 {
@@ -4021,13 +3907,6 @@ evas_object_image_filled_resize_listener(void *data EINA_UNUSED, Evas *e EINA_UN
    evas_object_image_fill_set(obj, 0, 0, w, h);
 }
 
-Evas_Object *
-_evas_object_image_source_get(Evas_Object *eo_obj)
-{
-   Evas_Image_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
-   return o->cur->source;
-}
-
 Eina_Bool
 _evas_object_image_preloading_get(const Evas_Object *eo_obj)
 {
@@ -4789,42 +4668,49 @@ EAPI Eina_Bool
 evas_object_image_source_set(Evas_Object *eo, Evas_Object *src)
 {
    EVAS_OBJECT_LEGACY_API(eo, EINA_FALSE);
-   return efl_canvas_proxy_source_set(eo, src);
+   return _evas_image_proxy_source_set(eo, src);
 }
 
 EAPI Evas_Object *
 evas_object_image_source_get(const Evas_Object *eo)
 {
    EVAS_OBJECT_LEGACY_API(eo, NULL);
-   return efl_canvas_proxy_source_get(eo);
+   return _evas_image_proxy_source_get(eo);
+}
+
+EAPI Eina_Bool
+evas_object_image_source_unset(Evas_Object *eo_obj)
+{
+   EVAS_OBJECT_LEGACY_API(eo_obj, EINA_FALSE);
+   return _evas_image_proxy_source_set(eo_obj, NULL);
 }
 
 EAPI void
 evas_object_image_source_clip_set(Evas_Object *eo, Eina_Bool source_clip)
 {
    EVAS_OBJECT_LEGACY_API(eo);
-   efl_canvas_proxy_source_clip_set(eo, source_clip);
+   _evas_image_proxy_source_clip_set(eo, source_clip);
 }
 
 EAPI Eina_Bool
 evas_object_image_source_clip_get(const Evas_Object *eo)
 {
    EVAS_OBJECT_LEGACY_API(eo, EINA_FALSE);
-   return efl_canvas_proxy_source_clip_get(eo);
+   return _evas_image_proxy_source_clip_get(eo);
 }
 
 EAPI void
 evas_object_image_source_events_set(Evas_Object *eo, Eina_Bool repeat)
 {
    EVAS_OBJECT_LEGACY_API(eo);
-   efl_canvas_proxy_source_events_set(eo, repeat);
+   _evas_image_proxy_source_events_set(eo, repeat);
 }
 
 EAPI Eina_Bool
 evas_object_image_source_events_get(const Evas_Object *eo)
 {
    EVAS_OBJECT_LEGACY_API(eo, EINA_FALSE);
-   return efl_canvas_proxy_source_events_get(eo);
+   return _evas_image_proxy_source_events_get(eo);
 }
 
 EAPI void
@@ -4883,13 +4769,6 @@ evas_object_image_source_visible_get(const Evas_Object *eo)
    return visible;
 }
 
-EAPI Eina_Bool
-evas_object_image_source_unset(Evas_Object *eo_obj)
-{
-   EVAS_OBJECT_LEGACY_API(eo_obj, EINA_FALSE);
-   return efl_canvas_proxy_source_set(eo_obj, NULL);
-}
-
 #include "canvas/evas_image.eo.c"
 
 /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 2eb3bffad6..f3678e84f2 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1872,7 +1872,7 @@ evas_render_proxy_subrender(Evas *eo_e, Evas_Object *eo_source, Evas_Object *eo_
         ENFN->context_free(ENDT, ctx);
 
         if (eo_isa(eo_proxy, EVAS_IMAGE_CLASS))
-          source_clip = efl_canvas_proxy_source_clip_get(eo_proxy);
+          source_clip = _evas_image_proxy_source_clip_get(eo_proxy);
 
         Evas_Proxy_Render_Data proxy_render_data = {
              .eo_proxy = eo_proxy,
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 9683e5c576..525ff1da9e 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1927,6 +1927,7 @@ void _evas_device_unref(Evas_Device *dev);
 Eina_Bool evas_vg_loader_svg(Evas_Object *vg, const Eina_File *f, const char *key EINA_UNUSED);
 
 void *_evas_object_image_surface_get(Evas_Object *eo, Evas_Object_Protected_Data *obj);
+Eina_Bool _evas_image_proxy_source_clip_get(const Eo *eo_obj);
 
 extern Eina_Cow *evas_object_proxy_cow;
 extern Eina_Cow *evas_object_map_cow;