summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Evas.am1
-rw-r--r--src/lib/elementary/efl_ui_win.c48
-rw-r--r--src/lib/elementary/efl_ui_win.eo10
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/efl_canvas.eo13
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c15
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo17
-rw-r--r--src/lib/evas/canvas/evas_filter_mixin.c6
-rw-r--r--src/lib/evas/canvas/evas_main.c3
-rw-r--r--src/lib/evas/canvas/evas_object_vg.c4
10 files changed, 62 insertions, 57 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 82ac21879b..f2ff0befc7 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -3,6 +3,7 @@
3 3
4evas_eolian_pub_files = \ 4evas_eolian_pub_files = \
5 lib/evas/canvas/evas_object.eo \ 5 lib/evas/canvas/evas_object.eo \
6 lib/evas/canvas/efl_canvas.eo \
6 lib/evas/canvas/efl_canvas_polygon.eo \ 7 lib/evas/canvas/efl_canvas_polygon.eo \
7 lib/evas/canvas/efl_canvas_rectangle.eo \ 8 lib/evas/canvas/efl_canvas_rectangle.eo \
8 lib/evas/canvas/evas_textblock.eo \ 9 lib/evas/canvas/evas_textblock.eo \
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 6178305aa3..b2d0b728cd 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -840,7 +840,7 @@ _elm_win_move(Ecore_Evas *ee)
840 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL); 840 ecore_evas_geometry_get(ee, &x, &y, NULL, NULL);
841 sd->screen.x = x; 841 sd->screen.x = x;
842 sd->screen.y = y; 842 sd->screen.y = y;
843 eo_event_callback_call(sd->obj, EFL_UI_WIN_EVENT_MOVED, NULL); 843 eo_event_callback_call(sd->obj, EFL_GFX_EVENT_MOVE, NULL);
844 evas_nochange_push(evas_object_evas_get(sd->obj)); 844 evas_nochange_push(evas_object_evas_get(sd->obj));
845 sd->response++; 845 sd->response++;
846 evas_object_move(sd->obj, x, y); 846 evas_object_move(sd->obj, x, y);
@@ -1751,7 +1751,7 @@ _elm_win_evas_render_post(void *data,
1751 Efl_Gfx_Event_Render_Post *ev = event_info; 1751 Efl_Gfx_Event_Render_Post *ev = event_info;
1752 Eo *win = data; 1752 Eo *win = data;
1753 1753
1754 eo_event_callback_call(win, EFL_UI_WIN_EVENT_RENDER_POST, ev); 1754 eo_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_POST, ev);
1755} 1755}
1756 1756
1757static void 1757static void
@@ -1762,7 +1762,7 @@ _elm_win_evas_render_pre(void *data,
1762{ 1762{
1763 Eo *win = data; 1763 Eo *win = data;
1764 1764
1765 eo_event_callback_call(win, EFL_UI_WIN_EVENT_RENDER_PRE, NULL); 1765 eo_event_callback_call(win, EFL_CANVAS_EVENT_RENDER_PRE, NULL);
1766} 1766}
1767 1767
1768static void 1768static void
@@ -1773,7 +1773,7 @@ _elm_win_evas_focus_in(void *data,
1773{ 1773{
1774 Eo *win = data; 1774 Eo *win = data;
1775 1775
1776 eo_event_callback_call(win, EFL_UI_WIN_EVENT_FOCUS_IN, NULL); 1776 eo_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_IN, NULL);
1777} 1777}
1778 1778
1779static void 1779static void
@@ -1784,7 +1784,7 @@ _elm_win_evas_focus_out(void *data,
1784{ 1784{
1785 Eo *win = data; 1785 Eo *win = data;
1786 1786
1787 eo_event_callback_call(win, EFL_UI_WIN_EVENT_FOCUS_OUT, NULL); 1787 eo_event_callback_call(win, EFL_CANVAS_EVENT_FOCUS_OUT, NULL);
1788} 1788}
1789 1789
1790static void 1790static void
@@ -1796,7 +1796,7 @@ _elm_win_evas_object_focus_in(void *data,
1796 Eo *object = event_info; 1796 Eo *object = event_info;
1797 Eo *win = data; 1797 Eo *win = data;
1798 1798
1799 eo_event_callback_call(win, EFL_UI_WIN_EVENT_OBJECT_FOCUS_IN, object); 1799 eo_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_IN, object);
1800} 1800}
1801 1801
1802static void 1802static void
@@ -1808,7 +1808,7 @@ _elm_win_evas_object_focus_out(void *data,
1808 Eo *object = event_info; 1808 Eo *object = event_info;
1809 Eo *win = data; 1809 Eo *win = data;
1810 1810
1811 eo_event_callback_call(win, EFL_UI_WIN_EVENT_OBJECT_FOCUS_OUT, object); 1811 eo_event_callback_call(win, EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT, object);
1812} 1812}
1813 1813
1814static void 1814static void
@@ -1820,7 +1820,7 @@ _elm_win_evas_device_changed(void *data,
1820 Eo *device = event_info; 1820 Eo *device = event_info;
1821 Eo *win = data; 1821 Eo *win = data;
1822 1822
1823 eo_event_callback_call(win, EFL_UI_WIN_EVENT_DEVICE_CHANGED, device); 1823 eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
1824} 1824}
1825 1825
1826static Eina_Bool 1826static Eina_Bool
@@ -1887,43 +1887,43 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
1887 eo_event_callback_add(sd->evas, array[i].desc, 1887 eo_event_callback_add(sd->evas, array[i].desc,
1888 _evas_event_key_cb, win); 1888 _evas_event_key_cb, win);
1889 } 1889 }
1890 else if (ev->info == EFL_UI_WIN_EVENT_RENDER_POST) 1890 else if (ev->info == EFL_CANVAS_EVENT_RENDER_POST)
1891 { 1891 {
1892 if (!(sd->event_forward.render_post++)) 1892 if (!(sd->event_forward.render_post++))
1893 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST, 1893 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST,
1894 _elm_win_evas_render_post, win); 1894 _elm_win_evas_render_post, win);
1895 } 1895 }
1896 else if (ev->info == EFL_UI_WIN_EVENT_RENDER_PRE) 1896 else if (ev->info == EFL_CANVAS_EVENT_RENDER_PRE)
1897 { 1897 {
1898 if (!(sd->event_forward.render_pre++)) 1898 if (!(sd->event_forward.render_pre++))
1899 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, 1899 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE,
1900 _elm_win_evas_render_pre, win); 1900 _elm_win_evas_render_pre, win);
1901 } 1901 }
1902 else if (ev->info == EFL_UI_WIN_EVENT_FOCUS_IN) 1902 else if (ev->info == EFL_CANVAS_EVENT_FOCUS_IN)
1903 { 1903 {
1904 if (!(sd->event_forward.focus_in++)) 1904 if (!(sd->event_forward.focus_in++))
1905 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN, 1905 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN,
1906 _elm_win_evas_focus_in, win); 1906 _elm_win_evas_focus_in, win);
1907 } 1907 }
1908 else if (ev->info == EFL_UI_WIN_EVENT_FOCUS_OUT) 1908 else if (ev->info == EFL_CANVAS_EVENT_FOCUS_OUT)
1909 { 1909 {
1910 if (!(sd->event_forward.focus_out++)) 1910 if (!(sd->event_forward.focus_out++))
1911 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 1911 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
1912 _elm_win_evas_focus_out, win); 1912 _elm_win_evas_focus_out, win);
1913 } 1913 }
1914 else if (ev->info == EFL_UI_WIN_EVENT_OBJECT_FOCUS_IN) 1914 else if (ev->info == EFL_CANVAS_EVENT_OBJECT_FOCUS_IN)
1915 { 1915 {
1916 if (!(sd->event_forward.object_focus_in++)) 1916 if (!(sd->event_forward.object_focus_in++))
1917 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, 1917 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
1918 _elm_win_evas_object_focus_in, win); 1918 _elm_win_evas_object_focus_in, win);
1919 } 1919 }
1920 else if (ev->info == EFL_UI_WIN_EVENT_OBJECT_FOCUS_OUT) 1920 else if (ev->info == EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT)
1921 { 1921 {
1922 if (!(sd->event_forward.object_focus_out++)) 1922 if (!(sd->event_forward.object_focus_out++))
1923 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 1923 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
1924 _elm_win_evas_object_focus_out, win); 1924 _elm_win_evas_object_focus_out, win);
1925 } 1925 }
1926 else if (ev->info == EFL_UI_WIN_EVENT_DEVICE_CHANGED) 1926 else if (ev->info == EFL_CANVAS_EVENT_DEVICE_CHANGED)
1927 { 1927 {
1928 if (!(sd->event_forward.device_changed++)) 1928 if (!(sd->event_forward.device_changed++))
1929 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED, 1929 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED,
@@ -1998,43 +1998,43 @@ _win_event_del_cb(void *data, const Eo_Event *ev)
1998 eo_event_callback_add(sd->evas, array[i].desc, 1998 eo_event_callback_add(sd->evas, array[i].desc,
1999 _evas_event_key_cb, win); 1999 _evas_event_key_cb, win);
2000 } 2000 }
2001 else if (ev->info == EFL_UI_WIN_EVENT_RENDER_POST) 2001 else if (ev->info == EFL_CANVAS_EVENT_RENDER_POST)
2002 { 2002 {
2003 if (!(--sd->event_forward.render_post)) 2003 if (!(--sd->event_forward.render_post))
2004 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST, 2004 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_POST,
2005 _elm_win_evas_render_post, win); 2005 _elm_win_evas_render_post, win);
2006 } 2006 }
2007 else if (ev->info == EFL_UI_WIN_EVENT_RENDER_PRE) 2007 else if (ev->info == EFL_CANVAS_EVENT_RENDER_PRE)
2008 { 2008 {
2009 if (!(--sd->event_forward.render_pre)) 2009 if (!(--sd->event_forward.render_pre))
2010 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE, 2010 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_RENDER_PRE,
2011 _elm_win_evas_render_pre, win); 2011 _elm_win_evas_render_pre, win);
2012 } 2012 }
2013 else if (ev->info == EFL_UI_WIN_EVENT_FOCUS_IN) 2013 else if (ev->info == EFL_CANVAS_EVENT_FOCUS_IN)
2014 { 2014 {
2015 if (!(--sd->event_forward.focus_in)) 2015 if (!(--sd->event_forward.focus_in))
2016 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN, 2016 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_IN,
2017 _elm_win_evas_focus_in, win); 2017 _elm_win_evas_focus_in, win);
2018 } 2018 }
2019 else if (ev->info == EFL_UI_WIN_EVENT_FOCUS_OUT) 2019 else if (ev->info == EFL_CANVAS_EVENT_FOCUS_OUT)
2020 { 2020 {
2021 if (!(--sd->event_forward.focus_out)) 2021 if (!(--sd->event_forward.focus_out))
2022 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT, 2022 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_FOCUS_OUT,
2023 _elm_win_evas_focus_out, win); 2023 _elm_win_evas_focus_out, win);
2024 } 2024 }
2025 else if (ev->info == EFL_UI_WIN_EVENT_OBJECT_FOCUS_IN) 2025 else if (ev->info == EFL_CANVAS_EVENT_OBJECT_FOCUS_IN)
2026 { 2026 {
2027 if (!(--sd->event_forward.object_focus_in)) 2027 if (!(--sd->event_forward.object_focus_in))
2028 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN, 2028 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_IN,
2029 _elm_win_evas_object_focus_in, win); 2029 _elm_win_evas_object_focus_in, win);
2030 } 2030 }
2031 else if (ev->info == EFL_UI_WIN_EVENT_OBJECT_FOCUS_OUT) 2031 else if (ev->info == EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT)
2032 { 2032 {
2033 if (!(--sd->event_forward.object_focus_out)) 2033 if (!(--sd->event_forward.object_focus_out))
2034 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT, 2034 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
2035 _elm_win_evas_object_focus_out, win); 2035 _elm_win_evas_object_focus_out, win);
2036 } 2036 }
2037 else if (ev->info == EFL_UI_WIN_EVENT_DEVICE_CHANGED) 2037 else if (ev->info == EFL_CANVAS_EVENT_DEVICE_CHANGED)
2038 { 2038 {
2039 if (!(--sd->event_forward.device_changed)) 2039 if (!(--sd->event_forward.device_changed))
2040 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED, 2040 evas_object_event_callback_add(sd->evas, EVAS_CALLBACK_DEVICE_CHANGED,
@@ -2537,7 +2537,7 @@ _efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, E
2537 { 2537 {
2538 sd->screen.x = x; 2538 sd->screen.x = x;
2539 sd->screen.y = y; 2539 sd->screen.y = y;
2540 eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MOVED, NULL); 2540 eo_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2541 } 2541 }
2542 return; 2542 return;
2543 } 2543 }
@@ -2553,7 +2553,7 @@ _efl_ui_win_evas_object_smart_move(Eo *obj, Efl_Ui_Win_Data *sd, Evas_Coord x, E
2553 { 2553 {
2554 sd->screen.x = x; 2554 sd->screen.x = x;
2555 sd->screen.y = y; 2555 sd->screen.y = y;
2556 eo_event_callback_call(obj, EFL_UI_WIN_EVENT_MOVED, NULL); 2556 eo_event_callback_call(obj, EFL_GFX_EVENT_MOVE, NULL);
2557 } 2557 }
2558 if (sd->frame_obj) 2558 if (sd->frame_obj)
2559 { 2559 {
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 96c6a9d86b..085d4500c4 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -143,7 +143,7 @@ enum Efl.Ui.Win.Urgent_Mode
143 urgent [[The window is a urgent window.]] 143 urgent [[The window is a urgent window.]]
144} 144}
145 145
146class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window, 146class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
147 Elm.Interface.Atspi_Widget_Action, Efl.Pack, 147 Elm.Interface.Atspi_Widget_Action, Efl.Pack,
148 Efl.Input.State, Efl.Input.Interface, Efl.Screen, 148 Efl.Input.State, Efl.Input.Interface, Efl.Screen,
149 Efl.Gfx.Size.Hint, Efl.Text) 149 Efl.Gfx.Size.Hint, Efl.Text)
@@ -805,7 +805,6 @@ class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
805 } 805 }
806 events { 806 events {
807 delete,request; 807 delete,request;
808 moved;
809 withdrawn; 808 withdrawn;
810 iconified; 809 iconified;
811 normal; 810 normal;
@@ -822,12 +821,5 @@ class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
822 wm,rotation,changed; 821 wm,rotation,changed;
823 theme,changed; 822 theme,changed;
824 elm,action,block_menu; 823 elm,action,block_menu;
825 focus,in;
826 focus,out;
827 object,focus,in;
828 object,focus,out;
829 render,pre;
830 render,post: Efl.Gfx.Event.Render_Post;
831 device,changed;
832 } 824 }
833} 825}
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index f04bec5a79..7a499a5271 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -8,6 +8,8 @@
8#include "canvas/efl_ui_selectable.eo.h" 8#include "canvas/efl_ui_selectable.eo.h"
9#include "canvas/efl_ui_zoomable.eo.h" 9#include "canvas/efl_ui_zoomable.eo.h"
10 10
11#include "canvas/efl_canvas.eo.h"
12
11#include "canvas/evas_canvas.eo.h" 13#include "canvas/evas_canvas.eo.h"
12 14
13/** 15/**
diff --git a/src/lib/evas/canvas/efl_canvas.eo b/src/lib/evas/canvas/efl_canvas.eo
new file mode 100644
index 0000000000..8d0230e57c
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas.eo
@@ -0,0 +1,13 @@
1interface Efl.Canvas ()
2{
3 [[Common interface for Window and some internal classes in EFL.]]
4 events {
5 focus,in;
6 focus,out;
7 object,focus,in: Efl.Gfx;
8 object,focus,out: Efl.Gfx;
9 render,pre;
10 render,post;
11 device,changed: Efl.Input.Device;
12 }
13}
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 7e48ed2f8c..cfac1a06e6 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,4 +1,5 @@
1#define EVAS_OBJECT_BETA 1#define EVAS_OBJECT_BETA
2#define EVAS_CANVAS_BETA
2 3
3#include "evas_common_private.h" 4#include "evas_common_private.h"
4#include "evas_private.h" 5#include "evas_private.h"
@@ -40,17 +41,17 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS
40 EVAS_OBJECT_EVENT_HOLD, 41 EVAS_OBJECT_EVENT_HOLD,
41 EFL_GFX_EVENT_CHANGE_SIZE_HINTS, 42 EFL_GFX_EVENT_CHANGE_SIZE_HINTS,
42 EFL_IMAGE_EVENT_PRELOAD, 43 EFL_IMAGE_EVENT_PRELOAD,
43 EVAS_CANVAS_EVENT_FOCUS_IN, 44 EFL_CANVAS_EVENT_FOCUS_IN,
44 EVAS_CANVAS_EVENT_FOCUS_OUT, 45 EFL_CANVAS_EVENT_FOCUS_OUT,
45 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, 46 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
46 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST, 47 EVAS_CANVAS_EVENT_RENDER_FLUSH_POST,
47 EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN, 48 EFL_CANVAS_EVENT_OBJECT_FOCUS_IN,
48 EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, 49 EFL_CANVAS_EVENT_OBJECT_FOCUS_OUT,
49 EFL_IMAGE_EVENT_UNLOAD, 50 EFL_IMAGE_EVENT_UNLOAD,
50 EVAS_CANVAS_EVENT_RENDER_PRE, 51 EFL_CANVAS_EVENT_RENDER_PRE,
51 EVAS_CANVAS_EVENT_RENDER_POST, 52 EFL_CANVAS_EVENT_RENDER_POST,
52 EFL_IMAGE_EVENT_RESIZE, 53 EFL_IMAGE_EVENT_RESIZE,
53 EVAS_CANVAS_EVENT_DEVICE_CHANGED, 54 EFL_CANVAS_EVENT_DEVICE_CHANGED,
54 EVAS_CANVAS_EVENT_AXIS_UPDATE, 55 EVAS_CANVAS_EVENT_AXIS_UPDATE,
55 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE 56 EVAS_CANVAS_EVENT_VIEWPORT_RESIZE
56}; 57};
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 71ec998fe9..8fd5aea395 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
1import evas_types; 1import evas_types;
2import efl_event_types; 2import efl_event_types;
3 3
4class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Animator, 4class Evas.Canvas (Eo.Base, Efl.Canvas, Evas.Common_Interface, Efl.Animator,
5 Efl.Input.Interface) 5 Efl.Input.Interface)
6{ 6{
7 legacy_prefix: evas; 7 legacy_prefix: evas;
@@ -1198,16 +1198,9 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface, Efl.Animator,
1198 Evas.Common_Interface.evas.get; 1198 Evas.Common_Interface.evas.get;
1199 } 1199 }
1200 events { 1200 events {
1201 focus,in; 1201 render,flush,pre @beta;
1202 focus,out; 1202 render,flush,post @beta;
1203 object,focus,in; 1203 axis,update @beta;
1204 object,focus,out; 1204 viewport,resize @beta;
1205 render,pre;
1206 render,post;
1207 render,flush,pre;
1208 render,flush,post;
1209 device,changed;
1210 axis,update;
1211 viewport,resize;
1212 } 1205 }
1213} 1206}
diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c
index 88168bc0fa..0ffc324ea4 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -267,7 +267,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
267 { 267 {
268 // Post render callback is not required anymore 268 // Post render callback is not required anymore
269 Evas *e = obj->layer->evas->evas; 269 Evas *e = obj->layer->evas->evas;
270 eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 270 eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
271 pd->has_cb = EINA_FALSE; 271 pd->has_cb = EINA_FALSE;
272 } 272 }
273 273
@@ -327,7 +327,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
327 if (do_async && !pd->has_cb) 327 if (do_async && !pd->has_cb)
328 { 328 {
329 Evas *e = obj->layer->evas->evas; 329 Evas *e = obj->layer->evas->evas;
330 eo_event_callback_add(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 330 eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
331 pd->has_cb = EINA_TRUE; 331 pd->has_cb = EINA_TRUE;
332 } 332 }
333 evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj); 333 evas_filter_context_post_run_callback_set(filter, _filter_cb, eo_obj);
@@ -629,7 +629,7 @@ finish:
629 if (pd->has_cb) 629 if (pd->has_cb)
630 { 630 {
631 Evas *e = obj->layer->evas->evas; 631 Evas *e = obj->layer->evas->evas;
632 eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj); 632 eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _render_post_cb, eo_obj);
633 } 633 }
634 SLKD(pd->lck); 634 SLKD(pd->lck);
635 635
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 1c0a5eea3c..16d3314465 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1,3 +1,5 @@
1#define EVAS_CANVAS_BETA
2
1#include "evas_common_private.h" 3#include "evas_common_private.h"
2#include "evas_private.h" 4#include "evas_private.h"
3//#include "evas_cs.h" 5//#include "evas_cs.h"
@@ -872,4 +874,5 @@ evas_output_viewport_get(const Evas *eo_e, Evas_Coord *x, Evas_Coord *y, Evas_Co
872 if (h) *h = e->viewport.h; 874 if (h) *h = e->viewport.h;
873} 875}
874 876
877#include "canvas/efl_canvas.eo.c"
875#include "canvas/evas_canvas.eo.c" 878#include "canvas/evas_canvas.eo.c"
diff --git a/src/lib/evas/canvas/evas_object_vg.c b/src/lib/evas/canvas/evas_object_vg.c
index 74c72fd4ef..0290a188ca 100644
--- a/src/lib/evas/canvas/evas_object_vg.c
+++ b/src/lib/evas/canvas/evas_object_vg.c
@@ -103,7 +103,7 @@ _evas_vg_eo_base_destructor(Eo *eo_obj, Evas_VG_Data *pd)
103 if (pd->engine_data) 103 if (pd->engine_data)
104 obj->layer->evas->engine.func->ector_free(pd->engine_data); 104 obj->layer->evas->engine.func->ector_free(pd->engine_data);
105 105
106 eo_event_callback_del(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); 106 eo_event_callback_del(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
107 107
108 eo_unref(pd->root); 108 eo_unref(pd->root);
109 pd->root = NULL; 109 pd->root = NULL;
@@ -138,7 +138,7 @@ _evas_vg_eo_base_finalize(Eo *obj, Evas_VG_Data *pd)
138 138
139 // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice 139 // TODO: If we start to have to many Evas_Object_VG per canvas, it may be nice
140 // to actually have one event per canvas and one array per canvas to. 140 // to actually have one event per canvas and one array per canvas to.
141 eo_event_callback_add(e, EVAS_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd); 141 eo_event_callback_add(e, EFL_CANVAS_EVENT_RENDER_POST, _cleanup_reference, pd);
142 142
143 return obj; 143 return obj;
144} 144}