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

map coords in mapped objects. 

SVN revision: 43463
This commit is contained in:
Carsten Haitzler 2009-11-05 15:24:48 +00:00
parent 36a2d10682
commit 9791b27a18
5 changed files with 404 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
legacy/evas/src/lib/canvas/evas_events.c
View File

@ -1,54 +1,123 @@
#include "evas_common.h" #include "evas_common.h"
#include "evas_private.h" #include "evas_private.h"
static void
_evas_event_havemap_adjust(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y)
{
Evas_Object *pmap;
if (!obj->havemap_parent) return;
pmap = obj->smart.parent;
if (!pmap) return;
while (pmap)
{
if ((pmap->cur.map) && (pmap->cur.map->count == 4) && (pmap->cur.usemap))
break;
pmap = obj->smart.parent;
}
if (!pmap) return;
evas_map_coords_get(pmap->cur.map, *x, *y, x, y, obj->mouse_grabbed);
}
static Eina_List * static Eina_List *
_evas_event_object_list_in_get(Evas *e, Eina_List *in, const Eina_Inlist *list, Evas_Object *stop, int x, int y, int *no_rep) _evas_event_object_list_in_get(Evas *e, Eina_List *in,
const Eina_Inlist *list, Evas_Object *stop,
int x, int y, int *no_rep, int parmap)
{ {
Evas_Object *obj; Evas_Object *obj;
if (!list) return in; if (!list) return in;
EINA_INLIST_REVERSE_FOREACH(list, obj) EINA_INLIST_REVERSE_FOREACH(list, obj)
{ {
if (parmap) obj->havemap_parent = 1;
else obj->havemap_parent = 0;
if (obj == stop) if (obj == stop)
{ {
*no_rep = 1; *no_rep = 1;
return in; return in;
} }
if (!evas_event_passes_through(obj)) if (evas_event_passes_through(obj)) continue;
{ if ((obj->cur.visible) && (obj->delete_me == 0) &&
if ((obj->cur.visible) && (obj->delete_me == 0) && (!obj->clip.clipees) &&
(!obj->clip.clipees) && (evas_object_clippers_is_visible(obj)))
(evas_object_clippers_is_visible(obj))) {
{ if (obj->smart.smart)
if (obj->smart.smart) {
{ int norep;
int norep; int inside;
norep = 0; norep = 0;
in = _evas_event_object_list_in_get(e, in, if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
evas_object_smart_members_get_direct(obj), {
stop, x, y, &norep); inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
if (norep) if (inside)
{ {
*no_rep = 1; if (!evas_map_coords_get(obj->cur.map, x, y,
return in; &(obj->cur.map->mx),
} &(obj->cur.map->my), 0))
} {
else inside = 0;
{ }
if (evas_object_is_in_output_rect(obj, x, y, 1, 1) && else
((!obj->precise_is_inside) || {
(evas_object_is_inside(obj, x, y)))) parmap = 1;
{ }
in = eina_list_append(in, obj); }
if (!obj->repeat_events) else
{ inside = 0;
*no_rep = 1; if (inside)
return in; {
} in = _evas_event_object_list_in_get
} (e, in,
} evas_object_smart_members_get_direct(obj),
} stop,
obj->cur.geometry.x + obj->cur.map->mx,
obj->cur.geometry.y + obj->cur.map->my,
&norep, parmap);
}
}
else
{
in = _evas_event_object_list_in_get
(e, in, evas_object_smart_members_get_direct(obj),
stop, x, y, &norep, parmap);
}
if (norep)
{
*no_rep = 1;
return in;
}
}
else
{
int inside = 1;
if (((obj->cur.map) && (obj->cur.map->count == 4) && (obj->cur.usemap)))
{
inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
if (inside)
{
if (!evas_map_coords_get(obj->cur.map, x, y,
&(obj->cur.map->mx),
&(obj->cur.map->my), 0))
inside = 0;
}
else
inside = 0;
}
else
inside = evas_object_is_in_output_rect(obj, x, y, 1, 1);
if (inside && ((!obj->precise_is_inside) ||
(evas_object_is_inside(obj, x, y))))
{
in = eina_list_append(in, obj);
if (!obj->repeat_events)
{
*no_rep = 1;
return in;
}
}
}
} }
} }
*no_rep = 0; *no_rep = 0;
@ -67,8 +136,9 @@ evas_event_objects_event_list(Evas *e, Evas_Object *stop, int x, int y)
int norep; int norep;
norep = 0; norep = 0;
in = _evas_event_object_list_in_get(e, in, EINA_INLIST_GET(lay->objects), stop, in = _evas_event_object_list_in_get(e, in,
x, y, &norep); EINA_INLIST_GET(lay->objects),
stop, x, y, &norep, 0);
if (norep) return in; if (norep) return in;
} }
return in; return in;
@ -240,6 +310,9 @@ evas_event_feed_mouse_down(Evas *e, int b, Evas_Button_Flags flags, unsigned int
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB)
{ {
obj->mouse_grabbed++; obj->mouse_grabbed++;
@ -305,6 +378,9 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if ((obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && if ((obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) &&
(obj->mouse_in) && (obj->mouse_grabbed > 0)) (obj->mouse_in) && (obj->mouse_grabbed > 0))
{ {
@ -344,6 +420,9 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if ((!eina_list_data_find(ins, obj)) || if ((!eina_list_data_find(ins, obj)) ||
(!e->pointer.inside)) (!e->pointer.inside))
{ {
@ -374,6 +453,9 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
EINA_LIST_FOREACH(ins, l, obj) EINA_LIST_FOREACH(ins, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if (!eina_list_data_find(e->pointer.object.in, obj)) if (!eina_list_data_find(e->pointer.object.in, obj))
{ {
@ -487,6 +569,9 @@ evas_event_feed_mouse_wheel(Evas *e, int direction, int z, unsigned int timestam
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if (e->events_frozen <= 0) if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev); evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_WHEEL, &ev);
if (e->delete_me) break; if (e->delete_me) break;
@ -564,6 +649,11 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
ev.cur.canvas.x = e->pointer.x;
ev.cur.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y);
e->pointer.x = ev.cur.canvas.x;
e->pointer.y = ev.cur.canvas.y;
if ((obj->cur.visible) && if ((obj->cur.visible) &&
(evas_object_clippers_is_visible(obj)) && (evas_object_clippers_is_visible(obj)) &&
(!evas_event_passes_through(obj)) && (!evas_event_passes_through(obj)) &&
@ -603,12 +693,13 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
outs = eina_list_remove(outs, obj); outs = eina_list_remove(outs, obj);
if ((obj->mouse_grabbed == 0) && (!e->delete_me)) if ((obj->mouse_grabbed == 0) && (!e->delete_me))
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
e->pointer.object.in = eina_list_remove(e->pointer.object.in, obj); e->pointer.object.in = eina_list_remove(e->pointer.object.in, obj);
{ obj->mouse_in = 0;
obj->mouse_in = 0; if (e->events_frozen <= 0)
if (e->events_frozen <= 0) evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
}
} }
} }
} }
@ -680,6 +771,9 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
{ {
if ((px != x) || (py != y)) if ((px != x) || (py != y))
{ {
ev.cur.canvas.x = e->pointer.x;
ev.cur.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.cur.canvas.x, &ev.cur.canvas.y);
if (e->events_frozen <= 0) if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev); evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_MOVE, &ev);
} }
@ -688,6 +782,9 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
else else
{ {
obj->mouse_in = 0; obj->mouse_in = 0;
ev2.canvas.x = e->pointer.x;
ev2.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev2.canvas.x, &ev2.canvas.y);
if (e->events_frozen <= 0) if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev2); evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev2);
} }
@ -697,6 +794,9 @@ evas_event_feed_mouse_move(Evas *e, int x, int y, unsigned int timestamp, const
/* go thru our current list of ins */ /* go thru our current list of ins */
EINA_LIST_FOREACH(ins, l, obj) EINA_LIST_FOREACH(ins, l, obj)
{ {
ev3.canvas.x = e->pointer.x;
ev3.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev3.canvas.x, &ev3.canvas.y);
/* if its not in the old list of ins send an enter event */ /* if its not in the old list of ins send an enter event */
if (!eina_list_data_find(e->pointer.object.in, obj)) if (!eina_list_data_find(e->pointer.object.in, obj))
{ {
@ -761,6 +861,9 @@ evas_event_feed_mouse_in(Evas *e, unsigned int timestamp, const void *data)
ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y); ins = evas_event_objects_event_list(e, NULL, e->pointer.x, e->pointer.y);
EINA_LIST_FOREACH(ins, l, obj) EINA_LIST_FOREACH(ins, l, obj)
{ {
ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
if (!eina_list_data_find(e->pointer.object.in, obj)) if (!eina_list_data_find(e->pointer.object.in, obj))
{ {
@ -825,7 +928,10 @@ evas_event_feed_mouse_out(Evas *e, unsigned int timestamp, const void *data)
copy = evas_event_list_copy(e->pointer.object.in); copy = evas_event_list_copy(e->pointer.object.in);
EINA_LIST_FOREACH(copy, l, obj) EINA_LIST_FOREACH(copy, l, obj)
{ {
obj->mouse_in = 0; ev.canvas.x = e->pointer.x;
ev.canvas.y = e->pointer.y;
_evas_event_havemap_adjust(obj, &ev.canvas.x, &ev.canvas.y);
obj->mouse_in = 0;
if (e->events_frozen <= 0) if (e->events_frozen <= 0)
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev); evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);

146
legacy/evas/src/lib/canvas/evas_map.c
View File

@ -64,7 +64,6 @@ static inline Evas_Map *
_evas_map_new(int count) _evas_map_new(int count)
{ {
int i; int i;
Evas_Map *m = calloc(1, sizeof(Evas_Map) + count * sizeof(Evas_Map_Point)); Evas_Map *m = calloc(1, sizeof(Evas_Map) + count * sizeof(Evas_Map_Point));
if (!m) return NULL; if (!m) return NULL;
m->count = count; m->count = count;
@ -111,6 +110,151 @@ _evas_map_free(Evas_Map *m)
free(m); free(m);
} }
Eina_Bool
evas_map_coords_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y,
Evas_Coord *mx, Evas_Coord *my, int grab)
{
int order[4], i, j, edges, edge[4][2], douv;
Evas_Coord xe[2];
double u[2], v[2];
if (m->count != 4) return 0;
// FIXME need to handle grab mode and extrapolte coords outside
// map
if (grab)
{
Evas_Coord ymin, ymax;
ymin = m->points[0].y;
ymax = m->points[0].y;
for (i = 1; i < m->count; i++)
{
if (m->points[i].y < ymin) ymin = m->points[i].y;
else if (m->points[i].y > ymax) ymax = m->points[i].y;
}
if (y <= ymin) y = ymin + 1;
if (y >= ymax) y = ymax - 1;
}
edges = 0;
for (i = 0; i < m->count; i++)
{
j = (i + 1) % m->count;
if ((m->points[i].y <= y) && (m->points[j].y > y))
{
edge[edges][0] = i;
edge[edges][1] = j;
edges++;
}
else if ((m->points[j].y <= y) && (m->points[i].y > y))
{
edge[edges][0] = j;
edge[edges][1] = i;
edges++;
}
}
douv = 0;
if ((mx) || (my)) douv = 1;
for (i = 0; i < (edges - 1); i+= 2)
{
Evas_Coord yp, yd, x0, x1;
j = i + 1;
yd = m->points[edge[i][1]].y - m->points[edge[i][0]].y;
if (yd > 0)
{
yp = y - m->points[edge[i][0]].y;
xe[0] = m->points[edge[i][1]].x - m->points[edge[i][0]].x;
xe[0] = m->points[edge[i][0]].x + ((xe[0] * yp) / yd);
if (douv)
{
u[0] = m->points[edge[i][1]].u - m->points[edge[i][0]].u;
u[0] = m->points[edge[i][0]].u + ((u[0] * yp) / yd);
v[0] = m->points[edge[i][1]].v - m->points[edge[i][0]].v;
v[0] = m->points[edge[i][0]].v + ((v[0] * yp) / yd);
}
}
else
{
xe[0] = m->points[edge[i][0]].x;
if (douv)
{
u[0] = m->points[edge[i][0]].u;
v[0] = m->points[edge[i][0]].v;
}
}
yd = m->points[edge[j][1]].y - m->points[edge[j][0]].y;
if (yd > 0)
{
yp = y - m->points[edge[j][0]].y;
xe[1] = m->points[edge[j][1]].x - m->points[edge[j][0]].x;
xe[1] = m->points[edge[j][0]].x + ((xe[1] * yp) / yd);
if (douv)
{
u[1] = m->points[edge[j][1]].u - m->points[edge[j][0]].u;
u[1] = m->points[edge[j][0]].u + ((u[1] * yp) / yd);
v[1] = m->points[edge[j][1]].v - m->points[edge[j][0]].v;
v[1] = m->points[edge[j][0]].v + ((v[1] * yp) / yd);
}
}
else
{
xe[1] = m->points[edge[j][0]].x;
if (douv)
{
u[1] = m->points[edge[j][0]].u;
v[1] = m->points[edge[j][0]].v;
}
}
if (xe[0] > xe[1])
{
int ti;
ti = xe[0]; xe[0] = xe[1]; xe[1] = ti;
if (douv)
{
double td;
td = u[0]; u[0] = u[1]; u[1] = td;
td = v[0]; v[0] = v[1]; v[1] = td;
}
}
if ((x >= xe[0]) && (x < xe[1]))
{
if (douv)
{
if (mx)
*mx = u[0] + (((x - xe[0]) * (u[1] - u[0])) /
(xe[1] - xe[0]));
if (my)
*my = v[0] + (((x - xe[0]) * (v[1] - v[0])) /
(xe[1] - xe[0]));
}
return 1;
}
if (grab)
{
if (douv)
{
if (mx)
*mx = u[0] + (((x - xe[0]) * (u[1] - u[0])) /
(xe[1] - xe[0]));
if (my)
*my = v[0] + (((x - xe[0]) * (v[1] - v[0])) /
(xe[1] - xe[0]));
}
return 1;
}
}
return 0;
}
Eina_Bool
evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord y)
{
return evas_map_coords_get(m, x, y, NULL, NULL, 0);
}
/** /**
* Enable or disable the map that is set * Enable or disable the map that is set
* *

152
legacy/evas/src/lib/canvas/evas_object_image.c
View File

@ -2855,99 +2855,107 @@ evas_object_image_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
x -= obj->cur.cache.clip.x; x -= obj->cur.cache.clip.x;
y -= obj->cur.cache.clip.y; y -= obj->cur.cache.clip.y;
w = obj->cur.geometry.w; w = obj->cur.cache.clip.w;
h = obj->cur.geometry.h; h = obj->cur.cache.clip.h;
iw = o->cur.image.w; iw = o->cur.image.w;
ih = o->cur.image.h; ih = o->cur.image.h;
if ((x < 0) || (y < 0) || (x >= w) || (y >= h)) return 0; if ((x < 0) || (y < 0) || (x >= w) || (y >= h)) return 0;
if (!o->cur.has_alpha) return 1; if (!o->cur.has_alpha) return 1;
w = o->cur.fill.w; if (obj->cur.map)
h = o->cur.fill.h;
x -= o->cur.fill.x;
y -= o->cur.fill.y;
x %= w;
y %= h;
if (x < 0) x += w;
if (y < 0) y += h;
if (o->cur.border.fill != EVAS_BORDER_FILL_DEFAULT)
{ {
if ((x > o->cur.border.l) && (x < (w - o->cur.border.r)) && x = obj->cur.map->mx;
(y > o->cur.border.t) && (y < (h - o->cur.border.b))) y = obj->cur.map->my;
{
if (o->cur.border.fill == EVAS_BORDER_FILL_SOLID) return 1;
return 0;
}
}
if (x < o->cur.border.l)
{
if (y < o->cur.border.t)
{
// nothing. x & y stay as-is
}
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
}
else if (x > (w - o->cur.border.r))
{
x = iw - (w - x);
if (y < o->cur.border.t)
{
// nothing. x & y stay as-is
}
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
} }
else else
{ {
if ((o->cur.border.l + o->cur.border.r) < iw) w = o->cur.fill.w;
h = o->cur.fill.h;
x -= o->cur.fill.x;
y -= o->cur.fill.y;
x %= w;
y %= h;
if (x < 0) x += w;
if (y < 0) y += h;
if (o->cur.border.fill != EVAS_BORDER_FILL_DEFAULT)
{ {
x = ((x - o->cur.border.l) * iw) / (iw - o->cur.border.l - o->cur.border.r); if ((x > o->cur.border.l) && (x < (w - o->cur.border.r)) &&
(y > o->cur.border.t) && (y < (h - o->cur.border.b)))
{
if (o->cur.border.fill == EVAS_BORDER_FILL_SOLID) return 1;
return 0;
}
}
if (x < o->cur.border.l)
{
if (y < o->cur.border.t)
{
// nothing. x & y stay as-is
}
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
}
else if (x > (w - o->cur.border.r))
{
x = iw - (w - x);
if (y < o->cur.border.t)
{
// nothing. x & y stay as-is
}
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
} }
else else
x = o->cur.border.l;
if (y < o->cur.border.t)
{ {
// nothing. x & y stay as-is if ((o->cur.border.l + o->cur.border.r) < iw)
{
x = ((x - o->cur.border.l) * iw) / (iw - o->cur.border.l - o->cur.border.r);
}
else
x = o->cur.border.l;
if (y < o->cur.border.t)
{
// nothing. x & y stay as-is
}
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
} }
else if (y > (h - o->cur.border.b))
{
y = ih - (h - y);
}
else if ((o->cur.border.t + o->cur.border.b) < ih)
{
y = ((y - o->cur.border.t) * ih) / (ih - o->cur.border.t - o->cur.border.b);
}
else
return 1;
} }
if (x < 0) x = 0; if (x < 0) x = 0;
if (y < 0) y = 0; if (y < 0) y = 0;
if (x >= iw) x = iw - 1; if (x >= iw) x = iw - 1;
if (y >= ih) y = ih - 1; if (y >= ih) y = ih - 1;
stride = o->cur.image.stride; stride = o->cur.image.stride;
o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output, o->engine_data = obj->layer->evas->engine.func->image_data_get(obj->layer->evas->engine.data.output,
o->engine_data, o->engine_data,
0, 0,

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

@ -486,8 +486,8 @@ evas_render_mapped(Evas *e, Evas_Object *obj, void *context, void *surface, int
} }
else else
{ {
off_x = -obj->cur.cache.clip.x; off_x = -obj->cur.geometry.x;
off_y = -obj->cur.cache.clip.y; off_y = -obj->cur.geometry.y;
obj->func->render(obj, e->engine.data.output, ctx, obj->func->render(obj, e->engine.data.output, ctx,
obj->cur.map->surface, off_x, off_y); obj->cur.map->surface, off_x, off_y);
} }

45
legacy/evas/src/lib/include/evas_private.h
View File

@ -50,22 +50,22 @@ typedef struct _Evas_Callbacks Evas_Callbacks;
typedef struct _Evas_Format Evas_Format; typedef struct _Evas_Format Evas_Format;
typedef struct _Evas_Map_Point Evas_Map_Point; typedef struct _Evas_Map_Point Evas_Map_Point;
#define MAGIC_EVAS 0x70777770 #define MAGIC_EVAS 0x70777770
#define MAGIC_OBJ 0x71777770 #define MAGIC_OBJ 0x71777770
#define MAGIC_OBJ_RECTANGLE 0x71777771 #define MAGIC_OBJ_RECTANGLE 0x71777771
#define MAGIC_OBJ_LINE 0x71777772 #define MAGIC_OBJ_LINE 0x71777772
#define MAGIC_OBJ_GRADIENT 0x71777773 #define MAGIC_OBJ_GRADIENT 0x71777773
#define MAGIC_OBJ_POLYGON 0x71777774 #define MAGIC_OBJ_POLYGON 0x71777774
#define MAGIC_OBJ_IMAGE 0x71777775 #define MAGIC_OBJ_IMAGE 0x71777775
#define MAGIC_OBJ_TEXT 0x71777776 #define MAGIC_OBJ_TEXT 0x71777776
#define MAGIC_OBJ_SMART 0x71777777 #define MAGIC_OBJ_SMART 0x71777777
#define MAGIC_OBJ_TEXTBLOCK 0x71777778 #define MAGIC_OBJ_TEXTBLOCK 0x71777778
#define MAGIC_SMART 0x72777770 #define MAGIC_SMART 0x72777770
#define MAGIC_OBJ_GRADIENT_LINEAR 0x72777771 #define MAGIC_OBJ_GRADIENT_LINEAR 0x72777771
#define MAGIC_OBJ_GRADIENT_RADIAL 0x72777772 #define MAGIC_OBJ_GRADIENT_RADIAL 0x72777772
#define MAGIC_OBJ_SHAPE 0x72777773 #define MAGIC_OBJ_SHAPE 0x72777773
#define MAGIC_OBJ_CONTAINER 0x72777774 #define MAGIC_OBJ_CONTAINER 0x72777774
#define MAGIC_OBJ_CUSTOM 0x72777775 #define MAGIC_OBJ_CUSTOM 0x72777775
#ifdef MAGIC_DEBUG #ifdef MAGIC_DEBUG
# define MAGIC_CHECK_FAILED(o, t, m) \ # define MAGIC_CHECK_FAILED(o, t, m) \
@ -367,13 +367,14 @@ struct _Evas_Map_Point
struct _Evas_Map struct _Evas_Map
{ {
int count; int count; // num of points
Evas_Coord_Rectangle normal_geometry; Evas_Coord_Rectangle normal_geometry; // bounding box of map geom actually
void *surface; void *surface; // surface holding map if needed
int surface_w, surface_h; int surface_w, surface_h; // current surface w & h alloc
Evas_Coord mx, my; // mouse x, y after conversion to map space
Eina_Bool alpha : 1; Eina_Bool alpha : 1;
Eina_Bool smooth : 1; Eina_Bool smooth : 1;
Evas_Map_Point points[]; Evas_Map_Point points[]; // actual points
}; };
struct _Evas_Object struct _Evas_Object
@ -458,6 +459,7 @@ struct _Evas_Object
Eina_Bool restack : 1; Eina_Bool restack : 1;
Eina_Bool changed : 1; Eina_Bool changed : 1;
Eina_Bool is_active : 1; Eina_Bool is_active : 1;
Eina_Bool render_pre : 1; Eina_Bool render_pre : 1;
Eina_Bool rect_del : 1; Eina_Bool rect_del : 1;
Eina_Bool mouse_in : 1; Eina_Bool mouse_in : 1;
@ -466,7 +468,9 @@ struct _Evas_Object
Eina_Bool focused : 1; Eina_Bool focused : 1;
Eina_Bool in_layer : 1; Eina_Bool in_layer : 1;
Eina_Bool no_propagate : 1; Eina_Bool no_propagate : 1;
Eina_Bool precise_is_inside : 1; Eina_Bool precise_is_inside : 1;
Eina_Bool havemap_parent : 1;
unsigned char delete_me; unsigned char delete_me;
}; };
@ -827,6 +831,9 @@ EAPI int _evas_module_engine_inherit(Evas_Func *funcs, char *name);
void evas_render_invalidate(Evas *e); void evas_render_invalidate(Evas *e);
void evas_render_object_recalc(Evas_Object *obj); void evas_render_object_recalc(Evas_Object *obj);
Eina_Bool evas_map_inside_get(const Evas_Map *m, Evas_Coord x, Evas_Coord 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);
#define EVAS_API_OVERRIDE(func, api, prefix) \ #define EVAS_API_OVERRIDE(func, api, prefix) \
(api)->func = prefix##func (api)->func = prefix##func