summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-03-08 16:40:36 +0100
committerDaniel Kolesa <d.kolesa@samsung.com>2019-03-09 22:18:59 +0100
commit89544426f9664f07458aa15f515fc0052f516e1b (patch)
treefd7ab292d6792d717f53a3652578b52481951310
parentafe26b831d110230174cf17e5bdaeeb784155abe (diff)
efl: remove all remaining .eo.legacy.h includesdevs/q66/remove-generated-legacy-includes
Summary: This is a little hacky (especially wrt the efl_access header files being created) but we need this in order to be able to fully remove legacy header generation in eolian. Reviewers: cedric, zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8258
-rw-r--r--src/Makefile_Elementary.am3
-rw-r--r--src/lib/elementary/efl_access_object.h2
-rw-r--r--src/lib/elementary/efl_access_object_eo.legacy.h299
-rw-r--r--src/lib/elementary/efl_access_text.h2
-rw-r--r--src/lib/elementary/efl_access_text_eo.legacy.h74
-rw-r--r--src/lib/elementary/efl_access_widget_action.h5
-rw-r--r--src/lib/elementary/efl_access_window.h5
-rw-r--r--src/lib/elementary/elm_interface_scrollable.h2
-rw-r--r--src/lib/elementary/elm_interface_scrollable_eo.legacy.h50
-rw-r--r--src/lib/elementary/elm_interfaces.h32
-rw-r--r--src/lib/elementary/elm_layout_legacy.h6
-rw-r--r--src/lib/elementary/elm_scroller_legacy.h2
-rw-r--r--src/lib/elementary/meson.build3
13 files changed, 472 insertions, 13 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 05a2c60a32..bb4e689caa 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -426,6 +426,8 @@ lib/elementary/efl_ui_widget_eo.legacy.h \
426lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h \ 426lib/elementary/efl_ui_win_inlined_legacy_eo.legacy.h \
427lib/elementary/efl_ui_win_legacy_eo.legacy.h \ 427lib/elementary/efl_ui_win_legacy_eo.legacy.h \
428lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \ 428lib/elementary/efl_ui_win_socket_legacy_eo.legacy.h \
429lib/elementary/efl_access_object_eo.legacy.h \
430lib/elementary/efl_access_text_eo.legacy.h \
429lib/elementary/elm_access_eo.legacy.h \ 431lib/elementary/elm_access_eo.legacy.h \
430lib/elementary/elm_actionslider_eo.legacy.h \ 432lib/elementary/elm_actionslider_eo.legacy.h \
431lib/elementary/elm_box_eo.legacy.h \ 433lib/elementary/elm_box_eo.legacy.h \
@@ -466,6 +468,7 @@ lib/elementary/elm_icon_eo.legacy.h \
466lib/elementary/elm_index_eo.legacy.h \ 468lib/elementary/elm_index_eo.legacy.h \
467lib/elementary/elm_index_item_eo.legacy.h \ 469lib/elementary/elm_index_item_eo.legacy.h \
468lib/elementary/elm_interface_fileselector_eo.legacy.h \ 470lib/elementary/elm_interface_fileselector_eo.legacy.h \
471lib/elementary/elm_interface_scrollable_eo.legacy.h \
469lib/elementary/elm_inwin_eo.legacy.h \ 472lib/elementary/elm_inwin_eo.legacy.h \
470lib/elementary/elm_label_eo.legacy.h \ 473lib/elementary/elm_label_eo.legacy.h \
471lib/elementary/elm_list_eo.legacy.h \ 474lib/elementary/elm_list_eo.legacy.h \
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index b42db31f7f..9fce897773 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -7,7 +7,7 @@
7#include "efl_access_object.eo.h" 7#include "efl_access_object.eo.h"
8#endif 8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT 9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_object.eo.legacy.h" 10#include "efl_access_object_eo.legacy.h"
11#endif 11#endif
12 12
13/* 13/*
diff --git a/src/lib/elementary/efl_access_object_eo.legacy.h b/src/lib/elementary/efl_access_object_eo.legacy.h
new file mode 100644
index 0000000000..32f04307de
--- /dev/null
+++ b/src/lib/elementary/efl_access_object_eo.legacy.h
@@ -0,0 +1,299 @@
1#ifndef _EFL_ACCESS_OBJECT_EO_LEGACY_H_
2#define _EFL_ACCESS_OBJECT_EO_LEGACY_H_
3
4#ifndef _EFL_ACCESS_OBJECT_EO_CLASS_TYPE
5#define _EFL_ACCESS_OBJECT_EO_CLASS_TYPE
6
7typedef Eo Efl_Access_Object;
8
9#endif
10
11#ifndef _EFL_ACCESS_OBJECT_EO_TYPES
12#define _EFL_ACCESS_OBJECT_EO_TYPES
13
14/** Type of accessibility object
15 *
16 * @ingroup Efl_Access
17 */
18typedef enum
19{
20 EFL_ACCESS_TYPE_REGULAR = 0, /**< default accessible object */
21 EFL_ACCESS_TYPE_DISABLED, /**< skip object and its children in accessibility
22 * hierarchy */
23 EFL_ACCESS_TYPE_SKIPPED /**< skip object in accessibility hierarchy */
24} Efl_Access_Type;
25
26/** Describes the role of an object visible to Accessibility Clients.
27 *
28 * @ingroup Efl_Access
29 */
30typedef enum
31{
32 EFL_ACCESS_ROLE_INVALID = 0, /**< Role: invalid */
33 EFL_ACCESS_ROLE_ACCELERATOR_LABEL, /**< Role: accelerator label */
34 EFL_ACCESS_ROLE_ALERT, /**< Role: alert */
35 EFL_ACCESS_ROLE_ANIMATION, /**< Role: animation */
36 EFL_ACCESS_ROLE_ARROW, /**< Role: arrow */
37 EFL_ACCESS_ROLE_CALENDAR, /**< Role: calendar */
38 EFL_ACCESS_ROLE_CANVAS, /**< Role: canvas */
39 EFL_ACCESS_ROLE_CHECK_BOX, /**< Role: check box */
40 EFL_ACCESS_ROLE_CHECK_MENU_ITEM, /**< Role: check menu item */
41 EFL_ACCESS_ROLE_COLOR_CHOOSER, /**< Role: color chooser */
42 EFL_ACCESS_ROLE_COLUMN_HEADER, /**< Role: column header */
43 EFL_ACCESS_ROLE_COMBO_BOX, /**< Role: combo box */
44 EFL_ACCESS_ROLE_DATE_EDITOR, /**< Role: data editor */
45 EFL_ACCESS_ROLE_DESKTOP_ICON, /**< Role: desktop icon */
46 EFL_ACCESS_ROLE_DESKTOP_FRAME, /**< Role: desktop frame */
47 EFL_ACCESS_ROLE_DIAL, /**< Role: dial */
48 EFL_ACCESS_ROLE_DIALOG, /**< Role: dialog */
49 EFL_ACCESS_ROLE_DIRECTORY_PANE, /**< Role: directory pane */
50 EFL_ACCESS_ROLE_DRAWING_AREA, /**< Role: drawing area */
51 EFL_ACCESS_ROLE_FILE_CHOOSER, /**< Role: file chooser */
52 EFL_ACCESS_ROLE_FILLER, /**< Role: filler */
53 EFL_ACCESS_ROLE_FOCUS_TRAVERSABLE, /**< Role: focus traversable */
54 EFL_ACCESS_ROLE_FONT_CHOOSER, /**< Role: font chooser */
55 EFL_ACCESS_ROLE_FRAME, /**< Role: frame */
56 EFL_ACCESS_ROLE_GLASS_PANE, /**< Role: glass pane */
57 EFL_ACCESS_ROLE_HTML_CONTAINER, /**< Role: HTML container */
58 EFL_ACCESS_ROLE_ICON, /**< Role: icon */
59 EFL_ACCESS_ROLE_IMAGE, /**< Role: image */
60 EFL_ACCESS_ROLE_INTERNAL_FRAME, /**< Role: internal frame */
61 EFL_ACCESS_ROLE_LABEL, /**< Role: label */
62 EFL_ACCESS_ROLE_LAYERED_PANE, /**< Role: layered pane */
63 EFL_ACCESS_ROLE_LIST, /**< Role: list */
64 EFL_ACCESS_ROLE_LIST_ITEM, /**< Role: list item */
65 EFL_ACCESS_ROLE_MENU, /**< Role: menu */
66 EFL_ACCESS_ROLE_MENU_BAR, /**< Role: menu bar */
67 EFL_ACCESS_ROLE_MENU_ITEM, /**< Role: menu item */
68 EFL_ACCESS_ROLE_OPTION_PANE, /**< Role: option pane */
69 EFL_ACCESS_ROLE_PAGE_TAB, /**< Role: page tab */
70 EFL_ACCESS_ROLE_PAGE_TAB_LIST, /**< Role: page tab list */
71 EFL_ACCESS_ROLE_PANEL, /**< Role: panel */
72 EFL_ACCESS_ROLE_PASSWORD_TEXT, /**< Role: password text */
73 EFL_ACCESS_ROLE_POPUP_MENU, /**< Role: popup menu */
74 EFL_ACCESS_ROLE_PROGRESS_BAR, /**< Role: progress bar */
75 EFL_ACCESS_ROLE_PUSH_BUTTON, /**< Role: push button */
76 EFL_ACCESS_ROLE_RADIO_BUTTON, /**< Role: radio button */
77 EFL_ACCESS_ROLE_RADIO_MENU_ITEM, /**< Role: radio menu item */
78 EFL_ACCESS_ROLE_ROOT_PANE, /**< Role: root pane */
79 EFL_ACCESS_ROLE_ROW_HEADER, /**< Role: row header */
80 EFL_ACCESS_ROLE_SCROLL_BAR, /**< Role: scroll bar */
81 EFL_ACCESS_ROLE_SCROLL_PANE, /**< Role: scroll pane */
82 EFL_ACCESS_ROLE_SEPARATOR, /**< Role: separator */
83 EFL_ACCESS_ROLE_SLIDER, /**< Role: slider */
84 EFL_ACCESS_ROLE_SPIN_BUTTON, /**< Role: spin button */
85 EFL_ACCESS_ROLE_SPLIT_PANE, /**< Role: split pane */
86 EFL_ACCESS_ROLE_STATUS_BAR, /**< Role: status bar */
87 EFL_ACCESS_ROLE_TABLE, /**< Role: table */
88 EFL_ACCESS_ROLE_TABLE_CELL, /**< Role: table cell */
89 EFL_ACCESS_ROLE_TABLE_COLUMN_HEADER, /**< Role: table column header */
90 EFL_ACCESS_ROLE_TABLE_ROW_HEADER, /**< Role: table row header */
91 EFL_ACCESS_ROLE_TEAROFF_MENU_ITEM, /**< Role: tearoff menu item */
92 EFL_ACCESS_ROLE_TERMINAL, /**< Role: terminal */
93 EFL_ACCESS_ROLE_TEXT, /**< Role: text */
94 EFL_ACCESS_ROLE_TOGGLE_BUTTON, /**< Role: toggle button */
95 EFL_ACCESS_ROLE_TOOL_BAR, /**< Role: too bar */
96 EFL_ACCESS_ROLE_TOOL_TIP, /**< Role: tool tip */
97 EFL_ACCESS_ROLE_TREE, /**< Role: tree */
98 EFL_ACCESS_ROLE_TREE_TABLE, /**< Role: tree table */
99 EFL_ACCESS_ROLE_UNKNOWN, /**< Role: unknown */
100 EFL_ACCESS_ROLE_VIEWPORT, /**< Role: viewport */
101 EFL_ACCESS_ROLE_WINDOW, /**< Role: window */
102 EFL_ACCESS_ROLE_EXTENDED, /**< Role: extended */
103 EFL_ACCESS_ROLE_HEADER, /**< Role: header */
104 EFL_ACCESS_ROLE_FOOTER, /**< Role: footer */
105 EFL_ACCESS_ROLE_PARAGRAPH, /**< Role: paragraph */
106 EFL_ACCESS_ROLE_RULER, /**< Role: ruler */
107 EFL_ACCESS_ROLE_APPLICATION, /**< Role: application */
108 EFL_ACCESS_ROLE_AUTOCOMPLETE, /**< Role: autocomplete */
109 EFL_ACCESS_ROLE_EDITBAR, /**< Role: editbar */
110 EFL_ACCESS_ROLE_EMBEDDED, /**< Role: embedded */
111 EFL_ACCESS_ROLE_ENTRY, /**< Role: entry */
112 EFL_ACCESS_ROLE_CHART, /**< Role: chart */
113 EFL_ACCESS_ROLE_CAPTION, /**< Role: caption */
114 EFL_ACCESS_ROLE_DOCUMENT_FRAME, /**< Role: document frame */
115 EFL_ACCESS_ROLE_HEADING, /**< Role: heading */
116 EFL_ACCESS_ROLE_PAGE, /**< Role: page */
117 EFL_ACCESS_ROLE_SECTION, /**< Role: section */
118 EFL_ACCESS_ROLE_REDUNDANT_OBJECT, /**< Role: redundant object */
119 EFL_ACCESS_ROLE_FORM, /**< Role: form */
120 EFL_ACCESS_ROLE_LINK, /**< Role: link */
121 EFL_ACCESS_ROLE_INPUT_METHOD_WINDOW, /**< Role: input method window */
122 EFL_ACCESS_ROLE_TABLE_ROW, /**< Role: table row */
123 EFL_ACCESS_ROLE_TREE_ITEM, /**< Role: table item */
124 EFL_ACCESS_ROLE_DOCUMENT_SPREADSHEET, /**< Role: document spreadsheet */
125 EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION, /**< Role: document presentation */
126 EFL_ACCESS_ROLE_DOCUMENT_TEXT, /**< Role: document text */
127 EFL_ACCESS_ROLE_DOCUMENT_WEB, /**< Role: document web */
128 EFL_ACCESS_ROLE_DOCUMENT_EMAIL, /**< Role: document email */
129 EFL_ACCESS_ROLE_COMMENT, /**< Role: comment */
130 EFL_ACCESS_ROLE_LIST_BOX, /**< Role: list box */
131 EFL_ACCESS_ROLE_GROUPING, /**< Role: grouping */
132 EFL_ACCESS_ROLE_IMAGE_MAP, /**< Role: image map */
133 EFL_ACCESS_ROLE_NOTIFICATION, /**< Role: notification */
134 EFL_ACCESS_ROLE_INFO_BAR, /**< Role: info bar */
135 EFL_ACCESS_ROLE_LAST_DEFINED /**< Last enum entry sentinel */
136} Efl_Access_Role;
137
138/** Describes the possible states for an object visible to accessibility
139 * clients.
140 *
141 * @ingroup Efl_Access
142 */
143typedef enum
144{
145 EFL_ACCESS_STATE_TYPE_INVALID = 0, /**< State: invalid */
146 EFL_ACCESS_STATE_TYPE_ACTIVE, /**< State: active */
147 EFL_ACCESS_STATE_TYPE_ARMED, /**< State: armed */
148 EFL_ACCESS_STATE_TYPE_BUSY, /**< State: busy */
149 EFL_ACCESS_STATE_TYPE_CHECKED, /**< State: checked */
150 EFL_ACCESS_STATE_TYPE_COLLAPSED, /**< State: collapsed */
151 EFL_ACCESS_STATE_TYPE_DEFUNCT, /**< State: defunct */
152 EFL_ACCESS_STATE_TYPE_EDITABLE, /**< State: editable */
153 EFL_ACCESS_STATE_TYPE_ENABLED, /**< State: enabled */
154 EFL_ACCESS_STATE_TYPE_EXPANDABLE, /**< State: expandable */
155 EFL_ACCESS_STATE_TYPE_EXPANDED, /**< State: expanded */
156 EFL_ACCESS_STATE_TYPE_FOCUSABLE, /**< State: focusable */
157 EFL_ACCESS_STATE_TYPE_FOCUSED, /**< State: focused */
158 EFL_ACCESS_STATE_TYPE_HAS_TOOLTIP, /**< State: has a tooltip */
159 EFL_ACCESS_STATE_TYPE_HORIZONTAL, /**< State: horizontal */
160 EFL_ACCESS_STATE_TYPE_MINIMIZED, /**< State: minimized */
161 EFL_ACCESS_STATE_TYPE_MODAL, /**< State: modal */
162 EFL_ACCESS_STATE_TYPE_MULTI_LINE, /**< State: multi line */
163 EFL_ACCESS_STATE_TYPE_MULTISELECTABLE, /**< State: multiselectable */
164 EFL_ACCESS_STATE_TYPE_OPAQUE, /**< State: opaque */
165 EFL_ACCESS_STATE_TYPE_PRESSED, /**< State: pressed */
166 EFL_ACCESS_STATE_TYPE_RESIZABLE, /**< State: resizable */
167 EFL_ACCESS_STATE_TYPE_SELECTABLE, /**< State: selectable */
168 EFL_ACCESS_STATE_TYPE_SELECTED, /**< State: selected */
169 EFL_ACCESS_STATE_TYPE_SENSITIVE, /**< State: sensitive */
170 EFL_ACCESS_STATE_TYPE_SHOWING, /**< State: showing */
171 EFL_ACCESS_STATE_TYPE_SINGLE_LINE, /**< State: single line */
172 EFL_ACCESS_STATE_TYPE_STALE, /**< State: stale */
173 EFL_ACCESS_STATE_TYPE_TRANSIENT, /**< State: transient */
174 EFL_ACCESS_STATE_TYPE_VERTICAL, /**< State: vertical */
175 EFL_ACCESS_STATE_TYPE_VISIBLE, /**< State: visible */
176 EFL_ACCESS_STATE_TYPE_MANAGES_DESCENDANTS, /**< State: manage descendants */
177 EFL_ACCESS_STATE_TYPE_INDETERMINATE, /**< State: indeterminate */
178 EFL_ACCESS_STATE_TYPE_REQUIRED, /**< State: required */
179 EFL_ACCESS_STATE_TYPE_TRUNCATED, /**< State: truncated */
180 EFL_ACCESS_STATE_TYPE_ANIMATED, /**< State: animated */
181 EFL_ACCESS_STATE_TYPE_INVALID_ENTRY, /**< State: invalid entry */
182 EFL_ACCESS_STATE_TYPE_SUPPORTS_AUTOCOMPLETION, /**< State: supports
183 * autocompletion */
184 EFL_ACCESS_STATE_TYPE_SELECTABLE_TEXT, /**< State: selectable text */
185 EFL_ACCESS_STATE_TYPE_IS_DEFAULT, /**< State: is default */
186 EFL_ACCESS_STATE_TYPE_VISITED, /**< State: visited */
187 EFL_ACCESS_STATE_TYPE_LAST_DEFINED /**< Last enum entry sentinel */
188} Efl_Access_State_Type;
189
190/** Describes the relationship between two objects.
191 *
192 * @ingroup Efl_Access
193 */
194typedef enum
195{
196 EFL_ACCESS_RELATION_TYPE_NULL = 0, /**< No relation */
197 EFL_ACCESS_RELATION_TYPE_LABEL_FOR, /**< Label for relation */
198 EFL_ACCESS_RELATION_TYPE_LABELLED_BY, /**< Labelled by relation */
199 EFL_ACCESS_RELATION_TYPE_CONTROLLER_FOR, /**< Controller for relation */
200 EFL_ACCESS_RELATION_TYPE_CONTROLLED_BY, /**< Controlled by relation */
201 EFL_ACCESS_RELATION_TYPE_MEMBER_OF, /**< Member of relation */
202 EFL_ACCESS_RELATION_TYPE_TOOLTIP_FOR, /**< Tooltip for relation */
203 EFL_ACCESS_RELATION_TYPE_NODE_CHILD_OF, /**< Node child of relation */
204 EFL_ACCESS_RELATION_TYPE_NODE_PARENT_OF, /**< Node parent of relation */
205 EFL_ACCESS_RELATION_TYPE_EXTENDED, /**< Extended relation */
206 EFL_ACCESS_RELATION_TYPE_FLOWS_TO, /**< Flows to relation */
207 EFL_ACCESS_RELATION_TYPE_FLOWS_FROM, /**< Flows from relation */
208 EFL_ACCESS_RELATION_TYPE_SUBWINDOW_OF, /**< Subwindow of relation */
209 EFL_ACCESS_RELATION_TYPE_EMBEDS, /**< Embeds relation */
210 EFL_ACCESS_RELATION_TYPE_EMBEDDED_BY, /**< Embedded by relation */
211 EFL_ACCESS_RELATION_TYPE_POPUP_FOR, /**< Popup for relation */
212 EFL_ACCESS_RELATION_TYPE_PARENT_WINDOW_OF, /**< Parent window of relation */
213 EFL_ACCESS_RELATION_TYPE_DESCRIPTION_FOR, /**< Description for relation */
214 EFL_ACCESS_RELATION_TYPE_DESCRIBED_BY, /**< Described by relation */
215 EFL_ACCESS_RELATION_TYPE_LAST_DEFINED /**< Last enum entry sentinel */
216} Efl_Access_Relation_Type;
217
218/** The accessible Reading information type that can be read.
219 *
220 * @ingroup Efl_Access_Reading_Info
221 */
222typedef enum
223{
224 EFL_ACCESS_READING_INFO_TYPE_NAME = 1 /* 1 >> 0 */, /**< Name should be read
225 */
226 EFL_ACCESS_READING_INFO_TYPE_ROLE = 2 /* 1 >> 1 */, /**< Role should be read
227 */
228 EFL_ACCESS_READING_INFO_TYPE_DESCRIPTION = 4 /* 1 >> 2 */, /**< description should be read. */
229 EFL_ACCESS_READING_INFO_TYPE_STATE = 8 /* 1 >> 3 */ /**< State should be read.
230 */
231} Efl_Access_Reading_Info_Type;
232
233/** Accessibility object state set.
234 *
235 * @ingroup Efl_Access
236 */
237typedef uint64_t Efl_Access_State_Set;
238
239/** Accessibility event listener
240 *
241 * @ingroup Efl_Access_Event
242 */
243typedef struct _Efl_Access_Event_Handler Efl_Access_Event_Handler;
244
245/** Accessibility state changed event data
246 *
247 * @ingroup Efl_Access_Event_State_Changed
248 */
249typedef struct _Efl_Access_Event_State_Changed_Data
250{
251 Efl_Access_State_Type type; /**< Type of the state changed event */
252 Eina_Bool new_value; /**< New value */
253} Efl_Access_Event_State_Changed_Data;
254
255/** Accessibility geometry changed event data
256 *
257 * @ingroup Efl_Access_Event_Geometry_Changed
258 */
259typedef struct _Efl_Access_Event_Geometry_Changed_Data
260{
261 int x; /**< X coordinate */
262 int y; /**< Y coordinate */
263 int width; /**< Width */
264 int height; /**< Height */
265} Efl_Access_Event_Geometry_Changed_Data;
266
267/** Accessibility children changed event data
268 *
269 * @ingroup Efl_Access_Event_Children_Changed
270 */
271typedef struct _Efl_Access_Event_Children_Changed_Data
272{
273 Eina_Bool is_added; /**< Child is added or not */
274 Efl_Object *child; /**< Child object */
275} Efl_Access_Event_Children_Changed_Data;
276
277/** Accessibility Attribute
278 *
279 * @ingroup Efl_Access
280 */
281typedef struct _Efl_Access_Attribute
282{
283 const char *key; /**< Attribute key */
284 const char *value; /**< Attribute value */
285} Efl_Access_Attribute;
286
287/** Accessibility Relation
288 *
289 * @ingroup Efl_Access
290 */
291typedef struct _Efl_Access_Relation
292{
293 Efl_Access_Relation_Type type; /**< Relation type */
294 Eina_List *objects; /**< List with relation objects */
295} Efl_Access_Relation;
296
297
298#endif
299#endif
diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
index f5cecc01bd..5ef60a1ea7 100644
--- a/src/lib/elementary/efl_access_text.h
+++ b/src/lib/elementary/efl_access_text.h
@@ -7,7 +7,7 @@
7#include "efl_access_text.eo.h" 7#include "efl_access_text.eo.h"
8#endif 8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT 9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_text.eo.legacy.h" 10#include "efl_access_text_eo.legacy.h"
11#endif 11#endif
12 12
13/** 13/**
diff --git a/src/lib/elementary/efl_access_text_eo.legacy.h b/src/lib/elementary/efl_access_text_eo.legacy.h
new file mode 100644
index 0000000000..d2acfc7e80
--- /dev/null
+++ b/src/lib/elementary/efl_access_text_eo.legacy.h
@@ -0,0 +1,74 @@
1#ifndef _EFL_ACCESS_TEXT_EO_LEGACY_H_
2#define _EFL_ACCESS_TEXT_EO_LEGACY_H_
3
4#ifndef _EFL_ACCESS_TEXT_EO_CLASS_TYPE
5#define _EFL_ACCESS_TEXT_EO_CLASS_TYPE
6
7typedef Eo Efl_Access_Text;
8
9#endif
10
11#ifndef _EFL_ACCESS_TEXT_EO_TYPES
12#define _EFL_ACCESS_TEXT_EO_TYPES
13
14/** Text accessibility granularity
15 *
16 * @ingroup Efl_Access
17 */
18typedef enum
19{
20 EFL_ACCESS_TEXT_GRANULARITY_CHAR = 0, /**< Character granularity */
21 EFL_ACCESS_TEXT_GRANULARITY_WORD, /**< Word granularity */
22 EFL_ACCESS_TEXT_GRANULARITY_SENTENCE, /**< Sentence granularity */
23 EFL_ACCESS_TEXT_GRANULARITY_LINE, /**< Line granularity */
24 EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH /**< Paragraph granularity */
25} Efl_Access_Text_Granularity;
26
27/** Text clip type
28 *
29 * @ingroup Efl_Access
30 */
31typedef enum
32{
33 EFL_ACCESS_TEXT_CLIP_TYPE_NONE = 0, /**< No clip type */
34 EFL_ACCESS_TEXT_CLIP_TYPE_MIN, /**< Minimum clip type */
35 EFL_ACCESS_TEXT_CLIP_TYPE_MAX, /**< Maximum clip type */
36 EFL_ACCESS_TEXT_CLIP_TYPE_BOTH /**< Both clip types */
37} Efl_Access_Text_Clip_Type;
38
39/** Text attribute
40 *
41 * @ingroup Efl_Access
42 */
43typedef struct _Efl_Access_Text_Attribute
44{
45 const char *name; /**< Text attribute name */
46 const char *value; /**< Text attribute value */
47} Efl_Access_Text_Attribute;
48
49/** Text range
50 *
51 * @ingroup Efl_Access
52 */
53typedef struct _Efl_Access_Text_Range
54{
55 int start_offset; /**< Range start offset */
56 int end_offset; /**< Range end offset */
57 char *content; /**< Range content */
58} Efl_Access_Text_Range;
59
60/** Text change information
61 *
62 * @ingroup Efl_Access
63 */
64typedef struct _Efl_Access_Text_Change_Info
65{
66 const char *content; /**< Change content */
67 Eina_Bool inserted; /**< @c true if text got inserted */
68 size_t pos; /**< Change position */
69 size_t len; /**< Change length */
70} Efl_Access_Text_Change_Info;
71
72
73#endif
74#endif
diff --git a/src/lib/elementary/efl_access_widget_action.h b/src/lib/elementary/efl_access_widget_action.h
index 62caf4f5ae..74ea3b99ee 100644
--- a/src/lib/elementary/efl_access_widget_action.h
+++ b/src/lib/elementary/efl_access_widget_action.h
@@ -17,7 +17,10 @@ typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data;
17#include "efl_access_widget_action.eo.h" 17#include "efl_access_widget_action.eo.h"
18#endif 18#endif
19#ifndef EFL_NOLEGACY_API_SUPPORT 19#ifndef EFL_NOLEGACY_API_SUPPORT
20#include "efl_access_widget_action.eo.legacy.h" 20#ifndef _EFL_ACCESS_WIDGET_ACTION_EO_CLASS_TYPE
21#define _EFL_ACCESS_WIDGET_ACTION_EO_CLASS_TYPE
22typedef Eo Efl_Access_Widget_Action;
23#endif
21#endif 24#endif
22 25
23#endif 26#endif
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index c4b3d3c398..17bc733392 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -7,7 +7,10 @@
7#include "efl_access_window.eo.h" 7#include "efl_access_window.eo.h"
8#endif 8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT 9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_window.eo.legacy.h" 10#ifndef _EFL_ACCESS_WINDOW_EO_CLASS_TYPE
11#define _EFL_ACCESS_WINDOW_EO_CLASS_TYPE
12typedef Eo Efl_Access_Window;
13#endif
11#endif 14#endif
12 15
13/** 16/**
diff --git a/src/lib/elementary/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h
index 3f2a0862a4..384d6e7055 100644
--- a/src/lib/elementary/elm_interface_scrollable.h
+++ b/src/lib/elementary/elm_interface_scrollable.h
@@ -62,7 +62,7 @@ typedef struct _Elm_Scrollable_Smart_Interface_Data
62#include "elm_interface_scrollable.eo.h" 62#include "elm_interface_scrollable.eo.h"
63#endif 63#endif
64#ifndef EFL_NOLEGACY_API_SUPPORT 64#ifndef EFL_NOLEGACY_API_SUPPORT
65#include "elm_interface_scrollable.eo.legacy.h" 65#include "elm_interface_scrollable_eo.legacy.h"
66#endif 66#endif
67 67
68struct _Elm_Scrollable_Smart_Interface_Data 68struct _Elm_Scrollable_Smart_Interface_Data
diff --git a/src/lib/elementary/elm_interface_scrollable_eo.legacy.h b/src/lib/elementary/elm_interface_scrollable_eo.legacy.h
new file mode 100644
index 0000000000..477c31ed41
--- /dev/null
+++ b/src/lib/elementary/elm_interface_scrollable_eo.legacy.h
@@ -0,0 +1,50 @@
1#ifndef _ELM_INTERFACE_SCROLLABLE_EO_LEGACY_H_
2#define _ELM_INTERFACE_SCROLLABLE_EO_LEGACY_H_
3
4#ifndef _ELM_INTERFACE_SCROLLABLE_EO_CLASS_TYPE
5#define _ELM_INTERFACE_SCROLLABLE_EO_CLASS_TYPE
6
7typedef Eo Elm_Interface_Scrollable;
8
9#endif
10
11#ifndef _ELM_INTERFACE_SCROLLABLE_EO_TYPES
12#define _ELM_INTERFACE_SCROLLABLE_EO_TYPES
13
14/**
15 * @brief Type that controls when scrollbars should appear.
16 *
17 * See also @ref Elm.Interface_Scrollable.policy.set.
18 *
19 * @ingroup Elm_Scroller
20 */
21typedef enum
22{
23 ELM_SCROLLER_POLICY_AUTO = 0, /**< Show scrollbars as needed */
24 ELM_SCROLLER_POLICY_ON, /**< Always show scrollbars */
25 ELM_SCROLLER_POLICY_OFF, /**< Never show scrollbars */
26 ELM_SCROLLER_POLICY_LAST /**< Sentinel value to indicate last enum field
27 * during iteration */
28} Elm_Scroller_Policy;
29
30/**
31 * @brief Type that controls how the content is scrolled.
32 *
33 * See also @ref Elm.Interface_Scrollable.single_direction.set.
34 *
35 * @ingroup Elm_Scroller
36 */
37typedef enum
38{
39 ELM_SCROLLER_SINGLE_DIRECTION_NONE = 0, /**< Scroll every direction */
40 ELM_SCROLLER_SINGLE_DIRECTION_SOFT, /**< Scroll single direction if the
41 * direction is certain */
42 ELM_SCROLLER_SINGLE_DIRECTION_HARD, /**< Scroll only single direction */
43 ELM_SCROLLER_SINGLE_DIRECTION_LAST /**< Sentinel value to indicate last enum
44 * field during iteration */
45} Elm_Scroller_Single_Direction;
46
47
48#endif
49
50#endif
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index bcbe8e646f..c65dbec043 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -17,12 +17,32 @@
17#include "efl_access_value.eo.h" 17#include "efl_access_value.eo.h"
18#include "efl_ui_legacy.eo.h" 18#include "efl_ui_legacy.eo.h"
19#endif 19#endif
20
20#ifndef EFL_NOLEGACY_API_SUPPORT 21#ifndef EFL_NOLEGACY_API_SUPPORT
21#include "efl_access_action.eo.legacy.h" 22#ifndef _EFL_ACCESS_ACTION_EO_CLASS_TYPE
22#include "efl_access_component.eo.legacy.h" 23#define _EFL_ACCESS_ACTION_EO_CLASS_TYPE
23#include "efl_access_editable_text.eo.legacy.h" 24typedef Eo Efl_Access_Action;
24#include "efl_access_selection.eo.legacy.h" 25#endif
25#include "efl_access_value.eo.legacy.h" 26#ifndef _EFL_ACCESS_COMPONENT_EO_CLASS_TYPE
26#include "efl_ui_legacy.eo.legacy.h" 27#define _EFL_ACCESS_COMPONENT_EO_CLASS_TYPE
28typedef Eo Efl_Access_Component;
29#endif
30#ifndef _EFL_ACCESS_EDITABLE_TEXT_EO_CLASS_TYPE
31#define _EFL_ACCESS_EDITABLE_TEXT_EO_CLASS_TYPE
32typedef Eo Efl_Access_Editable_Text;
33#endif
34#ifndef _EFL_ACCESS_SELECTION_EO_CLASS_TYPE
35#define _EFL_ACCESS_SELECTION_EO_CLASS_TYPE
36typedef Eo Efl_Access_Selection;
27#endif 37#endif
38#ifndef _EFL_ACCESS_VALUE_EO_CLASS_TYPE
39#define _EFL_ACCESS_VALUE_EO_CLASS_TYPE
40typedef Eo Efl_Access_Value;
41#endif
42#ifndef _EFL_UI_LEGACY_EO_CLASS_TYPE
43#define _EFL_UI_LEGACY_EO_CLASS_TYPE
44typedef Eo Efl_Ui_Legacy;
45#endif
46#endif
47
28#endif 48#endif
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index 58dab5bcc9..25cb73623d 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -712,4 +712,8 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
712 */ 712 */
713EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name); 713EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
714 714
715#include "efl_ui_layout.eo.legacy.h" 715/* FIXME: shouldn't need this but we do */
716#ifndef _EFL_UI_LAYOUT_EO_CLASS_TYPE
717#define _EFL_UI_LAYOUT_EO_CLASS_TYPE
718typedef Eo Efl_Ui_Layout;
719#endif
diff --git a/src/lib/elementary/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h
index 6b40eff78f..ee7230d32f 100644
--- a/src/lib/elementary/elm_scroller_legacy.h
+++ b/src/lib/elementary/elm_scroller_legacy.h
@@ -1,4 +1,4 @@
1#include "elm_interface_scrollable.eo.legacy.h" 1#include "elm_interface_scrollable_eo.legacy.h"
2#include "elm_scroller_eo.legacy.h" 2#include "elm_scroller_eo.legacy.h"
3 3
4/** 4/**
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 64698b6b26..22489c0640 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -622,6 +622,8 @@ elementary_pub_headers = [
622 'efl_ui_win_inlined_legacy_eo.legacy.h', 622 'efl_ui_win_inlined_legacy_eo.legacy.h',
623 'efl_ui_win_legacy_eo.legacy.h', 623 'efl_ui_win_legacy_eo.legacy.h',
624 'efl_ui_win_socket_legacy_eo.legacy.h', 624 'efl_ui_win_socket_legacy_eo.legacy.h',
625 'efl_access_object_eo.legacy.h',
626 'efl_access_text_eo.legacy.h',
625 'elm_access_eo.legacy.h', 627 'elm_access_eo.legacy.h',
626 'elm_actionslider_eo.legacy.h', 628 'elm_actionslider_eo.legacy.h',
627 'elm_box_eo.legacy.h', 629 'elm_box_eo.legacy.h',
@@ -662,6 +664,7 @@ elementary_pub_headers = [
662 'elm_index_eo.legacy.h', 664 'elm_index_eo.legacy.h',
663 'elm_index_item_eo.legacy.h', 665 'elm_index_item_eo.legacy.h',
664 'elm_interface_fileselector_eo.legacy.h', 666 'elm_interface_fileselector_eo.legacy.h',
667 'elm_interface_scrollable_eo.legacy.h',
665 'elm_inwin_eo.legacy.h', 668 'elm_inwin_eo.legacy.h',
666 'elm_label_eo.legacy.h', 669 'elm_label_eo.legacy.h',
667 'elm_list_eo.legacy.h', 670 'elm_list_eo.legacy.h',