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

edje - use Eina_Bool 

SVN revision: 76163
This commit is contained in:
ChunEon Park 2012-09-05 05:38:01 +00:00
parent f7f9341419
commit ac5f55d3d1
12 changed files with 185 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
legacy/edje/src/lib/edje_calc.c
View File

@ -115,8 +115,8 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
ep->description_pos = npos;
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ep->invalidate = 1;
#endif
@ -585,9 +585,9 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
ep->part->type == EDJE_PART_TYPE_EXTERNAL)
_edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
ed->recalc_hints = 1;
ed->dirty = 1;
ed->recalc_call = 1;
ed->recalc_hints = EINA_TRUE;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ep->invalidate = 1;
#endif
@ -598,7 +598,7 @@ _edje_recalc(Edje *ed)
{
if ((ed->freeze > 0) || (_edje_freeze_val > 0))
{
ed->recalc = 1;
ed->recalc = EINA_TRUE;
if (!ed->calc_only)
{
if (_edje_freeze_val > 0)
@ -607,7 +607,7 @@ _edje_recalc(Edje *ed)
{
_edje_freeze_calc_count++;
_edje_freeze_calc_list = eina_list_append(_edje_freeze_calc_list, ed);
ed->freeze_calc = 1;
ed->freeze_calc = EINA_TRUE;
}
}
return;
@ -618,7 +618,7 @@ _edje_recalc(Edje *ed)
// if (!ed->calc_only)
evas_object_smart_changed(ed->obj);
// XXX: dont need this with current smart calc infra. remove me later
// ed->postponed = 1;
// ed->postponed = EINA_TRUE;
}
void
@ -628,12 +628,12 @@ _edje_recalc_do(Edje *ed)
Eina_Bool need_calc;
// XXX: dont need this with current smart calc infra. remove me later
// ed->postponed = 0;
// ed->postponed = EINA_FALSE;
need_calc = evas_object_smart_need_recalculate_get(ed->obj);
evas_object_smart_need_recalculate_set(ed->obj, 0);
if (!ed->dirty) return;
ed->have_mapped_part = 0;
ed->dirty = 0;
ed->have_mapped_part = EINA_FALSE;
ed->dirty = EINA_FALSE;
ed->state++;
for (i = 0; i < ed->table_parts_size; i++)
{
@ -651,10 +651,10 @@ _edje_recalc_do(Edje *ed)
if (ep->calculated != FLAG_XY)
_edje_part_recalc(ed, ep, (~ep->calculated) & FLAG_XY, NULL);
}
if (!ed->calc_only) ed->recalc = 0;
if (!ed->calc_only) ed->recalc = EINA_FALSE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 0;
ed->text_part_change = 0;
ed->all_part_change = EINA_FALSE;
ed->text_part_change = EINA_FALSE;
#endif
if (!ed->calc_only)
{
@ -663,13 +663,13 @@ _edje_recalc_do(Edje *ed)
}
else
evas_object_smart_need_recalculate_set(ed->obj, need_calc);
ed->recalc_call = 0;
ed->recalc_call = EINA_FALSE;
if (ed->update_hints && ed->recalc_hints && !ed->calc_only)
{
Evas_Coord w, h;
ed->recalc_hints = 0;
ed->recalc_hints = EINA_FALSE;
edje_object_size_min_calc(ed->obj, &w, &h);
evas_object_size_hint_min_set(ed->obj, w, h);
@ -811,8 +811,8 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
ep->drag->x = x;
ep->drag->tmp.x = 0;
ep->drag->need_reset = 0;
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
}
if (ep->drag->y != y || ep->drag->tmp.y)
@ -820,8 +820,8 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
ep->drag->y = y;
ep->drag->tmp.y = 0;
ep->drag->need_reset = 0;
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
}
#ifdef EDJE_CALC_CACHE
@ -3015,7 +3015,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
{
static Evas_Map *map = NULL;
ed->have_mapped_part = 1;
ed->have_mapped_part = EINA_TRUE;
// create map and populate with part geometry
if (!map) map = evas_map_new(4);
evas_map_util_points_populate_from_object(map, ep->object);

16
legacy/edje/src/lib/edje_callbacks.c
View File

@ -185,8 +185,8 @@ _edje_mouse_up_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
if (rp->drag->down.count == 0)
{
rp->drag->need_reset = 1;
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -265,8 +265,8 @@ _edje_mouse_move_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
rp->drag->tmp.x = ev->cur.canvas.x - rp->drag->down.x;
if (rp->part->dragable.y)
rp->drag->tmp.y = ev->cur.canvas.y - rp->drag->down.y;
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -284,8 +284,8 @@ _edje_mouse_move_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
rp->drag->val.y = dy;
if (!ignored)
_edje_emit(ed, "drag", rp->part->name);
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -342,7 +342,7 @@ _edje_timer_cb(void *data __UNUSED__)
{
const void *tmp;
ed->walking_actions = 1;
ed->walking_actions = EINA_TRUE;
EINA_LIST_FOREACH(ed->actions, l, tmp)
newl = eina_list_append(newl, tmp);
while (newl)
@ -379,7 +379,7 @@ _edje_timer_cb(void *data __UNUSED__)
free(runp);
}
}
ed->walking_actions = 0;
ed->walking_actions = EINA_FALSE;
}
break_prog:
_edje_unblock(ed);

