Menu
▾
▴
E SVN: nash IN trunk/evas/src/lib: canvas include
|
From: Enlightenment S. <no-...@en...> - 2011-02-06 23:51:55
|
Log: Fix redrawing issues with proxies. Author: nash Date: 2011-02-06 15:51:48 -0800 (Sun, 06 Feb 2011) New Revision: 56775 Trac: http://trac.enlightenment.org/e/changeset/56775 Modified: trunk/evas/src/lib/canvas/evas_object_proxy.c trunk/evas/src/lib/canvas/evas_render.c trunk/evas/src/lib/include/evas_private.h Modified: trunk/evas/src/lib/canvas/evas_object_proxy.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_proxy.c 2011-02-06 23:51:39 UTC (rev 56774) +++ trunk/evas/src/lib/canvas/evas_object_proxy.c 2011-02-06 23:51:48 UTC (rev 56775) @@ -73,7 +73,6 @@ /* Optional .store = - .unstore = .is_visible = .was_visible = @@ -231,6 +230,7 @@ o->source = src; src->proxy.proxies = eina_list_append(src->proxy.proxies, proxy); + src->proxy.redraw = EINA_TRUE; } @@ -257,22 +257,26 @@ Evas_Object_Proxy *o; void *pixels; int w,h; + int iw, ih; o = obj->object_data; - printf("proxy render\n"); if (!o->source) return; - /* Images only essentially */ - if (o->source->proxy.surface) +// ENFN->context_multiplier_unset(output, context); + // ENFN->context_render_op_set(output, context, obj->cur.render_op); + + if (o->source->proxy.surface && o->source->proxy.redraw == EINA_FALSE) { pixels = o->source->proxy.surface; } /* Making this faster would be nice... */ -// else if (strcmp(evas_object_type_get(o->source),"image") == 0) - // { - // pixels = o->source->func->engine_data_get(o->source); - //} + else if (strcmp(evas_object_type_get(o->source),"image") == 0) + { + pixels = o->source->func->engine_data_get(o->source); + evas_object_image_size_get(o->source, &iw, &ih); + printf("\timage source (Pixels %p %dx%d)\n",pixels,iw,ih); + } else { _proxy_subrender(obj->layer->evas, o->source); @@ -321,12 +325,14 @@ } else { + printf("\timage draw %p %p %p %p %d %d %d %d %d %d\n", + output, context, surface, pixels, w,h,obj->cur.geometry.x+x, + obj->cur.geometry.y+y,iw,ih); +#warning Your mum obj->layer->evas->engine.func->image_draw(output, context, surface, pixels, 0, 0, - w, h, /* FIXME: - o->cur.image.w, - o->cur.image.h, */ + w, h, obj->cur.geometry.x + /*ix +*/ x, obj->cur.geometry.y + /*iy +*/ y, w, h,/* was iw,ih */ @@ -346,21 +352,28 @@ if (!source) return; - if (source->proxy.surface) + w = source->cur.geometry.w; + h = source->cur.geometry.h; + + source->proxy.redraw = EINA_FALSE; + + /* We need to redraw surface then */ + if (source->proxy.surface && (source->proxy.w != w || source->proxy.h != h)) { - /* FIXME: Don't free every time */ e->engine.func->image_map_surface_free(e->engine.data.output, source->proxy.surface); - + source->proxy.surface = NULL; } - w = source->cur.geometry.w; - h = source->cur.geometry.h; - /* FIXME: Hardcoded alpha 'on' */ /* FIXME (cont): Should see if the object has alpha */ - source->proxy.surface = e->engine.func->image_map_surface_new( - e->engine.data.output, w, h, 1); + if (!source->proxy.surface) + { + source->proxy.surface = e->engine.func->image_map_surface_new( + e->engine.data.output, w, h, 1); + source->proxy.w = w; + source->proxy.h = w; + } ctx = e->engine.func->context_new(e->engine.data.output); e->engine.func->context_color_set(e->engine.data.output, ctx, 0, 0, 0, 0); @@ -387,19 +400,64 @@ -source->cur.geometry.y); } e->engine.func->context_free(e->engine.data.output, ctx); + } static void _proxy_render_pre(Evas_Object *obj) { - printf("Proxy render pre\n"); + Evas_Object_Proxy *o; + Evas *e; + int was_v, is_v; + if (obj->pre_render_done) return; obj->pre_render_done = 1; + + printf("Proxy render pre: %p\n",obj); + + e = obj->layer->evas; + o = obj->object_data; + + is_v = evas_object_is_visible(obj); + was_v = evas_object_was_visible(obj); + + if (is_v != was_v) + { + printf("\tVis changed\n"); + evas_object_render_pre_visible_change(&e->clip_changes, obj, is_v, was_v); + } + if (((obj->cur.geometry.x != obj->prev.geometry.x) || + (obj->cur.geometry.y != obj->prev.geometry.y) || + (obj->cur.geometry.w != obj->prev.geometry.w) || + (obj->cur.geometry.h != obj->prev.geometry.h)) + ) + { + printf("\tgeo changed\n"); + evas_object_render_pre_prev_cur_add(&e->clip_changes, obj); + } + + if (o->source && o->source->proxy.redraw) + { + printf("\tsource redraw set\n"); + evas_add_rect(&e->clip_changes, + obj->cur.geometry.x, obj->cur.geometry.y, + obj->cur.geometry.w, obj->cur.geometry.h); + } + + evas_object_render_pre_effect_updates(&e->clip_changes, obj, is_v, was_v); } static void _proxy_render_post(Evas_Object *obj) { + Evas_Object_Proxy *o; + printf("proxy render post\n"); + o = obj->object_data; + + evas_object_clip_changes_clean(obj); + /* move cur to prev safely for object data */ + obj->prev = obj->cur; + //o->changed = 0; } static unsigned int _proxy_id_get(Evas_Object *obj) Modified: trunk/evas/src/lib/canvas/evas_render.c =================================================================== --- trunk/evas/src/lib/canvas/evas_render.c 2011-02-06 23:51:39 UTC (rev 56774) +++ trunk/evas/src/lib/canvas/evas_render.c 2011-02-06 23:51:48 UTC (rev 56775) @@ -191,6 +191,8 @@ Eina_Array *render_objects) { unsigned int i; + Eina_List *l; + Evas_Object *proxy; RD(" [--- PHASE 1 DIRECT\n"); for (i = 0; i < render_objects->count; i++) @@ -201,8 +203,15 @@ RD(" OBJ [%p] changed %i\n", obj, obj->changed); if (obj->changed) { + /* Flag need redraw on proxy too */ evas_object_clip_recalc(obj); obj->func->render_pre(obj); + if (obj->proxy.proxies) + { + obj->proxy.redraw = 1; + EINA_LIST_FOREACH(obj->proxy.proxies, l, proxy) + proxy->func->render_pre(proxy); + } if (obj->pre_render_done) { RD(" pre-render-done smart:%p|%p [%p, %i] | [%p, %i] has_map:%i had_map:%i\n", Modified: trunk/evas/src/lib/include/evas_private.h =================================================================== --- trunk/evas/src/lib/include/evas_private.h 2011-02-06 23:51:39 UTC (rev 56774) +++ trunk/evas/src/lib/include/evas_private.h 2011-02-06 23:51:48 UTC (rev 56775) @@ -444,6 +444,8 @@ struct { Eina_List *proxies; void *surface; + int w,h; + Eina_Bool redraw; } proxy; Evas_Size_Hints *size_hints; |