Edje & evas filters: Properly pass data from EDC to Lua

Also fix a few issues

3 files changed, 22 insertions, 11 deletions

diff --git a/src/lib/evas/canvas/evas_filter.eo b/src/lib/evas/canvas/evas_filter.eo
index 2750e10..b461de9 100644
--- a/src/lib/evas/canvas/evas_filter.eo
+++ b/src/lib/evas/canvas/evas_filter.eo
@@ -65,6 +65,7 @@ mixin Evas.Filter (Efl.Gfx.Filter)
       Efl.Gfx.Filter.padding.get;
       Efl.Gfx.Filter.source_set;
       Efl.Gfx.Filter.source_get;
+      Efl.Gfx.Filter.data_set;
       @virtual .input_alpha;
       @virtual .input_render;
       @virtual .dirty;
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 5a76b1e..5c47468 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -520,7 +520,7 @@ _evas_filter_efl_gfx_filter_data_set(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
           return;
      }
 
-   EINA_COW_WRITE_BEGIN(evas_object_filter_cow, fcow, Evas_Object_Filter_Data, fcow)
+   EINA_COW_WRITE_BEGIN(evas_object_filter_cow, pd->data, Evas_Object_Filter_Data, fcow)
      {
         if (!fcow->data)
           fcow->data = eina_hash_string_small_new(free);
@@ -529,7 +529,7 @@ _evas_filter_efl_gfx_filter_data_set(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
           evas_filter_program_data_set_all(fcow->chain, fcow->data);
         fcow->changed = 1;
      }
-   EINA_COW_WRITE_END(evas_object_filter_cow, fcow, fcow);
+   EINA_COW_WRITE_END(evas_object_filter_cow, pd->data, fcow);
 }
 
 #include "evas_filter.eo.c"
diff --git a/src/lib/evas/filters/evas_filter_parser.c b/src/lib/evas/filters/evas_filter_parser.c
index 2352d5d..58f75b8 100644
--- a/src/lib/evas/filters/evas_filter_parser.c
+++ b/src/lib/evas/filters/evas_filter_parser.c
@@ -2570,7 +2570,7 @@ _legacy_strdup(const char *str)
 }
 #endif
 
-static void
+static Eina_Bool
 _filter_program_state_set(Evas_Filter_Program *pgm)
 {
    lua_State *L = pgm->L;
@@ -2646,8 +2646,12 @@ _filter_program_state_set(Evas_Filter_Program *pgm)
                {
                   if ((value[0] == '-') && (value[1] == '-') && value[2] == '\n')
                     {
-                       int i = luaL_dostring(L, value);
-                       ERR("i %d", i);
+                       if (luaL_dostring(L, value) != 0)
+                         {
+                            eina_iterator_free(it);
+                            ERR("Failed to run value: %s", lua_tostring(L, -1));
+                            return EINA_FALSE;
+                         }
                     }
                   else
                     {
@@ -2658,17 +2662,20 @@ _filter_program_state_set(Evas_Filter_Program *pgm)
              else
                {
                   lua_pushnil(L);
+                  lua_setglobal(L, name);
                }
           }
         eina_iterator_free(it);
      }
 
+   return EINA_TRUE;
+
 #undef JOINC
 #undef SETFIELD
 #undef SETCOLOR
 }
 
-static void
+static Eina_Bool
 _filter_program_reset(Evas_Filter_Program *pgm)
 {
    Evas_Filter_Instruction *instr;
@@ -2696,7 +2703,7 @@ _filter_program_reset(Evas_Filter_Program *pgm)
    _filter_program_buffers_set(pgm);
 
    // Reset state table
-   _filter_program_state_set(pgm);
+   return _filter_program_state_set(pgm);
 }
 
 /** Parse a style program */
@@ -2733,10 +2740,13 @@ evas_filter_program_parse(Evas_Filter_Program *pgm, const char *str)
    if (ok)
      {
         pgm->lua_func = luaL_ref(L, LUA_REGISTRYINDEX);
-        _filter_program_reset(pgm);
-        lua_getglobal(L, _lua_errfunc_name);
-        lua_rawgeti(L, LUA_REGISTRYINDEX, pgm->lua_func);
-        ok = !lua_pcall(L, 0, LUA_MULTRET, -2);
+        ok =_filter_program_reset(pgm);
+        if (ok)
+          {
+             lua_getglobal(L, _lua_errfunc_name);
+             lua_rawgeti(L, LUA_REGISTRYINDEX, pgm->lua_func);
+             ok = !lua_pcall(L, 0, LUA_MULTRET, -2);
+          }
      }
 
    if (!ok)