dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl: change name of animator,tick event in C.

This commit is contained in:
Cedric Bail 2016-05-18 01:56:21 -07:00
parent 443948e3bd
commit 45bc4f30eb
12 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/elementary/test_anim.c
View File

@ -93,5 +93,5 @@ test_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
evas_object_resize(win, 480, 800); evas_object_resize(win, 480, 800);
evas_object_show(win); evas_object_show(win);
eo_event_callback_add(win, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _anim_tick, NULL); eo_event_callback_add(win, EFL_EVENT_ANIMATOR_TICK, _anim_tick, NULL);
} }

6
src/lib/ecore_evas/ecore_evas.c
View File

@ -3104,7 +3104,7 @@ ecore_evas_animator_tick(Ecore_Evas *ee, Eina_Rectangle *viewport)
a.update_area = *viewport; a.update_area = *viewport;
} }
eo_event_callback_call(ee->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, &a); eo_event_callback_call(ee->evas, EFL_EVENT_ANIMATOR_TICK, &a);
// FIXME: We do not support partial animator in the subcanvas // FIXME: We do not support partial animator in the subcanvas
EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee) EINA_LIST_FOREACH(ee->sub_ecore_evas, l, subee)
@ -3164,7 +3164,7 @@ _check_animator_event_catcher_add(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++) for (i = 0; array[i].desc != NULL; i++)
{ {
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK) if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{ {
if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE; if (ee->anim_count++ > 0) return EO_CALLBACK_CONTINUE;
INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title); INF("Setting up animator for %p from '%s' with title '%s'.", ee->evas, ee->driver, ee->prop.title);
@ -3200,7 +3200,7 @@ _check_animator_event_catcher_del(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++) for (i = 0; array[i].desc != NULL; i++)
{ {
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK) if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{ {
if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE; if ((--ee->anim_count) > 0) return EO_CALLBACK_CONTINUE;

2
src/lib/edje/edje_load.c
View File

@ -1725,7 +1725,7 @@ _edje_file_del(Edje *ed)
free(runp); free(runp);
} }
_edje_animators = eina_list_remove(_edje_animators, ed); _edje_animators = eina_list_remove(_edje_animators, ed);
eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
ecore_animator_del(ed->animator); ecore_animator_del(ed->animator);
ed->animator = NULL; ed->animator = NULL;

4
src/lib/edje/edje_program.c
View File

@ -433,7 +433,7 @@ _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp)
ed->actions = eina_list_remove(ed->actions, runp); ed->actions = eina_list_remove(ed->actions, runp);
if (!ed->actions) if (!ed->actions)
{ {
eo_event_callback_del(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); eo_event_callback_del(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
ecore_animator_del(ed->animator); ecore_animator_del(ed->animator);
ed->animator = NULL; ed->animator = NULL;
} }
@ -737,7 +737,7 @@ low_mem_current:
if (!ed->actions) if (!ed->actions)
{ {
if (ed->canvas_animator) if (ed->canvas_animator)
eo_event_callback_add(ed->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed); eo_event_callback_add(ed->obj, EFL_EVENT_ANIMATOR_TICK, _edje_timer_cb, ed);
else else
ed->animator = ecore_animator_add(_edje_animator_cb, ed); ed->animator = ecore_animator_add(_edje_animator_cb, ed);
} }

1
src/lib/efl/interfaces/efl_animator.eo
View File

@ -6,6 +6,7 @@ struct Efl.Event.Animator_Tick {
interface Efl.Animator { interface Efl.Animator {
eo_prefix: efl_animator; eo_prefix: efl_animator;
event_prefix: efl;
events { events {
animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]] animator,tick: Efl.Event.Animator_Tick; [[Animator tick synchronized with screen vsync if possible.]]
} }

4
src/lib/elementary/elc_naviframe.c
View File

@ -1437,7 +1437,7 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
free(nfo); free(nfo);
} }
eo_event_callback_del(nfd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, nfd); eo_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd);
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
} }
@ -1522,7 +1522,7 @@ static void
_schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd) _schedule_deferred(Elm_Naviframe_Op *nfo, Elm_Naviframe_Data *sd)
{ {
if (!sd->ops) if (!sd->ops)
eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _deferred, sd); eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, sd);
sd->ops = eina_list_append(sd->ops, nfo); sd->ops = eina_list_append(sd->ops, nfo);
} }

