summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2017-10-19 10:13:54 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-19 10:13:54 +0900
commit57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/lib/elementary
parent98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
elm: rename Elm_Interface_Atspi_Accessible interface
Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5341
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_access.c (renamed from src/lib/elementary/elm_interface_atspi_accessible.c)220
-rw-r--r--src/lib/elementary/efl_access.eo (renamed from src/lib/elementary/elm_interface_atspi_accessible.eo)92
-rw-r--r--src/lib/elementary/efl_access.h165
-rw-r--r--src/lib/elementary/efl_access_component.c4
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_bg.c4
-rw-r--r--src/lib/elementary/efl_ui_box.c4
-rw-r--r--src/lib/elementary/efl_ui_button.c4
-rw-r--r--src/lib/elementary/efl_ui_check.c26
-rw-r--r--src/lib/elementary/efl_ui_check.eo2
-rw-r--r--src/lib/elementary/efl_ui_clock.c4
-rw-r--r--src/lib/elementary/efl_ui_flip.c4
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_grid.c2
-rw-r--r--src/lib/elementary/efl_ui_grid_static.c2
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c4
-rw-r--r--src/lib/elementary/efl_ui_layout.c8
-rw-r--r--src/lib/elementary/efl_ui_panes.c4
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c4
-rw-r--r--src/lib/elementary/efl_ui_radio.c16
-rw-r--r--src/lib/elementary/efl_ui_radio.eo2
-rw-r--r--src/lib/elementary/efl_ui_slider.c8
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c34
-rw-r--r--src/lib/elementary/efl_ui_text.eo4
-rw-r--r--src/lib/elementary/efl_ui_video.c4
-rw-r--r--src/lib/elementary/efl_ui_win.c38
-rw-r--r--src/lib/elementary/efl_ui_win.eo6
-rw-r--r--src/lib/elementary/elc_combobox.c4
-rw-r--r--src/lib/elementary/elc_ctxpopup.c14
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_button.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c4
-rw-r--r--src/lib/elementary/elc_hoversel.c4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c38
-rw-r--r--src/lib/elementary/elc_naviframe.c12
-rw-r--r--src/lib/elementary/elc_player.c4
-rw-r--r--src/lib/elementary/elc_popup.c14
-rw-r--r--src/lib/elementary/elementary_js.cc4
-rw-r--r--src/lib/elementary/elm_access.c14
-rw-r--r--src/lib/elementary/elm_access.eo2
-rw-r--r--src/lib/elementary/elm_actionslider.c4
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c24
-rw-r--r--src/lib/elementary/elm_atspi_app_object.eo10
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c552
-rw-r--r--src/lib/elementary/elm_box.c6
-rw-r--r--src/lib/elementary/elm_bubble.c4
-rw-r--r--src/lib/elementary/elm_calendar.c4
-rw-r--r--src/lib/elementary/elm_clock.c4
-rw-r--r--src/lib/elementary/elm_color_item.eo4
-rw-r--r--src/lib/elementary/elm_colorselector.c28
-rw-r--r--src/lib/elementary/elm_colorselector.eo2
-rw-r--r--src/lib/elementary/elm_conform.c4
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo2
-rw-r--r--src/lib/elementary/elm_datetime.c2
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_diskselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c38
-rw-r--r--src/lib/elementary/elm_entry.eo4
-rw-r--r--src/lib/elementary/elm_flipselector.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c54
-rw-r--r--src/lib/elementary/elm_gengrid.eo4
-rw-r--r--src/lib/elementary/elm_gengrid_item.eo4
-rw-r--r--src/lib/elementary/elm_genlist.c60
-rw-r--r--src/lib/elementary/elm_genlist.eo4
-rw-r--r--src/lib/elementary/elm_genlist_item.eo4
-rw-r--r--src/lib/elementary/elm_glview.c4
-rw-r--r--src/lib/elementary/elm_grid.c4
-rw-r--r--src/lib/elementary/elm_hover.c4
-rw-r--r--src/lib/elementary/elm_icon.c4
-rw-r--r--src/lib/elementary/elm_index.c34
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_index_item.eo2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.h165
-rw-r--r--src/lib/elementary/elm_interfaces.h2
-rw-r--r--src/lib/elementary/elm_inwin.c4
-rw-r--r--src/lib/elementary/elm_label.c4
-rw-r--r--src/lib/elementary/elm_list.c62
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_list_item.eo4
-rw-r--r--src/lib/elementary/elm_map.c4
-rw-r--r--src/lib/elementary/elm_mapbuf.c4
-rw-r--r--src/lib/elementary/elm_menu.c66
-rw-r--r--src/lib/elementary/elm_menu.eo2
-rw-r--r--src/lib/elementary/elm_menu_item.eo10
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item.eo4
-rw-r--r--src/lib/elementary/elm_naviframe_item.eo2
-rw-r--r--src/lib/elementary/elm_notify.c4
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_plug.c4
-rw-r--r--src/lib/elementary/elm_popup.eo2
-rw-r--r--src/lib/elementary/elm_prefs.c4
-rw-r--r--src/lib/elementary/elm_priv.h2
-rw-r--r--src/lib/elementary/elm_scroller.c4
-rw-r--r--src/lib/elementary/elm_segment_control.c4
-rw-r--r--src/lib/elementary/elm_separator.c4
-rw-r--r--src/lib/elementary/elm_slideshow.c4
-rw-r--r--src/lib/elementary/elm_spinner.c12
-rw-r--r--src/lib/elementary/elm_spinner.eo2
-rw-r--r--src/lib/elementary/elm_table.c4
-rw-r--r--src/lib/elementary/elm_thumb.c4
-rw-r--r--src/lib/elementary/elm_toolbar.c48
-rw-r--r--src/lib/elementary/elm_toolbar.eo4
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo4
-rw-r--r--src/lib/elementary/elm_web2.c4
-rw-r--r--src/lib/elementary/elm_widget.c100
-rw-r--r--src/lib/elementary/elm_widget.eo12
-rw-r--r--src/lib/elementary/elm_widget_item.eo4
111 files changed, 1138 insertions, 1138 deletions
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/efl_access.c
index 22a18ba..4586012 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/efl_access.c
@@ -2,13 +2,13 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11const char* Atspi_Name[] = { 11const char* Access_Name[] = {
12 "invalid", 12 "invalid",
13 "accelerator label", 13 "accelerator label",
14 "alert", 14 "alert",
@@ -115,39 +115,39 @@ const char* Atspi_Name[] = {
115 "last defined" 115 "last defined"
116}; 116};
117 117
118struct _Elm_Atspi_Event_Handler 118struct _Efl_Access_Event_Handler
119{ 119{
120 Efl_Event_Cb cb; 120 Efl_Event_Cb cb;
121 void *data; 121 void *data;
122}; 122};
123 123
124struct _Elm_Interface_Atspi_Accessible_Data 124struct _Efl_Access_Data
125{ 125{
126 Elm_Atspi_Role role; 126 Efl_Access_Role role;
127 const char *name; 127 const char *name;
128 const char *description; 128 const char *description;
129 const char *translation_domain; 129 const char *translation_domain;
130 Elm_Atspi_Relation_Set relations; 130 Efl_Access_Relation_Set relations;
131 Elm_Atspi_Type type: 2; 131 Efl_Access_Type type: 2;
132}; 132};
133 133
134typedef struct _Elm_Interface_Atspi_Accessible_Data Elm_Interface_Atspi_Accessible_Data; 134typedef struct _Efl_Access_Data Efl_Access_Data;
135 135
136 136
137static Eina_List *global_callbacks; 137static Eina_List *global_callbacks;
138static Eo *root; 138static Eo *root;
139 139
140EOLIAN static int 140EOLIAN static int
141_elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 141_efl_access_index_in_parent_get(Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
142{ 142{
143 Eina_List *l, *children = NULL; 143 Eina_List *l, *children = NULL;
144 Eo *chld, *parent = NULL; 144 Eo *chld, *parent = NULL;
145 int ret = 0; 145 int ret = 0;
146 146
147 parent = elm_interface_atspi_accessible_parent_get(obj); 147 parent = efl_access_parent_get(obj);
148 if (!parent) return -1; 148 if (!parent) return -1;
149 149
150 children = elm_interface_atspi_accessible_children_get(parent); 150 children = efl_access_children_get(parent);
151 if (!children) return -1; 151 if (!children) return -1;
152 152
153 EINA_LIST_FOREACH(children, l, chld) 153 EINA_LIST_FOREACH(children, l, chld)
@@ -165,67 +165,67 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
165 return ret; 165 return ret;
166} 166}
167 167
168EOLIAN static Elm_Interface_Atspi_Accessible * 168EOLIAN static Efl_Access *
169_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 169_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
170{ 170{
171 Elm_Atspi_Type type; 171 Efl_Access_Type type;
172 Eo *parent = obj; 172 Eo *parent = obj;
173 173
174 do { 174 do {
175 parent = efl_parent_get(obj); 175 parent = efl_parent_get(obj);
176 if (efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 176 if (efl_isa(parent, EFL_ACCESS_MIXIN))
177 { 177 {
178 type = elm_interface_atspi_accessible_type_get(parent); 178 type = efl_access_type_get(parent);
179 if (type != ELM_ATSPI_TYPE_SKIPPED) break; 179 if (type != EFL_ACCESS_TYPE_SKIPPED) break;
180 } 180 }
181 } while (parent); 181 } while (parent);
182 182
183 return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL; 183 return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL;
184} 184}
185 185
186EOLIAN static void 186EOLIAN static void
187_elm_interface_atspi_accessible_parent_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Interface_Atspi_Accessible *new_parent EINA_UNUSED) 187_efl_access_parent_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access *new_parent EINA_UNUSED)
188{ 188{
189 WRN("The %s object does not implement the \"accessible_parent_set\" function.", 189 WRN("The %s object does not implement the \"accessible_parent_set\" function.",
190 efl_class_name_get(efl_class_get(obj))); 190 efl_class_name_get(efl_class_get(obj)));
191} 191}
192 192
193EOLIAN Eina_List* 193EOLIAN Eina_List*
194_elm_interface_atspi_accessible_attributes_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 194_efl_access_attributes_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
195{ 195{
196 WRN("The %s object does not implement the \"accessible_attributes_set\" function.", 196 WRN("The %s object does not implement the \"accessible_attributes_set\" function.",
197 efl_class_name_get(efl_class_get(obj))); 197 efl_class_name_get(efl_class_get(obj)));
198 return NULL; 198 return NULL;
199} 199}
200 200
201EOLIAN static Elm_Atspi_Role 201EOLIAN static Efl_Access_Role
202_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 202_efl_access_role_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
203{ 203{
204 return pd->role; 204 return pd->role;
205} 205}
206 206
207EOLIAN static void 207EOLIAN static void
208_elm_interface_atspi_accessible_role_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Atspi_Role role) 208_efl_access_role_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access_Role role)
209{ 209{
210 if (pd->role != role) 210 if (pd->role != role)
211 { 211 {
212 pd->role = role; 212 pd->role = role;
213 elm_interface_atspi_accessible_role_changed_signal_emit(obj); 213 efl_access_role_changed_signal_emit(obj);
214 } 214 }
215} 215}
216 216
217EOLIAN const char * 217EOLIAN const char *
218_elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 218_efl_access_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
219{ 219{
220 Elm_Atspi_Role role; 220 Efl_Access_Role role;
221 221
222 role = elm_interface_atspi_accessible_role_get(obj); 222 role = efl_access_role_get(obj);
223 223
224 return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role]; 224 return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role];
225} 225}
226 226
227EOLIAN const char * 227EOLIAN const char *
228_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 228_efl_access_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
229{ 229{
230#ifdef ENABLE_NLS 230#ifdef ENABLE_NLS
231 if (pd->translation_domain) 231 if (pd->translation_domain)
@@ -235,12 +235,12 @@ _elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atsp
235} 235}
236 236
237EOLIAN static void 237EOLIAN static void
238_elm_interface_atspi_accessible_name_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) 238_efl_access_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
239{ 239{
240 eina_stringshare_replace(&pd->name, val); 240 eina_stringshare_replace(&pd->name, val);
241} 241}
242 242
243const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 243const char * _efl_access_description_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
244{ 244{
245#ifdef ENABLE_NLS 245#ifdef ENABLE_NLS
246 if (pd->translation_domain) 246 if (pd->translation_domain)
@@ -250,16 +250,16 @@ const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED
250} 250}
251 251
252EOLIAN static void 252EOLIAN static void
253_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) 253_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
254{ 254{
255 eina_stringshare_replace(&pd->description, val); 255 eina_stringshare_replace(&pd->description, val);
256} 256}
257 257
258EOLIAN static const char * 258EOLIAN static const char *
259_elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 259_efl_access_localized_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
260{ 260{
261 const char *ret = NULL; 261 const char *ret = NULL;
262 ret = elm_interface_atspi_accessible_role_name_get(obj); 262 ret = efl_access_role_name_get(obj);
263#ifdef ENABLE_NLS 263#ifdef ENABLE_NLS
264 ret = gettext(ret); 264 ret = gettext(ret);
265#endif 265#endif
@@ -267,7 +267,7 @@ _elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm
267} 267}
268 268
269EOLIAN static Eina_List * 269EOLIAN static Eina_List *
270_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 270_efl_access_children_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
271{ 271{
272 Eina_List *children = NULL; 272 Eina_List *children = NULL;
273 Eina_Iterator *iter = NULL; 273 Eina_Iterator *iter = NULL;
@@ -279,7 +279,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
279 279
280 EINA_ITERATOR_FOREACH(iter, chld) 280 EINA_ITERATOR_FOREACH(iter, chld)
281 { 281 {
282 if (efl_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 282 if (efl_isa(chld, EFL_ACCESS_MIXIN))
283 children = eina_list_append(children, chld); 283 children = eina_list_append(children, chld);
284 } 284 }
285 eina_iterator_free(iter); 285 eina_iterator_free(iter);
@@ -287,21 +287,21 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_
287 return children; 287 return children;
288} 288}
289 289
290EOLIAN static Elm_Atspi_State_Set 290EOLIAN static Efl_Access_State_Set
291_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 291_efl_access_state_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
292{ 292{
293 return 0; 293 return 0;
294} 294}
295 295
296EOLIAN Elm_Atspi_Relation_Set 296EOLIAN Efl_Access_Relation_Set
297_elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) 297_efl_access_relation_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
298{ 298{
299 return elm_atspi_relation_set_clone(pd->relations); 299 return efl_access_relation_set_clone(pd->relations);
300} 300}
301 301
302EAPI void elm_atspi_attributes_list_free(Eina_List *list) 302EAPI void efl_access_attributes_list_free(Eina_List *list)
303{ 303{
304 Elm_Atspi_Attribute *attr; 304 Efl_Access_Attribute *attr;
305 EINA_LIST_FREE(list, attr) 305 EINA_LIST_FREE(list, attr)
306 { 306 {
307 eina_stringshare_del(attr->key); 307 eina_stringshare_del(attr->key);
@@ -311,27 +311,27 @@ EAPI void elm_atspi_attributes_list_free(Eina_List *list)
311} 311}
312 312
313EOLIAN void 313EOLIAN void
314_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) 314_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
315{ 315{
316 Eina_List *l; 316 Eina_List *l;
317 Elm_Atspi_Event_Handler *hdl; 317 Efl_Access_Event_Handler *hdl;
318 Elm_Atspi_Type type; 318 Efl_Access_Type type;
319 319
320 if (!accessible || !event || !efl_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 320 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN))
321 { 321 {
322 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); 322 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
323 return; 323 return;
324 } 324 }
325 325
326 type = elm_interface_atspi_accessible_type_get(accessible); 326 type = efl_access_type_get(accessible);
327 if (type != ELM_ATSPI_TYPE_REGULAR) 327 if (type != EFL_ACCESS_TYPE_REGULAR)
328 return; 328 return;
329 329
330 if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 330 if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED)
331 { 331 {
332 Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info; 332 Efl_Access_Event_Children_Changed_Data *event_data = event_info;
333 type = elm_interface_atspi_accessible_type_get(atspi_data->child); 333 type = efl_access_type_get(event_data->child);
334 if (type != ELM_ATSPI_TYPE_REGULAR) 334 if (type != EFL_ACCESS_TYPE_REGULAR)
335 return; 335 return;
336 } 336 }
337 337
@@ -346,10 +346,10 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
346 } 346 }
347} 347}
348 348
349EOLIAN Elm_Atspi_Event_Handler * 349EOLIAN Efl_Access_Event_Handler *
350_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) 350_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
351{ 351{
352 Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler)); 352 Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
353 353
354 ret->cb = cb; 354 ret->cb = cb;
355 ret->data = data; 355 ret->data = data;
@@ -360,10 +360,10 @@ _elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *p
360} 360}
361 361
362EOLIAN void 362EOLIAN void
363_elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Elm_Atspi_Event_Handler *handler) 363_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
364{ 364{
365 Eina_List *l, *l2; 365 Eina_List *l, *l2;
366 Elm_Atspi_Event_Handler *hdl; 366 Efl_Access_Event_Handler *hdl;
367 EINA_LIST_FOREACH_SAFE(global_callbacks, l, l2, hdl) 367 EINA_LIST_FOREACH_SAFE(global_callbacks, l, l2, hdl)
368 { 368 {
369 if (hdl == handler) 369 if (hdl == handler)
@@ -376,29 +376,29 @@ _elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *p
376} 376}
377 377
378EOLIAN void 378EOLIAN void
379_elm_interface_atspi_accessible_translation_domain_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *domain) 379_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain)
380{ 380{
381 eina_stringshare_replace(&pd->translation_domain, domain); 381 eina_stringshare_replace(&pd->translation_domain, domain);
382} 382}
383 383
384 384
385EOLIAN const char* 385EOLIAN const char*
386_elm_interface_atspi_accessible_translation_domain_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 386_efl_access_translation_domain_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
387{ 387{
388 return pd->translation_domain; 388 return pd->translation_domain;
389} 389}
390 390
391EAPI void 391EAPI void
392elm_atspi_relation_free(Elm_Atspi_Relation *relation) 392efl_access_relation_free(Efl_Access_Relation *relation)
393{ 393{
394 eina_list_free(relation->objects); 394 eina_list_free(relation->objects);
395 free(relation); 395 free(relation);
396} 396}
397 397
398EAPI Elm_Atspi_Relation * 398EAPI Efl_Access_Relation *
399elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) 399efl_access_relation_clone(const Efl_Access_Relation *relation)
400{ 400{
401 Elm_Atspi_Relation *ret = calloc(1, sizeof(Elm_Atspi_Relation)); 401 Efl_Access_Relation *ret = calloc(1, sizeof(Efl_Access_Relation));
402 if (!ret) return NULL; 402 if (!ret) return NULL;
403 403
404 ret->type = relation->type; 404 ret->type = relation->type;
@@ -409,8 +409,8 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation)
409static void 409static void
410_on_rel_obj_del(void *data, const Efl_Event *event) 410_on_rel_obj_del(void *data, const Efl_Event *event)
411{ 411{
412 Elm_Atspi_Relation_Set *set = data; 412 Efl_Access_Relation_Set *set = data;
413 Elm_Atspi_Relation *rel; 413 Efl_Access_Relation *rel;
414 Eina_List *l, *l2, *p, *p2; 414 Eina_List *l, *l2, *p, *p2;
415 Eo *rel_obj; 415 Eo *rel_obj;
416 416
@@ -430,12 +430,12 @@ _on_rel_obj_del(void *data, const Efl_Event *event)
430} 430}
431 431
432EAPI Eina_Bool 432EAPI Eina_Bool
433elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) 433efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj)
434{ 434{
435 Elm_Atspi_Relation *rel; 435 Efl_Access_Relation *rel;
436 Eina_List *l; 436 Eina_List *l;
437 437
438 if (!efl_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 438 if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN))
439 return EINA_FALSE; 439 return EINA_FALSE;
440 440
441 EINA_LIST_FOREACH(*set, l, rel) 441 EINA_LIST_FOREACH(*set, l, rel)
@@ -451,7 +451,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
451 } 451 }
452 } 452 }
453 453
454 rel = calloc(1, sizeof(Elm_Atspi_Relation)); 454 rel = calloc(1, sizeof(Efl_Access_Relation));
455 if (!rel) return EINA_FALSE; 455 if (!rel) return EINA_FALSE;
456 456
457 rel->type = type; 457 rel->type = type;
@@ -463,10 +463,10 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
463} 463}
464 464
465EAPI void 465EAPI void
466elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) 466efl_access_relation_set_relation_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj)
467{ 467{
468 Eina_List *l; 468 Eina_List *l;
469 Elm_Atspi_Relation *rel; 469 Efl_Access_Relation *rel;
470 470
471 EINA_LIST_FOREACH(*set, l, rel) 471 EINA_LIST_FOREACH(*set, l, rel)
472 { 472 {
@@ -480,7 +480,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
480 if (!rel->objects) 480 if (!rel->objects)
481 { 481 {
482 *set = eina_list_remove(*set, rel); 482 *set = eina_list_remove(*set, rel);
483 elm_atspi_relation_free(rel); 483 efl_access_relation_free(rel);
484 } 484 }
485 return; 485 return;
486 } 486 }
@@ -488,10 +488,10 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re
488} 488}
489 489
490EAPI void 490EAPI void
491elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type) 491efl_access_relation_set_relation_type_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type)
492{ 492{
493 Eina_List *l; 493 Eina_List *l;
494 Elm_Atspi_Relation *rel; 494 Efl_Access_Relation *rel;
495 Eo *obj; 495 Eo *obj;
496 496
497 EINA_LIST_FOREACH(*set, l, rel) 497 EINA_LIST_FOREACH(*set, l, rel)
@@ -501,16 +501,16 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats
501 EINA_LIST_FOREACH(rel->objects, l, obj) 501 EINA_LIST_FOREACH(rel->objects, l, obj)
502 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); 502 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
503 *set = eina_list_remove(*set, rel); 503 *set = eina_list_remove(*set, rel);
504 elm_atspi_relation_free(rel); 504 efl_access_relation_free(rel);
505 return; 505 return;
506 } 506 }
507 } 507 }
508} 508}
509 509
510EAPI void 510EAPI void
511elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set) 511efl_access_relation_set_free(Efl_Access_Relation_Set set)
512{ 512{
513 Elm_Atspi_Relation *rel; 513 Efl_Access_Relation *rel;
514 Eina_List *l; 514 Eina_List *l;
515 Eo *obj; 515 Eo *obj;
516 516
@@ -518,20 +518,20 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set)
518 { 518 {
519 EINA_LIST_FOREACH(rel->objects, l, obj) 519 EINA_LIST_FOREACH(rel->objects, l, obj)
520 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); 520 efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set);
521 elm_atspi_relation_free(rel); 521 efl_access_relation_free(rel);
522 } 522 }
523} 523}
524 524
525EAPI Elm_Atspi_Relation_Set 525EAPI Efl_Access_Relation_Set
526elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set) 526efl_access_relation_set_clone(const Efl_Access_Relation_Set set)
527{ 527{
528 Elm_Atspi_Relation_Set ret = NULL; 528 Efl_Access_Relation_Set ret = NULL;
529 Eina_List *l; 529 Eina_List *l;
530 Elm_Atspi_Relation *rel; 530 Efl_Access_Relation *rel;
531 531
532 EINA_LIST_FOREACH(set, l, rel) 532 EINA_LIST_FOREACH(set, l, rel)
533 { 533 {
534 Elm_Atspi_Relation *cpy = elm_atspi_relation_clone(rel); 534 Efl_Access_Relation *cpy = efl_access_relation_clone(rel);
535 ret = eina_list_append(ret, cpy); 535 ret = eina_list_append(ret, cpy);
536 } 536 }
537 537
@@ -539,29 +539,29 @@ elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set)
539} 539}
540 540
541EOLIAN static Eina_Bool 541EOLIAN static Eina_Bool
542_elm_interface_atspi_accessible_relationship_append(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd, Elm_Atspi_Relation_Type type, const Elm_Interface_Atspi_Accessible *relation_obj) 542_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
543{ 543{
544 return elm_atspi_relation_set_relation_append(&sd->relations, type, relation_obj); 544 return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj);
545} 545}
546 546
547EOLIAN static void 547EOLIAN static void
548_elm_interface_atspi_accessible_relationship_remove(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd, Elm_Atspi_Relation_Type type, const Elm_Interface_Atspi_Accessible *relation_obj) 548_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
549{ 549{
550 if (relation_obj) 550 if (relation_obj)
551 elm_atspi_relation_set_relation_remove(&sd->relations, type, relation_obj); 551 efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj);
552 else 552 else
553 elm_atspi_relation_set_relation_type_remove(&sd->relations, type); 553 efl_access_relation_set_relation_type_remove(&sd->relations, type);
554} 554}
555 555
556EOLIAN static void 556EOLIAN static void
557_elm_interface_atspi_accessible_relationships_clear(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd) 557_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd)
558{ 558{
559 elm_atspi_relation_set_free(sd->relations); 559 efl_access_relation_set_free(sd->relations);
560 sd->relations = NULL; 560 sd->relations = NULL;
561} 561}
562 562
563EOLIAN Eo* 563EOLIAN Eo*
564_elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED) 564_efl_access_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
565{ 565{
566 if (!root) 566 if (!root)
567 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 567 root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
@@ -569,50 +569,50 @@ _elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UN
569 return root; 569 return root;
570} 570}
571 571
572EOLIAN Elm_Atspi_Type 572EOLIAN Efl_Access_Type
573_elm_interface_atspi_accessible_type_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) 573_efl_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
574{ 574{
575 return pd->type; 575 return pd->type;
576} 576}
577 577
578EOLIAN void 578EOLIAN void
579_elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Atspi_Type val) 579_efl_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
580{ 580{
581 Elm_Interface_Atspi_Accessible *parent; 581 Efl_Access *parent;
582 if (val == pd->type) 582 if (val == pd->type)
583 return; 583 return;
584 584
585 parent = elm_interface_atspi_accessible_parent_get(obj); 585 parent = efl_access_parent_get(obj);
586 586
587 switch (val) 587 switch (val)
588 { 588 {
589 case ELM_ATSPI_TYPE_DISABLED: 589 case EFL_ACCESS_TYPE_DISABLED:
590 case ELM_ATSPI_TYPE_SKIPPED: 590 case EFL_ACCESS_TYPE_SKIPPED:
591 if (parent) elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj); 591 if (parent) efl_access_children_changed_del_signal_emit(parent, obj);
592 elm_interface_atspi_accessible_removed(obj); 592 efl_access_removed(obj);
593 break; 593 break;
594 case ELM_ATSPI_TYPE_REGULAR: 594 case EFL_ACCESS_TYPE_REGULAR:
595 if (parent) elm_interface_atspi_accessible_children_changed_added_signal_emit(parent, obj); 595 if (parent) efl_access_children_changed_added_signal_emit(parent, obj);
596 elm_interface_atspi_accessible_added(obj); 596 efl_access_added(obj);
597 } 597 }
598 pd->type = val; 598 pd->type = val;
599} 599}
600 600
601EOLIAN void 601EOLIAN void
602_elm_interface_atspi_accessible_efl_object_destructor(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd) 602_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd)
603{ 603{
604 eina_stringshare_del(pd->name); 604 eina_stringshare_del(pd->name);
605 eina_stringshare_del(pd->description); 605 eina_stringshare_del(pd->description);
606 eina_stringshare_del(pd->translation_domain); 606 eina_stringshare_del(pd->translation_domain);
607 elm_atspi_relation_set_free(pd->relations); 607 efl_access_relation_set_free(pd->relations);
608 608
609 efl_destructor(efl_super(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); 609 efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN));
610} 610}
611 611
612void 612void
613_elm_interface_atspi_shutdown(void) 613_efl_access_shutdown(void)
614{ 614{
615 Elm_Atspi_Event_Handler *hdl; 615 Efl_Access_Event_Handler *hdl;
616 616
617 EINA_LIST_FREE(global_callbacks, hdl) 617 EINA_LIST_FREE(global_callbacks, hdl)
618 free(hdl); 618 free(hdl);
@@ -620,4 +620,4 @@ _elm_interface_atspi_shutdown(void)
620 ELM_SAFE_DEL(root); 620 ELM_SAFE_DEL(root);
621} 621}
622 622
623#include "elm_interface_atspi_accessible.eo.c" 623#include "efl_access.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/efl_access.eo
index 9064d5d..17181f7 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/efl_access.eo
@@ -1,7 +1,7 @@
1/* FIXME: This definitely shouldn't be here. */ 1/* FIXME: This definitely shouldn't be here. */
2type Efl_Event_Cb: __undefined_type; [[Efl event callback type]] 2type Efl_Event_Cb: __undefined_type; [[Efl event callback type]]
3 3
4enum Elm.Atspi.Type 4enum Efl.Access.Type
5{ 5{
6 [[Type of accessibility object]] 6 [[Type of accessibility object]]
7 regular, [[default accessibile object]] 7 regular, [[default accessibile object]]
@@ -9,9 +9,9 @@ enum Elm.Atspi.Type
9 skipped [[skip object in accessibility hierarchy]] 9 skipped [[skip object in accessibility hierarchy]]
10} 10}
11 11
12enum Elm.Atspi.Role 12enum Efl.Access.Role
13{ 13{
14 [[Describes the role of an object visible to AT-SPI Clients.]] 14 [[Describes the role of an object visible to Accessibility Clients.]]
15 invalid, [[Role: invalid]] 15 invalid, [[Role: invalid]]
16 accelerator_label, [[Role: accelerator label]] 16 accelerator_label, [[Role: accelerator label]]
17 alert, [[Role: alert]] 17 alert, [[Role: alert]]
@@ -118,10 +118,10 @@ enum Elm.Atspi.Role
118 last_defined, [[Last enum entry sentinel]] 118 last_defined, [[Last enum entry sentinel]]
119} 119}
120 120
121enum Elm.Atspi.State_Type 121enum Efl.Access.State_Type
122{ 122{
123 [[Describes a possible states of an object visible to AT-SPI clients.]] 123 [[Describes a possible states of an object visible to accessibility clients.]]
124 legacy: elm_atspi_state; 124 legacy: efl_access_state;
125 invalid, [[State: invalid]] 125 invalid, [[State: invalid]]
126 active, [[State: active]] 126 active, [[State: active]]
127 armed, [[State: armed]] 127 armed, [[State: armed]]
@@ -166,10 +166,10 @@ enum Elm.Atspi.State_Type
166 last_defined, [[Last enum entry sentinel]] 166 last_defined, [[Last enum entry sentinel]]
167} 167}
168 168
169enum Elm.Atspi.Relation_Type 169enum Efl.Access.Relation_Type
170{ 170{
171 [[Describes relation between two objects.]] 171 [[Describes relation between two objects.]]
172 legacy: elm_atspi_relation; 172 legacy: efl_access_relation;
173 null, [[No relation]] 173 null, [[No relation]]
174 label_for, [[Label for relation]] 174 label_for, [[Label for relation]]
175 labelled_by, [[Labelled by relation]] 175 labelled_by, [[Labelled by relation]]
@@ -192,54 +192,54 @@ enum Elm.Atspi.Relation_Type
192 last_defined, [[Last enum entry sentinel]] 192 last_defined, [[Last enum entry sentinel]]
193} 193}
194 194
195type Elm.Atspi.State_Set: uint64; [[AT-SPI object state set.]] 195type Efl.Access.State_Set: uint64; [[Accessibility object state set.]]
196 196
197struct Elm.Atspi.Event.Handler; [[AT-SPI event listener]] 197struct Efl.Access.Event.Handler; [[Accessibility event listener]]
198 198
199struct Elm.Atspi.Event.State_Changed.Data 199struct Efl.Access.Event.State_Changed.Data
200{ 200{
201 [[AT-SPI state changed event data]] 201 [[Accessibility state changed event data]]
202 type: Elm.Atspi.State_Type; [[Type of the state changed event]] 202 type: Efl.Access.State_Type; [[Type of the state changed event]]
203 new_value: bool; [[New value]] 203 new_value: bool; [[New value]]
204} 204}
205 205
206struct Elm.Atspi.Event.Geometry_Changed.Data 206struct Efl.Access.Event.Geometry_Changed.Data
207{ 207{
208 [[AT-SPI geometry changed event data]] 208 [[Accessibility geometry changed event data]]
209 x: int; [[X coordinate]] 209 x: int; [[X coordinate]]
210 y: int; [[Y coordinate]] 210 y: int; [[Y coordinate]]
211 width: int; [[Width]] 211 width: int; [[Width]]
212 height: int; [[Height]] 212 height: int; [[Height]]
213} 213}
214 214
215struct Elm.Atspi.Event.Children_Changed.Data 215struct Efl.Access.Event.Children_Changed.Data
216{ 216{
217 [[AT-SPI children changed event data]] 217 [[Accessibility children changed event data]]
218 is_added: bool; [[Child is added or not]] 218 is_added: bool; [[Child is added or not]]
219 child: Efl.Object; [[Child object]] 219 child: Efl.Object; [[Child object]]
220} 220}
221 221
222struct Elm.Atspi.Attribute 222struct Efl.Access.Attribute
223{ 223{
224 [[AT-SPI Attribute]] 224 [[Accessibility Attribute]]
225 key: string; [[Attribute key]] 225 key: string; [[Attribute key]]
226 value: string; [[Attribute value]] 226 value: string; [[Attribute value]]
227} 227}
228 228
229struct Elm.Atspi.Relation 229struct Efl.Access.Relation
230{ 230{
231 [[AT-SPI Relation]] 231 [[Accessibility Relation]]
232 type: Elm.Atspi.Relation_Type; [[Relation type]] 232 type: Efl.Access.Relation_Type; [[Relation type]]
233 objects: list<Efl.Object>; [[List with relation objects]] 233 objects: list<Efl.Object>; [[List with relation objects]]
234} 234}
235 235
236type Elm.Atspi.Relation_Set: list<ptr(Elm.Atspi.Relation)>; [[Elementary AT-SPI relation set type]] 236type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]]
237 237
238mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) 238mixin Efl.Access (Efl.Interface, Efl.Object)
239{ 239{
240 [[AT-SPI accessible mixin]] 240 [[Accessibility accessible mixin]]
241 eo_prefix: elm_interface_atspi_accessible; 241 eo_prefix: efl_access;
242 data: Elm_Interface_Atspi_Accessible_Data; 242 data: Efl_Access_Data;
243 methods { 243 methods {
244 @property localized_role_name @protected { 244 @property localized_role_name @protected {
245 [[Gets an localized string describing accessible object role name.]] 245 [[Gets an localized string describing accessible object role name.]]
@@ -264,7 +264,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
264 get { 264 get {
265 } 265 }
266 values { 266 values {
267 relations: Elm.Atspi.Relation_Set; [[Accessible relation set]] 267 relations: Efl.Access.Relation_Set; [[Accessible relation set]]
268 } 268 }
269 } 269 }
270 @property role { 270 @property role {
@@ -274,7 +274,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
274 set { 274 set {
275 } 275 }
276 values { 276 values {
277 role: Elm.Atspi.Role; [[Accessible role]] 277 role: Efl.Access.Role; [[Accessible role]]
278 } 278 }
279 } 279 }
280 @property children @protected { 280 @property children @protected {
@@ -282,7 +282,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
282 get { 282 get {
283 } 283 }
284 values { 284 values {
285 children: list<Elm.Interface.Atspi_Accessible> @owned; [[List of widget's children]] 285 children: list<Efl.Access> @owned; [[List of widget's children]]
286 } 286 }
287 } 287 }
288 @property role_name @protected { 288 @property role_name @protected {
@@ -299,7 +299,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
299 } 299 }
300 values { 300 values {
301 /* FIXME: API for attribute free */ 301 /* FIXME: API for attribute free */
302 attributes: list<ptr(Elm.Atspi.Attribute) @owned> @owned; [[List of object attributes]] 302 attributes: list<ptr(Efl.Access.Attribute) @owned> @owned; [[List of object attributes]]
303 } 303 }
304 } 304 }
305 @property index_in_parent @protected { 305 @property index_in_parent @protected {
@@ -327,7 +327,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
327 set { 327 set {
328 } 328 }
329 values { 329 values {
330 parent: Elm.Interface.Atspi_Accessible; [[Accessible parent]] 330 parent: Efl.Access; [[Accessible parent]]
331 } 331 }
332 } 332 }
333 @property state_set @protected { 333 @property state_set @protected {
@@ -335,7 +335,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
335 get { 335 get {
336 } 336 }
337 values { 337 values {
338 states: Elm.Atspi.State_Set; [[Accessible state set]] 338 states: Efl.Access.State_Set; [[Accessible state set]]
339 } 339 }
340 } 340 }
341 event_handler_add @class @protected { 341 event_handler_add @class @protected {
@@ -344,18 +344,18 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
344 @in cb: Efl_Event_Cb; [[Callback]] 344 @in cb: Efl_Event_Cb; [[Callback]]
345 @in data: void_ptr; [[Data]] 345 @in data: void_ptr; [[Data]]
346 } 346 }
347 return: ptr(Elm.Atspi.Event.Handler); [[Event handler]] 347 return: ptr(Efl.Access.Event.Handler); [[Event handler]]
348 } 348 }
349 event_handler_del @class @protected { 349 event_handler_del @class @protected {
350 [[Deregister accessibility event listener]] 350 [[Deregister accessibility event listener]]
351 params { 351 params {
352 @in handler: ptr(Elm.Atspi.Event.Handler); [[Event handler]] 352 @in handler: ptr(Efl.Access.Event.Handler); [[Event handler]]
353 } 353 }
354 } 354 }
355 event_emit @class @protected { 355 event_emit @class @protected {
356 [[Emit event]] 356 [[Emit event]]
357 params { 357 params {
358 @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]] 358 @in accessible: Efl.Access; [[Accessibility object.]]
359 @in event: ptr(const(Efl.Event.Description)); [[Accessibility event type.]] 359 @in event: ptr(const(Efl.Event.Description)); [[Accessibility event type.]]
360 @in event_info: void_ptr; [[Accessibility event details.]] 360 @in event_info: void_ptr; [[Accessibility event details.]]
361 } 361 }
@@ -389,7 +389,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
389 set { 389 set {
390 } 390 }
391 values { 391 values {
392 type: Elm.Atspi.Type; [[Object type]] 392 type: Efl.Access.Type; [[Object type]]
393 } 393 }
394 } 394 }
395 relationship_append { 395 relationship_append {
@@ -402,13 +402,13 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
402 provide customized feedback, improving overall user experience. 402 provide customized feedback, improving overall user experience.
403 403
404 Relationship_append API is asymmetric, which means that 404 Relationship_append API is asymmetric, which means that
405 appending, for example, relation ELM_ATSPI_RELATION_FLOWS_TO from object A to B, 405 appending, for example, relation EFL_ACCESS_RELATION_FLOWS_TO from object A to B,
406 do NOT append relation ELM_ATSPI_RELATION_FLOWS_FROM from object B to 406 do NOT append relation EFL_ACCESS_RELATION_FLOWS_FROM from object B to
407 object A.]] 407 object A.]]
408 return: bool; [[$true if relationship was successfully appended, $false otherwise]] 408 return: bool; [[$true if relationship was successfully appended, $false otherwise]]
409 params { 409 params {
410 @in type: Elm.Atspi.Relation_Type; [[Relation type]] 410 @in type: Efl.Access.Relation_Type; [[Relation type]]
411 @in relation_object: const(Elm.Interface.Atspi_Accessible); [[Object to relate to]] 411 @in relation_object: const(Efl.Access); [[Object to relate to]]
412 } 412 }
413 } 413 }
414 relationship_remove { 414 relationship_remove {
@@ -418,8 +418,8 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
418 of given type. 418 of given type.
419 ]] 419 ]]
420 params { 420 params {
421 @in type: Elm.Atspi.Relation_Type; [[Relation type]] 421 @in type: Efl.Access.Relation_Type; [[Relation type]]
422 @in relation_object: const(Elm.Interface.Atspi_Accessible); [[Object to remove relation from]] 422 @in relation_object: const(Efl.Access); [[Object to remove relation from]]
423 } 423 }
424 } 424 }
425 relationships_clear { 425 relationships_clear {
@@ -439,9 +439,9 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
439 } 439 }
440 events { 440 events {
441 property,changed: string; [[Called when roperty has changed]] 441 property,changed: string; [[Called when roperty has changed]]
442 children,changed: Elm.Atspi.Event.Children_Changed.Data; [[Called when children have changed]] 442 children,changed: Efl.Access.Event.Children_Changed.Data; [[Called when children have changed]]
443 state,changed: Elm.Atspi.Event.State_Changed.Data; [[Called when tate has changed]] 443 state,changed: Efl.Access.Event.State_Changed.Data; [[Called when tate has changed]]
444 bounds,changed: Elm.Atspi.Event.Geometry_Changed.Data; [[Called when bounds have changed]] 444 bounds,changed: Efl.Access.Event.Geometry_Changed.Data; [[Called when bounds have changed]]
445 visible,data,changed; [[Called when visibility has changed]] 445 visible,data,changed; [[Called when visibility has changed]]
446 active,descendant,changed; [[Called when active state of descendant has changed]] 446 active,descendant,changed; [[Called when active state of descendant has changed]]
447 added; [[Called when item was added]] 447 added; [[Called when item was added]]
diff --git a/src/lib/elementary/efl_access.h b/src/lib/elementary/efl_access.h
new file mode 100644
index 0000000..ec1d9af
--- /dev/null
+++ b/src/lib/elementary/efl_access.h
@@ -0,0 +1,165 @@
1#ifndef EFL_ACCESS_H
2#define EFL_ACCESS_H
3
4#ifdef EFL_BETA_API_SUPPORT
5
6#ifdef EFL_EO_API_SUPPORT
7#include "efl_access.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access.eo.legacy.h"
11#endif
12
13/*
14 * Sets a particilar state type for given state set.
15 */
16#define STATE_TYPE_SET(state_set, type) (state_set|= (1ULL << type))
17
18/**
19 * Unsets a particilar state type for given state set.
20 */
21#define STATE_TYPE_UNSET(state_set, type) (state_set &= ~(1ULL << type))
22
23/**
24 * Gets value of a particilar state type for given state set.
25 */
26#define STATE_TYPE_GET(state_set, type) (state_set & (1ULL << type))
27
28/**
29 * Free Efl_Access_Attributes_List
30 */
31EAPI void efl_access_attributes_list_free(Eina_List *list);
32
33/**
34 * Frees relation.
35 */
36EAPI void efl_access_relation_free(Efl_Access_Relation *relation);
37
38/**
39 * Clones relation.
40 */
41EAPI Efl_Access_Relation * efl_access_relation_clone(const Efl_Access_Relation *relation);
42
43/**
44 * Appends relation to relation set
45 */
46EAPI Eina_Bool efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj);
47
48/**
49 * Removes relation from relation set
50 */
51EAPI void efl_access_relation_set_relation_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj);
52
53/**
54 * Removes all relation from relation set of a given type
55 */
56EAPI void efl_access_relation_set_relation_type_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type);
57
58/**
59 * Frees Efl_Access_Relation_Set
60 */
61EAPI void efl_access_relation_set_free(Efl_Access_Relation_Set set);
62
63/**
64 * Clones Efl_Access_Relation_Set
65 */
66EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Relation_Set set);
67
68#ifdef EFL_EO_API_SUPPORT
69
70/**
71 * Emits Accessible 'StateChanged' signal.
72 */
73#define efl_access_state_changed_signal_emit(obj, tp, nvl) \
74 { do { \
75 Efl_Access_Event_State_Changed_Data evinfo; \
76 evinfo.type = (tp); \
77 evinfo.new_value = (nvl); \
78 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_STATE_CHANGED, (void*)&evinfo); \
79 } while(0); }
80
81/**
82 * Emits Accessible 'BoundsChanged' signal.
83 */
84#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
85 do { \
86 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
87 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
88 } while(0);
89
90/**
91 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
92 */
93#define efl_access_name_changed_signal_emit(obj) \
94 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "name");
95
96/**
97 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
98 */
99#define efl_access_description_changed_signal_emit(obj) \
100 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "description");
101
102/**
103 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
104 */
105#define efl_access_parent_changed_signal_emit(obj) \
106 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "parent");
107
108/**
109 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
110 */
111#define efl_access_role_changed_signal_emit(obj) \
112 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "role");
113
114/**
115 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
116 */
117#define efl_access_value_changed_signal_emit(obj) \
118 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "value");
119
120/**
121 * Emits Accessible 'ChildrenChanged' signal with added child as argument.
122 */
123#define efl_access_children_changed_added_signal_emit(obj, child) \
124 do { \
125 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
126 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \
127 } while(0);
128
129/**
130 * Emits Accessible 'ChildrenChanged' signal with deleted child as argument.
131 */
132#define efl_access_children_changed_del_signal_emit(obj, child) \
133 do { \
134 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
135 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \
136 } while(0);
137
138/**
139 * Emits Accessible 'ActiveDescendantChanged' signal.
140 */
141#define efl_access_active_descendant_changed_signal_emit(obj, child) \
142 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
143
144/**
145 * Emits Accessible 'VisibleDataChanged' signal.
146 */
147#define efl_access_visible_data_changed_signal_emit(obj) \
148 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, NULL);
149
150/**
151 * Emits Accessible 'AddAccessible' signal.
152 */
153#define efl_access_added(obj) \
154 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ADDED, NULL);
155
156/**
157 * Emits Accessible 'RemoveAccessible' signal.
158 */
159#define efl_access_removed(obj) \
160 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_REMOVED, NULL);
161
162#endif
163
164#endif
165#endif
diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c
index 5b4ddd3..abc72ef 100644
--- a/src/lib/elementary/efl_access_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
9 9
@@ -76,7 +76,7 @@ _efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Ei
76 Eina_List *l, *children; 76 Eina_List *l, *children;
77 Eo *ret = NULL, *child; 77 Eo *ret = NULL, *child;
78 78
79 children = elm_interface_atspi_accessible_children_get(obj); 79 children = efl_access_children_get(obj);
80 80
81 EINA_LIST_FOREACH(children, l, child) 81 EINA_LIST_FOREACH(children, l, child)
82 { 82 {
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 5e2b6c8..06dce84 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#endif
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index 3e66cec..4170702 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -120,7 +120,7 @@ elm_bg_add(Evas_Object *parent)
120EOLIAN static Eo * 120EOLIAN static Eo *
121_efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED) 121_efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED)
122{ 122{
123 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED); 123 efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
124 obj = efl_constructor(efl_super(obj, MY_CLASS)); 124 obj = efl_constructor(efl_super(obj, MY_CLASS));
125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
126 126
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index aeab3b9..7c6fdeb 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -158,11 +158,11 @@ _efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
158EOLIAN static Eo * 158EOLIAN static Eo *
159_efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd) 159_efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
160{ 160{
161 elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); 161 efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
162 obj = efl_constructor(efl_super(obj, MY_CLASS)); 162 obj = efl_constructor(efl_super(obj, MY_CLASS));
163 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 163 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
164 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 164 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
165 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 165 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
166 166
167 pd->align.h = 0.5; 167 pd->align.h = 0.5;
168 pd->align.v = 0.5; 168 pd->align.v = 0.5;
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 0812c3a..578e70c 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 5#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
@@ -309,7 +309,7 @@ _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
309 obj = efl_constructor(efl_super(obj, MY_CLASS)); 309 obj = efl_constructor(efl_super(obj, MY_CLASS));
310 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 310 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
311 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 311 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
312 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 312 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
313 313
314 return obj; 314 return obj;
315} 315}
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index 8a487fb..26341ec 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8#define EFL_UI_NSTATE_PROTECTED 8#define EFL_UI_NSTATE_PROTECTED
@@ -79,8 +79,8 @@ _activate(Evas_Object *obj)
79 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); 79 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
80 80
81 if (_elm_config->atspi_mode) 81 if (_elm_config->atspi_mode)
82 elm_interface_atspi_accessible_state_changed_signal_emit(obj, 82 efl_access_state_changed_signal_emit(obj,
83 ELM_ATSPI_STATE_CHECKED, 83 EFL_ACCESS_STATE_CHECKED,
84 efl_ui_nstate_value_get(obj)); 84 efl_ui_nstate_value_get(obj));
85} 85}
86 86
@@ -100,15 +100,15 @@ _icon_signal_emit(Evas_Object *obj)
100 edje_object_message_signal_process(wd->resize_obj); 100 edje_object_message_signal_process(wd->resize_obj);
101} 101}
102 102
103EOLIAN static Elm_Atspi_State_Set 103EOLIAN static Efl_Access_State_Set
104_efl_ui_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) 104_efl_ui_check_efl_access_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
105{ 105{
106 Elm_Atspi_State_Set states = 0; 106 Efl_Access_State_Set states = 0;
107 107
108 states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); 108 states = efl_access_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
109 109
110 if (elm_check_state_get(obj)) 110 if (elm_check_state_get(obj))
111 STATE_TYPE_SET(states, ELM_ATSPI_STATE_CHECKED); 111 STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED);
112 112
113 return states; 113 return states;
114} 114}
@@ -239,8 +239,8 @@ _on_check_off(void *data,
239 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); 239 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
240 240
241 if (_elm_config->atspi_mode) 241 if (_elm_config->atspi_mode)
242 elm_interface_atspi_accessible_state_changed_signal_emit(data, 242 efl_access_state_changed_signal_emit(data,
243 ELM_ATSPI_STATE_CHECKED, 243 EFL_ACCESS_STATE_CHECKED,
244 efl_ui_nstate_value_get(obj)); 244 efl_ui_nstate_value_get(obj));
245} 245}
246 246
@@ -260,8 +260,8 @@ _on_check_on(void *data,
260 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); 260 efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL);
261 261
262 if (_elm_config->atspi_mode) 262 if (_elm_config->atspi_mode)
263 elm_interface_atspi_accessible_state_changed_signal_emit(data, 263 efl_access_state_changed_signal_emit(data,
264 ELM_ATSPI_STATE_CHECKED, 264 EFL_ACCESS_STATE_CHECKED,
265 efl_ui_nstate_value_get(obj)); 265 efl_ui_nstate_value_get(obj));
266} 266}
267 267
@@ -356,7 +356,7 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED
356 obj = efl_constructor(efl_super(obj, MY_CLASS)); 356 obj = efl_constructor(efl_super(obj, MY_CLASS));
357 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 357 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
358 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 358 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
359 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX); 359 efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
360 360
361 return obj; 361 return obj;
362} 362}
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index fd2ad47..00aa3b3 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -29,7 +29,7 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Elm.Interface.Atspi_Widget_Action)
29 Elm.Widget.widget_event; 29 Elm.Widget.widget_event;
30 Efl.Ui.Nstate.count { set; } 30 Efl.Ui.Nstate.count { set; }
31 Efl.Ui.Nstate.value { set; } 31 Efl.Ui.Nstate.value { set; }
32 Elm.Interface.Atspi_Accessible.state_set { get; } 32 Efl.Access.state_set { get; }
33 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 33 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
34 } 34 }
35 events { 35 events {
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index 1291f87..f994d56 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_UI_TRANSLATABLE_PROTECTED 6#define EFL_UI_TRANSLATABLE_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -908,7 +908,7 @@ _efl_ui_clock_efl_object_constructor(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED
908 obj = efl_constructor(efl_super(obj, MY_CLASS)); 908 obj = efl_constructor(efl_super(obj, MY_CLASS));
909 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 909 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
910 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 910 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
911 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR); 911 efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
912 912
913 return obj; 913 return obj;
914} 914}
diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c
index 05809aa..63b07ea 100644
--- a/src/lib/elementary/efl_ui_flip.c
+++ b/src/lib/elementary/efl_ui_flip.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
@@ -1877,7 +1877,7 @@ _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
1877 1877
1878 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1878 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1879 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1879 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1880 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); 1880 efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
1881 1881
1882 return obj; 1882 return obj;
1883} 1883}
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 16487b5..187b14f 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -148,7 +148,7 @@ _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED
148 obj = efl_constructor(efl_super(obj, MY_CLASS)); 148 obj = efl_constructor(efl_super(obj, MY_CLASS));
149 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 149 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
150 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 150 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
151 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); 151 efl_access_role_set(obj, EFL_ACCESS_ROLE_FRAME);
152 152
153 return obj; 153 return obj;
154} 154}
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 65e57d8..ef41b21 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -188,7 +188,7 @@ _efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd)
188{ 188{
189 obj = efl_constructor(efl_super(obj, MY_CLASS)); 189 obj = efl_constructor(efl_super(obj, MY_CLASS));
190 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 190 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
191 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 191 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
192 192
193 pd->dir1 = EFL_UI_DIR_RIGHT; 193 pd->dir1 = EFL_UI_DIR_RIGHT;
194 pd->dir2 = EFL_UI_DIR_DOWN; 194 pd->dir2 = EFL_UI_DIR_DOWN;
diff --git a/src/lib/elementary/efl_ui_grid_static.c b/src/lib/elementary/efl_ui_grid_static.c
index fb5601a..9e1567f 100644
--- a/src/lib/elementary/efl_ui_grid_static.c
+++ b/src/lib/elementary/efl_ui_grid_static.c
@@ -11,7 +11,7 @@ _efl_ui_grid_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
11 11
12 obj = efl_constructor(efl_super(obj, MY_CLASS)); 12 obj = efl_constructor(efl_super(obj, MY_CLASS));
13 efl_canvas_object_type_set(obj, MY_CLASS_NAME); 13 efl_canvas_object_type_set(obj, MY_CLASS_NAME);
14 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 14 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
15 15
16 gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS); 16 gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS);
17 gd->req_cols = 100; 17 gd->req_cols = 100;
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index c68b52a..be0cef5 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_IMAGE_PROTECTED 5#define EFL_ACCESS_IMAGE_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_CANVAS_LAYOUT_CALC_PROTECTED 8#define EFL_CANVAS_LAYOUT_CALC_PROTECTED
9 9
@@ -864,7 +864,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
864 obj = efl_constructor(efl_super(obj, MY_CLASS)); 864 obj = efl_constructor(efl_super(obj, MY_CLASS));
865 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 865 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
866 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 866 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
867 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 867 efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
868 868
869 pd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE; 869 pd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE;
870 pd->self = obj; 870 pd->self = obj;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index f889231..3b882a4 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -1540,7 +1540,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat
1540 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1540 obj = efl_constructor(efl_super(obj, MY_CLASS));
1541 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1541 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1542 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1542 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1543 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); 1543 efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
1544 1544
1545 return obj; 1545 return obj;
1546} 1546}
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 31dc5f5..2afd254 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -398,7 +398,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
398 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 398 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
399 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 399 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
400 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 400 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
401 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 401 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
402 } 402 }
403 else 403 else
404 { 404 {
@@ -406,7 +406,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
406 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 406 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
407 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 407 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
408 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 408 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
409 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 409 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
410 } 410 }
411 if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) 411 if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS))
412 edje_object_message_signal_process(wd->resize_obj); 412 edje_object_message_signal_process(wd->resize_obj);
@@ -2059,7 +2059,7 @@ _efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd)
2059 obj = efl_constructor(efl_super(obj, MY_CLASS)); 2059 obj = efl_constructor(efl_super(obj, MY_CLASS));
2060 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 2060 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2061 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2061 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2062 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); 2062 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
2063 2063
2064 return obj; 2064 return obj;
2065} 2065}
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index d0507d6..f196b0e 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7#define EFL_GFX_SIZE_HINT_PROTECTED 7#define EFL_GFX_SIZE_HINT_PROTECTED
8 8
@@ -392,7 +392,7 @@ _efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED
392 obj = efl_constructor(efl_super(obj, MY_CLASS)); 392 obj = efl_constructor(efl_super(obj, MY_CLASS));
393 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 393 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
394 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 394 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
395 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE); 395 efl_access_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE);
396 396
397 return obj; 397 return obj;
398} 398}
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 30ee503..3f24cac 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -353,7 +353,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd
353 obj = efl_constructor(efl_super(obj, MY_CLASS)); 353 obj = efl_constructor(efl_super(obj, MY_CLASS));
354 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 354 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
355 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 355 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
356 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR); 356 efl_access_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR);
357 357
358 return obj; 358 return obj;
359} 359}
diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c
index 818d73f..33ff0fc 100644
--- a/src/lib/elementary/efl_ui_radio.c
+++ b/src/lib/elementary/efl_ui_radio.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_LAYOUT_PROTECTED 7#define ELM_LAYOUT_PROTECTED
8 8
@@ -71,7 +71,7 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate)
71 { 71 {
72 if (sd->state) 72 if (sd->state)
73 { 73 {
74 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_CHECKED, EINA_TRUE); 74 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_CHECKED, EINA_TRUE);
75 } 75 }
76 } 76 }
77 } 77 }
@@ -254,7 +254,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED
254 obj = efl_constructor(efl_super(obj, MY_CLASS)); 254 obj = efl_constructor(efl_super(obj, MY_CLASS));
255 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 255 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
256 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 256 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
257 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON); 257 efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
258 258
259 return obj; 259 return obj;
260} 260}
@@ -371,14 +371,14 @@ _efl_ui_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
371 return &atspi_actions[0]; 371 return &atspi_actions[0];
372} 372}
373 373
374EOLIAN Elm_Atspi_State_Set 374EOLIAN Efl_Access_State_Set
375_efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) 375_efl_ui_radio_efl_access_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED)
376{ 376{
377 Elm_Atspi_State_Set ret; 377 Efl_Access_State_Set ret;
378 378
379 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); 379 ret = efl_access_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
380 if (obj == elm_radio_selected_object_get(obj)) 380 if (obj == elm_radio_selected_object_get(obj))
381 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); 381 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED);
382 382
383 return ret; 383 return ret;
384} 384}
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index 8d6c4cf..397c1fb 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -80,7 +80,7 @@ class Efl.Ui.Radio (Efl.Ui.Check, Elm.Interface.Atspi_Widget_Action)
80 Elm.Widget.theme_apply; 80 Elm.Widget.theme_apply;
81 Elm.Widget.on_access_activate; 81 Elm.Widget.on_access_activate;
82 Elm.Widget.widget_event; 82 Elm.Widget.widget_event;
83 Elm.Interface.Atspi_Accessible.state_set { get; } 83 Efl.Access.state_set { get; }
84 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 84 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
85 } 85 }
86 events { 86 events {
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index cb06d1d..00a0a86 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define EFL_ACCESS_VALUE_PROTECTED 7#define EFL_ACCESS_VALUE_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
@@ -69,7 +69,7 @@ _delay_change(void *data)
69 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_DELAY_CHANGED, NULL); 69 efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_DELAY_CHANGED, NULL);
70 70
71 if (_elm_config->atspi_mode) 71 if (_elm_config->atspi_mode)
72 elm_interface_atspi_accessible_value_changed_signal_emit(data); 72 efl_access_value_changed_signal_emit(data);
73 73
74 return ECORE_CALLBACK_CANCEL; 74 return ECORE_CALLBACK_CANCEL;
75} 75}
@@ -208,7 +208,7 @@ _val_set(Evas_Object *obj)
208 208
209 // emit accessiblity event also if value was chagend by API 209 // emit accessiblity event also if value was chagend by API
210 if (_elm_config->atspi_mode) 210 if (_elm_config->atspi_mode)
211 elm_interface_atspi_accessible_value_changed_signal_emit(obj); 211 efl_access_value_changed_signal_emit(obj);
212} 212}
213 213
214static void 214static void
@@ -1213,7 +1213,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
1213 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1213 obj = efl_constructor(efl_super(obj, MY_CLASS));
1214 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1214 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1215 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1215 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1216 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); 1216 efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
1217 1217
1218 return obj; 1218 return obj;
1219} 1219}
diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c
index 9d6cd83..a47f1c4 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED 7#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
8 8
@@ -79,7 +79,7 @@ _val_set(Evas_Object *obj)
79 79
80 // emit accessiblity event also if value was chagend by API 80 // emit accessiblity event also if value was chagend by API
81 if (_elm_config->atspi_mode) 81 if (_elm_config->atspi_mode)
82 elm_interface_atspi_accessible_value_changed_signal_emit(obj); 82 efl_access_value_changed_signal_emit(obj);
83} 83}
84 84
85static void 85static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index b3b4756..afe06ed 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_ACCESS_TEXT_PROTECTED 6#define EFL_ACCESS_TEXT_PROTECTED
7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED 7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
@@ -1213,7 +1213,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
1213 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1213 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1214 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 1214 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL);
1215 if (_elm_config->atspi_mode) 1215 if (_elm_config->atspi_mode)
1216 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 1216 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
1217 _return_key_enabled_check(obj); 1217 _return_key_enabled_check(obj);
1218 _validate(obj); 1218 _validate(obj);
1219 } 1219 }
@@ -1230,7 +1230,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
1230 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1230 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1231 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 1231 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL);
1232 if (_elm_config->atspi_mode) 1232 if (_elm_config->atspi_mode)
1233 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 1233 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
1234 1234
1235 if (_elm_config->selection_clear_enable) 1235 if (_elm_config->selection_clear_enable)
1236 { 1236 {
@@ -2196,14 +2196,14 @@ _entry_changed_user_signal_cb(void *data,
2196 atspi_info.content = edje_info->change.insert.content; 2196 atspi_info.content = edje_info->change.insert.content;
2197 atspi_info.pos = edje_info->change.insert.pos; 2197 atspi_info.pos = edje_info->change.insert.pos;
2198 atspi_info.len = edje_info->change.insert.plain_length; 2198 atspi_info.len = edje_info->change.insert.plain_length;
2199 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2199 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2200 } 2200 }
2201 else if (edje_info && !edje_info->insert) 2201 else if (edje_info && !edje_info->insert)
2202 { 2202 {
2203 atspi_info.content = edje_info->change.del.content; 2203 atspi_info.content = edje_info->change.del.content;
2204 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2204 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2205 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2205 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2206 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2206 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2207 } 2207 }
2208 } 2208 }
2209} 2209}
@@ -2258,7 +2258,7 @@ _entry_cursor_changed_signal_cb(void *data,
2258 _decoration_defer(obj); 2258 _decoration_defer(obj);
2259 2259
2260 if (_elm_config->atspi_mode) 2260 if (_elm_config->atspi_mode)
2261 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2261 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2262} 2262}
2263 2263
2264static void 2264static void
@@ -2270,7 +2270,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2270 efl_event_callback_legacy_call 2270 efl_event_callback_legacy_call
2271 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2271 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2272 if (_elm_config->atspi_mode) 2272 if (_elm_config->atspi_mode)
2273 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2273 efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2274} 2274}
2275 2275
2276static void 2276static void
@@ -3380,7 +3380,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED)
3380 obj = efl_constructor(efl_super(obj, MY_CLASS)); 3380 obj = efl_constructor(efl_super(obj, MY_CLASS));
3381 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 3381 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
3382 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 3382 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
3383 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 3383 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
3384 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); 3384 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
3385 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); 3385 efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
3386 efl_ui_text_interactive_editable_set(obj, EINA_FALSE); 3386 efl_ui_text_interactive_editable_set(obj, EINA_FALSE);
@@ -3414,7 +3414,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password)
3414 sd->single_line = EINA_TRUE; 3414 sd->single_line = EINA_TRUE;
3415 sd->line_wrap = ELM_WRAP_NONE; 3415 sd->line_wrap = ELM_WRAP_NONE;
3416 efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); 3416 efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA));
3417 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PASSWORD_TEXT); 3417 efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
3418 } 3418 }
3419 else 3419 else
3420 { 3420 {
@@ -3426,7 +3426,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password)
3426 _dnd_drop_cb, NULL); 3426 _dnd_drop_cb, NULL);
3427 3427
3428 efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); 3428 efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
3429 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); 3429 efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
3430 } 3430 }
3431 3431
3432 elm_obj_widget_theme_apply(obj); 3432 elm_obj_widget_theme_apply(obj);
@@ -4603,23 +4603,23 @@ _efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNU
4603 return EINA_TRUE; 4603 return EINA_TRUE;
4604} 4604}
4605 4605
4606EOLIAN static Elm_Atspi_State_Set 4606EOLIAN static Efl_Access_State_Set
4607_efl_ui_text_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4607_efl_ui_text_efl_access_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4608{ 4608{
4609 Elm_Atspi_State_Set ret; 4609 Efl_Access_State_Set ret;
4610 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 4610 ret = efl_access_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4611 4611
4612 if (efl_ui_text_interactive_editable_get(obj)) 4612 if (efl_ui_text_interactive_editable_get(obj))
4613 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); 4613 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
4614 4614
4615 return ret; 4615 return ret;
4616} 4616}
4617 4617
4618EOLIAN static const char* 4618EOLIAN static const char*
4619_efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *pd) 4619_efl_ui_text_efl_access_name_get(Eo *obj, Efl_Ui_Text_Data *pd)
4620{ 4620{
4621 const char *name; 4621 const char *name;
4622 name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); 4622 name = efl_access_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
4623 if (name && strncmp("", name, 1)) return name; 4623 if (name && strncmp("", name, 1)) return name;
4624 const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); 4624 const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide");
4625 return ret; 4625 return ret;
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 354dc9c..67ad82d 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -366,8 +366,8 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
366 Elm.Widget.widget_sub_object_del; 366 Elm.Widget.widget_sub_object_del;
367 Elm.Interface_Scrollable.policy { set; } 367 Elm.Interface_Scrollable.policy { set; }
368 Elm.Interface_Scrollable.bounce_allow { set; } 368 Elm.Interface_Scrollable.bounce_allow { set; }
369 Elm.Interface.Atspi_Accessible.state_set { get; } 369 Efl.Access.state_set { get; }
370 Elm.Interface.Atspi_Accessible.name { get; } 370 Efl.Access.name { get; }
371 Efl.Access.Text.text { get; } 371 Efl.Access.Text.text { get; }
372 Efl.Access.Text.string { get; } 372 Efl.Access.Text.string { get; }
373 Efl.Access.Text.attribute { get; } 373 Efl.Access.Text.attribute { get; }
diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c
index 97bafe8..486b13d 100644
--- a/src/lib/elementary/efl_ui_video.c
+++ b/src/lib/elementary/efl_ui_video.c
@@ -4,7 +4,7 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 7#define EFL_ACCESS_PROTECTED
8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -265,7 +265,7 @@ _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED
265 obj = efl_constructor(efl_super(obj, MY_CLASS)); 265 obj = efl_constructor(efl_super(obj, MY_CLASS));
266 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 266 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
267 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 267 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
268 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 268 efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
269 269
270 return obj; 270 return obj;
271} 271}
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 111032a..5d294fe 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
@@ -1243,7 +1243,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1243 if (_elm_config->atspi_mode) 1243 if (_elm_config->atspi_mode)
1244 { 1244 {
1245 efl_access_window_activated_signal_emit(obj); 1245 efl_access_window_activated_signal_emit(obj);
1246 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE); 1246 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_TRUE);
1247 } 1247 }
1248 1248
1249 /* do nothing */ 1249 /* do nothing */
@@ -1277,7 +1277,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
1277 if (_elm_config->atspi_mode) 1277 if (_elm_config->atspi_mode)
1278 { 1278 {
1279 efl_access_window_deactivated_signal_emit(obj); 1279 efl_access_window_deactivated_signal_emit(obj);
1280 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE); 1280 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE);
1281 } 1281 }
1282 1282
1283 /* do nothing */ 1283 /* do nothing */
@@ -2273,9 +2273,9 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2273 { 2273 {
2274 Eo *root; 2274 Eo *root;
2275 efl_access_window_created_signal_emit(obj); 2275 efl_access_window_created_signal_emit(obj);
2276 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 2276 root = efl_access_root_get(EFL_ACCESS_MIXIN);
2277 if (root) 2277 if (root)
2278 elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj); 2278 efl_access_children_changed_added_signal_emit(root, obj);
2279 } 2279 }
2280 2280
2281 if (do_eval) 2281 if (do_eval)
@@ -2334,10 +2334,10 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2334 if (_elm_config->atspi_mode) 2334 if (_elm_config->atspi_mode)
2335 { 2335 {
2336 Eo *root; 2336 Eo *root;
2337 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 2337 root = efl_access_root_get(EFL_ACCESS_MIXIN);
2338 efl_access_window_destroyed_signal_emit(obj); 2338 efl_access_window_destroyed_signal_emit(obj);
2339 if (root) 2339 if (root)
2340 elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj); 2340 efl_access_children_changed_del_signal_emit(root, obj);
2341 } 2341 }
2342 2342
2343 if (_elm_win_policy_quit_triggered(obj)) 2343 if (_elm_win_policy_quit_triggered(obj))
@@ -4319,7 +4319,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
4319 efreet_desktop_free(d); 4319 efreet_desktop_free(d);
4320 } 4320 }
4321 } 4321 }
4322 elm_interface_atspi_accessible_type_set(sd->icon, ELM_ATSPI_TYPE_DISABLED); 4322 efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
4323 } 4323 }
4324 4324
4325 edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon); 4325 edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
@@ -5282,7 +5282,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W
5282 elm_win_focus_highlight_animate_set(obj, EINA_TRUE); 5282 elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
5283 } 5283 }
5284 5284
5285 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW); 5285 efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW);
5286 if (_elm_config->atspi_mode) 5286 if (_elm_config->atspi_mode)
5287 efl_access_window_created_signal_emit(obj); 5287 efl_access_window_created_signal_emit(obj);
5288 5288
@@ -6648,7 +6648,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS
6648 target = efl_ui_focus_manager_focus_get(m); 6648 target = efl_ui_focus_manager_focus_get(m);
6649 } 6649 }
6650 if (target) 6650 if (target)
6651 elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 6651 efl_access_state_changed_signal_emit(target, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
6652 } 6652 }
6653 else 6653 else
6654 efl_access_window_deactivated_signal_emit(win); 6654 efl_access_window_deactivated_signal_emit(win);
@@ -6676,11 +6676,11 @@ _efl_ui_win_efl_object_debug_name_override(Eo *obj, Efl_Ui_Win_Data *pd, Eina_St
6676} 6676}
6677 6677
6678EOLIAN static Eo* 6678EOLIAN static Eo*
6679_efl_ui_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) 6679_efl_ui_win_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
6680{ 6680{
6681 // attach all kinds of windows directly to ATSPI application root object 6681 // attach all kinds of windows directly to ATSPI application root object
6682 Eo *root; 6682 Eo *root;
6683 root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); 6683 root = efl_access_root_get(EFL_ACCESS_MIXIN);
6684 return root; 6684 return root;
6685} 6685}
6686 6686
@@ -6699,23 +6699,23 @@ _efl_ui_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
6699 return &atspi_actions[0]; 6699 return &atspi_actions[0];
6700} 6700}
6701 6701
6702EOLIAN static Elm_Atspi_State_Set 6702EOLIAN static Efl_Access_State_Set
6703_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6703_efl_ui_win_efl_access_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6704{ 6704{
6705 Elm_Atspi_State_Set ret; 6705 Efl_Access_State_Set ret;
6706 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); 6706 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
6707 6707
6708 if (elm_win_focus_get(obj)) 6708 if (elm_win_focus_get(obj))
6709 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE); 6709 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE);
6710 6710
6711 return ret; 6711 return ret;
6712} 6712}
6713 6713
6714EOLIAN static const char* 6714EOLIAN static const char*
6715_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) 6715_efl_ui_win_efl_access_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
6716{ 6716{
6717 const char *ret; 6717 const char *ret;
6718 ret = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); 6718 ret = efl_access_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
6719 if (ret) return ret; 6719 if (ret) return ret;
6720 const char *name = elm_win_title_get(obj); 6720 const char *name = elm_win_title_get(obj);
6721 return name; 6721 return name;
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index cd0807e..d194dd2 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -830,9 +830,9 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
830 Elm.Widget.on_focus_update; 830 Elm.Widget.on_focus_update;
831 Elm.Widget.widget_event; 831 Elm.Widget.widget_event;
832 Elm.Widget.focus_manager_create; 832 Elm.Widget.focus_manager_create;
833 Elm.Interface.Atspi_Accessible.parent { get; } 833 Efl.Access.parent { get; }
834 Elm.Interface.Atspi_Accessible.state_set { get; } 834 Efl.Access.state_set { get; }
835 Elm.Interface.Atspi_Accessible.name { get; } 835 Efl.Access.name { get; }
836 Efl.Access.Component.extents { get; } 836 Efl.Access.Component.extents { get; }
837 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 837 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
838 Efl.Input.State.modifier_enabled { get; } 838 Efl.Input.State.modifier_enabled { get; }
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index fde189a..32c3a05 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define EFL_UI_TRANSLATABLE_PROTECTED 8#define EFL_UI_TRANSLATABLE_PROTECTED
@@ -358,7 +358,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
358 358
359 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 359 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
360 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 360 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
361 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); 361 efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
362 362
363 //hover-parent 363 //hover-parent
364 sd->hover_parent = elm_object_top_widget_get(obj); 364 sd->hover_parent = elm_object_top_widget_get(obj);
diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 1799b65..7f63333 100644
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
@@ -1124,7 +1124,7 @@ _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED
1124 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1124 obj = efl_constructor(efl_super(obj, MY_CLASS));
1125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1125 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1126 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1126 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1127 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); 1127 efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
1128 1128
1129 return obj; 1129 return obj;
1130} 1130}
@@ -1536,13 +1536,13 @@ _elm_ctxpopup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU
1536 return &atspi_actions[0]; 1536 return &atspi_actions[0];
1537} 1537}
1538 1538
1539EOLIAN static Elm_Atspi_State_Set 1539EOLIAN static Efl_Access_State_Set
1540_elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) 1540_elm_ctxpopup_efl_access_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
1541{ 1541{
1542 Elm_Atspi_State_Set ret; 1542 Efl_Access_State_Set ret;
1543 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); 1543 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
1544 1544
1545 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL); 1545 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
1546 1546
1547 return ret; 1547 return ret;
1548} 1548}
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 5ae7ed5..55f24ad 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -9,7 +9,7 @@
9# include "elementary_config.h" 9# include "elementary_config.h"
10#endif 10#endif
11 11
12#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 12#define EFL_ACCESS_PROTECTED
13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 13#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
14 14
15#include <Elementary.h> 15#include <Elementary.h>
@@ -2049,7 +2049,7 @@ _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
2049 sd->obj = obj; 2049 sd->obj = obj;
2050 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 2050 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
2051 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 2051 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
2052 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER); 2052 efl_access_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER);
2053 2053
2054 return obj; 2054 return obj;
2055} 2055}
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 1c67012..4e31179 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_priv.h" 8#include "elm_priv.h"
@@ -272,7 +272,7 @@ _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button
272 272
273 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 273 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
274 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 274 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
275 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 275 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
276 276
277 return obj; 277 return obj;
278} 278}
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 08c0d9f..ac49e18 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -3,7 +3,7 @@
3# include "elementary_config.h" 3# include "elementary_config.h"
4#endif 4#endif
5 5
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
9#include "elm_priv.h" 9#include "elm_priv.h"
@@ -338,7 +338,7 @@ _elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_D
338 obj = efl_constructor(efl_super(obj, MY_CLASS)); 338 obj = efl_constructor(efl_super(obj, MY_CLASS));
339 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 339 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
340 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 340 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
341 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); 341 efl_access_role_set(obj, EFL_ACCESS_ROLE_GROUPING);
342 342
343 return obj; 343 return obj;
344} 344}
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 3f0f126..fd20759 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
@@ -694,7 +694,7 @@ _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED
694 obj = efl_constructor(efl_super(obj, MY_CLASS)); 694 obj = efl_constructor(efl_super(obj, MY_CLASS));
695 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 695 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
696 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 696 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
697 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); 697 efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
698 698
699 return obj; 699 return obj;
700} 700}
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index aac415a..125da1c 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_WIDGET_ITEM_PROTECTED 6#define ELM_WIDGET_ITEM_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_UI_TRANSLATABLE_PROTECTED 8#define EFL_UI_TRANSLATABLE_PROTECTED
@@ -535,8 +535,8 @@ _on_item_clicked(void *data,
535 _item_select(WIDGET(it), it); 535 _item_select(WIDGET(it), it);
536 536
537 if (_elm_config->atspi_mode) 537 if (_elm_config->atspi_mode)
538 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, 538 efl_access_state_changed_signal_emit(eo_it,
539 ELM_ATSPI_STATE_CHECKED, 539 EFL_ACCESS_STATE_CHECKED,
540 EINA_TRUE); 540 EINA_TRUE);
541 541
542 if (sd->selected_it) 542 if (sd->selected_it)
@@ -699,7 +699,7 @@ _elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it,
699 Elm_Multibuttonentry_Item_Data *it) 699 Elm_Multibuttonentry_Item_Data *it)
700{ 700{
701 if (_elm_config->atspi_mode) 701 if (_elm_config->atspi_mode)
702 elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it); 702 efl_access_children_changed_del_signal_emit(WIDGET(it), eo_it);
703 _item_del(it); 703 _item_del(it);
704 704
705 efl_destructor(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 705 efl_destructor(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
@@ -793,12 +793,12 @@ _item_new(Elm_Multibuttonentry_Data *sd,
793 return NULL; 793 return NULL;
794 WIDGET_ITEM_DATA_SET(eo_item, data); 794 WIDGET_ITEM_DATA_SET(eo_item, data);
795 795
796 elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_RADIO_BUTTON); 796 efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
797 797
798 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); 798 ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
799 VIEW(item) = elm_layout_add(obj); 799 VIEW(item) = elm_layout_add(obj);
800 800
801 elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_DISABLED); 801 efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED);
802 802
803 if (!elm_layout_theme_set 803 if (!elm_layout_theme_set
804 (VIEW(item), "multibuttonentry", "btn", elm_widget_style_get(obj))) 804 (VIEW(item), "multibuttonentry", "btn", elm_widget_style_get(obj)))
@@ -971,8 +971,8 @@ _item_new(Elm_Multibuttonentry_Data *sd,
971 971
972 if (_elm_config->atspi_mode) 972 if (_elm_config->atspi_mode)
973 { 973 {
974 elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); 974 efl_access_children_changed_added_signal_emit(obj, eo_item);
975 elm_interface_atspi_accessible_added(eo_item); 975 efl_access_added(eo_item);
976 } 976 }
977 977
978 return eo_item; 978 return eo_item;
@@ -1694,7 +1694,7 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data
1694 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1694 obj = efl_constructor(efl_super(obj, MY_CLASS));
1695 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1695 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1696 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1696 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1697 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); 1697 efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL);
1698 1698
1699 return obj; 1699 return obj;
1700} 1700}
@@ -1985,38 +1985,38 @@ _elm_multibuttonentry_class_constructor(Efl_Class *klass)
1985} 1985}
1986 1986
1987EOLIAN static Eina_List* 1987EOLIAN static Eina_List*
1988_elm_multibuttonentry_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd) 1988_elm_multibuttonentry_efl_access_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd)
1989{ 1989{
1990 Eina_List *ret; 1990 Eina_List *ret;
1991 ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); 1991 ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
1992 return eina_list_merge(eina_list_clone(sd->items), ret); 1992 return eina_list_merge(eina_list_clone(sd->items), ret);
1993} 1993}
1994 1994
1995EOLIAN static const char* 1995EOLIAN static const char*
1996_elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) 1996_elm_multibuttonentry_item_efl_access_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item)
1997{ 1997{
1998 const char *ret; 1998 const char *ret;
1999 ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 1999 ret = efl_access_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
2000 if (ret) return ret; 2000 if (ret) return ret;
2001 2001
2002 ret = elm_object_part_text_get(VIEW(item), "elm.btn.text"); 2002 ret = elm_object_part_text_get(VIEW(item), "elm.btn.text");
2003 return _elm_widget_item_accessible_plain_name_get(eo_it, ret); 2003 return _elm_widget_item_accessible_plain_name_get(eo_it, ret);
2004} 2004}
2005 2005
2006EOLIAN static Elm_Atspi_State_Set 2006EOLIAN static Efl_Access_State_Set
2007_elm_multibuttonentry_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) 2007_elm_multibuttonentry_item_efl_access_state_set_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED)
2008{ 2008{
2009 Elm_Atspi_State_Set ret; 2009 Efl_Access_State_Set ret;
2010 Eina_Bool sel; 2010 Eina_Bool sel;
2011 2011
2012 ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); 2012 ret = efl_access_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
2013 2013
2014 sel = elm_obj_multibuttonentry_item_selected_get(eo_it); 2014 sel = elm_obj_multibuttonentry_item_selected_get(eo_it);
2015 2015
2016 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); 2016 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
2017 2017
2018 if (sel) 2018 if (sel)
2019 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); 2019 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED);
2020 2020
2021 return ret; 2021 return ret;
2022} 2022}
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 3688971..a544c59 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_ITEM_PROTECTED 7#define ELM_WIDGET_ITEM_PROTECTED
8#define ELM_WIDGET_PROTECTED 8#define ELM_WIDGET_PROTECTED
@@ -542,7 +542,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it,
542 if (nit->title_label) strncat(buf, " ", 1); 542 if (nit->title_label) strncat(buf, " ", 1);
543 strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2); 543 strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
544 } 544 }
545 elm_interface_atspi_accessible_name_set(eo_it, buf); 545 efl_access_name_set(eo_it, buf);
546 546
547 elm_layout_sizing_eval(WIDGET(nit)); 547 elm_layout_sizing_eval(WIDGET(nit));
548} 548}
@@ -1265,8 +1265,8 @@ _item_new(Evas_Object *obj,
1265 ELM_NAVIFRAME_DATA_GET(obj, sd); 1265 ELM_NAVIFRAME_DATA_GET(obj, sd);
1266 1266
1267 eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj); 1267 eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
1268 elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_PAGE_TAB); 1268 efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB);
1269 elm_interface_atspi_accessible_name_set(eo_item, (char*)title_label); 1269 efl_access_name_set(eo_item, (char*)title_label);
1270 1270
1271 if (!eo_item) 1271 if (!eo_item)
1272 { 1272 {
@@ -1591,7 +1591,7 @@ _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd)
1591 sd->obj = obj; 1591 sd->obj = obj;
1592 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1592 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1593 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1593 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1594 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); 1594 efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
1595 1595
1596 return obj; 1596 return obj;
1597} 1597}
@@ -1943,7 +1943,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED,
1943} 1943}
1944 1944
1945EOLIAN static Eina_List* 1945EOLIAN static Eina_List*
1946_elm_naviframe_item_elm_interface_atspi_accessible_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) 1946_elm_naviframe_item_efl_access_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
1947{ 1947{
1948 Eina_List *ret = NULL; 1948 Eina_List *ret = NULL;
1949 1949
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index ac6d35e..ae06fa7 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -4,7 +4,7 @@
4 4
5#include <Emotion.h> 5#include <Emotion.h>
6 6
7#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 7#define EFL_ACCESS_PROTECTED
8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 8#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -667,7 +667,7 @@ _elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
667 obj = efl_constructor(efl_super(obj, MY_CLASS)); 667 obj = efl_constructor(efl_super(obj, MY_CLASS));
668 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 668 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
669 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 669 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
670 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); 670 efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
671 671
672 return obj; 672 return obj;
673} 673}
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 61e8c12..bd88611 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
@@ -1531,7 +1531,7 @@ _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
1531 obj = efl_constructor(efl_super(obj, MY_CLASS)); 1531 obj = efl_constructor(efl_super(obj, MY_CLASS));
1532 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 1532 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
1533 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 1533 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
1534 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); 1534 efl_access_role_set(obj, EFL_ACCESS_ROLE_NOTIFICATION);
1535 1535
1536 return obj; 1536 return obj;
1537} 1537}
@@ -1799,13 +1799,13 @@ _elm_popup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED
1799 return &atspi_actions[0]; 1799 return &atspi_actions[0];
1800} 1800}
1801 1801
1802EOLIAN static Elm_Atspi_State_Set 1802EOLIAN static Efl_Access_State_Set
1803_elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) 1803_elm_popup_efl_access_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
1804{ 1804{
1805 Elm_Atspi_State_Set ret; 1805 Efl_Access_State_Set ret;
1806 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); 1806 ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
1807 1807
1808 STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL); 1808 STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
1809 1809
1810 return ret; 1810 return ret;
1811} 1811}
diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc
index 93744c8..50ed67d 100644
--- a/src/lib/elementary/elementary_js.cc
+++ b/src/lib/elementary/elementary_js.cc
@@ -35,7 +35,7 @@
35#endif /* ! _WIN32 */ 35#endif /* ! _WIN32 */
36 36
37EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate); 37EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate);
38EAPI void register_elm_interface_atspi_accessible(v8::Handle<v8::Object> global, v8::Isolate* isolate); 38EAPI void register_efl_access(v8::Handle<v8::Object> global, v8::Isolate* isolate);
39EAPI void register_efl_access_action(v8::Handle<v8::Object> global, v8::Isolate* isolate); 39EAPI void register_efl_access_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
40EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate); 40EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
41EAPI void register_elm_interface_atspi_text_editable(v8::Handle<v8::Object> global, v8::Isolate* isolate); 41EAPI void register_elm_interface_atspi_text_editable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
@@ -200,7 +200,7 @@ void init(v8::Handle<v8::Object> exports)
200 elm::register_icon(exports, v8::Isolate::GetCurrent()); 200 elm::register_icon(exports, v8::Isolate::GetCurrent());
201 elm::register_image(exports, v8::Isolate::GetCurrent()); 201 elm::register_image(exports, v8::Isolate::GetCurrent());
202 elm::register_index(exports, v8::Isolate::GetCurrent()); 202 elm::register_index(exports, v8::Isolate::GetCurrent());
203 ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent()); 203 ::register_efl_access(exports, v8::Isolate::GetCurrent());
204 ::register_efl_access_action(exports, v8::Isolate::GetCurrent()); 204 ::register_efl_access_action(exports, v8::Isolate::GetCurrent());
205 ::register_efl_access_component(exports, v8::Isolate::GetCurrent()); 205 ::register_efl_access_component(exports, v8::Isolate::GetCurrent());
206 ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent()); 206 ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent());
diff --git a/src/lib/elementary/elm_access.c b/src/lib/elementary/elm_access.c
index 0dc7211..fd953d1 100644
--- a/src/lib/elementary/elm_access.c
+++ b/src/lib/elementary/elm_access.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -1521,17 +1521,17 @@ _elm_access_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE
1521 return &atspi_actions[0]; 1521 return &atspi_actions[0];
1522} 1522}
1523 1523
1524EOLIAN static Elm_Atspi_State_Set 1524EOLIAN static Efl_Access_State_Set
1525_elm_access_elm_interface_atspi_accessible_state_set_get(Eo *obj, void *pd EINA_UNUSED) 1525_elm_access_efl_access_state_set_get(Eo *obj, void *pd EINA_UNUSED)
1526{ 1526{
1527 Elm_Atspi_State_Set ret; 1527 Efl_Access_State_Set ret;
1528 ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); 1528 ret = efl_access_state_set_get(efl_super(obj, ELM_ACCESS_CLASS));
1529 1529
1530 Elm_Access_Info *info = _elm_access_info_get(obj); 1530 Elm_Access_Info *info = _elm_access_info_get(obj);
1531 if (info && !evas_object_visible_get(info->part_object)) 1531 if (info && !evas_object_visible_get(info->part_object))
1532 { 1532 {
1533 STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_VISIBLE); 1533 STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_VISIBLE);
1534 STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_SHOWING); 1534 STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_SHOWING);
1535 } 1535 }
1536 1536
1537 return ret; 1537 return ret;
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index fb1519f..7a23915 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -10,6 +10,6 @@ class Elm.Access (Elm.Widget, Elm.Interface.Atspi_Widget_Action)
10 Elm.Widget.on_access_activate; 10 Elm.Widget.on_access_activate;
11 Elm.Widget.on_focus_update; 11 Elm.Widget.on_focus_update;
12 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 12 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
13 Elm.Interface.Atspi_Accessible.state_set { get; } 13 Efl.Access.state_set { get; }
14 } 14 }
15} 15}
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 8177f69..698d8bb 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define ELM_LAYOUT_PROTECTED 6#define ELM_LAYOUT_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -548,7 +548,7 @@ _elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EIN
548 obj = efl_constructor(efl_super(obj, MY_CLASS)); 548 obj = efl_constructor(efl_super(obj, MY_CLASS));
549 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); 549 efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
550 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 550 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
551 elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); 551 efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
552 552
553 return obj; 553 return obj;
554} 554}
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 2b90552..b1d45c1 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -2,7 +2,7 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
@@ -26,18 +26,18 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O
26} 26}
27 27
28EOLIAN static Eina_List* 28EOLIAN static Eina_List*
29_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 29_elm_atspi_app_object_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
30{ 30{
31 Eina_List *l, *accs = NULL; 31 Eina_List *l, *accs = NULL;
32 Evas_Object *win; 32 Evas_Object *win;
33 33
34 EINA_LIST_FOREACH(_elm_win_list, l, win) 34 EINA_LIST_FOREACH(_elm_win_list, l, win)
35 { 35 {
36 Elm_Atspi_Type type; 36 Efl_Access_Type type;
37 if (!efl_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) 37 if (!efl_isa(win, EFL_ACCESS_MIXIN))
38 continue; 38 continue;
39 type = elm_interface_atspi_accessible_type_get(win); 39 type = efl_access_type_get(win);
40 if (type == ELM_ATSPI_TYPE_REGULAR) 40 if (type == EFL_ACCESS_TYPE_REGULAR)
41 accs = eina_list_append(accs, win); 41 accs = eina_list_append(accs, win);
42 } 42 }
43 43
@@ -45,7 +45,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
45} 45}
46 46
47EOLIAN static const char* 47EOLIAN static const char*
48_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 48_elm_atspi_app_object_efl_access_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
49{ 49{
50 const char *ret; 50 const char *ret;
51 ret = elm_app_name_get(); 51 ret = elm_app_name_get();
@@ -53,21 +53,21 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSE
53} 53}
54 54
55EOLIAN static const char* 55EOLIAN static const char*
56_elm_atspi_app_object_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) 56_elm_atspi_app_object_efl_access_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
57{ 57{
58 return _pd->descr; 58 return _pd->descr;
59} 59}
60 60
61EOLIAN static void 61EOLIAN static void
62_elm_atspi_app_object_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) 62_elm_atspi_app_object_efl_access_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr)
63{ 63{
64 eina_stringshare_replace(&_pd->descr, descr); 64 eina_stringshare_replace(&_pd->descr, descr);
65} 65}
66 66
67EOLIAN static Elm_Atspi_Role 67EOLIAN static Efl_Access_Role
68_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) 68_elm_atspi_app_object_efl_access_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
69{ 69{
70 return ELM_ATSPI_ROLE_APPLICATION; 70 return EFL_ACCESS_ROLE_APPLICATION;
71} 71}
72 72
73#include "elm_atspi_app_object.eo.c" 73#include "elm_atspi_app_object.eo.c"
diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo
index 250a567..2d6bd13 100644
--- a/src/lib/elementary/elm_atspi_app_object.eo
+++ b/src/lib/elementary/elm_atspi_app_object.eo
@@ -1,13 +1,13 @@
1class Elm.Atspi.App.Object (Efl.Object, Elm.Interface.Atspi_Accessible) 1class Elm.Atspi.App.Object (Efl.Object, Efl.Access)
2{ 2{
3 [[AT-SPI application object class]] 3 [[AT-SPI application object class]]
4 legacy_prefix: elm_atspi_app_object; 4 legacy_prefix: elm_atspi_app_object;
5 data: Elm_Atspi_App_Object_Data; 5 data: Elm_Atspi_App_Object_Data;
6 implements { 6 implements {
7 Efl.Object.destructor; 7 Efl.Object.destructor;
8 Elm.Interface.Atspi_Accessible.name { get; } 8 Efl.Access.name { get; }
9 Elm.Interface.Atspi_Accessible.description { get; set; } 9 Efl.Access.description { get; set; }
10 Elm.Interface.Atspi_Accessible.role { get; } 10 Efl.Access.role { get; }
11 Elm.Interface.Atspi_Accessible.children { get; } 11 Efl.Access.children { get; }
12 } 12 }
13} 13}
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 0d8fd28..3d3b3ff 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#define EFL_ACCESS_ACTION_PROTECTED 7#define EFL_ACCESS_ACTION_PROTECTED
8#define EFL_ACCESS_VALUE_PROTECTED 8#define EFL_ACCESS_VALUE_PROTECTED
9#define EFL_ACCESS_IMAGE_PROTECTED 9#define EFL_ACCESS_IMAGE_PROTECTED
@@ -93,14 +93,14 @@ typedef struct _Elm_Atspi_Bridge_Data
93 Eldbus_Service_Interface *text; 93 Eldbus_Service_Interface *text;
94 Eldbus_Service_Interface *value; 94 Eldbus_Service_Interface *value;
95 } interfaces; 95 } interfaces;
96 Elm_Atspi_Event_Handler *event_hdlr; 96 Efl_Access_Event_Handler *event_hdlr;
97 Eina_Hash *event_hash; 97 Eina_Hash *event_hash;
98 Eina_Bool connected : 1; 98 Eina_Bool connected : 1;
99} Elm_Atspi_Bridge_Data; 99} Elm_Atspi_Bridge_Data;
100 100
101 101
102struct collection_match_rule { 102struct collection_match_rule {
103 Elm_Atspi_State_Set states; 103 Efl_Access_State_Set states;
104 AtspiCollectionMatchType statematchtype; 104 AtspiCollectionMatchType statematchtype;
105 Eina_List *attributes; 105 Eina_List *attributes;
106 AtspiCollectionMatchType attributematchtype; 106 AtspiCollectionMatchType attributematchtype;
@@ -149,14 +149,14 @@ typedef struct {
149} Elm_Atspi_Bridge_Event_Handler; 149} Elm_Atspi_Bridge_Event_Handler;
150 150
151static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = { 151static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
152 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, 152 { EFL_ACCESS_EVENT_CHILDREN_CHANGED, _children_changed_signal_send},
153 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, 153 { EFL_ACCESS_EVENT_PROPERTY_CHANGED, _property_changed_signal_send},
154 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, 154 { EFL_ACCESS_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send},
155 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_STATE_CHANGED, _state_changed_signal_send}, 155 { EFL_ACCESS_EVENT_STATE_CHANGED, _state_changed_signal_send},
156 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, 156 { EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send},
157 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, 157 { EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
158 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, _on_object_add}, 158 { EFL_ACCESS_EVENT_ADDED, _on_object_add},
159 { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, _on_object_del}, 159 { EFL_ACCESS_EVENT_REMOVED, _on_object_del},
160 { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send}, 160 { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
161 { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send}, 161 { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
162 { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send}, 162 { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
@@ -283,185 +283,185 @@ static const Eldbus_Signal _window_obj_signals[] = {
283}; 283};
284 284
285static const int elm_roles_to_atspi_roles[][2] = { 285static const int elm_roles_to_atspi_roles[][2] = {
286 { ELM_ATSPI_ROLE_INVALID, ATSPI_ROLE_INVALID }, 286 { EFL_ACCESS_ROLE_INVALID, ATSPI_ROLE_INVALID },
287 { ELM_ATSPI_ROLE_ACCELERATOR_LABEL, ATSPI_ROLE_ACCELERATOR_LABEL }, 287 { EFL_ACCESS_ROLE_ACCELERATOR_LABEL, ATSPI_ROLE_ACCELERATOR_LABEL },
288 { ELM_ATSPI_ROLE_ALERT, ATSPI_ROLE_ALERT }, 288 { EFL_ACCESS_ROLE_ALERT, ATSPI_ROLE_ALERT },
289 { ELM_ATSPI_ROLE_ANIMATION, ATSPI_ROLE_ANIMATION }, 289 { EFL_ACCESS_ROLE_ANIMATION, ATSPI_ROLE_ANIMATION },
290 { ELM_ATSPI_ROLE_ARROW, ATSPI_ROLE_ARROW }, 290 { EFL_ACCESS_ROLE_ARROW, ATSPI_ROLE_ARROW },
291 { ELM_ATSPI_ROLE_CALENDAR, ATSPI_ROLE_CALENDAR }, 291 { EFL_ACCESS_ROLE_CALENDAR, ATSPI_ROLE_CALENDAR },
292 { ELM_ATSPI_ROLE_CANVAS, ATSPI_ROLE_CANVAS }, 292 { EFL_ACCESS_ROLE_CANVAS, ATSPI_ROLE_CANVAS },
293 { ELM_ATSPI_ROLE_CHECK_BOX, ATSPI_ROLE_CHECK_BOX }, 293 { EFL_ACCESS_ROLE_CHECK_BOX, ATSPI_ROLE_CHECK_BOX },
294 { ELM_ATSPI_ROLE_CHECK_MENU_ITEM, ATSPI_ROLE_CHECK_MENU_ITEM }, 294 { EFL_ACCESS_ROLE_CHECK_MENU_ITEM, ATSPI_ROLE_CHECK_MENU_ITEM },
295 { ELM_ATSPI_ROLE_COLOR_CHOOSER, ATSPI_ROLE_COLOR_CHOOSER }, 295 { EFL_ACCESS_ROLE_COLOR_CHOOSER, ATSPI_ROLE_COLOR_CHOOSER },
296 { ELM_ATSPI_ROLE_COLUMN_HEADER, ATSPI_ROLE_COLUMN_HEADER }, 296 { EFL_ACCESS_ROLE_COLUMN_HEADER, ATSPI_ROLE_COLUMN_HEADER },
297 { ELM_ATSPI_ROLE_COMBO_BOX, ATSPI_ROLE_COMBO_BOX }, 297 { EFL_ACCESS_ROLE_COMBO_BOX, ATSPI_ROLE_COMBO_BOX },
298 { ELM_ATSPI_ROLE_DATE_EDITOR, ATSPI_ROLE_DATE_EDITOR }, 298 { EFL_ACCESS_ROLE_DATE_EDITOR, ATSPI_ROLE_DATE_EDITOR },
299 { ELM_ATSPI_ROLE_DESKTOP_ICON, ATSPI_ROLE_DESKTOP_ICON }, 299 { EFL_ACCESS_ROLE_DESKTOP_ICON, ATSPI_ROLE_DESKTOP_ICON },
300 { ELM_ATSPI_ROLE_DESKTOP_FRAME, ATSPI_ROLE_DESKTOP_FRAME }, 300 { EFL_ACCESS_ROLE_DESKTOP_FRAME, ATSPI_ROLE_DESKTOP_FRAME },
301 { ELM_ATSPI_ROLE_DIAL, ATSPI_ROLE_DIAL }, 301 { EFL_ACCESS_ROLE_DIAL, ATSPI_ROLE_DIAL },
302 { ELM_ATSPI_ROLE_DIALOG, ATSPI_ROLE_DIALOG }, 302 { EFL_ACCESS_ROLE_DIALOG, ATSPI_ROLE_DIALOG },
303 { ELM_ATSPI_ROLE_DIRECTORY_PANE, ATSPI_ROLE_DIRECTORY_PANE }, 303 { EFL_ACCESS_ROLE_DIRECTORY_PANE, ATSPI_ROLE_DIRECTORY_PANE },
304 { ELM_ATSPI_ROLE_DRAWING_AREA, ATSPI_ROLE_DRAWING_AREA }, 304 { EFL_ACCESS_ROLE_DRAWING_AREA, ATSPI_ROLE_DRAWING_AREA },
305 { ELM_ATSPI_ROLE_FILE_CHOOSER, ATSPI_ROLE_FILE_CHOOSER }, 305 { EFL_ACCESS_ROLE_FILE_CHOOSER, ATSPI_ROLE_FILE_CHOOSER },
306 { ELM_ATSPI_ROLE_FILLER, ATSPI_ROLE_FILLER }, 306 { EFL_ACCESS_ROLE_FILLER, ATSPI_ROLE_FILLER },
307 { ELM_ATSPI_ROLE_FOCUS_TRAVERSABLE, ATSPI_ROLE_FOCUS_TRAVERSABLE }, 307 { EFL_ACCESS_ROLE_FOCUS_TRAVERSABLE, ATSPI_ROLE_FOCUS_TRAVERSABLE },
308 { ELM_ATSPI_ROLE_FONT_CHOOSER, ATSPI_ROLE_FONT_CHOOSER }, 308 { EFL_ACCESS_ROLE_FONT_CHOOSER, ATSPI_ROLE_FONT_CHOOSER },
309 { ELM_ATSPI_ROLE_FRAME, ATSPI_ROLE_FRAME }, 309 { EFL_ACCESS_ROLE_FRAME, ATSPI_ROLE_FRAME },
310 { ELM_ATSPI_ROLE_GLASS_PANE, ATSPI_ROLE_GLASS_PANE }, 310 { EFL_ACCESS_ROLE_GLASS_PANE, ATSPI_ROLE_GLASS_PANE },
311 { ELM_ATSPI_ROLE_HTML_CONTAINER, ATSPI_ROLE_HTML_CONTAINER }, 311 { EFL_ACCESS_ROLE_HTML_CONTAINER, ATSPI_ROLE_HTML_CONTAINER },
312 { ELM_ATSPI_ROLE_ICON, ATSPI_ROLE_ICON }, 312 { EFL_ACCESS_ROLE_ICON, ATSPI_ROLE_ICON },
313 { ELM_ATSPI_ROLE_IMAGE, ATSPI_ROLE_IMAGE }, 313 { EFL_ACCESS_ROLE_IMAGE, ATSPI_ROLE_IMAGE },
314 { ELM_ATSPI_ROLE_INTERNAL_FRAME, ATSPI_ROLE_INTERNAL_FRAME }, 314 { EFL_ACCESS_ROLE_INTERNAL_FRAME, ATSPI_ROLE_INTERNAL_FRAME },
315 { ELM_ATSPI_ROLE_LABEL, ATSPI_ROLE_LABEL }, 315 { EFL_ACCESS_ROLE_LABEL, ATSPI_ROLE_LABEL },
316 { ELM_ATSPI_ROLE_LAYERED_PANE, ATSPI_ROLE_LAYERED_PANE }, 316 { EFL_ACCESS_ROLE_LAYERED_PANE, ATSPI_ROLE_LAYERED_PANE },
317 { ELM_ATSPI_ROLE_LIST, ATSPI_ROLE_LIST }, 317 { EFL_ACCESS_ROLE_LIST, ATSPI_ROLE_LIST },
318 { ELM_ATSPI_ROLE_LIST_ITEM, ATSPI_ROLE_LIST_ITEM }, 318 { EFL_ACCESS_ROLE_LIST_ITEM, ATSPI_ROLE_LIST_ITEM },
319 { ELM_ATSPI_ROLE_MENU, ATSPI_ROLE_MENU }, 319 { EFL_ACCESS_ROLE_MENU, ATSPI_ROLE_MENU },
320 { ELM_ATSPI_ROLE_MENU_BAR, ATSPI_ROLE_MENU_BAR }, 320 { EFL_ACCESS_ROLE_MENU_BAR, ATSPI_ROLE_MENU_BAR },
321 { ELM_ATSPI_ROLE_MENU_ITEM, ATSPI_ROLE_MENU_ITEM }, 321 { EFL_ACCESS_ROLE_MENU_ITEM, ATSPI_ROLE_MENU_ITEM },
322 { ELM_ATSPI_ROLE_OPTION_PANE, ATSPI_ROLE_OPTION_PANE }, 322 { EFL_ACCESS_ROLE_OPTION_PANE, ATSPI_ROLE_OPTION_PANE },
323 { ELM_ATSPI_ROLE_PAGE_TAB, ATSPI_ROLE_PAGE_TAB }, 323 { EFL_ACCESS_ROLE_PAGE_TAB, ATSPI_ROLE_PAGE_TAB },
324 { ELM_ATSPI_ROLE_PAGE_TAB_LIST, ATSPI_ROLE_PAGE_TAB_LIST }, 324 { EFL_ACCESS_ROLE_PAGE_TAB_LIST, ATSPI_ROLE_PAGE_TAB_LIST },
325 { ELM_ATSPI_ROLE_PANEL, ATSPI_ROLE_PANEL }, 325 { EFL_ACCESS_ROLE_PANEL, ATSPI_ROLE_PANEL },
326 { ELM_ATSPI_ROLE_PASSWORD_TEXT, ATSPI_ROLE_PASSWORD_TEXT }, 326 { EFL_ACCESS_ROLE_PASSWORD_TEXT, ATSPI_ROLE_PASSWORD_TEXT },
327 { ELM_ATSPI_ROLE_POPUP_MENU, ATSPI_ROLE_POPUP_MENU }, 327 { EFL_ACCESS_ROLE_POPUP_MENU, ATSPI_ROLE_POPUP_MENU },
328 { ELM_ATSPI_ROLE_PROGRESS_BAR, ATSPI_ROLE_PROGRESS_BAR }, 328 { EFL_ACCESS_ROLE_PROGRESS_BAR, ATSPI_ROLE_PROGRESS_BAR },
329 { ELM_ATSPI_ROLE_PUSH_BUTTON, ATSPI_ROLE_PUSH_BUTTON }, 329 { EFL_ACCESS_ROLE_PUSH_BUTTON, ATSPI_ROLE_PUSH_BUTTON },
330 { ELM_ATSPI_ROLE_RADIO_BUTTON, ATSPI_ROLE_RADIO_BUTTON }, 330 { EFL_ACCESS_ROLE_RADIO_BUTTON, ATSPI_ROLE_RADIO_BUTTON },
331 { ELM_ATSPI_ROLE_RADIO_MENU_ITEM, ATSPI_ROLE_RADIO_MENU_ITEM }, 331 { EFL_ACCESS_ROLE_RADIO_MENU_ITEM, ATSPI_ROLE_RADIO_MENU_ITEM },
332 { ELM_ATSPI_ROLE_ROOT_PANE, ATSPI_ROLE_ROOT_PANE }, 332 { EFL_ACCESS_ROLE_ROOT_PANE, ATSPI_ROLE_ROOT_PANE },
333 { ELM_ATSPI_ROLE_ROW_HEADER, ATSPI_ROLE_ROW_HEADER }, 333 { EFL_ACCESS_ROLE_ROW_HEADER, ATSPI_ROLE_ROW_HEADER },
334 { ELM_ATSPI_ROLE_SCROLL_BAR, ATSPI_ROLE_SCROLL_BAR }, 334 { EFL_ACCESS_ROLE_SCROLL_BAR, ATSPI_ROLE_SCROLL_BAR },
335 { ELM_ATSPI_ROLE_SCROLL_PANE, ATSPI_ROLE_SCROLL_PANE }, 335 { EFL_ACCESS_ROLE_SCROLL_PANE, ATSPI_ROLE_SCROLL_PANE },
336 { ELM_ATSPI_ROLE_SEPARATOR, ATSPI_ROLE_SEPARATOR }, 336 { EFL_ACCESS_ROLE_SEPARATOR, ATSPI_ROLE_SEPARATOR },
337 { ELM_ATSPI_ROLE_SLIDER, ATSPI_ROLE_SLIDER }, 337 { EFL_ACCESS_ROLE_SLIDER, ATSPI_ROLE_SLIDER },
338 { ELM_ATSPI_ROLE_SPIN_BUTTON, ATSPI_ROLE_SPIN_BUTTON }, 338 { EFL_ACCESS_ROLE_SPIN_BUTTON, ATSPI_ROLE_SPIN_BUTTON },
339 { ELM_ATSPI_ROLE_SPLIT_PANE, ATSPI_ROLE_SPLIT_PANE }, 339 { EFL_ACCESS_ROLE_SPLIT_PANE, ATSPI_ROLE_SPLIT_PANE },
340 { ELM_ATSPI_ROLE_STATUS_BAR, ATSPI_ROLE_STATUS_BAR }, 340 { EFL_ACCESS_ROLE_STATUS_BAR, ATSPI_ROLE_STATUS_BAR },
341 { ELM_ATSPI_ROLE_TABLE, ATSPI_ROLE_TABLE }, 341 { EFL_ACCESS_ROLE_TABLE, ATSPI_ROLE_TABLE },
342 { ELM_ATSPI_ROLE_TABLE_CELL, ATSPI_ROLE_TABLE_CELL }, 342 { EFL_ACCESS_ROLE_TABLE_CELL, ATSPI_ROLE_TABLE_CELL },
343 { ELM_ATSPI_ROLE_TABLE_COLUMN_HEADER, ATSPI_ROLE_TABLE_COLUMN_HEADER }, 343 { EFL_ACCESS_ROLE_TABLE_COLUMN_HEADER, ATSPI_ROLE_TABLE_COLUMN_HEADER },
344 { ELM_ATSPI_ROLE_TABLE_ROW_HEADER, ATSPI_ROLE_TABLE_ROW_HEADER }, 344 { EFL_ACCESS_ROLE_TABLE_ROW_HEADER, ATSPI_ROLE_TABLE_ROW_HEADER },
345 { ELM_ATSPI_ROLE_TEAROFF_MENU_ITEM, ATSPI_ROLE_TEAROFF_MENU_ITEM }, 345 { EFL_ACCESS_ROLE_TEAROFF_MENU_ITEM, ATSPI_ROLE_TEAROFF_MENU_ITEM },
346 { ELM_ATSPI_ROLE_TERMINAL, ATSPI_ROLE_TERMINAL }, 346 { EFL_ACCESS_ROLE_TERMINAL, ATSPI_ROLE_TERMINAL },
347 { ELM_ATSPI_ROLE_TEXT, ATSPI_ROLE_TEXT }, 347 { EFL_ACCESS_ROLE_TEXT, ATSPI_ROLE_TEXT },
348 { ELM_ATSPI_ROLE_TOGGLE_BUTTON, ATSPI_ROLE_TOGGLE_BUTTON }, 348 { EFL_ACCESS_ROLE_TOGGLE_BUTTON, ATSPI_ROLE_TOGGLE_BUTTON },
349 { ELM_ATSPI_ROLE_TOOL_BAR, ATSPI_ROLE_TOOL_BAR }, 349 { EFL_ACCESS_ROLE_TOOL_BAR, ATSPI_ROLE_TOOL_BAR },
350 { ELM_ATSPI_ROLE_TOOL_TIP, ATSPI_ROLE_TOOL_TIP }, 350 { EFL_ACCESS_ROLE_TOOL_TIP, ATSPI_ROLE_TOOL_TIP },
351 { ELM_ATSPI_ROLE_TREE, ATSPI_ROLE_TREE }, 351 { EFL_ACCESS_ROLE_TREE, ATSPI_ROLE_TREE },
352 { ELM_ATSPI_ROLE_TREE_TABLE, ATSPI_ROLE_TREE_TABLE }, 352 { EFL_ACCESS_ROLE_TREE_TABLE, ATSPI_ROLE_TREE_TABLE },
353 { ELM_ATSPI_ROLE_UNKNOWN, ATSPI_ROLE_UNKNOWN }, 353 { EFL_ACCESS_ROLE_UNKNOWN, ATSPI_ROLE_UNKNOWN },
354 { ELM_ATSPI_ROLE_VIEWPORT, ATSPI_ROLE_VIEWPORT }, 354 { EFL_ACCESS_ROLE_VIEWPORT, ATSPI_ROLE_VIEWPORT },
355 { ELM_ATSPI_ROLE_WINDOW, ATSPI_ROLE_WINDOW }, 355 { EFL_ACCESS_ROLE_WINDOW, ATSPI_ROLE_WINDOW },
356 { ELM_ATSPI_ROLE_EXTENDED, ATSPI_ROLE_EXTENDED }, 356 { EFL_ACCESS_ROLE_EXTENDED, ATSPI_ROLE_EXTENDED },
357 { ELM_ATSPI_ROLE_HEADER, ATSPI_ROLE_HEADER }, 357 { EFL_ACCESS_ROLE_HEADER, ATSPI_ROLE_HEADER },
358 { ELM_ATSPI_ROLE_FOOTER, ATSPI_ROLE_FOOTER }, 358 { EFL_ACCESS_ROLE_FOOTER, ATSPI_ROLE_FOOTER },
359 { ELM_ATSPI_ROLE_PARAGRAPH, ATSPI_ROLE_PARAGRAPH }, 359 { EFL_ACCESS_ROLE_PARAGRAPH, ATSPI_ROLE_PARAGRAPH },
360 { ELM_ATSPI_ROLE_RULER, ATSPI_ROLE_RULER }, 360 { EFL_ACCESS_ROLE_RULER, ATSPI_ROLE_RULER },
361 { ELM_ATSPI_ROLE_APPLICATION, ATSPI_ROLE_APPLICATION }, 361 { EFL_ACCESS_ROLE_APPLICATION, ATSPI_ROLE_APPLICATION },
362 { ELM_ATSPI_ROLE_AUTOCOMPLETE, ATSPI_ROLE_AUTOCOMPLETE }, 362 { EFL_ACCESS_ROLE_AUTOCOMPLETE, ATSPI_ROLE_AUTOCOMPLETE },
363 { ELM_ATSPI_ROLE_EDITBAR, ATSPI_ROLE_EDITBAR }, 363 { EFL_ACCESS_ROLE_EDITBAR, ATSPI_ROLE_EDITBAR },
364 { ELM_ATSPI_ROLE_EMBEDDED, ATSPI_ROLE_EMBEDDED }, 364 { EFL_ACCESS_ROLE_EMBEDDED, ATSPI_ROLE_EMBEDDED },
365 { ELM_ATSPI_ROLE_ENTRY, ATSPI_ROLE_ENTRY }, 365 { EFL_ACCESS_ROLE_ENTRY, ATSPI_ROLE_ENTRY },
366 { ELM_ATSPI_ROLE_CHART, ATSPI_ROLE_CHART }, 366 { EFL_ACCESS_ROLE_CHART, ATSPI_ROLE_CHART },
367 { ELM_ATSPI_ROLE_CAPTION, ATSPI_ROLE_CAPTION }, 367 { EFL_ACCESS_ROLE_CAPTION, ATSPI_ROLE_CAPTION },
368 { ELM_ATSPI_ROLE_DOCUMENT_FRAME, ATSPI_ROLE_DOCUMENT_FRAME }, 368 { EFL_ACCESS_ROLE_DOCUMENT_FRAME, ATSPI_ROLE_DOCUMENT_FRAME },
369 { ELM_ATSPI_ROLE_HEADING, ATSPI_ROLE_HEADING }, 369 { EFL_ACCESS_ROLE_HEADING, ATSPI_ROLE_HEADING },
370 { ELM_ATSPI_ROLE_PAGE, ATSPI_ROLE_PAGE }, 370 { EFL_ACCESS_ROLE_PAGE, ATSPI_ROLE_PAGE },
371 { ELM_ATSPI_ROLE_SECTION, ATSPI_ROLE_SECTION }, 371 { EFL_ACCESS_ROLE_SECTION, ATSPI_ROLE_SECTION },
372 { ELM_ATSPI_ROLE_REDUNDANT_OBJECT, ATSPI_ROLE_REDUNDANT_OBJECT }, 372 { EFL_ACCESS_ROLE_REDUNDANT_OBJECT, ATSPI_ROLE_REDUNDANT_OBJECT },
373 { ELM_ATSPI_ROLE_FORM, ATSPI_ROLE_FORM }, 373 { EFL_ACCESS_ROLE_FORM, ATSPI_ROLE_FORM },
374 { ELM_ATSPI_ROLE_LINK, ATSPI_ROLE_LINK }, 374 { EFL_ACCESS_ROLE_LINK, ATSPI_ROLE_LINK },
375 { ELM_ATSPI_ROLE_INPUT_METHOD_WINDOW, ATSPI_ROLE_INPUT_METHOD_WINDOW }, 375 { EFL_ACCESS_ROLE_INPUT_METHOD_WINDOW, ATSPI_ROLE_INPUT_METHOD_WINDOW },
376 { ELM_ATSPI_ROLE_TABLE_ROW, ATSPI_ROLE_TABLE_ROW }, 376 { EFL_ACCESS_ROLE_TABLE_ROW, ATSPI_ROLE_TABLE_ROW },
377 { ELM_ATSPI_ROLE_TREE_ITEM, ATSPI_ROLE_TREE_ITEM }, 377 { EFL_ACCESS_ROLE_TREE_ITEM, ATSPI_ROLE_TREE_ITEM },
378 { ELM_ATSPI_ROLE_DOCUMENT_SPREADSHEET, ATSPI_ROLE_DOCUMENT_SPREADSHEET }, 378 { EFL_ACCESS_ROLE_DOCUMENT_SPREADSHEET, ATSPI_ROLE_DOCUMENT_SPREADSHEET },
379 { ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION, ATSPI_ROLE_DOCUMENT_PRESENTATION }, 379 { EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION, ATSPI_ROLE_DOCUMENT_PRESENTATION },
380 { ELM_ATSPI_ROLE_DOCUMENT_TEXT, ATSPI_ROLE_DOCUMENT_TEXT }, 380 { EFL_ACCESS_ROLE_DOCUMENT_TEXT, ATSPI_ROLE_DOCUMENT_TEXT },
381 { ELM_ATSPI_ROLE_DOCUMENT_WEB, ATSPI_ROLE_DOCUMENT_WEB }, 381 { EFL_ACCESS_ROLE_DOCUMENT_WEB, ATSPI_ROLE_DOCUMENT_WEB },
382 { ELM_ATSPI_ROLE_DOCUMENT_EMAIL, ATSPI_ROLE_DOCUMENT_EMAIL }, 382 { EFL_ACCESS_ROLE_DOCUMENT_EMAIL, ATSPI_ROLE_DOCUMENT_EMAIL },
383 { ELM_ATSPI_ROLE_COMMENT, ATSPI_ROLE_COMMENT }, 383 { EFL_ACCESS_ROLE_COMMENT, ATSPI_ROLE_COMMENT },
384 { ELM_ATSPI_ROLE_LIST_BOX, ATSPI_ROLE_LIST_BOX }, 384 { EFL_ACCESS_ROLE_LIST_BOX, ATSPI_ROLE_LIST_BOX },
385 { ELM_ATSPI_ROLE_GROUPING, ATSPI_ROLE_GROUPING }, 385 { EFL_ACCESS_ROLE_GROUPING, ATSPI_ROLE_GROUPING },
386 { ELM_ATSPI_ROLE_IMAGE_MAP, ATSPI_ROLE_IMAGE_MAP }, 386 { EFL_ACCESS_ROLE_IMAGE_MAP, ATSPI_ROLE_IMAGE_MAP },
387 { ELM_ATSPI_ROLE_NOTIFICATION, ATSPI_ROLE_NOTIFICATION }, 387 { EFL_ACCESS_ROLE_NOTIFICATION, ATSPI_ROLE_NOTIFICATION },
388 { ELM_ATSPI_ROLE_INFO_BAR, ATSPI_ROLE_INFO_BAR }, 388 { EFL_ACCESS_ROLE_INFO_BAR, ATSPI_ROLE_INFO_BAR },
389 { ELM_ATSPI_ROLE_LAST_DEFINED, ATSPI_ROLE_LAST_DEFINED }, 389 { EFL_ACCESS_ROLE_LAST_DEFINED, ATSPI_ROLE_LAST_DEFINED },
390}; 390};
391 391
392struct atspi_state_desc 392struct atspi_state_desc
393{ 393{
394 Elm_Atspi_State_Type elm_state; 394 Efl_Access_State_Type elm_state;
395 AtspiStateType atspi_state; 395 AtspiStateType atspi_state;
396 const char *name; 396 const char *name;
397}; 397};
398 398
399static const struct atspi_state_desc elm_states_to_atspi_state[] = { 399static const struct atspi_state_desc elm_states_to_atspi_state[] = {
400 { ELM_ATSPI_STATE_INVALID, ATSPI_STATE_INVALID, "invalid" }, 400 { EFL_ACCESS_STATE_INVALID, ATSPI_STATE_INVALID, "invalid" },
401 { ELM_ATSPI_STATE_ACTIVE, ATSPI_STATE_ACTIVE, "active" }, 401 { EFL_ACCESS_STATE_ACTIVE, ATSPI_STATE_ACTIVE, "active" },
402 { ELM_ATSPI_STATE_ARMED, ATSPI_STATE_ARMED, "armed" }, 402 { EFL_ACCESS_STATE_ARMED, ATSPI_STATE_ARMED, "armed" },
403 { ELM_ATSPI_STATE_BUSY, ATSPI_STATE_BUSY, "busy" }, 403 { EFL_ACCESS_STATE_BUSY, ATSPI_STATE_BUSY, "busy" },
404 { ELM_ATSPI_STATE_CHECKED, ATSPI_STATE_CHECKED, "checked" }, 404 { EFL_ACCESS_STATE_CHECKED, ATSPI_STATE_CHECKED, "checked" },
405 { ELM_ATSPI_STATE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" }, 405 { EFL_ACCESS_STATE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" },
406 { ELM_ATSPI_STATE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" }, 406 { EFL_ACCESS_STATE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" },
407 { ELM_ATSPI_STATE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" }, 407 { EFL_ACCESS_STATE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" },
408 { ELM_ATSPI_STATE_ENABLED, ATSPI_STATE_ENABLED, "enabled" }, 408 { EFL_ACCESS_STATE_ENABLED, ATSPI_STATE_ENABLED, "enabled" },
409 { ELM_ATSPI_STATE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" }, 409 { EFL_ACCESS_STATE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" },
410 { ELM_ATSPI_STATE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" }, 410 { EFL_ACCESS_STATE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" },
411 { ELM_ATSPI_STATE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" }, 411 { EFL_ACCESS_STATE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" },
412 { ELM_ATSPI_STATE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" }, 412 { EFL_ACCESS_STATE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" },
413 { ELM_ATSPI_STATE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" }, 413 { EFL_ACCESS_STATE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" },
414 { ELM_ATSPI_STATE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" }, 414 { EFL_ACCESS_STATE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" },
415 { ELM_ATSPI_STATE_ICONIFIED, ATSPI_STATE_ICONIFIED, "iconified" }, 415 { EFL_ACCESS_STATE_ICONIFIED, ATSPI_STATE_ICONIFIED, "iconified" },
416 { ELM_ATSPI_STATE_MODAL, ATSPI_STATE_MODAL, "modal" }, 416 { EFL_ACCESS_STATE_MODAL, ATSPI_STATE_MODAL, "modal" },
417 { ELM_ATSPI_STATE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" }, 417 { EFL_ACCESS_STATE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" },
418 { ELM_ATSPI_STATE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" }, 418 { EFL_ACCESS_STATE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" },
419 { ELM_ATSPI_STATE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" }, 419 { EFL_ACCESS_STATE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" },
420 { ELM_ATSPI_STATE_PRESSED, ATSPI_STATE_PRESSED, "pressed" }, 420 { EFL_ACCESS_STATE_PRESSED, ATSPI_STATE_PRESSED, "pressed" },
421 { ELM_ATSPI_STATE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" }, 421 { EFL_ACCESS_STATE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" },
422 { ELM_ATSPI_STATE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" }, 422 { EFL_ACCESS_STATE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" },
423 { ELM_ATSPI_STATE_SELECTED, ATSPI_STATE_SELECTED, "selected" }, 423 { EFL_ACCESS_STATE_SELECTED, ATSPI_STATE_SELECTED, "selected" },
424 { ELM_ATSPI_STATE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" }, 424 { EFL_ACCESS_STATE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" },
425 { ELM_ATSPI_STATE_SHOWING, ATSPI_STATE_SHOWING, "showing" }, 425 { EFL_ACCESS_STATE_SHOWING, ATSPI_STATE_SHOWING, "showing" },
426 { ELM_ATSPI_STATE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" }, 426 { EFL_ACCESS_STATE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" },
427 { ELM_ATSPI_STATE_STALE, ATSPI_STATE_STALE, "stale" }, 427 { EFL_ACCESS_STATE_STALE, ATSPI_STATE_STALE, "stale" },
428 { ELM_ATSPI_STATE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" }, 428 { EFL_ACCESS_STATE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" },
429 { ELM_ATSPI_STATE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" }, 429 { EFL_ACCESS_STATE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" },
430 { ELM_ATSPI_STATE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" }, 430 { EFL_ACCESS_STATE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" },
431 { ELM_ATSPI_STATE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" }, 431 { EFL_ACCESS_STATE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" },
432 { ELM_ATSPI_STATE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" }, 432 { EFL_ACCESS_STATE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" },
433 { ELM_ATSPI_STATE_REQUIRED, ATSPI_STATE_REQUIRED, "required" }, 433 { EFL_ACCESS_STATE_REQUIRED, ATSPI_STATE_REQUIRED, "required" },
434 { ELM_ATSPI_STATE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" }, 434 { EFL_ACCESS_STATE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" },
435 { ELM_ATSPI_STATE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" }, 435 { EFL_ACCESS_STATE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" },
436 { ELM_ATSPI_STATE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" }, 436 { EFL_ACCESS_STATE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" },
437 { ELM_ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" }, 437 { EFL_ACCESS_STATE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" },
438 { ELM_ATSPI_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, 438 { EFL_ACCESS_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" },
439 { ELM_ATSPI_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, 439 { EFL_ACCESS_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" },
440 { ELM_ATSPI_STATE_VISITED, ATSPI_STATE_VISITED, "visited" }, 440 { EFL_ACCESS_STATE_VISITED, ATSPI_STATE_VISITED, "visited" },
441 { ELM_ATSPI_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" }, 441 { EFL_ACCESS_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" },
442}; 442};
443 443
444static const int elm_relation_to_atspi_relation_mapping[] = { 444static const int elm_relation_to_atspi_relation_mapping[] = {
445 [ELM_ATSPI_RELATION_NULL] = ATSPI_RELATION_NULL, 445 [EFL_ACCESS_RELATION_NULL] = ATSPI_RELATION_NULL,
446 [ELM_ATSPI_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR, 446 [EFL_ACCESS_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR,
447 [ELM_ATSPI_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY, 447 [EFL_ACCESS_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY,
448 [ELM_ATSPI_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR, 448 [EFL_ACCESS_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR,
449 [ELM_ATSPI_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY, 449 [EFL_ACCESS_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY,
450 [ELM_ATSPI_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF, 450 [EFL_ACCESS_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF,
451 [ELM_ATSPI_RELATION_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR, 451 [EFL_ACCESS_RELATION_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR,
452 [ELM_ATSPI_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF, 452 [EFL_ACCESS_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF,
453 [ELM_ATSPI_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF, 453 [EFL_ACCESS_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF,
454 [ELM_ATSPI_RELATION_EXTENDED] = ATSPI_RELATION_EXTENDED, 454 [EFL_ACCESS_RELATION_EXTENDED] = ATSPI_RELATION_EXTENDED,
455 [ELM_ATSPI_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO, 455 [EFL_ACCESS_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO,
456 [ELM_ATSPI_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM, 456 [EFL_ACCESS_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM,
457 [ELM_ATSPI_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF, 457 [EFL_ACCESS_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF,
458 [ELM_ATSPI_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS, 458 [EFL_ACCESS_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS,
459 [ELM_ATSPI_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY, 459 [EFL_ACCESS_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY,
460 [ELM_ATSPI_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR, 460 [EFL_ACCESS_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR,
461 [ELM_ATSPI_RELATION_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF, 461 [EFL_ACCESS_RELATION_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF,
462 [ELM_ATSPI_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR, 462 [EFL_ACCESS_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR,
463 [ELM_ATSPI_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY, 463 [EFL_ACCESS_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY,
464 [ELM_ATSPI_RELATION_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED, 464 [EFL_ACCESS_RELATION_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED,
465}; 465};
466 466
467static inline Eldbus_Message *_dbus_invalid_ref_error_new(const Eldbus_Message *msg) 467static inline Eldbus_Message *_dbus_invalid_ref_error_new(const Eldbus_Message *msg)
@@ -469,9 +469,9 @@ static inline Eldbus_Message *_dbus_invalid_ref_error_new(const Eldbus_Message *
469 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.UnknownObject", "Path is not valid accessible object reference."); 469 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.UnknownObject", "Path is not valid accessible object reference.");
470}