4
legacy/edje/src/lib/edje_container.c
View File

@ -157,7 +157,7 @@ _edje_item_recalc(Edje_Item *ei)
((Smart_Data *)(ei->sd))->colinfo[i].maxw = ei->cells[i].maxw;
}
ei->recalc = 0;
ei->recalc = EINA_FALSE;
_edje_container_recalc(ei->sd);
}
@ -419,7 +419,7 @@ edje_item_column_size_set(Edje_Item *ei, int col, Evas_Coord minw, Evas_Coord ma
ei->cells[col].maxh = maxh;
ei->cells[col].minw = minw;
ei->cells[col].maxw = maxw;
ei->recalc = 1;
ei->recalc = EINA_TRUE;
if (ei->sd)
{
((Smart_Data *)(ei->sd))->changed = 1;

18
legacy/edje/src/lib/edje_embryo.c
View File

@ -674,10 +674,10 @@ _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
if (h < 0.0) h = 0.0;
ed->collection->prop.min.w = w;
ed->collection->prop.min.h = h;
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
return 0;
@ -702,10 +702,10 @@ _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
if (h < 0.0) h = 0.0;
ed->collection->prop.max.w = w;
ed->collection->prop.max.h = h;
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
@ -726,13 +726,13 @@ _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params)
program_id = params[1];
if (program_id < 0) return 0;
ed->walking_actions = 1;
ed->walking_actions = EINA_TRUE;
EINA_LIST_FOREACH(ed->actions, l, runp)
if (program_id == runp->program->id)
_edje_program_end(ed, runp);
ed->walking_actions = 0;
ed->walking_actions = EINA_FALSE;
return 0;
}
@ -2202,7 +2202,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
ed->dirty=1;
ed->dirty = EINA_TRUE;
return 0;
}

10
legacy/edje/src/lib/edje_load.c
View File

@ -389,7 +389,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
ed->load_error = EDJE_LOAD_ERROR_NONE;
_edje_file_add(ed);
ed->block_break = 0;
ed->block_break = EINA_FALSE;
if (ed->file && ed->file->external_dir)
{
@ -764,10 +764,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
_edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
}
}
ed->recalc_call = 1;
ed->dirty = 1;
ed->recalc_call = EINA_TRUE;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
if ((evas_object_clipees_get(ed->base.clipper)) &&
(evas_object_visible_get(obj)))
@ -1198,7 +1198,7 @@ _edje_file_del(Edje *ed)
if (ed->freeze_calc)
{
_edje_freeze_calc_list = eina_list_remove(_edje_freeze_calc_list, ed);
ed->freeze_calc = 0;
ed->freeze_calc = EINA_FALSE;
_edje_freeze_calc_count--;
}
_edje_entry_shutdown(ed);

