diff options
Diffstat (limited to 'src/lib/evas/canvas/evas_events.c')
| -rw-r--r-- | src/lib/evas/canvas/evas_events.c | 158 |
1 files changed, 79 insertions, 79 deletions
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index 392a56247b..31a3604552 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -15,7 +15,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte { if (obj->smart.parent) { - Evas_Object_Protected_Data *smart_parent_obj = eo_data_get(obj->smart.parent, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *smart_parent_obj = eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS); _evas_event_havemap_adjust(obj->smart.parent, smart_parent_obj, x, y, mouse_grabbed); } @@ -34,7 +34,7 @@ _evas_event_havemap_adjust(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protecte static void _evas_event_framespace_adjust(Evas_Object *eo_obj, Evas_Coord *x, Evas_Coord *y) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Public_Data *evas; if (obj->is_frame) return; @@ -192,10 +192,10 @@ _transform_to_src_space(Evas_Object_Protected_Data *obj, Evas_Object_Protected_D static void _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Down *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object_Protected_Data *child; Evas_Object *eo_child; @@ -232,7 +232,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (child->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -251,7 +251,7 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); ev->canvas = point; _evas_event_framespace_adjust(eo_child, &ev->canvas.x, &ev->canvas.y); @@ -272,10 +272,10 @@ _evas_event_source_mouse_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Move *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->cur.canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -296,7 +296,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if ((evas_object_clippers_is_visible(eo_child, child) || child->mouse_grabbed) && @@ -325,7 +325,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event { eo_child = outs->data; outs = eina_list_remove(outs, eo_child); - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if ((child->mouse_grabbed == 0) && (!e->delete_me)) { if (child->mouse_in) continue; @@ -360,7 +360,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); ev->cur.canvas = point; @@ -408,7 +408,7 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event int event_id2 = _evas_event_counter; EINA_LIST_FOREACH(ins, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { if (!child->mouse_in) @@ -447,10 +447,10 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Up *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -468,7 +468,7 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) return; - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if ((child->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && (child->mouse_grabbed > 0)) { @@ -499,9 +499,9 @@ _evas_event_source_mouse_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M static void _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); if (obj->layer->evas->is_frozen) return; @@ -511,7 +511,7 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void EINA_LIST_FOREACH(src->proxy->src_event_in, l, child_eo) { if (src->delete_me) return; - child = eo_data_get(child_eo, EVAS_OBJ_CLASS); + child = eo_data_scope_get(child_eo, EVAS_OBJ_CLASS); evas_object_event_callback_call(child_eo, child, EVAS_CALLBACK_HOLD, ev, event_id); if (src->layer->evas->delete_me) break; @@ -521,10 +521,10 @@ _evas_event_source_hold_events(Evas_Object *eo_obj, Evas *eo_e EINA_UNUSED, void static void _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Wheel *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -540,7 +540,7 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous EINA_LIST_FOREACH(copy, l, eo_child) { if (src->delete_me) return; - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); ev->canvas = point; _evas_event_havemap_adjust(eo_child, child, &ev->canvas.x, @@ -557,10 +557,10 @@ _evas_event_source_wheel_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mous static void _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Down *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -577,7 +577,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event EINA_LIST_FOREACH(src->proxy->src_event_in, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if (child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { child->mouse_grabbed += (addgrab + 1); @@ -595,7 +595,7 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->canvas.x, &ev->canvas.y, child->mouse_grabbed); - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_DOWN, ev, event_id); if (e->delete_me) break; @@ -608,10 +608,10 @@ _evas_event_source_multi_down_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Up *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->canvas; if (obj->delete_me || src->delete_me || obj->layer->evas->is_frozen) return; @@ -629,7 +629,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M EINA_LIST_FOREACH(copy, l, eo_child) { ev->canvas = point; - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && (child->mouse_grabbed > 0)) { @@ -652,10 +652,10 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M static void _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Multi_Move *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Precision_Point canvas = ev->cur.canvas; if (obj->delete_me || src->delete_me || e->is_frozen) return; @@ -677,7 +677,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if (((evas_object_clippers_is_visible(eo_child, child)) || ((child->mouse_grabbed) && (!evas_event_passes_through(eo_child, child)) && @@ -689,7 +689,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id); @@ -712,7 +712,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event Eina_List *copy = evas_event_list_copy(src->proxy->src_event_in); EINA_LIST_FOREACH(copy, l, eo_child) { - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); ev->cur.canvas = point; if (evas_object_is_in_output_rect(eo_child, child, @@ -732,7 +732,7 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event &ev->cur.canvas.x, &ev->cur.canvas.y, child->mouse_grabbed); - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); + child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_MOVE, ev, event_id); @@ -759,10 +759,10 @@ _evas_event_source_multi_move_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event static void _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_In *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; Eina_List *ins = NULL; @@ -787,7 +787,7 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ point = ev->canvas; EINA_LIST_FOREACH(ins, l, eo_child) { - Evas_Object_Protected_Data *child = eo_data_get(eo_child, + Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if (!eina_list_data_find(src->proxy->src_event_in, eo_child)) { @@ -819,10 +819,10 @@ _evas_event_source_mouse_in_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ static void _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_Mouse_Out *ev, int event_id) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); Evas_Object *eo_src = _evas_object_image_source_get(eo_obj); - Evas_Object_Protected_Data *src = eo_data_get(eo_src, EVAS_OBJ_CLASS); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Object_Protected_Data *src = eo_data_scope_get(eo_src, EVAS_OBJ_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Coord_Point canvas = ev->canvas; Evas_Object *eo_child; Eina_List *l; @@ -840,7 +840,7 @@ _evas_event_source_mouse_out_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_ EINA_LIST_FOREACH(copy, l, eo_child) { - Evas_Object_Protected_Data *child = eo_data_get(eo_child, + Evas_Object_Protected_Data *child = eo_data_scope_get(eo_child, EVAS_OBJ_CLASS); if (!child->mouse_in) continue; child->mouse_in = 0; @@ -878,7 +878,7 @@ _evas_event_object_list_in_get(Evas *eo_e, Eina_List *in, Eina_List * evas_event_objects_event_list(Evas *eo_e, Evas_Object *stop, int x, int y) { - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Evas_Layer *lay; Eina_List *in = NULL; @@ -1020,7 +1020,7 @@ evas_event_thaw_eval(Evas *eo_e) MAGIC_CHECK(eo_e, Evas, MAGIC_EVAS); return; MAGIC_CHECK_END(); - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); if (0 == evas_event_freeze_get(eo_e)) { _canvas_event_thaw_eval_internal(eo_e, e); @@ -1099,7 +1099,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) || (obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_NOGRAB_NO_REPEAT_UPDOWN)) { @@ -1114,7 +1114,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list) } EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (obj->delete_me) continue; ev.canvas.x = e->pointer.x; ev.canvas.y = e->pointer.y; @@ -1143,7 +1143,7 @@ _canvas_event_feed_mouse_down(Eo *eo_e, void *_pd, va_list *list) static int _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) { - Evas_Public_Data *e = eo_data_get(eo_e, EVAS_CLASS); + Evas_Public_Data *e = eo_data_scope_get(eo_e, EVAS_CLASS); Eina_List *l, *copy, *ins, *ll; Evas_Event_Mouse_Out ev; Evas_Object *eo_obj; @@ -1172,7 +1172,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, ll, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((!eina_list_data_find(ins, eo_obj)) || (!e->pointer.inside)) { if (!obj->mouse_in) continue; @@ -1219,7 +1219,7 @@ _post_up_handle(Evas *eo_e, unsigned int timestamp, const void *data) EINA_LIST_FOREACH(ins, l, eo_obj_itr) { - Evas_Object_Protected_Data *obj_itr = eo_data_get(eo_obj_itr, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj_itr = eo_data_scope_get(eo_obj_itr, EVAS_OBJ_CLASS); if (!eina_list_data_find(e->pointer.object.in, eo_obj_itr)) { if (obj_itr->mouse_in) continue; @@ -1327,7 +1327,7 @@ _canvas_event_feed_mouse_up(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((obj->pointer_mode == EVAS_OBJECT_POINTER_MODE_AUTOGRAB) && (obj->mouse_grabbed > 0)) { @@ -1463,7 +1463,7 @@ _canvas_event_feed_mouse_wheel(Eo *eo_e, void *_pd, va_list *list) EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (!evas_event_freezes_through(eo_obj, obj)) { ev.canvas.x = e->pointer.x; @@ -1562,7 +1562,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((!e->is_frozen) && (evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && @@ -1631,7 +1631,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) Evas_Object *eo_obj; eo_obj = outs->data; outs = eina_list_remove(outs, eo_obj); - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((obj->mouse_grabbed == 0) && (!e->delete_me)) { if (!obj->mouse_in) continue; @@ -1718,7 +1718,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -1782,7 +1782,7 @@ _canvas_event_feed_mouse_move(Eo *eo_e, void *_pd, va_list *list) /* go thru our current list of ins */ EINA_LIST_FOREACH(ins, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); /* if its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -1897,7 +1897,7 @@ nogrep: eo_below_obj = evas_object_below_get(nogrep_obj); if (eo_below_obj) { - Evas_Object_Protected_Data *below_obj = eo_data_get(eo_below_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *below_obj = eo_data_scope_get(eo_below_obj, EVAS_OBJ_CLASS); ins = _evas_event_object_list_raw_in_get(eo_e, NULL, EINA_INLIST_GET(below_obj), NULL, e->pointer.x, e->pointer.y, @@ -1915,7 +1915,7 @@ nogrep: EINA_LIST_FOREACH(lst, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -1975,7 +1975,7 @@ nogrep: /* go thru our current list of ins */ EINA_LIST_FOREACH(newin, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); /* if its not in the old list of ins send an enter event */ if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { @@ -2059,7 +2059,7 @@ _canvas_event_feed_mouse_in(Eo *eo_e, void *_pd, va_list *list) ins = evas_event_objects_event_list(eo_e, NULL, e->pointer.x, e->pointer.y); EINA_LIST_FOREACH(ins, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (!eina_list_data_find(e->pointer.object.in, eo_obj)) { if (obj->mouse_in) continue; @@ -2137,7 +2137,7 @@ _canvas_event_feed_mouse_out(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (!obj->mouse_in) continue; obj->mouse_in = 0; if (!obj->delete_me) @@ -2244,7 +2244,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if (obj->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) { obj->mouse_grabbed += addgrab + 1; @@ -2253,7 +2253,7 @@ _canvas_event_feed_multi_down(Eo *eo_e, void *_pd, va_list *list) } EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2354,7 +2354,7 @@ _canvas_event_feed_multi_up(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); ev.canvas.x = x; ev.canvas.y = y; ev.canvas.xsub = fx; @@ -2462,7 +2462,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ((evas_object_clippers_is_visible(eo_obj, obj) || obj->mouse_grabbed) && (!evas_event_passes_through(eo_obj, obj)) && @@ -2530,7 +2530,7 @@ _canvas_event_feed_multi_move(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); /* if its under the pointer and its visible and its in the new */ /* in list */ // FIXME: i don't think we need this @@ -2650,7 +2650,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list) { if (!(e->modifiers.mask & g->not_modifiers)) { - Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2675,7 +2675,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list) l = eina_list_next(l); if (g->delete_me) { - Evas_Object_Protected_Data *g_object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *g_object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); evas_key_grab_free(g->object, g_object_obj, g->keyname, g->modifiers, g->not_modifiers); } @@ -2685,7 +2685,7 @@ _canvas_event_feed_key_down(Eo *eo_e, void *_pd, va_list *list) } if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_get(e->focused, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) evas_object_event_callback_call(e->focused, focused_obj, EVAS_CALLBACK_KEY_DOWN, @@ -2762,7 +2762,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list) (g->not_modifiers == ~e->modifiers.mask))) && (!strcmp(keyname, g->keyname))) { - Evas_Object_Protected_Data *object_obj = eo_data_get(g->object, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *object_obj = eo_data_scope_get(g->object, EVAS_OBJ_CLASS); if (!e->is_frozen && !evas_event_freezes_through(g->object, object_obj)) { @@ -2788,7 +2788,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list) if (gr->delete_me) { Evas_Object_Protected_Data *gr_object_obj = - eo_data_get(gr->object, EVAS_OBJ_CLASS); + eo_data_scope_get(gr->object, EVAS_OBJ_CLASS); evas_key_grab_free(gr->object, gr_object_obj, gr->keyname, gr->modifiers, gr->not_modifiers); } @@ -2798,7 +2798,7 @@ _canvas_event_feed_key_up(Eo *eo_e, void *_pd, va_list *list) } if ((e->focused) && (!exclusive)) { - Evas_Object_Protected_Data *focused_obj = eo_data_get(e->focused, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *focused_obj = eo_data_scope_get(e->focused, EVAS_OBJ_CLASS); if (!e->is_frozen && !evas_event_freezes_through(e->focused, focused_obj)) evas_object_event_callback_call(e->focused, focused_obj, EVAS_CALLBACK_KEY_UP, @@ -2845,7 +2845,7 @@ _canvas_event_feed_hold(Eo *eo_e, void *_pd, va_list *list) copy = evas_event_list_copy(e->pointer.object.in); EINA_LIST_FOREACH(copy, l, eo_obj) { - Evas_Object_Protected_Data *obj = eo_data_get(eo_obj, EVAS_OBJ_CLASS); + Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJ_CLASS); if ( !evas_event_freezes_through(eo_obj, obj)) { evas_object_event_callback_call(eo_obj, obj, EVAS_CALLBACK_HOLD, |