4
src/lib/elementary/elm_genlist.c
View File

@ -2432,7 +2432,7 @@ _elm_genlist_tree_effect_setup(Elm_Genlist_Data *sd)
evas_object_stack_below(sd->event_block_rect, sd->stack[1]); evas_object_stack_below(sd->event_block_rect, sd->stack[1]);
evas_object_show(sd->event_block_rect); evas_object_show(sd->event_block_rect);
sd->start_time = ecore_time_get(); sd->start_time = ecore_time_get();
eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
sd->tree_effect_animator = 1; sd->tree_effect_animator = 1;
return EINA_TRUE; return EINA_TRUE;
} }
@ -2445,7 +2445,7 @@ _elm_genlist_tree_effect_stop(Elm_Genlist_Data *sd)
if (sd->tree_effect_animator) if (sd->tree_effect_animator)
{ {
sd->tree_effect_animator = 0; sd->tree_effect_animator = 0;
eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj); eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _tree_effect_animator_cb, sd->obj);
} }
} }

6
src/lib/elementary/elm_interface_scrollable.c
View File

@ -31,12 +31,12 @@
} }
#define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \ #define ELM_ANIMATOR_CONNECT(Obj, Bool, Callback, Data) \
eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
eo_event_callback_add(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ eo_event_callback_add(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 1; Bool = 1;
#define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \ #define ELM_ANIMATOR_DISCONNECT(Obj, Bool, Callback, Data) \
eo_event_callback_del(Obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, Callback, Data); \ eo_event_callback_del(Obj, EFL_EVENT_ANIMATOR_TICK, Callback, Data); \
Bool = 0; Bool = 0;
static const char SIG_CHANGED[] = "changed"; static const char SIG_CHANGED[] = "changed";

6
src/lib/elementary/elm_map.c
View File

@ -1210,9 +1210,9 @@ _zoom_animator_set(Elm_Map_Data *sd,
Eina_Bool r = EINA_FALSE; Eina_Bool r = EINA_FALSE;
sd->zoom_animator = !!callback; sd->zoom_animator = !!callback;
r = eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj); r = eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, sd->obj);
r |= eo_event_callback_del(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj); r |= eo_event_callback_del(sd->obj, EFL_EVENT_ANIMATOR_TICK, _zoom_bring_anim_cb, sd->obj);
if (callback) eo_event_callback_add(sd->obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj); if (callback) eo_event_callback_add(sd->obj, EFL_EVENT_ANIMATOR_TICK, callback, sd->obj);
return r; return r;
} }

4
src/lib/elementary/elm_panel.c
View File

@ -1125,7 +1125,7 @@ _elm_panel_evas_object_smart_resize(Eo *obj, Elm_Panel_Data *sd, Evas_Coord w, E
break; break;
} }
eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
} }
EOLIAN static void EOLIAN static void
@ -1378,7 +1378,7 @@ _elm_panel_scrollable_content_size_set(Eo *obj, Elm_Panel_Data *sd, double ratio
break; break;
} }
eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj); eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _elm_panel_anim_cb, obj);
} }
EOLIAN static Eina_Bool EOLIAN static Eina_Bool

18
src/lib/elementary/elm_photocam.c
View File

@ -786,7 +786,7 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
{ {
sd->no_smooth--; sd->no_smooth--;
if (!sd->no_smooth) _smooth_update(data); if (!sd->no_smooth) _smooth_update(data);
eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL); eo_event_callback_call(obj, EVAS_ZOOMABLE_INTERFACE_EVENT_ZOOM_STOP, NULL);
} }
@ -1079,7 +1079,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
elm_interface_scrollable_freeze_set(obj, EINA_FALSE); elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
} }
@ -1088,7 +1088,7 @@ _elm_photocam_bounce_reset(Eo *obj, Elm_Photocam_Data *sd EINA_UNUSED)
{ {
Eina_Bool r; Eina_Bool r;
r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); r = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
if (r) _zoom_do(obj, 1.0); if (r) _zoom_do(obj, 1.0);
} }
@ -1097,7 +1097,7 @@ _elm_photocam_zoom_reset(Eo *obj, Elm_Photocam_Data *sd)
{ {
Eina_Bool r; Eina_Bool r;
r = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); r = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
if (r) if (r)
{ {
sd->no_smooth--; sd->no_smooth--;
@ -1302,7 +1302,7 @@ _g_layer_zoom_end_cb(void *data,
sd->g_layer_zoom.bounce.t_end = t + sd->g_layer_zoom.bounce.t_end = t +
_elm_config->page_scroll_friction; _elm_config->page_scroll_friction;
eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
} }
else else
{ {
@ -1470,8 +1470,8 @@ _elm_photocam_evas_object_smart_del(Eo *obj, Elm_Photocam_Data *sd)
ecore_job_del(sd->calc_job); ecore_job_del(sd->calc_job);
ecore_timer_del(sd->scr_timer); ecore_timer_del(sd->scr_timer);
ecore_timer_del(sd->long_timer); ecore_timer_del(sd->long_timer);
eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _bounce_eval, obj); eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
evas_obj_smart_del(eo_super(obj, MY_CLASS)); evas_obj_smart_del(eo_super(obj, MY_CLASS));
} }
@ -1939,8 +1939,8 @@ done:
} }
else else
{ {
an = eo_event_callback_del(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); an = eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
eo_event_callback_add(obj, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); eo_event_callback_add(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
if (!an) if (!an)
{ {
sd->no_smooth++; sd->no_smooth++;

10
src/lib/evas/canvas/evas_object_main.c
View File

@ -89,7 +89,7 @@ _animator_repeater(void *data, const Eo_Event *event)
{ {
Evas_Object_Protected_Data *obj = data; Evas_Object_Protected_Data *obj = data;
eo_event_callback_call(obj->object, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, event->info); eo_event_callback_call(obj->object, EFL_EVENT_ANIMATOR_TICK, event->info);
DBG("Emitting animator tick on %p.", obj->object); DBG("Emitting animator tick on %p.", obj->object);
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
@ -104,11 +104,11 @@ _check_event_catcher_add(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++) for (i = 0; array[i].desc != NULL; i++)
{ {
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK) if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{ {
if (obj->animator_ref++ > 0) break; if (obj->animator_ref++ > 0) break;
eo_event_callback_add(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); eo_event_callback_add(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Registering an animator tick on canvas %p for object %p.", INF("Registering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object); obj->layer->evas->evas, obj->object);
} }
@ -130,11 +130,11 @@ _check_event_catcher_del(void *data, const Eo_Event *event)
for (i = 0; array[i].desc != NULL; i++) for (i = 0; array[i].desc != NULL; i++)
{ {
if (array[i].desc == EFL_ANIMATOR_EVENT_ANIMATOR_TICK) if (array[i].desc == EFL_EVENT_ANIMATOR_TICK)
{ {
if ((--obj->animator_ref) > 0) break; if ((--obj->animator_ref) > 0) break;
eo_event_callback_del(obj->layer->evas->evas, EFL_ANIMATOR_EVENT_ANIMATOR_TICK, _animator_repeater, obj); eo_event_callback_del(obj->layer->evas->evas, EFL_EVENT_ANIMATOR_TICK, _animator_repeater, obj);
INF("Unregistering an animator tick on canvas %p for object %p.", INF("Unregistering an animator tick on canvas %p for object %p.",
obj->layer->evas->evas, obj->object); obj->layer->evas->evas, obj->object);
} }