forked from enlightenment/efl
edje/edje_program - clean code
This commit is contained in:
parent
dfd491a751
commit
a553f9459f
|
@ -275,7 +275,7 @@ _animation_set(Eo *obj, void *_pd, va_list *list)
|
||||||
evas_object_show(obj);
|
evas_object_show(obj);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break_prog:
|
break_prog:
|
||||||
|
|
||||||
for (i = 0; i < ed->table_parts_size; i++)
|
for (i = 0; i < ed->table_parts_size; i++)
|
||||||
{
|
{
|
||||||
|
@ -379,7 +379,7 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
|
||||||
if (!ed->actions)
|
if (!ed->actions)
|
||||||
_edje_animators = eina_list_remove(_edje_animators, ed);
|
_edje_animators = eina_list_remove(_edje_animators, ed);
|
||||||
}
|
}
|
||||||
// _edje_emit(ed, "program,stop", runp->program->name);
|
// _edje_emit(ed, "program,stop", runp->program->name);
|
||||||
if (_edje_block_break(ed))
|
if (_edje_block_break(ed))
|
||||||
{
|
{
|
||||||
if (!ed->walking_actions) free(runp);
|
if (!ed->walking_actions) free(runp);
|
||||||
|
@ -406,7 +406,7 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
|
||||||
_edje_unblock(ed);
|
_edje_unblock(ed);
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
}
|
}
|
||||||
break_prog:
|
break_prog:
|
||||||
_edje_recalc(ed);
|
_edje_recalc(ed);
|
||||||
_edje_thaw(ed);
|
_edje_thaw(ed);
|
||||||
_edje_unref(ed);
|
_edje_unref(ed);
|
||||||
|
@ -419,7 +419,7 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Edje_Program_Target *pt;
|
Edje_Program_Target *pt;
|
||||||
// const char *pname = NULL;
|
// const char *pname = NULL;
|
||||||
int free_runp = 0;
|
int free_runp = 0;
|
||||||
|
|
||||||
if (ed->delete_me) return;
|
if (ed->delete_me) return;
|
||||||
|
@ -449,7 +449,7 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp)
|
||||||
}
|
}
|
||||||
_edje_recalc(ed);
|
_edje_recalc(ed);
|
||||||
runp->delete_me = EINA_TRUE;
|
runp->delete_me = EINA_TRUE;
|
||||||
// pname = runp->program->name;
|
// pname = runp->program->name;
|
||||||
if (!ed->walking_actions)
|
if (!ed->walking_actions)
|
||||||
{
|
{
|
||||||
_edje_anim_count--;
|
_edje_anim_count--;
|
||||||
|
@ -460,7 +460,7 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp)
|
||||||
_edje_animators = eina_list_remove(_edje_animators, ed);
|
_edje_animators = eina_list_remove(_edje_animators, ed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// _edje_emit(ed, "program,stop", pname);
|
// _edje_emit(ed, "program,stop", pname);
|
||||||
_edje_thaw(ed);
|
_edje_thaw(ed);
|
||||||
_edje_unref(ed);
|
_edje_unref(ed);
|
||||||
if (free_runp) free(runp);
|
if (free_runp) free(runp);
|
||||||
|
@ -574,7 +574,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
low_mem_current:
|
low_mem_current:
|
||||||
if (rp->current)
|
if (rp->current)
|
||||||
{
|
{
|
||||||
eina_cow_free(_edje_calc_params_map_cow, rp->current->map);
|
eina_cow_free(_edje_calc_params_map_cow, rp->current->map);
|
||||||
|
@ -670,7 +670,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
|
||||||
if (pt->id == runp->program->id)
|
if (pt->id == runp->program->id)
|
||||||
{
|
{
|
||||||
_edje_program_end(ed, runp);
|
_edje_program_end(ed, runp);
|
||||||
// goto done;
|
// goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (ll = ed->pending_actions; ll; )
|
for (ll = ed->pending_actions; ll; )
|
||||||
|
@ -682,11 +682,11 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
|
||||||
ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
|
ed->pending_actions = eina_list_remove(ed->pending_actions, pp);
|
||||||
ecore_timer_del(pp->timer);
|
ecore_timer_del(pp->timer);
|
||||||
free(pp);
|
free(pp);
|
||||||
// goto done;
|
// goto done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// done:
|
// done:
|
||||||
// continue;
|
// continue;
|
||||||
}
|
}
|
||||||
// _edje_emit(ed, "program,stop", pr->name);
|
// _edje_emit(ed, "program,stop", pr->name);
|
||||||
if (_edje_block_break(ed)) goto break_prog;
|
if (_edje_block_break(ed)) goto break_prog;
|
||||||
|
@ -987,7 +987,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break_prog:
|
break_prog:
|
||||||
_edje_thaw(ed);
|
_edje_thaw(ed);
|
||||||
_edje_unref(ed);
|
_edje_unref(ed);
|
||||||
recursions--;
|
recursions--;
|
||||||
|
@ -1138,12 +1138,12 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
|
||||||
break ;
|
break ;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// ERR("SPANK SPANK SPANK !!!\nYou should never be here !");
|
// ERR("SPANK SPANK SPANK !!!\nYou should never be here !");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
emsg.sig = sig;
|
emsg.sig = sig;
|
||||||
emsg.src = src;
|
emsg.src = src;
|
||||||
if (data)
|
if (data)
|
||||||
|
@ -1157,12 +1157,12 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
|
||||||
{
|
{
|
||||||
emsg.data = NULL;
|
emsg.data = NULL;
|
||||||
}
|
}
|
||||||
/* new sends code */
|
/* new sends code */
|
||||||
if (broadcast)
|
if (broadcast)
|
||||||
edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
edje_object_message_send(ed->obj, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
||||||
else
|
else
|
||||||
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
||||||
/* old send code - use api now
|
/* old send code - use api now
|
||||||
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, EDJE_MESSAGE_SIGNAL, 0, &emsg);
|
||||||
EINA_LIST_FOREACH(ed->subobjs, l, obj)
|
EINA_LIST_FOREACH(ed->subobjs, l, obj)
|
||||||
{
|
{
|
||||||
|
@ -1219,7 +1219,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
|
||||||
if (ed->delete_me) return;
|
if (ed->delete_me) return;
|
||||||
if (!sig) sig = "";
|
if (!sig) sig = "";
|
||||||
if (!src) src = "";
|
if (!src) src = "";
|
||||||
// printf("EDJE EMIT: (%p) signal: \"%s\" source: \"%s\"\n", ed, sig, src);
|
// printf("EDJE EMIT: (%p) signal: \"%s\" source: \"%s\"\n", ed, sig, src);
|
||||||
_edje_block(ed);
|
_edje_block(ed);
|
||||||
_edje_ref(ed);
|
_edje_ref(ed);
|
||||||
_edje_freeze(ed);
|
_edje_freeze(ed);
|
||||||
|
@ -1374,7 +1374,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
|
||||||
goto break_prog;
|
goto break_prog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break_prog:
|
break_prog:
|
||||||
_edje_thaw(ed);
|
_edje_thaw(ed);
|
||||||
_edje_unref(ed);
|
_edje_unref(ed);
|
||||||
_edje_unblock(ed);
|
_edje_unblock(ed);
|
||||||
|
@ -1446,7 +1446,7 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Da
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break_prog:
|
break_prog:
|
||||||
_edje_signal_callback_matches_unref(m);
|
_edje_signal_callback_matches_unref(m);
|
||||||
|
|
||||||
_edje_signal_callback_patterns_unref(ssp);
|
_edje_signal_callback_patterns_unref(ssp);
|
||||||
|
@ -2157,7 +2157,7 @@ _edje_param_copy(Edje *ed, Edje_Real_Part *src_part, const char *src_param, Edje
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
free(free_ptr);
|
free(free_ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue