forked from enlightenment/efl
Evas: Rename Evas.Filter to Efl.Canvas.Filter.Internal
Trying to hide the name Evas from the public EO API...
This commit is contained in:
parent
62b0817880
commit
3df8e89e9a
|
@ -41,7 +41,7 @@ evas_eolian_pub_files = \
|
||||||
lib/evas/canvas/efl_canvas_surface_tbm.eo \
|
lib/evas/canvas/efl_canvas_surface_tbm.eo \
|
||||||
lib/evas/canvas/efl_canvas_surface_x11.eo \
|
lib/evas/canvas/efl_canvas_surface_x11.eo \
|
||||||
lib/evas/canvas/efl_canvas_surface_wayland.eo \
|
lib/evas/canvas/efl_canvas_surface_wayland.eo \
|
||||||
lib/evas/canvas/evas_filter.eo \
|
lib/evas/canvas/efl_canvas_filter_internal.eo \
|
||||||
lib/evas/canvas/evas_smart_clipped.eo \
|
lib/evas/canvas/evas_smart_clipped.eo \
|
||||||
lib/evas/canvas/efl_event_input.eo \
|
lib/evas/canvas/efl_event_input.eo \
|
||||||
lib/evas/canvas/efl_event_key.eo \
|
lib/evas/canvas/efl_event_key.eo \
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
|
mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Eo.Base)
|
||||||
{
|
{
|
||||||
[[Evas internal implementation of filters.]]
|
[[Evas internal implementation of filters.]]
|
||||||
|
|
||||||
eo_prefix: evas;
|
eo_prefix: evas;
|
||||||
|
data: Evas_Filter_Data;
|
||||||
|
|
||||||
methods {
|
methods {
|
||||||
@property filter_changed @protected {
|
@property filter_changed @protected {
|
||||||
|
@ -22,11 +23,11 @@ mixin Evas.Filter (Efl.Gfx.Filter, Eo.Base)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
filter_input_alpha @protected @virtual_pure {
|
filter_input_alpha @protected @virtual_pure {
|
||||||
[[Called by Evas.Filter to determine whether the input is alpha or rgba.]]
|
[[Called by Efl.Canvas.Filter.Internal to determine whether the input is alpha or rgba.]]
|
||||||
return: bool;
|
return: bool;
|
||||||
}
|
}
|
||||||
filter_input_render @protected @virtual_pure {
|
filter_input_render @protected @virtual_pure {
|
||||||
[[Called by Evas.Filter when the parent class must render the input.
|
[[Called by Efl.Canvas.Filter.Internal when the parent class must render the input.
|
||||||
;
|
;
|
||||||
]]
|
]]
|
||||||
return: bool; [[Indicates success from the object render function.]]
|
return: bool; [[Indicates success from the object render function.]]
|
|
@ -1,4 +1,4 @@
|
||||||
abstract Efl.Canvas.Image.Internal (Evas.Object, Evas.Filter,
|
abstract Efl.Canvas.Image.Internal (Evas.Object, Efl.Canvas.Filter.Internal,
|
||||||
Efl.Image, Efl.Gfx.Buffer,
|
Efl.Image, Efl.Gfx.Buffer,
|
||||||
Efl.Gfx.Fill, Efl.Gfx.View,
|
Efl.Gfx.Fill, Efl.Gfx.View,
|
||||||
Efl.Orientation, Efl.Flipable,
|
Efl.Orientation, Efl.Flipable,
|
||||||
|
@ -38,8 +38,8 @@ abstract Efl.Canvas.Image.Internal (Evas.Object, Evas.Filter,
|
||||||
Efl.Gfx.Fill.fill_auto.set;
|
Efl.Gfx.Fill.fill_auto.set;
|
||||||
Efl.Gfx.Filter.filter_program.set;
|
Efl.Gfx.Filter.filter_program.set;
|
||||||
Efl.Gfx.View.view_size.get;
|
Efl.Gfx.View.view_size.get;
|
||||||
Evas.Filter.filter_input_alpha;
|
Efl.Canvas.Filter.Internal.filter_input_alpha;
|
||||||
Evas.Filter.filter_input_render;
|
Efl.Canvas.Filter.Internal.filter_input_render;
|
||||||
Evas.Filter.filter_dirty;
|
Efl.Canvas.Filter.Internal.filter_dirty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
#define EVAS_FILTER_PROTECTED
|
#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
|
||||||
|
|
||||||
#include "evas_common_private.h"
|
#include "evas_common_private.h"
|
||||||
#include "evas_private.h"
|
#include "evas_private.h"
|
||||||
#include "../../lib/efl/interfaces/efl_gfx_filter.eo.h"
|
#include "../../lib/efl/interfaces/efl_gfx_filter.eo.h"
|
||||||
#include "evas_filter.eo.h"
|
#include "efl_canvas_filter_internal.eo.h"
|
||||||
#include "evas_filter.h"
|
#include "evas_filter.h"
|
||||||
|
|
||||||
#define MY_CLASS EVAS_FILTER_MIXIN
|
#define MY_CLASS EFL_CANVAS_FILTER_INTERNAL_MIXIN
|
||||||
|
|
||||||
#define ENFN obj->layer->evas->engine.func
|
#define ENFN obj->layer->evas->engine.func
|
||||||
#define ENDT obj->layer->evas->engine.data.output
|
#define ENDT obj->layer->evas->engine.data.output
|
||||||
|
@ -193,7 +193,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
|
||||||
obj->cur->clipper->cur->cache.clip.b,
|
obj->cur->clipper->cur->cache.clip.b,
|
||||||
obj->cur->clipper->cur->cache.clip.a);
|
obj->cur->clipper->cur->cache.clip.a);
|
||||||
else
|
else
|
||||||
ENFN->context_multiplier_unset(output, context);
|
ENFN->context_multiplier_unset(output, context);
|
||||||
|
|
||||||
if (!pd->data->chain)
|
if (!pd->data->chain)
|
||||||
{
|
{
|
||||||
|
@ -354,8 +354,8 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
const char *code, const char *name)
|
const char *code, const char *name)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
Evas_Filter_Program *pgm = NULL;
|
Evas_Filter_Program *pgm = NULL;
|
||||||
|
@ -369,47 +369,47 @@ _evas_filter_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
|
|
||||||
evas_object_async_block(obj);
|
evas_object_async_block(obj);
|
||||||
fcow = FCOW_BEGIN(pd);
|
fcow = FCOW_BEGIN(pd);
|
||||||
{
|
{
|
||||||
// Parse filter program
|
// Parse filter program
|
||||||
evas_filter_program_del(fcow->chain);
|
evas_filter_program_del(fcow->chain);
|
||||||
eina_stringshare_replace(&fcow->name, name);
|
eina_stringshare_replace(&fcow->name, name);
|
||||||
if (code)
|
if (code)
|
||||||
{
|
{
|
||||||
alpha = evas_filter_input_alpha(eo_obj);
|
alpha = evas_filter_input_alpha(eo_obj);
|
||||||
pgm = evas_filter_program_new(fcow->name, alpha);
|
pgm = evas_filter_program_new(fcow->name, alpha);
|
||||||
evas_filter_program_source_set_all(pgm, fcow->sources);
|
evas_filter_program_source_set_all(pgm, fcow->sources);
|
||||||
evas_filter_program_data_set_all(pgm, fcow->data);
|
evas_filter_program_data_set_all(pgm, fcow->data);
|
||||||
evas_filter_program_state_set(pgm, eo_obj, obj,
|
evas_filter_program_state_set(pgm, eo_obj, obj,
|
||||||
fcow->state.cur.name, fcow->state.cur.value,
|
fcow->state.cur.name, fcow->state.cur.value,
|
||||||
fcow->state.next.name, fcow->state.next.value,
|
fcow->state.next.name, fcow->state.next.value,
|
||||||
fcow->state.pos);
|
fcow->state.pos);
|
||||||
if (!evas_filter_program_parse(pgm, code))
|
if (!evas_filter_program_parse(pgm, code))
|
||||||
{
|
{
|
||||||
ERR("Parsing failed!");
|
ERR("Parsing failed!");
|
||||||
evas_filter_program_del(pgm);
|
evas_filter_program_del(pgm);
|
||||||
pgm = NULL;
|
pgm = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fcow->chain = pgm;
|
fcow->chain = pgm;
|
||||||
fcow->changed = EINA_TRUE;
|
fcow->changed = EINA_TRUE;
|
||||||
fcow->invalid = (pgm == NULL);
|
fcow->invalid = (pgm == NULL);
|
||||||
eina_stringshare_replace(&fcow->code, code);
|
eina_stringshare_replace(&fcow->code, code);
|
||||||
}
|
}
|
||||||
FCOW_END(fcow, pd);
|
FCOW_END(fcow, pd);
|
||||||
|
|
||||||
evas_filter_dirty(eo_obj);
|
evas_filter_dirty(eo_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char **code, const char **name)
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char **code, const char **name)
|
||||||
{
|
{
|
||||||
if (code) *code = pd->data->code;
|
if (code) *code = pd->data->code;
|
||||||
if (name) *name = pd->data->name;
|
if (name) *name = pd->data->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
const char *name, Efl_Gfx *eo_source)
|
const char *name, Efl_Gfx *eo_source)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
|
Evas_Filter_Proxy_Binding *pb, *pb_old = NULL;
|
||||||
|
@ -491,8 +491,8 @@ update:
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Gfx *
|
EOLIAN static Efl_Gfx *
|
||||||
_evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
||||||
const char * name)
|
const char * name)
|
||||||
{
|
{
|
||||||
Evas_Filter_Proxy_Binding *pb = eina_hash_find(pd->data->sources, name);
|
Evas_Filter_Proxy_Binding *pb = eina_hash_find(pd->data->sources, name);
|
||||||
if (!pb) return NULL;
|
if (!pb) return NULL;
|
||||||
|
@ -500,10 +500,10 @@ _evas_filter_efl_gfx_filter_filter_source_get(Eo *obj EINA_UNUSED, Evas_Filter_D
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
const char *cur_state, double cur_val,
|
const char *cur_state, double cur_val,
|
||||||
const char *next_state, double next_val,
|
const char *next_state, double next_val,
|
||||||
double pos)
|
double pos)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
|
|
||||||
|
@ -534,10 +534,10 @@ _evas_filter_efl_gfx_filter_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
||||||
const char **cur_state, double *cur_val,
|
const char **cur_state, double *cur_val,
|
||||||
const char **next_state, double *next_val,
|
const char **next_state, double *next_val,
|
||||||
double *pos)
|
double *pos)
|
||||||
{
|
{
|
||||||
if (cur_state) *cur_state = pd->data->state.cur.name;
|
if (cur_state) *cur_state = pd->data->state.cur.name;
|
||||||
if (cur_val) *cur_val = pd->data->state.cur.value;
|
if (cur_val) *cur_val = pd->data->state.cur.value;
|
||||||
|
@ -547,8 +547,8 @@ _evas_filter_efl_gfx_filter_filter_state_get(Eo *obj EINA_UNUSED, Evas_Filter_Da
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd,
|
||||||
int *l, int *r, int *t, int *b)
|
int *l, int *r, int *t, int *b)
|
||||||
{
|
{
|
||||||
if (!pd->data->chain)
|
if (!pd->data->chain)
|
||||||
{
|
{
|
||||||
|
@ -562,7 +562,7 @@ _evas_filter_efl_gfx_filter_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filt
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
|
_efl_canvas_filter_internal_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
|
||||||
{
|
{
|
||||||
if ((evas_object_filter_cow_default != pd->data) && (pd->data->changed != val))
|
if ((evas_object_filter_cow_default != pd->data) && (pd->data->changed != val))
|
||||||
{
|
{
|
||||||
|
@ -573,7 +573,7 @@ _evas_filter_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Ei
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
|
_efl_canvas_filter_internal_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val)
|
||||||
{
|
{
|
||||||
if (pd->data->invalid != val)
|
if (pd->data->invalid != val)
|
||||||
{
|
{
|
||||||
|
@ -584,7 +584,7 @@ _evas_filter_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Ei
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eo_Base *
|
EOLIAN static Eo_Base *
|
||||||
_evas_filter_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
_efl_canvas_filter_internal_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
||||||
{
|
{
|
||||||
Eo *obj = NULL;
|
Eo *obj = NULL;
|
||||||
|
|
||||||
|
@ -596,7 +596,7 @@ _evas_filter_eo_base_constructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
_efl_canvas_filter_internal_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
Evas_Filter_Data_Binding *db;
|
Evas_Filter_Data_Binding *db;
|
||||||
|
@ -610,7 +610,7 @@ _evas_filter_eo_base_destructor(Eo *eo_obj, Evas_Filter_Data *pd)
|
||||||
if (!pd->data->async)
|
if (!pd->data->async)
|
||||||
ENFN->image_free(ENDT, pd->data->output);
|
ENFN->image_free(ENDT, pd->data->output);
|
||||||
else
|
else
|
||||||
evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
|
evas_unref_queue_image_put(obj->layer->evas, pd->data->output);
|
||||||
}
|
}
|
||||||
eina_hash_free(pd->data->sources);
|
eina_hash_free(pd->data->sources);
|
||||||
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
|
EINA_INLIST_FOREACH_SAFE(pd->data->data, il, db)
|
||||||
|
@ -637,9 +637,9 @@ finish:
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
const char *name, const char *value,
|
const char *name, const char *value,
|
||||||
Eina_Bool execute)
|
Eina_Bool execute)
|
||||||
{
|
{
|
||||||
Evas_Filter_Data_Binding *db, *found = NULL;
|
Evas_Filter_Data_Binding *db, *found = NULL;
|
||||||
Evas_Object_Filter_Data *fcow;
|
Evas_Object_Filter_Data *fcow;
|
||||||
|
@ -662,33 +662,33 @@ _evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, Evas_Filter_Data *pd,
|
||||||
}
|
}
|
||||||
|
|
||||||
fcow = FCOW_BEGIN(pd);
|
fcow = FCOW_BEGIN(pd);
|
||||||
{
|
{
|
||||||
if (found)
|
if (found)
|
||||||
{
|
{
|
||||||
// Note: we are keeping references to NULL values here.
|
// Note: we are keeping references to NULL values here.
|
||||||
eina_stringshare_replace(&found->value, value);
|
eina_stringshare_replace(&found->value, value);
|
||||||
found->execute = execute;
|
found->execute = execute;
|
||||||
}
|
}
|
||||||
else if (value)
|
else if (value)
|
||||||
{
|
{
|
||||||
db = calloc(1, sizeof(Evas_Filter_Data_Binding));
|
db = calloc(1, sizeof(Evas_Filter_Data_Binding));
|
||||||
db->name = eina_stringshare_add(name);
|
db->name = eina_stringshare_add(name);
|
||||||
db->value = eina_stringshare_add(value);
|
db->value = eina_stringshare_add(value);
|
||||||
db->execute = execute;
|
db->execute = execute;
|
||||||
fcow->data = eina_inlist_append(fcow->data, EINA_INLIST_GET(db));
|
fcow->data = eina_inlist_append(fcow->data, EINA_INLIST_GET(db));
|
||||||
}
|
}
|
||||||
evas_filter_program_data_set_all(fcow->chain, fcow->data);
|
evas_filter_program_data_set_all(fcow->chain, fcow->data);
|
||||||
fcow->changed = 1;
|
fcow->changed = 1;
|
||||||
}
|
}
|
||||||
FCOW_END(fcow, pd);
|
FCOW_END(fcow, pd);
|
||||||
|
|
||||||
evas_filter_dirty(eo_obj);
|
evas_filter_dirty(eo_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_filter_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
_efl_canvas_filter_internal_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd,
|
||||||
const char *name, const char **value,
|
const char *name, const char **value,
|
||||||
Eina_Bool *execute)
|
Eina_Bool *execute)
|
||||||
{
|
{
|
||||||
Evas_Filter_Data_Binding *db;
|
Evas_Filter_Data_Binding *db;
|
||||||
|
|
||||||
|
@ -710,9 +710,9 @@ _evas_filter_efl_gfx_filter_filter_data_get(Eo *obj EINA_UNUSED, Evas_Filter_Dat
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void *
|
EOLIAN static void *
|
||||||
_evas_filter_filter_output_buffer_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd)
|
_efl_canvas_filter_internal_filter_output_buffer_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->data->output;
|
return pd->data->output;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "evas_filter.eo.c"
|
#include "canvas/efl_canvas_filter_internal.eo.c"
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
* new efl_canvas classes (image, snapshot, proxy, ...)
|
* new efl_canvas classes (image, snapshot, proxy, ...)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define EVAS_FILTER_PROTECTED
|
#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
|
||||||
#define EVAS_OBJECT_PROTECTED
|
#define EVAS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include "evas_common_private.h"
|
#include "evas_common_private.h"
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
#include "../common/evas_convert_yuv.h"
|
#include "../common/evas_convert_yuv.h"
|
||||||
|
|
||||||
#include "canvas/evas_image.eo.h"
|
#include "canvas/evas_image.eo.h"
|
||||||
#include "evas_filter.eo.h"
|
#include "canvas/efl_canvas_filter_internal.eo.h"
|
||||||
#include "evas_filter.h"
|
#include "evas_filter.h"
|
||||||
|
|
||||||
/* private struct for rectangle object internal data */
|
/* private struct for rectangle object internal data */
|
||||||
|
|
|
@ -1621,7 +1621,7 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_canvas_image_internal_evas_filter_filter_dirty(Eo *eo_obj, Evas_Image_Data *o)
|
_efl_canvas_image_internal_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Image_Data *o)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
|
|
||||||
|
@ -1630,7 +1630,7 @@ _efl_canvas_image_internal_evas_filter_filter_dirty(Eo *eo_obj, Evas_Image_Data
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_efl_canvas_image_internal_evas_filter_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o EINA_UNUSED)
|
_efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -1644,7 +1644,7 @@ _efl_canvas_image_internal_efl_gfx_filter_filter_program_set(Eo *obj, Evas_Image
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_efl_canvas_image_internal_evas_filter_filter_input_render(Eo *eo_obj, Evas_Image_Data *o,
|
_efl_canvas_image_internal_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj, Evas_Image_Data *o,
|
||||||
void *_filter, void *context,
|
void *_filter, void *context,
|
||||||
int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
|
int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
|
||||||
Eina_Bool do_async)
|
Eina_Bool do_async)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#define EVAS_FILTER_PROTECTED
|
#define EFL_CANVAS_FILTER_INTERNAL_PROTECTED
|
||||||
|
|
||||||
#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
|
#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
|
||||||
#include "evas_private.h"
|
#include "evas_private.h"
|
||||||
|
|
||||||
#include "../efl/interfaces/efl_gfx_filter.eo.h"
|
#include "../efl/interfaces/efl_gfx_filter.eo.h"
|
||||||
#include "evas_filter.eo.h"
|
#include "efl_canvas_filter_internal.eo.h"
|
||||||
#include "evas_filter.h"
|
#include "evas_filter.h"
|
||||||
|
|
||||||
#define MY_CLASS EVAS_TEXT_CLASS
|
#define MY_CLASS EVAS_TEXT_CLASS
|
||||||
|
@ -1663,7 +1663,7 @@ evas_font_draw_async_check(Evas_Object_Protected_Data *obj,
|
||||||
/* ugly binding between evas_fitler_mixin.c and this object */
|
/* ugly binding between evas_fitler_mixin.c and this object */
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_evas_text_evas_filter_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
|
_evas_text_efl_canvas_filter_internal_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
|
||||||
{
|
{
|
||||||
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS);
|
||||||
|
|
||||||
|
@ -1674,13 +1674,13 @@ _evas_text_evas_filter_filter_dirty(Eo *eo_obj, Evas_Text_Data *o)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_evas_text_evas_filter_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o EINA_UNUSED)
|
_evas_text_efl_canvas_filter_internal_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_evas_text_evas_filter_filter_input_render(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o,
|
_evas_text_efl_canvas_filter_internal_filter_input_render(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o,
|
||||||
void *_filter, void *drawctx,
|
void *_filter, void *drawctx,
|
||||||
int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
|
int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
|
||||||
Eina_Bool do_async)
|
Eina_Bool do_async)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Evas.Filter)
|
class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Efl.Canvas.Filter.Internal)
|
||||||
{
|
{
|
||||||
legacy_prefix: evas_object_text;
|
legacy_prefix: evas_object_text;
|
||||||
eo_prefix: evas_obj_text;
|
eo_prefix: evas_obj_text;
|
||||||
|
@ -261,9 +261,9 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Evas.Filter)
|
||||||
Efl.Text.Properties.font_source.get;
|
Efl.Text.Properties.font_source.get;
|
||||||
Efl.Text.Properties.font_source.set;
|
Efl.Text.Properties.font_source.set;
|
||||||
Efl.Gfx.Filter.filter_program.set;
|
Efl.Gfx.Filter.filter_program.set;
|
||||||
Evas.Filter.filter_input_alpha;
|
Efl.Canvas.Filter.Internal.filter_input_alpha;
|
||||||
Evas.Filter.filter_input_render;
|
Efl.Canvas.Filter.Internal.filter_input_render;
|
||||||
Evas.Filter.filter_dirty;
|
Efl.Canvas.Filter.Internal.filter_dirty;
|
||||||
Evas.Object.paragraph_direction.set;
|
Evas.Object.paragraph_direction.set;
|
||||||
Evas.Object.paragraph_direction.get;
|
Evas.Object.paragraph_direction.get;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue