forked from enlightenment/efl
edje: Pass extra signal data to program_run
Summary: Depends on D6114 Reviewers: zmike, cedric Reviewed By: zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6115
This commit is contained in:
parent
6d4f78d676
commit
1982046315
|
@ -452,7 +452,7 @@ _edje_pending_timer_cb(void *data)
|
||||||
|
|
||||||
pp = data;
|
pp = data;
|
||||||
pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp);
|
pp->edje->pending_actions = eina_list_remove(pp->edje->pending_actions, pp);
|
||||||
_edje_program_run(pp->edje, pp->program, 1, "", "");
|
_edje_program_run(pp->edje, pp->program, 1, "", "", NULL);
|
||||||
pp->timer = NULL;
|
pp->timer = NULL;
|
||||||
free(pp);
|
free(pp);
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
|
|
|
@ -11205,7 +11205,7 @@ edje_edit_program_run(Evas_Object *obj, const char *prog)
|
||||||
GET_ED_OR_RETURN(EINA_FALSE);
|
GET_ED_OR_RETURN(EINA_FALSE);
|
||||||
GET_EPR_OR_RETURN(EINA_FALSE);
|
GET_EPR_OR_RETURN(EINA_FALSE);
|
||||||
|
|
||||||
_edje_program_run(ed, epr, 0, "", "");
|
_edje_program_run(ed, epr, 0, "", "", NULL);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1416,7 +1416,7 @@ _edje_embryo_fn_run_program(Embryo_Program *ep, Embryo_Cell *params)
|
||||||
pr = ed->collection->patterns.table_programs[program_id % ed->collection->patterns.table_programs_size];
|
pr = ed->collection->patterns.table_programs[program_id % ed->collection->patterns.table_programs_size];
|
||||||
if (pr)
|
if (pr)
|
||||||
{
|
{
|
||||||
_edje_program_run(ed, pr, 0, "", "");
|
_edje_program_run(ed, pr, 0, "", "", NULL);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2523,7 +2523,7 @@ void _edje_unref(Edje *ed);
|
||||||
void _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp);
|
void _edje_program_run_cleanup(Edje *ed, Edje_Running_Program *runp);
|
||||||
Eina_Bool _edje_program_run_iterate(Edje_Running_Program *runp, double tim);
|
Eina_Bool _edje_program_run_iterate(Edje_Running_Program *runp, double tim);
|
||||||
void _edje_program_end(Edje *ed, Edje_Running_Program *runp);
|
void _edje_program_end(Edje *ed, Edje_Running_Program *runp);
|
||||||
void _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc);
|
void _edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc, Edje_Message_Signal_Data *mdata);
|
||||||
void _edje_programs_patterns_clean(Edje_Part_Collection *ed);
|
void _edje_programs_patterns_clean(Edje_Part_Collection *ed);
|
||||||
void _edje_programs_patterns_init(Edje_Part_Collection *ed);
|
void _edje_programs_patterns_init(Edje_Part_Collection *ed);
|
||||||
void _edje_emit(Edje *ed, const char *sig, const char *src);
|
void _edje_emit(Edje *ed, const char *sig, const char *src);
|
||||||
|
|
|
@ -487,7 +487,7 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
|
||||||
if (pa->id >= 0)
|
if (pa->id >= 0)
|
||||||
{
|
{
|
||||||
pr = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
pr = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
||||||
if (pr) _edje_program_run(ed, pr, 0, "", "");
|
if (pr) _edje_program_run(ed, pr, 0, "", "", NULL);
|
||||||
if (_edje_block_break(ed))
|
if (_edje_block_break(ed))
|
||||||
{
|
{
|
||||||
if ((!ed->walking_actions) && (runp->ref == 0))
|
if ((!ed->walking_actions) && (runp->ref == 0))
|
||||||
|
@ -644,7 +644,7 @@ not_allowed:
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
_edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc)
|
_edje_program_run(Edje *ed, Edje_Program *pr, Eina_Bool force, const char *ssig, const char *ssrc, Edje_Message_Signal_Data *mdata)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Edje_Real_Part *rp;
|
Edje_Real_Part *rp;
|
||||||
|
@ -804,7 +804,7 @@ low_mem_current:
|
||||||
if (pa->id >= 0)
|
if (pa->id >= 0)
|
||||||
{
|
{
|
||||||
pr2 = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
pr2 = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
||||||
if (pr2) _edje_program_run(ed, pr2, 0, "", "");
|
if (pr2) _edje_program_run(ed, pr2, 0, "", "", mdata);
|
||||||
if (_edje_block_break(ed)) goto break_prog;
|
if (_edje_block_break(ed)) goto break_prog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1226,7 +1226,7 @@ low_mem_current:
|
||||||
if (pa->id >= 0)
|
if (pa->id >= 0)
|
||||||
{
|
{
|
||||||
pr2 = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
pr2 = ed->collection->patterns.table_programs[pa->id % ed->collection->patterns.table_programs_size];
|
||||||
if (pr2) _edje_program_run(ed, pr2, 0, "", "");
|
if (pr2) _edje_program_run(ed, pr2, 0, "", "", mdata);
|
||||||
if (_edje_block_break(ed)) goto break_prog;
|
if (_edje_block_break(ed)) goto break_prog;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1495,7 +1495,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
|
||||||
EINA_LIST_FOREACH(matches, l, pr)
|
EINA_LIST_FOREACH(matches, l, pr)
|
||||||
if (pr->exec)
|
if (pr->exec)
|
||||||
{
|
{
|
||||||
_edje_program_run(ed, pr, 0, sig, src);
|
_edje_program_run(ed, pr, 0, sig, src, sdata);
|
||||||
if (_edje_block_break(ed))
|
if (_edje_block_break(ed))
|
||||||
{
|
{
|
||||||
goto break_prog;
|
goto break_prog;
|
||||||
|
@ -1550,7 +1550,7 @@ _edje_emit_handle(Edje *ed, const char *sig, const char *src,
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
if (pr->exec)
|
if (pr->exec)
|
||||||
_edje_program_run(ed, pr, 0, sig, src);
|
_edje_program_run(ed, pr, 0, sig, src, sdata);
|
||||||
|
|
||||||
if (_edje_block_break(ed))
|
if (_edje_block_break(ed))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue