enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje: reformat all C files 

this has been unreadable for years due to the french tabber.
This commit is contained in:
Mike Blumenkrantz 2015-06-08 14:43:00 -04:00
parent 86e5a1a27c
commit 172a0ccf0c
27 changed files with 12764 additions and 12191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/edje/edje_box_layout.c
View File

@ -253,3 +253,4 @@ _edje_box_layout_remove_child(Edje_Real_Part *rp, Evas_Object *child_obj)
}
rp->typedata.container->anim->recalculate = EINA_TRUE;
}

10
src/lib/edje/edje_cache.c
View File

@ -69,7 +69,6 @@ edje_cache_emp_free(Edje_Part_Collection_Directory_Entry *ce)
ce->ref = NULL;
}
void
_edje_programs_patterns_init(Edje_Part_Collection *edc)
{
@ -345,6 +344,7 @@ _edje_file_dangling(Edje_File *edf)
_edje_file_hash = NULL;
}
}
#endif
Edje_File *
@ -609,7 +609,6 @@ _edje_file_cache_shutdown(void)
edje_file_cache_flush();
}
/*============================================================================*
* Global *
*============================================================================*/
@ -618,7 +617,6 @@ _edje_file_cache_shutdown(void)
* API *
*============================================================================*/
EAPI void
edje_file_cache_set(int count)
{
@ -627,14 +625,12 @@ edje_file_cache_set(int count)
_edje_cache_file_clean();
}
EAPI int
edje_file_cache_get(void)
{
return _edje_file_cache_size;
}
EAPI void
edje_file_cache_flush(void)
{
@ -646,7 +642,6 @@ edje_file_cache_flush(void)
_edje_file_cache_size = ps;
}
EAPI void
edje_collection_cache_set(int count)
{
@ -660,14 +655,12 @@ edje_collection_cache_set(int count)
/* FIXME: freach in file hash too! */
}
EAPI int
edje_collection_cache_get(void)
{
return _edje_collection_cache_size;
}
EAPI void
edje_collection_cache_flush(void)
{
@ -682,3 +675,4 @@ edje_collection_cache_flush(void)
/* FIXME: freach in file hash too! */
_edje_collection_cache_size = ps;
}

109
src/lib/edje/edje_calc.c Executable file → Normal file
View File

@ -46,6 +46,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
COS(MUL(fp_pos,
PI))));
break;
case EDJE_TWEEN_MODE_ACCELERATE:
/* npos = 1.0 - sin((PI / 2.0) + (pos * PI / 2.0)); */
npos = SUB(FROM_INT(1),
@ -53,14 +54,17 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
MUL(fp_pos,
DIV2(PI)))));
break;
case EDJE_TWEEN_MODE_DECELERATE:
/* npos = sin(pos * PI / 2.0); */
npos = SIN(MUL(fp_pos,
DIV2(PI)));
break;
case EDJE_TWEEN_MODE_LINEAR:
npos = fp_pos;
break;
default:
npos = fp_pos;
break;
@ -73,16 +77,19 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
ECORE_POS_MAP_SINUSOIDAL,
0.0, 0.0));
break;
case EDJE_TWEEN_MODE_ACCELERATE:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_ACCELERATE,
0.0, 0.0));
break;
case EDJE_TWEEN_MODE_DECELERATE:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_DECELERATE,
0.0, 0.0));
break;
case EDJE_TWEEN_MODE_LINEAR:
npos = fp_pos;
/* npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
@ -90,36 +97,43 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
0.0, 0.0));
*/
break;
case EDJE_TWEEN_MODE_ACCELERATE_FACTOR:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_ACCELERATE_FACTOR,
TO_DOUBLE(v1), 0.0));
break;
case EDJE_TWEEN_MODE_DECELERATE_FACTOR:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_DECELERATE_FACTOR,
TO_DOUBLE(v1), 0.0));
break;
case EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_SINUSOIDAL_FACTOR,
TO_DOUBLE(v1), 0.0));
break;
case EDJE_TWEEN_MODE_DIVISOR_INTERP:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_DIVISOR_INTERP,
TO_DOUBLE(v1), TO_DOUBLE(v2)));
break;
case EDJE_TWEEN_MODE_BOUNCE:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_BOUNCE,
TO_DOUBLE(v1), TO_DOUBLE(v2)));
break;
case EDJE_TWEEN_MODE_SPRING:
npos = FROM_DOUBLE(ecore_animator_pos_map(TO_DOUBLE(pos),
ECORE_POS_MAP_SPRING,
TO_DOUBLE(v1), TO_DOUBLE(v2)));
break;
case EDJE_TWEEN_MODE_CUBIC_BEZIER:
v[0] = TO_DOUBLE(v1);
v[1] = TO_DOUBLE(v2);
@ -130,6 +144,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
ECORE_POS_MAP_CUBIC_BEZIER,
4, v));
break;
default:
npos = fp_pos;
break;
@ -146,7 +161,6 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
#endif
}
/**
* Returns part description
*
@ -243,18 +257,21 @@ _edje_get_description_by_orientation(Edje *ed, Edje_Part_Description_Common *src
ce->count.RECTANGLE++;
memsize = sizeof(Edje_Part_Description_Common);
break;
case EDJE_PART_TYPE_SWALLOW:
desc_rtl = eina_mempool_malloc(ce->mp_rtl.SWALLOW,
sizeof (Edje_Part_Description_Common));
ce->count.SWALLOW++;
memsize = sizeof(Edje_Part_Description_Common);
break;
case EDJE_PART_TYPE_GROUP:
desc_rtl = eina_mempool_malloc(ce->mp_rtl.GROUP,
sizeof (Edje_Part_Description_Common));
ce->count.GROUP++;
memsize = sizeof(Edje_Part_Description_Common);
break;
case EDJE_PART_TYPE_SPACER:
desc_rtl = eina_mempool_malloc(ce->mp_rtl.SPACER,
sizeof (Edje_Part_Description_Common));
@ -514,21 +531,27 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_Set **set
case EVAS_LOAD_ERROR_GENERIC:
ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
break;
case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
break;
case EVAS_LOAD_ERROR_PERMISSION_DENIED:
ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
break;
case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
break;
case EVAS_LOAD_ERROR_CORRUPT_FILE:
ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
break;
case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
break;
default:
ERR("Error type: ???");
break;
@ -775,12 +798,15 @@ _edje_recalc_do(Edje *ed)
ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
break;
case 1:
ed->collection->limits.parts[i].height = EDJE_PART_LIMIT_UNKNOWN;
break;
case 2:
ed->collection->limits.parts[i].width = EDJE_PART_LIMIT_UNKNOWN;
break;
case 3:
break;
}
@ -851,8 +877,10 @@ _edje_part_dragable_calc(Edje *ed EINA_UNUSED, Edje_Real_Part *ep, FLOAT_T *x, F
if ((ep->part->dragable.x != 0) &&
(ep->part->dragable.y != 0)) ret = 3;
else if (ep->part->dragable.x != 0) ret = 1;
else if (ep->part->dragable.y != 0) ret = 2;
else if (ep->part->dragable.x != 0)
ret = 1;
else if (ep->part->dragable.y != 0)
ret = 2;
dx = FROM_INT(ep->x - ep->drag->confine_to->x);
dw = FROM_INT(ep->drag->confine_to->w - ep->w);
@ -1026,15 +1054,19 @@ _edje_part_recalc_single_aspect(Edje *ed,
case EDJE_ASPECT_CONTROL_NEITHER:
apref = EDJE_ASPECT_PREFER_NONE;
break;
case EDJE_ASPECT_CONTROL_HORIZONTAL:
apref = EDJE_ASPECT_PREFER_HORIZONTAL;
break;
case EDJE_ASPECT_CONTROL_VERTICAL:
apref = EDJE_ASPECT_PREFER_VERTICAL;
break;
case EDJE_ASPECT_CONTROL_BOTH:
apref = EDJE_ASPECT_PREFER_BOTH;
break;
default:
break;
}
@ -1067,6 +1099,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
new_h = params->eval.h;
}
break;
/* prefer vertical size as determiner */
case EDJE_ASPECT_PREFER_VERTICAL:
/* keep both dimensions in check */
@ -1077,6 +1110,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
if ((amin > ZERO) && (aspect < amin))
new_w = MUL(amin, params->eval.h);
break;
/* prefer horizontal size as determiner */
case EDJE_ASPECT_PREFER_HORIZONTAL:
/* keep both dimensions in check */
@ -1087,6 +1121,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
if ((amin > ZERO) && (aspect < amin))
new_h = DIV(params->eval.w, amin);
break;
case EDJE_ASPECT_PREFER_SOURCE:
case EDJE_ASPECT_PREFER_BOTH:
/* keep both dimensions in check */
@ -1103,6 +1138,7 @@ _edje_part_recalc_single_aspect(Edje *ed,
new_h = DIV(params->eval.w, amin);
}
break;
default:
break;
}
@ -1392,7 +1428,6 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
i--;
}
}
}
if (stl)
@ -1557,6 +1592,7 @@ _edje_part_recalc_single_text(FLOAT_T sc EINA_UNUSED,
if (mh > *minh) *minh = mh;
}
}
#else
{
char *sfont = NULL;
@ -1769,6 +1805,7 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
{
case EDJE_ASPECT_PREFER_NONE:
break;
case EDJE_ASPECT_PREFER_VERTICAL:
tmp = DIV(SCALE(params->eval.w, minh), h);
if (tmp >= FROM_INT(minw))
@ -1776,6 +1813,7 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
minw = TO_INT(tmp);
break;
}
case EDJE_ASPECT_PREFER_HORIZONTAL:
tmp = DIV(SCALE(params->eval.h, minw), w);
if (tmp >= FROM_INT(minh))
@ -1783,6 +1821,7 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
minh = TO_INT(tmp);
break;
}
case EDJE_ASPECT_PREFER_SOURCE:
case EDJE_ASPECT_PREFER_BOTH:
tmp = DIV(SCALE(params->eval.w, minh), h);
@ -1836,6 +1875,7 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
{
case EDJE_ASPECT_PREFER_NONE:
break;
case EDJE_ASPECT_PREFER_VERTICAL:
tmp = DIV(SCALE(params->eval.w, maxh), h);
if (tmp <= FROM_INT(maxw))
@ -1843,6 +1883,7 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
maxw = TO_INT(tmp);
break;
}
case EDJE_ASPECT_PREFER_HORIZONTAL:
tmp = DIV(SCALE(params->eval.h, maxw), w);
if (tmp <= FROM_INT(maxh))
@ -1850,6 +1891,7 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
maxh = TO_INT(tmp);
break;
}
case EDJE_ASPECT_PREFER_SOURCE:
case EDJE_ASPECT_PREFER_BOTH:
tmp = DIV(SCALE(params->eval.w, maxh), h);
@ -1939,7 +1981,8 @@ _edje_part_recalc_single_drag(Edje_Real_Part *ep,
v = SCALE(ep->drag->size.x, confine_to->w);
if ((minw > 0) && (TO_INT(v) < minw)) params->eval.w = FROM_INT(minw);
else if ((maxw >= 0) && (TO_INT(v) > maxw)) params->eval.w = FROM_INT(maxw);
else if ((maxw >= 0) && (TO_INT(v) > maxw))
params->eval.w = FROM_INT(maxw);
else params->eval.w = v;
offset = TO_INT(SCALE(ep->drag->x, (confine_to->w - TO_INT(params->eval.w))))
@ -1960,7 +2003,8 @@ _edje_part_recalc_single_drag(Edje_Real_Part *ep,
v = SCALE(ep->drag->size.y, confine_to->h);
if ((minh > 0) && (TO_INT(v) < minh)) params->eval.h = FROM_INT(minh);
else if ((maxh >= 0) && (TO_INT(v) > maxh)) params->eval.h = FROM_INT(maxh);
else if ((maxh >= 0) && (TO_INT(v) > maxh))
params->eval.h = FROM_INT(maxh);
else params->eval.h = v;
offset = TO_INT(SCALE(ep->drag->y, (confine_to->h - TO_INT(params->eval.h))))
@ -2385,6 +2429,7 @@ _edje_part_recalc_single(Edje *ed,
break;
}
case EDJE_PART_TYPE_TEXT:
case EDJE_PART_TYPE_TEXTBLOCK:
{
@ -2421,6 +2466,7 @@ _edje_part_recalc_single(Edje *ed,
break;
}
case EDJE_PART_TYPE_SPACER:
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_BOX:
@ -2429,9 +2475,11 @@ _edje_part_recalc_single(Edje *ed,
case EDJE_PART_TYPE_GROUP:
case EDJE_PART_TYPE_PROXY:
break;
case EDJE_PART_TYPE_GRADIENT:
/* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
break;
default:
break;
}
@ -2667,9 +2715,11 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
case EDJE_PART_TYPE_PROXY:
evas_object_image_source_set(ep->object, pp->object);
break;
case EDJE_PART_TYPE_GRADIENT:
/* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
break;
case EDJE_PART_TYPE_GROUP:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_EXTERNAL:
@ -2679,6 +2729,7 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
evas_object_image_source_set(ep->object, pp->typedata.swallow->swallowed_object);
}
break;
case EDJE_PART_TYPE_SPACER:
/* FIXME: detect that at compile time and prevent it */
break;
@ -2785,7 +2836,7 @@ _edje_physics_world_geometry_check(EPhysics_World *world)
{
Evas_Coord w, h, d;
ephysics_world_render_geometry_get(world, NULL, NULL, NULL, &w, &h, &d);
return (w && h && d);
return w && h && d;
}
static void
@ -2879,48 +2930,61 @@ _edje_physics_body_add(Edje *ed, Edje_Real_Part *rp, EPhysics_World *world)
case EDJE_PART_PHYSICS_BODY_RIGID_BOX:
rp->body = ephysics_body_box_add(world);
break;
case EDJE_PART_PHYSICS_BODY_RIGID_SPHERE:
rp->body = ephysics_body_sphere_add(world);
break;
case EDJE_PART_PHYSICS_BODY_RIGID_CYLINDER:
rp->body = ephysics_body_cylinder_add(world);
break;
case EDJE_PART_PHYSICS_BODY_SOFT_BOX:
rp->body = ephysics_body_soft_box_add(world);
break;
case EDJE_PART_PHYSICS_BODY_SOFT_SPHERE:
rp->body = ephysics_body_soft_sphere_add(world, 0);
break;
case EDJE_PART_PHYSICS_BODY_SOFT_CYLINDER:
rp->body = ephysics_body_soft_cylinder_add(world);
break;
case EDJE_PART_PHYSICS_BODY_CLOTH:
rp->body = ephysics_body_cloth_add(world, 0, 0);
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_TOP:
rp->body = ephysics_body_top_boundary_add(world);
resize = EINA_FALSE;
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_BOTTOM:
rp->body = ephysics_body_bottom_boundary_add(world);
resize = EINA_FALSE;
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_RIGHT:
rp->body = ephysics_body_right_boundary_add(world);
resize = EINA_FALSE;
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_LEFT:
rp->body = ephysics_body_left_boundary_add(world);
resize = EINA_FALSE;
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_FRONT:
rp->body = ephysics_body_front_boundary_add(world);
resize = EINA_FALSE;
break;
case EDJE_PART_PHYSICS_BODY_BOUNDARY_BACK:
rp->body = ephysics_body_back_boundary_add(world);
resize = EINA_FALSE;
break;
default:
ERR("Invalid body: %i", rp->part->physics_body);
return;
@ -2949,6 +3013,7 @@ _edje_physics_body_add(Edje *ed, Edje_Real_Part *rp, EPhysics_World *world)
_edje_physics_body_update_cb, rp);
ephysics_body_data_set(rp->body, ed);
}
#endif
#define FINTP(_x1, _x2, _p) \
@ -3508,7 +3573,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
#ifdef HAVE_EPHYSICS
p1->physics = physics;
#endif
}
p3 = &lp3;
@ -3555,7 +3619,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
pos2 = pos;
if (pos2 < ZERO) pos2 = ZERO;
else if (pos2 > FROM_INT(1)) pos2 = FROM_INT(1);
else if (pos2 > FROM_INT(1))
pos2 = FROM_INT(1);
beginning_pos = (pos < FROM_DOUBLE(0.5));
part_type = ep->part->type;
@ -3670,14 +3735,17 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
p3->type.common.spec.image.t = INTP(p1->type.common.spec.image.t, p2->type.common.spec.image.t, pos);
p3->type.common.spec.image.b = INTP(p1->type.common.spec.image.b, p2->type.common.spec.image.b, pos);
p3->type.common.spec.image.border_scale_by = FFP(p1->type.common.spec.image.border_scale_by, p2->type.common.spec.image.border_scale_by, pos);
case EDJE_PART_TYPE_PROXY:
p3->type.common.fill.x = INTP(p1->type.common.fill.x, p2->type.common.fill.x, pos);
p3->type.common.fill.y = INTP(p1->type.common.fill.y, p2->type.common.fill.y, pos);
p3->type.common.fill.w = INTP(p1->type.common.fill.w, p2->type.common.fill.w, pos);
p3->type.common.fill.h = INTP(p1->type.common.fill.h, p2->type.common.fill.h, pos);
break;
case EDJE_PART_TYPE_TEXT:
p3->type.text.size = INTP(p1->type.text.size, p2->type.text.size, pos);
/* no break as we share code with the TEXTBLOCK type here. Intended fall-through */
case EDJE_PART_TYPE_TEXTBLOCK:
p3->type.text.color2.r = INTP(p1->type.text.color2.r, p2->type.text.color2.r, pos2);
@ -3872,6 +3940,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
img_desc->image.scale_hint);
/* No break here as we share the rest of the code for all types. Intended fall-through*/
}
case EDJE_PART_TYPE_PROXY:
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_TEXTBLOCK:
@ -3910,6 +3979,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
break;
}
evas_object_show(ep->object);
#endif
/* move and resize are needed for all previous object => no break here. */
case EDJE_PART_TYPE_SWALLOW:
@ -3943,9 +4013,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
efl_gfx_size_set(pf->final.w, pf->final.h));
#endif
if (ep->nested_smart)
{ /* Move, Resize all nested parts */
/* Not really needed but will improve the bounding box evaluation done by Evas */
if (ep->nested_smart) /* Move, Resize all nested parts */
{ /* Not really needed but will improve the bounding box evaluation done by Evas */
eo_do(ep->nested_smart,
efl_gfx_position_set(ed->x + pf->final.x, ed->y + pf->final.y),
efl_gfx_size_set(pf->final.w, pf->final.h));
@ -3953,13 +4022,16 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
if (ep->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_real_part_configure(ed, ep);
break;
case EDJE_PART_TYPE_TEXT:
/* This is correctly handle in _edje_text_recalc_apply at the moment. */
break;
case EDJE_PART_TYPE_GRADIENT:
/* FIXME: definitivly remove this code when we switch to new format. */
abort();
break;
case EDJE_PART_TYPE_SPACER:
/* We really should do nothing on SPACER part */
break;
@ -3971,31 +4043,39 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
case EDJE_PART_TYPE_TEXT:
_edje_text_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text *)chosen_desc, EINA_FALSE);
break;
case EDJE_PART_TYPE_PROXY:
_edje_proxy_recalc_apply(ed, ep, pf, (Edje_Part_Description_Proxy *)chosen_desc, pos);
break;
case EDJE_PART_TYPE_IMAGE:
_edje_image_recalc_apply(ed, ep, pf, (Edje_Part_Description_Image *)chosen_desc, pos);
break;
case EDJE_PART_TYPE_BOX:
_edje_box_recalc_apply(ed, ep, pf, (Edje_Part_Description_Box *)chosen_desc);
break;
case EDJE_PART_TYPE_TABLE:
_edje_table_recalc_apply(ed, ep, pf, (Edje_Part_Description_Table *)chosen_desc);
break;
case EDJE_PART_TYPE_TEXTBLOCK:
_edje_textblock_recalc_apply(ed, ep, pf, (Edje_Part_Description_Text *)chosen_desc);
break;
case EDJE_PART_TYPE_EXTERNAL:
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_GROUP:
/* Nothing special to do for this type of object. */
break;
case EDJE_PART_TYPE_GRADIENT:
/* FIXME: definitivly remove this code when we switch to new format. */
abort();
break;
case EDJE_PART_TYPE_SPACER:
/* We really should do nothing on SPACER part */
break;
@ -4044,8 +4124,8 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
}
else
{
if (ep->nested_smart)
{ /* Cancel map of smart obj holding nested parts */
if (ep->nested_smart) /* Cancel map of smart obj holding nested parts */
{
eo_do(ep->nested_smart,
evas_obj_map_enable_set(EINA_FALSE),
evas_obj_map_set(NULL));
@ -4080,6 +4160,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
ep->h = pf->final.h;
#ifdef HAVE_EPHYSICS
}
#endif
ep->calculated |= flags;

10
src/lib/edje/edje_callbacks.c
View File

@ -35,7 +35,6 @@ _edje_focus_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_focus_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
@ -52,7 +51,6 @@ _edje_focus_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -71,7 +69,6 @@ _edje_mouse_in_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -90,7 +87,6 @@ _edje_mouse_out_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -160,7 +156,6 @@ _edje_mouse_down_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -234,7 +229,6 @@ _edje_mouse_up_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -260,7 +254,6 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
if (rp->still_in)
{
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
rp->still_in = EINA_FALSE;
else
@ -333,7 +326,6 @@ _edje_mouse_move_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc
return EO_CALLBACK_CONTINUE;
}
static Eina_Bool
_edje_mouse_wheel_signal_cb(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
{
@ -355,7 +347,6 @@ _edje_mouse_wheel_signal_cb(void *data, Eo *obj, const Eo_Event_Description *des
return EO_CALLBACK_CONTINUE;
}
Eina_Bool
_edje_timer_cb(void *data EINA_UNUSED)
{
@ -483,3 +474,4 @@ _edje_callbacks_focus_del(Evas_Object *obj, Edje *ed)
eo_do(obj, eo_event_callback_array_del(edje_focus_callbacks(), ed));
evas_object_data_del(obj, "real_part");
}

6
src/lib/edje/edje_container.c
View File

@ -14,7 +14,8 @@ _edje_container_relayout(Smart_Data *sd)
if (!sd->need_layout) return;
if (sd->w < sd->min_w) sw = sd->min_w;
else if (sd->w > sd->max_w) sw = sd->max_w;
else if (sd->w > sd->max_w)
sw = sd->max_w;
else sw = sd->w;
y = 0;
@ -162,7 +163,6 @@ _edje_item_recalc(Edje_Item *ei)
_edje_container_recalc(ei->sd);
}
/*****************************/
/**
* @endcond
@ -318,8 +318,6 @@ edje_item_overlay_object_set(Edje_Item *ei, Evas_Object *obj)
evas_object_smart_member_add(((Smart_Data *)(ei->sd))->smart_obj, obj);
}
Evas_Object *
edje_item_overlay_object_get(Edje_Item *ei)
{

5
src/lib/edje/edje_convert.c
View File

@ -269,7 +269,6 @@ _edje_collection_convert(Edje_File *file, Old_Edje_Part_Collection *oedc)
int *count;
int dummy = 0;
switch (part->type)
{
#define CSP(Tp, Ce) \
@ -286,6 +285,7 @@ _edje_collection_convert(Edje_File *file, Old_Edje_Part_Collection *oedc)
CSP(BOX, ce);
CSP(TABLE, ce);
CSP(EXTERNAL, ce);
default:
count = &dummy;
break;
@ -433,10 +433,12 @@ _edje_description_convert(int type,
result = eina_mempool_malloc(ce->mp.RECTANGLE,
sizeof (Edje_Part_Description_Common));
break;
case EDJE_PART_TYPE_SWALLOW:
result = eina_mempool_malloc(ce->mp.SWALLOW,
sizeof (Edje_Part_Description_Common));
break;
case EDJE_PART_TYPE_GROUP:
result = eina_mempool_malloc(ce->mp.GROUP,
sizeof (Edje_Part_Description_Common));
@ -496,3 +498,4 @@ _edje_description_convert(int type,
free(oed);
return result;
}

6
src/lib/edje/edje_data.c
View File

@ -137,7 +137,8 @@ mem_free_part(void *data)
(eed) = NULL; \
}
struct {
struct
{
Edje_Part_Type type;
const char *name;
} variant_convertion[] = {
@ -451,7 +452,6 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_3d_vec, Edje_3D_Vec, "y", y, EDJE_T_FLOAT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_3d_vec, Edje_3D_Vec, "z", z, EDJE_T_FLOAT);
/* collection directory */
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Edje_Part_Collection_Directory_Entry);
_edje_edd_edje_part_collection_directory_entry =
@ -1112,7 +1112,6 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_MAPPING(_edje_edd_edje_part_description_variant, "light", _edje_edd_edje_part_description_light);
EET_DATA_DESCRIPTOR_ADD_MAPPING(_edje_edd_edje_part_description_variant, "camera", _edje_edd_edje_part_description_camera);
#define EDJE_ADD_ARRAY_MAPPING(Variant, Type, Minus) \
{ \
Edje_Part_Description_List tmp; \
@ -1293,3 +1292,4 @@ _edje_data_font_list_desc_make(Eet_Data_Descriptor **_font_list_edd,
EET_DATA_DESCRIPTOR_ADD_LIST(*_font_list_edd, Edje_Font_List,
"list", list, *_font_edd);
}

149
src/lib/edje/edje_edit.c
View File

@ -419,7 +419,6 @@ _edje_edit_file_import(Edje *ed, const char *path, const char *entry, int compre
return EINA_FALSE;
}
static Eina_Bool
_edje_import_image_file(Edje *ed, const char *path, int id)
{
@ -632,13 +631,17 @@ static void
_edje_part_description_id_switch(int type, Edje_Part_Description_Common *c, int id1, int id2)
{
if (c->rel1.id_x == id1) c->rel1.id_x = id2;
else if (c->rel1.id_x == id2) c->rel1.id_x = id1;
else if (c->rel1.id_x == id2)
c->rel1.id_x = id1;
if (c->rel1.id_y == id1) c->rel1.id_y = id2;
else if (c->rel1.id_y == id2) c->rel1.id_y = id1;
else if (c->rel1.id_y == id2)
c->rel1.id_y = id1;
if (c->rel2.id_x == id1) c->rel2.id_x = id2;
else if (c->rel2.id_x == id2) c->rel2.id_x = id1;
else if (c->rel2.id_x == id2)
c->rel2.id_x = id1;
if (c->rel2.id_y == id1) c->rel2.id_y = id2;
else if (c->rel2.id_y == id2) c->rel2.id_y = id1;
else if (c->rel2.id_y == id2)
c->rel2.id_y = id1;
if (type == EDJE_PART_TYPE_TEXT
|| type == EDJE_PART_TYPE_TEXTBLOCK)
@ -647,9 +650,11 @@ _edje_part_description_id_switch(int type, Edje_Part_Description_Common *c, int
t = (Edje_Part_Description_Text *)c;
if (t->text.id_source == id1) t->text.id_source = id2;
else if (t->text.id_source == id2) t->text.id_source = id1;
else if (t->text.id_source == id2)
t->text.id_source = id1;
if (t->text.id_text_source == id1) t->text.id_text_source = id2;
else if (t->text.id_text_source == id2) t->text.id_text_source = id1;
else if (t->text.id_text_source == id2)
t->text.id_text_source = id1;
}
}
@ -665,7 +670,8 @@ _edje_part_program_id_switch(Edje_Program *epr, int id1, int id2)
EINA_LIST_FOREACH(epr->targets, ll, pt)
{
if (pt->id == id1) pt->id = id2;
else if (pt->id == id2) pt->id = id1;
else if (pt->id == id2)
pt->id = id1;
}
}
@ -707,9 +713,11 @@ _edje_parts_id_switch(Edje *ed, Edje_Real_Part *rp1, Edje_Real_Part *rp2)
//printf(" search id: %d in %s\n", old_id, p->name);
if (p->clip_to_id == id1) p->clip_to_id = id2;
else if (p->clip_to_id == id2) p->clip_to_id = id1;
else if (p->clip_to_id == id2)
p->clip_to_id = id1;
if (p->dragable.confine_id == id1) p->dragable.confine_id = id2;
else if (p->dragable.confine_id == id2) p->dragable.confine_id = id1;
else if (p->dragable.confine_id == id2)
p->dragable.confine_id = id1;
// ...in default description
_edje_part_description_id_switch(p->type, p->default_desc, id1, id2);
@ -1266,7 +1274,6 @@ edje_edit_sound_tone_add(Evas_Object *obj, const char* name, int frequency)
return EINA_TRUE;
}
EAPI Eina_Bool
edje_edit_sound_tone_del(Evas_Object *obj, const char *name)
{
@ -1538,7 +1545,6 @@ edje_edit_sound_samplesource_get(Evas_Object *obj, const char *sample_name)
return NULL;
}
/****************/
/* GROUPS API */
/****************/
@ -1936,6 +1942,7 @@ edje_edit_group_orientation_get(Evas_Object *obj)
if (!ed->collection) return -1;
return ed->collection->prop.orientation;
}
EAPI Eina_Bool
edje_edit_group_orientation_set(Evas_Object *obj, unsigned char orient)
{
@ -1953,6 +1960,7 @@ edje_edit_group_broadcast_signal_get(Evas_Object *obj)
if (!ed->collection) return EINA_TRUE;
return ed->collection->broadcast_signal;
}
EAPI Eina_Bool
edje_edit_group_broadcast_signal_set(Evas_Object *obj, Eina_Bool bs)
{
@ -2410,7 +2418,8 @@ edje_edit_group_data_name_set(Evas_Object *obj, const char *key, const char *ne
{
GET_ED_OR_RETURN(EINA_FALSE);
if (!key || !new_key || !ed->file || !ed->collection) {
if (!key || !new_key || !ed->file || !ed->collection)
{
return EINA_FALSE;
}
@ -2627,8 +2636,6 @@ edje_edit_color_class_name_set(Evas_Object *obj, const char *name, const char *n
return EINA_FALSE;
}
/*********************/
/* TEXT STYLES API */
/*********************/
@ -3755,7 +3762,6 @@ edje_edit_part_anti_alias_set(Evas_Object *obj, const char *part, Eina_Bool anti
return EINA_TRUE;
}
EAPI Eina_Bool
edje_edit_part_repeat_events_get(Evas_Object *obj, const char *part)
{
@ -4019,13 +4025,16 @@ edje_edit_part_source_set(Evas_Object *obj, const char *part, const char *source
edje_object_file_set(child_obj, ed->file->path, source);
_edje_real_part_swallow(ed, rp, child_obj, EINA_TRUE);
}
// this fall through case is intentional
case EDJE_PART_TYPE_TEXTBLOCK:
if (source) _edje_if_string_replace(ed, &rp->part->source, source);
else _edje_if_string_free(ed, &rp->part->source);
return EINA_TRUE;
case EDJE_PART_TYPE_EXTERNAL: //EXTERNAL part has source property but it cannot be changed
break;
default:
break;
}
@ -4241,6 +4250,7 @@ edje_edit_state_table_homogeneous_get(Evas_Object *obj, const char *part, const
table = (Edje_Part_Description_Table *)pd;
return table->table.homogeneous;
}
default:
return 0;
}
@ -4261,6 +4271,7 @@ edje_edit_state_table_homogeneous_set(Evas_Object *obj, const char *part, const
table->table.homogeneous = homogeneous;
break;
}
default:
return EINA_FALSE;
}
@ -4286,6 +4297,7 @@ edje_edit_state_container_align_get(Evas_Object *obj, const char *part, const ch
if (y) *y = FROM_DOUBLE(table->table.align.y);
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4294,6 +4306,7 @@ edje_edit_state_container_align_get(Evas_Object *obj, const char *part, const ch
if (y) *y = FROM_DOUBLE(box->box.align.y);
break;
}
default:
return EINA_FALSE;
}
@ -4315,6 +4328,7 @@ edje_edit_state_container_align_set(Evas_Object *obj, const char *part, const ch
table->table.align.y = TO_DOUBLE(y);
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4323,6 +4337,7 @@ edje_edit_state_container_align_set(Evas_Object *obj, const char *part, const ch
box->box.align.y = y;
break;
}
default:
return EINA_FALSE;
}
@ -4344,6 +4359,7 @@ edje_edit_state_container_padding_get(Evas_Object *obj, const char *part, const
if (y) *y = table->table.padding.y;
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4352,6 +4368,7 @@ edje_edit_state_container_padding_get(Evas_Object *obj, const char *part, const
if (y) *y = box->box.padding.y;
break;
}
default:
return EINA_FALSE;
}
@ -4374,6 +4391,7 @@ edje_edit_state_container_padding_set(Evas_Object *obj, const char *part, const
table->table.padding.y = y;
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4382,6 +4400,7 @@ edje_edit_state_container_padding_set(Evas_Object *obj, const char *part, const
box->box.padding.y = y;
break;
}
default:
return EINA_FALSE;
}
@ -4403,6 +4422,7 @@ edje_edit_state_container_min_get(Evas_Object *obj, const char *part, const char
if (v) *v = table->table.min.v;
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4411,6 +4431,7 @@ edje_edit_state_container_min_get(Evas_Object *obj, const char *part, const char
if (v) *v = box->box.min.v;
break;
}
default:
return EINA_FALSE;
}
@ -4433,6 +4454,7 @@ edje_edit_state_container_min_set(Evas_Object *obj, const char *part, const char
table->table.min.v = v;
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box;
@ -4441,6 +4463,7 @@ edje_edit_state_container_min_set(Evas_Object *obj, const char *part, const char
box->box.min.v = v;
break;
}
default:
return EINA_FALSE;
}
@ -4454,7 +4477,6 @@ edje_edit_state_container_min_set(Evas_Object *obj, const char *part, const char
EAPI Eina_Bool
edje_edit_part_item_append(Evas_Object *obj, const char *part, const char *item_name, const char *source_group)
{
Edje_Part *ep;
unsigned int i;
Edje_Pack_Element *item;
@ -4594,7 +4616,6 @@ edje_edit_part_item_del(Evas_Object *obj, const char *part, const char* name)
return EINA_TRUE;
}
EAPI Eina_Bool
edje_edit_part_item_source_set(Evas_Object *obj, const char *part, const char *item_name, const char *source_group)
{
@ -4749,7 +4770,6 @@ edje_edit_part_item_aspect_mode_get(Evas_Object *obj, const char *part, const ch
if (!item) return EDJE_ASPECT_CONTROL_NONE;
return item->aspect.mode;
}
EAPI Eina_Bool
@ -4783,7 +4803,6 @@ edje_edit_part_item_aspect_mode_set(Evas_Object *obj, const char *part, const ch
item->aspect.mode = mode;
return EINA_TRUE;
}
EAPI Eina_Bool
@ -4932,6 +4951,7 @@ edje_edit_part_item_position_get(Evas_Object *obj, const char *part, const char
*row = item->row;
return EINA_TRUE;
}
EAPI Eina_Bool
edje_edit_part_item_position_set(Evas_Object *obj, const char *part, const char *item_name, unsigned short col, unsigned short row)
{
@ -5143,14 +5163,17 @@ _edje_edit_state_alloc(int type, Edje *ed)
pd = eina_mempool_malloc(ce->mp.RECTANGLE, sizeof (Edje_Part_Description_Common));
ce->count.RECTANGLE++;
break;
case EDJE_PART_TYPE_SPACER:
pd = eina_mempool_malloc(ce->mp.SPACER, sizeof (Edje_Part_Description_Common));
ce->count.SPACER++;
break;
case EDJE_PART_TYPE_SWALLOW:
pd = eina_mempool_malloc(ce->mp.SWALLOW, sizeof (Edje_Part_Description_Common));
ce->count.SWALLOW++;
break;
case EDJE_PART_TYPE_GROUP:
pd = eina_mempool_malloc(ce->mp.GROUP, sizeof (Edje_Part_Description_Common));
ce->count.GROUP++;
@ -5353,18 +5376,22 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double
if (pi->info.i.def != EDJE_EXTERNAL_INT_UNSET)
p->i = pi->info.i.def;
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
if (pi->info.d.def != EDJE_EXTERNAL_DOUBLE_UNSET)
p->d = pi->info.d.def;
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
if (pi->info.c.def)
p->s = eina_stringshare_add(pi->info.c.def);
break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
if (pi->info.s.def)
p->s = eina_stringshare_add(pi->info.s.def);
break;
default:
ERR("unknown external parameter type '%d'", p->type);
}
@ -5437,7 +5464,6 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
rpto->part->other.desc[rpto->part->other.desc_count++] = pdto;
}
#define PD_STRING_COPY(To, From, _x) \
if (From->_x) \
To->_x = (char *)eina_stringshare_add(From->_x);
@ -5461,6 +5487,7 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
break;
}
case EDJE_PART_TYPE_IMAGE:
{
Edje_Part_Description_Image *img_to = (Edje_Part_Description_Image *)pdto;
@ -5487,6 +5514,7 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
}
break;
}
case EDJE_PART_TYPE_TEXT:
case EDJE_PART_TYPE_TEXTBLOCK:
{
@ -5503,6 +5531,7 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
PD_STRING_COPY(text_to, text_from, text.repch.str);
break;
}
case EDJE_PART_TYPE_BOX:
{
Edje_Part_Description_Box *box_to = (Edje_Part_Description_Box *)pdto;
@ -5514,6 +5543,7 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
PD_STRING_COPY(box_to, box_from, box.alt_layout);
break;
}
case EDJE_PART_TYPE_TABLE:
{
Edje_Part_Description_Table *table_to = (Edje_Part_Description_Table *)pdto;
@ -5522,6 +5552,7 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
table_to->table = table_from->table;
break;
}
case EDJE_PART_TYPE_EXTERNAL:
{
Edje_Part_Description_External *ext_to = (Edje_Part_Description_External *)pdto;
@ -5547,13 +5578,16 @@ _edje_edit_part_state_copy(Evas_Object *obj, const char *part, const char *part_
case EDJE_EXTERNAL_PARAM_TYPE_INT:
new_p->i = p->i;
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
new_p->d = p->d;
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
new_p->s = eina_stringshare_add(p->s);
break;
default:
break;
}
@ -5821,6 +5855,7 @@ edje_edit_state_fill_smooth_get(Evas_Object *obj, const char *part, const char *
img = (Edje_Part_Description_Image *)pd;
return img->image.fill.smooth;
}
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *pro;
@ -5846,6 +5881,7 @@ edje_edit_state_fill_smooth_set(Evas_Object *obj, const char *part, const char *
img->image.fill.smooth = smooth;
return EINA_TRUE;
}
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *pro;
@ -5874,6 +5910,7 @@ edje_edit_state_fill_type_set(Evas_Object *obj, const char *part, const char *st
img->image.fill.type = fill_type;
return EINA_TRUE;
}
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *pro;
@ -5899,6 +5936,7 @@ edje_edit_state_fill_type_get(Evas_Object *obj, const char *part, const char *st
img = (Edje_Part_Description_Image *)pd;
return img->image.fill.type;
}
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *pro;
@ -6181,13 +6219,16 @@ edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const cha
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
*val = &p->i;
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
*val = &p->d;
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
*val = (void *)p->s;
break;
default:
ERR("unknown external parameter type '%d'", p->type);
}
@ -6413,13 +6454,16 @@ edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const cha
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
p->i = (int)va_arg(ap, int);
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
p->d = (double)va_arg(ap, double);
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
p->s = eina_stringshare_add((const char *)va_arg(ap, char *));
break;
default:
ERR("unknown external parameter type '%d'", type);
va_end(ap);
@ -8000,12 +8044,16 @@ edje_edit_image_compression_type_get(Evas_Object *obj, const char *image)
return EDJE_EDIT_IMAGE_COMP_RAW;
else // COMP
return EDJE_EDIT_IMAGE_COMP_COMP;
case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY: // LOSSY
return EDJE_EDIT_IMAGE_COMP_LOSSY;
case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1: // LOSSY_ETC1
return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1;
case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2
return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2;
case EDJE_IMAGE_SOURCE_TYPE_EXTERNAL: // USER
return EDJE_EDIT_IMAGE_COMP_USER;
}
@ -8043,6 +8091,7 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E
}
else
return EINA_FALSE;
case EDJE_EDIT_IMAGE_COMP_COMP: // COMP
if (de->source_param == 1)
{
@ -8051,21 +8100,25 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E
}
else
return EINA_FALSE;
case EDJE_EDIT_IMAGE_COMP_LOSSY: // LOSSY
{
de->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY;
return EINA_TRUE;
}
case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC1: // LOSSY_ETC1
{
de->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1;
return EINA_TRUE;
}
case EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2: // LOSSY_ETC2
{
de->source_type = EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2;
return EINA_TRUE;
}
case EDJE_EDIT_IMAGE_COMP_USER: // USER
{
de->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
@ -8340,7 +8393,6 @@ edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const
return EINA_TRUE;
}
/******************/
/* PROGRAMS API */
/******************/
@ -9203,7 +9255,6 @@ edje_edit_program_targets_get(Evas_Object *obj, const char *prog)
return _edje_program_targets_get(obj, epr);
}
EAPI Eina_Bool
edje_edit_program_targets_clear(Evas_Object *obj, const char *prog)
{
@ -9310,6 +9361,7 @@ edje_edit_program_target_del(Evas_Object *obj, const char *prog, const char *tar
if (!tar) return EINA_FALSE;
id = tar->id;
break;
default:
return EINA_FALSE;
}
@ -10072,7 +10124,6 @@ error:
return NULL;
}
EAPI const char *
edje_edit_source_generate(Evas_Object *obj)
{
@ -10180,7 +10231,6 @@ edje_edit_source_generate(Evas_Object *obj)
buf = eina_strbuf_new();
/* If data items exist, print them */
if (ed->file->data)
{
@ -10280,21 +10330,25 @@ edje_edit_source_generate(Evas_Object *obj)
BUF_APPEND("RAW;\n");
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_COMP:
{
BUF_APPEND("COMP;\n");
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_LOSSY:
{
BUF_APPENDF("LOSSY %f;\n", uses_sample->quality);
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_AS_IS:
{
BUF_APPEND("AS_IS;\n");
break;
}
default:
break;
}
@ -10448,6 +10502,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
case EDJE_ACTION_TYPE_ACTION_STOP:
BUF_APPEND(I4 "action: ACTION_STOP;\n");
break;
case EDJE_ACTION_TYPE_STATE_SET:
if (epr->state)
{
@ -10455,10 +10510,12 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
edje_edit_program_value_get(obj, program));
}
break;
case EDJE_ACTION_TYPE_SIGNAL_EMIT:
if (epr->state && epr->state2)
BUF_APPENDF(I4 "action: SIGNAL_EMIT \"%s\" \"%s\";\n", epr->state, epr->state2);
break;
case EDJE_ACTION_TYPE_SCRIPT:
{
Program_Script *ps;
@ -10472,6 +10529,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
}
}
break;
case EDJE_ACTION_TYPE_SOUND_SAMPLE:
{
BUF_APPEND(I4 "action: PLAY_SAMPLE ");
@ -10483,61 +10541,72 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
BUF_APPEND(" BACKGROUND");
break;
}
case EDJE_CHANNEL_MUSIC:
{
BUF_APPEND(" MUSIC");
break;
}
case EDJE_CHANNEL_FOREGROUND:
{
BUF_APPEND(" FOREGROUND");
break;
}
case EDJE_CHANNEL_INTERFACE:
{
BUF_APPEND(" INTERFACE");
break;
}
case EDJE_CHANNEL_INPUT:
{
BUF_APPEND(" INPUT");
break;
}
case EDJE_CHANNEL_ALERT:
{
BUF_APPEND(" ALERT");
break;
}
default:
break;
}
BUF_APPENDF(";\n");
break;
}
case EDJE_ACTION_TYPE_SOUND_TONE:
{
BUF_APPEND(I4 "action: PLAY_TONE ");
BUF_APPENDF("\"%s\" %.4f;\n", epr->tone_name, epr->duration);
break;
}
case EDJE_ACTION_TYPE_DRAG_VAL_SET:
{
BUF_APPEND(I4 "action: DRAG_VAL_SET ");
BUF_APPENDF("%.4f %.4f;\n", epr->value, epr->value2);
break;
}
case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
{
BUF_APPEND(I4 "action: DRAG_VAL_STEP ");
BUF_APPENDF("%.4f %.4f;\n", epr->value, epr->value2);
break;
}
case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
{
BUF_APPEND(I4 "action: DRAG_VAL_PAGE ");
BUF_APPENDF("%.4f %.4f;\n", epr->value, epr->value2);
break;
}
default:
break;
}
@ -10553,42 +10622,52 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
else
no_transition = EINA_TRUE;
break;
case EDJE_TWEEN_MODE_ACCELERATE:
BUF_APPENDF(I4 "transition: ACCELERATE %.5f", db);
break;
case EDJE_TWEEN_MODE_DECELERATE:
BUF_APPENDF(I4 "transition: DECELERATE %.5f", db);
break;
case EDJE_TWEEN_MODE_SINUSOIDAL:
BUF_APPENDF(I4 "transition: SINUSOIDAL %.5f", db);
break;
case EDJE_TWEEN_MODE_ACCELERATE_FACTOR:
v1 = TO_DOUBLE(epr->tween.v1);
BUF_APPENDF(I4 "transition: ACCELERATE_FACTOR %.5f %.5f", db, v1);
break;
case EDJE_TWEEN_MODE_DECELERATE_FACTOR:
v1 = TO_DOUBLE(epr->tween.v1);
BUF_APPENDF(I4 "transition: DECELERATE_FACTOR %.5f %.5f", db, v1);
break;
case EDJE_TWEEN_MODE_SINUSOIDAL_FACTOR:
v1 = TO_DOUBLE(epr->tween.v1);
BUF_APPENDF(I4 "transition: SINUSOIDAL_FACTOR %.5f %.5f", db, v1);
break;
case EDJE_TWEEN_MODE_DIVISOR_INTERP:
v1 = TO_DOUBLE(epr->tween.v1);
v2 = TO_DOUBLE(epr->tween.v2);
BUF_APPENDF(I4 "transition: DIVISOR_INTERP %.5f %.5f %.5f", db, v1, v2);
break;
case EDJE_TWEEN_MODE_BOUNCE:
v1 = TO_DOUBLE(epr->tween.v1);
v2 = TO_DOUBLE(epr->tween.v2);
BUF_APPENDF(I4 "transition: BOUNCE %.5f %.5f %.5f", db, v1, v2);
break;
case EDJE_TWEEN_MODE_SPRING:
v1 = TO_DOUBLE(epr->tween.v1);
v2 = TO_DOUBLE(epr->tween.v2);
BUF_APPENDF(I4 "transition: SPRING %.5f %.5f %.5f", db, v1, v2);
break;
case EDJE_TWEEN_MODE_CUBIC_BEZIER:
v1 = TO_DOUBLE(epr->tween.v1);
v2 = TO_DOUBLE(epr->tween.v2);
@ -10596,6 +10675,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
v4 = TO_DOUBLE(epr->tween.v4);
BUF_APPENDF(I4 "transition: CUBIC_BEZIER %.5f %.5f %.5f %.5f %.5f", db, v1, v2, v3, v4);
break;
default:
no_transition = EINA_TRUE;
break;
@ -10714,11 +10794,13 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
BUF_APPEND("limit: WIDTH;\n");
break;
}
case EDJE_STATE_LIMIT_HEIGHT:
{
BUF_APPEND("limit: HEIGHT;\n");
break;
}
case EDJE_STATE_LIMIT_BOTH:
{
BUF_APPEND("limit: BOTH;\n");
@ -10818,7 +10900,6 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
}
}
if (rp->part->type == EDJE_PART_TYPE_TABLE)
{
Edje_Part_Description_Table *table;
@ -10839,6 +10920,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
BUF_APPENDF(I6 "homogeneous: TABLE;\n");
break;
}
case EDJE_OBJECT_TABLE_HOMOGENEOUS_ITEM:
{
BUF_APPENDF(I6 "homogeneous: ITEM;\n");
@ -10986,7 +11068,6 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
BUF_APPEND(I5 "}\n");
}
//Image
if (rp->part->type == EDJE_PART_TYPE_IMAGE)
{
@ -11205,22 +11286,27 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
case EDJE_EXTERNAL_PARAM_TYPE_INT:
BUF_APPENDF(I6 "int: \"%s\" \"%d\";\n", p->name, p->i);
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
BUF_APPENDF(I6 "double: \"%s\" \"%g\";\n", p->name, p->d);
break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
if (p->s)
BUF_APPENDF(I6 "string: \"%s\" \"%s\";\n", p->name,
p->s);
break;
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
BUF_APPENDF(I6 "bool: \"%s\" \"%d\";\n", p->name, p->i);
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
if (p->s)
BUF_APPENDF(I6 "choice: \"%s\" \"%s\";\n", p->name,
p->s);
break;
default:
break;
}
@ -11485,7 +11571,6 @@ _edje_generate_source_of_sounds(Edje_Sound_Directory *sound_directory, Eina_Strb
Edje_Sound_Tone *current_tone = sound_directory->tones;
BUF_APPEND(I1 "sounds {\n");
for (i = 0; i < sound_directory->samples_count; i++, current_sample++)
{
BUF_APPEND(I2 "sample {\n");
@ -11497,21 +11582,25 @@ _edje_generate_source_of_sounds(Edje_Sound_Directory *sound_directory, Eina_Strb
BUF_APPEND("RAW;\n");
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_COMP:
{
BUF_APPEND("COMP;\n");
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_LOSSY:
{
BUF_APPENDF("LOSSY %f;\n", current_sample->quality);
break;
}
case EDJE_SOUND_SOURCE_TYPE_INLINE_AS_IS:
{
BUF_APPEND("AS_IS;\n");
break;
}
default:
break;
}
@ -11606,9 +11695,11 @@ _edje_generate_source_of_group(Edje *ed, Edje_Part_Collection_Directory_Entry *p
case (EDJE_ORIENTATION_LTR):
BUF_APPENDF(I2 "orientation: LTR;\n");
break;
case (EDJE_ORIENTATION_RTL):
BUF_APPENDF(I2 "orientation: RTL;\n");
break;
case (EDJE_ORIENTATION_AUTO):
default:
break;
@ -11889,7 +11980,6 @@ edje_edit_full_source_generate(Evas_Object *obj)
return ret;
}
/*********************/
/* SAVING ROUTINES */
/*********************/
@ -11927,6 +12017,7 @@ source_edd(void)
_srcfile_list_edd = eet_data_descriptor_stream_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_srcfile_list_edd, SrcFile_List, "list", list, _srcfile_edd);
}
/////////////////////////////////////////
static Eina_Bool

154
src/lib/edje/edje_embryo.c
View File

@ -493,7 +493,6 @@ _edje_embryo_fn_replace_str(Embryo_Program *ep, Embryo_Cell *params)
return 0;
}
/* fetch_str(id, pos, dst[], maxlen) */
static Embryo_Cell
_edje_embryo_fn_fetch_str(Embryo_Program *ep, Embryo_Cell *params)
@ -709,23 +708,28 @@ _edje_embryo_fn_get_anim_pos_map(Embryo_Program *ep, Embryo_Cell *params)
case ECORE_POS_MAP_SINUSOIDAL:
pos = ecore_animator_pos_map(pos, tween, 0, 0);
break;
case ECORE_POS_MAP_ACCELERATE_FACTOR:
pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_ACCELERATE_FACTOR,
v1, 0);
break;
case ECORE_POS_MAP_DECELERATE_FACTOR:
pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_DECELERATE_FACTOR,
v1, 0);
break;
case ECORE_POS_MAP_SINUSOIDAL_FACTOR:
pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_SINUSOIDAL_FACTOR,
v1, 0);
break;
case ECORE_POS_MAP_DIVISOR_INTERP:
case ECORE_POS_MAP_BOUNCE:
case ECORE_POS_MAP_SPRING:
pos = ecore_animator_pos_map(pos, tween, v1, v2);
break;
default:
break;
}
@ -1434,7 +1438,7 @@ _edje_embryo_fn_set_drag(Embryo_Program *ep, Embryo_Cell *params)
edje_object_part_drag_value_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
return 0;
}
/* get_drag_size(part_id, &Float:dx, &Float:dy) */
@ -1474,7 +1478,7 @@ _edje_embryo_fn_set_drag_size(Embryo_Program *ep, Embryo_Cell *params)
edje_object_part_drag_size_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
return 0;
}
/* set_text(part_id, str[]) */
@ -1492,10 +1496,11 @@ _edje_embryo_fn_set_text(Embryo_Program *ep, Embryo_Cell *params)
if (part_id < 0) return 0;
rp = ed->table_parts[part_id % ed->table_parts_size];
GETSTR(s, params[2]);
if (s){
if (s)
{
edje_object_part_text_set(ed->obj, rp->part->name, s);
}
return(0);
return 0;
}
/* get_text(part_id, dst[], maxlen) */
@ -1564,7 +1569,6 @@ _edje_embryo_fn_get_max_size(Embryo_Program *ep, Embryo_Cell *params)
SETINT(w, params[1]);
SETINT(h, params[2]);
return 0;
}
/* get_color_class(class[], &r, &g, &b, &a) */
@ -1680,7 +1684,7 @@ _edje_embryo_fn_set_drag_step(Embryo_Program *ep, Embryo_Cell *params)
edje_object_part_drag_step_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
return 0;
}
/* get_drag_page(part_id, &Float:dx, &Float:&dy) */
@ -1743,7 +1747,7 @@ _edje_embryo_fn_set_drag_page(Embryo_Program *ep, Embryo_Cell *params)
edje_object_part_drag_page_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
return 0;
}
/* send_message(Msg_Type:type, id,...); */
@ -1764,8 +1768,10 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_NONE:
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, NULL);
break;
case EDJE_MESSAGE_SIGNAL:
break;
case EDJE_MESSAGE_STRING:
{
Embryo_Cell *cptr;
@ -1787,6 +1793,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
}
}
break;
case EDJE_MESSAGE_INT:
{
Edje_Message_Int *emsg;
@ -1798,6 +1805,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
}
break;
case EDJE_MESSAGE_FLOAT:
{
Edje_Message_Float *emsg;
@ -1815,6 +1823,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
}
break;
case EDJE_MESSAGE_STRING_SET:
{
Edje_Message_String_Set *emsg;
@ -1842,6 +1851,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
}
break;
case EDJE_MESSAGE_INT_SET:
{
Edje_Message_Int_Set *emsg;
@ -1858,6 +1868,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
}
break;
case EDJE_MESSAGE_FLOAT_SET:
{
Edje_Message_Float_Set *emsg;
@ -1881,6 +1892,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
_edje_util_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
}
break;
case EDJE_MESSAGE_STRING_INT:
{
Edje_Message_String_Int *emsg;
@ -1905,6 +1917,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
}
}
break;
case EDJE_MESSAGE_STRING_FLOAT:
{
Edje_Message_String_Float *emsg;
@ -1935,6 +1948,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
}
}
break;
case EDJE_MESSAGE_STRING_INT_SET:
{
Edje_Message_String_Int_Set *emsg;
@ -1964,6 +1978,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
}
}
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
{
Edje_Message_String_Float_Set *emsg;
@ -2000,10 +2015,11 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
}
}
break;
default:
break;
}
return(0);
return 0;
}
/* custom_state(part_id, state[], Float:state_val = 0.0) */
@ -2180,6 +2196,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->align.y, params[4]);
break;
case EDJE_STATE_PARAM_MIN:
CHKPARAM(4);
@ -2187,6 +2204,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->min.h, params[4]);
break;
case EDJE_STATE_PARAM_MAX:
CHKPARAM(4);
@ -2194,6 +2212,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->max.h, params[4]);
break;
case EDJE_STATE_PARAM_STEP:
CHKPARAM(4);
@ -2201,6 +2220,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->step.y, params[4]);
break;
case EDJE_STATE_PARAM_ASPECT:
CHKPARAM(4);
@ -2208,12 +2228,14 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->aspect.max, params[4]);
break;
case EDJE_STATE_PARAM_ASPECT_PREF:
CHKPARAM(3);
GETINT(rp->custom->description->aspect.prefer, params[3]);
break;
case EDJE_STATE_PARAM_COLOR:
CHKPARAM(6);
@ -2223,6 +2245,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->color.a, params[6]);
break;
case EDJE_STATE_PARAM_COLOR2:
CHKPARAM(6);
@ -2232,6 +2255,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->color2.a, params[6]);
break;
case EDJE_STATE_PARAM_COLOR3:
{
Edje_Part_Description_Text *text;
@ -2250,6 +2274,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(text->text.color3.a, params[6]);
break;
}
case EDJE_STATE_PARAM_COLOR_CLASS:
CHKPARAM(3);
@ -2257,6 +2282,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETSTREVAS(s, rp->custom->description->color_class);
break;
case EDJE_STATE_PARAM_REL1:
CHKPARAM(4);
@ -2264,6 +2290,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->rel1.relative_y, params[4]);
break;
case EDJE_STATE_PARAM_REL1_TO:
CHKPARAM(4);
@ -2271,6 +2298,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->rel1.id_y, params[4]);
break;
case EDJE_STATE_PARAM_REL1_OFFSET:
CHKPARAM(4);
@ -2278,6 +2306,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->rel1.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2:
CHKPARAM(4);
@ -2285,6 +2314,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->rel2.relative_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2_TO:
CHKPARAM(4);
@ -2292,6 +2322,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->rel2.id_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2_OFFSET:
CHKPARAM(4);
@ -2299,6 +2330,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->rel2.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_IMAGE:
{
Edje_Part_Description_Image *img;
@ -2311,6 +2343,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_BORDER:
{
Edje_Part_Description_Image *img;
@ -2327,6 +2360,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_SMOOTH:
{
Edje_Part_Description_Image *img;
@ -2348,6 +2382,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_POS:
{
Edje_Part_Description_Image *img;
@ -2377,6 +2412,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_SIZE:
{
Edje_Part_Description_Image *img;
@ -2406,6 +2442,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT:
{
Edje_Part_Description_Text *text;
@ -2422,6 +2459,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_CLASS:
{
Edje_Part_Description_Text *text;
@ -2438,6 +2476,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_FONT:
{
Edje_Part_Description_Text *text;
@ -2452,6 +2491,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_STYLE:
{
Edje_Part_Description_Text *text;
@ -2466,6 +2506,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_SIZE:
{
Edje_Part_Description_Text *text;
@ -2478,6 +2519,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_FIT:
{
Edje_Part_Description_Text *text;
@ -2492,6 +2534,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_MIN:
{
Edje_Part_Description_Text *text;
@ -2508,6 +2551,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_MAX:
{
Edje_Part_Description_Text *text;
@ -2524,6 +2568,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_ALIGN:
{
Edje_Part_Description_Text *text;
@ -2538,78 +2583,91 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_VISIBLE:
CHKPARAM(3);
GETINT(rp->custom->description->visible, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ON:
CHKPARAM(3);
GETINT(rp->custom->description->map.on, params[3]);
break;
case EDJE_STATE_PARAM_MAP_PERSP:
CHKPARAM(3);
GETINT(rp->custom->description->map.id_persp, params[3]);
break;
case EDJE_STATE_PARAM_MAP_LIGHT:
CHKPARAM(3);
GETINT(rp->custom->description->map.id_light, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_CENTER:
CHKPARAM(3);
GETINT(rp->custom->description->map.rot.id_center, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_X:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->map.rot.x, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_Y:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->map.rot.y, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_Z:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->map.rot.z, params[3]);
break;
case EDJE_STATE_PARAM_MAP_BACK_CULL:
CHKPARAM(3);
GETINT(rp->custom->description->map.backcull, params[3]);
break;
case EDJE_STATE_PARAM_MAP_PERSP_ON:
CHKPARAM(3);
GETINT(rp->custom->description->map.persp_on, params[3]);
break;
case EDJE_STATE_PARAM_PERSP_ZPLANE:
CHKPARAM(3);
GETINT(rp->custom->description->persp.zplane, params[3]);
break;
case EDJE_STATE_PARAM_PERSP_FOCAL:
CHKPARAM(3);
GETINT(rp->custom->description->persp.focal, params[3]);
break;
case EDJE_STATE_PARAM_PROXY_SRC_CLIP:
{
Edje_Part_Description_Proxy *proxy;
@ -2622,6 +2680,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_PROXY_SRC_VISIBLE:
{
Edje_Part_Description_Proxy *proxy;
@ -2634,6 +2693,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
#ifdef HAVE_EPHYSICS
case EDJE_STATE_PARAM_PHYSICS_MASS:
CHKPARAM(3);
@ -2641,18 +2701,21 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->physics.mass, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_RESTITUTION:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->physics.restitution, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_FRICTION:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->physics.friction, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DAMPING:
CHKPARAM(4);
@ -2661,6 +2724,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
params[4]);
break;
case EDJE_STATE_PARAM_PHYSICS_SLEEP:
CHKPARAM(4);
@ -2668,31 +2732,37 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETFLOAT_T(rp->custom->description->physics.sleep.angular, params[4]);
break;
case EDJE_STATE_PARAM_PHYSICS_MATERIAL:
CHKPARAM(3);
GETINT(rp->custom->description->physics.material, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DENSITY:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->physics.density, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_HARDNESS:
CHKPARAM(3);
GETFLOAT_T(rp->custom->description->physics.hardness, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_IGNORE_PART_POS:
CHKPARAM(3);
GETINT(rp->custom->description->physics.ignore_part_pos, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_LIGHT_ON:
CHKPARAM(3);
GETINT(rp->custom->description->physics.light_on, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_MOV_FREEDOM_LIN:
CHKPARAM(5);
@ -2700,6 +2770,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->physics.mov_freedom.lin.y, params[4]);
GETINT(rp->custom->description->physics.mov_freedom.lin.z, params[5]);
break;
case EDJE_STATE_PARAM_PHYSICS_MOV_FREEDOM_ANG:
CHKPARAM(5);
@ -2707,21 +2778,25 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom->description->physics.mov_freedom.ang.y, params[4]);
GETINT(rp->custom->description->physics.mov_freedom.ang.z, params[5]);
break;
case EDJE_STATE_PARAM_PHYSICS_BACK_CULL:
CHKPARAM(3);
GETINT(rp->custom->description->physics.backcull, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_Z:
CHKPARAM(3);
GETINT(rp->custom->description->physics.z, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DEPTH:
CHKPARAM(3);
GETINT(rp->custom->description->physics.depth, params[3]);
break;
#endif
default:
break;
@ -2765,6 +2840,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->align.y, params[4]);
break;
case EDJE_STATE_PARAM_MIN:
CHKPARAM(4);
@ -2772,6 +2848,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->min.h, params[4]);
break;
case EDJE_STATE_PARAM_MAX:
CHKPARAM(4);
@ -2779,6 +2856,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->max.h, params[4]);
break;
case EDJE_STATE_PARAM_STEP:
CHKPARAM(4);
@ -2786,6 +2864,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->step.y, params[4]);
break;
case EDJE_STATE_PARAM_ASPECT:
CHKPARAM(4);
@ -2793,12 +2872,14 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->aspect.max, params[4]);
break;
case EDJE_STATE_PARAM_ASPECT_PREF:
CHKPARAM(3);
SETINT(rp->custom->description->aspect.prefer, params[3]);
break;
case EDJE_STATE_PARAM_COLOR:
CHKPARAM(6);
@ -2808,6 +2889,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->color.a, params[6]);
break;
case EDJE_STATE_PARAM_COLOR2:
CHKPARAM(6);
@ -2817,6 +2899,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->color2.a, params[6]);
break;
case EDJE_STATE_PARAM_COLOR3:
{
Edje_Part_Description_Text *text;
@ -2836,6 +2919,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_COLOR_CLASS:
CHKPARAM(4);
@ -2843,6 +2927,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETSTRALLOCATE(s);
break;
case EDJE_STATE_PARAM_REL1:
CHKPARAM(4);
@ -2850,6 +2935,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->rel1.relative_y, params[4]);
break;
case EDJE_STATE_PARAM_REL1_TO:
CHKPARAM(4);
@ -2857,6 +2943,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->rel1.id_y, params[4]);
break;
case EDJE_STATE_PARAM_REL1_OFFSET:
CHKPARAM(4);
@ -2864,6 +2951,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->rel1.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2:
CHKPARAM(4);
@ -2871,6 +2959,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->rel2.relative_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2_TO:
CHKPARAM(4);
@ -2878,6 +2967,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->rel2.id_y, params[4]);
break;
case EDJE_STATE_PARAM_REL2_OFFSET:
CHKPARAM(4);
@ -2885,6 +2975,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->rel2.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_IMAGE:
{
Edje_Part_Description_Image *img;
@ -2898,6 +2989,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_BORDER:
{
Edje_Part_Description_Image *img;
@ -2914,6 +3006,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_SMOOTH:
{
Edje_Part_Description_Image *img;
@ -2937,6 +3030,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_POS:
{
Edje_Part_Description_Image *img;
@ -2966,6 +3060,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_FILL_SIZE:
{
Edje_Part_Description_Image *img;
@ -2995,6 +3090,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT:
{
Edje_Part_Description_Text *text;
@ -3012,6 +3108,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_CLASS:
{
Edje_Part_Description_Text *text;
@ -3029,6 +3126,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_FONT:
{
Edje_Part_Description_Text *text;
@ -3044,6 +3142,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_STYLE:
{
Edje_Part_Description_Text *text;
@ -3059,6 +3158,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_SIZE:
{
Edje_Part_Description_Text *text;
@ -3073,6 +3173,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_FIT:
{
Edje_Part_Description_Text *text;
@ -3087,6 +3188,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_MIN:
{
Edje_Part_Description_Text *text;
@ -3104,6 +3206,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_MAX:
{
Edje_Part_Description_Text *text;
@ -3121,6 +3224,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_TEXT_ALIGN:
{
Edje_Part_Description_Text *text;
@ -3136,78 +3240,91 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_VISIBLE:
CHKPARAM(3);
SETINT(rp->custom->description->visible, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ON:
CHKPARAM(3);
SETINT(rp->custom->description->map.on, params[3]);
break;
case EDJE_STATE_PARAM_MAP_PERSP:
CHKPARAM(3);
SETINT(rp->custom->description->map.id_persp, params[3]);
break;
case EDJE_STATE_PARAM_MAP_LIGHT:
CHKPARAM(3);
SETINT(rp->custom->description->map.id_light, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_CENTER:
CHKPARAM(3);
SETINT(rp->custom->description->map.rot.id_center, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_X:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->map.rot.x, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_Y:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->map.rot.y, params[3]);
break;
case EDJE_STATE_PARAM_MAP_ROT_Z:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->map.rot.z, params[3]);
break;
case EDJE_STATE_PARAM_MAP_BACK_CULL:
CHKPARAM(3);
SETINT(rp->custom->description->map.backcull, params[3]);
break;
case EDJE_STATE_PARAM_MAP_PERSP_ON:
CHKPARAM(3);
SETINT(rp->custom->description->map.persp_on, params[3]);
break;
case EDJE_STATE_PARAM_PERSP_ZPLANE:
CHKPARAM(3);
SETINT(rp->custom->description->persp.zplane, params[3]);
break;
case EDJE_STATE_PARAM_PERSP_FOCAL:
CHKPARAM(3);
SETINT(rp->custom->description->persp.focal, params[3]);
break;
case EDJE_STATE_PARAM_PROXY_SRC_CLIP:
{
Edje_Part_Description_Proxy *proxy;
@ -3220,6 +3337,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
case EDJE_STATE_PARAM_PROXY_SRC_VISIBLE:
{
Edje_Part_Description_Proxy *proxy;
@ -3232,6 +3350,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
}
#ifdef HAVE_EPHYSICS
case EDJE_STATE_PARAM_PHYSICS_MASS:
CHKPARAM(3);
@ -3239,18 +3358,21 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->physics.mass, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_RESTITUTION:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->physics.restitution, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_FRICTION:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->physics.friction, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DAMPING:
CHKPARAM(4);
@ -3259,6 +3381,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
params[4]);
break;
case EDJE_STATE_PARAM_PHYSICS_SLEEP:
CHKPARAM(4);
@ -3266,31 +3389,37 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETFLOAT_T(rp->custom->description->physics.sleep.angular, params[4]);
break;
case EDJE_STATE_PARAM_PHYSICS_MATERIAL:
CHKPARAM(3);
SETINT(rp->custom->description->physics.material, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DENSITY:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->physics.density, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_HARDNESS:
CHKPARAM(3);
SETFLOAT_T(rp->custom->description->physics.hardness, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_IGNORE_PART_POS:
CHKPARAM(3);
SETINT(rp->custom->description->physics.ignore_part_pos, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_LIGHT_ON:
CHKPARAM(3);
SETINT(rp->custom->description->physics.light_on, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_MOV_FREEDOM_LIN:
CHKPARAM(5);
@ -3298,6 +3427,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->physics.mov_freedom.lin.y, params[4]);
SETINT(rp->custom->description->physics.mov_freedom.lin.z, params[5]);
break;
case EDJE_STATE_PARAM_PHYSICS_MOV_FREEDOM_ANG:
CHKPARAM(5);
@ -3305,21 +3435,25 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom->description->physics.mov_freedom.ang.y, params[4]);
SETINT(rp->custom->description->physics.mov_freedom.ang.z, params[5]);
break;
case EDJE_STATE_PARAM_PHYSICS_BACK_CULL:
CHKPARAM(3);
SETINT(rp->custom->description->physics.backcull, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_Z:
CHKPARAM(3);
SETINT(rp->custom->description->physics.z, params[3]);
break;
case EDJE_STATE_PARAM_PHYSICS_DEPTH:
CHKPARAM(3);
SETINT(rp->custom->description->physics.depth, params[3]);
break;
#endif
default:
break;
@ -3969,6 +4103,7 @@ _edje_embryo_fn_physics_get_rotation(Embryo_Program *ep, Embryo_Cell *params)
return 0;
}
#endif
void
@ -4203,3 +4338,4 @@ _edje_embryo_globals_init(Edje *ed)
}
}
}

38
src/lib/edje/edje_entry.c
View File

@ -142,6 +142,7 @@ _edje_entry_focus_out_cb(void *data, Evas_Object *o EINA_UNUSED, const char *emi
ecore_imf_context_reset(en->imf_context);
ecore_imf_context_focus_out(en->imf_context);
}
#endif
static void
@ -242,7 +243,8 @@ _text_filter_markup_prepend_internal(Edje *ed, Entry *en, Evas_Textblock_Cursor
_range_del_emit(ed, en->cursor, en->rp->object, en);
if (info) info->merge = EINA_TRUE;
}
if (info) info->change.insert.pos =
if (info)
info->change.insert.pos =
evas_textblock_cursor_pos_get(en->cursor);
if (fmtpre) _text_filter_format_prepend(ed, en, en->cursor, fmtpre);
evas_object_textblock_text_markup_prepend(c, text);
@ -314,7 +316,8 @@ _text_filter_format_prepend(Edje *ed, Entry *en, Evas_Textblock_Cursor *c, const
if (*s == '+')
{
s++;
while (*s == ' ') s++;
while (*s == ' ')
s++;
if (!*s)
{
free(text2);
@ -332,7 +335,8 @@ _text_filter_format_prepend(Edje *ed, Entry *en, Evas_Textblock_Cursor *c, const
else if (s[0] == '-')
{
s++;
while (*s == ' ') s++;
while (*s == ' ')
s++;
if (!*s)
{
free(text2);
@ -411,6 +415,7 @@ _curs_update_from_curs(Evas_Textblock_Cursor *c, Evas_Object *o EINA_UNUSED, Ent
case EDJE_ENTRY_CURSOR_MODE_BEFORE:
cur_type = EVAS_TEXTBLOCK_CURSOR_BEFORE;
break;
case EDJE_ENTRY_CURSOR_MODE_UNDER:
/* no break for a reason */
default:
@ -1357,7 +1362,8 @@ _compose_seq_reset(Entry *en)
{
char *str;
EINA_LIST_FREE(en->seq, str) eina_stringshare_del(str);
EINA_LIST_FREE(en->seq, str)
eina_stringshare_del(str);
en->composing = EINA_FALSE;
}
@ -2257,7 +2263,6 @@ _edje_part_mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
(rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE))
return;
/* We don't check for ON_HOLD because we'd like to end selection anyway when
* mouse is up, even if it's held. */
@ -2711,6 +2716,7 @@ _edje_entry_real_part_configure(Edje *ed, Edje_Real_Part *rp)
case EDJE_ENTRY_CURSOR_MODE_BEFORE:
cur_type = EVAS_TEXTBLOCK_CURSOR_BEFORE;
break;
case EDJE_ENTRY_CURSOR_MODE_UNDER:
/* no break for a reason */
default:
@ -3071,6 +3077,7 @@ _edje_entry_cursor_geometry_get(Edje_Real_Part *rp, Evas_Coord *cx, Evas_Coord *
case EDJE_ENTRY_CURSOR_MODE_BEFORE:
cur_type = EVAS_TEXTBLOCK_CURSOR_BEFORE;
break;
case EDJE_ENTRY_CURSOR_MODE_UNDER:
/* no break for a reason */
default:
@ -3516,7 +3523,8 @@ _edje_entry_input_panel_show_on_demand_get(Edje_Real_Part *rp)
en = rp->typedata.text->entry_data;
if (!en) return EINA_FALSE;
#ifdef HAVE_ECORE_IMF
if (en->imf_context) {
if (en->imf_context)
{
Eina_Bool ret = ecore_imf_context_input_panel_show_on_demand_get(en->imf_context);
return ret;
}
@ -3537,26 +3545,33 @@ _cursor_get(Edje_Real_Part *rp, Edje_Cursor cur)
{
case EDJE_CURSOR_MAIN:
return en->cursor;
case EDJE_CURSOR_SELECTION_BEGIN:
return en->sel_start;
case EDJE_CURSOR_SELECTION_END:
return en->sel_end;
case EDJE_CURSOR_PREEDIT_START:
if (!en->preedit_start)
en->preedit_start = evas_object_textblock_cursor_new(rp->object);
return en->preedit_start;
case EDJE_CURSOR_PREEDIT_END:
if (!en->preedit_end)
en->preedit_end = evas_object_textblock_cursor_new(rp->object);
return en->preedit_end;
case EDJE_CURSOR_USER:
if (!en->cursor_user)
en->cursor_user = evas_object_textblock_cursor_new(rp->object);
return en->cursor_user;
case EDJE_CURSOR_USER_EXTRA:
if (!en->cursor_user_extra)
en->cursor_user_extra = evas_object_textblock_cursor_new(rp->object);
return en->cursor_user_extra;
default:
break;
}
@ -4130,7 +4145,6 @@ _edje_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED,
EINA_TRUE, EINA_TRUE);
}
_edje_entry_imf_cursor_info_set(en);
_anchors_get(en->cursor, rp->object, en);
if (info)
@ -4154,8 +4168,10 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA
int preedit_start_pos, preedit_end_pos;
char *preedit_string;
char *markup_txt = NULL;
char *tagname[] = {NULL, "preedit", "preedit_sel", "preedit_sel",
"preedit_sub1", "preedit_sub2", "preedit_sub3", "preedit_sub4"};
char *tagname[] = {
NULL, "preedit", "preedit_sel", "preedit_sel",
"preedit_sub1", "preedit_sub2", "preedit_sub3", "preedit_sub4"
};
int i;
size_t preedit_type_size = sizeof(tagname) / sizeof(tagname[0]);
Eina_Bool preedit_end_state = EINA_FALSE;
@ -4293,7 +4309,8 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA
/* delete attribute list */
if (attrs)
{
EINA_LIST_FREE(attrs, attr) free(attr);
EINA_LIST_FREE(attrs, attr)
free(attr);
}
free(preedit_string);
@ -4406,6 +4423,7 @@ _edje_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UN
else
return EINA_FALSE;
}
#endif
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/

6
src/lib/edje/edje_external.c
View File

@ -10,14 +10,19 @@ edje_external_param_type_str(Edje_External_Param_Type type)
{
case EDJE_EXTERNAL_PARAM_TYPE_INT:
return "INT";
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
return "DOUBLE";
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
return "STRING";
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
return "BOOL";
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
return "CHOICE";
default:
return "(unknown)";
}
@ -563,3 +568,4 @@ _edje_external_parsed_params_free(Evas_Object *obj, void *params)
type->params_free(params);
}

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

@ -16,10 +16,12 @@ struct _Edje_Drag_Items
{
const char *part;
FLOAT_T x, y, w, h;
struct {
struct
{
FLOAT_T x, y;
} step;
struct {
struct
{
FLOAT_T x, y;
} page;
};
@ -29,8 +31,8 @@ void _edje_file_add(Edje *ed, const Eina_File *f);
/* START - Nested part support */
#define _edje_smart_nested_type "Evas_Smart_Nested"
typedef struct _Edje_Nested_Support Edje_Nested_Support;
struct _Edje_Nested_Support
{ /* We builed nested-parts list using this struct */
struct _Edje_Nested_Support /* We builed nested-parts list using this struct */
{
Evas_Object *o; /* Smart object containing nested children */
unsigned char nested_children_count; /* Number of nested children */
};
@ -136,7 +138,6 @@ edje_smart_nested_add(Evas *evas)
/* END - Nested part support */
#ifdef EDJE_PROGRAM_CACHE
static Eina_Bool _edje_collection_free_prog_cache_matches_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
#endif
@ -169,24 +170,34 @@ edje_load_error_str(Edje_Load_Error error)
{
case EDJE_LOAD_ERROR_NONE:
return "No Error";
case EDJE_LOAD_ERROR_GENERIC:
return "Generic Error";
case EDJE_LOAD_ERROR_DOES_NOT_EXIST:
return "File Does Not Exist";
case EDJE_LOAD_ERROR_PERMISSION_DENIED:
return "Permission Denied";
case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
return "Resource Allocation Failed";
case EDJE_LOAD_ERROR_CORRUPT_FILE:
return "Corrupt File";
case EDJE_LOAD_ERROR_UNKNOWN_FORMAT:
return "Unknown Format";
case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE:
return "Incompatible File";
case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION:
return "Unknown Collection";
case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE:
return "Recursive Reference";
default:
return "Unknown Error";
}
@ -450,6 +461,7 @@ _edje_physics_world_update_cb(void *data, EPhysics_World *world EINA_UNUSED, voi
Edje *edje = data;
_edje_recalc_do(edje);
}
#endif
int
@ -590,8 +602,8 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
ep = ed->collection->parts[n];
if (ep->nested_children_count)
{ /* Add object to nested parts list */
if (ep->nested_children_count) /* Add object to nested parts list */
{
st_nested = malloc(sizeof(*st_nested));
nested_smart = st_nested->o = edje_smart_nested_add(tev);
@ -641,6 +653,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
rp->typedata.text = calloc(1, sizeof(Edje_Real_Part_Text));
if (!rp->typedata.text) memerr = EINA_TRUE;
break;
case EDJE_PART_TYPE_GROUP:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_EXTERNAL:
@ -648,12 +661,14 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
rp->typedata.swallow = calloc(1, sizeof(Edje_Real_Part_Swallow));
if (!rp->typedata.swallow) memerr = EINA_TRUE;
break;
case EDJE_PART_TYPE_BOX:
case EDJE_PART_TYPE_TABLE:
rp->type = EDJE_RP_TYPE_CONTAINER;
rp->typedata.container = calloc(1, sizeof(Edje_Real_Part_Container));
if (!rp->typedata.container) memerr = EINA_TRUE;
break;
default:
break;
}
@ -683,17 +698,21 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
case EDJE_PART_TYPE_RECTANGLE:
rp->object = evas_object_rectangle_add(ed->base->evas);
break;
case EDJE_PART_TYPE_PROXY:
case EDJE_PART_TYPE_IMAGE:
rp->object = evas_object_image_add(ed->base->evas);
break;
case EDJE_PART_TYPE_TEXT:
_edje_text_part_on_add(ed, rp);
rp->object = evas_object_text_add(ed->base->evas);
evas_object_text_font_source_set(rp->object, ed->path);
break;
case EDJE_PART_TYPE_GROUP:
sources = eina_list_append(sources, rp);
// fallthrough intentional
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_EXTERNAL:
@ -705,27 +724,33 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
evas_object_pointer_mode_set(rp->object, EVAS_OBJECT_POINTER_MODE_NOGRAB);
_edje_callbacks_focus_add(rp->object, ed, rp);
break;
case EDJE_PART_TYPE_TEXTBLOCK:
_edje_textblock_styles_add(ed, rp);
textblocks = eina_list_append(textblocks, rp);
rp->object = evas_object_textblock_add(ed->base->evas);
break;
case EDJE_PART_TYPE_BOX:
sources = eina_list_append(sources, rp);
rp->object = evas_object_box_add(ed->base->evas);
rp->typedata.container->anim = _edje_box_layout_anim_new(rp->object);
break;
case EDJE_PART_TYPE_TABLE:
sources = eina_list_append(sources, rp);
rp->object = evas_object_table_add(ed->base->evas);
break;
case EDJE_PART_TYPE_GRADIENT:
ERR("SPANK ! SPANK ! SPANK ! YOU ARE USING GRADIENT IN PART %s FROM GROUP %s INSIDE FILE %s !! THEY ARE NOW REMOVED !",
ep->name, group, eina_file_filename_get(file));
break;
case EDJE_PART_TYPE_SPACER:
rp->object = NULL;
break;
default:
ERR("wrong part type %i!", ep->type);
break;
@ -733,15 +758,15 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
if (rp->object)
{
if (nested_smart)
{ /* Update this pointer to father object only
if (nested_smart) /* Update this pointer to father object only
this will make smart object size == father sz */
{
rp->nested_smart = nested_smart;
nested_smart = NULL;
}
if (st_nested && st_nested->nested_children_count)
{ /* Add this to list of children */
if (st_nested && st_nested->nested_children_count) /* Add this to list of children */
{
evas_object_smart_member_add(rp->object,
st_nested->o);
@ -948,6 +973,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
case EDJE_PART_TYPE_GROUP:
source = rp->part->source;
break;
case EDJE_PART_TYPE_BOX:
case EDJE_PART_TYPE_TABLE:
if (rp->part->items)
@ -963,6 +989,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
}
}
break;
default:
/* This list should only be filled by group, box or table, nothing else. */
abort();
@ -1137,36 +1164,43 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch
edje_object_part_swallow(obj, eud->part, eud->u.swallow.child);
child = eud->u.swallow.child;
break;
case EDJE_USER_BOX_PACK:
boxes = eina_list_append(boxes, eud);
eud = NULL;
break;
case EDJE_USER_TABLE_PACK:
edje_object_part_table_pack(obj, eud->part, eud->u.table.child,
eud->u.table.col, eud->u.table.row,
eud->u.table.colspan, eud->u.table.rowspan);
child = eud->u.table.child;
break;
case EDJE_USER_DRAG_STEP:
edje_object_part_drag_step_set(obj, eud->part,
eud->u.drag_position.x,
eud->u.drag_position.y);
break;
case EDJE_USER_DRAG_PAGE:
edje_object_part_drag_page_set(obj, eud->part,
eud->u.drag_position.x,
eud->u.drag_position.y);
break;
case EDJE_USER_DRAG_VALUE:
edje_object_part_drag_value_set(obj, eud->part,
eud->u.drag_position.x,
eud->u.drag_position.y);
break;
case EDJE_USER_DRAG_SIZE:
edje_object_part_drag_size_set(obj, eud->part,
eud->u.drag_size.w,
eud->u.drag_size.h);
break;
case EDJE_USER_STRING:
edje_object_part_text_set(obj, eud->part, eud->u.string.text);
eina_stringshare_del(eud->u.string.text);
@ -1315,6 +1349,7 @@ _edje_object_collect(Edje *ed)
case EDJE_USER_STRING:
eud->u.string.text = eina_stringshare_ref(eud->u.string.text);
break;
case EDJE_USER_BOX_PACK:
if (eud->u.box.index == -1)
{
@ -1349,6 +1384,7 @@ _edje_object_collect(Edje *ed)
}
}
break;
case EDJE_USER_TABLE_PACK:
{
Edje_Real_Part *rp;
@ -1361,9 +1397,11 @@ _edje_object_collect(Edje *ed)
}
break;
}
case EDJE_USER_SWALLOW:
edje_object_part_unswallow(NULL, eud->u.swallow.child);
break;
case EDJE_USER_DRAG_STEP:
case EDJE_USER_DRAG_PAGE:
case EDJE_USER_DRAG_VALUE:
@ -1471,9 +1509,11 @@ _edje_file_del(Edje *ed)
_edje_external_parsed_params_free(rp->typedata.swallow->swallowed_object, rp->param1.external_params);
if (rp->param2)
_edje_external_parsed_params_free(rp->typedata.swallow->swallowed_object, rp->param2->external_params);
// fallthrough intentional
case EDJE_PART_TYPE_GROUP:
evas_object_del(rp->typedata.swallow->swallowed_object);
default:
break;
}
@ -1586,7 +1626,8 @@ _edje_file_del(Edje *ed)
}
if (ed->L) _edje_lua2_script_shutdown(ed);
while (ed->subobjs) _edje_subobj_unregister(ed, ed->subobjs->data);
while (ed->subobjs)
_edje_subobj_unregister(ed, ed->subobjs->data);
if (ed->table_parts) free(ed->table_parts);
ed->table_parts = NULL;
ed->table_parts_size = 0;
@ -1631,7 +1672,6 @@ _edje_file_free(Edje_File *edf)
EINA_LIST_FREE(edf->image_dir->sets[i].entries, se)
free(se);
}
free(edf->image_dir->entries);
@ -1852,6 +1892,7 @@ _edje_collection_free_part_description_clean(int type, Edje_Part_Description_Com
free(img->image.tweens);
break;
}
case EDJE_PART_TYPE_EXTERNAL:
{
Edje_Part_Description_External *external;
@ -1862,6 +1903,7 @@ _edje_collection_free_part_description_clean(int type, Edje_Part_Description_Com
_edje_external_params_free(external->external_params, free_strings);
break;
}
case EDJE_PART_TYPE_TEXT:
case EDJE_PART_TYPE_TEXTBLOCK:
if (free_strings)
@ -1919,6 +1961,7 @@ _edje_collection_free_prog_cache_matches_free_cb(const Eina_Hash *hash EINA_UNUS
hash = NULL;
fdata = NULL;
}
#endif
static void
@ -1955,9 +1998,13 @@ _edje_object_pack_item_hints_set(Evas_Object *obj, Edje_Pack_Element *it)
switch (it->aspect.mode)
{
case EDJE_ASPECT_CONTROL_NONE: mode = EVAS_ASPECT_CONTROL_NONE; break;
case EDJE_ASPECT_CONTROL_NEITHER: mode = EVAS_ASPECT_CONTROL_NEITHER; break;
case EDJE_ASPECT_CONTROL_HORIZONTAL: mode = EVAS_ASPECT_CONTROL_HORIZONTAL; break;
case EDJE_ASPECT_CONTROL_VERTICAL: mode = EVAS_ASPECT_CONTROL_VERTICAL; break;
case EDJE_ASPECT_CONTROL_BOTH: mode = EVAS_ASPECT_CONTROL_BOTH; break;
}
evas_object_size_hint_aspect_set(obj, mode, it->aspect.w, it->aspect.h);
@ -2106,3 +2153,4 @@ _cb_signal_repeat(void *data, Evas_Object *obj, const char *sig, const char *sou
_edje_util_message_send(ed_parent, EDJE_QUEUE_SCRIPT,
EDJE_MESSAGE_SIGNAL, 0, &emsg);
}

30
src/lib/edje/edje_lua.c
View File

@ -135,15 +135,19 @@ __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int
case LUA_ERRRUN:
err_type = "runtime";
break;
case LUA_ERRSYNTAX:
err_type = "syntax";
break;
case LUA_ERRMEM:
err_type = "memory allocation";
break;
case LUA_ERRERR:
err_type = "error handler";
break;
default:
err_type = "unknown";
break;
@ -687,7 +691,6 @@ const luaL_Reg lClass_fn[] = {
{NULL, NULL} // sentinel
};
const luaL_Reg lTimer_get[];
const luaL_Reg lTimer_set[];
@ -2131,7 +2134,7 @@ _edje_lua_image_get_size(lua_State *L)
lua_pushnumber(L, h);
lua_rawseti(L, -2, 2);
return 1;
};
}
const luaL_Reg lImage_get[] = {
{"size", _edje_lua_image_get_size},
@ -3034,7 +3037,6 @@ _edje_lua_description_set_aspect(lua_State *L)
obj->rp->custom->description->aspect.min = FROM_DOUBLE(luaL_checknumber(L, -2));
obj->rp->custom->description->aspect.max = FROM_DOUBLE(luaL_checknumber(L, -1));
return 0;
}
static int
@ -3045,7 +3047,6 @@ _edje_lua_description_set_aspect_pref(lua_State *L)
if (!obj->rp->custom) return 0;
obj->rp->custom->description->aspect.prefer = luaL_checknumber(L, 2);
return 0;
}
static int
@ -3551,7 +3552,7 @@ _edje_lua_part_get_states_list(lua_State *L)
}
edje_edit_string_list_free(slist);
return 1;
};
}
static int
_edje_lua_part_get_state(lua_State *L)
@ -3566,7 +3567,7 @@ _edje_lua_part_get_state(lua_State *L)
lua_pushnumber(L, val);
lua_rawseti(L, -2, 2);
return 1;
};
}
static int
_edje_lua_part_get_text(lua_State *L)
@ -3574,7 +3575,7 @@ _edje_lua_part_get_text(lua_State *L)
Edje_Lua_Edje_Part_Object *obj = _edje_lua_checkudata(L, 1, &mPart);
lua_pushstring(L, edje_object_part_text_get(obj->ed->obj, obj->key));
return 1;
};
}
static int
_edje_lua_part_get_text_selection(lua_State *L)
@ -3583,7 +3584,7 @@ _edje_lua_part_get_text_selection(lua_State *L)
lua_pushstring(L,
edje_object_part_text_selection_get(obj->ed->obj, obj->key));
return 1;
};
}
static int
_edje_lua_part_get_drag_dir(lua_State *L)
@ -4388,6 +4389,7 @@ _edje_lua_group_set_frametime(lua_State *L)
edje_frametime_set(luaL_checknumber(L, 2));
return 0;
}
const luaL_Reg lGroup_set[] = {
{"group", _edje_lua_group_set_group},
{"size_min", _edje_lua_group_set_size_min},
@ -4557,8 +4559,10 @@ _edje_lua_group_fn_message_send(lua_State *L)
{
case EDJE_MESSAGE_NONE:
break;
case EDJE_MESSAGE_SIGNAL:
break;
case EDJE_MESSAGE_STRING:
{
Edje_Message_String *msg_string =
@ -4567,6 +4571,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string;
}
break;
case EDJE_MESSAGE_INT:
{
Edje_Message_Int *msg_int = malloc(sizeof(Edje_Message_Int));
@ -4575,6 +4580,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_int;
}
break;
case EDJE_MESSAGE_FLOAT:
{
Edje_Message_Float *msg_float = malloc(sizeof(Edje_Message_Float));
@ -4583,6 +4589,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_float;
}
break;
case EDJE_MESSAGE_STRING_SET:
{
if (lua_type(L, 4) != LUA_TTABLE)
@ -4601,6 +4608,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string_set;
}
break;
case EDJE_MESSAGE_INT_SET:
{
if (lua_type(L, 4) != LUA_TTABLE)
@ -4618,6 +4626,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_int_set;
}
break;
case EDJE_MESSAGE_FLOAT_SET:
{
if (lua_type(L, 4) != LUA_TTABLE)
@ -4636,6 +4645,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_float_set;
}
break;
case EDJE_MESSAGE_STRING_INT:
{
Edje_Message_String_Int *msg_string_int =
@ -4645,6 +4655,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string_int;
}
break;
case EDJE_MESSAGE_STRING_FLOAT:
{
Edje_Message_String_Float *msg_string_float =
@ -4654,6 +4665,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string_float;
}
break;
case EDJE_MESSAGE_STRING_INT_SET:
{
if (lua_type(L, 5) != LUA_TTABLE)
@ -4673,6 +4685,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string_int_set;
}
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
{
if (lua_type(L, 5) != LUA_TTABLE)
@ -4692,6 +4705,7 @@ _edje_lua_group_fn_message_send(lua_State *L)
msg = msg_string_float_set;
}
break;
default:
break;
}

124
src/lib/edje/edje_lua2.c
View File

@ -1,12 +1,10 @@
// FIXME: Some error checking would be nice.
#include "edje_private.h"
#include <ctype.h>
#define RASTER_FORGOT_WHY "this is here."
//--------------------------------------------------------------------------//
#define MAX_LUA_MEM (4 * (1024 * 1024))
#define ELO "|-ELO"
@ -125,7 +123,6 @@ struct _Edje_Lua_Map
Evas_Map *map;
};
static void _elua_add_functions(lua_State *L, const char *api, const luaL_Reg *funcs, const char *meta, const char *parent, const char *base);
static Eina_Bool _elua_isa(Edje_Lua_Obj *obj, const char *type);
@ -466,6 +463,7 @@ _elua_scan_params(lua_State *L, int i, char *params, ...) // Stac
}
break;
}
case '#':
{
if (table)
@ -480,6 +478,7 @@ _elua_scan_params(lua_State *L, int i, char *params, ...) // Stac
}
break;
}
case '$':
{
if (table)
@ -502,6 +501,7 @@ _elua_scan_params(lua_State *L, int i, char *params, ...) // Stac
}
break;
}
case '!':
{
if (table)
@ -516,6 +516,7 @@ _elua_scan_params(lua_State *L, int i, char *params, ...) // Stac
}
break;
}
default:
{
get = EINA_FALSE;
@ -575,24 +576,28 @@ _elua_ret(lua_State *L, char *params, ...) // Stack usage [-(2*n)
lua_pushinteger(L, va_arg(vl, int)); // Stack usage [-0, +1, -]
break;
}
case '#':
{
q = _elua_push_name(L, q, -1); // Stack usage [-0, +1, m]
lua_pushnumber(L, va_arg(vl, double)); // Stack usage [-0, +1, -]
break;
}
case '$':
{
q = _elua_push_name(L, q, -1); // Stack usage [-0, +1, m]
lua_pushstring(L, va_arg(vl, char *)); // Stack usage [-0, +1, m]
break;
}
case '!':
{
q = _elua_push_name(L, q, -1); // Stack usage [-0, +1, m]
lua_pushboolean(L, va_arg(vl, int)); // Stack usage [-0, +1, -]
break;
}
default:
{
set = EINA_FALSE;
@ -762,8 +767,8 @@ _elua_date(lua_State *L) // Stack usage [-16, +17, em]
tzset();
}
tm = localtime(&tt);
if (tm)
{ // Stack usage [-16, +17, em]
if (tm) // Stack usage [-16, +17, em]
{
_elua_ret(L, "%year %month %day %yearday %weekday %hour %min #sec",
(int)(tm->tm_year + 1900),
(int)(tm->tm_mon + 1),
@ -774,8 +779,6 @@ _elua_date(lua_State *L) // Stack usage [-16, +17, em]
(int)(tm->tm_min),
(double)((double)tm->tm_sec + (((double)timev.tv_usec) / 1000000))
);
}
return 1;
}
@ -1443,8 +1446,8 @@ _elua_color_class(lua_State *L) // Stack usage [-(1
if (!class) return 0;
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
_elua_color_fix(&r, &g, &b, &a);
// This is the way that embryo does it -
//edje_object_color_class_set(ed->obj, class, r, g, b, a, r, g, b, a, r, g, b, a);
@ -2074,8 +2077,8 @@ _elua_geom(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_meta)) return 0;
evas_object_geometry_get(elo->evas_obj, &ox, &oy, &ow, &oh);
if (_elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
if ((x != (ox - obj->ed->x)) || (y != (oy - obj->ed->y)))
{
evas_object_move(elo->evas_obj,
@ -2124,8 +2127,8 @@ _elua_move(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_meta)) return 0;
evas_object_geometry_get(elo->evas_obj, &ox, &oy, NULL, NULL);
if (_elua_scan_params(L, 2, "%x %y", &x, &y) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2, "%x %y", &x, &y) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
if ((x != (ox - obj->ed->x)) || (y != (oy - obj->ed->y)))
{
evas_object_move(elo->evas_obj,
@ -2182,8 +2185,8 @@ _elua_resize(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_meta)) return 0;
evas_object_geometry_get(elo->evas_obj, NULL, NULL, &ow, &oh);
if (_elua_scan_params(L, 2, "%w %h", &w, &h) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2, "%w %h", &w, &h) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
if ((w != ow) || (h != oh))
{
evas_object_resize(elo->evas_obj, w, h);
@ -2465,8 +2468,8 @@ _elua_color(lua_State *L) // Stack usage [
int r, g, b, a;
if (!_elua_isa(obj, _elua_evas_meta)) return 0;
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
_elua_color_fix(&r, &g, &b, &a);
evas_object_color_set(elo->evas_obj, r, g, b, a);
}
@ -2656,14 +2659,23 @@ _elua_edje_file(lua_State *L) // Stack usage [
switch (err)
{
case EDJE_LOAD_ERROR_NONE: LE("Edje file loading errer %s %s - no error happened, but you should not see this.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_GENERIC: LE("Edje file loading errer %s %s - generic error.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_DOES_NOT_EXIST: LE("Edje file loading errer %s %s - file does not exist.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_PERMISSION_DENIED: LE("Edje file loading errer %s %s - permission denied reading the file.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED: LE("Edje file loading errer %s %s - resource allocation failed.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_CORRUPT_FILE: LE("Edje file loading errer %s %s - corrupt file.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_UNKNOWN_FORMAT: LE("Edje file loading errer %s %s - unknown file format.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_INCOMPATIBLE_FILE: LE("Edje file loading errer %s %s - incompatible file.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_UNKNOWN_COLLECTION: LE("Edje file loading errer %s %s - unknown group.", obj->ed->file->path, group); break;
case EDJE_LOAD_ERROR_RECURSIVE_REFERENCE: LE("Edje file loading errer %s %s - recursive reference in group.", obj->ed->file->path, group); break;
}
}
@ -2740,8 +2752,8 @@ _elua_image_fill(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_image_meta)) return 0;
if (_elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_object_image_fill_set(elo->evas_obj, x, y, w, h);
}
evas_object_image_fill_get(elo->evas_obj, &x, &y, &w, &h);
@ -2930,7 +2942,8 @@ table.
@since 1.1.0
*/
static int _elua_line_xy(lua_State *L) // Stack usage [-(8|12), +(9|13), em]
static int
_elua_line_xy(lua_State *L) // Stack usage [-(8|12), +(9|13), em]
{
Edje_Lua_Obj *obj = (Edje_Lua_Obj *)lua_touserdata(L, 1); // Stack usage [-0, +0, -]
Edje_Lua_Evas_Object *elo = (Edje_Lua_Evas_Object *)obj;
@ -2938,8 +2951,8 @@ static int _elua_line_xy(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_line_meta)) return 0;
if (_elua_scan_params(L, 2, "%x1 %y1 %x2 %y2", &x1, &y1, &x2, &y2) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%x1 %y1 %x2 %y2", &x1, &y1, &x2, &y2) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_object_line_xy_set(elo->evas_obj, x1, y1, x2, y2);
}
evas_object_line_xy_get(elo->evas_obj, &x1, &y1, &x2, &y2);
@ -3104,8 +3117,8 @@ _elua_map_colour(lua_State *L) // Stack usage [
{
case 5:
{
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%r %g %b %a", &r, &g, &b, &a) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_map_util_points_color_set(elm->map, r, g, b, a);
}
break;
@ -3114,8 +3127,8 @@ _elua_map_colour(lua_State *L) // Stack usage [
case 1:
case 6:
{
if (_elua_scan_params(L, 3, "%r %g %b %a", &r, &g, &b, &a) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 3, "%r %g %b %a", &r, &g, &b, &a) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_map_point_color_set(elm->map, lua_tointeger(L, 2), r, g, b, a);
// Stack usage [-0, +0, -]
}
@ -3165,8 +3178,8 @@ _elua_map_coord(lua_State *L) // Stack usage [
n = lua_gettop(L); // Stack usage [-0, +0, -]
if (2 > n) return 0;
if (_elua_scan_params(L, 2, "%x %y %z", &x, &y, &z) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (_elua_scan_params(L, 2, "%x %y %z", &x, &y, &z) > 0) // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
{
evas_map_point_coord_set(elm->map, lua_tointeger(L, 2), x, y, z);
// Stack usage [-0, +0, -]
}
@ -3212,8 +3225,8 @@ _elua_map_lighting(lua_State *L) // Stack usage [
// Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (n += _elua_scan_params(L, 2 + n, "%r %g %b", &r, &g, &b) > 0)
// Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (_elua_scan_params(L, 2 + n, "%r %g %b", &r1, &g1, &b1) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (_elua_scan_params(L, 2 + n, "%r %g %b", &r1, &g1, &b1) > 0) // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
{
evas_map_util_3d_lighting(elm->map, x, y, z, r, g, b, r1, g1, b1);
}
return 0;
@ -3245,8 +3258,8 @@ _elua_map_perspective(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_map_meta)) return 0;
if (_elua_scan_params(L, 2, "%x %y %z %f", &x, &y, &z, &f) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if (_elua_scan_params(L, 2, "%x %y %z %f", &x, &y, &z, &f) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_map_util_3d_perspective(elm->map, x, y, z, f);
}
return 0;
@ -3316,8 +3329,8 @@ _elua_map_populate(lua_State *L) // Stack usage [
{
Evas_Coord x, y, w, h;
if ((n = _elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h)) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
if ((n = _elua_scan_params(L, 2, "%x %y %w %h", &x, &y, &w, &h)) > 0) // Stack usage [-0, +0, m] unless it's in a table [-4, +4, e]
{
evas_map_util_points_populate_from_geometry(elm->map, x, y, w, h, lua_tointeger(L, 2 + n));
}
break;
@ -3356,8 +3369,8 @@ _elua_map_rotate(lua_State *L) // Stack usage [
if (4 != n) return 0;
degrees = lua_tonumber(L, 2);
if (_elua_scan_params(L, 3, "%x %y", &x, &y) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 3, "%x %y", &x, &y) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
evas_map_util_rotate(elm->map, degrees, x, y);
}
return 0;
@ -3396,8 +3409,8 @@ _elua_map_rotate3d(lua_State *L) // Stack usage [
if ((n = _elua_scan_params(L, 2, "#x #y #z", &zx, &zy, &zz)) > 0)
// Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (_elua_scan_params(L, 2 + n, "%x %y %z", &x, &y, &z) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
if (_elua_scan_params(L, 2 + n, "%x %y %z", &x, &y, &z) > 0) // Stack usage [-0, +0, m] unless it's in a table [-3, +3, e]
{
evas_map_util_3d_rotate(elm->map, zx, zy, zz, x, y, z);
}
return 0;
@ -3473,8 +3486,8 @@ _elua_map_uv(lua_State *L) // Stack usage [
n = lua_gettop(L); // Stack usage [-0, +0, -]
if (2 > n) return 0;
if (_elua_scan_params(L, 3, "#u #v", &u, &v) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 3, "#u #v", &u, &v) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
evas_map_point_image_uv_set(elm->map, lua_tonumber(L, 2), u, v);
// Stack usage [-0, +0, -]
}
@ -3515,8 +3528,8 @@ _elua_map_zoom(lua_State *L) // Stack usage [
if ((n = _elua_scan_params(L, 2, "#x #y", &zx, &zy)) > 0)
// Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2 + n, "%x %y", &x, &y) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2 + n, "%x %y", &x, &y) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
evas_map_util_zoom(elm->map, zx, zy, x, y);
}
return 0;
@ -3594,8 +3607,8 @@ _elua_polygon_point(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_polygon_meta)) return 0;
if (_elua_scan_params(L, 2, "%x %y", &x, &y) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2, "%x %y", &x, &y) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
evas_object_polygon_point_add(elo->evas_obj, x, y);
}
@ -3665,8 +3678,8 @@ _elua_text_font(lua_State *L) // Stack usage [
if (!_elua_isa(obj, _elua_evas_text_meta)) return 0;
if (_elua_scan_params(L, 2, "$font %size", &font, &size) > 0)
{ // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
if (_elua_scan_params(L, 2, "$font %size", &font, &size) > 0) // Stack usage [-0, +0, m] unless it's in a table [-2, +2, e]
{
/* Check if the font is embedded in the .edj
* This is a simple check.
* There is a much more complicated version in edje_text.c _edje_text_recalc_apply().
@ -3742,7 +3755,6 @@ _elua_text_text(lua_State *L) // Stack usage [
return 1;
}
//--------------------------------------------------------------------------//
// A metatable and functions so that calling non existant API does not crash Lua scripts.
@ -3925,6 +3937,7 @@ _elua_init(void)
lua_rawset(L, -3); // Stack usage [-2, +0, m]
lua_rawset(L, LUA_REGISTRYINDEX); // Stack usage [-2, +0, m]
}
#endif
void
@ -4125,15 +4138,19 @@ _edje_lua2_error_full(const char *file, const char *fnc, int line,
case LUA_ERRRUN:
err_type = "runtime";
break;
case LUA_ERRSYNTAX:
err_type = "syntax";
break;
case LUA_ERRMEM:
err_type = "memory allocation";
break;
case LUA_ERRERR:
err_type = "error handler";
break;
default:
err_type = "unknown";
break;
@ -4293,26 +4310,31 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
case EDJE_MESSAGE_NONE:
lua_pushstring(ed->L, "none"); // Stack usage [-0, +1, m]
break;
case EDJE_MESSAGE_SIGNAL:
break;
case EDJE_MESSAGE_STRING:
lua_pushstring(ed->L, "str"); // Stack usage [-0, +1, m]
lua_pushstring(ed->L, ((Edje_Message_String *)em->msg)->str);
// Stack usage [-0, +1, m]
n += 1;
break;
case EDJE_MESSAGE_INT:
lua_pushstring(ed->L, "int"); // Stack usage [-0, +1, m]
lua_pushinteger(ed->L, ((Edje_Message_Int *)em->msg)->val);
// Stack usage [-0, +1, -]
n += 1;
break;
case EDJE_MESSAGE_FLOAT:
lua_pushstring(ed->L, "float"); // Stack usage [-0, +1, m]
lua_pushnumber(ed->L, ((Edje_Message_Float *)em->msg)->val);
// Stack usage [-0, +1, -]
n += 1;
break;
case EDJE_MESSAGE_STRING_SET:
lua_pushstring(ed->L, "strset"); // Stack usage [-0, +1, m]
c = ((Edje_Message_String_Set *)em->msg)->count;
@ -4327,6 +4349,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
}
n += 1;
break;
case EDJE_MESSAGE_INT_SET:
lua_pushstring(ed->L, "intset"); // Stack usage [-0, +1, m]
c = ((Edje_Message_Int_Set *)em->msg)->count;
@ -4339,6 +4362,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
}
n += 1;
break;
case EDJE_MESSAGE_FLOAT_SET:
lua_pushstring(ed->L, "floatset"); // Stack usage [-0, +1, m]
c = ((Edje_Message_Float_Set *)em->msg)->count;
@ -4351,6 +4375,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
}
n += 1;
break;
case EDJE_MESSAGE_STRING_INT:
lua_pushstring(ed->L, "strint"); // Stack usage [-0, +1, m]
lua_pushstring(ed->L, ((Edje_Message_String_Int *)em->msg)->str);
@ -4359,6 +4384,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
// Stack usage [-0, +1, -]
n += 2;
break;
case EDJE_MESSAGE_STRING_FLOAT:
lua_pushstring(ed->L, "strfloat"); // Stack usage [-0, +1, m]
lua_pushstring(ed->L, ((Edje_Message_String_Float *)em->msg)->str);
@ -4367,6 +4393,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
// Stack usage [-0, +1, -]
n += 2;
break;
case EDJE_MESSAGE_STRING_INT_SET:
lua_pushstring(ed->L, "strintset"); // Stack usage [-0, +1, m]
lua_pushstring(ed->L, ((Edje_Message_String_Int_Set *)em->msg)->str);
@ -4381,6 +4408,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
}
n += 2;
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
lua_pushstring(ed->L, "strfloatset"); // Stack usage [-0, +1, m]
lua_pushstring(ed->L, ((Edje_Message_String_Float_Set *)em->msg)->str);
@ -4395,6 +4423,7 @@ _edje_lua2_script_func_message(Edje *ed, Edje_Message *em) // Stack usage [-?,
}
n += 2;
break;
default:
break;
}
@ -4429,3 +4458,4 @@ _edje_lua2_script_func_signal(Edje *ed, const char *sig, const char *src) // St
else
lua_pop(ed->L, 1);
}

1
src/lib/edje/edje_main.c
View File

@ -324,3 +324,4 @@ _edje_need_imf(void)
ecore_imf_init();
#endif
}

3
src/lib/edje/edje_match.c
View File

@ -571,7 +571,6 @@ edje_match_callback_exec_check_finals(const Edje_Signals_Sources_Patterns *ssp,
return r;
}
static Edje_States *
_edje_match_fn(const Edje_Patterns *ppat,
const char *string,
@ -775,7 +774,6 @@ _edje_signal_source_key_cmp(const Edje_Signal_Source_Char *node,
return strcmp(node->source, source);
}
Eina_List *
edje_match_program_hash_build(Edje_Program *const *programs,
unsigned int count,
@ -881,3 +879,4 @@ edje_match_signal_source_free(Edje_Signal_Source_Char *key, EINA_UNUSED void *da
eina_inarray_flush(&key->list);
free(key);
}

36
src/lib/edje/edje_message_queue.c
View File

@ -135,7 +135,6 @@ edje_message_signal_process(void)
_edje_message_queue_process();
}
static Eina_Bool
_edje_dummy_timer(void *data EINA_UNUSED)
{
@ -237,6 +236,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_INT:
{
Edje_Message_Int *emsg;
@ -245,6 +245,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_FLOAT:
{
Edje_Message_Float *emsg;
@ -253,6 +254,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_INT_SET:
{
Edje_Message_Int_Set *emsg;
@ -261,6 +263,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_FLOAT_SET:
{
Edje_Message_Float_Set *emsg;
@ -269,6 +272,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_STRING_FLOAT:
{
Edje_Message_String_Float *emsg;
@ -278,6 +282,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_STRING_INT:
{
Edje_Message_String_Int *emsg;
@ -287,6 +292,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
{
Edje_Message_String_Float_Set *emsg;
@ -296,6 +302,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_STRING_INT_SET:
{
Edje_Message_String_Int_Set *emsg;
@ -305,6 +312,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_SIGNAL:
{
Edje_Message_Signal *emsg;
@ -323,6 +331,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_STRING_SET:
{
Edje_Message_String_Set *emsg;
@ -333,6 +342,7 @@ _edje_message_free(Edje_Message *em)
free(emsg);
}
break;
case EDJE_MESSAGE_NONE:
default:
break;
@ -378,6 +388,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
{
case EDJE_MESSAGE_NONE:
break;
case EDJE_MESSAGE_SIGNAL:
{
Edje_Message_Signal *emsg2, *emsg3;
@ -394,6 +405,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING:
{
Edje_Message_String *emsg2, *emsg3;
@ -405,6 +417,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_INT:
{
Edje_Message_Int *emsg2, *emsg3;
@ -415,6 +428,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_FLOAT:
{
Edje_Message_Float *emsg2, *emsg3;
@ -425,6 +439,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING_SET:
{
Edje_Message_String_Set *emsg2, *emsg3;
@ -437,6 +452,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_INT_SET:
{
Edje_Message_Int_Set *emsg2, *emsg3;
@ -449,6 +465,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_FLOAT_SET:
{
Edje_Message_Float_Set *emsg2, *emsg3;
@ -461,6 +478,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING_INT:
{
Edje_Message_String_Int *emsg2, *emsg3;
@ -472,6 +490,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING_FLOAT:
{
Edje_Message_String_Float *emsg2, *emsg3;
@ -483,6 +502,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING_INT_SET:
{
Edje_Message_String_Int_Set *emsg2, *emsg3;
@ -496,6 +516,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
{
Edje_Message_String_Float_Set *emsg2, *emsg3;
@ -509,6 +530,7 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
msg = (unsigned char *)emsg3;
}
break;
default:
break;
}
@ -540,10 +562,12 @@ _edje_message_parameters_push(Edje_Message *em)
{
case EDJE_MESSAGE_NONE:
break;
case EDJE_MESSAGE_STRING:
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String *)em->msg)->str);
break;
case EDJE_MESSAGE_INT:
{
Embryo_Cell v;
@ -552,6 +576,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_FLOAT:
{
Embryo_Cell v;
@ -562,11 +587,13 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_STRING_SET:
for (i = 0; i < ((Edje_Message_String_Set *)em->msg)->count; i++)
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String_Set *)em->msg)->str[i]);
break;
case EDJE_MESSAGE_INT_SET:
for (i = 0; i < ((Edje_Message_Int_Set *)em->msg)->count; i++)
{
@ -576,6 +603,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_FLOAT_SET:
for (i = 0; i < ((Edje_Message_Float_Set *)em->msg)->count; i++)
{
@ -587,6 +615,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_STRING_INT:
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String_Int *)em->msg)->str);
@ -597,6 +626,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_STRING_FLOAT:
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String_Float *)em->msg)->str);
@ -609,6 +639,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_STRING_INT_SET:
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String_Int_Set *)em->msg)->str);
@ -620,6 +651,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
case EDJE_MESSAGE_STRING_FLOAT_SET:
embryo_parameter_string_push(em->edje->collection->script,
((Edje_Message_String_Float_Set *)em->msg)->str);
@ -633,6 +665,7 @@ _edje_message_parameters_push(Edje_Message *em)
embryo_parameter_cell_array_push(em->edje->collection->script, &v, 1);
}
break;
default:
break;
}
@ -853,3 +886,4 @@ _edje_message_del(Edje *ed)
if (ed->message.num <= 0) return;
}
}

1
src/lib/edje/edje_module.c
View File

@ -177,3 +177,4 @@ edje_available_modules_get(void)
return result;
}

14
src/lib/edje/edje_multisense.c
View File

@ -7,14 +7,16 @@ static Eo *out = NULL;
static int outs = 0;
static Eina_Bool outfail = EINA_FALSE;
static Eina_Bool _play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
static Eina_Bool
_play_finished(void *data EINA_UNUSED, Eo *in, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
eo_del(in);
return EINA_TRUE;
}
static Eina_Bool _out_fail(void *data EINA_UNUSED, Eo *output EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
static Eina_Bool
_out_fail(void *data EINA_UNUSED, Eo *output EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
{
outfail = EINA_TRUE;
eo_del(out);
@ -47,12 +49,15 @@ eet_snd_file_seek(void *data, Eo *eo_obj EINA_UNUSED, int offset, int whence)
case SEEK_SET:
vf->offset = offset;
break;
case SEEK_CUR:
vf->offset += offset;
break;
case SEEK_END:
vf->offset = vf->length + offset;
break;
default:
break;
}
@ -287,7 +292,8 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
}
eo_do(out, ret = ecore_audio_obj_out_input_attach(in));
if (!ret) {
if (!ret)
{
ERR("Could not attach input");
eo_del(in);
return EINA_FALSE;
@ -303,7 +309,6 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
(void)channel;
return EINA_FALSE;
#endif
}
Eina_Bool
@ -345,3 +350,4 @@ _edje_multisense_shutdown(void)
ecore_audio_shutdown();
#endif
}

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

@ -8,7 +8,6 @@ int _edje_anim_count = 0;
Ecore_Animator *_edje_timer = NULL;
Eina_List *_edje_animators = NULL;
static Eina_Bool
_edje_emit_aliased(Edje *ed, const char *part, const char *sig, const char *src)
{
@ -420,7 +419,8 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
if (pt->id >= 0)
{
rp = ed->table_parts[pt->id % ed->table_parts_size];
if (rp) _edje_part_pos_set(ed, rp,
if (rp)
_edje_part_pos_set(ed, rp,
runp->program->tween.mode, t,
runp->program->tween.v1,
runp->program->tween.v2,
@ -575,6 +575,7 @@ _edje_physics_action_set(Edje *ed, Edje_Program *pr, void (*func)(EPhysics_Body
return EINA_TRUE;
}
#endif
void
@ -747,6 +748,7 @@ low_mem_current:
_edje_recalc(ed);
}
break;
case EDJE_ACTION_TYPE_ACTION_STOP:
// _edje_emit(ed, "program,start", pr->name);
EINA_LIST_FOREACH(pr->targets, l, pt)
@ -783,6 +785,7 @@ low_mem_current:
// _edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
break;
case EDJE_ACTION_TYPE_SIGNAL_EMIT:
// _edje_emit(ed, "program,start", pr->name);
if (_edje_block_break(ed)) goto break_prog;
@ -808,6 +811,7 @@ low_mem_current:
// _edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
break;
case EDJE_ACTION_TYPE_DRAG_VAL_SET:
// _edje_emit(ed, "program,start", pr->name);
if (_edje_block_break(ed)) goto break_prog;
@ -821,9 +825,11 @@ low_mem_current:
rp->drag->val.x = pr->value;
rp->drag->val.y = pr->value2;
if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
else if (rp->drag->val.x > 1.0)
rp->drag->val.x = 1.0;
if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
else if (rp->drag->val.y > 1.0)
rp->drag->val.y = 1.0;
_edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
_edje_emit(ed, "drag,set", rp->part->name);
if (_edje_block_break(ed)) goto break_prog;
@ -833,6 +839,7 @@ low_mem_current:
// _edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
break;
case EDJE_ACTION_TYPE_DRAG_VAL_STEP:
// _edje_emit(ed, "program,start", pr->name);
if (_edje_block_break(ed)) goto break_prog;
@ -846,9 +853,11 @@ low_mem_current:
rp->drag->val.x += pr->value * rp->drag->step.x * rp->part->dragable.x;
rp->drag->val.y += pr->value2 * rp->drag->step.y * rp->part->dragable.y;
if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
else if (rp->drag->val.x > 1.0)
rp->drag->val.x = 1.0;
if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
else if (rp->drag->val.y > 1.0)
rp->drag->val.y = 1.0;
_edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
_edje_emit(ed, "drag,step", rp->part->name);
if (_edje_block_break(ed)) goto break_prog;
@ -858,6 +867,7 @@ low_mem_current:
// _edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
break;
case EDJE_ACTION_TYPE_DRAG_VAL_PAGE:
// _edje_emit(ed, "program,start", pr->name);
if (_edje_block_break(ed)) goto break_prog;
@ -871,9 +881,11 @@ low_mem_current:
rp->drag->val.x += pr->value * rp->drag->page.x * rp->part->dragable.x;
rp->drag->val.y += pr->value2 * rp->drag->page.y * rp->part->dragable.y;
if (rp->drag->val.x < 0.0) rp->drag->val.x = 0.0;
else if (rp->drag->val.x > 1.0) rp->drag->val.x = 1.0;
else if (rp->drag->val.x > 1.0)
rp->drag->val.x = 1.0;
if (rp->drag->val.y < 0.0) rp->drag->val.y = 0.0;
else if (rp->drag->val.y > 1.0) rp->drag->val.y = 1.0;
else if (rp->drag->val.y > 1.0)
rp->drag->val.y = 1.0;
_edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
_edje_emit(ed, "drag,page", rp->part->name);
if (_edje_block_break(ed)) goto break_prog;
@ -883,6 +895,7 @@ low_mem_current:
// _edje_emit(ed, "program,stop", pr->name);
if (_edje_block_break(ed)) goto break_prog;
break;
case EDJE_ACTION_TYPE_SCRIPT:
{
char fname[128];
@ -896,6 +909,7 @@ low_mem_current:
_edje_recalc_do(ed);
}
break;
case EDJE_ACTION_TYPE_FOCUS_SET:
if (!pr->targets)
{
@ -927,6 +941,7 @@ low_mem_current:
}
}
break;
case EDJE_ACTION_TYPE_FOCUS_OBJECT:
if (!pr->targets)
{
@ -968,21 +983,25 @@ low_mem_current:
}
}
break;
case EDJE_ACTION_TYPE_SOUND_SAMPLE:
if (_edje_block_break(ed))
goto break_prog;
_edje_multisense_internal_sound_sample_play(ed, pr->sample_name, pr->speed, pr->channel);
break;
case EDJE_ACTION_TYPE_SOUND_TONE:
if (_edje_block_break(ed))
goto break_prog;
_edje_multisense_internal_sound_tone_play(ed, pr->tone_name, pr->duration, pr->channel);
break;
case EDJE_ACTION_TYPE_VIBRATION_SAMPLE:
if (_edje_block_break(ed))
goto break_prog;
_edje_multisense_internal_vibration_sample_play(ed, pr->vibration_name, pr->vibration_repeat);
break;
case EDJE_ACTION_TYPE_PARAM_COPY:
{
Edje_Real_Part *src_part, *dst_part;
@ -999,6 +1018,7 @@ low_mem_current:
if (_edje_block_break(ed)) goto break_prog;
}
break;
case EDJE_ACTION_TYPE_PARAM_SET:
{
Edje_Real_Part *part;
@ -1014,23 +1034,28 @@ low_mem_current:
if (_edje_block_break(ed)) goto break_prog;
}
break;
#ifdef HAVE_EPHYSICS
case EDJE_ACTION_TYPE_PHYSICS_IMPULSE:
if (!_edje_physics_action_set(ed, pr, ephysics_body_central_impulse_apply))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_TORQUE_IMPULSE:
if (!_edje_physics_action_set(ed, pr, ephysics_body_torque_impulse_apply))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_FORCE:
if (!_edje_physics_action_set(ed, pr, ephysics_body_central_force_apply))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_TORQUE:
if (!_edje_physics_action_set(ed, pr, ephysics_body_torque_apply))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_FORCES_CLEAR:
if (_edje_block_break(ed))
goto break_prog;
@ -1044,14 +1069,17 @@ low_mem_current:
}
}
break;
case EDJE_ACTION_TYPE_PHYSICS_VEL_SET:
if (!_edje_physics_action_set(ed, pr, ephysics_body_linear_velocity_set))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_ANG_VEL_SET:
if (!_edje_physics_action_set(ed, pr, ephysics_body_angular_velocity_set))
goto break_prog;
break;
case EDJE_ACTION_TYPE_PHYSICS_STOP:
if (_edje_block_break(ed))
goto break_prog;
@ -1065,6 +1093,7 @@ low_mem_current:
}
}
break;
case EDJE_ACTION_TYPE_PHYSICS_ROT_SET:
if (_edje_block_break(ed))
goto break_prog;
@ -1085,6 +1114,7 @@ low_mem_current:
}
}
break;
#endif
default:
// _edje_emit(ed, "program,start", pr->name);
@ -1165,7 +1195,8 @@ struct _Edje_Program_Data
const char *source;
};
static Eina_Bool _edje_glob_callback(Edje_Program *pr, void *dt)
static Eina_Bool
_edje_glob_callback(Edje_Program *pr, void *dt)
{
struct _Edje_Program_Data *data = dt;
Edje_Real_Part *rp = NULL;
@ -1901,14 +1932,17 @@ _edje_param_convert(Edje_External_Param *param, const Edje_External_Param_Info *
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
i = (int)param->d;
break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
i = (param->s) ? atoi(param->s) : 0;
break;
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
case EDJE_EXTERNAL_PARAM_TYPE_INT:
i = param->i;
break;
default:
return NULL;
}
@ -1927,13 +1961,16 @@ _edje_param_convert(Edje_External_Param *param, const Edje_External_Param_Info *
case EDJE_EXTERNAL_PARAM_TYPE_INT:
d = (double)param->i;
break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
d = (param->s) ? atof(param->s) : 0.0;
break;
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
d = (double)param->i;
break;
default:
return NULL;
}
@ -1951,12 +1988,15 @@ _edje_param_convert(Edje_External_Param *param, const Edje_External_Param_Info *
case EDJE_EXTERNAL_PARAM_TYPE_INT:
if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
break;
case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
param->type = dst_info->type;
return param;
default:
return NULL;
}
@ -1976,13 +2016,16 @@ _edje_param_convert(Edje_External_Param *param, const Edje_External_Param_Info *
if (!snprintf(s, sizeof(s), "%i", param->i)) return NULL;
val = s;
break;
case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
if (!snprintf(s, sizeof(s), "%f", param->d)) return NULL;
val = s;
break;
case EDJE_EXTERNAL_PARAM_TYPE_STRING:
val = param->s;
break;
default:
return NULL;
}
@ -2002,7 +2045,7 @@ _edje_param_validate(const Edje_External_Param *param, const Edje_External_Param
switch (info->type)
{
case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
return ((param->i == 0) || (param->i == 1));
return (param->i == 0) || (param->i == 1);
case EDJE_EXTERNAL_PARAM_TYPE_INT:
if ((info->info.i.min != EDJE_EXTERNAL_INT_UNSET) &&
@ -2197,3 +2240,4 @@ _edje_param_set(Edje *ed, Edje_Real_Part *part, const char *param, const char *v
}
}
}

1
src/lib/edje/edje_signal.c
View File

@ -384,7 +384,6 @@ _edje_signal_callback_patterns_ref(const Edje_Signal_Callback_Group *gp)
if (gp->flags[i].delete_me)
_edje_signal_callback_move_last((Edje_Signal_Callback_Group *)gp, i);
}
}
_edje_signal_callback_patterns_unref(tmp->patterns);

1
src/lib/edje/edje_smart.c
View File

@ -72,7 +72,6 @@ _edje_color_class_free(void *data)
free(cc);
}
/* Private Routines */
EOLIAN static void
_edje_object_evas_object_smart_add(Eo *obj, Edje *ed)

27
src/lib/edje/edje_text.c
View File

@ -426,7 +426,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
int bottom, top;
if (th < sh) bottom = 10;
else if (th > sh) bottom = 1;
else if (th > sh)
bottom = 1;
else bottom = 0; /* XXX shut up GCC, th == sh is handled before! */
top = size;
@ -442,7 +443,8 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep,
part_get_geometry(ep, &tw, &th);
if (th < sh) bottom = current + 1;
else if (th > sh) top = current - 1;
else if (th > sh)
top = current - 1;
} while ((bottom < top) && (th != sh));
}
@ -535,7 +537,7 @@ arrange_text:
{
Edje_Real_Part *rp = _edje_real_part_get(ed, source_name);
evas_obj_text_filter_source_set(source_name, rp ? rp->object : NULL);
};
}
evas_obj_text_filter_program_set(filter));
/* Handle alignment */
@ -570,7 +572,6 @@ arrange_text:
efl_gfx_visible_set(params->visible));
}
{
Evas_Text_Style_Type style;
Edje_Text_Effect effect;
@ -589,6 +590,7 @@ arrange_text:
case EDJE_TEXT_EFFECT_PLAIN:
style = EVAS_TEXT_STYLE_PLAIN;
break;
case EDJE_TEXT_EFFECT_OUTLINE:
style = EVAS_TEXT_STYLE_OUTLINE;
evas_object_text_outline_color_set(ep->object,
@ -597,6 +599,7 @@ arrange_text:
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
break;
case EDJE_TEXT_EFFECT_SOFT_OUTLINE:
style = EVAS_TEXT_STYLE_SOFT_OUTLINE;
evas_object_text_outline_color_set(ep->object,
@ -605,6 +608,7 @@ arrange_text:
(params->type.text.color2.b * params->type.text.color2.a) / 255,
params->type.text.color2.a);
break;
case EDJE_TEXT_EFFECT_SHADOW:
style = EVAS_TEXT_STYLE_SHADOW;
evas_object_text_shadow_color_set(ep->object,
@ -613,6 +617,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
break;
case EDJE_TEXT_EFFECT_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_SOFT_SHADOW;
evas_object_text_shadow_color_set(ep->object,
@ -621,6 +626,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
break;
case EDJE_TEXT_EFFECT_OUTLINE_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
eo_do(ep->object,
@ -633,6 +639,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
break;
case EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
eo_do(ep->object,
@ -645,6 +652,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
break;
case EDJE_TEXT_EFFECT_FAR_SHADOW:
style = EVAS_TEXT_STYLE_FAR_SHADOW;
evas_object_text_shadow_color_set(ep->object,
@ -653,6 +661,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
break;
case EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW:
style = EVAS_TEXT_STYLE_FAR_SOFT_SHADOW;
evas_object_text_shadow_color_set(ep->object,
@ -661,6 +670,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a);
break;
case EDJE_TEXT_EFFECT_GLOW:
style = EVAS_TEXT_STYLE_GLOW;
eo_do(ep->object,
@ -673,6 +683,7 @@ arrange_text:
(params->type.text.color3.b * params->type.text.color3.a) / 255,
params->type.text.color3.a));
break;
default:
style = EVAS_TEXT_STYLE_PLAIN;
break;
@ -684,34 +695,42 @@ arrange_text:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_RIGHT);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_BOTTOM_LEFT:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM_LEFT);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_LEFT:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_LEFT);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_LEFT:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_LEFT);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_TOP_RIGHT:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT);
break;
case EDJE_TEXT_EFFECT_SHADOW_DIRECTION_RIGHT:
EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET
(style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_RIGHT);
break;
default:
break;
}

1
src/lib/edje/edje_textblock_styles.c
View File

@ -538,3 +538,4 @@ _edje_textblock_style_cleanup(Edje_File *edf)
free(stl);
}
}

96
src/lib/edje/edje_util.c
View File

@ -113,16 +113,19 @@ _edje_user_definition_free(Edje_User_Defined *eud)
_edje_recalc_do(eud->ed);
}
break;
case EDJE_USER_BOX_PACK:
child = eud->u.box.child;
rp = _edje_real_part_recursive_get(&eud->ed, eud->part);
if (rp) _edje_child_remove(eud->ed, rp, child);
break;
case EDJE_USER_TABLE_PACK:
child = eud->u.table.child;
rp = _edje_real_part_recursive_get(&eud->ed, eud->part);
if (rp) _edje_child_remove(eud->ed, rp, child);
break;
case EDJE_USER_STRING:
case EDJE_USER_DRAG_STEP:
case EDJE_USER_DRAG_PAGE:
@ -252,7 +255,6 @@ _edje_class_members_clean(Edje *ed, Eina_Hash *ghash)
eina_iterator_free(it);
}
/************************** API Routines **************************/
#define FASTFREEZE 1
@ -297,6 +299,7 @@ _edje_util_thaw_edje(Edje *ed)
}
if ((ed->recalc) && (ed->freeze <= 0)) _edje_recalc_do(ed);
}
#endif
void
@ -363,7 +366,6 @@ _edje_object_language_get(Eo *obj EINA_UNUSED, Edje *ed)
return ed->language;
}
EAPI void
edje_language_set(const char *locale)
{
@ -393,7 +395,6 @@ edje_language_set(const char *locale)
continue;
_edje_language_signal_emit(ed, obj, signal);
}
}
@ -632,13 +633,17 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
}
if (r < 0) r = 0;
else if (r > 255) r = 255;
else if (r > 255)
r = 255;
if (g < 0) g = 0;
else if (g > 255) g = 255;
else if (g > 255)
g = 255;
if (b < 0) b = 0;
else if (b > 255) b = 255;
else if (b > 255)
b = 255;
if (a < 0) a = 0;
else if (a > 255) a = 255;
else if (a > 255)
a = 255;
if ((cc->r == r) && (cc->g == g) &&
(cc->b == b) && (cc->a == a) &&
(cc->r2 == r2) && (cc->g2 == g2) &&
@ -688,7 +693,8 @@ edje_color_class_get(const char *color_class, int *r, int *g, int *b, int *a, in
if (cc)
{
#define X(C) if (C) *C = cc->C
#define X(C) if (C) \
*C = cc->C
#define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
S(r, g, b, a);
S(r2, g2, b2, a2);
@ -699,7 +705,8 @@ edje_color_class_get(const char *color_class, int *r, int *g, int *b, int *a, in
}
else
{
#define X(C) if (C) *C = 0
#define X(C) if (C) \
*C = 0
#define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
S(r, g, b, a);
S(r2, g2, b2, a2);
@ -855,13 +862,17 @@ _edje_object_color_class_set(Eo *obj EINA_UNUSED, Edje *ed, const char *color_cl
if ((!ed) || (!color_class)) return EINA_FALSE;
if (r < 0) r = 0;
else if (r > 255) r = 255;
else if (r > 255)
r = 255;
if (g < 0) g = 0;
else if (g > 255) g = 255;
else if (g > 255)
g = 255;
if (b < 0) b = 0;
else if (b > 255) b = 255;
else if (b > 255)
b = 255;
if (a < 0) a = 0;
else if (a > 255) a = 255;
else if (a > 255)
a = 255;
cc = eina_hash_find(ed->color_classes, color_class);
if (cc)
{
@ -935,7 +946,8 @@ _edje_object_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_cl
if (cc)
{
#define X(C) if (C) *C = cc->C
#define X(C) if (C) \
*C = cc->C
#define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
S(r, g, b, a);
S(r2, g2, b2, a2);
@ -946,7 +958,8 @@ _edje_object_color_class_get(Eo *obj EINA_UNUSED, Edje *ed, const char *color_cl
}
else
{
#define X(C) if (C) *C = 0
#define X(C) if (C) \
*C = 0
#define S(_r, _g, _b, _a) X(_r); X(_g); X(_b); X(_a)
S(r, g, b, a);
S(r2, g2, b2, a2);
@ -1412,7 +1425,8 @@ _edje_object_part_text_raw_set(Edje *ed, Evas_Object *obj, Edje_Real_Part *rp, c
if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
_edje_entry_text_markup_set(rp, text);
else
if (text) rp->typedata.text->text = eina_stringshare_add(text);
if (text)
rp->typedata.text->text = eina_stringshare_add(text);
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
ed->recalc_hints = EINA_TRUE;
@ -2896,10 +2910,15 @@ edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas
switch (aspect)
{
case EDJE_ASPECT_CONTROL_NONE: asp = EVAS_ASPECT_CONTROL_NONE; break;
case EDJE_ASPECT_CONTROL_NEITHER: asp = EVAS_ASPECT_CONTROL_NEITHER; break;
case EDJE_ASPECT_CONTROL_HORIZONTAL: asp = EVAS_ASPECT_CONTROL_HORIZONTAL; break;
case EDJE_ASPECT_CONTROL_VERTICAL: asp = EVAS_ASPECT_CONTROL_VERTICAL; break;
case EDJE_ASPECT_CONTROL_BOTH: asp = EVAS_ASPECT_CONTROL_BOTH; break;
default: break;
}
if (aw < 1) aw = 1;
@ -2907,7 +2926,8 @@ edje_extern_object_aspect_set(Evas_Object *obj, Edje_Aspect_Control aspect, Evas
evas_object_size_hint_aspect_set(obj, asp, aw, ah);
}
struct edje_box_layout_builtin {
struct edje_box_layout_builtin
{
const char *name;
Evas_Object_Box_Layout cb;
};
@ -2934,12 +2954,15 @@ _edje_box_layout_builtin_find(const char *name)
case 'h':
base = _edje_box_layout_builtin + 0;
break;
case 's':
base = _edje_box_layout_builtin + 4;
break;
case 'v':
base = _edje_box_layout_builtin + 5;
break;
default:
return NULL;
}
@ -3531,8 +3554,10 @@ _edje_object_part_drag_dir_get(Eo *obj EINA_UNUSED, Edje *ed, const char *part)
rp = _edje_real_part_recursive_get(&ed, part);
if (!rp) return ret;
if ((rp->part->dragable.x) && (rp->part->dragable.y)) ret = EDJE_DRAG_DIR_XY;
else if (rp->part->dragable.x) ret = EDJE_DRAG_DIR_X;
else if (rp->part->dragable.y) ret = EDJE_DRAG_DIR_Y;
else if (rp->part->dragable.x)
ret = EDJE_DRAG_DIR_X;
else if (rp->part->dragable.y)
ret = EDJE_DRAG_DIR_Y;
return ret;
}
@ -3653,9 +3678,11 @@ _edje_object_part_drag_size_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
if (dw < 0.0) dw = 0.0;
else if (dw > 1.0) dw = 1.0;
else if (dw > 1.0)
dw = 1.0;
if (dh < 0.0) dh = 0.0;
else if (dh > 1.0) dh = 1.0;
else if (dh > 1.0)
dh = 1.0;
if ((rp->drag->size.x == FROM_DOUBLE(dw)) && (rp->drag->size.y == FROM_DOUBLE(dh)))
{
return EINA_TRUE;
@ -3730,9 +3757,11 @@ _edje_object_part_drag_step_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0;
else if (dx > 1.0)
dx = 1.0;
if (dy < 0.0) dy = 0.0;
else if (dy > 1.0) dy = 1.0;
else if (dy > 1.0)
dy = 1.0;
rp->drag->step.x = FROM_DOUBLE(dx);
rp->drag->step.y = FROM_DOUBLE(dy);
#ifdef EDJE_CALC_CACHE
@ -3800,9 +3829,11 @@ _edje_object_part_drag_page_set(Eo *obj EINA_UNUSED, Edje *ed, const char *part,
}
if (dx < 0.0) dx = 0.0;
else if (dx > 1.0) dx = 1.0;
else if (dx > 1.0)
dx = 1.0;
if (dy < 0.0) dy = 0.0;
else if (dy > 1.0) dy = 1.0;
else if (dy > 1.0)
dy = 1.0;
rp->drag->page.x = FROM_DOUBLE(dx);
rp->drag->page.y = FROM_DOUBLE(dy);
#ifdef EDJE_CALC_CACHE
@ -3945,7 +3976,6 @@ _edje_object_part_drag_page(Eo *obj EINA_UNUSED, Edje *ed, const char *part, dou
void
_edje_box_init(void)
{
}
void
@ -4887,12 +4917,15 @@ _edje_children_get(Edje_Real_Part *rp, const char *partid)
(!rp->typedata.swallow)) return NULL;
return _edje_external_content_get
(rp->typedata.swallow->swallowed_object, partid);
case EDJE_PART_TYPE_BOX:
it = evas_object_box_iterator_new(rp->object);
break;
case EDJE_PART_TYPE_TABLE:
it = evas_object_table_iterator_new(rp->object);
break;
default:
return NULL;
}
@ -4956,7 +4989,6 @@ _edje_merge_path(const char *alias, char * const *path)
return tmp;
}
Edje_Real_Part *
_edje_real_part_recursive_get_helper(Edje **ed, char **path)
{
@ -4972,7 +5004,8 @@ _edje_real_part_recursive_get_helper(Edje **ed, char **path)
char *alias;
alias = _edje_merge_path(eina_hash_find((*ed)->collection->alias, path[0]), path + 1);
if (alias) {
if (alias)
{
rp = _edje_real_part_recursive_get(ed, alias);
free(alias);
return rp;
@ -5008,6 +5041,7 @@ _edje_real_part_recursive_get_helper(Edje **ed, char **path)
if (!*ed) return NULL;
path++;
return _edje_real_part_recursive_get_helper(ed, path);
case EDJE_PART_TYPE_BOX:
case EDJE_PART_TYPE_TABLE:
case EDJE_PART_TYPE_EXTERNAL:
@ -5020,6 +5054,7 @@ _edje_real_part_recursive_get_helper(Edje **ed, char **path)
if (!*ed) return NULL;
return _edje_real_part_recursive_get_helper(ed, path);
default:
return NULL;
}
@ -5331,18 +5366,23 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp)
case EVAS_ASPECT_CONTROL_NONE:
rp->typedata.swallow->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NONE;
break;
case EVAS_ASPECT_CONTROL_NEITHER:
rp->typedata.swallow->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_NEITHER;
break;
case EVAS_ASPECT_CONTROL_HORIZONTAL:
rp->typedata.swallow->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_HORIZONTAL;
break;
case EVAS_ASPECT_CONTROL_VERTICAL:
rp->typedata.swallow->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_VERTICAL;
break;
case EVAS_ASPECT_CONTROL_BOTH:
rp->typedata.swallow->swallow_params.aspect.mode = EDJE_ASPECT_CONTROL_BOTH;
break;
default:
break;
}

52
src/lib/edje/edje_var.c
View File

@ -623,7 +623,8 @@ _edje_var_list_count_get(Edje *ed, int id)
if ((id < 0) || (id >= ed->var_pool->size)) return 0;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return 0;
return eina_list_count(ed->var_pool->vars[id].data.l.v);
}
@ -636,7 +637,8 @@ _edje_var_list_remove_nth(Edje *ed, int id, int n)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Eina_List *nth;
@ -658,7 +660,8 @@ _edje_var_list_nth_int_get(Edje *ed, int id, int n)
if ((id < 0) || (id >= ed->var_pool->size)) return 0;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return 0;
{
Edje_Var *var;
@ -678,7 +681,8 @@ _edje_var_list_nth_int_set(Edje *ed, int id, int n, int v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -698,7 +702,8 @@ _edje_var_list_int_append(Edje *ed, int id, int v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -719,7 +724,8 @@ _edje_var_list_int_prepend(Edje *ed, int id, int v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -740,7 +746,8 @@ _edje_var_list_int_insert(Edje *ed, int id, int n, int v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var, *var_rel;
@ -765,7 +772,8 @@ _edje_var_list_nth_float_get(Edje *ed, int id, int n)
if ((id < 0) || (id >= ed->var_pool->size)) return 0;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return 0;
{
Edje_Var *var;
@ -785,7 +793,8 @@ _edje_var_list_nth_float_set(Edje *ed, int id, int n, double v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -805,7 +814,8 @@ _edje_var_list_float_append(Edje *ed, int id, double v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -826,7 +836,8 @@ _edje_var_list_float_prepend(Edje *ed, int id, double v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -847,7 +858,8 @@ _edje_var_list_float_insert(Edje *ed, int id, int n, double v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var, *var_rel;
@ -872,7 +884,8 @@ _edje_var_list_nth_str_get(Edje *ed, int id, int n)
if ((id < 0) || (id >= ed->var_pool->size)) return NULL;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return NULL;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return NULL;
{
Edje_Var *var;
@ -892,7 +905,8 @@ _edje_var_list_nth_str_set(Edje *ed, int id, int n, const char *v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -912,7 +926,8 @@ _edje_var_list_str_append(Edje *ed, int id, const char *v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -933,7 +948,8 @@ _edje_var_list_str_prepend(Edje *ed, int id, const char *v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var;
@ -954,7 +970,8 @@ _edje_var_list_str_insert(Edje *ed, int id, int n, const char *v)
if ((id < 0) || (id >= ed->var_pool->size)) return;
if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
ed->var_pool->vars[id].type = EDJE_VAR_LIST;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return;
else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST)
return;
{
Edje_Var *var, *var_rel;
@ -1101,3 +1118,4 @@ _edje_var_anim_del(Edje *ed, int id)
}
}
}