Enlightenment CVS committal
Author : cedric
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_render.c
Log Message:
Removing trailing white spaces.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_render.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evas_render.c 2 Oct 2007 03:40:14 -0000 1.26
+++ evas_render.c 14 Apr 2008 09:31:31 -0000 1.27
@@ -71,7 +71,7 @@
_evas_render_phase1_object_process(Evas *e, Evas_Object *obj, Evas_List
**active_objects, Evas_List **restack_objects, Evas_List **delete_objects, int
restack)
{
int is_active;
-
+
/* if (obj->cur.cache.clip.dirty) */
evas_object_clip_recalc(obj);
/* because of clip objects - delete 2 cycles later */
@@ -80,7 +80,7 @@
else if (obj->delete_me != 0) obj->delete_me++;
/* build active object list */
is_active = evas_object_is_active(obj);
- if ((is_active) || (obj->delete_me != 0))
+ if ((is_active) || (obj->delete_me != 0))
*active_objects = evas_list_append(*active_objects, obj);
if (restack)
{
@@ -92,14 +92,14 @@
if (obj->smart.smart)
{
Evas_Object_List *l;
-
+
obj->func->render_pre(obj);
for (l = obj->smart.contained; l; l = l->next)
{
Evas_Object *obj2;
-
+
obj2 = (Evas_Object *)l;
- _evas_render_phase1_object_process(e, obj2,
+ _evas_render_phase1_object_process(e, obj2,
active_objects,
restack_objects,
delete_objects,
@@ -109,11 +109,11 @@
else
{
if ((is_active) && (obj->restack) && (!obj->clip.clipees) &&
- ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
+ ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
(evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
*restack_objects = evas_list_append(*restack_objects, obj);
else if ((is_active) && (!obj->clip.clipees) &&
- ((evas_object_is_visible(obj) &&
(!obj->cur.have_clipees)) ||
+ ((evas_object_is_visible(obj) &&
(!obj->cur.have_clipees)) ||
(evas_object_was_visible(obj) &&
(!obj->prev.have_clipees))))
obj->func->render_pre(obj);
}
@@ -121,21 +121,21 @@
else
{
if ((!obj->clip.clipees) && (obj->delete_me == 0) &&
- ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
+ ((evas_object_is_visible(obj) && (!obj->cur.have_clipees)) ||
(evas_object_was_visible(obj) && (!obj->prev.have_clipees))))
{
if (obj->smart.smart)
{
Evas_Object_List *l;
-
+
obj->func->render_pre(obj);
for (l = obj->smart.contained; l; l = l->next)
{
Evas_Object *obj2;
-
+
obj2 = (Evas_Object *)l;
- _evas_render_phase1_object_process(e, obj2,
- active_objects,
+ _evas_render_phase1_object_process(e, obj2,
+ active_objects,
restack_objects,
delete_objects,
restack);
@@ -143,7 +143,7 @@
}
else
{
- if (evas_object_is_opaque(obj) &&
+ if (evas_object_is_opaque(obj) &&
evas_object_is_visible(obj))
e->engine.func->output_redraws_rect_del(e->engine.data.output,
obj->cur.cache.clip.x,
@@ -153,7 +153,7 @@
}
}
}
- if (!is_active) obj->restack = 0;
+ if (!is_active) obj->restack = 0;
}
static void
@@ -173,7 +173,7 @@
obj = (Evas_Object *)l2;
_evas_render_phase1_object_process(e, obj, active_objects,
- restack_objects,
+ restack_objects,
delete_objects, 0);
}
}
@@ -285,11 +285,11 @@
&cx, &cy, &cw,
&ch)))
{
int off_x, off_y;
-
+
if (make_updates)
{
Evas_Rectangle *rect;
-
+
rect = malloc(sizeof(Evas_Rectangle));
if (rect)
{
@@ -303,7 +303,7 @@
for (ll = obscuring_objects_orig; ll; ll = ll->next)
{
Evas_Object *obj;
-
+
obj = (Evas_Object *)(ll->data);
if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh))
obscuring_objects = evas_list_append(obscuring_objects,
obj);
@@ -314,7 +314,7 @@
Evas_Object *obj;
Evas_List *l3;
obj = (Evas_Object *)(ll->data);
-
+
/* if it's in our outpout rect and it doesn't clip anything */
if (evas_object_is_in_output_rect(obj, ux, uy, uw, uh) &&
(!obj->clip.clipees) &&
@@ -325,8 +325,8 @@
(obj->cur.color.a > 0))
{
int x, y, w, h;
-
- if ((obscuring_objects) &&
+
+ if ((obscuring_objects) &&
(obscuring_objects->data == obj))
obscuring_objects =
evas_list_remove(obscuring_objects, obj);
x = cx; y = cy; w = cw; h = ch;
@@ -351,7 +351,7 @@
/// {
/// abort();
/// }
-
+
e->engine.func->context_clip_set(e->engine.data.output,
e->engine.data.context,
x, y, w, h);
@@ -359,7 +359,7 @@
for (l3 = obscuring_objects; l3; l3 = l3->next)
{
Evas_Object *obj2;
-
+
obj2 = (Evas_Object *)l3->data;
e->engine.func->context_cutout_add(e->engine.data.output,
e->engine.data.context,
@@ -395,7 +395,7 @@
for (ll = active_objects; ll; ll = ll->next)
{
Evas_Object *obj;
-
+
obj = (Evas_Object *)(ll->data);
obj->pre_render_done = 0;
if ((obj->changed) && (do_draw))
@@ -428,9 +428,9 @@
e->changed = 0;
e->viewport.changed = 0;
e->output.changed = 0;
-
+
evas_module_clean();
-
+
return updates;
}
@@ -462,7 +462,7 @@
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
MAGIC_CHECK_END();
-
+
if (!e->changed) return NULL;
return evas_render_updates_internal(e, 1, 1);
}
@@ -496,7 +496,7 @@
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
-
+
// if (!e->changed) return;
evas_render_updates_internal(e, 0, 0);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
