summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2019-10-31 13:20:33 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-10-31 13:29:56 -0400
commit7dc98ab3d01b47f14552ca021d49b49b24fb7057 (patch)
tree483e5fe2f047c1ab3cbe0c55de4d38793625d44a
parent72be0842ab514b43124f6fd17066039ccf78cec5 (diff)
evas: move efl_input_device into evas/Efl_Canvas.h
Summary: The internal and the API we would like is mostly a canvas API. A lot of the code in evas is working around the fact that efl_input_device is not defined inside Evas. This patch is the first step to try to clean this up. Depends on D10487 Reviewers: zmike, raster, bu5hm4n, Hermet Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T8321 Differential Revision: https://phab.enlightenment.org/D10488
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/lib/ecore_evas/ecore_evas.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas_drm.h1
-rw-r--r--src/lib/ecore_evas/ecore_evas_util.c1
-rw-r--r--src/lib/edje/Efl_Layout.h3
-rw-r--r--src/lib/edje/edje_callbacks.c3
-rw-r--r--src/lib/edje/edje_private.h3
-rw-r--r--src/lib/efl/Efl.h6
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h169
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/meson.build9
-rw-r--r--src/lib/elementary/efl_ui_widget.c4
-rw-r--r--src/lib/elementary/efl_ui_win.c3
-rw-r--r--src/lib/elementary/elm_priv.h1
-rw-r--r--src/lib/emotion/emotion_smart.c1
-rw-r--r--src/lib/evas/Efl_Canvas.h13
-rw-r--r--src/lib/evas/Evas_Common.h22
-rw-r--r--src/lib/evas/Evas_Eo.h23
-rw-r--r--src/lib/evas/Evas_Internal.h160
-rw-r--r--src/lib/evas/canvas/efl_canvas_pointer.eo (renamed from src/lib/efl/interfaces/efl_canvas_pointer.eo)0
-rw-r--r--src/lib/evas/canvas/efl_canvas_scene.eo (renamed from src/lib/efl/interfaces/efl_canvas_scene.eo)0
-rw-r--r--src/lib/evas/canvas/efl_input_device.c (renamed from src/lib/efl/interfaces/efl_input_device.c)7
-rw-r--r--src/lib/evas/canvas/efl_input_device.eo (renamed from src/lib/efl/interfaces/efl_input_device.eo)0
-rw-r--r--src/lib/evas/canvas/efl_input_event.c4
-rw-r--r--src/lib/evas/canvas/efl_input_focus.c5
-rw-r--r--src/lib/evas/canvas/efl_input_hold.c3
-rw-r--r--src/lib/evas/canvas/efl_input_key.c3
-rw-r--r--src/lib/evas/canvas/efl_input_pointer.c3
-rw-r--r--src/lib/evas/canvas/efl_input_types.eot (renamed from src/lib/efl/interfaces/efl_input_types.eot)0
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c3
-rw-r--r--src/lib/evas/canvas/evas_device.c3
-rw-r--r--src/lib/evas/canvas/evas_events.c3
-rw-r--r--src/lib/evas/canvas/evas_events_legacy.c3
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c3
-rw-r--r--src/lib/evas/canvas/evas_main.c5
-rw-r--r--src/lib/evas/canvas/meson.build9
-rw-r--r--src/lib/evas/gesture/efl_canvas_gesture_private.h2
-rw-r--r--src/lib/evas/include/evas_common_private.h1
39 files changed, 231 insertions, 258 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index e1438db..48eac32 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -5,7 +5,7 @@
5#include <Elementary.h> 5#include <Elementary.h>
6 6
7#define EFL_INTERNAL_UNSTABLE 7#define EFL_INTERNAL_UNSTABLE
8#include "interfaces/efl_common_internal.h" 8#include "Evas_Internal.h"
9 9
10#define DEFAULT_TEXT "Click the white rectangle to get started" 10#define DEFAULT_TEXT "Click the white rectangle to get started"
11 11
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index 9d2d4d1..d3c26dd 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -24,6 +24,7 @@
24#include "ecore_private.h" 24#include "ecore_private.h"
25#include <Ecore_Input.h> 25#include <Ecore_Input.h>
26#include <Ecore_Input_Evas.h> 26#include <Ecore_Input_Evas.h>
27#define EFL_INTERNAL_UNSTABLE
27#include <Evas_Internal.h> 28#include <Evas_Internal.h>
28 29
29#include "Ecore_Evas.h" 30#include "Ecore_Evas.h"
@@ -34,9 +35,6 @@
34#include "ecore_evas_extn.h" 35#include "ecore_evas_extn.h"
35#include "ecore_evas_win32.h" 36#include "ecore_evas_win32.h"
36 37
37#define EFL_INTERNAL_UNSTABLE
38#include "interfaces/efl_common_internal.h"
39
40#include "ecore_private.h" 38#include "ecore_private.h"
41 39
42#ifndef O_BINARY 40#ifndef O_BINARY
diff --git a/src/lib/ecore_evas/ecore_evas_drm.h b/src/lib/ecore_evas/ecore_evas_drm.h
index 401fb1e..63ef7be 100644
--- a/src/lib/ecore_evas/ecore_evas_drm.h
+++ b/src/lib/ecore_evas/ecore_evas_drm.h
@@ -1,6 +1,7 @@
1#ifndef ECORE_EVAS_DRM_H_ 1#ifndef ECORE_EVAS_DRM_H_
2# define ECORE_EVAS_DRM_H_ 2# define ECORE_EVAS_DRM_H_
3 3
4#define EFL_INTERNAL_UNSTABLE
4# include "Evas_Internal.h" 5# include "Evas_Internal.h"
5 6
6typedef struct _Ecore_Evas_Interface_Drm Ecore_Evas_Interface_Drm; 7typedef struct _Ecore_Evas_Interface_Drm Ecore_Evas_Interface_Drm;
diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c
index 4f3e9c4..7b07fdc 100644
--- a/src/lib/ecore_evas/ecore_evas_util.c
+++ b/src/lib/ecore_evas/ecore_evas_util.c
@@ -11,6 +11,7 @@
11 11
12#include "Ecore_Evas.h" 12#include "Ecore_Evas.h"
13#include "ecore_evas_private.h" 13#include "ecore_evas_private.h"
14#define EFL_INTERNAL_UNSTABLE
14#include "Evas_Internal.h" 15#include "Evas_Internal.h"
15 16
16static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate"; 17static const char ASSOCIATE_KEY[] = "__Ecore_Evas_Associate";
diff --git a/src/lib/edje/Efl_Layout.h b/src/lib/edje/Efl_Layout.h
index 123ce30..8387984 100644
--- a/src/lib/edje/Efl_Layout.h
+++ b/src/lib/edje/Efl_Layout.h
@@ -8,6 +8,9 @@
8#include <Eo.h> 8#include <Eo.h>
9/* This include has been added to support Eo in Evas */ 9/* This include has been added to support Eo in Evas */
10#include <Efl.h> 10#include <Efl.h>
11
12#include <Efl_Canvas.h>
13
11#ifdef EAPI 14#ifdef EAPI
12# undef EAPI 15# undef EAPI
13#endif 16#endif
diff --git a/src/lib/edje/edje_callbacks.c b/src/lib/edje/edje_callbacks.c
index 11fce6e..5b034b2 100644
--- a/src/lib/edje/edje_callbacks.c
+++ b/src/lib/edje/edje_callbacks.c
@@ -1,8 +1,5 @@
1#include "edje_private.h" 1#include "edje_private.h"
2 2
3#define EFL_INTERNAL_UNSTABLE
4#include "interfaces/efl_common_internal.h"
5
6static void 3static void
7_edje_hold_signal_cb(void *data, const Efl_Event *event) 4_edje_hold_signal_cb(void *data, const Efl_Event *event)
8{ 5{
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index d12c1d1..c3e4e16 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -44,7 +44,6 @@
44#include <Eet.h> 44#include <Eet.h>
45#include <Eo.h> 45#include <Eo.h>
46#include <Evas.h> 46#include <Evas.h>
47#include <Evas_Internal.h>
48#include <Ecore.h> 47#include <Ecore.h>
49#include <Ecore_Evas.h> 48#include <Ecore_Evas.h>
50#include <Ecore_File.h> 49#include <Ecore_File.h>
@@ -65,6 +64,8 @@
65#endif 64#endif
66 65
67#include "Edje.h" 66#include "Edje.h"
67#define EFL_INTERNAL_UNSTABLE
68#include <Evas_Internal.h>
68 69
69#ifdef EAPI 70#ifdef EAPI
70# undef EAPI 71# undef EAPI
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index f20979b..296fc1b 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -174,13 +174,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
174#include "interfaces/efl_gfx_text_class.eo.h" 174#include "interfaces/efl_gfx_text_class.eo.h"
175#include "interfaces/efl_gfx_size_class.eo.h" 175#include "interfaces/efl_gfx_size_class.eo.h"
176 176
177/* Input events */
178#include "interfaces/efl_input_types.eot.h"
179#include "interfaces/efl_input_device.eo.h"
180
181/* Canvas & UI */ 177/* Canvas & UI */
182#include "interfaces/efl_canvas_scene.eo.h"
183#include "interfaces/efl_canvas_pointer.eo.h"
184#include "interfaces/efl_ui_view.eo.h" 178#include "interfaces/efl_ui_view.eo.h"
185#include "interfaces/efl_ui_property_bind.eo.h" 179#include "interfaces/efl_ui_property_bind.eo.h"
186#include "interfaces/efl_ui_factory.eo.h" 180#include "interfaces/efl_ui_factory.eo.h"
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
deleted file mode 100644
index f465c08..0000000
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ /dev/null
@@ -1,169 +0,0 @@
1/* This header file is intended for EFL internal use, and is not part of
2 * EFL stable API.
3 * Place here structs and enums that need to be shared between core EFL
4 * components, such as Ecore, Evas, etc...
5 */
6
7#ifndef EFL_COMMON_INTERNAL_H
8#define EFL_COMMON_INTERNAL_H
9
10#ifndef EFL_INTERNAL_UNSTABLE
11# error This file can not be included outside EFL
12#endif
13
14#include <Efl.h>
15
16typedef struct _Efl_Input_Pointer_Data Efl_Input_Pointer_Data;
17typedef struct _Efl_Input_Key_Data Efl_Input_Key_Data;
18typedef struct _Efl_Input_Device_Data Efl_Input_Device_Data;
19typedef struct _Efl_Input_Hold_Data Efl_Input_Hold_Data;
20typedef struct _Efl_Input_Focus_Data Efl_Input_Focus_Data;
21
22#ifndef _EVAS_TYPES_EOT_H_
23typedef struct _Evas_Modifier Evas_Modifier;
24typedef struct _Evas_Lock Evas_Lock;
25#endif
26
27struct _Efl_Input_Pointer_Data
28{
29 Eo *eo;
30 unsigned int timestamp; /* FIXME: store as double? */
31 int button;
32 unsigned int pressed_buttons;
33 int touch_id; /* finger or tool ID */
34 double radius, radius_x, radius_y;
35 double pressure, distance, azimuth, tilt, twist;
36 double angle;
37 /* current, previous positions in window coordinates.
38 * raw can be either un-smoothed, un-predicted x,y or a tablet's raw input.
39 * norm is the normalized value in [0..1] for tablet input.
40 */
41 Eina_Vector2 cur, prev, raw, norm;
42 struct {
43 int z;
44 Eina_Bool horizontal;
45 } wheel;
46 Efl_Gfx_Entity *source; /* could it be ecore? */
47 Efl_Input_Device *device;
48 Efl_Pointer_Action action;
49 Efl_Pointer_Flags button_flags;
50 Efl_Input_Flags event_flags;
51 void *data; /* evas data - whatever that is */
52 Eina_Bool window_pos; /* true if positions are window-relative
53 (see input vs. feed: this is "input") */
54 Evas_Modifier *modifiers;
55 Evas_Lock *locks;
56 void *legacy; /* DO NOT TOUCH THIS */
57 uint32_t value_flags;
58 Eina_Bool has_norm : 1; /* not in value_flags */
59 Eina_Bool has_raw : 1; /* not in value_flags */
60 Eina_Bool evas_done : 1; /* set by evas */
61 Eina_Bool fake : 1;
62 Eina_Bool win_fed : 1;
63};
64
65struct _Efl_Input_Key_Data
66{
67 Eo *eo;
68 unsigned int timestamp; /* FIXME: store as double? */
69
70 Eina_Bool pressed; /* 1 = pressed/down, 0 = released/up */
71 Eina_Stringshare *keyname;
72 Eina_Stringshare *key;
73 Eina_Stringshare *string;
74 Eina_Stringshare *compose;
75 unsigned int keycode;
76
77 void *data;
78 Evas_Modifier *modifiers;
79 Evas_Lock *locks;
80 Efl_Input_Flags event_flags;
81 Efl_Input_Device *device;
82 void *legacy; /* DO NOT TOUCH THIS */
83 Eina_Bool evas_done : 1; /* set by evas */
84 Eina_Bool fake : 1;
85 Eina_Bool win_fed : 1;
86 Eina_Bool no_stringshare : 1;
87};
88
89struct _Efl_Input_Device_Data
90{
91 Eo *eo;
92 Eo *evas; /* Evas */
93 Efl_Input_Device *source; /* ref */
94 Eina_List *children; /* ref'ed by efl_parent, not by this list */
95 unsigned int id;
96 Efl_Input_Device_Type klass;
97 unsigned int subclass; // Evas_Device_Subclass (unused)
98 unsigned int pointer_count;
99};
100
101struct _Efl_Input_Hold_Data
102{
103 Eo *eo;
104 double timestamp;
105 Efl_Input_Flags event_flags;
106 Efl_Input_Device *device;
107 void *data;
108 void *legacy; /* DO NOT TOUCH THIS */
109 Eina_Bool hold : 1;
110 Eina_Bool evas_done : 1; /* set by evas */
111};
112
113struct _Efl_Input_Focus_Data
114{
115 Eo *eo;
116 Efl_Input_Device *device; //The seat
117 Eo *object_wref; // wref on the focused object - Efl.Canvas.Object or Efl.Canvas.
118 double timestamp;
119 Efl_Input_Flags event_flags;
120};
121
122/* Internal helpers */
123
124static inline const char *
125_efl_input_modifier_to_string(Efl_Input_Modifier mod)
126{
127 switch (mod)
128 {
129 default:
130 case EFL_INPUT_MODIFIER_NONE: return NULL;
131 case EFL_INPUT_MODIFIER_ALT: return "Alt";
132 case EFL_INPUT_MODIFIER_CONTROL: return "Control";
133 case EFL_INPUT_MODIFIER_SHIFT: return "Shift";
134 case EFL_INPUT_MODIFIER_META: return "Meta";
135 case EFL_INPUT_MODIFIER_ALTGR: return "AltGr";
136 case EFL_INPUT_MODIFIER_HYPER: return "Hyper";
137 case EFL_INPUT_MODIFIER_SUPER: return "Super";
138 }
139}
140
141static inline const char *
142_efl_input_lock_to_string(Efl_Input_Lock lock)
143{
144 switch (lock)
145 {
146 default:
147 case EFL_INPUT_LOCK_NONE: return NULL;
148 case EFL_INPUT_LOCK_NUM: return "Num";
149 case EFL_INPUT_LOCK_CAPS: return "Caps";
150 case EFL_INPUT_LOCK_SCROLL: return "Scroll";
151 case EFL_INPUT_LOCK_SHIFT: return "Shift";
152 }
153}
154
155static inline Eina_Bool
156_efl_input_value_has(const Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
157{
158 return (pd->value_flags & (1u << (int) key)) != 0;
159}
160
161static inline void
162_efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
163{
164 pd->value_flags |= (1u << (int) key);
165}
166
167#define _efl_input_value_mask(key) (1u << (int) key)
168
169#endif
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index ead7306..f1bff04 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -47,8 +47,6 @@
47#include "interfaces/efl_gfx_blur.eo.c" 47#include "interfaces/efl_gfx_blur.eo.c"
48 48
49#include "interfaces/efl_gfx_hint.eo.c" 49#include "interfaces/efl_gfx_hint.eo.c"
50#include "interfaces/efl_canvas_scene.eo.c"
51#include "interfaces/efl_canvas_pointer.eo.c"
52 50
53#include "interfaces/efl_screen.eo.c" 51#include "interfaces/efl_screen.eo.c"
54 52
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 4e3f90e..ccbab1c 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -6,7 +6,6 @@ pub_legacy_eo_files = [
6 'efl_gfx_color.eo', 6 'efl_gfx_color.eo',
7 'efl_gfx_image.eo', 7 'efl_gfx_image.eo',
8 'efl_gfx_frame_controller.eo', 8 'efl_gfx_frame_controller.eo',
9 'efl_input_device.eo',
10 'efl_ui_draggable.eo', 9 'efl_ui_draggable.eo',
11 'efl_ui_scrollable.eo', 10 'efl_ui_scrollable.eo',
12 'efl_ui_scrollbar.eo', 11 'efl_ui_scrollbar.eo',
@@ -32,8 +31,6 @@ endforeach
32 31
33pub_eo_files = [ 32pub_eo_files = [
34 'efl_playable.eo', 33 'efl_playable.eo',
35 'efl_canvas_scene.eo',
36 'efl_canvas_pointer.eo',
37 'efl_config.eo', 34 'efl_config.eo',
38 'efl_control.eo', 35 'efl_control.eo',
39 'efl_duplicate.eo', 36 'efl_duplicate.eo',
@@ -121,7 +118,6 @@ pub_eo_files += pub_legacy_eo_files
121pub_eo_types_files = [ 118pub_eo_types_files = [
122 'efl_gfx_types.eot', 119 'efl_gfx_types.eot',
123 'efl_ui_drag_types.eot', 120 'efl_ui_drag_types.eot',
124 'efl_input_types.eot',
125 'efl_types.eot', 121 'efl_types.eot',
126 'efl_text_types.eot', 122 'efl_text_types.eot',
127] 123]
@@ -157,7 +153,6 @@ efl_src += files([
157 'efl_gfx_path.c', 153 'efl_gfx_path.c',
158 'efl_gfx_shape.c', 154 'efl_gfx_shape.c',
159 'efl_gfx_color.c', 155 'efl_gfx_color.c',
160 'efl_input_device.c',
161 'efl_io_closer.c', 156 'efl_io_closer.c',
162 'efl_io_positioner.c', 157 'efl_io_positioner.c',
163 'efl_io_reader.c', 158 'efl_io_reader.c',
@@ -172,10 +167,6 @@ efl_src += files([
172 'efl_model_provider.c', 167 'efl_model_provider.c',
173]) 168])
174 169
175#efl_header_src += files([
176# 'efl_common_internal.h'
177#])
178
179install_headers('efl_file.h', 170install_headers('efl_file.h',
180 install_dir : join_paths(dir_package_include, 'interfaces'), 171 install_dir : join_paths(dir_package_include, 'interfaces'),
181) 172)
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index 61c8c62..96cecc6 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -21,10 +21,6 @@
21#include "elm_part_helper.h" 21#include "elm_part_helper.h"
22#include "elm_widget_combobox.h" 22#include "elm_widget_combobox.h"
23 23
24/* FIXME: remove this when we don't rely on evas event structs anymore */
25#define EFL_INTERNAL_UNSTABLE
26#include "interfaces/efl_common_internal.h"
27
28#define MY_CLASS EFL_UI_WIDGET_CLASS 24#define MY_CLASS EFL_UI_WIDGET_CLASS
29 25
30#define MY_CLASS_NAME "Efl_Ui_Widget" 26#define MY_CLASS_NAME "Efl_Ui_Widget"
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index d6253f1..e6fb019 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -26,9 +26,6 @@
26 26
27#include "../evas/canvas/evas_box_eo.h" 27#include "../evas/canvas/evas_box_eo.h"
28 28
29#define EFL_INTERNAL_UNSTABLE
30#include "interfaces/efl_common_internal.h"
31
32#include "elm_part_helper.h" 29#include "elm_part_helper.h"
33#include "efl_ui_win_part.eo.h" 30#include "efl_ui_win_part.eo.h"
34#include "elm_plug_eo.h" 31#include "elm_plug_eo.h"
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h
index fede13f..0d71bd0 100644
--- a/src/lib/elementary/elm_priv.h
+++ b/src/lib/elementary/elm_priv.h
@@ -23,6 +23,7 @@
23 23
24// Evas internal EO APIs 24// Evas internal EO APIs
25# include "Evas.h" 25# include "Evas.h"
26#define EFL_INTERNAL_UNSTABLE
26# include "Evas_Internal.h" 27# include "Evas_Internal.h"
27# include "Emotion.h" 28# include "Emotion.h"
28 29
diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 9a86bfd..a642386 100644
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -13,6 +13,7 @@
13# include <Eio.h> 13# include <Eio.h>
14#endif 14#endif
15 15
16#define EFL_INTERNAL_UNSTABLE
16#include <Evas_Internal.h> 17#include <Evas_Internal.h>
17 18
18#include "Emotion.h" 19#include "Emotion.h"
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index cd8bf52..dcb3836 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -45,6 +45,19 @@ extern "C" {
45#include <canvas/efl_canvas_animation_types.eot.h> 45#include <canvas/efl_canvas_animation_types.eot.h>
46#include <gesture/efl_canvas_gesture_types.eot.h> 46#include <gesture/efl_canvas_gesture_types.eot.h>
47 47
48/* Input events */
49#include "canvas/efl_input_device.eo.h"
50#include "canvas/efl_canvas_pointer.eo.h"
51#include "canvas/efl_canvas_scene.eo.h"
52#include "canvas/efl_input_state.eo.h"
53#include "canvas/efl_input_event.eo.h"
54#include "canvas/efl_input_pointer.eo.h"
55#include "canvas/efl_input_key.eo.h"
56#include "canvas/efl_input_hold.eo.h"
57#include "canvas/efl_input_interface.eo.h"
58#include "canvas/efl_input_focus.eo.h"
59#include "canvas/efl_input_clickable.eo.h"
60
48#include <gesture/efl_canvas_gesture.eo.h> 61#include <gesture/efl_canvas_gesture.eo.h>
49#include <gesture/efl_canvas_gesture_touch.eo.h> 62#include <gesture/efl_canvas_gesture_touch.eo.h>
50#include <gesture/efl_canvas_gesture_recognizer.eo.h> 63#include <gesture/efl_canvas_gesture_recognizer.eo.h>
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 1ae09bf..f68f544 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -3488,13 +3488,29 @@ typedef Eo Efl_Animation_Group_Sequential;
3488#define EFL_ANIMATION_REPEAT_INFINITE -1 3488#define EFL_ANIMATION_REPEAT_INFINITE -1
3489#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1 3489#define EFL_ANIMATION_PLAYER_REPEAT_INFINITE -1
3490 3490
3491#ifndef _EFL_INPUT_DEVICE_EO_H_ 3491// The below type are necessary for legacy API and need to be manually kept in sync with .eo file.
3492#define _EFL_INPUT_DEVICE_EO_H_ 3492#ifndef _EFL_INPUT_DEVICE_EO_CLASS_TYPE
3493#define _EFL_INPUT_DEVICE_EO_CLASS_TYPE
3493typedef Eo Efl_Input_Device; 3494typedef Eo Efl_Input_Device;
3494typedef unsigned int Efl_Input_Device_Type; 3495#endif
3496
3497#ifndef _EFL_INPUT_DEVICE_EO_TYPES
3498#define _EFL_INPUT_DEVICE_EO_TYPES
3499typedef enum
3500{
3501 EFL_INPUT_DEVICE_TYPE_NONE = 0,
3502 EFL_INPUT_DEVICE_TYPE_SEAT,
3503 EFL_INPUT_DEVICE_TYPE_KEYBOARD,
3504 EFL_INPUT_DEVICE_TYPE_MOUSE,
3505 EFL_INPUT_DEVICE_TYPE_TOUCH,
3506 EFL_INPUT_DEVICE_TYPE_PEN,
3507 EFL_INPUT_DEVICE_TYPE_WAND,
3508 EFL_INPUT_DEVICE_TYPE_GAMEPAD
3509} Efl_Input_Device_Type;
3495 3510
3496#endif 3511#endif
3497 3512
3513
3498#ifndef _EFL_TEXT_CURSOR_EO_H_ 3514#ifndef _EFL_TEXT_CURSOR_EO_H_
3499#define _EFL_TEXT_CURSOR_EO_H_ 3515#define _EFL_TEXT_CURSOR_EO_H_
3500 3516
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 5f46511..ddf3b2d 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -185,6 +185,20 @@ struct _Efl_Canvas_Object_Animation_Event
185 * @} 185 * @}
186 */ 186 */
187 187
188/* Input events */
189#include "interfaces/efl_input_types.eot.h"
190#include "canvas/efl_input_device.eo.h"
191#include "canvas/efl_canvas_pointer.eo.h"
192#include "canvas/efl_canvas_scene.eo.h"
193#include "canvas/efl_input_state.eo.h"
194#include "canvas/efl_input_event.eo.h"
195#include "canvas/efl_input_pointer.eo.h"
196#include "canvas/efl_input_key.eo.h"
197#include "canvas/efl_input_hold.eo.h"
198#include "canvas/efl_input_interface.eo.h"
199#include "canvas/efl_input_focus.eo.h"
200#include "canvas/efl_input_clickable.eo.h"
201
188#include "canvas/efl_canvas_animation_types.eot.h" 202#include "canvas/efl_canvas_animation_types.eot.h"
189 203
190#include "gesture/efl_canvas_gesture_types.eot.h" 204#include "gesture/efl_canvas_gesture_types.eot.h"
@@ -457,12 +471,3 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
457#include "canvas/efl_canvas_vg_gradient.eo.h" 471#include "canvas/efl_canvas_vg_gradient.eo.h"
458#include "canvas/efl_canvas_vg_gradient_linear.eo.h" 472#include "canvas/efl_canvas_vg_gradient_linear.eo.h"
459#include "canvas/efl_canvas_vg_gradient_radial.eo.h" 473#include "canvas/efl_canvas_vg_gradient_radial.eo.h"
460
461#include "canvas/efl_input_state.eo.h"
462#include "canvas/efl_input_event.eo.h"
463#include "canvas/efl_input_pointer.eo.h"
464#include "canvas/efl_input_key.eo.h"
465#include "canvas/efl_input_hold.eo.h"
466#include "canvas/efl_input_interface.eo.h"
467#include "canvas/efl_input_focus.eo.h"
468#include "canvas/efl_input_clickable.eo.h"
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 15e4ed1..baf7cd5 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -32,6 +32,166 @@
32extern "C" { 32extern "C" {
33#endif 33#endif
34 34
35
36#ifndef EFL_INTERNAL_UNSTABLE
37# error This file can not be included outside EFL
38#endif
39
40#include <Efl.h>
41
42typedef struct _Efl_Input_Pointer_Data Efl_Input_Pointer_Data;
43typedef struct _Efl_Input_Key_Data Efl_Input_Key_Data;
44typedef struct _Efl_Input_Device_Data Efl_Input_Device_Data;
45typedef struct _Efl_Input_Hold_Data Efl_Input_Hold_Data;
46typedef struct _Efl_Input_Focus_Data Efl_Input_Focus_Data;
47
48#ifndef _EVAS_TYPES_EOT_H_
49typedef struct _Evas_Modifier Evas_Modifier;
50typedef struct _Evas_Lock Evas_Lock;
51#endif
52
53struct _Efl_Input_Pointer_Data
54{
55 Eo *eo;
56 unsigned int timestamp; /* FIXME: store as double? */
57 int button;
58 unsigned int pressed_buttons;
59 int touch_id; /* finger or tool ID */
60 double radius, radius_x, radius_y;
61 double pressure, distance, azimuth, tilt, twist;
62 double angle;
63 /* current, previous positions in window coordinates.
64 * raw can be either un-smoothed, un-predicted x,y or a tablet's raw input.
65 * norm is the normalized value in [0..1] for tablet input.
66 */
67 Eina_Vector2 cur, prev, raw, norm;
68 struct {
69 int z;
70 Eina_Bool horizontal;
71 } wheel;
72 Efl_Gfx_Entity *source; /* could it be ecore? */
73 Efl_Input_Device *device;
74 Efl_Pointer_Action action;
75 Efl_Pointer_Flags button_flags;
76 Efl_Input_Flags event_flags;
77 void *data; /* evas data - whatever that is */
78 Eina_Bool window_pos; /* true if positions are window-relative
79 (see input vs. feed: this is "input") */
80 Evas_Modifier *modifiers;
81 Evas_Lock *locks;
82 void *legacy; /* DO NOT TOUCH THIS */
83 uint32_t value_flags;
84 Eina_Bool has_norm : 1; /* not in value_flags */
85 Eina_Bool has_raw : 1; /* not in value_flags */
86 Eina_Bool evas_done : 1; /* set by evas */
87 Eina_Bool fake : 1;
88 Eina_Bool win_fed : 1;
89};
90
91struct _Efl_Input_Key_Data
92{
93 Eo *eo;
94 unsigned int timestamp; /* FIXME: store as double? */
95
96 Eina_Bool pressed; /* 1 = pressed/down, 0 = released/up */
97 Eina_Stringshare *keyname;
98 Eina_Stringshare *key;
99 Eina_Stringshare *string;
100 Eina_Stringshare *compose;
101 unsigned int keycode;
102
103 void *data;
104 Evas_Modifier *modifiers;
105 Evas_Lock *locks;
106 Efl_Input_Flags event_flags;
107 Efl_Input_Device *device;
108 void *legacy; /* DO NOT TOUCH THIS */
109 Eina_Bool evas_done : 1; /* set by evas */
110 Eina_Bool fake : 1;
111 Eina_Bool win_fed : 1;
112 Eina_Bool no_stringshare : 1;
113};
114
115struct _Efl_Input_Device_Data
116{
117 Eo *eo;
118 Eo *evas; /* Evas */
119 Efl_Input_Device *source; /* ref */
120 Eina_List *children; /* ref'ed by efl_parent, not by this list */
121 unsigned int id;
122 Efl_Input_Device_Type klass;
123 unsigned int subclass; // Evas_Device_Subclass (unused)
124 unsigned int pointer_count;
125};
126
127struct _Efl_Input_Hold_Data
128{
129 Eo *eo;
130 double timestamp;
131 Efl_Input_Flags event_flags;
132 Efl_Input_Device *device;
133 void *data;
134 void *legacy; /* DO NOT TOUCH THIS */
135 Eina_Bool hold : 1;
136 Eina_Bool evas_done : 1; /* set by evas */
137};
138
139struct _Efl_Input_Focus_Data
140{
141 Eo *eo;
142 Efl_Input_Device *device; //The seat
143 Eo *object_wref; // wref on the focused object - Efl.Canvas.Object or Efl.Canvas.
144 double timestamp;
145 Efl_Input_Flags event_flags;
146};
147
148/* Internal helpers */
149
150static inline const char *
151_efl_input_modifier_to_string(Efl_Input_Modifier mod)
152{
153 switch (mod)
154 {
155 default:
156 case EFL_INPUT_MODIFIER_NONE: return NULL;
157 case EFL_INPUT_MODIFIER_ALT: return "Alt";
158 case EFL_INPUT_MODIFIER_CONTROL: return "Control";
159 case EFL_INPUT_MODIFIER_SHIFT: return "Shift";
160 case EFL_INPUT_MODIFIER_META: return "Meta";
161 case EFL_INPUT_MODIFIER_ALTGR: return "AltGr";
162 case EFL_INPUT_MODIFIER_HYPER: return "Hyper";
163 case EFL_INPUT_MODIFIER_SUPER: return "Super";
164 }
165}
166
167static inline const char *
168_efl_input_lock_to_string(Efl_Input_Lock lock)
169{
170 switch (lock)
171 {
172 default:
173 case EFL_INPUT_LOCK_NONE: return NULL;
174 case EFL_INPUT_LOCK_NUM: return "Num";
175 case EFL_INPUT_LOCK_CAPS: return "Caps";
176 case EFL_INPUT_LOCK_SCROLL: return "Scroll";
177 case EFL_INPUT_LOCK_SHIFT: return "Shift";
178 }
179}
180
181static inline Eina_Bool
182_efl_input_value_has(const Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
183{
184 return (pd->value_flags & (1u << (int) key)) != 0;
185}
186
187static inline void
188_efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
189{
190 pd->value_flags |= (1u << (int) key);
191}
192
193#define _efl_input_value_mask(key) (1u << (int) key)
194
35typedef struct _Efl_Canvas_Output Efl_Canvas_Output; 195typedef struct _Efl_Canvas_Output Efl_Canvas_Output;
36 196
37EAPI Efl_Canvas_Output *efl_canvas_output_add(Evas *canvas); 197EAPI Efl_Canvas_Output *efl_canvas_output_add(Evas *canvas);
diff --git a/src/lib/efl/interfaces/efl_canvas_pointer.eo b/src/lib/evas/canvas/efl_canvas_pointer.eo
index f0c363a..f0c363a 100644
--- a/src/lib/efl/interfaces/efl_canvas_pointer.eo
+++ b/src/lib/evas/canvas/efl_canvas_pointer.eo
diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/evas/canvas/efl_canvas_scene.eo
index b31f0ba..b31f0ba 100644
--- a/src/lib/efl/interfaces/efl_canvas_scene.eo
+++ b/src/lib/evas/canvas/efl_canvas_scene.eo
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/evas/canvas/efl_input_device.c
index bd77780..690db76 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/evas/canvas/efl_input_device.c
@@ -2,10 +2,9 @@
2# include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include <Efl.h> 5#include "Evas.h"
6
7#define EFL_INTERNAL_UNSTABLE 6#define EFL_INTERNAL_UNSTABLE
8#include "efl_common_internal.h" 7#include "Evas_Internal.h"
9 8
10#define MY_CLASS EFL_INPUT_DEVICE_CLASS 9#define MY_CLASS EFL_INPUT_DEVICE_CLASS
11 10
@@ -228,4 +227,4 @@ _efl_input_device_is_pointer_type_get(const Eo *obj EINA_UNUSED, Efl_Input_Devic
228} 227}
229 228
230 229
231#include "interfaces/efl_input_device.eo.c" 230#include "efl_input_device.eo.c"
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/evas/canvas/efl_input_device.eo
index dda39b1..dda39b1 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/evas/canvas/efl_input_device.eo
diff --git a/src/lib/evas/canvas/efl_input_event.c b/src/lib/evas/canvas/efl_input_event.c
index 3274b31..90bddde 100644
--- a/src/lib/evas/canvas/efl_input_event.c
+++ b/src/lib/evas/canvas/efl_input_event.c
@@ -5,12 +5,10 @@
5#define EFL_INPUT_EVENT_PROTECTED 5#define EFL_INPUT_EVENT_PROTECTED
6 6
7#include <Evas.h> 7#include <Evas.h>
8#define EFL_INTERNAL_UNSTABLE
8#include <Evas_Internal.h> 9#include <Evas_Internal.h>
9#include "canvas/evas_canvas_eo.h" 10#include "canvas/evas_canvas_eo.h"
10 11
11#define EFL_INTERNAL_UNSTABLE
12#include "interfaces/efl_common_internal.h"
13
14#define MY_CLASS EFL_INPUT_EVENT_MIXIN 12#define MY_CLASS EFL_INPUT_EVENT_MIXIN
15 13
16EOLIAN static void 14EOLIAN static void
diff --git a/src/lib/evas/canvas/efl_input_focus.c b/src/lib/evas/canvas/efl_input_focus.c
index d7b18de..cb154a0 100644
--- a/src/lib/evas/canvas/efl_input_focus.c
+++ b/src/lib/evas/canvas/efl_input_focus.c
@@ -9,11 +9,6 @@
9 9
10#include <Evas.h> 10#include <Evas.h>
11 11
12#include <Evas_Internal.h>
13
14#define EFL_INTERNAL_UNSTABLE
15#include "interfaces/efl_common_internal.h"
16
17#define MY_CLASS EFL_INPUT_FOCUS_CLASS 12#define MY_CLASS EFL_INPUT_FOCUS_CLASS
18 13
19static void 14static void
diff --git a/src/lib/evas/canvas/efl_input_hold.c b/src/lib/evas/canvas/efl_input_hold.c
index c23f043..b5ad65b 100644
--- a/src/lib/evas/canvas/efl_input_hold.c
+++ b/src/lib/evas/canvas/efl_input_hold.c
@@ -7,9 +7,6 @@
7#include "evas_common_private.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10#define EFL_INTERNAL_UNSTABLE
11#include "interfaces/efl_common_internal.h"
12
13#define MY_CLASS EFL_INPUT_HOLD_CLASS 10#define MY_CLASS EFL_INPUT_HOLD_CLASS
14 11
15EOLIAN static void 12EOLIAN static void
diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c
index 07d5a63..79c833c 100644
--- a/src/lib/evas/canvas/efl_input_key.c
+++ b/src/lib/evas/canvas/efl_input_key.c
@@ -7,9 +7,6 @@
7#include "evas_common_private.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10#define EFL_INTERNAL_UNSTABLE
11#include "interfaces/efl_common_internal.h"
12
13#define MY_CLASS EFL_INPUT_KEY_CLASS 10#define MY_CLASS EFL_INPUT_KEY_CLASS
14 11
15EOAPI Eo* 12EOAPI Eo*
diff --git a/src/lib/evas/canvas/efl_input_pointer.c b/src/lib/evas/canvas/efl_input_pointer.c
index 8b16c57..33cb80c 100644
--- a/src/lib/evas/canvas/efl_input_pointer.c
+++ b/src/lib/evas/canvas/efl_input_pointer.c
@@ -7,9 +7,6 @@
7#include "evas_common_private.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10#define EFL_INTERNAL_UNSTABLE
11#include "interfaces/efl_common_internal.h"
12
13#define MY_CLASS EFL_INPUT_POINTER_CLASS 10#define MY_CLASS EFL_INPUT_POINTER_CLASS
14 11
15 12
diff --git a/src/lib/efl/interfaces/efl_input_types.eot b/src/lib/evas/canvas/efl_input_types.eot
index a716686..a716686 100644
--- a/src/lib/efl/interfaces/efl_input_types.eot
+++ b/src/lib/evas/canvas/efl_input_types.eot
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 65b78f2..d19ce68 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -2,9 +2,6 @@
2#include "evas_common_private.h" 2#include "evas_common_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4 4
5#define EFL_INTERNAL_UNSTABLE
6#include "interfaces/efl_common_internal.h"
7
8EVAS_MEMPOOL(_mp_pc); 5EVAS_MEMPOOL(_mp_pc);
9 6
10extern Eina_Hash* signals_hash_table; 7extern Eina_Hash* signals_hash_table;
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 660f657..5f5e1aa 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -1,9 +1,6 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define EFL_INTERNAL_UNSTABLE
5#include "interfaces/efl_common_internal.h"
6
7/* WARNING: This API is not used across EFL, hard to test! */ 4/* WARNING: This API is not used across EFL, hard to test! */
8 5
9#ifdef DEBUG_UNTESTED_ 6#ifdef DEBUG_UNTESTED_
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 46a765e..bb8c934 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -3,9 +3,6 @@
3#include "evas_common_private.h" 3#include "evas_common_private.h"
4#include "evas_private.h" 4#include "evas_private.h"
5 5
6#define EFL_INTERNAL_UNSTABLE
7#include "interfaces/efl_common_internal.h"
8
9int _evas_event_counter = 0; 6int _evas_event_counter = 0;
10 7
11static Eina_List * 8static Eina_List *
diff --git a/src/lib/evas/canvas/evas_events_legacy.c b/src/lib/evas/canvas/evas_events_legacy.c
index 4675735..1204800 100644
--- a/src/lib/evas/canvas/evas_events_legacy.c
+++ b/src/lib/evas/canvas/evas_events_legacy.c
@@ -1,9 +1,6 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define EFL_INTERNAL_UNSTABLE
5#include "interfaces/efl_common_internal.h"
6
7typedef union { 4typedef union {
8 Evas_Event_Mouse_Down down; 5 Evas_Event_Mouse_Down down;
9 Evas_Event_Mouse_Up up; 6 Evas_Event_Mouse_Up up;
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index d76c104..e11df78 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -3,8 +3,6 @@
3 3
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
6#include "interfaces/efl_common_internal.h"
7
8 6
9static int evas_focus_log_domain = -1; 7static int evas_focus_log_domain = -1;
10 8
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index aaf6e6a..5c8969c 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -1,9 +1,6 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#define EFL_INTERNAL_UNSTABLE
5#include "interfaces/efl_common_internal.h"
6
7/* private calls */ 4/* private calls */
8 5
9/* FIXME: this is not optimal, but works. i should have a hash of keys per */ 6/* FIXME: this is not optimal, but works. i should have a hash of keys per */
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 92c9ed2..6d4c07c 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -16,9 +16,6 @@
16 16
17#include <Ecore.h> 17#include <Ecore.h>
18 18
19#define EFL_INTERNAL_UNSTABLE
20#include "interfaces/efl_common_internal.h"
21
22#define MY_CLASS EVAS_CANVAS_CLASS 19#define MY_CLASS EVAS_CANVAS_CLASS
23 20
24#ifdef LKDEBUG 21#ifdef LKDEBUG
@@ -2052,3 +2049,5 @@ _evas_canvas_efl_object_event_callback_array_priority_add(Eo *obj, Evas_Public_D
2052 2049
2053#include "evas_stack.x" 2050#include "evas_stack.x"
2054#include "canvas/evas_canvas_eo.c" 2051#include "canvas/evas_canvas_eo.c"
2052#include "efl_canvas_pointer.eo.c"
2053#include "efl_canvas_scene.eo.c"
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 758a8db..1edaeca 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -28,6 +28,9 @@ pub_eo_files = [
28 'efl_input_hold.eo', 28 'efl_input_hold.eo',
29 'efl_input_focus.eo', 29 'efl_input_focus.eo',
30 'efl_input_clickable.eo', 30 'efl_input_clickable.eo',
31 'efl_input_device.eo',
32 'efl_canvas_pointer.eo',
33 'efl_canvas_scene.eo',
31 'efl_canvas_animation.eo', 34 'efl_canvas_animation.eo',
32 'efl_canvas_animation_alpha.eo', 35 'efl_canvas_animation_alpha.eo',
33 'efl_canvas_animation_rotate.eo', 36 'efl_canvas_animation_rotate.eo',
@@ -52,7 +55,7 @@ pub_eo_files = [
52 'efl_canvas_group.eo', 55 'efl_canvas_group.eo',
53 'efl_gfx_mapping.eo', 56 'efl_gfx_mapping.eo',
54 'efl_canvas_event_grabber.eo', 57 'efl_canvas_event_grabber.eo',
55 'efl_canvas_text.eo' 58 'efl_canvas_text.eo',
56] 59]
57 60
58evas_canvas_eo_files = pub_eo_files 61evas_canvas_eo_files = pub_eo_files
@@ -76,7 +79,8 @@ endforeach
76 79
77pub_eo_types_files = [ 80pub_eo_types_files = [
78 'evas_canvas3d_types.eot', 81 'evas_canvas3d_types.eot',
79 'efl_canvas_animation_types.eot' 82 'efl_canvas_animation_types.eot',
83 'efl_input_types.eot',
80] 84]
81 85
82evas_canvas_eot_files = pub_eo_types_files 86evas_canvas_eot_files = pub_eo_types_files
@@ -171,6 +175,7 @@ evas_src += files([
171 'efl_input_hold.c', 175 'efl_input_hold.c',
172 'efl_input_focus.c', 176 'efl_input_focus.c',
173 'efl_input_clickable.c', 177 'efl_input_clickable.c',
178 'efl_input_device.c',
174 'efl_canvas_animation.c', 179 'efl_canvas_animation.c',
175 'efl_canvas_animation_alpha.c', 180 'efl_canvas_animation_alpha.c',
176 'efl_canvas_animation_rotate.c', 181 'efl_canvas_animation_rotate.c',
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_private.h b/src/lib/evas/gesture/efl_canvas_gesture_private.h
index ceb7ca7..a835c30 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_private.h
+++ b/src/lib/evas/gesture/efl_canvas_gesture_private.h
@@ -3,8 +3,6 @@
3 3
4#include "evas_common_private.h" 4#include "evas_common_private.h"
5#include "evas_private.h" 5#include "evas_private.h"
6#define EFL_INTERNAL_UNSTABLE
7#include "interfaces/efl_common_internal.h"
8 6
9#include "efl_gesture_events.eo.h" 7#include "efl_gesture_events.eo.h"
10 8
diff --git a/src/lib/evas/include/evas_common_private.h b/src/lib/evas/include/evas_common_private.h
index 59eb800..5fecf3f 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -54,6 +54,7 @@
54 54
55#include "Evas.h" 55#include "Evas.h"
56 56
57#define EFL_INTERNAL_UNSTABLE
57#include "Evas_Internal.h" 58#include "Evas_Internal.h"
58 59
59#include "../common/evas_font.h" 60#include "../common/evas_font.h"