summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-03-26 15:21:21 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:23 -0700
commit65ee277a6674dcad9c938b8b0ac9b56520105fc4 (patch)
tree1ed89932d2279c2f237bef50f733adef0fc51a0b
parentf6fc78119b3309fbd22f6a2b115caaf30b98169a (diff)
Efl.Canvas.Scene (from Efl.Canvas)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c4
-rw-r--r--src/examples/ecore/ecore_evas_cursor_example.c2
-rw-r--r--src/examples/ecore/ecore_evas_vnc_example.c6
-rw-r--r--src/examples/ecore/ecore_evas_wayland_multiseat_example.c14
-rw-r--r--src/examples/edje/edje-multiseat-custom-names.c4
-rw-r--r--src/examples/edje/edje-multiseat-filter.c2
-rw-r--r--src/examples/edje/edje-multiseat.c2
-rw-r--r--src/examples/evas/evas-event-filter.c6
-rw-r--r--src/examples/evas/evas-multiseat-events.c8
-rw-r--r--src/lib/ecore_evas/ecore_evas.c6
-rw-r--r--src/lib/edje/edje_entry.c8
-rw-r--r--src/lib/edje/edje_load.c18
-rw-r--r--src/lib/efl/Efl.h2
-rw-r--r--src/lib/efl/interfaces/efl_canvas_scene.eo (renamed from src/lib/efl/interfaces/efl_canvas.eo)2
-rw-r--r--src/lib/efl/interfaces/efl_input_device.c2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c4
-rw-r--r--src/lib/efl/interfaces/efl_ui_base.eo2
-rw-r--r--src/lib/efl_wl/efl_wl.c4
-rw-r--r--src/lib/elementary/efl_ui_win.c72
-rw-r--r--src/lib/elementary/efl_ui_win.eo22
-rw-r--r--src/lib/evas/canvas/efl_canvas_vg.c4
-rw-r--r--src/lib/evas/canvas/efl_gfx_map.c2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c18
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo20
-rw-r--r--src/lib/evas/canvas/evas_device.c14
-rw-r--r--src/lib/evas/canvas/evas_image_legacy.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c22
-rw-r--r--src/tests/elementary/elm_test_win.c8
29 files changed, 141 insertions, 141 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index 469b76a336..8994e25186 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -16,7 +16,7 @@ efl_eolian_legacy_files = \
16 $(NULL) 16 $(NULL)
17 17
18efl_eolian_files = \ 18efl_eolian_files = \
19 lib/efl/interfaces/efl_canvas.eo \ 19 lib/efl/interfaces/efl_canvas_scene.eo \
20 lib/efl/interfaces/efl_canvas_pointer.eo \ 20 lib/efl/interfaces/efl_canvas_pointer.eo \
21 lib/efl/interfaces/efl_config.eo \ 21 lib/efl/interfaces/efl_config.eo \
22 lib/efl/interfaces/efl_control.eo \ 22 lib/efl/interfaces/efl_control.eo \
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 9eb5dca932..dd9e15388f 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -55,7 +55,7 @@ _render_post(void *data, const Efl_Event *ev)
55{ 55{
56 Eo *snap = data; 56 Eo *snap = data;
57 57
58 efl_event_callback_del(ev->object, EFL_CANVAS_EVENT_RENDER_POST, _render_post, data); 58 efl_event_callback_del(ev->object, EFL_CANVAS_SCENE_EVENT_RENDER_POST, _render_post, data);
59 efl_file_save(snap, eina_slstr_printf("%s/snap-efl.png", eina_environment_tmp_get()), NULL, NULL); 59 efl_file_save(snap, eina_slstr_printf("%s/snap-efl.png", eina_environment_tmp_get()), NULL, NULL);
60} 60}
61 61
@@ -67,7 +67,7 @@ _save_image(void *data, const Efl_Event *ev EINA_UNUSED)
67 67
68 // Save is available only during render_post 68 // Save is available only during render_post
69 snap = efl_key_wref_get(win, "snap"); 69 snap = efl_key_wref_get(win, "snap");
70 efl_event_callback_add(win, EFL_CANVAS_EVENT_RENDER_POST, _render_post, snap); 70 efl_event_callback_add(win, EFL_CANVAS_SCENE_EVENT_RENDER_POST, _render_post, snap);
71 71
72 // Force a render in order to ensure post_render is called. EO API provides 72 // Force a render in order to ensure post_render is called. EO API provides
73 // no way to do manual render, so we add a damage to the snapshot object. 73 // no way to do manual render, so we add a damage to the snapshot object.
diff --git a/src/examples/ecore/ecore_evas_cursor_example.c b/src/examples/ecore/ecore_evas_cursor_example.c
index a40ad3c0bc..cbf7dfc32d 100644
--- a/src/examples/ecore/ecore_evas_cursor_example.c
+++ b/src/examples/ecore/ecore_evas_cursor_example.c
@@ -202,7 +202,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
202 } 202 }
203 203
204 t = ecore_timer_add(TIMEOUT, _mouse_pos_print, ee); 204 t = ecore_timer_add(TIMEOUT, _mouse_pos_print, ee);
205 efl_event_callback_add(e, EFL_CANVAS_EVENT_DEVICE_ADDED, 205 efl_event_callback_add(e, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
206 _device_added, ee); 206 _device_added, ee);
207 ecore_evas_callback_resize_set(ee, _resize_cb); 207 ecore_evas_callback_resize_set(ee, _resize_cb);
208 ecore_evas_callback_delete_request_set(ee, _delete_request_cb); 208 ecore_evas_callback_delete_request_set(ee, _delete_request_cb);
diff --git a/src/examples/ecore/ecore_evas_vnc_example.c b/src/examples/ecore/ecore_evas_vnc_example.c
index 0f06c62d3e..c3d1ac7cfd 100644
--- a/src/examples/ecore/ecore_evas_vnc_example.c
+++ b/src/examples/ecore/ecore_evas_vnc_example.c
@@ -188,7 +188,7 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
188 efl_name_get(dev), 188 efl_name_get(dev),
189 _device_type_to_string(efl_input_device_type_get(dev)), 189 _device_type_to_string(efl_input_device_type_get(dev)),
190 efl_comment_get(dev), 190 efl_comment_get(dev),
191 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed"); 191 event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed");
192 192
193 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT) 193 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
194 _seat_children_print(dev); 194 _seat_children_print(dev);
@@ -301,9 +301,9 @@ main(int argc, char *argv[])
301 _mouse_wheel, NULL); 301 _mouse_wheel, NULL);
302 302
303 _seat_children_print(evas_default_device_get(evas, EFL_INPUT_DEVICE_TYPE_SEAT)); 303 _seat_children_print(evas_default_device_get(evas, EFL_INPUT_DEVICE_TYPE_SEAT));
304 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 304 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
305 _dev_added_or_removed, NULL); 305 _dev_added_or_removed, NULL);
306 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, 306 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
307 _dev_added_or_removed, NULL); 307 _dev_added_or_removed, NULL);
308 ecore_main_loop_begin(); 308 ecore_main_loop_begin();
309 309
diff --git a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
index 5b21a88e39..3aec0fa524 100644
--- a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
+++ b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
@@ -106,7 +106,7 @@ _dev_added_or_removed(void *data, const Efl_Event *event)
106 dev, efl_name_get(dev), 106 dev, efl_name_get(dev),
107 _device_type_to_string(efl_input_device_type_get(dev)), 107 _device_type_to_string(efl_input_device_type_get(dev)),
108 efl_comment_get(dev), 108 efl_comment_get(dev),
109 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed", 109 event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed",
110 data); 110 data);
111} 111}
112 112
@@ -197,18 +197,18 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
197 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, 197 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
198 _mouse_wheel, NULL); 198 _mouse_wheel, NULL);
199 199
200 efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_ADDED, 200 efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
201 _dev_added_or_removed, ee1); 201 _dev_added_or_removed, ee1);
202 efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_REMOVED, 202 efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
203 _dev_added_or_removed, ee1); 203 _dev_added_or_removed, ee1);
204 efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_CHANGED, 204 efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
205 _dev_changed, ee1); 205 _dev_changed, ee1);
206 206
207 efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_ADDED, 207 efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
208 _dev_added_or_removed, ee2); 208 _dev_added_or_removed, ee2);
209 efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_REMOVED, 209 efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
210 _dev_added_or_removed, ee2); 210 _dev_added_or_removed, ee2);
211 efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_CHANGED, 211 efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
212 _dev_changed, ee2); 212 _dev_changed, ee2);
213 213
214 ecore_main_loop_begin(); 214 ecore_main_loop_begin();
diff --git a/src/examples/edje/edje-multiseat-custom-names.c b/src/examples/edje/edje-multiseat-custom-names.c
index ce1342bbb2..9da96b8371 100644
--- a/src/examples/edje/edje-multiseat-custom-names.c
+++ b/src/examples/edje/edje-multiseat-custom-names.c
@@ -123,9 +123,9 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
123 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT) 123 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
124 _device_rename(dev); 124 _device_rename(dev);
125 } 125 }
126 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 126 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
127 _device_added, NULL); 127 _device_added, NULL);
128 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_CHANGED, 128 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
129 _device_changed, NULL); 129 _device_changed, NULL);
130 130
131 printf("Running example on evas engine %s\n", 131 printf("Running example on evas engine %s\n",
diff --git a/src/examples/edje/edje-multiseat-filter.c b/src/examples/edje/edje-multiseat-filter.c
index 5cf59d69b2..92a7e7c7b6 100644
--- a/src/examples/edje/edje-multiseat-filter.c
+++ b/src/examples/edje/edje-multiseat-filter.c
@@ -108,7 +108,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
108 efl_canvas_object_seat_focus_add(edje_obj, dev); 108 efl_canvas_object_seat_focus_add(edje_obj, dev);
109 109
110 } 110 }
111 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 111 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
112 _device_added, edje_obj); 112 _device_added, edje_obj);
113 113
114 ecore_evas_show(ee); 114 ecore_evas_show(ee);
diff --git a/src/examples/edje/edje-multiseat.c b/src/examples/edje/edje-multiseat.c
index a6cd6c0e72..18abfec743 100644
--- a/src/examples/edje/edje-multiseat.c
+++ b/src/examples/edje/edje-multiseat.c
@@ -255,7 +255,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
255 efl_canvas_object_seat_focus_add(edje_obj, dev); 255 efl_canvas_object_seat_focus_add(edje_obj, dev);
256 256
257 } 257 }
258 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 258 efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
259 _device_added, edje_obj); 259 _device_added, edje_obj);
260 evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN, 260 evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN,
261 _on_key_down, evas); 261 _on_key_down, evas);
diff --git a/src/examples/evas/evas-event-filter.c b/src/examples/evas/evas-event-filter.c
index 530aba9b5a..dc25750871 100644
--- a/src/examples/evas/evas-event-filter.c
+++ b/src/examples/evas/evas-event-filter.c
@@ -165,7 +165,7 @@ _device_added_removed_cb(void *data, const Efl_Event *event)
165 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT) 165 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
166 return; 166 return;
167 167
168 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED) 168 if (event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED)
169 { 169 {
170 if (ctx->allowed_seat) 170 if (ctx->allowed_seat)
171 efl_input_seat_event_filter_set(ctx->filtered_obj, 171 efl_input_seat_event_filter_set(ctx->filtered_obj,
@@ -180,8 +180,8 @@ _device_added_removed_cb(void *data, const Efl_Event *event)
180} 180}
181 181
182EFL_CALLBACKS_ARRAY_DEFINE(_device_callbacks, 182EFL_CALLBACKS_ARRAY_DEFINE(_device_callbacks,
183 { EFL_CANVAS_EVENT_DEVICE_ADDED, _device_added_removed_cb }, 183 { EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, _device_added_removed_cb },
184 { EFL_CANVAS_EVENT_DEVICE_REMOVED, _device_added_removed_cb }); 184 { EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, _device_added_removed_cb });
185 185
186EFL_CALLBACKS_ARRAY_DEFINE(_obj_callbacks, 186EFL_CALLBACKS_ARRAY_DEFINE(_obj_callbacks,
187 { EFL_EVENT_FOCUS_IN, _obj_events_cb }, 187 { EFL_EVENT_FOCUS_IN, _obj_events_cb },
diff --git a/src/examples/evas/evas-multiseat-events.c b/src/examples/evas/evas-multiseat-events.c
index c0659f06ff..bc99bd3246 100644
--- a/src/examples/evas/evas-multiseat-events.c
+++ b/src/examples/evas/evas-multiseat-events.c
@@ -212,15 +212,15 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
212 printf("The seat '%s' - description: '%s' was '%s'\n", 212 printf("The seat '%s' - description: '%s' was '%s'\n",
213 efl_name_get(dev), 213 efl_name_get(dev),
214 efl_comment_get(dev), 214 efl_comment_get(dev),
215 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed"); 215 event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed");
216} 216}
217 217
218EFL_CALLBACKS_ARRAY_DEFINE(canvas_callbacks, 218EFL_CALLBACKS_ARRAY_DEFINE(canvas_callbacks,
219 { EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, 219 { EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
220 _canvas_focus_in_cb }, 220 _canvas_focus_in_cb },
221 { EFL_CANVAS_EVENT_DEVICE_ADDED, 221 { EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
222 _dev_added_or_removed }, 222 _dev_added_or_removed },
223 { EFL_CANVAS_EVENT_DEVICE_REMOVED, 223 { EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
224 _dev_added_or_removed }); 224 _dev_added_or_removed });
225 225
226EFL_CALLBACKS_ARRAY_DEFINE(callbacks, 226EFL_CALLBACKS_ARRAY_DEFINE(callbacks,
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 915945c7e4..1866d48676 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -372,7 +372,7 @@ _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
372{ 372{
373 Ecore_Evas *ee = data; 373 Ecore_Evas *ee = data;
374 374
375 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED) 375 if (event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED)
376 { 376 {
377 if (_is_pointer(event->info)) 377 if (_is_pointer(event->info))
378 _ecore_evas_cursor_add(ee, event->info); 378 _ecore_evas_cursor_add(ee, event->info);
@@ -402,8 +402,8 @@ _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
402} 402}
403 403
404EFL_CALLBACKS_ARRAY_DEFINE(_ecore_evas_device_cbs, 404EFL_CALLBACKS_ARRAY_DEFINE(_ecore_evas_device_cbs,
405 { EFL_CANVAS_EVENT_DEVICE_ADDED, _ecore_evas_dev_added_or_removed }, 405 { EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, _ecore_evas_dev_added_or_removed },
406 { EFL_CANVAS_EVENT_DEVICE_REMOVED, _ecore_evas_dev_added_or_removed }); 406 { EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, _ecore_evas_dev_added_or_removed });
407Eina_Bool 407Eina_Bool
408_ecore_evas_cursors_init(Ecore_Evas *ee) 408_ecore_evas_cursors_init(Ecore_Evas *ee)
409{ 409{
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 26c599020b..a4c35ceaa5 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -2875,9 +2875,9 @@ _edje_entry_init(Edje *ed)
2875 _edje_key_down_cb, ed); 2875 _edje_key_down_cb, ed);
2876 evas_object_event_callback_add(ed->obj, EVAS_CALLBACK_KEY_UP, 2876 evas_object_event_callback_add(ed->obj, EVAS_CALLBACK_KEY_UP,
2877 _edje_key_up_cb, ed); 2877 _edje_key_up_cb, ed);
2878 efl_event_callback_add(ed->base.evas, EFL_CANVAS_EVENT_FOCUS_IN, 2878 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
2879 _evas_focus_in_cb, ed); 2879 _evas_focus_in_cb, ed);
2880 efl_event_callback_add(ed->base.evas, EFL_CANVAS_EVENT_FOCUS_OUT, 2880 efl_event_callback_add(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
2881 _evas_focus_out_cb, ed); 2881 _evas_focus_out_cb, ed);
2882} 2882}
2883 2883
@@ -2896,9 +2896,9 @@ _edje_entry_shutdown(Edje *ed)
2896 _edje_key_down_cb); 2896 _edje_key_down_cb);
2897 evas_object_event_callback_del(ed->obj, EVAS_CALLBACK_KEY_UP, 2897 evas_object_event_callback_del(ed->obj, EVAS_CALLBACK_KEY_UP,
2898 _edje_key_up_cb); 2898 _edje_key_up_cb);
2899 efl_event_callback_del(ed->base.evas, EFL_CANVAS_EVENT_FOCUS_IN, 2899 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
2900 _evas_focus_in_cb, ed); 2900 _evas_focus_in_cb, ed);
2901 efl_event_callback_del(ed->base.evas, EFL_CANVAS_EVENT_FOCUS_OUT, 2901 efl_event_callback_del(ed->base.evas, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
2902 _evas_focus_out_cb, ed); 2902 _evas_focus_out_cb, ed);
2903} 2903}
2904 2904
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 88f1664be2..230c556af2 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -727,13 +727,13 @@ static void
727_edje_device_canvas_del(void *data, const Efl_Event *event) 727_edje_device_canvas_del(void *data, const Efl_Event *event)
728{ 728{
729 Edje *ed = data; 729 Edje *ed = data;
730 efl_event_callback_del(event->object, EFL_CANVAS_EVENT_DEVICE_ADDED, 730 efl_event_callback_del(event->object, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
731 _edje_device_added_cb, ed); 731 _edje_device_added_cb, ed);
732 efl_event_callback_del(event->object, EFL_CANVAS_EVENT_DEVICE_REMOVED, 732 efl_event_callback_del(event->object, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
733 _edje_device_removed_cb, ed); 733 _edje_device_removed_cb, ed);
734 734
735 if (ed->collection && ed->collection->use_custom_seat_names) 735 if (ed->collection && ed->collection->use_custom_seat_names)
736 efl_event_callback_del(event->object, EFL_CANVAS_EVENT_DEVICE_CHANGED, 736 efl_event_callback_del(event->object, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
737 _edje_device_changed_cb, ed); 737 _edje_device_changed_cb, ed);
738} 738}
739 739
@@ -751,13 +751,13 @@ _edje_devices_add(Edje *ed, Evas *tev)
751 } 751 }
752 efl_event_callback_add(tev, EFL_EVENT_DEL, _edje_device_canvas_del, ed); 752 efl_event_callback_add(tev, EFL_EVENT_DEL, _edje_device_canvas_del, ed);
753 753
754 efl_event_callback_add(tev, EFL_CANVAS_EVENT_DEVICE_ADDED, 754 efl_event_callback_add(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
755 _edje_device_added_cb, ed); 755 _edje_device_added_cb, ed);
756 efl_event_callback_add(tev, EFL_CANVAS_EVENT_DEVICE_REMOVED, 756 efl_event_callback_add(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
757 _edje_device_removed_cb, ed); 757 _edje_device_removed_cb, ed);
758 758
759 if (ed->collection && ed->collection->use_custom_seat_names) 759 if (ed->collection && ed->collection->use_custom_seat_names)
760 efl_event_callback_add(tev, EFL_CANVAS_EVENT_DEVICE_CHANGED, 760 efl_event_callback_add(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
761 _edje_device_changed_cb, ed); 761 _edje_device_changed_cb, ed);
762} 762}
763 763
@@ -1857,12 +1857,12 @@ _edje_file_callbacks_del(Edje *ed, Evas *e)
1857 1857
1858 if (!tev) tev = evas_object_evas_get(ed->obj); 1858 if (!tev) tev = evas_object_evas_get(ed->obj);
1859 efl_event_callback_del(tev, EFL_EVENT_DEL, _edje_device_canvas_del, ed); 1859 efl_event_callback_del(tev, EFL_EVENT_DEL, _edje_device_canvas_del, ed);
1860 efl_event_callback_del(tev, EFL_CANVAS_EVENT_DEVICE_ADDED, 1860 efl_event_callback_del(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
1861 _edje_device_added_cb, ed); 1861 _edje_device_added_cb, ed);
1862 efl_event_callback_del(tev, EFL_CANVAS_EVENT_DEVICE_REMOVED, 1862 efl_event_callback_del(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
1863 _edje_device_removed_cb, ed); 1863 _edje_device_removed_cb, ed);
1864 if (ed->collection && ed->collection->use_custom_seat_names) 1864 if (ed->collection && ed->collection->use_custom_seat_names)
1865 efl_event_callback_del(tev, EFL_CANVAS_EVENT_DEVICE_CHANGED, 1865 efl_event_callback_del(tev, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
1866 _edje_device_changed_cb, ed); 1866 _edje_device_changed_cb, ed);
1867} 1867}
1868 1868
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index b428d459fd..8b0c18b7fc 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -128,7 +128,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
128#include "interfaces/efl_input_device.eo.h" 128#include "interfaces/efl_input_device.eo.h"
129 129
130/* Canvas & UI */ 130/* Canvas & UI */
131#include "interfaces/efl_canvas.eo.h" 131#include "interfaces/efl_canvas_scene.eo.h"
132#include "interfaces/efl_canvas_pointer.eo.h" 132#include "interfaces/efl_canvas_pointer.eo.h"
133#include "interfaces/efl_ui_view.eo.h" 133#include "interfaces/efl_ui_view.eo.h"
134#include "interfaces/efl_ui_model_connect.eo.h" 134#include "interfaces/efl_ui_model_connect.eo.h"
diff --git a/src/lib/efl/interfaces/efl_canvas.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo
index c7657e9db2..ccba22c030 100644
--- a/src/lib/efl/interfaces/efl_canvas.eo
+++ b/src/lib/efl/interfaces/efl_canvas_scene.eo
@@ -1,6 +1,6 @@
1import efl_input_device; 1import efl_input_device;
2 2
3interface Efl.Canvas () 3interface Efl.Canvas.Scene ()
4{ 4{
5 [[Common interface for window and some internal classes in EFL.]] 5 [[Common interface for window and some internal classes in EFL.]]
6 methods { 6 methods {
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/efl/interfaces/efl_input_device.c
index a347e09db9..aed03c9980 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/efl/interfaces/efl_input_device.c
@@ -80,7 +80,7 @@ _efl_input_device_efl_object_parent_set(Eo *obj, Efl_Input_Device_Data *pd EINA_
80 _seat_pointers_update(p, pd); 80 _seat_pointers_update(p, pd);
81 } 81 }
82 } 82 }
83 else if(!efl_isa(parent, EFL_CANVAS_INTERFACE)) 83 else if(!efl_isa(parent, EFL_CANVAS_SCENE_INTERFACE))
84 { 84 {
85 EINA_SAFETY_ERROR("The parent of a device must be a seat or the canvas"); 85 EINA_SAFETY_ERROR("The parent of a device must be a seat or the canvas");
86 return; 86 return;
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index a9a663e60b..e3a26f8c49 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -2,7 +2,7 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#define EFL_CANVAS_BETA 5#define EFL_CANVAS_SCENE_BETA
6#define EFL_UI_SCROLLBAR_PROTECTED 6#define EFL_UI_SCROLLBAR_PROTECTED
7#define EFL_UI_SCROLLBAR_BETA 7#define EFL_UI_SCROLLBAR_BETA
8 8
@@ -43,7 +43,7 @@
43#include "interfaces/efl_gfx_blur.eo.c" 43#include "interfaces/efl_gfx_blur.eo.c"
44 44
45#include "interfaces/efl_gfx_size_hint.eo.c" 45#include "interfaces/efl_gfx_size_hint.eo.c"
46#include "interfaces/efl_canvas.eo.c" 46#include "interfaces/efl_canvas_scene.eo.c"
47#include "interfaces/efl_canvas_pointer.eo.c" 47#include "interfaces/efl_canvas_pointer.eo.c"
48 48
49#include "interfaces/efl_screen.eo.c" 49#include "interfaces/efl_screen.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_base.eo b/src/lib/efl/interfaces/efl_ui_base.eo
index 7ce917d660..646b31be99 100644
--- a/src/lib/efl/interfaces/efl_ui_base.eo
+++ b/src/lib/efl/interfaces/efl_ui_base.eo
@@ -21,7 +21,7 @@ interface Efl.Ui.Base
21 to set the value of @.mirrored. 21 to set the value of @.mirrored.
22 22
23 This property may be implemented by high-level widgets (in Efl.Ui) 23 This property may be implemented by high-level widgets (in Efl.Ui)
24 but not by low-level widgets (in @Efl.Canvas) as the configuration 24 but not by low-level widgets (in @Efl.Canvas.Scene) as the configuration
25 should affect only high-level widgets. 25 should affect only high-level widgets.
26 ]] 26 ]]
27 values { 27 values {
diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c
index a6c51b07b9..0da7d8c374 100644
--- a/src/lib/efl_wl/efl_wl.c
+++ b/src/lib/efl_wl/efl_wl.c
@@ -5285,8 +5285,8 @@ comp_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_in
5285} 5285}
5286 5286
5287EFL_CALLBACKS_ARRAY_DEFINE(comp_device_cbs, 5287EFL_CALLBACKS_ARRAY_DEFINE(comp_device_cbs,
5288 { EFL_CANVAS_EVENT_DEVICE_ADDED, comp_device_add }, 5288 { EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, comp_device_add },
5289 { EFL_CANVAS_EVENT_DEVICE_REMOVED, comp_device_del }); 5289 { EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, comp_device_del });
5290 5290
5291static void 5291static void
5292hints_set_aspect(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t width, uint32_t height, uint32_t aspect) 5292hints_set_aspect(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, uint32_t width, uint32_t height, uint32_t aspect)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index d5f3518dbf..d8504a8563 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -13,7 +13,7 @@
13#define EFL_UI_WIN_INLINED_PROTECTED 13#define EFL_UI_WIN_INLINED_PROTECTED
14#define EFL_UI_FOCUS_OBJECT_PROTECTED 14#define EFL_UI_FOCUS_OBJECT_PROTECTED
15#define EFL_UI_WIN_BETA 15#define EFL_UI_WIN_BETA
16#define EFL_CANVAS_BETA 16#define EFL_CANVAS_SCENE_BETA
17 17
18#include <Elementary.h> 18#include <Elementary.h>
19#include <Elementary_Cursor.h> 19#include <Elementary_Cursor.h>
@@ -1792,7 +1792,7 @@ _elm_win_evas_render_post(void *data,
1792 Efl_Gfx_Event_Render_Post *ev = event_info; 1792 Efl_Gfx_Event_Render_Post *ev = event_info;
1793 Eo *win = data; 1793 Eo *win = data;
1794 1794
1795 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev); 1795 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_RENDER_POST, ev);
1796} 1796}
1797 1797
1798static void 1798static void
@@ -1803,7 +1803,7 @@ _elm_win_evas_render_pre(void *data,
1803 Eo *win = data; 1803 Eo *win = data;
1804 1804
1805 _elm_win_throttle_ok = EINA_TRUE; 1805 _elm_win_throttle_ok = EINA_TRUE;
1806 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL); 1806 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_RENDER_PRE, NULL);
1807} 1807}
1808 1808
1809static void 1809static void
@@ -1814,7 +1814,7 @@ _elm_win_evas_focus_in(void *data,
1814 Eo *win = data; 1814 Eo *win = data;
1815 1815
1816 _elm_win_throttle_ok = EINA_TRUE; 1816 _elm_win_throttle_ok = EINA_TRUE;
1817 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL); 1817 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_IN, NULL);
1818} 1818}
1819 1819
1820static void 1820static void
@@ -1824,7 +1824,7 @@ _elm_win_evas_focus_out(void *data,
1824{ 1824{
1825 Eo *win = data; 1825 Eo *win = data;
1826 1826
1827 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL); 1827 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_FOCUS_OUT, NULL);
1828} 1828}
1829 1829
1830static void 1830static void
@@ -1836,7 +1836,7 @@ _elm_win_evas_object_focus_in(void *data,
1836 Eo *win = data; 1836 Eo *win = data;
1837 1837
1838 _elm_win_throttle_ok = EINA_TRUE; 1838 _elm_win_throttle_ok = EINA_TRUE;
1839 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object); 1839 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN, object);
1840} 1840}
1841 1841
1842static void 1842static void
@@ -1847,7 +1847,7 @@ _elm_win_evas_object_focus_out(void *data,
1847 Eo *object = event_info; 1847 Eo *object = event_info;
1848 Eo *win = data; 1848 Eo *win = data;
1849 1849
1850 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object); 1850 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT, object);
1851} 1851}
1852 1852
1853static void 1853static void
@@ -1858,7 +1858,7 @@ _elm_win_evas_device_changed(void *data,
1858 Eo *device = event_info; 1858 Eo *device = event_info;
1859 Eo *win = data; 1859 Eo *win = data;
1860 1860
1861 efl_event_callback_legacy_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device); 1861 efl_event_callback_legacy_call(win, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED, device);
1862} 1862}
1863 1863
1864static void 1864static void
@@ -1947,43 +1947,43 @@ _win_event_add_cb(void *data, const Efl_Event *ev)
1947 efl_event_callback_add(sd->evas, array[i].desc, 1947 efl_event_callback_add(sd->evas, array[i].desc,
1948 _evas_event_key_cb, win); 1948 _evas_event_key_cb, win);
1949 } 1949 }
1950 else if (array[i].desc == EFL_CANVAS_EVENT_RENDER_POST) 1950 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_RENDER_POST)
1951 { 1951 {
1952 if (!(sd->event_forward.render_post++)) 1952 if (!(sd->event_forward.render_post++))
1953 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST, 1953 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST,
1954 _elm_win_evas_render_post, win); 1954 _elm_win_evas_render_post, win);
1955 } 1955 }
1956 else if (array[i].desc == EFL_CANVAS_EVENT_RENDER_PRE) 1956 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_RENDER_PRE)
1957 { 1957 {
1958 if (!(sd->event_forward.render_pre++)) 1958 if (!(sd->event_forward.render_pre++))
1959 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, 1959 evas_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE,
1960 _elm_win_evas_render_pre, win); 1960 _elm_win_evas_render_pre, win);
1961 } 1961 }
1962 else if (array[i].desc == EFL_CANVAS_EVENT_FOCUS_IN) 1962 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN)
1963 { 1963 {
1964 if (!(sd->event_forward.focus_in++)) 1964 if (!(sd->event_forward.focus_in++))
1965 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN, 1965 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN,
1966 _elm_win_evas_focus_in, win); 1966 _elm_win_evas_focus_in, win);
1967 } 1967 }
1968 else if (array[i].desc == EFL_CANVAS_EVENT_FOCUS_OUT) 1968 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT)
1969 { 1969 {
1970 if (!(sd->event_forward.focus_out++)) 1970 if (!(sd->event_forward.focus_out++))
1971 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 1971 evas_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
1972 _elm_win_evas_focus_out, win); 1972 _elm_win_evas_focus_out, win);
1973 } 1973 }
1974 else if (array[i].desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_IN) 1974 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN)
1975 { 1975 {
1976 if (!(sd->event_forward.object_focus_in++)) 1976 if (!(sd->event_forward.object_focus_in++))
1977 evas_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, 1977 evas_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
1978 _elm_win_evas_object_focus_in, win); 1978 _elm_win_evas_object_focus_in, win);
1979 } 1979 }
1980 else if (array[i].desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT) 1980 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT)
1981 { 1981 {
1982 if (!(sd->event_forward.object_focus_out++)) 1982 if (!(sd->event_forward.object_focus_out++))
1983 evas_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 1983 evas_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
1984 _elm_win_evas_object_focus_out, win); 1984 _elm_win_evas_object_focus_out, win);
1985 } 1985 }
1986 else if (array[i].desc == EFL_CANVAS_EVENT_DEVICE_CHANGED) 1986 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED)
1987 { 1987 {
1988 if (!(sd->event_forward.device_changed++)) 1988 if (!(sd->event_forward.device_changed++))
1989 evas_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED, 1989 evas_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED,
@@ -2078,43 +2078,43 @@ _win_event_del_cb(void *data, const Efl_Event *ev)
2078 efl_event_callback_del(sd->evas, array[i].desc, 2078 efl_event_callback_del(sd->evas, array[i].desc,
2079 _evas_event_key_cb, win); 2079 _evas_event_key_cb, win);
2080 } 2080 }
2081 else if (array[i].desc == EFL_CANVAS_EVENT_RENDER_POST) 2081 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_RENDER_POST)
2082 { 2082 {
2083 if (!(--sd->event_forward.render_post)) 2083 if (!(--sd->event_forward.render_post))
2084 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_POST, 2084 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_POST,
2085 _elm_win_evas_render_post, win); 2085 _elm_win_evas_render_post, win);
2086 } 2086 }
2087 else if (array[i].desc == EFL_CANVAS_EVENT_RENDER_PRE) 2087 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_RENDER_PRE)
2088 { 2088 {
2089 if (!(--sd->event_forward.render_pre)) 2089 if (!(--sd->event_forward.render_pre))
2090 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE, 2090 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_RENDER_PRE,
2091 _elm_win_evas_render_pre, win); 2091 _elm_win_evas_render_pre, win);
2092 } 2092 }
2093 else if (array[i].desc == EFL_CANVAS_EVENT_FOCUS_IN) 2093 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_IN)
2094 { 2094 {
2095 if (!(--sd->event_forward.focus_in)) 2095 if (!(--sd->event_forward.focus_in))
2096 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_IN, 2096 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_IN,
2097 _elm_win_evas_focus_in, win); 2097 _elm_win_evas_focus_in, win);
2098 } 2098 }
2099 else if (array[i].desc == EFL_CANVAS_EVENT_FOCUS_OUT) 2099 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_FOCUS_OUT)
2100 { 2100 {
2101 if (!(--sd->event_forward.focus_out)) 2101 if (!(--sd->event_forward.focus_out))
2102 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 2102 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
2103 _elm_win_evas_focus_out, win); 2103 _elm_win_evas_focus_out, win);
2104 } 2104 }
2105 else if (array[i].desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_IN) 2105 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN)
2106 { 2106 {
2107 if (!(--sd->event_forward.object_focus_in)) 2107 if (!(--sd->event_forward.object_focus_in))
2108 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, 2108 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
2109 _elm_win_evas_object_focus_in, win); 2109 _elm_win_evas_object_focus_in, win);
2110 } 2110 }
2111 else if (array[i].desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT) 2111 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT)
2112 { 2112 {
2113 if (!(--sd->event_forward.object_focus_out)) 2113 if (!(--sd->event_forward.object_focus_out))
2114 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 2114 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
2115 _elm_win_evas_object_focus_out, win); 2115 _elm_win_evas_object_focus_out, win);
2116 } 2116 }
2117 else if (array[i].desc == EFL_CANVAS_EVENT_DEVICE_CHANGED) 2117 else if (array[i].desc == EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED)
2118 { 2118 {
2119 if (!(--sd->event_forward.device_changed)) 2119 if (!(--sd->event_forward.device_changed))
2120 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED, 2120 evas_event_callback_del_full(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED,
@@ -2172,7 +2172,7 @@ _elm_win_resume(void *data, const Efl_Event *ev)
2172 2172
2173EFL_CALLBACKS_ARRAY_DEFINE(_elm_evas_tracking, 2173EFL_CALLBACKS_ARRAY_DEFINE(_elm_evas_tracking,
2174 { EFL_EVENT_POINTER_UP, _elm_win_cb_mouse_up }, 2174 { EFL_EVENT_POINTER_UP, _elm_win_cb_mouse_up },
2175 { EFL_CANVAS_EVENT_RENDER_PRE, _elm_win_resume }) 2175 { EFL_CANVAS_SCENE_EVENT_RENDER_PRE, _elm_win_resume })
2176 2176
2177static void 2177static void
2178_deferred_ecore_evas_free(void *data) 2178_deferred_ecore_evas_free(void *data)
@@ -2346,7 +2346,7 @@ _efl_ui_win_efl_gfx_visible_set(Eo *obj, Efl_Ui_Win_Data *sd, Eina_Bool vis)
2346} 2346}
2347 2347
2348EOLIAN static Eina_Position2D 2348EOLIAN static Eina_Position2D
2349_efl_ui_win_efl_canvas_pointer_position_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 2349_efl_ui_win_efl_canvas_scene_pointer_position_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
2350{ 2350{
2351 Eina_Position2D pos; 2351 Eina_Position2D pos;
2352 evas_pointer_canvas_xy_get(sd->evas, &pos.x, &pos.y); 2352 evas_pointer_canvas_xy_get(sd->evas, &pos.x, &pos.y);
@@ -2390,7 +2390,7 @@ _input_pointer_iterator_free(Input_Pointer_Iterator *it)
2390} 2390}
2391 2391
2392EOLIAN static Eina_Iterator * 2392EOLIAN static Eina_Iterator *
2393_efl_ui_win_efl_canvas_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd, 2393_efl_ui_win_efl_canvas_scene_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd,
2394 Eina_Bool hover EINA_UNUSED) 2394 Eina_Bool hover EINA_UNUSED)
2395{ 2395{
2396 Input_Pointer_Iterator *it; 2396 Input_Pointer_Iterator *it;
@@ -2458,19 +2458,19 @@ _efl_ui_win_efl_canvas_pointer_iterate(const Eo *obj, Efl_Ui_Win_Data *sd,
2458} 2458}
2459 2459
2460EOLIAN static Eina_Bool 2460EOLIAN static Eina_Bool
2461_efl_ui_win_efl_canvas_image_max_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D *max) 2461_efl_ui_win_efl_canvas_scene_image_max_size_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Size2D *max)
2462{ 2462{
2463 return efl_canvas_image_max_size_get(sd->evas, max); 2463 return efl_canvas_scene_image_max_size_get(sd->evas, max);
2464} 2464}
2465 2465
2466EOLIAN static void 2466EOLIAN static void
2467_efl_ui_win_efl_canvas_smart_objects_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) 2467_efl_ui_win_efl_canvas_scene_smart_objects_calculate(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
2468{ 2468{
2469 evas_smart_objects_calculate(sd->evas); 2469 evas_smart_objects_calculate(sd->evas);
2470} 2470}
2471 2471
2472EOLIAN static Eina_Iterator * 2472EOLIAN static Eina_Iterator *
2473_efl_ui_win_efl_canvas_objects_at_xy_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2473_efl_ui_win_efl_canvas_scene_objects_at_xy_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2474{ 2474{
2475 Eina_List *objs = NULL; 2475 Eina_List *objs = NULL;
2476 objs = evas_objects_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects); 2476 objs = evas_objects_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
@@ -2478,13 +2478,13 @@ _efl_ui_win_efl_canvas_objects_at_xy_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *s
2478} 2478}
2479 2479
2480EOLIAN static Efl_Gfx * 2480EOLIAN static Efl_Gfx *
2481_efl_ui_win_efl_canvas_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2481_efl_ui_win_efl_canvas_scene_object_top_at_xy_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2482{ 2482{
2483 return evas_object_top_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects); 2483 return evas_object_top_at_xy_get(sd->evas, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
2484} 2484}
2485 2485
2486EOLIAN static Eina_Iterator * 2486EOLIAN static Eina_Iterator *
2487_efl_ui_win_efl_canvas_objects_in_rectangle_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2487_efl_ui_win_efl_canvas_scene_objects_in_rectangle_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2488{ 2488{
2489 Eina_List *objs = NULL; 2489 Eina_List *objs = NULL;
2490 objs = evas_objects_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects); 2490 objs = evas_objects_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects);
@@ -2492,21 +2492,21 @@ _efl_ui_win_efl_canvas_objects_in_rectangle_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_
2492} 2492}
2493 2493
2494EOLIAN static Efl_Gfx * 2494EOLIAN static Efl_Gfx *
2495_efl_ui_win_efl_canvas_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 2495_efl_ui_win_efl_canvas_scene_object_top_in_rectangle_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Rect r, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
2496{ 2496{
2497 return evas_object_top_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects); 2497 return evas_object_top_in_rectangle_get(sd->evas, r.x, r.y, r.w, r.h, include_pass_events_objects, include_hidden_objects);
2498} 2498}
2499 2499
2500EOLIAN static Efl_Input_Device * 2500EOLIAN static Efl_Input_Device *
2501_efl_ui_win_efl_canvas_device_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *name) 2501_efl_ui_win_efl_canvas_scene_device_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *name)
2502{ 2502{
2503 return efl_canvas_device_get(sd->evas, name); 2503 return efl_canvas_scene_device_get(sd->evas, name);
2504} 2504}
2505 2505
2506EOLIAN static Efl_Input_Device * 2506EOLIAN static Efl_Input_Device *
2507_efl_ui_win_efl_canvas_seat_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int id) 2507_efl_ui_win_efl_canvas_scene_seat_get(const Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, int id)
2508{ 2508{
2509 return efl_canvas_seat_get(sd->evas, id); 2509 return efl_canvas_scene_seat_get(sd->evas, id);
2510} 2510}
2511 2511
2512static void 2512static void
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 0101b54b82..53601f1b9e 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -154,7 +154,7 @@ enum Efl.Ui.Win.Move_Resize_Mode
154 right = (1 << 4) [[Start resizing window to the right]] 154 right = (1 << 4) [[Start resizing window to the right]]
155} 155}
156 156
157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Window, 157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Access.Window,
158 Efl.Access.Component, Efl.Access.Widget.Action, 158 Efl.Access.Component, Efl.Access.Widget.Action,
159 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 159 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
160 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, 160 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part,
@@ -803,18 +803,18 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas, Efl.Canvas.Pointer, Efl.Access.Wind
803 Efl.Gfx.Size.Hint.hint_weight { set; } 803 Efl.Gfx.Size.Hint.hint_weight { set; }
804 Efl.Gfx.Size.Hint.hint_max { set; } 804 Efl.Gfx.Size.Hint.hint_max { set; }
805 Efl.Text.text { get; set; } 805 Efl.Text.text { get; set; }
806 Efl.Canvas.pointer_position { get; } 806 Efl.Canvas.Scene.pointer_position { get; }
807 Efl.Canvas.Pointer.pointer_inside { get; } 807 Efl.Canvas.Pointer.pointer_inside { get; }
808 Efl.Canvas.pointer_iterate; 808 Efl.Canvas.Scene.pointer_iterate;
809 Efl.Canvas.image_max_size { get; } 809 Efl.Canvas.Scene.image_max_size { get; }
810 Efl.Canvas.smart_objects_calculate; 810 Efl.Canvas.Scene.smart_objects_calculate;
811 Efl.Canvas.objects_at_xy_get; 811 Efl.Canvas.Scene.objects_at_xy_get;
812 Efl.Canvas.object_top_at_xy_get; 812 Efl.Canvas.Scene.object_top_at_xy_get;
813 Efl.Canvas.objects_in_rectangle_get; 813 Efl.Canvas.Scene.objects_in_rectangle_get;
814 Efl.Canvas.object_top_in_rectangle_get; 814 Efl.Canvas.Scene.object_top_in_rectangle_get;
815 //Efl.Canvas.seats; 815 //Efl.Canvas.seats;
816 Efl.Canvas.device { get; } 816 Efl.Canvas.Scene.device { get; }
817 Efl.Canvas.seat { get; } 817 Efl.Canvas.Scene.seat { get; }
818 Efl.Content.content { get; set; } 818 Efl.Content.content { get; set; }
819 Efl.Content.content_unset; 819 Efl.Content.content_unset;
820 Efl.Part.part; 820 Efl.Part.part;
diff --git a/src/lib/evas/canvas/efl_canvas_vg.c b/src/lib/evas/canvas/efl_canvas_vg.c
index 92bf7c04fd..6662c53528 100644
--- a/src/lib/evas/canvas/efl_canvas_vg.c
+++ b/src/lib/evas/canvas/efl_canvas_vg.c
@@ -319,7 +319,7 @@ _efl_canvas_vg_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Vg_Data *pd)
319{ 319{
320 Evas *e = evas_object_evas_get(eo_obj); 320 Evas *e = evas_object_evas_get(eo_obj);
321 321
322 efl_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); 322 efl_event_callback_del(e, EFL_CANVAS_SCENE_EVENT_RENDER_POST, _cleanup_reference, pd);
323 323
324 efl_unref(pd->root); 324 efl_unref(pd->root);
325 pd->root = NULL; 325 pd->root = NULL;
@@ -355,7 +355,7 @@ _efl_canvas_vg_efl_object_finalize(Eo *obj, Efl_Canvas_Vg_Data *pd)
355 355
356 // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice 356 // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice
357 // to actually have one event per canvas and one array per canvas to. 357 // to actually have one event per canvas and one array per canvas to.
358 efl_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); 358 efl_event_callback_add(e, EFL_CANVAS_SCENE_EVENT_RENDER_POST, _cleanup_reference, pd);
359 359
360 return obj; 360 return obj;
361} 361}
diff --git a/src/lib/evas/canvas/efl_gfx_map.c b/src/lib/evas/canvas/efl_gfx_map.c
index 1d070921d0..58ddb9953f 100644
--- a/src/lib/evas/canvas/efl_gfx_map.c
+++ b/src/lib/evas/canvas/efl_gfx_map.c
@@ -742,7 +742,7 @@ _gfx_map_op_add(Eo *eo_obj, Efl_Gfx_Map_Data *pd, Gfx_Map_Op_Type type,
742 pivot->is_evas = EINA_TRUE; 742 pivot->is_evas = EINA_TRUE;
743 pivot->is_canvas = EINA_TRUE; 743 pivot->is_canvas = EINA_TRUE;
744 } 744 }
745 else if (efl_isa(eo_pivot, EFL_CANVAS_INTERFACE)) 745 else if (efl_isa(eo_pivot, EFL_CANVAS_SCENE_INTERFACE))
746 pivot->is_canvas = EINA_TRUE; 746 pivot->is_canvas = EINA_TRUE;
747 pivot->map_obj = obj; 747 pivot->map_obj = obj;
748 EINA_INLIST_APPEND(mcow->pivots, pivot); 748 EINA_INLIST_APPEND(mcow->pivots, pivot);
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 10f4597ad6..a94fba30d4 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -59,17 +59,17 @@ DEFINE_EVAS_CALLBACKS(_legacy_evas_callback_table, EVAS_CALLBACK_LAST,
59 EFL_EVENT_HOLD, 59 EFL_EVENT_HOLD,
60 EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 60 EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
61 EFL_IMAGE_EVENT_PRELOAD, 61 EFL_IMAGE_EVENT_PRELOAD,
62 EFL_CANVAS_EVENT_FOCUS_IN, 62 EFL_CANVAS_SCENE_EVENT_FOCUS_IN,
63 EFL_CANVAS_EVENT_FOCUS_OUT, 63 EFL_CANVAS_SCENE_EVENT_FOCUS_OUT,
64 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, 64 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
65 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST, 65 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
66 EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, 66 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
67 EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, 67 EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT,
68 EFL_IMAGE_EVENT_UNLOAD, 68 EFL_IMAGE_EVENT_UNLOAD,
69 EFL_CANVAS_EVENT_RENDER_PRE, 69 EFL_CANVAS_SCENE_EVENT_RENDER_PRE,
70 EFL_CANVAS_EVENT_RENDER_POST, 70 EFL_CANVAS_SCENE_EVENT_RENDER_POST,
71 EFL_IMAGE_EVENT_RESIZE, 71 EFL_IMAGE_EVENT_RESIZE,
72 EFL_CANVAS_EVENT_DEVICE_CHANGED, 72 EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
73 EFL_EVENT_POINTER_AXIS, 73 EFL_EVENT_POINTER_AXIS,
74 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE ); 74 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE );
75 75
@@ -209,8 +209,8 @@ _eo_evas_cb(void *data, const Efl_Event *event)
209 209
210 if (!info->func.evas_cb) return; 210 if (!info->func.evas_cb) return;
211 211
212 if (event->desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_IN || 212 if (event->desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN ||
213 event->desc == EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT) 213 event->desc == EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_OUT)
214 { 214 {
215 event_info = efl_input_focus_object_get(efl_event_info); 215 event_info = efl_input_focus_object_get(efl_event_info);
216 goto emit; 216 goto emit;
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 4afdade8d8..d11285a611 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,6 +1,6 @@
1import efl_input_types; 1import efl_input_types;
2 2
3class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface, 3class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface,
4 Efl.Loop.Consumer, Efl.Canvas.Pointer) 4 Efl.Loop.Consumer, Efl.Canvas.Pointer)
5{ 5{
6 [[Evas canvas class]] 6 [[Evas canvas class]]
@@ -990,14 +990,14 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
990 Efl.Loop.Consumer.loop { get; } 990 Efl.Loop.Consumer.loop { get; }
991 //Efl.Canvas.seats; 991 //Efl.Canvas.seats;
992 Efl.Canvas.Pointer.pointer_inside { get; } 992 Efl.Canvas.Pointer.pointer_inside { get; }
993 Efl.Canvas.device { get; } 993 Efl.Canvas.Scene.device { get; }
994 Efl.Canvas.seat { get; } 994 Efl.Canvas.Scene.seat { get; }
995 Efl.Canvas.image_max_size { get; } 995 Efl.Canvas.Scene.image_max_size { get; }
996 Efl.Canvas.objects_at_xy_get; 996 Efl.Canvas.Scene.objects_at_xy_get;
997 Efl.Canvas.object_top_at_xy_get; 997 Efl.Canvas.Scene.object_top_at_xy_get;
998 Efl.Canvas.objects_in_rectangle_get; 998 Efl.Canvas.Scene.objects_in_rectangle_get;
999 Efl.Canvas.object_top_in_rectangle_get; 999 Efl.Canvas.Scene.object_top_in_rectangle_get;
1000 Efl.Canvas.smart_objects_calculate; 1000 Efl.Canvas.Scene.smart_objects_calculate;
1001 Efl.Canvas.smart_objects_calculating { get; } 1001 Efl.Canvas.Scene.smart_objects_calculating { get; }
1002 } 1002 }
1003} 1003}
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 23eb01d08c..e67350deeb 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -111,12 +111,12 @@ _del_cb(void *data, const Efl_Event *ev)
111 _evas_pointer_data_remove(e, ev->object); 111 _evas_pointer_data_remove(e, ev->object);
112 eina_hash_del_by_key(e->locks.masks, &ev->object); 112 eina_hash_del_by_key(e->locks.masks, &ev->object);
113 eina_hash_del_by_key(e->modifiers.masks, &ev->object); 113 eina_hash_del_by_key(e->modifiers.masks, &ev->object);
114 efl_event_callback_call(e->evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, 114 efl_event_callback_call(e->evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
115 ev->object); 115 ev->object);
116} 116}
117 117
118EOLIAN Efl_Input_Device * 118EOLIAN Efl_Input_Device *
119_evas_canvas_efl_canvas_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name) 119_evas_canvas_efl_canvas_scene_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name)
120{ 120{
121 const char *dev_name; 121 const char *dev_name;
122 Evas_Device *dev; 122 Evas_Device *dev;
@@ -138,11 +138,11 @@ _evas_canvas_efl_canvas_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e,
138EAPI Evas_Device * 138EAPI Evas_Device *
139evas_device_get(Evas *eo_e, const char *name) 139evas_device_get(Evas *eo_e, const char *name)
140{ 140{
141 return efl_canvas_device_get(eo_e, name); 141 return efl_canvas_scene_device_get(eo_e, name);
142} 142}
143 143
144EOLIAN Efl_Input_Device * 144EOLIAN Efl_Input_Device *
145_evas_canvas_efl_canvas_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int id) 145_evas_canvas_efl_canvas_scene_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int id)
146{ 146{
147 Evas_Device *dev; 147 Evas_Device *dev;
148 Eina_List *l; 148 Eina_List *l;
@@ -162,7 +162,7 @@ _evas_canvas_efl_canvas_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, un
162EAPI Evas_Device * 162EAPI Evas_Device *
163evas_device_get_by_seat_id(Evas *eo_e, unsigned int id) 163evas_device_get_by_seat_id(Evas *eo_e, unsigned int id)
164{ 164{
165 return efl_canvas_seat_get(eo_e, id); 165 return efl_canvas_scene_seat_get(eo_e, id);
166} 166}
167 167
168EAPI Evas_Device * 168EAPI Evas_Device *
@@ -247,7 +247,7 @@ evas_device_add_full(Evas *eo_e, const char *name, const char *desc,
247 e->devices = eina_list_append(e->devices, dev); 247 e->devices = eina_list_append(e->devices, dev);
248 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e); 248 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
249 249
250 efl_event_callback_call(eo_e, EFL_CANVAS_EVENT_DEVICE_ADDED, dev); 250 efl_event_callback_call(eo_e, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, dev);
251 // Keeping this event to do not break things... 251 // Keeping this event to do not break things...
252 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); 252 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev);
253 if (e->pending_default_focus_obj && (e->default_seat == dev)) 253 if (e->pending_default_focus_obj && (e->default_seat == dev))
@@ -500,7 +500,7 @@ again:
500 */ 500 */
501 EINA_LIST_FREE(e->devices, dev) 501 EINA_LIST_FREE(e->devices, dev)
502 { 502 {
503 efl_event_callback_call(e->evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, dev); 503 efl_event_callback_call(e->evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, dev);
504 efl_event_callback_del(dev, EFL_EVENT_DEL, _del_cb, e); 504 efl_event_callback_del(dev, EFL_EVENT_DEL, _del_cb, e);
505 } 505 }
506} 506}
diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c
index ace876cb0b..be5b2ad1cb 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -1220,7 +1220,7 @@ evas_image_max_size_get(Eo *eo_e, int *w, int *h)
1220 Eina_Size2D size; 1220 Eina_Size2D size;
1221 Eina_Bool ret; 1221 Eina_Bool ret;
1222 1222
1223 ret = efl_canvas_image_max_size_get(eo_e, &size); 1223 ret = efl_canvas_scene_image_max_size_get(eo_e, &size);
1224 if (ret) 1224 if (ret)
1225 { 1225 {
1226 if (w) *w = size.w; 1226 if (w) *w = size.w;
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 42e2c6c8e3..7b658aac90 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1055,7 +1055,7 @@ _evas_canvas_image_cache_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
1055} 1055}
1056 1056
1057EOLIAN static Eina_Bool 1057EOLIAN static Eina_Bool
1058_evas_canvas_efl_canvas_image_max_size_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Size2D *max) 1058_evas_canvas_efl_canvas_scene_image_max_size_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Size2D *max)
1059{ 1059{
1060 int w = 0, h = 0; 1060 int w = 0, h = 0;
1061 1061
@@ -1452,7 +1452,7 @@ efl_canvas_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *lis
1452} 1452}
1453 1453
1454EOLIAN static Evas_Object* 1454EOLIAN static Evas_Object*
1455_evas_canvas_efl_canvas_object_top_at_xy_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1455_evas_canvas_efl_canvas_scene_object_top_at_xy_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1456{ 1456{
1457 Evas_Layer *lay; 1457 Evas_Layer *lay;
1458 int xx, yy; 1458 int xx, yy;
@@ -1490,7 +1490,7 @@ EAPI Evas_Object*
1490evas_object_top_at_xy_get(Eo *eo_e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1490evas_object_top_at_xy_get(Eo *eo_e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1491{ 1491{
1492 Eina_Position2D pos = {x, y}; 1492 Eina_Position2D pos = {x, y};
1493 return efl_canvas_object_top_at_xy_get(eo_e, pos, include_pass_events_objects, include_hidden_objects); 1493 return efl_canvas_scene_object_top_at_xy_get(eo_e, pos, include_pass_events_objects, include_hidden_objects);
1494} 1494}
1495 1495
1496EAPI Evas_Object * 1496EAPI Evas_Object *
@@ -1502,11 +1502,11 @@ evas_object_top_at_pointer_get(const Evas *eo_e)
1502 1502
1503 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, NULL); 1503 Evas_Pointer_Data *pdata = _evas_pointer_data_by_device_get(e, NULL);
1504 EINA_SAFETY_ON_NULL_RETURN_VAL(pdata, NULL); 1504 EINA_SAFETY_ON_NULL_RETURN_VAL(pdata, NULL);
1505 return efl_canvas_object_top_at_xy_get((Eo *)eo_e, EINA_POSITION2D(pdata->seat->x, pdata->seat->y), EINA_TRUE, EINA_TRUE); 1505 return efl_canvas_scene_object_top_at_xy_get((Eo *)eo_e, EINA_POSITION2D(pdata->seat->x, pdata->seat->y), EINA_TRUE, EINA_TRUE);
1506} 1506}
1507 1507
1508EOLIAN Evas_Object* 1508EOLIAN Evas_Object*
1509_evas_canvas_efl_canvas_object_top_in_rectangle_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Rect rect, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1509_evas_canvas_efl_canvas_scene_object_top_in_rectangle_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Rect rect, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1510{ 1510{
1511 Evas_Layer *lay; 1511 Evas_Layer *lay;
1512 int xx, yy, ww, hh; 1512 int xx, yy, ww, hh;
@@ -1548,7 +1548,7 @@ _evas_canvas_efl_canvas_object_top_in_rectangle_get(const Eo *eo_e EINA_UNUSED,
1548EAPI Evas_Object * 1548EAPI Evas_Object *
1549evas_object_top_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1549evas_object_top_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1550{ 1550{
1551 return efl_canvas_object_top_in_rectangle_get(obj, EINA_RECT(x, y, w, h), include_pass_events_objects, include_hidden_objects); 1551 return efl_canvas_scene_object_top_in_rectangle_get(obj, EINA_RECT(x, y, w, h), include_pass_events_objects, include_hidden_objects);
1552} 1552}
1553 1553
1554static Eina_List * 1554static Eina_List *
@@ -1596,7 +1596,7 @@ _efl_canvas_evas_canvas_objects_at_xy_get_helper(Eo *eo_e EINA_UNUSED, Evas_Publ
1596} 1596}
1597 1597
1598EOLIAN static Eina_Iterator * 1598EOLIAN static Eina_Iterator *
1599_evas_canvas_efl_canvas_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1599_evas_canvas_efl_canvas_scene_objects_at_xy_get(Eo *eo_e, Evas_Public_Data *e, Eina_Position2D pos, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1600{ 1600{
1601 Eina_List *l = _efl_canvas_evas_canvas_objects_at_xy_get_helper(eo_e, e, pos.x, pos.y, include_pass_events_objects, include_hidden_objects); 1601 Eina_List *l = _efl_canvas_evas_canvas_objects_at_xy_get_helper(eo_e, e, pos.x, pos.y, include_pass_events_objects, include_hidden_objects);
1602 if (l) return efl_canvas_iterator_create(eo_e, eina_list_iterator_new(l), l); 1602 if (l) return efl_canvas_iterator_create(eo_e, eina_list_iterator_new(l), l);
@@ -1665,7 +1665,7 @@ _efl_canvas_objects_in_rectangle_get_helper(const Eo *eo_e EINA_UNUSED, Evas_Pub
1665 1665
1666 1666
1667EOLIAN static Eina_Iterator* 1667EOLIAN static Eina_Iterator*
1668_evas_canvas_efl_canvas_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Rect rect, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) 1668_evas_canvas_efl_canvas_scene_objects_in_rectangle_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Eina_Rect rect, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects)
1669{ 1669{
1670 Eina_List *l = _efl_canvas_objects_in_rectangle_get_helper(eo_e, e, rect.x, rect.y, rect.w, rect.h, include_pass_events_objects, include_hidden_objects); 1670 Eina_List *l = _efl_canvas_objects_in_rectangle_get_helper(eo_e, e, rect.x, rect.y, rect.w, rect.h, include_pass_events_objects, include_hidden_objects);
1671 if (!l) return NULL; 1671 if (!l) return NULL;
@@ -1812,7 +1812,7 @@ evas_font_available_list_free(Evas *eo_e, Eina_List *available)
1812 1812
1813 1813
1814EOLIAN static void 1814EOLIAN static void
1815_evas_canvas_efl_canvas_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED) 1815_evas_canvas_efl_canvas_scene_smart_objects_calculate(Eo *eo_e, Evas_Public_Data *o EINA_UNUSED)
1816{ 1816{
1817 evas_call_smarts_calculate(eo_e); 1817 evas_call_smarts_calculate(eo_e);
1818} 1818}
@@ -1824,7 +1824,7 @@ evas_smart_objects_calculate(Eo *eo_e)
1824} 1824}
1825 1825
1826EOLIAN Eina_Bool 1826EOLIAN Eina_Bool
1827_evas_canvas_efl_canvas_smart_objects_calculating_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) 1827_evas_canvas_efl_canvas_scene_smart_objects_calculating_get(const Eo *eo_e EINA_UNUSED, Evas_Public_Data *e)
1828{ 1828{
1829 return !!e->in_smart_calc; 1829 return !!e->in_smart_calc;
1830} 1830}
@@ -1832,7 +1832,7 @@ _evas_canvas_efl_canvas_smart_objects_calculating_get(const Eo *eo_e EINA_UNUSED
1832EAPI Eina_Bool 1832EAPI Eina_Bool
1833evas_smart_objects_calculating_get(const Eo *obj) 1833evas_smart_objects_calculating_get(const Eo *obj)
1834{ 1834{
1835 return efl_canvas_smart_objects_calculating_get(obj); 1835 return efl_canvas_scene_smart_objects_calculating_get(obj);
1836} 1836}
1837 1837
1838EOLIAN int 1838EOLIAN int
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 942927ab66..c7ef94a74e 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -5,7 +5,7 @@
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_BETA
6#define EFL_ACCESS_COMPONENT_BETA 6#define EFL_ACCESS_COMPONENT_BETA
7#define EFL_ACCESS_COMPONENT_PROTECTED 7#define EFL_ACCESS_COMPONENT_PROTECTED
8#define EFL_CANVAS_BETA 8#define EFL_CANVAS_SCENE_BETA
9 9
10#include <Elementary.h> 10#include <Elementary.h>
11#ifdef HAVE_ELEMENTARY_X 11#ifdef HAVE_ELEMENTARY_X
@@ -246,7 +246,7 @@ _inputs_timer2_cb(void *data)
246 size_t cnt = 0; 246 size_t cnt = 0;
247 int i = 0; 247 int i = 0;
248 248
249 it = efl_canvas_pointer_iterate(win, 0); 249 it = efl_canvas_scene_pointer_iterate(win, 0);
250 EINA_ITERATOR_FOREACH(it, ptr) 250 EINA_ITERATOR_FOREACH(it, ptr)
251 { 251 {
252 double x, y; 252 double x, y;
@@ -309,7 +309,7 @@ _inputs_timer3_cb(void *data)
309 size_t cnt = 0; 309 size_t cnt = 0;
310 int i = 0; 310 int i = 0;
311 311
312 it = efl_canvas_pointer_iterate(win, 0); 312 it = efl_canvas_scene_pointer_iterate(win, 0);
313 EINA_ITERATOR_FOREACH(it, ptr) 313 EINA_ITERATOR_FOREACH(it, ptr)
314 { 314 {
315 int tool, ok = 0; 315 int tool, ok = 0;
@@ -340,7 +340,7 @@ _inputs_timer3_cb(void *data)
340 fail_if(cnt != 2); // 2 moves (in the list), 2 ups (gone) 340 fail_if(cnt != 2); // 2 moves (in the list), 2 ups (gone)
341 341
342 fail_if(!efl_canvas_pointer_inside_get(win, NULL)); 342 fail_if(!efl_canvas_pointer_inside_get(win, NULL));
343 pos = efl_canvas_pointer_position_get(win); 343 pos = efl_canvas_scene_pointer_position_get(win);
344 ck_assert_int_eq(pos.x, points[1][0].x); 344 ck_assert_int_eq(pos.x, points[1][0].x);
345 ck_assert_int_eq(pos.y, points[1][0].y); 345 ck_assert_int_eq(pos.y, points[1][0].y);
346 346