8
legacy/edje/src/lib/edje_lua.c
View File

@ -4315,7 +4315,7 @@ _edje_lua_group_set_size_min(lua_State *L)
lua_rawgeti(L, 2, 2);
obj->ed->collection->prop.min.w = luaL_checkint(L, -2);
obj->ed->collection->prop.min.h = luaL_checkint(L, -1);
obj->ed->dirty = 1;
obj->ed->dirty = EINA_TRUE;
_edje_recalc(obj->ed);
return 0;
}
@ -4329,7 +4329,7 @@ _edje_lua_group_set_size_max(lua_State *L)
lua_rawgeti(L, 2, 2);
obj->ed->collection->prop.max.w = luaL_checkint(L, -2);
obj->ed->collection->prop.max.h = luaL_checkint(L, -1);
obj->ed->dirty = 1;
obj->ed->dirty = EINA_TRUE;
_edje_recalc(obj->ed);
return 0;
}
@ -4536,11 +4536,11 @@ _edje_lua_group_fn_program_stop(lua_State *L)
int program_id = pr->id;
Edje_Running_Program *runp;
Eina_List *l;
obj->ed->walking_actions = 1;
obj->ed->walking_actions = EINA_TRUE;
EINA_LIST_FOREACH(obj->ed->actions, l, runp)
if (program_id == runp->program->id)
_edje_program_end(obj->ed, runp);
obj->ed->walking_actions = 0;
obj->ed->walking_actions = EINA_FALSE;
return 0;
}

2
legacy/edje/src/lib/edje_main.c
View File

@ -224,7 +224,7 @@ _edje_del(Edje *ed)
if (ed->processing_messages)
{
ed->delete_me = 1;
ed->delete_me = EINA_TRUE;
return;
}
_edje_message_del(ed);

6
legacy/edje/src/lib/edje_match.c
View File

@ -264,7 +264,7 @@ _edje_match_patterns_exec_init_states(Edje_States *states,
if (!r) return NULL; \
\
r->ref = 1; \
r->delete_me = 0; \
r->delete_me = EINA_FALSE; \
r->patterns_size = eina_list_count(lst); \
r->max_length = 0; \
r->patterns = (const char **) r->finals + r->patterns_size + 1; \
@ -331,7 +331,7 @@ _edje_match_patterns_exec_init_states(Edje_States *states,
if (!r) return NULL; \
\
r->ref = 1; \
r->delete_me = 0; \
r->delete_me = EINA_FALSE; \
r->patterns_size = count; \
r->max_length = 0; \
r->patterns = (const char **) r->finals + r->patterns_size + 1; \
@ -678,7 +678,7 @@ edje_match_patterns_free(Edje_Patterns *ppat)
{
if (!ppat) return ;
ppat->delete_me = 1;
ppat->delete_me = EINA_TRUE;
ppat->ref--;
if (ppat->ref > 0) return;
_edje_match_states_free(ppat->states, 2);

50
legacy/edje/src/lib/edje_private.h
View File

@ -1191,29 +1191,29 @@ struct _Edje
int walking_callbacks;
unsigned int dirty : 1;
unsigned int recalc : 1;
unsigned int delete_callbacks : 1;
unsigned int just_added_callbacks : 1;
unsigned int have_objects : 1;
unsigned int paused : 1;
unsigned int no_anim : 1;
unsigned int calc_only : 1;
unsigned int walking_actions : 1;
unsigned int block_break : 1;
unsigned int delete_me : 1;
unsigned int postponed : 1;
unsigned int freeze_calc : 1;
unsigned int has_entries : 1;
unsigned int entries_inited : 1;
Eina_Bool dirty : 1;
Eina_Bool recalc : 1;
Eina_Bool delete_callbacks : 1;
Eina_Bool just_added_callbacks : 1;
Eina_Bool have_objects : 1;
Eina_Bool paused : 1;
Eina_Bool no_anim : 1;
Eina_Bool calc_only : 1;
Eina_Bool walking_actions : 1;
Eina_Bool block_break : 1;
Eina_Bool delete_me : 1;
Eina_Bool postponed : 1;
Eina_Bool freeze_calc : 1;
Eina_Bool has_entries : 1;
Eina_Bool entries_inited : 1;
#ifdef EDJE_CALC_CACHE
unsigned int text_part_change : 1;
unsigned int all_part_change : 1;
Eina_Bool text_part_change : 1;
Eina_Bool all_part_change : 1;
#endif
unsigned int have_mapped_part : 1;
unsigned int recalc_call : 1;
unsigned int update_hints : 1;
unsigned int recalc_hints : 1;
Eina_Bool have_mapped_part : 1;
Eina_Bool recalc_call : 1;
Eina_Bool update_hints : 1;
Eina_Bool recalc_hints : 1;
};
struct _Edje_Calc_Params
@ -1384,7 +1384,7 @@ struct _Edje_Running_Program
Edje *edje;
Edje_Program *program;
double start_time;
char delete_me : 1;
Eina_Bool delete_me : 1;
};
struct _Edje_Signal_Callback
@ -1393,9 +1393,9 @@ struct _Edje_Signal_Callback
const char *source;
Edje_Signal_Cb func;
void *data;
unsigned char just_added : 1;
unsigned char delete_me : 1;
unsigned char propagate : 1;
Eina_Bool just_added : 1;
Eina_Bool delete_me : 1;
Eina_Bool propagate : 1;
};
struct _Edje_Text_Insert_Filter_Callback

