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

Evas evas_render.c: Fixed formatting. 

Fixed indentation and removed trailing whitespaces.


SVN revision: 59560
This commit is contained in:
Daniel Juyung Seo 2011-05-21 06:23:33 +00:00
parent b9eef78c41
commit 924bddfc83
1 changed files with 450 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
legacy/evas/src/lib/canvas/evas_render.c
View File

@ -92,14 +92,14 @@ _evas_render_has_map(Evas_Object *obj)
{
return ((!((obj->func->can_map) && (obj->func->can_map(obj)))) &&
((obj->cur.map) && (obj->cur.usemap)));
// return ((obj->cur.map) && (obj->cur.usemap));
// return ((obj->cur.map) && (obj->cur.usemap));
}
static Eina_Bool
_evas_render_had_map(Evas_Object *obj)
{
return ((obj->prev.map) && (obj->prev.usemap));
// return ((!obj->cur.map) && (obj->prev.usemap));
// return ((!obj->cur.map) && (obj->prev.usemap));
}
static Eina_Bool
@ -218,7 +218,7 @@ _evas_render_phase1_direct(Evas *e,
{
if (obj->smart.smart)
{
// obj->func->render_pre(obj);
// obj->func->render_pre(obj);
}
else if (obj->rect_del)
{
@ -329,7 +329,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj,
{
RDI(level);
RD(" had map - restack objs\n");
// eina_array_push(restack_objects, obj);
// eina_array_push(restack_objects, obj);
_evas_render_prev_cur_clip_cache_add(e, obj);
if (obj->changed)
{
@ -450,7 +450,7 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj,
}
}
}
/*
/*
else if (obj->smart.smart)
{
RDI(level);
@ -468,17 +468,17 @@ _evas_render_phase1_object_process(Evas *e, Evas_Object *obj,
restack, map,
redraw_all
#ifdef REND_DGB
, level + 1
, level + 1
#endif
);
}
}
);
}
}
*/
}
if (!is_active) obj->restack = 0;
RDI(level);
RD(" ---]\n");
return clean_them;
}
if (!is_active) obj->restack = 0;
RDI(level);
RD(" ---]\n");
return clean_them;
}
static Eina_Bool
@ -570,7 +570,7 @@ _evas_render_check_pending_objects(Eina_Array *pending_objects, Evas *e)
}
}
clean_stuff:
clean_stuff:
if (!ok)
{
eina_array_clean(&e->active_objects);
@ -594,7 +594,7 @@ pending_change(void *data, void *gdata __UNUSED__)
{
RD(" OBJ [%p] pending change %i -> 0, pre %i\n", obj, obj->changed, obj->pre_render_done);
obj->pre_render_done = 0;
//// FIXME: this wipes out changes
//// FIXME: this wipes out changes
obj->changed = 0;
obj->changed_move_only = 0;
obj->changed_nomove = 0;
@ -603,9 +603,9 @@ pending_change(void *data, void *gdata __UNUSED__)
return obj->changed ? EINA_TRUE : EINA_FALSE;
}
/*
static void
unchange(Evas_Object *obj)
{
static void
unchange(Evas_Object *obj)
{
Evas_Object *obj2;
if (!obj->changed) return;
@ -617,11 +617,11 @@ unchange(Evas_Object *obj)
{
unchange(obj2);
}
}
}
static int
chlist(Evas_Object *obj, int i)
{
static int
chlist(Evas_Object *obj, int i)
{
Evas_Object *obj2;
int j;
int ret = 0;
@ -644,8 +644,8 @@ chlist(Evas_Object *obj, int i)
if (obj2->changed)
ret |= chlist(obj2, i + 1);
}
}
*/
}
*/
static Eina_Bool
evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
@ -782,7 +782,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
}
if (o2->changed)
{
// chlist(o2, 0);
// chlist(o2, 0);
changed = 1;
o2->changed = 0;
o2->changed_move_only = 0;
@ -791,7 +791,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
break;
}
}
// unchange(obj);
// unchange(obj);
obj->changed = 0;
obj->changed_move_only = 0;
obj->changed_nomove = 0;
@ -944,9 +944,9 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
obj->cur.map->smooth, 0);
// FIXME: needs to cache these maps and
// keep them only rendering updates
// obj->layer->evas->engine.func->image_map_surface_free
// (e->engine.data.output, obj->cur.map->surface);
// obj->cur.map->surface = NULL;
// obj->layer->evas->engine.func->image_map_surface_free
// (e->engine.data.output, obj->cur.map->surface);
// obj->cur.map->surface = NULL;
}
else
{
@ -1020,7 +1020,7 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface,
}
obj->func->render(obj, e->engine.data.output, ctx,
surface, off_x, off_y);
/*
/*
obj->layer->evas->engine.func->context_color_set(e->engine.data.output,
ctx,
0, 30, 0, 30);
@ -1174,12 +1174,12 @@ evas_render_updates_internal(Evas *e,
(!obj->delete_me) &&
(obj->cur.cache.clip.visible) &&
(!obj->smart.smart)))
/* obscuring_objects = eina_list_append(obscuring_objects, obj); */
/* obscuring_objects = eina_list_append(obscuring_objects, obj); */
eina_array_push(&e->obscuring_objects, obj);
}
/* save this list */
/* obscuring_objects_orig = obscuring_objects; */
/* obscuring_objects = NULL; */
/* obscuring_objects_orig = obscuring_objects; */
/* obscuring_objects = NULL; */
/* phase 6. go thru each update rect and render objects in it*/
if (do_draw)
{
@ -1296,7 +1296,7 @@ evas_render_updates_internal(Evas *e,
(obj->cur.visible) &&
(!obj->delete_me) &&
(obj->cur.cache.clip.visible) &&
// (!obj->smart.smart) &&
// (!obj->smart.smart) &&
((obj->cur.color.a > 0 || obj->cur.render_op != EVAS_RENDER_BLEND)))
{
int x, y, w, h;
@ -1435,7 +1435,7 @@ evas_render_updates_internal(Evas *e,
obj->changed_nomove = 0;
obj->changed_move = 0;
}
/* moved to other pre-process phase 1
/* moved to other pre-process phase 1
if (obj->delete_me == 2)
{
delete_objects = eina_list_append(delete_objects, obj);
@ -1538,7 +1538,7 @@ evas_norender(Evas *e)
return;
MAGIC_CHECK_END();
// if (!e->changed) return;
// if (!e->changed) return;
evas_render_updates_internal(e, 0, 0);
}
@ -1663,5 +1663,4 @@ evas_render_object_recalc(Evas_Object *obj)
}
}
/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/