From: Enlightenment S. <no-...@en...> - 2011-02-14 04:43:02
|
Log: evas/evas_object_image - fixed an inccorect word in doxygen Author: hermet Date: 2011-02-13 20:42:53 -0800 (Sun, 13 Feb 2011) New Revision: 57003 Trac: http://trac.enlightenment.org/e/changeset/57003 Modified: trunk/evas/src/lib/canvas/evas_object_image.c Modified: trunk/evas/src/lib/canvas/evas_object_image.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_image.c 2011-02-14 03:04:20 UTC (rev 57002) +++ trunk/evas/src/lib/canvas/evas_object_image.c 2011-02-14 04:42:53 UTC (rev 57003) @@ -1757,7 +1757,7 @@ * * @param obj The given canvas object. * @param w The new width of the canvas image given. - * @param h Th new height of the canvas image given. + * @param h The new height of the canvas image given. * * This function sets a new size for the given canvas image. * |
From: Enlightenment S. <no-...@en...> - 2011-04-03 16:15:28
|
Log: evas / evas_smart - removed white spaces Author: hermet Date: 2011-04-03 09:15:21 -0700 (Sun, 03 Apr 2011) New Revision: 58305 Trac: http://trac.enlightenment.org/e/changeset/58305 Modified: trunk/evas/src/lib/canvas/evas_smart.c Modified: trunk/evas/src/lib/canvas/evas_smart.c =================================================================== --- trunk/evas/src/lib/canvas/evas_smart.c 2011-04-03 16:06:37 UTC (rev 58304) +++ trunk/evas/src/lib/canvas/evas_smart.c 2011-04-03 16:15:21 UTC (rev 58305) @@ -233,24 +233,24 @@ if (size == 0) { - free(a->array); - a->array = NULL; - a->size = 0; - return 1; + free(a->array); + a->array = NULL; + a->size = 0; + return 1; } tmp = realloc(a->array, (size + 1) * sizeof(Evas_Smart_Cb_Description *)); if (tmp) { - a->array = tmp; - a->size = size; - a->array[size] = NULL; - return 1; + a->array = tmp; + a->size = size; + a->array[size] = NULL; + return 1; } else { - ERR("realloc failed!"); - return 0; + ERR("realloc failed!"); + return 0; } } @@ -269,12 +269,12 @@ if (!a) { - ERR("no array to fix!"); - return; + ERR("no array to fix!"); + return; } qsort(a->array, a->size, sizeof(Evas_Smart_Cb_Description *), - _evas_smart_cb_description_cmp_sort); + _evas_smart_cb_description_cmp_sort); DBG("%u callbacks", a->size); if (a->size) @@ -282,29 +282,29 @@ for (i = 0, j = 1; j < a->size; j++) { - const Evas_Smart_Cb_Description *cur, *prev; + const Evas_Smart_Cb_Description *cur, *prev; - cur = a->array[j]; - prev = a->array[i]; + cur = a->array[j]; + prev = a->array[i]; - DBG("%s [type=%s]", cur->name, cur->type); + DBG("%s [type=%s]", cur->name, cur->type); - if (strcmp(cur->name, prev->name) != 0) - { - i++; - if (i != j) - a->array[i] = a->array[j]; - } - else - { - if (strcmp(cur->type, prev->type) == 0) - WRN("duplicated smart callback description" - " with name '%s' and type '%s'", cur->name, cur->type); - else - ERR("callback descriptions named '%s' differ" - " in type, keeping '%s', ignoring '%s'", - cur->name, prev->type, cur->type); - } + if (strcmp(cur->name, prev->name) != 0) + { + i++; + if (i != j) + a->array[i] = a->array[j]; + } + else + { + if (strcmp(cur->type, prev->type) == 0) + WRN("duplicated smart callback description" + " with name '%s' and type '%s'", cur->name, cur->type); + else + ERR("callback descriptions named '%s' differ" + " in type, keeping '%s', ignoring '%s'", + cur->name, prev->type, cur->type); + } } evas_smart_cb_descriptions_resize(a, i + 1); @@ -318,18 +318,18 @@ for (sc = s->smart_class; sc; sc = sc->parent) { - const Evas_Smart_Cb_Description *d; - for (d = sc->callbacks; d && d->name; d++) - n++; + const Evas_Smart_Cb_Description *d; + for (d = sc->callbacks; d && d->name; d++) + n++; } if (n == 0) return; if (!evas_smart_cb_descriptions_resize(&s->callbacks, n)) return; for (n = 0, sc = s->smart_class; sc; sc = sc->parent) { - const Evas_Smart_Cb_Description *d; - for (d = sc->callbacks; d && d->name; d++) - s->callbacks.array[n++] = d; + const Evas_Smart_Cb_Description *d; + for (d = sc->callbacks; d && d->name; d++) + s->callbacks.array[n++] = d; } evas_smart_cb_descriptions_fix(&s->callbacks); } @@ -349,5 +349,5 @@ { if (!a->array) return NULL; return bsearch(name, a->array, a->size, sizeof(Evas_Smart_Cb_Description *), - _evas_smart_cb_description_cmp_search); + _evas_smart_cb_description_cmp_search); } |
From: Enlightenment S. <no-...@en...> - 2011-05-04 11:19:57
|
Log: evas / canvas - removed useless line. Author: hermet Date: 2011-05-04 04:19:49 -0700 (Wed, 04 May 2011) New Revision: 59190 Trac: http://trac.enlightenment.org/e/changeset/59190 Modified: trunk/evas/src/lib/canvas/evas_events.c Modified: trunk/evas/src/lib/canvas/evas_events.c =================================================================== --- trunk/evas/src/lib/canvas/evas_events.c 2011-05-04 10:42:54 UTC (rev 59189) +++ trunk/evas/src/lib/canvas/evas_events.c 2011-05-04 11:19:49 UTC (rev 59190) @@ -133,7 +133,6 @@ return in; } -static Eina_List *evas_event_list_copy(Eina_List *list); static Eina_List * evas_event_list_copy(Eina_List *list) { |
From: Enlightenment S. <no-...@en...> - 2011-05-06 10:55:31
|
Log: evas/evas_object_smart - fixed parent cache invalidation logic error. Author: hermet Date: 2011-05-06 03:55:24 -0700 (Fri, 06 May 2011) New Revision: 59241 Trac: http://trac.enlightenment.org/e/changeset/59241 Modified: trunk/evas/src/lib/canvas/evas_object_smart.c Modified: trunk/evas/src/lib/canvas/evas_object_smart.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_smart.c 2011-05-06 10:52:20 UTC (rev 59240) +++ trunk/evas/src/lib/canvas/evas_object_smart.c 2011-05-06 10:55:24 UTC (rev 59241) @@ -712,11 +712,14 @@ Evas_Object_Smart *o; Eina_Inlist *l; + MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); + obj->parent_cache_valid = 0; + MAGIC_CHECK_END(); + o = (Evas_Object_Smart *)(obj->object_data); if (o->magic != MAGIC_OBJ_SMART) return; - obj->parent_cache_valid = 0; for (l = o->contained; l; l = l->next) { Evas_Object *obj2; |
From: Enlightenment S. <no-...@en...> - 2011-05-06 11:04:41
|
Log: evas / evas_object_smart - mistook! spank my ass! Author: hermet Date: 2011-05-06 04:04:32 -0700 (Fri, 06 May 2011) New Revision: 59242 Trac: http://trac.enlightenment.org/e/changeset/59242 Modified: trunk/evas/src/lib/canvas/evas_object_smart.c Modified: trunk/evas/src/lib/canvas/evas_object_smart.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_smart.c 2011-05-06 10:55:24 UTC (rev 59241) +++ trunk/evas/src/lib/canvas/evas_object_smart.c 2011-05-06 11:04:32 UTC (rev 59242) @@ -713,9 +713,11 @@ Eina_Inlist *l; MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); - obj->parent_cache_valid = 0; + return; MAGIC_CHECK_END(); + obj->parent_cache_valid = 0; + o = (Evas_Object_Smart *)(obj->object_data); if (o->magic != MAGIC_OBJ_SMART) return; |
From: Enlightenment S. <no-...@en...> - 2011-05-23 10:37:24
|
Log: evas/evas_map - removed white spaces, fixed identation. Author: hermet Date: 2011-05-23 03:37:17 -0700 (Mon, 23 May 2011) New Revision: 59620 Trac: http://trac.enlightenment.org/e/changeset/59620 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-05-23 10:25:14 UTC (rev 59619) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-05-23 10:37:17 UTC (rev 59620) @@ -11,22 +11,22 @@ evas_object_clip_dirty(obj); if (obj->layer->evas->events_frozen <= 0) { - evas_object_recalc_clippees(obj); - if (!pass) - { - if (!obj->smart.smart) - { - is = evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1); - if ((is ^ was) && obj->cur.visible) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); - } - } + evas_object_recalc_clippees(obj); + if (!pass) + { + if (!obj->smart.smart) + { + is = evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1); + if ((is ^ was) && obj->cur.visible) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); + } + } } evas_object_inform_call_move(obj); evas_object_inform_call_resize(obj); @@ -46,11 +46,11 @@ if (obj->prev.map->count == obj->cur.map->count) { const Evas_Map_Point *p2; - + p = obj->cur.map->points; p_end = p + obj->cur.map->count; p2 = obj->prev.map->points; - + for (; p < p_end; p++, p2++) { if ((p->a != p2->a) || @@ -75,7 +75,7 @@ } else ch = 1; - + p = obj->cur.map->points; p_end = p + obj->cur.map->count; x1 = p->x; @@ -134,8 +134,8 @@ { if (dst->count != src->count) { - ERR("cannot copy map of different sizes: dst=%i, src=%i", dst->count, src->count); - return EINA_FALSE; + ERR("cannot copy map of different sizes: dst=%i, src=%i", dst->count, src->count); + return EINA_FALSE; } memcpy(dst->points, src->points, src->count * sizeof(Evas_Map_Point)); dst->smooth = src->smooth; @@ -392,7 +392,7 @@ obj->prev.geometry = obj->cur.map->normal_geometry; if (!obj->prev.map) { - _evas_map_free(obj, obj->cur.map); + _evas_map_free(obj, obj->cur.map); obj->cur.map = NULL; evas_object_mapped_clip_across_mark(obj); return; @@ -418,7 +418,7 @@ } else { - if (obj->cur.map) evas_map_free(obj->cur.map); + if (obj->cur.map) evas_map_free(obj->cur.map); obj->cur.map = _evas_map_dup(map); if (obj->cur.usemap) evas_object_mapped_clip_across_mark(obj); @@ -441,8 +441,8 @@ { if (count < 4) { - ERR("num (%i) < 4 is unsupported!", count); - return NULL; + ERR("num (%i) < 4 is unsupported!", count); + return NULL; } return _evas_map_new(count); } @@ -512,7 +512,7 @@ evas_map_point_coord_get(const Evas_Map *m, int idx, Evas_Coord *x, Evas_Coord *y, Evas_Coord *z) { const Evas_Map_Point *p; - + if (!m) goto error; if (idx >= m->count) goto error; p = m->points + idx; @@ -588,7 +588,7 @@ { Evas_Map_Point *p = m->points; int i; - + p[0].x = x; p[0].y = y; p[0].z = z; @@ -612,7 +612,7 @@ p[3].z = z; p[3].u = 0.0; p[3].v = h; - + for (i = 0; i < 4; i++) { p[i].px = p[i].x; @@ -628,16 +628,16 @@ MAGIC_CHECK_END(); if (!m) { - ERR("map == NULL"); - return; + ERR("map == NULL"); + return; } if (m->count != 4) { - ERR("map has count=%d where 4 was expected.", m->count); - return; + ERR("map has count=%d where 4 was expected.", m->count); + return; } _evas_map_util_points_populate(m, obj->cur.geometry.x, obj->cur.geometry.y, - obj->cur.geometry.w, obj->cur.geometry.h, z); + obj->cur.geometry.w, obj->cur.geometry.h, z); } EAPI void @@ -648,16 +648,16 @@ MAGIC_CHECK_END(); if (!m) { - ERR("map == NULL"); - return; + ERR("map == NULL"); + return; } if (m->count != 4) { - ERR("map has count=%d where 4 was expected.", m->count); - return; + ERR("map has count=%d where 4 was expected.", m->count); + return; } _evas_map_util_points_populate(m, obj->cur.geometry.x, obj->cur.geometry.y, - obj->cur.geometry.w, obj->cur.geometry.h, 0); + obj->cur.geometry.w, obj->cur.geometry.h, 0); } EAPI void @@ -665,13 +665,13 @@ { if (!m) { - ERR("map == NULL"); - return; + ERR("map == NULL"); + return; } if (m->count != 4) { - ERR("map has count=%d where 4 was expected.", m->count); - return; + ERR("map has count=%d where 4 was expected.", m->count); + return; } _evas_map_util_points_populate(m, x, y, w, h, z); } @@ -682,17 +682,17 @@ Evas_Map_Point *p, *p_end; if (!m) { - ERR("map == NULL"); - return; + ERR("map == NULL"); + return; } p = m->points; p_end = p + m->count; for (; p < p_end; p++) { - p->r = r; - p->g = g; - p->b = b; - p->a = a; + p->r = r; + p->g = g; + p->b = b; + p->a = a; } } @@ -748,7 +748,7 @@ } EAPI void -evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, +evas_map_util_3d_rotate(Evas_Map *m, double dx, double dy, double dz, Evas_Coord cx, Evas_Coord cy, Evas_Coord cz) { double rz = (dz * M_PI) / 180.0; @@ -767,7 +767,7 @@ x = p->x - cx; y = p->y - cy; z = p->z - cz; - + if (rz != 0.0) { xx = x * cos(rz); @@ -783,7 +783,7 @@ x = xx + (z * cos(ry + M_PI_2)); z = zz + (z * sin(ry + M_PI_2)); } - + if (rx != 0.0) { zz = z * cos(rx); @@ -791,7 +791,7 @@ z = zz + (y * cos(rx + M_PI_2)); y = yy + (y * sin(rx + M_PI_2)); } - + p->px = p->x = x + cx; p->py = p->y = y + cy; p->z = z + cz; @@ -799,20 +799,20 @@ } EAPI void -evas_map_util_3d_lighting(Evas_Map *m, +evas_map_util_3d_lighting(Evas_Map *m, Evas_Coord lx, Evas_Coord ly, Evas_Coord lz, int lr, int lg, int lb, int ar, int ag, int ab) { int i; - + if (!m) return; - + for (i = 0; i < m->count; i++) { double x, y, z; double nx, ny, nz, x1, y1, z1, x2, y2, z2, ln, br; int h, j, mr, mg, mb; - + x = m->points[i].x; y = m->points[i].y; z = m->points[i].z; @@ -823,17 +823,17 @@ x1 = m->points[h].x - x; y1 = m->points[h].y - y; z1 = m->points[h].z - z; - + x2 = m->points[j].x - x; y2 = m->points[j].y - y; z2 = m->points[j].z - z; nx = (y1 * z2) - (z1 * y2); ny = (z1 * x2) - (x1 * z2); nz = (x1 * y2) - (y1 * x2); - + ln = (nx * nx) + (ny * ny) + (nz * nz); ln = sqrt(ln); - + if (ln != 0.0) { nx /= ln; @@ -845,25 +845,25 @@ x = lx - x; y = ly - y; z = lz - z; - + ln = (x * x) + (y * y) + (z * z); ln = sqrt(ln); - + if (ln != 0.0) { x /= ln; y /= ln; z /= ln; } - + // brightness - tan (0.0 -> 1.0 brightness really) br = (nx * x) + (ny * y) + (nz * z); if (br < 0.0) br = 0.0; - + mr = ar + ((lr - ar) * br); mg = ag + ((lg - ag) * br); mb = ab + ((lb - ab) * br); - if (m->points[i].a != 255) + if (m->points[i].a != 255) { mr = (mr * m->points[i].a) / 255; mg = (mg * m->points[i].a) / 255; @@ -898,15 +898,15 @@ { x = p->x - px; y = p->y - py; - + zz = ((p->z - z0) + foc); - + if (zz > 0) { x = (x * foc) / zz; y = (y * foc) / zz; } - + p->x = px + x; p->y = py + y; } @@ -918,16 +918,16 @@ { int i, j, k, count; long long c; - + if (!m) return 0; if (m->count < 3) return 0; - + count = 0; for (i = 0; i < m->count; i++) { - j = (i + 1) % m->count; + j = (i + 1) % m->count; k = (i + 2) % m->count; - c = + c = ((m->points[j].x - m->points[i].x) * (m->points[k].y - m->points[j].y)) - |
From: Enlightenment S. <no-...@en...> - 2011-06-07 04:30:32
|
Log: evas/evas_gl - removed white spaces / fixed identation Author: hermet Date: 2011-06-06 21:30:25 -0700 (Mon, 06 Jun 2011) New Revision: 60019 Trac: http://trac.enlightenment.org/e/changeset/60019 Modified: trunk/evas/src/lib/canvas/evas_gl.c Modified: trunk/evas/src/lib/canvas/evas_gl.c =================================================================== --- trunk/evas/src/lib/canvas/evas_gl.c 2011-06-07 04:20:10 UTC (rev 60018) +++ trunk/evas/src/lib/canvas/evas_gl.c 2011-06-07 04:30:25 UTC (rev 60019) @@ -50,11 +50,11 @@ // Delete undeleted surfaces while (evas_gl->surfaces) - evas_gl_surface_destroy(evas_gl, evas_gl->surfaces->data); + evas_gl_surface_destroy(evas_gl, evas_gl->surfaces->data); // Delete undeleted contexts while (evas_gl->contexts) - evas_gl_context_destroy(evas_gl, evas_gl->contexts->data); + evas_gl_context_destroy(evas_gl, evas_gl->contexts->data); free(evas_gl); evas_gl = NULL; @@ -71,9 +71,9 @@ surf = calloc(1, sizeof(Evas_GL_Surface)); - surf->data = evas_gl->evas->engine.func->gl_surface_create(evas_gl->evas->engine.data.output, config, width, height); + surf->data = evas_gl->evas->engine.func->gl_surface_create(evas_gl->evas->engine.data.output, config, width, height); - if (!surf->data) + if (!surf->data) { ERR("Failed creating a surface from the engine\n"); free(surf); @@ -86,7 +86,7 @@ return surf; } -EAPI void +EAPI void evas_gl_surface_destroy(Evas_GL *evas_gl, Evas_GL_Surface *surf) { // Magic @@ -96,7 +96,7 @@ if (!surf) { - ERR("Trying to destroy a NULL surface pointer!\n"); + ERR("Trying to destroy a NULL surface pointer!\n"); return; } @@ -123,7 +123,7 @@ // Allocate a context object ctx = calloc(1, sizeof(Evas_GL_Context)); - if (!ctx) + if (!ctx) { ERR("Unable to create a Evas_GL_Context object\n"); return NULL; @@ -132,15 +132,15 @@ // Call engine->gl_create_context if (share_ctx) { - ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, share_ctx->data); + ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, share_ctx->data); } - else + else { - ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, NULL); + ctx->data = evas_gl->evas->engine.func->gl_context_create(evas_gl->evas->engine.data.output, NULL); } // Set a few variables - if (!ctx->data) + if (!ctx->data) { ERR("Failed creating a context from the engine\n"); free(ctx); @@ -164,12 +164,12 @@ if (!ctx) { - ERR("Trying to destroy a NULL context pointer!\n"); + ERR("Trying to destroy a NULL context pointer!\n"); return; } // Call Engine's destroy - evas_gl->evas->engine.func->gl_context_destroy(evas_gl->evas->engine.data.output, ctx->data); + evas_gl->evas->engine.func->gl_context_destroy(evas_gl->evas->engine.data.output, ctx->data); // Remove it from the list evas_gl->contexts = eina_list_remove(evas_gl->contexts, ctx); @@ -186,13 +186,13 @@ MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL); return EINA_FALSE; - MAGIC_CHECK_END(); + MAGIC_CHECK_END(); if ((!surf) || (!ctx)) - ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, NULL, NULL); - else - ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, surf->data, ctx->data); - + ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, NULL, NULL); + else + ret = (Eina_Bool)evas_gl->evas->engine.func->gl_make_current(evas_gl->evas->engine.data.output, surf->data, ctx->data); + return ret; } @@ -203,7 +203,7 @@ return EINA_FALSE; MAGIC_CHECK_END(); - return (Evas_GL_Func)evas_gl->evas->engine.func->gl_proc_address_get(evas_gl->evas->engine.data.output, name); + return (Evas_GL_Func)evas_gl->evas->engine.func->gl_proc_address_get(evas_gl->evas->engine.data.output, name); } EAPI Eina_Bool @@ -213,7 +213,7 @@ return EINA_FALSE; MAGIC_CHECK_END(); - return (Eina_Bool)evas_gl->evas->engine.func->gl_native_surface_get(evas_gl->evas->engine.data.output, surf->data, ns); + return (Eina_Bool)evas_gl->evas->engine.func->gl_native_surface_get(evas_gl->evas->engine.data.output, surf->data, ns); } @@ -224,6 +224,6 @@ return NULL; MAGIC_CHECK_END(); - return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output); + return (Evas_GL_API*)evas_gl->evas->engine.func->gl_api_get(evas_gl->evas->engine.data.output); } |
From: Enlightenment S. <no-...@en...> - 2011-06-09 02:46:06
|
Log: evas/canvas - removed white spaces / fixed indentation Author: hermet Date: 2011-06-08 19:45:59 -0700 (Wed, 08 Jun 2011) New Revision: 60109 Trac: http://trac.enlightenment.org/e/changeset/60109 Modified: trunk/evas/src/lib/canvas/evas_object_main.c Modified: trunk/evas/src/lib/canvas/evas_object_main.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_main.c 2011-06-09 01:32:41 UTC (rev 60108) +++ trunk/evas/src/lib/canvas/evas_object_main.c 2011-06-09 02:45:59 UTC (rev 60109) @@ -21,7 +21,7 @@ obj = EVAS_MEMPOOL_ALLOC(_mp_obj, Evas_Object); if (!obj) return NULL; EVAS_MEMPOOL_PREP(_mp_obj, obj, Evas_Object); - + obj->magic = MAGIC_OBJ; obj->cur.scale = 1.0; obj->prev.scale = 1.0; @@ -36,7 +36,7 @@ #if 0 // filtering disabled evas_filter_free(obj); -#endif +#endif evas_object_map_set(obj, NULL); evas_object_grabs_cleanup(obj); evas_object_intercept_cleanup(obj); @@ -51,11 +51,11 @@ evas_object_event_callback_cleanup(obj); while (obj->data.elements) { - Evas_Data_Node *node; + Evas_Data_Node *node; - node = obj->data.elements->data; - obj->data.elements = eina_list_remove(obj->data.elements, node); - free(node); + node = obj->data.elements->data; + obj->data.elements = eina_list_remove(obj->data.elements, node); + free(node); } obj->magic = 0; if (obj->size_hints) @@ -71,7 +71,7 @@ Eina_List *l; Evas_Object *obj2; Eina_Bool movch = 0; - + if (obj->layer->evas->nochange) { // printf("nochange %p\n", obj); @@ -114,19 +114,19 @@ if (is_v == was_v) return ; if (is_v) { - evas_add_rect(rects, - obj->cur.cache.clip.x, - obj->cur.cache.clip.y, - obj->cur.cache.clip.w, - obj->cur.cache.clip.h); + evas_add_rect(rects, + obj->cur.cache.clip.x, + obj->cur.cache.clip.y, + obj->cur.cache.clip.w, + obj->cur.cache.clip.h); } else { - evas_add_rect(rects, - obj->prev.cache.clip.x, - obj->prev.cache.clip.y, - obj->prev.cache.clip.w, - obj->prev.cache.clip.h); + evas_add_rect(rects, + obj->prev.cache.clip.x, + obj->prev.cache.clip.y, + obj->prev.cache.clip.w, + obj->prev.cache.clip.h); } } @@ -137,48 +137,48 @@ if (obj->cur.clipper == obj->prev.clipper) return ; if ((obj->cur.clipper) && (obj->prev.clipper)) { - /* get difference rects between clippers */ - evas_rects_return_difference_rects(rects, - obj->cur.clipper->cur.cache.clip.x, - obj->cur.clipper->cur.cache.clip.y, - obj->cur.clipper->cur.cache.clip.w, - obj->cur.clipper->cur.cache.clip.h, - obj->prev.clipper->prev.cache.clip.x, - obj->prev.clipper->prev.cache.clip.y, - obj->prev.clipper->prev.cache.clip.w, - obj->prev.clipper->prev.cache.clip.h); + /* get difference rects between clippers */ + evas_rects_return_difference_rects(rects, + obj->cur.clipper->cur.cache.clip.x, + obj->cur.clipper->cur.cache.clip.y, + obj->cur.clipper->cur.cache.clip.w, + obj->cur.clipper->cur.cache.clip.h, + obj->prev.clipper->prev.cache.clip.x, + obj->prev.clipper->prev.cache.clip.y, + obj->prev.clipper->prev.cache.clip.w, + obj->prev.clipper->prev.cache.clip.h); } else if (obj->cur.clipper) { - evas_rects_return_difference_rects(rects, - obj->cur.geometry.x, - obj->cur.geometry.y, - obj->cur.geometry.w, - obj->cur.geometry.h, + evas_rects_return_difference_rects(rects, + obj->cur.geometry.x, + obj->cur.geometry.y, + obj->cur.geometry.w, + obj->cur.geometry.h, //// rl = evas_rects_return_difference_rects(obj->cur.cache.geometry.x, //// obj->cur.cache.geometry.y, //// obj->cur.cache.geometry.w, //// obj->cur.cache.geometry.h, - obj->cur.clipper->cur.cache.clip.x, - obj->cur.clipper->cur.cache.clip.y, - obj->cur.clipper->cur.cache.clip.w, - obj->cur.clipper->cur.cache.clip.h); + obj->cur.clipper->cur.cache.clip.x, + obj->cur.clipper->cur.cache.clip.y, + obj->cur.clipper->cur.cache.clip.w, + obj->cur.clipper->cur.cache.clip.h); } else if (obj->prev.clipper) { - evas_rects_return_difference_rects(rects, - obj->prev.geometry.x, - obj->prev.geometry.y, - obj->prev.geometry.w, - obj->prev.geometry.h, + evas_rects_return_difference_rects(rects, + obj->prev.geometry.x, + obj->prev.geometry.y, + obj->prev.geometry.w, + obj->prev.geometry.h, //// rl = evas_rects_return_difference_rects(obj->prev.cache.geometry.x, //// obj->prev.cache.geometry.y, //// obj->prev.cache.geometry.w, //// obj->prev.cache.geometry.h, - obj->prev.clipper->prev.cache.clip.x, - obj->prev.clipper->prev.cache.clip.y, - obj->prev.clipper->prev.cache.clip.w, - obj->prev.clipper->prev.cache.clip.h); + obj->prev.clipper->prev.cache.clip.x, + obj->prev.clipper->prev.cache.clip.y, + obj->prev.clipper->prev.cache.clip.w, + obj->prev.clipper->prev.cache.clip.h); } } @@ -240,74 +240,74 @@ was_v = 0; if (!obj->clip.clipees) { - EINA_ARRAY_ITER_NEXT(rects, i, r, it) - { - /* get updates and clip to current clip */ - x = r->x; - y = r->y; - w = r->w; - h = r->h; - RECTS_CLIP_TO_RECT(x, y, w, h, - obj->cur.cache.clip.x, - obj->cur.cache.clip.y, - obj->cur.cache.clip.w, - obj->cur.cache.clip.h); - if ((w > 0) && (h > 0)) - obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, - x, y, w, h); - /* get updates and clip to previous clip */ - x = r->x; - y = r->y; - w = r->w; - h = r->h; - RECTS_CLIP_TO_RECT(x, y, w, h, - obj->prev.cache.clip.x, - obj->prev.cache.clip.y, - obj->prev.cache.clip.w, - obj->prev.cache.clip.h); - if ((w > 0) && (h > 0)) - obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, - x, y, w, h); - } - /* if the object is actually visible, take any parent clip changes */ - if (is_v) - { - clipper = obj->cur.clipper; - while (clipper) - { - EINA_LIST_FOREACH(clipper->clip.changes, l, r) - { - /* get updates and clip to current clip */ - x = r->x; y = r->y; w = r->w; h = r->h; - RECTS_CLIP_TO_RECT(x, y, w, h, - obj->cur.cache.clip.x, - obj->cur.cache.clip.y, - obj->cur.cache.clip.w, - obj->cur.cache.clip.h); - if ((w > 0) && (h > 0)) - obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, - x, y, w, h); - /* get updates and clip to previous clip */ - x = r->x; y = r->y; w = r->w; h = r->h; - RECTS_CLIP_TO_RECT(x, y, w, h, - obj->prev.cache.clip.x, - obj->prev.cache.clip.y, - obj->prev.cache.clip.w, - obj->prev.cache.clip.h); - if ((w > 0) && (h > 0)) - obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, - x, y, w, h); - } - clipper = clipper->cur.clipper; - } - } + EINA_ARRAY_ITER_NEXT(rects, i, r, it) + { + /* get updates and clip to current clip */ + x = r->x; + y = r->y; + w = r->w; + h = r->h; + RECTS_CLIP_TO_RECT(x, y, w, h, + obj->cur.cache.clip.x, + obj->cur.cache.clip.y, + obj->cur.cache.clip.w, + obj->cur.cache.clip.h); + if ((w > 0) && (h > 0)) + obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, + x, y, w, h); + /* get updates and clip to previous clip */ + x = r->x; + y = r->y; + w = r->w; + h = r->h; + RECTS_CLIP_TO_RECT(x, y, w, h, + obj->prev.cache.clip.x, + obj->prev.cache.clip.y, + obj->prev.cache.clip.w, + obj->prev.cache.clip.h); + if ((w > 0) && (h > 0)) + obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, + x, y, w, h); + } + /* if the object is actually visible, take any parent clip changes */ + if (is_v) + { + clipper = obj->cur.clipper; + while (clipper) + { + EINA_LIST_FOREACH(clipper->clip.changes, l, r) + { + /* get updates and clip to current clip */ + x = r->x; y = r->y; w = r->w; h = r->h; + RECTS_CLIP_TO_RECT(x, y, w, h, + obj->cur.cache.clip.x, + obj->cur.cache.clip.y, + obj->cur.cache.clip.w, + obj->cur.cache.clip.h); + if ((w > 0) && (h > 0)) + obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, + x, y, w, h); + /* get updates and clip to previous clip */ + x = r->x; y = r->y; w = r->w; h = r->h; + RECTS_CLIP_TO_RECT(x, y, w, h, + obj->prev.cache.clip.x, + obj->prev.cache.clip.y, + obj->prev.cache.clip.w, + obj->prev.cache.clip.h); + if ((w > 0) && (h > 0)) + obj->layer->evas->engine.func->output_redraws_rect_add(obj->layer->evas->engine.data.output, + x, y, w, h); + } + clipper = clipper->cur.clipper; + } + } } else { - evas_object_clip_changes_clean(obj); - EINA_ARRAY_ITER_NEXT(rects, i, r, it) - obj->clip.changes = eina_list_append(obj->clip.changes, r); - eina_array_clean(rects); + evas_object_clip_changes_clean(obj); + EINA_ARRAY_ITER_NEXT(rects, i, r, it) + obj->clip.changes = eina_list_append(obj->clip.changes, r); + eina_array_clean(rects); } end: @@ -322,10 +322,10 @@ if (obj->smart.smart) return 0; /* assumes coords have been recalced */ if ((RECTS_INTERSECT(x, y, w, h, - obj->prev.cache.clip.x, - obj->prev.cache.clip.y, - obj->prev.cache.clip.w, - obj->prev.cache.clip.h))) + obj->prev.cache.clip.x, + obj->prev.cache.clip.y, + obj->prev.cache.clip.w, + obj->prev.cache.clip.h))) return 1; return 0; } @@ -336,9 +336,9 @@ if (obj->smart.smart) return 0; if (obj->prev.cache.clip.a == 255) { - if (obj->func->was_opaque) - return obj->func->was_opaque(obj); - return 1; + if (obj->func->was_opaque) + return obj->func->was_opaque(obj); + return 1; } return 0; } @@ -404,10 +404,10 @@ evas_object_hide(obj); if (obj->focused) { - obj->focused = 0; - obj->layer->evas->focused = NULL; - _evas_object_event_new(); - evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL); + obj->focused = 0; + obj->layer->evas->focused = NULL; + _evas_object_event_new(); + evas_object_event_callback_call(obj, EVAS_CALLBACK_FOCUS_OUT, NULL); _evas_post_event_callback_call(obj->layer->evas); } _evas_object_event_new(); @@ -416,8 +416,8 @@ if (obj->name) evas_object_name_set(obj, NULL); if (!obj->layer) { - evas_object_free(obj, 1); - return; + evas_object_free(obj, 1); + return; } obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; obj->mouse_grabbed = 0; @@ -456,17 +456,17 @@ if ((obj->cur.geometry.x == x) && (obj->cur.geometry.y == y)) return; if (obj->layer->evas->events_frozen <= 0) { - pass = evas_event_passes_through(obj); - if (!pass) - was = evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1); + pass = evas_event_passes_through(obj); + if (!pass) + was = evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1); } obj->doing.in_move++; if (obj->smart.smart) { - if (obj->smart.smart->smart_class->move) - obj->smart.smart->smart_class->move(obj, x, y); + if (obj->smart.smart->smart_class->move) + obj->smart.smart->smart_class->move(obj, x, y); } obj->cur.geometry.x = x; obj->cur.geometry.y = y; @@ -477,22 +477,22 @@ obj->doing.in_move--; if (obj->layer->evas->events_frozen <= 0) { - evas_object_recalc_clippees(obj); - if (!pass) - { - if (!obj->smart.smart) - { - is = evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1); - if ((is ^ was) && obj->cur.visible) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); - } - } + evas_object_recalc_clippees(obj); + if (!pass) + { + if (!obj->smart.smart) + { + is = evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1); + if ((is ^ was) && obj->cur.visible) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); + } + } } evas_object_inform_call_move(obj); } @@ -516,17 +516,17 @@ if ((obj->cur.geometry.w == w) && (obj->cur.geometry.h == h)) return; if (obj->layer->evas->events_frozen <= 0) { - pass = evas_event_passes_through(obj); - if (!pass) - was = evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1); + pass = evas_event_passes_through(obj); + if (!pass) + was = evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1); } obj->doing.in_resize++; if (obj->smart.smart) { if (obj->smart.smart->smart_class->resize) - obj->smart.smart->smart_class->resize(obj, w, h); + obj->smart.smart->smart_class->resize(obj, w, h); } obj->cur.geometry.w = w; obj->cur.geometry.h = h; @@ -540,22 +540,22 @@ /* NB: If this creates glitches on screen then move to above position */ evas_object_recalc_clippees(obj); - // if (obj->func->coords_recalc) obj->func->coords_recalc(obj); - if (!pass) - { - if (!obj->smart.smart) - { - is = evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1); - if ((is ^ was) && (obj->cur.visible)) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); - } - } + // if (obj->func->coords_recalc) obj->func->coords_recalc(obj); + if (!pass) + { + if (!obj->smart.smart) + { + is = evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1); + if ((is ^ was) && (obj->cur.visible)) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); + } + } } evas_object_inform_call_resize(obj); } @@ -569,8 +569,8 @@ MAGIC_CHECK_END(); if (obj->delete_me) { - if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0; - return; + if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0; + return; } if (x) *x = obj->cur.geometry.x; if (y) *y = obj->cur.geometry.y; @@ -602,8 +602,8 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (w) *w = 0; if (h) *h = 0; - return; + if (w) *w = 0; if (h) *h = 0; + return; } if (w) *w = obj->size_hints->min.w; if (h) *h = obj->size_hints->min.h; @@ -634,8 +634,8 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (w) *w = -1; if (h) *h = -1; - return; + if (w) *w = -1; if (h) *h = -1; + return; } if (w) *w = obj->size_hints->max.w; if (h) *h = obj->size_hints->max.h; @@ -666,8 +666,8 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (w) *w = 0; if (h) *h = 0; - return; + if (w) *w = 0; if (h) *h = 0; + return; } if (w) *w = obj->size_hints->request.w; if (h) *h = obj->size_hints->request.h; @@ -699,9 +699,9 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE; - if (w) *w = 0; if (h) *h = 0; - return; + if (aspect) *aspect = EVAS_ASPECT_CONTROL_NONE; + if (w) *w = 0; if (h) *h = 0; + return; } if (aspect) *aspect = obj->size_hints->aspect.mode; if (w) *w = obj->size_hints->aspect.size.w; @@ -734,8 +734,8 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (x) *x = 0.5; if (y) *y = 0.5; - return; + if (x) *x = 0.5; if (y) *y = 0.5; + return; } if (x) *x = obj->size_hints->align.x; if (y) *y = obj->size_hints->align.y; @@ -766,8 +766,8 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (x) *x = 0.0; if (y) *y = 0.0; - return; + if (x) *x = 0.0; if (y) *y = 0.0; + return; } if (x) *x = obj->size_hints->weight.x; if (y) *y = obj->size_hints->weight.y; @@ -799,9 +799,9 @@ MAGIC_CHECK_END(); if ((!obj->size_hints) || obj->delete_me) { - if (l) *l = 0; if (r) *r = 0; - if (t) *t = 0; if (b) *b = 0; - return; + if (l) *l = 0; if (r) *r = 0; + if (t) *t = 0; if (b) *b = 0; + return; } if (l) *l = obj->size_hints->padding.l; if (r) *r = obj->size_hints->padding.r; @@ -838,11 +838,11 @@ if (obj->smart.smart) { if (obj->smart.smart->smart_class->show) - obj->smart.smart->smart_class->show(obj); + obj->smart.smart->smart_class->show(obj); } if (obj->cur.visible) { - return; + return; } obj->cur.visible = 1; evas_object_change(obj); @@ -850,21 +850,21 @@ if (obj->layer->evas->events_frozen <= 0) { evas_object_clip_across_clippees_check(obj); - evas_object_recalc_clippees(obj); - if (!evas_event_passes_through(obj)) - { - if (!obj->smart.smart) - { - if (evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1)) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); - } - } + evas_object_recalc_clippees(obj); + if (!evas_event_passes_through(obj)) + { + if (!obj->smart.smart) + { + if (evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1)) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); + } + } } evas_object_inform_call_show(obj); } @@ -880,11 +880,11 @@ if (obj->smart.smart) { if (obj->smart.smart->smart_class->hide) - obj->smart.smart->smart_class->hide(obj); + obj->smart.smart->smart_class->hide(obj); } if (!obj->cur.visible) { - return; + return; } obj->cur.visible = 0; evas_object_change(obj); @@ -892,26 +892,26 @@ if (obj->layer->evas->events_frozen <= 0) { evas_object_clip_across_clippees_check(obj); - evas_object_recalc_clippees(obj); - if (!evas_event_passes_through(obj)) - { - if ((!obj->smart.smart) || + evas_object_recalc_clippees(obj); + if (!evas_event_passes_through(obj)) + { + if ((!obj->smart.smart) || ((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap))) - { - if (evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1)) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); - if (obj->delete_me) return; - if (obj->mouse_grabbed > 0) - { + { + if (evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1)) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); + if (obj->delete_me) return; + if (obj->mouse_grabbed > 0) + { // if (obj->layer->evas->pointer.mouse_grabbed >= obj->mouse_grabbed) - obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; - } + obj->layer->evas->pointer.mouse_grabbed -= obj->mouse_grabbed; + } if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) { obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); @@ -926,7 +926,7 @@ { Evas_Event_Mouse_Out ev; - _evas_object_event_new(); + _evas_object_event_new(); obj->mouse_in = 0; ev.buttons = obj->layer->evas->pointer.button; @@ -937,20 +937,20 @@ ev.data = NULL; ev.modifiers = &(obj->layer->evas->modifiers); ev.locks = &(obj->layer->evas->locks); - ev.timestamp = obj->layer->evas->last_timestamp; - ev.event_flags = EVAS_EVENT_FLAG_NONE; + ev.timestamp = obj->layer->evas->last_timestamp; + ev.event_flags = EVAS_EVENT_FLAG_NONE; evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev); _evas_post_event_callback_call(obj->layer->evas); - } - } - } + } + } + } } else { - if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) - obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); - obj->mouse_grabbed = 0; - obj->mouse_in = 0; + if ((obj->mouse_in) || (obj->mouse_grabbed > 0)) + obj->layer->evas->pointer.object.in = eina_list_remove(obj->layer->evas->pointer.object.in, obj); + obj->mouse_grabbed = 0; + obj->mouse_in = 0; } evas_object_inform_call_hide(obj); } @@ -980,7 +980,7 @@ if (obj->smart.smart) { if (obj->smart.smart->smart_class->color_set) - obj->smart.smart->smart_class->color_set(obj, r, g, b, a); + obj->smart.smart->smart_class->color_set(obj, r, g, b, a); } if ((obj->cur.color.r == r) && (obj->cur.color.g == g) && @@ -1004,8 +1004,8 @@ MAGIC_CHECK_END(); if (obj->delete_me) { - if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0; - return; + if (r) *r = 0; if (g) *g = 0; if (b) *b = 0; if (a) *a = 0; + return; } if (r) *r = obj->cur.color.r; if (g) *g = obj->cur.color.g; @@ -1107,18 +1107,18 @@ //// yy = evas_coord_world_y_to_screen(e, y); EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { - Evas_Object *obj; + Evas_Object *obj; - EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) - { - if (obj->delete_me) continue; - if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; - if ((!include_hidden_objects) && (!obj->cur.visible)) continue; - evas_object_clip_recalc(obj); - if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) && - (!obj->clip.clipees)) - return obj; - } + EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) + { + if (obj->delete_me) continue; + if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; + if ((!include_hidden_objects) && (!obj->cur.visible)) continue; + evas_object_clip_recalc(obj); + if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) && + (!obj->clip.clipees)) + return obj; + } } return NULL; } @@ -1151,18 +1151,18 @@ if (hh < 1) hh = 1; EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { - Evas_Object *obj; + Evas_Object *obj; - EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) - { - if (obj->delete_me) continue; - if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; - if ((!include_hidden_objects) && (!obj->cur.visible)) continue; - evas_object_clip_recalc(obj); - if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) && - (!obj->clip.clipees)) - return obj; - } + EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) + { + if (obj->delete_me) continue; + if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; + if ((!include_hidden_objects) && (!obj->cur.visible)) continue; + evas_object_clip_recalc(obj); + if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) && + (!obj->clip.clipees)) + return obj; + } } return NULL; } @@ -1183,18 +1183,18 @@ //// yy = evas_coord_world_y_to_screen(e, y); EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { - Evas_Object *obj; + Evas_Object *obj; - EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) - { - if (obj->delete_me) continue; - if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; - if ((!include_hidden_objects) && (!obj->cur.visible)) continue; - evas_object_clip_recalc(obj); - if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) && - (!obj->clip.clipees)) - in = eina_list_prepend(in, obj); - } + EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) + { + if (obj->delete_me) continue; + if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; + if ((!include_hidden_objects) && (!obj->cur.visible)) continue; + evas_object_clip_recalc(obj); + if ((evas_object_is_in_output_rect(obj, xx, yy, 1, 1)) && + (!obj->clip.clipees)) + in = eina_list_prepend(in, obj); + } } return in; } @@ -1233,18 +1233,18 @@ if (hh < 1) hh = 1; EINA_INLIST_REVERSE_FOREACH((EINA_INLIST_GET(e->layers)), lay) { - Evas_Object *obj; + Evas_Object *obj; - EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) - { - if (obj->delete_me) continue; - if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; - if ((!include_hidden_objects) && (!obj->cur.visible)) continue; - evas_object_clip_recalc(obj); - if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) && - (!obj->clip.clipees)) - in = eina_list_prepend(in, obj); - } + EINA_INLIST_REVERSE_FOREACH(get_layer_objects(lay), obj) + { + if (obj->delete_me) continue; + if ((!include_pass_events_objects) && (evas_event_passes_through(obj))) continue; + if ((!include_hidden_objects) && (!obj->cur.visible)) continue; + evas_object_clip_recalc(obj); + if ((evas_object_is_in_output_rect(obj, xx, yy, ww, hh)) && + (!obj->clip.clipees)) + in = eina_list_prepend(in, obj); + } } return in; } |
From: Enlightenment S. <no-...@en...> - 2011-06-09 03:08:57
|
Log: evas/canvas - removed white trailing Author: hermet Date: 2011-06-08 20:08:50 -0700 (Wed, 08 Jun 2011) New Revision: 60112 Trac: http://trac.enlightenment.org/e/changeset/60112 Modified: trunk/evas/src/lib/canvas/evas_object_main.c Modified: trunk/evas/src/lib/canvas/evas_object_main.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_main.c 2011-06-09 02:54:26 UTC (rev 60111) +++ trunk/evas/src/lib/canvas/evas_object_main.c 2011-06-09 03:08:50 UTC (rev 60112) @@ -423,7 +423,7 @@ obj->mouse_grabbed = 0; obj->mouse_in = 0; evas_object_grabs_cleanup(obj); - while (obj->clip.clipees) + while (obj->clip.clipees) evas_object_clip_unset(obj->clip.clipees->data); while (obj->proxy.proxies) evas_object_image_source_unset(obj->proxy.proxies->data); |
From: Enlightenment S. <no-...@en...> - 2011-06-15 00:48:46
|
Log: evas/canvas - just removed white trailings Author: hermet Date: 2011-06-14 17:48:38 -0700 (Tue, 14 Jun 2011) New Revision: 60321 Trac: http://trac.enlightenment.org/e/changeset/60321 Modified: trunk/evas/src/lib/canvas/evas_clip.c Modified: trunk/evas/src/lib/canvas/evas_clip.c =================================================================== --- trunk/evas/src/lib/canvas/evas_clip.c 2011-06-15 00:06:59 UTC (rev 60320) +++ trunk/evas/src/lib/canvas/evas_clip.c 2011-06-15 00:48:38 UTC (rev 60321) @@ -153,9 +153,9 @@ evas_object_child_map_across_mark (obj, obj->smart.parent->cur.map_parent, 0); else - evas_object_child_map_across_mark(obj, NULL, 0); + evas_object_child_map_across_mark(obj, NULL, 0); } -#endif +#endif } /* public functions */ |
From: Enlightenment S. <no-...@en...> - 2011-06-15 08:57:51
|
Log: evas/canvas - it will be more standard computation. and compute less than before. Author: hermet Date: 2011-06-15 01:57:45 -0700 (Wed, 15 Jun 2011) New Revision: 60333 Trac: http://trac.enlightenment.org/e/changeset/60333 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-15 08:50:47 UTC (rev 60332) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-15 08:57:45 UTC (rev 60333) @@ -338,10 +338,12 @@ evas_object_mapped_clip_across_mark(obj); } } + _evas_map_calc_geom_change(obj); _evas_map_calc_map_geometry(obj); /* This is a bit heavy handed, but it fixes the case of same geometry, but * changed colour or UV settings. */ evas_object_change(obj); +evas_damage_rectangle_add(evas_object_evas_get(obj), 0, 0, 240, 400); } EAPI Eina_Bool @@ -772,24 +774,24 @@ { xx = x * cos(rz); yy = x * sin(rz); - x = xx + (y * cos(rz + M_PI_2)); - y = yy + (y * sin(rz + M_PI_2)); + x = xx - (y * sin(rz)); + y = yy + (y * cos(rz)); } if (ry != 0.0) { xx = x * cos(ry); zz = x * sin(ry); - x = xx + (z * cos(ry + M_PI_2)); - z = zz + (z * sin(ry + M_PI_2)); + x = xx - (z * sin(ry)); + z = zz + (z * cos(ry)); } if (rx != 0.0) { zz = z * cos(rx); yy = z * sin(rx); - z = zz + (y * cos(rx + M_PI_2)); - y = yy + (y * sin(rx + M_PI_2)); + z = zz - (y * sin(rx)); + y = yy + (y * cos(rx)); } p->px = p->x = x + cx; |
From: Enlightenment S. <no-...@en...> - 2011-06-15 09:02:11
|
Log: evas/canvas - sorry i added two lines should not be added. Author: hermet Date: 2011-06-15 02:02:04 -0700 (Wed, 15 Jun 2011) New Revision: 60334 Trac: http://trac.enlightenment.org/e/changeset/60334 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-15 08:57:45 UTC (rev 60333) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-15 09:02:04 UTC (rev 60334) @@ -338,12 +338,10 @@ evas_object_mapped_clip_across_mark(obj); } } - _evas_map_calc_geom_change(obj); _evas_map_calc_map_geometry(obj); /* This is a bit heavy handed, but it fixes the case of same geometry, but * changed colour or UV settings. */ evas_object_change(obj); -evas_damage_rectangle_add(evas_object_evas_get(obj), 0, 0, 240, 400); } EAPI Eina_Bool |
From: Enlightenment S. <no-...@en...> - 2011-06-16 08:21:50
|
Log: evas/canvas - just made standard computation. Author: hermet Date: 2011-06-16 01:21:39 -0700 (Thu, 16 Jun 2011) New Revision: 60379 Trac: http://trac.enlightenment.org/e/changeset/60379 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 08:20:48 UTC (rev 60378) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 08:21:39 UTC (rev 60379) @@ -715,8 +715,8 @@ xx = (x * cos(r)); yy = (x * sin(r)); - x = xx + (y * cos(r + (M_PI / 2.0))); - y = yy + (y * sin(r + (M_PI / 2.0))); + x = xx - (y * sin(r)); + y = yy + (y * cos(r)); p->px = p->x = x + cx; p->py = p->y = y + cy; |
From: Enlightenment S. <no-...@en...> - 2011-06-16 08:46:25
|
Log: evas/canvas - reverted evas_map since some texture mapping is incorrect. Author: hermet Date: 2011-06-16 01:46:16 -0700 (Thu, 16 Jun 2011) New Revision: 60381 Trac: http://trac.enlightenment.org/e/changeset/60381 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 08:24:02 UTC (rev 60380) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 08:46:16 UTC (rev 60381) @@ -713,10 +713,10 @@ x = p->x - cx; y = p->y - cy; - xx = (x * cos(r)); - yy = (x * sin(r)); - x = xx - (y * sin(r)); - y = yy + (y * cos(r)); + xx = x * cos(r); + yy = x * sin(r); + x = xx + (y * cos(r + M_PI_2)); + y = yy + (y * sin(r + M_PI_2)); p->px = p->x = x + cx; p->py = p->y = y + cy; @@ -772,24 +772,24 @@ { xx = x * cos(rz); yy = x * sin(rz); - x = xx - (y * sin(rz)); - y = yy + (y * cos(rz)); + x = xx + (y * cos(rz + M_PI_2)); + y = yy + (y * sin(rz + M_PI_2)); } if (ry != 0.0) { xx = x * cos(ry); zz = x * sin(ry); - x = xx - (z * sin(ry)); - z = zz + (z * cos(ry)); + x = xx + (z * cos(ry + M_PI_2)); + z = zz + (z * sin(ry + M_PI_2)); } if (rx != 0.0) { zz = z * cos(rx); yy = z * sin(rx); - z = zz - (y * sin(rx)); - y = yy + (y * cos(rx)); + z = zz + (y * cos(rx + M_PI_2)); + y = yy + (y * sin(rx + M_PI_2)); } p->px = p->x = x + cx; |
From: Enlightenment S. <no-...@en...> - 2011-06-16 10:03:45
|
Log: evas/canvas - ok. it works fine. modified to use the standard computation again. Author: hermet Date: 2011-06-16 03:03:37 -0700 (Thu, 16 Jun 2011) New Revision: 60386 Trac: http://trac.enlightenment.org/e/changeset/60386 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 09:22:49 UTC (rev 60385) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 10:03:37 UTC (rev 60386) @@ -715,8 +715,8 @@ xx = x * cos(r); yy = x * sin(r); - x = xx + (y * cos(r + M_PI_2)); - y = yy + (y * sin(r + M_PI_2)); + x = xx - (y * sin(r)); + y = yy + (y * cos(r)); p->px = p->x = x + cx; p->py = p->y = y + cy; @@ -772,24 +772,24 @@ { xx = x * cos(rz); yy = x * sin(rz); - x = xx + (y * cos(rz + M_PI_2)); - y = yy + (y * sin(rz + M_PI_2)); + x = xx - (y * sin(rz)); + y = yy + (y * cos(rz)); } if (ry != 0.0) { xx = x * cos(ry); zz = x * sin(ry); - x = xx + (z * cos(ry + M_PI_2)); - z = zz + (z * sin(ry + M_PI_2)); + x = xx - (z * sin(ry)); + z = zz + (z * cos(ry)); } if (rx != 0.0) { zz = z * cos(rx); yy = z * sin(rx); - z = zz + (y * cos(rx + M_PI_2)); - y = yy + (y * sin(rx + M_PI_2)); + z = zz - (y * sin(rx)); + y = yy + (y * cos(rx)); } p->px = p->x = x + cx; |
From: Enlightenment S. <no-...@en...> - 2011-06-16 11:12:47
|
Log: evas/evas_gl - fixed to release magic field and it's data type Author: hermet Date: 2011-06-16 04:12:40 -0700 (Thu, 16 Jun 2011) New Revision: 60387 Trac: http://trac.enlightenment.org/e/changeset/60387 Modified: trunk/evas/src/lib/canvas/evas_gl.c Modified: trunk/evas/src/lib/canvas/evas_gl.c =================================================================== --- trunk/evas/src/lib/canvas/evas_gl.c 2011-06-16 10:03:37 UTC (rev 60386) +++ trunk/evas/src/lib/canvas/evas_gl.c 2011-06-16 11:12:40 UTC (rev 60387) @@ -5,7 +5,7 @@ struct _Evas_GL { - int magic; + DATA32 magic; Evas *evas; Eina_List *contexts; @@ -56,8 +56,8 @@ while (evas_gl->contexts) evas_gl_context_destroy(evas_gl, evas_gl->contexts->data); + evas_gl->magic = 0; free(evas_gl); - evas_gl = NULL; } EAPI Evas_GL_Surface * |
From: Enlightenment S. <no-...@en...> - 2011-06-16 11:48:47
|
Log: evas/evas_map - just removed unused lines and moved internal function position Author: hermet Date: 2011-06-16 04:48:41 -0700 (Thu, 16 Jun 2011) New Revision: 60389 Trac: http://trac.enlightenment.org/e/changeset/60389 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 11:19:30 UTC (rev 60388) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 11:48:41 UTC (rev 60389) @@ -168,6 +168,46 @@ free(m); } +/****************************************************************************/ +/* util functions for manipulating maps, so you don't need to know the math */ +/****************************************************************************/ +static inline void +_evas_map_util_points_populate(Evas_Map *m, const Evas_Coord x, const Evas_Coord y, const Evas_Coord w, const Evas_Coord h, const Evas_Coord z) +{ + Evas_Map_Point *p = m->points; + int i; + + p[0].x = x; + p[0].y = y; + p[0].z = z; + p[0].u = 0.0; + p[0].v = 0.0; + + p[1].x = x + w; + p[1].y = y; + p[1].z = z; + p[1].u = w; + p[1].v = 0.0; + + p[2].x = x + w; + p[2].y = y + h; + p[2].z = z; + p[2].u = w; + p[2].v = h; + + p[3].x = x; + p[3].y = y + h; + p[3].z = z; + p[3].u = 0.0; + p[3].v = h; + + for (i = 0; i < 4; i++) + { + p[i].px = p[i].x; + p[i].py = p[i].y; + } +} + Eina_Bool evas_map_coords_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y, Evas_Coord *mx, Evas_Coord *my, int grab) @@ -313,7 +353,6 @@ return evas_map_coords_get(m, x, y, NULL, NULL, 0); } - EAPI void evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled) { @@ -580,46 +619,6 @@ if (a) *a = p->a; } -/****************************************************************************/ -/* util functions for manipulating maps, so you don't need to know the math */ -/****************************************************************************/ -static inline void -_evas_map_util_points_populate(Evas_Map *m, const Evas_Coord x, const Evas_Coord y, const Evas_Coord w, const Evas_Coord h, const Evas_Coord z) -{ - Evas_Map_Point *p = m->points; - int i; - - p[0].x = x; - p[0].y = y; - p[0].z = z; - p[0].u = 0.0; - p[0].v = 0.0; - - p[1].x = x + w; - p[1].y = y; - p[1].z = z; - p[1].u = w; - p[1].v = 0.0; - - p[2].x = x + w; - p[2].y = y + h; - p[2].z = z; - p[2].u = w; - p[2].v = h; - - p[3].x = x; - p[3].y = y + h; - p[3].z = z; - p[3].u = 0.0; - p[3].v = h; - - for (i = 0; i < 4; i++) - { - p[i].px = p[i].x; - p[i].py = p[i].y; - } -} - EAPI void evas_map_util_points_populate_from_object_full(Evas_Map *m, const Evas_Object *obj, Evas_Coord z) { |
From: Enlightenment S. <no-...@en...> - 2011-06-16 12:18:26
|
Log: evas/evas_map - modified to use Eina_Bool values. Author: hermet Date: 2011-06-16 05:18:19 -0700 (Thu, 16 Jun 2011) New Revision: 60392 Trac: http://trac.enlightenment.org/e/changeset/60392 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 12:11:41 UTC (rev 60391) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-16 12:18:19 UTC (rev 60392) @@ -333,7 +333,7 @@ *my = v[0] + (((x - xe[0]) * (v[1] - v[0])) / (xe[1] - xe[0])); } - return 1; + return EINA_TRUE; } if (grab) { @@ -346,10 +346,10 @@ *my = v[0] + (((x - xe[0]) * (v[1] - v[0])) / (xe[1] - xe[0])); } - return 1; + return EINA_TRUE; } } - return 0; + return EINA_FALSE; } Eina_Bool @@ -392,7 +392,7 @@ evas_object_map_enable_get(const Evas_Object *obj) { MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); - return 0; + return EINA_FALSE; MAGIC_CHECK_END(); return obj->cur.usemap; } @@ -535,7 +535,7 @@ evas_map_dup(const Evas_Map *m) { MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); - return; + return NULL; MAGIC_CHECK_END(); return _evas_map_dup(m); @@ -979,7 +979,7 @@ int i, j, k, count; long long c; - if (m->count < 3) return 0; + if (m->count < 3) return EINA_FALSE; count = 0; for (i = 0; i < m->count; i++) @@ -995,6 +995,6 @@ if (c < 0) count--; else if (c > 0) count++; } - if (count > 0) return 1; - return 0; + if (count > 0) return EINA_TRUE; + return EINA_FALSE; } |
From: Enlightenment S. <no-...@en...> - 2011-06-17 01:16:22
|
Log: evas/evas_map - stuffed trivial missing things. Author: hermet Date: 2011-06-16 18:16:16 -0700 (Thu, 16 Jun 2011) New Revision: 60415 Trac: http://trac.enlightenment.org/e/changeset/60415 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-17 00:17:02 UTC (rev 60414) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-17 01:16:16 UTC (rev 60415) @@ -166,6 +166,7 @@ obj->layer->evas->engine.func->image_map_surface_free (obj->layer->evas->engine.data.output, m->surface); } + m->magic = 0; free(m); } @@ -364,6 +365,7 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); + enabled = !!enabled; if (obj->cur.usemap == enabled) return; obj->cur.usemap = enabled; @@ -422,6 +424,7 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); + if (!map) { if (obj->cur.map) @@ -451,7 +454,7 @@ return; } - if (obj->cur.map && obj->cur.map->count == map->count) + if ((obj->cur.map) && (obj->cur.map->count == map->count)) { Evas_Map *omap = obj->cur.map; obj->cur.map = _evas_map_new(map->count); @@ -476,8 +479,8 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - if (obj->cur.map) return obj->cur.map; - return NULL; + + return obj->cur.map; } EAPI Evas_Map * @@ -488,6 +491,7 @@ ERR("map point count (%i) != 4 is unsupported!", count); return NULL; } + return _evas_map_new(count); } |
From: Enlightenment S. <no-...@en...> - 2011-06-17 07:12:27
|
Log: evas/evas_map - trivial changes. Author: hermet Date: 2011-06-17 00:12:20 -0700 (Fri, 17 Jun 2011) New Revision: 60425 Trac: http://trac.enlightenment.org/e/changeset/60425 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-06-17 06:58:35 UTC (rev 60424) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-06-17 07:12:20 UTC (rev 60425) @@ -951,26 +951,26 @@ m->persp.py = py; m->persp.z0 = z0; m->persp.foc = foc; + + if (foc <= 0) return; + for (; p < p_end; p++) { double x, y, zz; - if (foc > 0) - { - x = p->x - px; - y = p->y - py; + x = p->x - px; + y = p->y - py; - zz = ((p->z - z0) + foc); + zz = ((p->z - z0) + foc); - if (zz > 0) - { - x = (x * foc) / zz; - y = (y * foc) / zz; - } + if (zz > 0) + { + x = (x * foc) / zz; + y = (y * foc) / zz; + } - p->x = px + x; - p->y = py + y; - } + p->x = px + x; + p->y = py + y; } } @@ -980,6 +980,7 @@ MAGIC_CHECK(m, Evas_Map, MAGIC_MAP); return EINA_FALSE; MAGIC_CHECK_END(); + int i, j, k, count; long long c; |
From: Enlightenment S. <no-...@en...> - 2011-06-18 09:08:40
|
Log: evas/evas_layer.c - added some missed exception handlings. Author: hermet Date: 2011-06-18 02:08:33 -0700 (Sat, 18 Jun 2011) New Revision: 60471 Trac: http://trac.enlightenment.org/e/changeset/60471 Modified: trunk/evas/src/lib/canvas/evas_layer.c Modified: trunk/evas/src/lib/canvas/evas_layer.c =================================================================== --- trunk/evas/src/lib/canvas/evas_layer.c 2011-06-18 05:47:57 UTC (rev 60470) +++ trunk/evas/src/lib/canvas/evas_layer.c 2011-06-18 09:08:33 UTC (rev 60471) @@ -143,6 +143,7 @@ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); return; MAGIC_CHECK_END(); + if (obj->delete_me) return; if (evas_object_intercept_call_layer_set(obj, l)) return; if (obj->smart.parent) return; if (obj->cur.layer == l) @@ -150,6 +151,8 @@ evas_object_raise(obj); return; } + if (l < EVAS_LAYER_MIN) l = EVAS_LAYER_MIN; + else if (l > EVAS_LAYER_MAX) l = EVAS_LAYER_MAX; e = obj->layer->evas; evas_object_release(obj, 1); obj->cur.layer = l; |
From: Enlightenment S. <no-...@en...> - 2011-06-18 09:16:29
|
Log: evas_layer.c - fixed indenation and removed white spaces Author: hermet Date: 2011-06-18 02:16:22 -0700 (Sat, 18 Jun 2011) New Revision: 60472 Trac: http://trac.enlightenment.org/e/changeset/60472 Modified: trunk/evas/src/lib/canvas/evas_layer.c Modified: trunk/evas/src/lib/canvas/evas_layer.c =================================================================== --- trunk/evas/src/lib/canvas/evas_layer.c 2011-06-18 09:08:33 UTC (rev 60471) +++ trunk/evas/src/lib/canvas/evas_layer.c 2011-06-18 09:16:22 UTC (rev 60472) @@ -12,9 +12,9 @@ lay = evas_layer_find(e, obj->cur.layer); if (!lay) { - lay = evas_layer_new(e); - lay->layer = obj->cur.layer; - evas_layer_add(lay); + lay = evas_layer_new(e); + lay->layer = obj->cur.layer; + evas_layer_add(lay); } lay->objects = (Evas_Object *)eina_inlist_append(EINA_INLIST_GET(lay->objects), EINA_INLIST_GET(obj)); lay->usage++; @@ -30,11 +30,11 @@ obj->layer->usage--; if (clean_layer) { - if (obj->layer->usage <= 0) - { - evas_layer_del(obj->layer); - _evas_layer_free(obj->layer); - } + if (obj->layer->usage <= 0) + { + evas_layer_del(obj->layer); + _evas_layer_free(obj->layer); + } } obj->layer = NULL; obj->in_layer = 0; @@ -64,8 +64,8 @@ EINA_INLIST_FOREACH(lay->objects, obj) { - if ((!obj->smart.parent) && (!obj->delete_me)) - evas_object_del(obj); + if ((!obj->smart.parent) && (!obj->delete_me)) + evas_object_del(obj); } } @@ -74,10 +74,10 @@ { while (lay->objects) { - Evas_Object *obj; + Evas_Object *obj; - obj = (Evas_Object *)lay->objects; - evas_object_free(obj, 0); + obj = (Evas_Object *)lay->objects; + evas_object_free(obj, 0); } } @@ -88,9 +88,9 @@ while (e->layers) { - tmp = e->layers; - evas_layer_del(tmp); - _evas_layer_free(tmp); + tmp = e->layers; + evas_layer_del(tmp); + _evas_layer_free(tmp); } } @@ -101,7 +101,7 @@ EINA_INLIST_FOREACH(e->layers, layer) { - if (layer->layer == layer_num) return layer; + if (layer->layer == layer_num) return layer; } return NULL; } @@ -113,13 +113,13 @@ EINA_INLIST_FOREACH(lay->evas->layers, layer) { - if (layer->layer > lay->layer) - { - lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers), - EINA_INLIST_GET(lay), - EINA_INLIST_GET(layer)); - return; - } + if (layer->layer > lay->layer) + { + lay->evas->layers = (Evas_Layer *)eina_inlist_prepend_relative(EINA_INLIST_GET(lay->evas->layers), + EINA_INLIST_GET(lay), + EINA_INLIST_GET(layer)); + return; + } } lay->evas->layers = (Evas_Layer *)eina_inlist_append(EINA_INLIST_GET(lay->evas->layers), EINA_INLIST_GET(lay)); } @@ -148,8 +148,8 @@ if (obj->smart.parent) return; if (obj->cur.layer == l) { - evas_object_raise(obj); - return; + evas_object_raise(obj); + return; } if (l < EVAS_LAYER_MIN) l = EVAS_LAYER_MIN; else if (l > EVAS_LAYER_MAX) l = EVAS_LAYER_MAX; @@ -161,22 +161,22 @@ evas_object_change(obj); if (obj->clip.clipees) { - evas_object_inform_call_restack(obj); - return; + evas_object_inform_call_restack(obj); + return; } evas_object_change(obj); if (!obj->smart.smart) { - if (evas_object_is_in_output_rect(obj, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, 1, 1) && - obj->cur.visible) - if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj)) - evas_event_feed_mouse_move(obj->layer->evas, - obj->layer->evas->pointer.x, - obj->layer->evas->pointer.y, - obj->layer->evas->last_timestamp, - NULL); + if (evas_object_is_in_output_rect(obj, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, 1, 1) && + obj->cur.visible) + if (eina_list_data_find(obj->layer->evas->pointer.object.in, obj)) + evas_event_feed_mouse_move(obj->layer->evas, + obj->layer->evas->pointer.x, + obj->layer->evas->pointer.y, + obj->layer->evas->last_timestamp, + NULL); } evas_object_inform_call_restack(obj); } |
From: Enlightenment S. <no-...@en...> - 2011-07-01 01:10:38
|
Log: evas/evas_map - added workaround code to remove afterimage problem. Sine the last frame is not updated when map is disabled, Afterimage problem is happened in software rendering. Need to find out the reason in the rendering engine then fix it. However, it's hard to fix the problem now, added a just workaround code temporary. This problem will be fixed later or be removed when the rendering engine is refactored completely. Author: hermet Date: 2011-06-30 18:10:32 -0700 (Thu, 30 Jun 2011) New Revision: 60901 Trac: http://trac.enlightenment.org/e/changeset/60901 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 00:54:34 UTC (rev 60900) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 01:10:32 UTC (rev 60901) @@ -383,6 +383,17 @@ _evas_map_calc_geom_change(obj); evas_object_mapped_clip_across_mark(obj); } + //FIXME: Since the last frame is not updated when map is disabled, + //Afterimage problem is happened in software rendering. + //Need to find out the reason in the rendering engine then fix it. + //However, it's hard to fix the problem now, added a just workarond code. + //This problem will be fixed later or be removed when the rendering engine is refactored completely. + Evas *e = evas_object_evas_get(obj); + evas_damage_rectangle_add(e, + e->viewport.x, + e->viewport.y, + e->viewport.w, + e->viewport.h); } _evas_map_calc_map_geometry(obj); /* This is a bit heavy handed, but it fixes the case of same geometry, but |
From: Enlightenment S. <no-...@en...> - 2011-07-01 04:35:33
|
Log: evas/evas_map - fixed workaround code more properly. Author: hermet Date: 2011-06-30 21:35:26 -0700 (Thu, 30 Jun 2011) New Revision: 60906 Trac: http://trac.enlightenment.org/e/changeset/60906 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 02:59:48 UTC (rev 60905) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 04:35:26 UTC (rev 60906) @@ -388,12 +388,8 @@ //Need to find out the reason in the rendering engine then fix it. //However, it's hard to fix the problem now, added a just workarond code. //This problem will be fixed later or be removed when the rendering engine is refactored completely. - Evas *e = evas_object_evas_get(obj); - evas_damage_rectangle_add(e, - e->viewport.x, - e->viewport.y, - e->viewport.w, - e->viewport.h); + Evas *e = obj->layer->evas; + evas_damage_rectangle_add(e, 0, 0, e->output.w, e->output.h); } _evas_map_calc_map_geometry(obj); /* This is a bit heavy handed, but it fixes the case of same geometry, but |
From: Enlightenment S. <no-...@en...> - 2011-07-01 10:59:04
|
Log: evas/evas_map - reverted the work around code. Author: hermet Date: 2011-07-01 03:58:58 -0700 (Fri, 01 Jul 2011) New Revision: 60913 Trac: http://trac.enlightenment.org/e/changeset/60913 Modified: trunk/evas/src/lib/canvas/evas_map.c Modified: trunk/evas/src/lib/canvas/evas_map.c =================================================================== --- trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 09:10:11 UTC (rev 60912) +++ trunk/evas/src/lib/canvas/evas_map.c 2011-07-01 10:58:58 UTC (rev 60913) @@ -383,13 +383,6 @@ _evas_map_calc_geom_change(obj); evas_object_mapped_clip_across_mark(obj); } - //FIXME: Since the last frame is not updated when map is disabled, - //Afterimage problem is happened in software rendering. - //Need to find out the reason in the rendering engine then fix it. - //However, it's hard to fix the problem now, added a just workarond code. - //This problem will be fixed later or be removed when the rendering engine is refactored completely. - Evas *e = obj->layer->evas; - evas_damage_rectangle_add(e, 0, 0, e->output.w, e->output.h); } _evas_map_calc_map_geometry(obj); /* This is a bit heavy handed, but it fixes the case of same geometry, but |