30
legacy/edje/src/lib/edje_program.c
View File

@ -44,7 +44,7 @@ edje_object_propagate_callback_add(Evas_Object *obj, void (*func) (void *data, E
if (ed->walking_callbacks)
{
escb->just_added = 1;
ed->just_added_callbacks = 1;
ed->just_added_callbacks = EINA_TRUE;
}
else
_edje_callbacks_patterns_clean(ed);
@ -71,7 +71,7 @@ edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const ch
if (ed->walking_callbacks)
{
escb->just_added = 1;
ed->just_added_callbacks = 1;
ed->just_added_callbacks = EINA_TRUE;
}
else
_edje_callbacks_patterns_clean(ed);
@ -101,8 +101,8 @@ edje_object_signal_callback_del(Evas_Object *obj, const char *emission, const ch
data = escb->data;
if (ed->walking_callbacks)
{
escb->delete_me = 1;
ed->delete_callbacks = 1;
escb->delete_me = EINA_TRUE;
ed->delete_callbacks = EINA_TRUE;
}
else
{
@ -143,8 +143,8 @@ edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, con
data2 = escb->data;
if (ed->walking_callbacks)
{
escb->delete_me = 1;
ed->delete_callbacks = 1;
escb->delete_me = EINA_TRUE;
ed->delete_callbacks = EINA_TRUE;
}
else
{
@ -189,7 +189,7 @@ edje_object_play_set(Evas_Object *obj, Eina_Bool play)
if (play)
{
if (!ed->paused) return;
ed->paused = 0;
ed->paused = EINA_FALSE;
t = ecore_time_get() - ed->paused_at;
EINA_LIST_FOREACH(ed->actions, l, runp)
runp->start_time += t;
@ -349,7 +349,7 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
}
}
_edje_recalc(ed);
runp->delete_me = 1;
runp->delete_me = EINA_TRUE;
if (!ed->walking_actions)
{
_edje_anim_count--;
@ -426,7 +426,7 @@ _edje_program_end(Edje *ed, Edje_Running_Program *runp)
}
}
_edje_recalc(ed);
runp->delete_me = 1;
runp->delete_me = EINA_TRUE;
// pname = runp->program->name;
if (!ed->walking_actions)
{
@ -1326,8 +1326,8 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src, Edje_Message_Signal_Da
if (!ed->walking_callbacks &&
((ed->delete_callbacks) || (ed->just_added_callbacks)))
{
ed->delete_callbacks = 0;
ed->just_added_callbacks = 0;
ed->delete_callbacks = EINA_FALSE;
ed->just_added_callbacks = EINA_FALSE;
l = ed->callbacks;
while (l)
{
@ -1633,8 +1633,8 @@ _edje_param_native_set(Edje_Real_Part *rp, const char *name, const Edje_External
if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
return EINA_FALSE;
rp->drag->size.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
rp->edje->recalc_call = 1;
rp->edje->dirty = 1;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -1646,8 +1646,8 @@ _edje_param_native_set(Edje_Real_Part *rp, const char *name, const Edje_External
if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
return EINA_FALSE;
rp->drag->size.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
rp->edje->recalc_call = 1;
rp->edje->dirty = 1;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif

8
legacy/edje/src/lib/edje_smart.c
View File

@ -120,7 +120,7 @@ _edje_smart_add(Evas_Object *obj)
evas_object_resize(ed->base.clipper, 20000, 20000);
evas_object_pass_events_set(ed->base.clipper, 1);
ed->is_rtl = EINA_FALSE;
ed->have_objects = 1;
ed->have_objects = EINA_TRUE;
ed->references = 1;
ed->user_defined = NULL;
ed->color_classes = eina_hash_string_small_new(_edje_color_class_free);
@ -192,7 +192,7 @@ _edje_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
if (ed->have_mapped_part)
{
ed->dirty = 1;
ed->dirty = EINA_TRUE;
_edje_recalc_do(ed);
}
else
@ -269,7 +269,7 @@ _edje_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h)
ed->w = w;
ed->h = h;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
if (_edje_script_only(ed))
{
@ -282,7 +282,7 @@ _edje_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h)
return;
}
// evas_object_resize(ed->clipper, ed->w, ed->h);
ed->dirty = 1;
ed->dirty = EINA_TRUE;
_edje_recalc_do(ed);
_edje_emit(ed, "resize", NULL);
}

176
legacy/edje/src/lib/edje_util.c
View File

@ -99,8 +99,8 @@ _edje_user_definition_free(Edje_User_Defined *eud)
rp->swallow_params.min.h = 0;
rp->swallow_params.max.w = 0;
rp->swallow_params.max.h = 0;
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -278,7 +278,7 @@ edje_thaw(void)
EINA_LIST_FREE(_edje_freeze_calc_list, ed)
{
_edje_thaw_edje(ed);
ed->freeze_calc = 0;
ed->freeze_calc = EINA_FALSE;
}
}
#else
@ -521,10 +521,10 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
Edje *ed;
ed = eina_list_data_get(members);
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
_edje_emit(ed, "color_class,set", color_class);
@ -588,10 +588,10 @@ edje_color_class_del(const char *color_class)
Edje *ed;
ed = eina_list_data_get(members);
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
_edje_emit(ed, "color_class,del", color_class);
@ -662,10 +662,10 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
cc->g3 = g3;
cc->b3 = b3;
cc->a3 = a3;
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
return EINA_TRUE;
@ -693,10 +693,10 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
cc->b3 = b3;
cc->a3 = a3;
eina_hash_direct_add(ed->color_classes, cc->name, cc);
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
for (i = 0; i < ed->table_parts_size; i++)
@ -767,10 +767,10 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class)
edje_object_color_class_del(rp->swallowed_object, color_class);
}
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
_edje_emit(ed, "color_class,del", color_class);
@ -823,11 +823,11 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
Edje *ed;
ed = eina_list_data_get(members);
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_textblock_style_all_update(ed);
#ifdef EDJE_CALC_CACHE
ed->text_part_change = 1;
ed->text_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
members = eina_list_next(members);
@ -857,10 +857,10 @@ edje_text_class_del(const char *text_class)
Edje *ed;
ed = eina_list_data_get(members);
ed->dirty = 1;
ed->dirty = EINA_TRUE;
_edje_textblock_style_all_update(ed);
#ifdef EDJE_CALC_CACHE
ed->text_part_change = 1;
ed->text_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
members = eina_list_next(members);
@ -944,10 +944,10 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
font, size);
}
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->text_part_change = 1;
ed->text_part_change = EINA_TRUE;
#endif
_edje_textblock_style_all_update(ed);
_edje_recalc(ed);
@ -1069,9 +1069,9 @@ _edje_object_part_text_raw_set(Evas_Object *obj, Edje_Real_Part *rp, const char
_edje_entry_text_markup_set(rp, text);
else
if (text) rp->text.text = eina_stringshare_add(text);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->recalc_hints = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->recalc_hints = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -1105,7 +1105,7 @@ _edje_object_part_text_raw_append(Evas_Object *obj, Edje_Real_Part *rp, const ch
eina_stringshare_replace(&rp->text.text, text);
}
}
rp->edje->dirty = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = 1;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
@ -1134,7 +1134,7 @@ edje_object_part_text_style_user_push(Evas_Object *obj, const char *part,
evas_textblock_style_set(ts, style);
evas_object_textblock_style_user_push(rp->object, ts);
evas_textblock_style_free(ts);
ed->recalc_hints = 1;
ed->recalc_hints = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -1154,7 +1154,7 @@ edje_object_part_text_style_user_pop(Evas_Object *obj, const char *part)
if (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) return;
evas_object_textblock_style_user_pop(rp->object);
ed->recalc_hints = 1;
ed->recalc_hints = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -1543,9 +1543,9 @@ edje_object_part_text_insert(Evas_Object *obj, const char *part, const char *tex
if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return;
_edje_entry_text_markup_insert(rp, text);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->recalc_hints = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->recalc_hints = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -1566,9 +1566,9 @@ edje_object_part_text_append(Evas_Object *obj, const char *part, const char *tex
if (!rp) return;
if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
_edje_object_part_text_raw_append(obj, rp, part, text);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->recalc_hints = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->recalc_hints = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -2501,8 +2501,8 @@ _recalc_extern_parent(Evas_Object *obj)
parent = evas_object_smart_parent_get(obj);
ed = _edje_fetch(parent);
ed->dirty = 1;
ed->recalc_call = 1; // ZZZ: ???
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE; // ZZZ: ???
_edje_recalc(ed);
}
@ -2803,8 +2803,8 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
rp->swallow_params.min.h = 0;
rp->swallow_params.max.w = 0;
rp->swallow_params.max.h = 0;
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -2890,9 +2890,9 @@ edje_object_calc_force(Evas_Object *obj)
ed = _edje_fetch(obj);
if (!ed) return;
ed->dirty = 1;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
pf2 = _edje_freeze_val;
@ -2931,10 +2931,10 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
return EINA_FALSE;
}
ed->calc_only = 1;
ed->calc_only = EINA_TRUE;
/* Need to recalc before providing the object. */
ed->dirty = 1;
ed->dirty = EINA_TRUE;
_edje_recalc_do(ed);
for (i = 0; i < ed->table_parts_size; i++)
@ -2956,7 +2956,7 @@ edje_object_parts_extends_calc(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
if (yy2 < rpy2) yy2 = rpy2;
}
ed->calc_only = 0;
ed->calc_only = EINA_FALSE;
if (x) *x = xx1;
if (y) *y = yy1;
@ -2985,7 +2985,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
return;
}
reset_maxwh = 1;
ed->calc_only = 1;
ed->calc_only = EINA_TRUE;
pw = ed->w;
ph = ed->h;
@ -3001,9 +3001,9 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
unsigned int i;
okw = okh = 0;
ed->dirty = 1;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc_do(ed);
if (reset_maxwh)
@ -3109,12 +3109,12 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
ed->w = pw;
ed->h = ph;
ed->dirty = 1;
ed->dirty = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
ed->all_part_change = 1;
ed->all_part_change = EINA_TRUE;
#endif
_edje_recalc(ed);
ed->calc_only = 0;
ed->calc_only = EINA_FALSE;
}
/* FIXME: Correctly return other states */
@ -3305,8 +3305,8 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
if ((rp->drag->size.x == FROM_DOUBLE(dw)) && (rp->drag->size.y == FROM_DOUBLE(dh))) return EINA_TRUE;
rp->drag->size.x = FROM_DOUBLE(dw);
rp->drag->size.y = FROM_DOUBLE(dh);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -3837,8 +3837,8 @@ _edje_box_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUS
{
Edje_Real_Part *rp = data;
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -3851,8 +3851,8 @@ _edje_box_child_add(Edje_Real_Part *rp, Evas_Object *child)
evas_object_event_callback_add
(child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -3865,8 +3865,8 @@ _edje_box_child_remove(Edje_Real_Part *rp, Evas_Object *child)
evas_object_event_callback_del_full
(child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -4032,8 +4032,8 @@ _edje_table_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child, voi
}
}
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -4046,8 +4046,8 @@ _edje_table_child_add(Edje_Real_Part *rp, Evas_Object *child)
evas_object_event_callback_add
(child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -4060,8 +4060,8 @@ _edje_table_child_remove(Edje_Real_Part *rp, Evas_Object *child)
evas_object_event_callback_del_full
(child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
#ifdef EDJE_CALC_CACHE
rp->invalidate = 1;
#endif
@ -4197,8 +4197,8 @@ _edje_perspective_obj_del(void *data, __UNUSED__ Evas *e, __UNUSED__ Evas_Object
ed = evas_object_smart_data_get(o);
if (!ed) continue;
ed->persp = NULL;
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_recalc_do(ed);
}
free(ps);
@ -4251,8 +4251,8 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
if (!ed) continue;
if (!ed->persp)
{
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_recalc_do(ed);
}
}
@ -4266,8 +4266,8 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
if (!ed) continue;
if (!ed->persp)
{
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_recalc_do(ed);
}
}
@ -4300,8 +4300,8 @@ edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global)
if (!ed) continue;
if (!ed->persp)
{
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_recalc_do(ed);
}
}
@ -4340,8 +4340,8 @@ edje_object_perspective_set(Evas_Object *obj, Edje_Perspective *ps)
}
ed->persp = ps;
if (ps) ps->users = eina_list_append(ps->users, obj);
ed->dirty = 1;
ed->recalc_call = 1;
ed->dirty = EINA_TRUE;
ed->recalc_call = EINA_TRUE;
_edje_recalc_do(ed);
}
@ -4458,7 +4458,7 @@ edje_object_update_hints_set(Evas_Object *obj, Eina_Bool update)
ed->update_hints = !!update;
if (update)
{
ed->recalc_hints = 1;
ed->recalc_hints = EINA_TRUE;
_edje_recalc(ed);
}
}
@ -4892,7 +4892,7 @@ _edje_unblock(Edje *ed)
if (!ed) return ret;
ed->block--;
if (ed->block == 0) ed->block_break = 0;
if (ed->block == 0) ed->block_break = EINA_FALSE;
ret = ed->block;
_edje_unref(ed);
return ret;
@ -4908,7 +4908,7 @@ _edje_block_break(Edje *ed)
void
_edje_block_violate(Edje *ed)
{
if (ed->block > 0) ed->block_break = 1;
if (ed->block > 0) ed->block_break = EINA_TRUE;
}
void
@ -5015,8 +5015,8 @@ _edje_object_part_swallow_changed_hints_cb(void *data, __UNUSED__ Evas *e, __UNU
rp = data;
_edje_real_part_swallow_hints_update(rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
_edje_recalc(rp->edje);
return;
}
@ -5036,9 +5036,9 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
{
if (hints_update)
_edje_real_part_swallow_hints_update(rp);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->recalc_hints = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->recalc_hints = EINA_TRUE;
_edje_recalc(rp->edje);
return;
}
@ -5081,9 +5081,9 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
if (rp->part->precise_is_inside)
evas_object_precise_is_inside_set(obj_swallow, 1);
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
rp->edje->recalc_hints = 1;
rp->edje->dirty = EINA_TRUE;
rp->edje->recalc_call = EINA_TRUE;
rp->edje->recalc_hints = EINA_TRUE;
_edje_recalc(rp->edje);
}