summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2012-10-25 15:24:27 +0000
committerChunEon Park <hermet@hermet.pe.kr>2012-10-25 15:24:27 +0000
commit045354d679efc581b2a6ff1db044a65575fe8d0f (patch)
tree48502ba018ce2ae332e5b642d2cac9d79aefc0f1 /legacy/evas
parentecc24faf1e69f7cde876864fe80ae524d855ef57 (diff)
evas/proxy - rename variables to be shorter.
SVN revision: 78460
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c53
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_image.c26
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_line.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_main.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_polygon.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_rectangle.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_smart.c4
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_text.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textblock.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_textgrid.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_render.c2
-rw-r--r--legacy/evas/src/lib/include/evas_inline.x12
-rw-r--r--legacy/evas/src/lib/include/evas_private.h12
13 files changed, 62 insertions, 61 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 5a12b89..8f57068 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -163,7 +163,7 @@ _evas_event_source_events_call(Evas_Object_Protected_Data *src, Evas_Callback_Ty
163 Eina_List *l; 163 Eina_List *l;
164 Evas_Object *child_eo; 164 Evas_Object *child_eo;
165 Evas_Object_Protected_Data *child; 165 Evas_Object_Protected_Data *child;
166 EINA_LIST_FOREACH(src->proxy.event_in, l, child_eo) 166 EINA_LIST_FOREACH(src->proxy.src_event_in, l, child_eo)
167 { 167 {
168 if (src->delete_me) return; 168 if (src->delete_me) return;
169 child = eo_data_get(child_eo, EVAS_OBJ_CLASS); 169 child = eo_data_get(child_eo, EVAS_OBJ_CLASS);
@@ -211,17 +211,17 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event
211 ev->output.x = ev->canvas.x; 211 ev->output.x = ev->canvas.x;
212 ev->output.y = ev->canvas.y; 212 ev->output.y = ev->canvas.y;
213 213
214 if (src->proxy.event_in) 214 if (src->proxy.src_event_in)
215 src->proxy.event_in = eina_list_free(src->proxy.event_in); 215 src->proxy.src_event_in = eina_list_free(src->proxy.src_event_in);
216 216
217 //FIXME: Needs to care the src mouse grab. 217 //FIXME: Needs to care the src mouse grab.
218 if (src->is_smart) 218 if (src->is_smart)
219 { 219 {
220 int no_rep = 0; 220 int no_rep = 0;
221 src->proxy.event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE); 221 src->proxy.src_event_in = _evas_event_object_list_raw_in_get(eo_e, src->proxy.src_event_in, evas_object_smart_members_get_direct(eo_src), NULL, ev->canvas.x, ev->canvas.y, &no_rep, EINA_TRUE);
222 } 222 }
223 else 223 else
224 src->proxy.event_in = eina_list_append(src->proxy.event_in, src); 224 src->proxy.src_event_in = eina_list_append(src->proxy.src_event_in, src);
225 _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_DOWN, ev, event_id); 225 _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_DOWN, ev, event_id);
226 ev->canvas = canvas; 226 ev->canvas = canvas;
227 ev->output = output; 227 ev->output = output;
@@ -270,7 +270,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas_Event_Mouse_Up *ev,
270 270
271 //FIXME: Needs to care the src mouse grab. 271 //FIXME: Needs to care the src mouse grab.
272 _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_UP, ev, event_id); 272 _evas_event_source_events_call(src, EVAS_CALLBACK_MOUSE_UP, ev, event_id);
273 src->proxy.event_in = eina_list_free(src->proxy.event_in); 273 src->proxy.src_event_in = eina_list_free(src->proxy.src_event_in);
274 274
275 ev->canvas = canvas; 275 ev->canvas = canvas;
276 ev->output = output; 276 ev->output = output;
@@ -408,6 +408,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas_Event_Mouse_Out *e
408 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 408 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
409 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); 409 Evas_Object *eo_src = _evas_object_image_source_get(eo_obj);
410 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); 410 Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS);
411 Evas_Point output = ev->output;
411 Evas_Coord_Point canvas = ev->canvas; 412 Evas_Coord_Point canvas = ev->canvas;
412 413
413 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; 414 if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return;
@@ -684,7 +685,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list)
684 evas_object_event_callback_call(eo_obj, obj, 685 evas_object_event_callback_call(eo_obj, obj,
685 EVAS_CALLBACK_MOUSE_DOWN, &ev, 686 EVAS_CALLBACK_MOUSE_DOWN, &ev,
686 event_id); 687 event_id);
687 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 688 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
688 _evas_event_source_mouse_down_events(eo_obj, eo_e, &ev, 689 _evas_event_source_mouse_down_events(eo_obj, eo_e, &ev,
689 event_id); 690 event_id);
690 } 691 }
@@ -749,7 +750,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
749 evas_object_event_callback_call(eo_obj, obj, 750 evas_object_event_callback_call(eo_obj, obj,
750 EVAS_CALLBACK_MOUSE_OUT, 751 EVAS_CALLBACK_MOUSE_OUT,
751 &ev, event_id); 752 &ev, event_id);
752 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 753 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
753 _evas_event_source_mouse_out_events(eo_obj, &ev, 754 _evas_event_source_mouse_out_events(eo_obj, &ev,
754 event_id); 755 event_id);
755 } 756 }
@@ -796,7 +797,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data)
796 evas_object_event_callback_call(eo_obj_itr, obj_itr, 797 evas_object_event_callback_call(eo_obj_itr, obj_itr,
797 EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id); 798 EVAS_CALLBACK_MOUSE_IN, &ev_in, event_id);
798 if ((obj_itr->proxy.is_proxy) && 799 if ((obj_itr->proxy.is_proxy) &&
799 (obj_itr->proxy.source_events)) 800 (obj_itr->proxy.src_events))
800 _evas_event_source_mouse_in_events(eo_obj_itr, 801 _evas_event_source_mouse_in_events(eo_obj_itr,
801 &ev_in, 802 &ev_in,
802 event_id); 803 event_id);
@@ -908,7 +909,7 @@ _canvas_event_feed_mouse_up(Eo *eo_e, void *_pd, va_list *list)
908 evas_object_event_callback_call(eo_obj, obj, 909 evas_object_event_callback_call(eo_obj, obj,
909 EVAS_CALLBACK_MOUSE_UP, 910 EVAS_CALLBACK_MOUSE_UP,
910 &ev, event_id); 911 &ev, event_id);
911 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 912 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
912 _evas_event_source_mouse_up_events(eo_obj, &ev, 913 _evas_event_source_mouse_up_events(eo_obj, &ev,
913 event_id); 914 event_id);
914 } 915 }
@@ -1032,7 +1033,7 @@ _canvas_event_feed_mouse_wheel(Eo *eo_e, void *_pd, va_list *list)
1032 evas_object_event_callback_call(eo_obj, obj, 1033 evas_object_event_callback_call(eo_obj, obj,
1033 EVAS_CALLBACK_MOUSE_WHEEL, &ev, 1034 EVAS_CALLBACK_MOUSE_WHEEL, &ev,
1034 event_id); 1035 event_id);
1035 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 1036 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
1036 _evas_event_source_wheel_events(eo_obj, &ev, event_id); 1037 _evas_event_source_wheel_events(eo_obj, &ev, event_id);
1037 } 1038 }
1038 if (e->delete_me) break; 1039 if (e->delete_me) break;
@@ -1139,7 +1140,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1139 { 1140 {
1140 evas_object_event_callback_call(eo_obj, obj, 1141 evas_object_event_callback_call(eo_obj, obj,
1141 EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 1142 EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
1142 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 1143 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
1143 _evas_event_source_mouse_move_events(eo_obj, &ev, 1144 _evas_event_source_mouse_move_events(eo_obj, &ev,
1144 event_id); 1145 event_id);
1145 } 1146 }
@@ -1204,7 +1205,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1204 obj, 1205 obj,
1205 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id); 1206 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
1206 if ((obj->proxy.is_proxy) && 1207 if ((obj->proxy.is_proxy) &&
1207 (obj->proxy.source_events)) 1208 (obj->proxy.src_events))
1208 _evas_event_source_mouse_out_events(eo_obj, &ev, event_id); 1209 _evas_event_source_mouse_out_events(eo_obj, &ev, event_id);
1209 } 1210 }
1210 } 1211 }
@@ -1298,7 +1299,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1298 ev.cur.canvas.y = e->pointer.y; 1299 ev.cur.canvas.y = e->pointer.y;
1299 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed); 1300 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
1300 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 1301 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
1301 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 1302 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
1302 _evas_event_source_mouse_move_events(eo_obj,&ev, 1303 _evas_event_source_mouse_move_events(eo_obj,&ev,
1303 event_id); 1304 event_id);
1304 } 1305 }
@@ -1318,7 +1319,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1318 evas_object_event_callback_call(eo_obj, obj, 1319 evas_object_event_callback_call(eo_obj, obj,
1319 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id); 1320 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
1320 if ((obj->proxy.is_proxy) && 1321 if ((obj->proxy.is_proxy) &&
1321 (obj->proxy.source_events)) 1322 (obj->proxy.src_events))
1322 _evas_event_source_mouse_out_events(eo_obj, &ev2, 1323 _evas_event_source_mouse_out_events(eo_obj, &ev2,
1323 event_id); 1324 event_id);
1324 } 1325 }
@@ -1351,7 +1352,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list)
1351 evas_object_event_callback_call(eo_obj, obj, 1352 evas_object_event_callback_call(eo_obj, obj,
1352 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2); 1353 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
1353 if ((obj->proxy.is_proxy) && 1354 if ((obj->proxy.is_proxy) &&
1354 (obj->proxy.source_events)) 1355 (obj->proxy.src_events))
1355 _evas_event_source_mouse_in_events(eo_obj, &ev3, 1356 _evas_event_source_mouse_in_events(eo_obj, &ev3,
1356 event_id2); 1357 event_id2);
1357 } 1358 }
@@ -1490,7 +1491,7 @@ nogrep:
1490 _evas_event_framespace_adjust(eo_obj, &ev.cur.canvas.x, &ev.cur.canvas.y); 1491 _evas_event_framespace_adjust(eo_obj, &ev.cur.canvas.x, &ev.cur.canvas.y);
1491 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed); 1492 _evas_event_havemap_adjust(eo_obj, obj, &ev.cur.canvas.x, &ev.cur.canvas.y, obj->mouse_grabbed);
1492 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id); 1493 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MOUSE_MOVE, &ev, event_id);
1493 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 1494 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
1494 _evas_event_source_mouse_move_events(eo_obj, &ev, 1495 _evas_event_source_mouse_move_events(eo_obj, &ev,
1495 event_id); 1496 event_id);
1496 } 1497 }
@@ -1510,7 +1511,7 @@ nogrep:
1510 evas_object_event_callback_call(eo_obj, obj, 1511 evas_object_event_callback_call(eo_obj, obj,
1511 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id); 1512 EVAS_CALLBACK_MOUSE_OUT, &ev2, event_id);
1512 if ((obj->proxy.is_proxy) && 1513 if ((obj->proxy.is_proxy) &&
1513 (obj->proxy.source_events)) 1514 (obj->proxy.src_events))
1514 _evas_event_source_mouse_out_events(eo_obj, &ev2, 1515 _evas_event_source_mouse_out_events(eo_obj, &ev2,
1515 event_id); 1516 event_id);
1516 } 1517 }
@@ -1543,7 +1544,7 @@ nogrep:
1543 evas_object_event_callback_call(eo_obj, obj, 1544 evas_object_event_callback_call(eo_obj, obj,
1544 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2); 1545 EVAS_CALLBACK_MOUSE_IN, &ev3, event_id2);
1545 if ((obj->proxy.is_proxy) && 1546 if ((obj->proxy.is_proxy) &&
1546 (obj->proxy.source_events)) 1547 (obj->proxy.src_events))
1547 _evas_event_source_mouse_in_events(eo_obj, &ev3, 1548 _evas_event_source_mouse_in_events(eo_obj, &ev3,
1548 event_id2); 1549 event_id2);
1549 } 1550 }
@@ -1628,7 +1629,7 @@ _canvas_event_feed_mouse_in(Eo *eo_e, void *_pd, va_list *list)
1628 evas_object_event_callback_call(eo_obj, obj, 1629 evas_object_event_callback_call(eo_obj, obj,
1629 EVAS_CALLBACK_MOUSE_IN, 1630 EVAS_CALLBACK_MOUSE_IN,
1630 &ev, event_id); 1631 &ev, event_id);
1631 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 1632 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
1632 _evas_event_source_mouse_in_events(eo_obj, &ev, 1633 _evas_event_source_mouse_in_events(eo_obj, &ev,
1633 event_id); 1634 event_id);
1634 } 1635 }
@@ -1712,7 +1713,7 @@ _canvas_event_feed_mouse_out(Eo *eo_e, void *_pd, va_list *list)
1712 evas_object_event_callback_call(eo_obj, obj, 1713 evas_object_event_callback_call(eo_obj, obj,
1713 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id); 1714 EVAS_CALLBACK_MOUSE_OUT, &ev, event_id);
1714 if ((obj->proxy.is_proxy) && 1715 if ((obj->proxy.is_proxy) &&
1715 (obj->proxy.source_events)) 1716 (obj->proxy.src_events))
1716 _evas_event_source_mouse_out_events(eo_obj, &ev, 1717 _evas_event_source_mouse_out_events(eo_obj, &ev,
1717 event_id); 1718 event_id);
1718 } 1719 }
@@ -1834,7 +1835,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list)
1834 evas_object_event_callback_call(eo_obj, obj, 1835 evas_object_event_callback_call(eo_obj, obj,
1835 EVAS_CALLBACK_MULTI_DOWN, &ev, 1836 EVAS_CALLBACK_MULTI_DOWN, &ev,
1836 event_id); 1837 event_id);
1837 if ((obj->proxy.is_proxy) || (obj->proxy.source_events)) 1838 if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
1838 _evas_event_source_multi_down_events(eo_obj, &ev, event_id); 1839 _evas_event_source_multi_down_events(eo_obj, &ev, event_id);
1839 } 1840 }
1840 if (e->delete_me) break; 1841 if (e->delete_me) break;
@@ -1943,7 +1944,7 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list)
1943 evas_object_event_callback_call(eo_obj, obj, 1944 evas_object_event_callback_call(eo_obj, obj,
1944 EVAS_CALLBACK_MULTI_UP, &ev, 1945 EVAS_CALLBACK_MULTI_UP, &ev,
1945 event_id); 1946 event_id);
1946 if ((obj->proxy.is_proxy) || (obj->proxy.source_events)) 1947 if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
1947 _evas_event_source_multi_up_events(eo_obj, &ev, event_id); 1948 _evas_event_source_multi_up_events(eo_obj, &ev, event_id);
1948 } 1949 }
1949 if (e->delete_me) break; 1950 if (e->delete_me) break;
@@ -2053,7 +2054,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2053 if (y != ev.cur.canvas.y) 2054 if (y != ev.cur.canvas.y)
2054 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision 2055 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
2055 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id); 2056 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
2056 if ((obj->proxy.is_proxy) || (obj->proxy.source_events)) 2057 if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
2057 _evas_event_source_multi_move_events(eo_obj, &ev, event_id); 2058 _evas_event_source_multi_move_events(eo_obj, &ev, event_id);
2058 } 2059 }
2059 if (e->delete_me) break; 2060 if (e->delete_me) break;
@@ -2126,7 +2127,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list)
2126 if (y != ev.cur.canvas.y) 2127 if (y != ev.cur.canvas.y)
2127 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision 2128 ev.cur.canvas.ysub = ev.cur.canvas.y; // fixme - lost precision
2128 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id); 2129 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_MULTI_MOVE, &ev, event_id);
2129 if ((obj->proxy.is_proxy) || (obj->proxy.source_events)) 2130 if ((obj->proxy.is_proxy) || (obj->proxy.src_events))
2130 _evas_event_source_multi_move_events(eo_obj, &ev, event_id); 2131 _evas_event_source_multi_move_events(eo_obj, &ev, event_id);
2131 } 2132 }
2132 if (e->delete_me) break; 2133 if (e->delete_me) break;
@@ -2415,7 +2416,7 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list)
2415 { 2416 {
2416 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, 2417 evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD,
2417 &ev, event_id); 2418 &ev, event_id);
2418 if ((obj->proxy.is_proxy) && (obj->proxy.source_events)) 2419 if ((obj->proxy.is_proxy) && (obj->proxy.src_events))
2419 _evas_event_source_hold_events(eo_obj, &ev, event_id); 2420 _evas_event_source_hold_events(eo_obj, &ev, event_id);
2420 } 2421 }
2421 if (e->delete_me) break; 2422 if (e->delete_me) break;
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index 721eaa5..932f11a 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -573,10 +573,10 @@ _image_source_events_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
573 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 573 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
574 574
575 source_events = !!source_events; 575 source_events = !!source_events;
576 if (obj->proxy.source_events == source_events) return; 576 if (obj->proxy.src_events == source_events) return;
577 obj->proxy.source_events = source_events; 577 obj->proxy.src_events = source_events;
578 if (!o->cur.source) return; 578 if (!o->cur.source) return;
579 if ((obj->proxy.source_invisible) || (!source_events)) return; 579 if ((obj->proxy.src_invisible) || (!source_events)) return;
580 //FIXME: Feed mouse events here. 580 //FIXME: Feed mouse events here.
581} 581}
582 582
@@ -599,7 +599,7 @@ _image_source_events_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
599 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); 599 Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS);
600 Eina_Bool *source_events = va_arg(*list, Eina_Bool *); 600 Eina_Bool *source_events = va_arg(*list, Eina_Bool *);
601 if (!source_events) return; 601 if (!source_events) return;
602 *source_events = obj->proxy.source_events; 602 *source_events = obj->proxy.src_events;
603} 603}
604 604
605EAPI void 605EAPI void
@@ -623,13 +623,13 @@ _image_source_visible_set(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
623 623
624 visible = !!visible; 624 visible = !!visible;
625 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS); 625 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
626 if (src_obj->proxy.source_invisible == !visible) return; 626 if (src_obj->proxy.src_invisible == !visible) return;
627 src_obj->proxy.source_invisible = !visible; 627 src_obj->proxy.src_invisible = !visible;
628 src_obj->changed_source_visible = EINA_TRUE; 628 src_obj->changed_src_visible = EINA_TRUE;
629 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE, 629 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
630 EINA_FALSE, EINA_TRUE); 630 EINA_FALSE, EINA_TRUE);
631 evas_object_change(o->cur.source, src_obj); 631 evas_object_change(o->cur.source, src_obj);
632 if ((!visible) || (!src_obj->proxy.source_events)) return; 632 if ((!visible) || (!src_obj->proxy.src_events)) return;
633 //FIXME: Feed mouse events here. 633 //FIXME: Feed mouse events here.
634} 634}
635 635
@@ -656,7 +656,7 @@ _image_source_visible_get(Eo *eo_obj EINA_UNUSED, void *_pd, va_list *list)
656 if (!visible) return; 656 if (!visible) return;
657 if (!o->cur.source) *visible = EINA_FALSE; 657 if (!o->cur.source) *visible = EINA_FALSE;
658 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS); 658 src_obj = eo_data_get(o->cur.source, EVAS_OBJ_CLASS);
659 if (src_obj) *visible = !src_obj->proxy.source_invisible; 659 if (src_obj) *visible = !src_obj->proxy.src_invisible;
660 else *visible = EINA_FALSE; 660 else *visible = EINA_FALSE;
661} 661}
662 662
@@ -2671,10 +2671,10 @@ _proxy_unset(Evas_Object *proxy)
2671 cur_source->proxy.proxies = eina_list_remove(cur_source->proxy.proxies, proxy); 2671 cur_source->proxy.proxies = eina_list_remove(cur_source->proxy.proxies, proxy);
2672 cur_proxy->proxy.is_proxy = EINA_FALSE; 2672 cur_proxy->proxy.is_proxy = EINA_FALSE;
2673 2673
2674 if (cur_source->proxy.source_invisible) 2674 if (cur_source->proxy.src_invisible)
2675 { 2675 {
2676 cur_source->proxy.source_invisible = EINA_FALSE; 2676 cur_source->proxy.src_invisible = EINA_FALSE;
2677 cur_source->changed_source_visible = EINA_TRUE; 2677 cur_source->changed_src_visible = EINA_TRUE;
2678 evas_object_change(o->cur.source, cur_source); 2678 evas_object_change(o->cur.source, cur_source);
2679 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE, 2679 evas_object_smart_member_cache_invalidate(o->cur.source, EINA_FALSE,
2680 EINA_FALSE, EINA_TRUE); 2680 EINA_FALSE, EINA_TRUE);
@@ -3696,7 +3696,7 @@ evas_object_image_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
3696 evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v); 3696 evas_object_render_pre_visible_change(&e->clip_changes, eo_obj, is_v, was_v);
3697 if (!o->pixel_updates) goto done; 3697 if (!o->pixel_updates) goto done;
3698 } 3698 }
3699 if (obj->changed_map || obj->changed_source_visible) 3699 if (obj->changed_map || obj->changed_src_visible)
3700 { 3700 {
3701 evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj); 3701 evas_object_render_pre_prev_cur_add(&e->clip_changes, eo_obj, obj);
3702 goto done; 3702 goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_line.c b/legacy/evas/src/lib/canvas/evas_object_line.c
index 9d10810..76a6263 100644
--- a/legacy/evas/src/lib/canvas/evas_object_line.c
+++ b/legacy/evas/src/lib/canvas/evas_object_line.c
@@ -311,7 +311,7 @@ evas_object_line_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
311 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); 311 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
312 goto done; 312 goto done;
313 } 313 }
314 if (obj->changed_map || obj->changed_source_visible) 314 if (obj->changed_map || obj->changed_src_visible)
315 { 315 {
316 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, 316 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj,
317 obj); 317 obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c
index 0771c83..d639c57 100644
--- a/legacy/evas/src/lib/canvas/evas_object_main.c
+++ b/legacy/evas/src/lib/canvas/evas_object_main.c
@@ -54,7 +54,7 @@ evas_object_change_reset(Evas_Object *eo_obj)
54 obj->changed_color = EINA_FALSE; 54 obj->changed_color = EINA_FALSE;
55 obj->changed_map = EINA_FALSE; 55 obj->changed_map = EINA_FALSE;
56 obj->changed_pchange = EINA_FALSE; 56 obj->changed_pchange = EINA_FALSE;
57 obj->changed_source_visible = EINA_FALSE; 57 obj->changed_src_visible = EINA_FALSE;
58} 58}
59 59
60void 60void
diff --git a/legacy/evas/src/lib/canvas/evas_object_polygon.c b/legacy/evas/src/lib/canvas/evas_object_polygon.c
index 7e4fb06..475c555 100644
--- a/legacy/evas/src/lib/canvas/evas_object_polygon.c
+++ b/legacy/evas/src/lib/canvas/evas_object_polygon.c
@@ -368,7 +368,7 @@ evas_object_polygon_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *
368 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); 368 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
369 goto done; 369 goto done;
370 } 370 }
371 if (obj->changed_map || obj->changed_source_visible) 371 if (obj->changed_map || obj->changed_src_visible)
372 { 372 {
373 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); 373 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
374 goto done; 374 goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_rectangle.c b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
index 854e327..a90aeb7 100644
--- a/legacy/evas/src/lib/canvas/evas_object_rectangle.c
+++ b/legacy/evas/src/lib/canvas/evas_object_rectangle.c
@@ -178,7 +178,7 @@ evas_object_rectangle_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
178 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); 178 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
179 goto done; 179 goto done;
180 } 180 }
181 if (obj->changed_map || obj->changed_source_visible) 181 if (obj->changed_map || obj->changed_src_visible)
182 { 182 {
183 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj); 183 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, eo_obj, obj);
184 goto done; 184 goto done;
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index afcbd36..9502aef 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -1151,7 +1151,7 @@ evas_object_smart_member_cache_invalidate(Evas_Object *eo_obj,
1151 if (freeze_events) 1151 if (freeze_events)
1152 obj->parent_cache.freeze_events_valid = EINA_FALSE; 1152 obj->parent_cache.freeze_events_valid = EINA_FALSE;
1153 if (source_invisible) 1153 if (source_invisible)
1154 obj->parent_cache.source_invisible_valid = EINA_FALSE; 1154 obj->parent_cache.src_invisible_valid = EINA_FALSE;
1155 1155
1156 if (!obj->is_smart) return; 1156 if (!obj->is_smart) return;
1157 Evas_Object_Smart *o = eo_data_get(eo_obj, MY_CLASS); 1157 Evas_Object_Smart *o = eo_data_get(eo_obj, MY_CLASS);
@@ -1403,7 +1403,7 @@ evas_object_smart_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
1403#endif 1403#endif
1404 } 1404 }
1405 1405
1406 if (obj->changed_map || obj->changed_source_visible) 1406 if (obj->changed_map || obj->changed_src_visible)
1407 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 1407 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
1408 eo_obj, obj); 1408 eo_obj, obj);
1409 1409
diff --git a/legacy/evas/src/lib/canvas/evas_object_text.c b/legacy/evas/src/lib/canvas/evas_object_text.c
index b7b1013..0279544 100644
--- a/legacy/evas/src/lib/canvas/evas_object_text.c
+++ b/legacy/evas/src/lib/canvas/evas_object_text.c
@@ -1849,7 +1849,7 @@ evas_object_text_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj
1849 eo_obj, is_v, was_v); 1849 eo_obj, is_v, was_v);
1850 goto done; 1850 goto done;
1851 } 1851 }
1852 if (obj->changed_map || obj->changed_source_visible) 1852 if (obj->changed_map || obj->changed_src_visible)
1853 { 1853 {
1854 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 1854 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
1855 eo_obj, obj); 1855 eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 0977a22..2830f66 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -10015,7 +10015,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
10015 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); 10015 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
10016 goto done; 10016 goto done;
10017 } 10017 }
10018 if (obj->changed_map || obj->changed_source_visible) 10018 if (obj->changed_map || obj->changed_src_visible)
10019 { 10019 {
10020 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 10020 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
10021 eo_obj, obj); 10021 eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_object_textgrid.c b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
index 471248e..9ba96ed 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textgrid.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textgrid.c
@@ -723,7 +723,7 @@ evas_object_textgrid_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data
723 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v); 723 evas_object_render_pre_visible_change(&obj->layer->evas->clip_changes, eo_obj, is_v, was_v);
724 goto done; 724 goto done;
725 } 725 }
726 if (obj->changed_map || obj->changed_source_visible) 726 if (obj->changed_map || obj->changed_src_visible)
727 { 727 {
728 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes, 728 evas_object_render_pre_prev_cur_add(&obj->layer->evas->clip_changes,
729 eo_obj, obj); 729 eo_obj, obj);
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 42b5f05..9762dda 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -244,7 +244,7 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
244 _evas_render_had_map(obj)); 244 _evas_render_had_map(obj));
245 if ((obj->is_smart) && 245 if ((obj->is_smart) &&
246 ((_evas_render_has_map(eo_obj, obj) || 246 ((_evas_render_has_map(eo_obj, obj) ||
247 (obj->changed_source_visible)))) 247 (obj->changed_src_visible))))
248 { 248 {
249 RD(" has map + smart\n"); 249 RD(" has map + smart\n");
250 _evas_render_prev_cur_clip_cache_add(e, obj); 250 _evas_render_prev_cur_clip_cache_add(e, obj);
diff --git a/legacy/evas/src/lib/include/evas_inline.x b/legacy/evas/src/lib/include/evas_inline.x
index 5e6d8cd..4ad3727 100644
--- a/legacy/evas/src/lib/include/evas_inline.x
+++ b/legacy/evas/src/lib/include/evas_inline.x
@@ -109,16 +109,16 @@ evas_event_passes_through(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_
109static inline int 109static inline int
110evas_object_is_source_invisible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj) 110evas_object_is_source_invisible(Evas_Object *eo_obj __UNUSED__, Evas_Object_Protected_Data *obj)
111{ 111{
112 if (obj->parent_cache.source_invisible_valid) 112 if (obj->parent_cache.src_invisible_valid)
113 return obj->parent_cache.source_invisible; 113 return obj->parent_cache.src_invisible;
114 if (obj->proxy.proxies && obj->proxy.source_invisible) return 1; 114 if (obj->proxy.proxies && obj->proxy.src_invisible) return 1;
115 if (!obj->smart.parent) return 0; 115 if (!obj->smart.parent) return 0;
116 Evas_Object_Protected_Data *smart_parent_pd = 116 Evas_Object_Protected_Data *smart_parent_pd =
117 eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS); 117 eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS);
118 obj->parent_cache.source_invisible = 118 obj->parent_cache.src_invisible =
119 evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd); 119 evas_object_is_source_invisible(obj->smart.parent, smart_parent_pd);
120 obj->parent_cache.source_invisible_valid = EINA_TRUE; 120 obj->parent_cache.src_invisible_valid = EINA_TRUE;
121 return obj->parent_cache.source_invisible; 121 return obj->parent_cache.src_invisible;
122} 122}
123 123
124static inline int 124static inline int
diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h
index e7e0e72..e6536fd 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@@ -595,11 +595,11 @@ struct _Evas_Object_Protected_Data
595 Eina_List *proxies; 595 Eina_List *proxies;
596 void *surface; 596 void *surface;
597 int w,h; 597 int w,h;
598 Eina_List *event_in; 598 Eina_List *src_event_in;
599 Eina_Bool redraw : 1; 599 Eina_Bool redraw : 1;
600 Eina_Bool is_proxy : 1; 600 Eina_Bool is_proxy : 1;
601 Eina_Bool source_invisible : 1; 601 Eina_Bool src_invisible : 1;
602 Eina_Bool source_events: 1; 602 Eina_Bool src_events: 1;
603 } proxy; 603 } proxy;
604 604
605 // Pointer to the Evas_Object itself 605 // Pointer to the Evas_Object itself
@@ -648,8 +648,8 @@ struct _Evas_Object_Protected_Data
648 Eina_Bool pass_events_valid : 1; 648 Eina_Bool pass_events_valid : 1;
649 Eina_Bool freeze_events : 1; 649 Eina_Bool freeze_events : 1;
650 Eina_Bool freeze_events_valid : 1; 650 Eina_Bool freeze_events_valid : 1;
651 Eina_Bool source_invisible : 1; 651 Eina_Bool src_invisible : 1;
652 Eina_Bool source_invisible_valid : 1; 652 Eina_Bool src_invisible_valid : 1;
653 } parent_cache; 653 } parent_cache;
654 Eina_Bool restack : 1; 654 Eina_Bool restack : 1;
655 Eina_Bool is_active : 1; 655 Eina_Bool is_active : 1;
@@ -670,7 +670,7 @@ struct _Evas_Object_Protected_Data
670 Eina_Bool changed_color : 1; 670 Eina_Bool changed_color : 1;
671 Eina_Bool changed_map : 1; 671 Eina_Bool changed_map : 1;
672 Eina_Bool changed_pchange : 1; 672 Eina_Bool changed_pchange : 1;
673 Eina_Bool changed_source_visible : 1; 673 Eina_Bool changed_src_visible : 1;
674 Eina_Bool del_ref : 1; 674 Eina_Bool del_ref : 1;
675 675
676 Eina_Bool is_frame : 1; 676 Eina_Bool is_frame : 1;