summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-31 16:36:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 11:22:33 +0900
commit9cec14918c089d94a742cb067872181dd452b7ef (patch)
tree59fd6ae40189a1c9e500d795ae09bc88076b3096 /src
parentb8ca1272aee00314ca2cfb10214f36590084f6f0 (diff)
evas: Move evas_canvas.eo to legacy-only
This isn't meant to be installed. The canvas API in EO is based around the interfaces Efl.Canvas and the widget Efl.Ui.Win. Anything else is not EO (eg: ecore_evas, evas, ...) Note: evas_canvas3d is the last remaining thing that is installed along EO files, but those are all beta APIs.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/examples/ecore/ecore_evas_vnc_example.c2
-rw-r--r--src/lib/edje/edje_entry.c2
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/edje/edje_smart.c2
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_cnp.c2
-rw-r--r--src/lib/elementary/els_tooltip.c4
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Internal.h4
-rw-r--r--src/lib/evas/canvas/efl_input_event.c1
-rw-r--r--src/lib/evas/include/evas_private.h1
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c2
-rw-r--r--src/tests/emotion/emotion_test_main-eo.c8
14 files changed, 21 insertions, 17 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 5657ed34b1..8b82e1aaed 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -8,7 +8,6 @@ evas_canvas_eolian_pub_files = \
8 lib/evas/canvas/efl_canvas_rectangle.eo \ 8 lib/evas/canvas/efl_canvas_rectangle.eo \
9 lib/evas/canvas/efl_canvas_text.eo \ 9 lib/evas/canvas/efl_canvas_text.eo \
10 lib/evas/canvas/efl_canvas_group.eo \ 10 lib/evas/canvas/efl_canvas_group.eo \
11 lib/evas/canvas/evas_canvas.eo \
12 lib/evas/canvas/efl_canvas_image_internal.eo \ 11 lib/evas/canvas/efl_canvas_image_internal.eo \
13 lib/evas/canvas/evas_canvas3d_camera.eo\ 12 lib/evas/canvas/evas_canvas3d_camera.eo\
14 lib/evas/canvas/evas_canvas3d_texture.eo\ 13 lib/evas/canvas/evas_canvas3d_texture.eo\
@@ -71,6 +70,7 @@ evas_gesture_eolian_pub_files = \
71 $(NULL) 70 $(NULL)
72 71
73evas_eolian_legacy_files = \ 72evas_eolian_legacy_files = \
73 lib/evas/canvas/evas_canvas.eo \
74 lib/evas/canvas/evas_line.eo \ 74 lib/evas/canvas/evas_line.eo \
75 lib/evas/canvas/evas_table.eo \ 75 lib/evas/canvas/evas_table.eo \
76 lib/evas/canvas/evas_grid.eo \ 76 lib/evas/canvas/evas_grid.eo \
diff --git a/src/examples/ecore/ecore_evas_vnc_example.c b/src/examples/ecore/ecore_evas_vnc_example.c
index 1f91bc999c..0f06c62d3e 100644
--- a/src/examples/ecore/ecore_evas_vnc_example.c
+++ b/src/examples/ecore/ecore_evas_vnc_example.c
@@ -300,7 +300,7 @@ main(int argc, char *argv[])
300 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, 300 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
301 _mouse_wheel, NULL); 301 _mouse_wheel, NULL);
302 302
303 _seat_children_print(evas_canvas_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_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_EVENT_DEVICE_REMOVED,
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 5f7fb7437b..3fa1299abb 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -4594,7 +4594,7 @@ _edje_entry_imf_default_focused_rp_get(Edje *ed)
4594 Evas *e; 4594 Evas *e;
4595 4595
4596 e = evas_object_evas_get(ed->obj); 4596 e = evas_object_evas_get(ed->obj);
4597 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 4597 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
4598 seat_name = _edje_seat_name_get(ed, seat); 4598 seat_name = _edje_seat_name_get(ed, seat);
4599 4599
4600 return _edje_focused_part_get(ed, seat_name); 4600 return _edje_focused_part_get(ed, seat_name);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 705ac4da65..a231f244ac 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -595,7 +595,7 @@ _edje_part_focus_set(Edje *ed, const char *seat_name, Edje_Real_Part *rp)
595 else /* Use default seat name */ 595 else /* Use default seat name */
596 { 596 {
597 e = evas_object_evas_get(ed->obj); 597 e = evas_object_evas_get(ed->obj);
598 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 598 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
599 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat)); 599 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat));
600 } 600 }
601 601
@@ -983,7 +983,7 @@ low_mem_current:
983 Evas *e; 983 Evas *e;
984 984
985 e = evas_object_evas_get(ed->obj); 985 e = evas_object_evas_get(ed->obj);
986 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT); 986 seat = evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
987 } 987 }
988 if (!pr->targets) 988 if (!pr->targets)
989 { 989 {
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 7515d0a421..8b01b4eb03 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -33,7 +33,7 @@ _edje_object_efl_object_constructor(Eo *obj, Edje *ed)
33 efl_canvas_group_clipped_set(obj, EINA_TRUE); 33 efl_canvas_group_clipped_set(obj, EINA_TRUE);
34 obj = efl_constructor(efl_super(obj, MY_CLASS)); 34 obj = efl_constructor(efl_super(obj, MY_CLASS));
35 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 35 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
36 ed->base.evas = efl_provider_find(obj, EVAS_CANVAS_CLASS); 36 ed->base.evas = evas_object_evas_get(obj);
37 ed->base.clipper = (Evas_Object *) efl_canvas_group_clipper_get(obj); 37 ed->base.clipper = (Evas_Object *) efl_canvas_group_clipper_get(obj);
38 ed->duration_scale = 1.0; 38 ed->duration_scale = 1.0;
39 _edje_lib_ref(); 39 _edje_lib_ref();
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 58b7fc1171..4904a13e10 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4138,7 +4138,7 @@ _elm_win_frame_cb_menu(void *data,
4138 int x, y, wx, wy; 4138 int x, y, wx, wy;
4139 4139
4140 if (!sd->wl.win) return; 4140 if (!sd->wl.win) return;
4141 evas_canvas_pointer_canvas_xy_get(sd->evas, &x, &y); 4141 evas_pointer_canvas_xy_get(sd->evas, &x, &y);
4142 ecore_wl2_window_geometry_get(sd->wl.win, &wx, &wy, NULL, NULL); 4142 ecore_wl2_window_geometry_get(sd->wl.win, &wx, &wy, NULL, NULL);
4143 if (x < 0) x += wx; 4143 if (x < 0) x += wx;
4144 if (y < 0) y += wy; 4144 if (y < 0) y += wy;
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 39528de8cb..e7ac5cb625 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -2922,7 +2922,7 @@ _wl_default_seat_get(Ecore_Wl2_Window *win, Evas_Object *obj)
2922 return input; 2922 return input;
2923 } 2923 }
2924 2924
2925 seat = evas_canvas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT); 2925 seat = evas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT);
2926 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL); 2926 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL);
2927 return ecore_wl2_display_input_find(ecore_wl2_window_display_get(win), 2927 return ecore_wl2_display_input_find(ecore_wl2_window_display_get(win),
2928 evas_device_seat_id_get(seat)); 2928 evas_device_seat_id_get(seat));
diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c
index 84fe835afa..4eaea65cf7 100644
--- a/src/lib/elementary/els_tooltip.c
+++ b/src/lib/elementary/els_tooltip.c
@@ -544,14 +544,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
544 &basex, &basey, &cw, &ch); 544 &basex, &basey, &cw, &ch);
545 elm_win_screen_position_get(elm_widget_top_get(tt->owner), 545 elm_win_screen_position_get(elm_widget_top_get(tt->owner),
546 &cx, &cy); 546 &cx, &cy);
547 evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); 547 evas_pointer_canvas_xy_get(tt->evas, &px, &py);
548 cx -= basex; 548 cx -= basex;
549 cy -= basey; 549 cy -= basey;
550 } 550 }
551 else 551 else
552 { 552 {
553 evas_output_size_get(tt->evas, &cw, &ch); 553 evas_output_size_get(tt->evas, &cw, &ch);
554 evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); 554 evas_pointer_canvas_xy_get(tt->evas, &px, &py);
555 } 555 }
556 TTDBG("SCREEN: cw=%d,ch=%d\n", cw, ch); 556 TTDBG("SCREEN: cw=%d,ch=%d\n", cw, ch);
557 557
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index dbd65e1555..fcc7fc67fe 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -4,8 +4,6 @@
4 4
5#ifdef EFL_EO_API_SUPPORT 5#ifdef EFL_EO_API_SUPPORT
6 6
7#include "canvas/evas_canvas.eo.h"
8
9/** 7/**
10 * @ingroup Evas_Object_Rectangle 8 * @ingroup Evas_Object_Rectangle
11 * 9 *
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 2a84270917..09cc2c8f4e 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -63,6 +63,10 @@ EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
63EOAPI void efl_canvas_group_add(Eo *obj); 63EOAPI void efl_canvas_group_add(Eo *obj);
64EOAPI void efl_canvas_group_del(Eo *obj); 64EOAPI void efl_canvas_group_del(Eo *obj);
65EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped); 65EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped);
66EOAPI void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y);
67EOAPI void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat);
68EOAPI void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat);
69EOAPI Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat);
66 70
67EOAPI void *efl_input_legacy_info_get(const Eo *obj); 71EOAPI void *efl_input_legacy_info_get(const Eo *obj);
68EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv); 72EOAPI Eo *efl_input_instance_get(const Eo *obj, Efl_Object *owner, void **priv);
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 745ab8f8ca..f18eb3d136 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -6,6 +6,7 @@
6 6
7#include <Evas.h> 7#include <Evas.h>
8#include <Evas_Internal.h> 8#include <Evas_Internal.h>
9#include "canvas/evas_canvas.eo.h"
9 10
10#define EFL_INTERNAL_UNSTABLE 11#define EFL_INTERNAL_UNSTABLE
11#include "interfaces/efl_common_internal.h" 12#include "interfaces/efl_common_internal.h"
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 2cedf01807..ebc14a44c9 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -50,6 +50,7 @@
50#define ENFN obj->layer->evas->engine.func 50#define ENFN obj->layer->evas->engine.func
51#define ENC _evas_engine_context(obj->layer->evas) 51#define ENC _evas_engine_context(obj->layer->evas)
52 52
53#include "canvas/evas_canvas.eo.h"
53#include "canvas/evas_text.eo.h" 54#include "canvas/evas_text.eo.h"
54#include "canvas/evas_textgrid.eo.h" 55#include "canvas/evas_textgrid.eo.h"
55#include "canvas/evas_line.eo.h" 56#include "canvas/evas_line.eo.h"
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 00da3f52bb..163c88762e 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1772,7 +1772,7 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event EINA_
1772 einfo->y_rel = wdata->y_rel; 1772 einfo->y_rel = wdata->y_rel;
1773 } 1773 }
1774 einfo->timestamp = wdata->timestamp; 1774 einfo->timestamp = wdata->timestamp;
1775 evas_canvas_pointer_canvas_xy_get(evas, &einfo->x_cursor, &einfo->y_cursor); 1775 evas_pointer_canvas_xy_get(evas, &einfo->x_cursor, &einfo->y_cursor);
1776 evas_output_framespace_get(evas, &fx, &fy, NULL, NULL); 1776 evas_output_framespace_get(evas, &fx, &fy, NULL, NULL);
1777 einfo->x_cursor -= fx; 1777 einfo->x_cursor -= fx;
1778 einfo->y_cursor -= fy; 1778 einfo->y_cursor -= fy;
diff --git a/src/tests/emotion/emotion_test_main-eo.c b/src/tests/emotion/emotion_test_main-eo.c
index fae86ccaed..66bcfa922f 100644
--- a/src/tests/emotion/emotion_test_main-eo.c
+++ b/src/tests/emotion/emotion_test_main-eo.c
@@ -503,7 +503,7 @@ video_obj_signal_frame_move_start_cb(void *data EINA_UNUSED, Evas_Object *o, con
503 fd = efl_key_data_get(o, "frame_data"); 503 fd = efl_key_data_get(o, "frame_data");
504 if (!fd) return; 504 if (!fd) return;
505 fd->moving = 1; 505 fd->moving = 1;
506 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 506 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
507 fd->x = x; 507 fd->x = x;
508 fd->y = y; 508 fd->y = y;
509 efl_gfx_stack_raise(o); 509 efl_gfx_stack_raise(o);
@@ -528,7 +528,7 @@ video_obj_signal_frame_resize_start_cb(void *data EINA_UNUSED, Evas_Object *o, c
528 fd = efl_key_data_get(o, "frame_data"); 528 fd = efl_key_data_get(o, "frame_data");
529 if (!fd) return; 529 if (!fd) return;
530 fd->resizing = 1; 530 fd->resizing = 1;
531 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 531 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
532 fd->x = x; 532 fd->x = x;
533 fd->y = y; 533 fd->y = y;
534 efl_gfx_stack_raise(o); 534 efl_gfx_stack_raise(o);
@@ -556,7 +556,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
556 Evas_Coord x, y; 556 Evas_Coord x, y;
557 Eina_Position2D pos; 557 Eina_Position2D pos;
558 558
559 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 559 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
560 pos = efl_gfx_position_get(o); 560 pos = efl_gfx_position_get(o);
561 pos.x += (x - fd->x); 561 pos.x += (x - fd->x);
562 pos.y += (y - fd->y); 562 pos.y += (y - fd->y);
@@ -569,7 +569,7 @@ video_obj_signal_frame_move_cb(void *data EINA_UNUSED, Evas_Object *o, const cha
569 Evas_Coord x, y; 569 Evas_Coord x, y;
570 Eina_Size2D sz; 570 Eina_Size2D sz;
571 571
572 evas_canvas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y); 572 evas_pointer_canvas_xy_get(evas_object_evas_get(o), &x, &y);
573 sz = efl_gfx_size_get(o); 573 sz = efl_gfx_size_get(o);
574 evas_object_resize(o, sz.w + (x - fd->x), sz.h + (y - fd->y)); 574 evas_object_resize(o, sz.w + (x - fd->x), sz.h + (y - fd->y));
575 fd->x = x; 575 fd->x = x;