diff options
| author | Lukasz Stanislawski <lukasz.stanislawski@gmail.com> | 2017-10-19 10:13:54 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-10-19 10:13:54 +0900 |
| commit | 57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch) | |
| tree | 897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src | |
| parent | 98622623a0865c525ede12ef5759ab6f5b3af407 (diff) | |
| download | efl-57aefc53c18c14ada19dcd09d3e5b5612b277b16.tar.gz | |
elm: rename Elm_Interface_Atspi_Accessible interface
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D5341
Diffstat (limited to 'src')
176 files changed, 1518 insertions, 1520 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index e639a4a0ff..4020195635 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -28,7 +28,7 @@ elm_public_eolian_files = \ lib/elementary/elm_hover.eo \ lib/elementary/efl_ui_image.eo \ lib/elementary/elm_index.eo \ - lib/elementary/elm_interface_atspi_accessible.eo \ + lib/elementary/efl_access.eo \ lib/elementary/efl_access_action.eo \ lib/elementary/efl_access_component.eo \ lib/elementary/efl_access_editable_text.eo \ @@ -233,7 +233,7 @@ includesdir = $(includedir)/elementary-@VMAJ@ includesunstable_HEADERS = \ lib/elementary/elm_gen_common.h \ lib/elementary/elm_atspi_bridge.h \ - lib/elementary/elm_interface_atspi_accessible.h \ + lib/elementary/efl_access.h \ lib/elementary/efl_access_text.h \ lib/elementary/elm_interface_atspi_widget_action.h \ lib/elementary/efl_access_window.h \ @@ -625,7 +625,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_icon.c \ lib/elementary/efl_ui_image.c \ lib/elementary/elm_index.c \ - lib/elementary/elm_interface_atspi_accessible.c \ + lib/elementary/efl_access.c \ lib/elementary/efl_access_action.c \ lib/elementary/efl_access_component.c \ lib/elementary/efl_access_editable_text.c \ diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/efl_access.c index 22a18ba231..4586012b77 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.c +++ b/src/lib/elementary/efl_access.c @@ -2,13 +2,13 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_widget.h" #include "elm_priv.h" -const char* Atspi_Name[] = { +const char* Access_Name[] = { "invalid", "accelerator label", "alert", @@ -115,39 +115,39 @@ const char* Atspi_Name[] = { "last defined" }; -struct _Elm_Atspi_Event_Handler +struct _Efl_Access_Event_Handler { Efl_Event_Cb cb; void *data; }; -struct _Elm_Interface_Atspi_Accessible_Data +struct _Efl_Access_Data { - Elm_Atspi_Role role; + Efl_Access_Role role; const char *name; const char *description; const char *translation_domain; - Elm_Atspi_Relation_Set relations; - Elm_Atspi_Type type: 2; + Efl_Access_Relation_Set relations; + Efl_Access_Type type: 2; }; -typedef struct _Elm_Interface_Atspi_Accessible_Data Elm_Interface_Atspi_Accessible_Data; +typedef struct _Efl_Access_Data Efl_Access_Data; static Eina_List *global_callbacks; static Eo *root; EOLIAN static int -_elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +_efl_access_index_in_parent_get(Eo *obj, Efl_Access_Data *pd EINA_UNUSED) { Eina_List *l, *children = NULL; Eo *chld, *parent = NULL; int ret = 0; - parent = elm_interface_atspi_accessible_parent_get(obj); + parent = efl_access_parent_get(obj); if (!parent) return -1; - children = elm_interface_atspi_accessible_children_get(parent); + children = efl_access_children_get(parent); if (!children) return -1; EINA_LIST_FOREACH(children, l, chld) @@ -165,67 +165,67 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi return ret; } -EOLIAN static Elm_Interface_Atspi_Accessible * -_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +EOLIAN static Efl_Access * +_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { - Elm_Atspi_Type type; + Efl_Access_Type type; Eo *parent = obj; do { parent = efl_parent_get(obj); - if (efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (efl_isa(parent, EFL_ACCESS_MIXIN)) { - type = elm_interface_atspi_accessible_type_get(parent); - if (type != ELM_ATSPI_TYPE_SKIPPED) break; + type = efl_access_type_get(parent); + if (type != EFL_ACCESS_TYPE_SKIPPED) break; } } while (parent); - return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL; + return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL; } EOLIAN static void -_elm_interface_atspi_accessible_parent_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Interface_Atspi_Accessible *new_parent EINA_UNUSED) +_efl_access_parent_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access *new_parent EINA_UNUSED) { WRN("The %s object does not implement the \"accessible_parent_set\" function.", efl_class_name_get(efl_class_get(obj))); } EOLIAN Eina_List* -_elm_interface_atspi_accessible_attributes_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +_efl_access_attributes_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { WRN("The %s object does not implement the \"accessible_attributes_set\" function.", efl_class_name_get(efl_class_get(obj))); return NULL; } -EOLIAN static Elm_Atspi_Role -_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +EOLIAN static Efl_Access_Role +_efl_access_role_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { return pd->role; } EOLIAN static void -_elm_interface_atspi_accessible_role_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED, Elm_Atspi_Role role) +_efl_access_role_set(Eo *obj, Efl_Access_Data *pd EINA_UNUSED, Efl_Access_Role role) { if (pd->role != role) { pd->role = role; - elm_interface_atspi_accessible_role_changed_signal_emit(obj); + efl_access_role_changed_signal_emit(obj); } } EOLIAN const char * -_elm_interface_atspi_accessible_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +_efl_access_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { - Elm_Atspi_Role role; + Efl_Access_Role role; - role = elm_interface_atspi_accessible_role_get(obj); + role = efl_access_role_get(obj); - return role > ELM_ATSPI_ROLE_LAST_DEFINED ? "" : Atspi_Name[role]; + return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role]; } EOLIAN const char * -_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) +_efl_access_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) { #ifdef ENABLE_NLS if (pd->translation_domain) @@ -235,12 +235,12 @@ _elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atsp } EOLIAN static void -_elm_interface_atspi_accessible_name_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) +_efl_access_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) { eina_stringshare_replace(&pd->name, val); } -const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) +const char * _efl_access_description_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) { #ifdef ENABLE_NLS if (pd->translation_domain) @@ -250,16 +250,16 @@ const char * _elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED } EOLIAN static void -_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *val) +_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val) { eina_stringshare_replace(&pd->description, val); } EOLIAN static const char * -_elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +_efl_access_localized_role_name_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { const char *ret = NULL; - ret = elm_interface_atspi_accessible_role_name_get(obj); + ret = efl_access_role_name_get(obj); #ifdef ENABLE_NLS ret = gettext(ret); #endif @@ -267,7 +267,7 @@ _elm_interface_atspi_accessible_localized_role_name_get(Eo *obj EINA_UNUSED, Elm } EOLIAN static Eina_List * -_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +_efl_access_children_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { Eina_List *children = NULL; Eina_Iterator *iter = NULL; @@ -279,7 +279,7 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_ EINA_ITERATOR_FOREACH(iter, chld) { - if (efl_isa(chld, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (efl_isa(chld, EFL_ACCESS_MIXIN)) children = eina_list_append(children, chld); } eina_iterator_free(iter); @@ -287,21 +287,21 @@ _elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Interface_ return children; } -EOLIAN static Elm_Atspi_State_Set -_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_efl_access_state_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { return 0; } -EOLIAN Elm_Atspi_Relation_Set -_elm_interface_atspi_accessible_relation_set_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED) +EOLIAN Efl_Access_Relation_Set +_efl_access_relation_set_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED) { - return elm_atspi_relation_set_clone(pd->relations); + return efl_access_relation_set_clone(pd->relations); } -EAPI void elm_atspi_attributes_list_free(Eina_List *list) +EAPI void efl_access_attributes_list_free(Eina_List *list) { - Elm_Atspi_Attribute *attr; + Efl_Access_Attribute *attr; EINA_LIST_FREE(list, attr) { eina_stringshare_del(attr->key); @@ -311,27 +311,27 @@ EAPI void elm_atspi_attributes_list_free(Eina_List *list) } EOLIAN void -_elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) +_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info) { Eina_List *l; - Elm_Atspi_Event_Handler *hdl; - Elm_Atspi_Type type; + Efl_Access_Event_Handler *hdl; + Efl_Access_Type type; - if (!accessible || !event || !efl_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN)) { CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); return; } - type = elm_interface_atspi_accessible_type_get(accessible); - if (type != ELM_ATSPI_TYPE_REGULAR) + type = efl_access_type_get(accessible); + if (type != EFL_ACCESS_TYPE_REGULAR) return; - if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) + if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED) { - Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info; - type = elm_interface_atspi_accessible_type_get(atspi_data->child); - if (type != ELM_ATSPI_TYPE_REGULAR) + Efl_Access_Event_Children_Changed_Data *event_data = event_info; + type = efl_access_type_get(event_data->child); + if (type != EFL_ACCESS_TYPE_REGULAR) return; } @@ -346,10 +346,10 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_ } } -EOLIAN Elm_Atspi_Event_Handler * -_elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) +EOLIAN Efl_Access_Event_Handler * +_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data) { - Elm_Atspi_Event_Handler *ret = calloc(1, sizeof(Elm_Atspi_Event_Handler)); + Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler)); ret->cb = cb; ret->data = data; @@ -360,10 +360,10 @@ _elm_interface_atspi_accessible_event_handler_add(Eo *class EINA_UNUSED, void *p } EOLIAN void -_elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Elm_Atspi_Event_Handler *handler) +_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler) { Eina_List *l, *l2; - Elm_Atspi_Event_Handler *hdl; + Efl_Access_Event_Handler *hdl; EINA_LIST_FOREACH_SAFE(global_callbacks, l, l2, hdl) { if (hdl == handler) @@ -376,29 +376,29 @@ _elm_interface_atspi_accessible_event_handler_del(Eo *class EINA_UNUSED, void *p } EOLIAN void -_elm_interface_atspi_accessible_translation_domain_set(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd, const char *domain) +_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain) { eina_stringshare_replace(&pd->translation_domain, domain); } EOLIAN const char* -_elm_interface_atspi_accessible_translation_domain_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) +_efl_access_translation_domain_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) { return pd->translation_domain; } EAPI void -elm_atspi_relation_free(Elm_Atspi_Relation *relation) +efl_access_relation_free(Efl_Access_Relation *relation) { eina_list_free(relation->objects); free(relation); } -EAPI Elm_Atspi_Relation * -elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) +EAPI Efl_Access_Relation * +efl_access_relation_clone(const Efl_Access_Relation *relation) { - Elm_Atspi_Relation *ret = calloc(1, sizeof(Elm_Atspi_Relation)); + Efl_Access_Relation *ret = calloc(1, sizeof(Efl_Access_Relation)); if (!ret) return NULL; ret->type = relation->type; @@ -409,8 +409,8 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation) static void _on_rel_obj_del(void *data, const Efl_Event *event) { - Elm_Atspi_Relation_Set *set = data; - Elm_Atspi_Relation *rel; + Efl_Access_Relation_Set *set = data; + Efl_Access_Relation *rel; Eina_List *l, *l2, *p, *p2; Eo *rel_obj; @@ -430,12 +430,12 @@ _on_rel_obj_del(void *data, const Efl_Event *event) } EAPI Eina_Bool -elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) +efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj) { - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; Eina_List *l; - if (!efl_isa(rel_obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN)) return EINA_FALSE; EINA_LIST_FOREACH(*set, l, rel) @@ -451,7 +451,7 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re } } - rel = calloc(1, sizeof(Elm_Atspi_Relation)); + rel = calloc(1, sizeof(Efl_Access_Relation)); if (!rel) return EINA_FALSE; rel->type = type; @@ -463,10 +463,10 @@ elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re } EAPI void -elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj) +efl_access_relation_set_relation_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj) { Eina_List *l; - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; EINA_LIST_FOREACH(*set, l, rel) { @@ -480,7 +480,7 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re if (!rel->objects) { *set = eina_list_remove(*set, rel); - elm_atspi_relation_free(rel); + efl_access_relation_free(rel); } return; } @@ -488,10 +488,10 @@ elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Re } EAPI void -elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type) +efl_access_relation_set_relation_type_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type) { Eina_List *l; - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; Eo *obj; EINA_LIST_FOREACH(*set, l, rel) @@ -501,16 +501,16 @@ elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Ats EINA_LIST_FOREACH(rel->objects, l, obj) efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); *set = eina_list_remove(*set, rel); - elm_atspi_relation_free(rel); + efl_access_relation_free(rel); return; } } } EAPI void -elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set) +efl_access_relation_set_free(Efl_Access_Relation_Set set) { - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; Eina_List *l; Eo *obj; @@ -518,20 +518,20 @@ elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set) { EINA_LIST_FOREACH(rel->objects, l, obj) efl_event_callback_del(obj, EFL_EVENT_DEL, _on_rel_obj_del, set); - elm_atspi_relation_free(rel); + efl_access_relation_free(rel); } } -EAPI Elm_Atspi_Relation_Set -elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set) +EAPI Efl_Access_Relation_Set +efl_access_relation_set_clone(const Efl_Access_Relation_Set set) { - Elm_Atspi_Relation_Set ret = NULL; + Efl_Access_Relation_Set ret = NULL; Eina_List *l; - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; EINA_LIST_FOREACH(set, l, rel) { - Elm_Atspi_Relation *cpy = elm_atspi_relation_clone(rel); + Efl_Access_Relation *cpy = efl_access_relation_clone(rel); ret = eina_list_append(ret, cpy); } @@ -539,29 +539,29 @@ elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set) } EOLIAN static Eina_Bool -_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) +_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) { - return elm_atspi_relation_set_relation_append(&sd->relations, type, relation_obj); + return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj); } EOLIAN static void -_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) +_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj) { if (relation_obj) - elm_atspi_relation_set_relation_remove(&sd->relations, type, relation_obj); + efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj); else - elm_atspi_relation_set_relation_type_remove(&sd->relations, type); + efl_access_relation_set_relation_type_remove(&sd->relations, type); } EOLIAN static void -_elm_interface_atspi_accessible_relationships_clear(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *sd) +_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd) { - elm_atspi_relation_set_free(sd->relations); + efl_access_relation_set_free(sd->relations); sd->relations = NULL; } EOLIAN Eo* -_elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED) +_efl_access_root_get(Eo *class EINA_UNUSED, void *pd EINA_UNUSED) { if (!root) 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 return root; } -EOLIAN Elm_Atspi_Type -_elm_interface_atspi_accessible_type_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd) +EOLIAN Efl_Access_Type +_efl_access_type_get(Eo *obj EINA_UNUSED, Efl_Access_Data *pd) { return pd->type; } EOLIAN void -_elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Atspi_Type val) +_efl_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val) { - Elm_Interface_Atspi_Accessible *parent; + Efl_Access *parent; if (val == pd->type) return; - parent = elm_interface_atspi_accessible_parent_get(obj); + parent = efl_access_parent_get(obj); switch (val) { - case ELM_ATSPI_TYPE_DISABLED: - case ELM_ATSPI_TYPE_SKIPPED: - if (parent) elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj); - elm_interface_atspi_accessible_removed(obj); + case EFL_ACCESS_TYPE_DISABLED: + case EFL_ACCESS_TYPE_SKIPPED: + if (parent) efl_access_children_changed_del_signal_emit(parent, obj); + efl_access_removed(obj); break; - case ELM_ATSPI_TYPE_REGULAR: - if (parent) elm_interface_atspi_accessible_children_changed_added_signal_emit(parent, obj); - elm_interface_atspi_accessible_added(obj); + case EFL_ACCESS_TYPE_REGULAR: + if (parent) efl_access_children_changed_added_signal_emit(parent, obj); + efl_access_added(obj); } pd->type = val; } EOLIAN void -_elm_interface_atspi_accessible_efl_object_destructor(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd) +_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd) { eina_stringshare_del(pd->name); eina_stringshare_del(pd->description); eina_stringshare_del(pd->translation_domain); - elm_atspi_relation_set_free(pd->relations); + efl_access_relation_set_free(pd->relations); - efl_destructor(efl_super(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); + efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN)); } void -_elm_interface_atspi_shutdown(void) +_efl_access_shutdown(void) { - Elm_Atspi_Event_Handler *hdl; + Efl_Access_Event_Handler *hdl; EINA_LIST_FREE(global_callbacks, hdl) free(hdl); @@ -620,4 +620,4 @@ _elm_interface_atspi_shutdown(void) ELM_SAFE_DEL(root); } -#include "elm_interface_atspi_accessible.eo.c" +#include "efl_access.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/efl_access.eo index 9064d5d702..17181f7ff6 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.eo +++ b/src/lib/elementary/efl_access.eo @@ -1,7 +1,7 @@ /* FIXME: This definitely shouldn't be here. */ type Efl_Event_Cb: __undefined_type; [[Efl event callback type]] -enum Elm.Atspi.Type +enum Efl.Access.Type { [[Type of accessibility object]] regular, [[default accessibile object]] @@ -9,9 +9,9 @@ enum Elm.Atspi.Type skipped [[skip object in accessibility hierarchy]] } -enum Elm.Atspi.Role +enum Efl.Access.Role { - [[Describes the role of an object visible to AT-SPI Clients.]] + [[Describes the role of an object visible to Accessibility Clients.]] invalid, [[Role: invalid]] accelerator_label, [[Role: accelerator label]] alert, [[Role: alert]] @@ -118,10 +118,10 @@ enum Elm.Atspi.Role last_defined, [[Last enum entry sentinel]] } -enum Elm.Atspi.State_Type +enum Efl.Access.State_Type { - [[Describes a possible states of an object visible to AT-SPI clients.]] - legacy: elm_atspi_state; + [[Describes a possible states of an object visible to accessibility clients.]] + legacy: efl_access_state; invalid, [[State: invalid]] active, [[State: active]] armed, [[State: armed]] @@ -166,10 +166,10 @@ enum Elm.Atspi.State_Type last_defined, [[Last enum entry sentinel]] } -enum Elm.Atspi.Relation_Type +enum Efl.Access.Relation_Type { [[Describes relation between two objects.]] - legacy: elm_atspi_relation; + legacy: efl_access_relation; null, [[No relation]] label_for, [[Label for relation]] labelled_by, [[Labelled by relation]] @@ -192,54 +192,54 @@ enum Elm.Atspi.Relation_Type last_defined, [[Last enum entry sentinel]] } -type Elm.Atspi.State_Set: uint64; [[AT-SPI object state set.]] +type Efl.Access.State_Set: uint64; [[Accessibility object state set.]] -struct Elm.Atspi.Event.Handler; [[AT-SPI event listener]] +struct Efl.Access.Event.Handler; [[Accessibility event listener]] -struct Elm.Atspi.Event.State_Changed.Data +struct Efl.Access.Event.State_Changed.Data { - [[AT-SPI state changed event data]] - type: Elm.Atspi.State_Type; [[Type of the state changed event]] + [[Accessibility state changed event data]] + type: Efl.Access.State_Type; [[Type of the state changed event]] new_value: bool; [[New value]] } -struct Elm.Atspi.Event.Geometry_Changed.Data +struct Efl.Access.Event.Geometry_Changed.Data { - [[AT-SPI geometry changed event data]] + [[Accessibility geometry changed event data]] x: int; [[X coordinate]] y: int; [[Y coordinate]] width: int; [[Width]] height: int; [[Height]] } -struct Elm.Atspi.Event.Children_Changed.Data +struct Efl.Access.Event.Children_Changed.Data { - [[AT-SPI children changed event data]] + [[Accessibility children changed event data]] is_added: bool; [[Child is added or not]] child: Efl.Object; [[Child object]] } -struct Elm.Atspi.Attribute +struct Efl.Access.Attribute { - [[AT-SPI Attribute]] + [[Accessibility Attribute]] key: string; [[Attribute key]] value: string; [[Attribute value]] } -struct Elm.Atspi.Relation +struct Efl.Access.Relation { - [[AT-SPI Relation]] - type: Elm.Atspi.Relation_Type; [[Relation type]] + [[Accessibility Relation]] + type: Efl.Access.Relation_Type; [[Relation type]] objects: list<Efl.Object>; [[List with relation objects]] } -type Elm.Atspi.Relation_Set: list<ptr(Elm.Atspi.Relation)>; [[Elementary AT-SPI relation set type]] +type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]] -mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) +mixin Efl.Access (Efl.Interface, Efl.Object) { - [[AT-SPI accessible mixin]] - eo_prefix: elm_interface_atspi_accessible; - data: Elm_Interface_Atspi_Accessible_Data; + [[Accessibility accessible mixin]] + eo_prefix: efl_access; + data: Efl_Access_Data; methods { @property localized_role_name @protected { [[Gets an localized string describing accessible object role name.]] @@ -264,7 +264,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) get { } values { - relations: Elm.Atspi.Relation_Set; [[Accessible relation set]] + relations: Efl.Access.Relation_Set; [[Accessible relation set]] } } @property role { @@ -274,7 +274,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) set { } values { - role: Elm.Atspi.Role; [[Accessible role]] + role: Efl.Access.Role; [[Accessible role]] } } @property children @protected { @@ -282,7 +282,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) get { } values { - children: list<Elm.Interface.Atspi_Accessible> @owned; [[List of widget's children]] + children: list<Efl.Access> @owned; [[List of widget's children]] } } @property role_name @protected { @@ -299,7 +299,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) } values { /* FIXME: API for attribute free */ - attributes: list<ptr(Elm.Atspi.Attribute) @owned> @owned; [[List of object attributes]] + attributes: list<ptr(Efl.Access.Attribute) @owned> @owned; [[List of object attributes]] } } @property index_in_parent @protected { @@ -327,7 +327,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) set { } values { - parent: Elm.Interface.Atspi_Accessible; [[Accessible parent]] + parent: Efl.Access; [[Accessible parent]] } } @property state_set @protected { @@ -335,7 +335,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) get { } values { - states: Elm.Atspi.State_Set; [[Accessible state set]] + states: Efl.Access.State_Set; [[Accessible state set]] } } event_handler_add @class @protected { @@ -344,18 +344,18 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) @in cb: Efl_Event_Cb; [[Callback]] @in data: void_ptr; [[Data]] } - return: ptr(Elm.Atspi.Event.Handler); [[Event handler]] + return: ptr(Efl.Access.Event.Handler); [[Event handler]] } event_handler_del @class @protected { [[Deregister accessibility event listener]] params { - @in handler: ptr(Elm.Atspi.Event.Handler); [[Event handler]] + @in handler: ptr(Efl.Access.Event.Handler); [[Event handler]] } } event_emit @class @protected { [[Emit event]] params { - @in accessible: Elm.Interface.Atspi_Accessible; [[Accessibility object.]] + @in accessible: Efl.Access; [[Accessibility object.]] @in event: ptr(const(Efl.Event.Description)); [[Accessibility event type.]] @in event_info: void_ptr; [[Accessibility event details.]] } @@ -389,7 +389,7 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) set { } values { - type: Elm.Atspi.Type; [[Object type]] + type: Efl.Access.Type; [[Object type]] } } relationship_append { @@ -402,13 +402,13 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) provide customized feedback, improving overall user experience. Relationship_append API is asymmetric, which means that - appending, for example, relation ELM_ATSPI_RELATION_FLOWS_TO from object A to B, - do NOT append relation ELM_ATSPI_RELATION_FLOWS_FROM from object B to + appending, for example, relation EFL_ACCESS_RELATION_FLOWS_TO from object A to B, + do NOT append relation EFL_ACCESS_RELATION_FLOWS_FROM from object B to object A.]] return: bool; [[$true if relationship was successfully appended, $false otherwise]] params { - @in type: Elm.Atspi.Relation_Type; [[Relation type]] - @in relation_object: const(Elm.Interface.Atspi_Accessible); [[Object to relate to]] + @in type: Efl.Access.Relation_Type; [[Relation type]] + @in relation_object: const(Efl.Access); [[Object to relate to]] } } relationship_remove { @@ -418,8 +418,8 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) of given type. ]] params { - @in type: Elm.Atspi.Relation_Type; [[Relation type]] - @in relation_object: const(Elm.Interface.Atspi_Accessible); [[Object to remove relation from]] + @in type: Efl.Access.Relation_Type; [[Relation type]] + @in relation_object: const(Efl.Access); [[Object to remove relation from]] } } relationships_clear { @@ -439,9 +439,9 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object) } events { property,changed: string; [[Called when roperty has changed]] - children,changed: Elm.Atspi.Event.Children_Changed.Data; [[Called when children have changed]] - state,changed: Elm.Atspi.Event.State_Changed.Data; [[Called when tate has changed]] - bounds,changed: Elm.Atspi.Event.Geometry_Changed.Data; [[Called when bounds have changed]] + children,changed: Efl.Access.Event.Children_Changed.Data; [[Called when children have changed]] + state,changed: Efl.Access.Event.State_Changed.Data; [[Called when tate has changed]] + bounds,changed: Efl.Access.Event.Geometry_Changed.Data; [[Called when bounds have changed]] visible,data,changed; [[Called when visibility has changed]] active,descendant,changed; [[Called when active state of descendant has changed]] 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 0000000000..ec1d9afe25 --- /dev/null +++ b/src/lib/elementary/efl_access.h @@ -0,0 +1,165 @@ +#ifndef EFL_ACCESS_H +#define EFL_ACCESS_H + +#ifdef EFL_BETA_API_SUPPORT + +#ifdef EFL_EO_API_SUPPORT +#include "efl_access.eo.h" +#endif +#ifndef EFL_NOLEGACY_API_SUPPORT +#include "efl_access.eo.legacy.h" +#endif + +/* + * Sets a particilar state type for given state set. + */ +#define STATE_TYPE_SET(state_set, type) (state_set|= (1ULL << type)) + +/** + * Unsets a particilar state type for given state set. + */ +#define STATE_TYPE_UNSET(state_set, type) (state_set &= ~(1ULL << type)) + +/** + * Gets value of a particilar state type for given state set. + */ +#define STATE_TYPE_GET(state_set, type) (state_set & (1ULL << type)) + +/** + * Free Efl_Access_Attributes_List + */ +EAPI void efl_access_attributes_list_free(Eina_List *list); + +/** + * Frees relation. + */ +EAPI void efl_access_relation_free(Efl_Access_Relation *relation); + +/** + * Clones relation. + */ +EAPI Efl_Access_Relation * efl_access_relation_clone(const Efl_Access_Relation *relation); + +/** + * Appends relation to relation set + */ +EAPI Eina_Bool efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj); + +/** + * Removes relation from relation set + */ +EAPI void efl_access_relation_set_relation_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type, const Eo *rel_obj); + +/** + * Removes all relation from relation set of a given type + */ +EAPI void efl_access_relation_set_relation_type_remove(Efl_Access_Relation_Set *set, Efl_Access_Relation_Type type); + +/** + * Frees Efl_Access_Relation_Set + */ +EAPI void efl_access_relation_set_free(Efl_Access_Relation_Set set); + +/** + * Clones Efl_Access_Relation_Set + */ +EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Relation_Set set); + +#ifdef EFL_EO_API_SUPPORT + +/** + * Emits Accessible 'StateChanged' signal. + */ +#define efl_access_state_changed_signal_emit(obj, tp, nvl) \ + { do { \ + Efl_Access_Event_State_Changed_Data evinfo; \ + evinfo.type = (tp); \ + evinfo.new_value = (nvl); \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_STATE_CHANGED, (void*)&evinfo); \ + } while(0); } + +/** + * Emits Accessible 'BoundsChanged' signal. + */ +#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ + do { \ + Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ + } while(0); + +/** + * Emits Accessible 'PropertyChanged' signal for 'Name' property. + */ +#define efl_access_name_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "name"); + +/** + * Emits Accessible 'PropertyChanged' signal for 'Description' property. + */ +#define efl_access_description_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "description"); + +/** + * Emits Accessible 'PropertyChanged' signal for 'Parent' property. + */ +#define efl_access_parent_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "parent"); + +/** + * Emits Accessible 'PropertyChanged' signal for 'Role' property. + */ +#define efl_access_role_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "role"); + +/** + * Emits Accessible 'PropertyChanged' signal for 'Value' property. + */ +#define efl_access_value_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "value"); + +/** + * Emits Accessible 'ChildrenChanged' signal with added child as argument. + */ +#define efl_access_children_changed_added_signal_emit(obj, child) \ + do { \ + Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ + } while(0); + +/** + * Emits Accessible 'ChildrenChanged' signal with deleted child as argument. + */ +#define efl_access_children_changed_del_signal_emit(obj, child) \ + do { \ + Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_CHILDREN_CHANGED, &atspi_data); \ + } while(0); + +/** + * Emits Accessible 'ActiveDescendantChanged' signal. + */ +#define efl_access_active_descendant_changed_signal_emit(obj, child) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, child); + +/** + * Emits Accessible 'VisibleDataChanged' signal. + */ +#define efl_access_visible_data_changed_signal_emit(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, NULL); + +/** + * Emits Accessible 'AddAccessible' signal. + */ +#define efl_access_added(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ADDED, NULL); + +/** + * Emits Accessible 'RemoveAccessible' signal. + */ +#define efl_access_removed(obj) \ + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_REMOVED, NULL); + +#endif + +#endif +#endif diff --git a/src/lib/elementary/efl_access_component.c b/src/lib/elementary/efl_access_component.c index 5b4ddd356d..abc72ef3dd 100644 --- a/src/lib/elementary/efl_access_component.c +++ b/src/lib/elementary/efl_access_component.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_COMPONENT_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -76,7 +76,7 @@ _efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Ei Eina_List *l, *children; Eo *ret = NULL, *child; - children = elm_interface_atspi_accessible_children_get(obj); + children = efl_access_children_get(obj); EINA_LIST_FOREACH(children, l, child) { diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h index 5e2b6c82d7..06dce849b1 100644 --- a/src/lib/elementary/efl_access_window.h +++ b/src/lib/elementary/efl_access_window.h @@ -14,43 +14,43 @@ * Emits 'Window:Activated' accessible signal. */ #define efl_access_window_activated_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); /** * Emits 'Window:Deactivated' accessible signal. */ #define efl_access_window_deactivated_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); /** * Emits 'Window:Created' accessible signal. */ #define efl_access_window_created_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); /** * Emits 'Window:Destroyed' accessible signal. */ #define efl_access_window_destroyed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); /** * Emits 'Window:Maximized' accessible signal. */ #define efl_access_window_maximized_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); /** * Emits 'Window:Minimized' accessible signal. */ #define efl_access_window_minimized_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); /** * Emits 'Window:Restored' accessible signal. */ #define efl_access_window_restored_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); #endif #endif diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c index 3e66cec3b6..4170702012 100644 --- a/src/lib/elementary/efl_ui_bg.c +++ b/src/lib/elementary/efl_ui_bg.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -120,7 +120,7 @@ elm_bg_add(Evas_Object *parent) EOLIAN static Eo * _efl_ui_bg_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Data *_pd EINA_UNUSED) { - elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED); obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c index aeab3b9477..7c6fdeb123 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) EOLIAN static Eo * _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd) { - elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); pd->align.h = 0.5; pd->align.v = 0.5; diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 0812c3a7e7..578e70c039 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -309,7 +309,7 @@ _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 8a487fbade..26341ec756 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_UI_NSTATE_PROTECTED @@ -79,8 +79,8 @@ _activate(Evas_Object *obj) efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, - ELM_ATSPI_STATE_CHECKED, + efl_access_state_changed_signal_emit(obj, + EFL_ACCESS_STATE_CHECKED, efl_ui_nstate_value_get(obj)); } @@ -100,15 +100,15 @@ _icon_signal_emit(Evas_Object *obj) edje_object_message_signal_process(wd->resize_obj); } -EOLIAN static Elm_Atspi_State_Set -_efl_ui_check_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_efl_ui_check_efl_access_state_set_get(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED) { - Elm_Atspi_State_Set states = 0; + Efl_Access_State_Set states = 0; - states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); + states = efl_access_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS)); if (elm_check_state_get(obj)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_CHECKED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED); return states; } @@ -239,8 +239,8 @@ _on_check_off(void *data, efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(data, - ELM_ATSPI_STATE_CHECKED, + efl_access_state_changed_signal_emit(data, + EFL_ACCESS_STATE_CHECKED, efl_ui_nstate_value_get(obj)); } @@ -260,8 +260,8 @@ _on_check_on(void *data, efl_event_callback_legacy_call(obj, EFL_UI_CHECK_EVENT_CHANGED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(data, - ELM_ATSPI_STATE_CHECKED, + efl_access_state_changed_signal_emit(data, + EFL_ACCESS_STATE_CHECKED, efl_ui_nstate_value_get(obj)); } @@ -356,7 +356,7 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CHECK_BOX); + efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); return obj; } diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo index fd2ad47ea5..00aa3b3e59 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) Elm.Widget.widget_event; Efl.Ui.Nstate.count { set; } Efl.Ui.Nstate.value { set; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index 1291f87eea..f994d56b9c 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #include <Elementary.h> @@ -908,7 +908,7 @@ _efl_ui_clock_efl_object_constructor(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DATE_EDITOR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR); return obj; } diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 05809aac81..63b07ea5c5 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -1877,7 +1877,7 @@ _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); return obj; } diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c index 16487b5e27..187b14f784 100644 --- a/src/lib/elementary/efl_ui_frame.c +++ b/src/lib/elementary/efl_ui_frame.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -148,7 +148,7 @@ _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FRAME); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FRAME); return obj; } diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c index 65e57d8dd7..ef41b21add 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) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); pd->dir1 = EFL_UI_DIR_RIGHT; 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 fb5601a064..9e1567f467 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) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); gd = efl_data_scope_get(obj, EFL_UI_GRID_CLASS); gd->req_cols = 100; diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index c68b52aff7..be0cef5b0d 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_IMAGE_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_CANVAS_LAYOUT_CALC_PROTECTED @@ -864,7 +864,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); pd->scale_type = EFL_UI_IMAGE_SCALE_TYPE_FIT_INSIDE; pd->self = obj; diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index f889231054..3b882a4808 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -1540,7 +1540,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c index 31dc5f5811..2afd254e24 100644 --- a/src/lib/elementary/efl_ui_layout.c +++ b/src/lib/elementary/efl_ui_layout.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -398,7 +398,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ evas_object_focus_set(wd->resize_obj, EINA_TRUE); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } else { @@ -406,7 +406,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_ evas_object_focus_set(wd->resize_obj, EINA_FALSE); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); } if (efl_isa(wd->resize_obj, EDJE_OBJECT_CLASS)) 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) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c index d0507d6413..f196b0e674 100644 --- a/src/lib/elementary/efl_ui_panes.c +++ b/src/lib/elementary/efl_ui_panes.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #define EFL_GFX_SIZE_HINT_PROTECTED @@ -392,7 +392,7 @@ _efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPLIT_PANE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE); return obj; } diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c index 30ee503dfa..3f24cac4d7 100644 --- a/src/lib/elementary/efl_ui_progressbar.c +++ b/src/lib/elementary/efl_ui_progressbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -353,7 +353,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PROGRESS_BAR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR); return obj; } diff --git a/src/lib/elementary/efl_ui_radio.c b/src/lib/elementary/efl_ui_radio.c index 818d73fc99..33ff0fc834 100644 --- a/src/lib/elementary/efl_ui_radio.c +++ b/src/lib/elementary/efl_ui_radio.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -71,7 +71,7 @@ _state_set(Evas_Object *obj, Eina_Bool state, Eina_Bool activate) { if (sd->state) { - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_CHECKED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_CHECKED, EINA_TRUE); } } } @@ -254,7 +254,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_RADIO_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON); return obj; } @@ -371,14 +371,14 @@ _efl_ui_radio_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU return &atspi_actions[0]; } -EOLIAN Elm_Atspi_State_Set -_efl_ui_radio_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) +EOLIAN Efl_Access_State_Set +_efl_ui_radio_efl_access_state_set_get(Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); + ret = efl_access_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS)); if (obj == elm_radio_selected_object_get(obj)) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); return ret; } diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo index 8d6c4cff1f..397c1fba25 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) Elm.Widget.theme_apply; Elm.Widget.on_access_activate; Elm.Widget.widget_event; - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index cb06d1da54..00a0a86ba0 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -69,7 +69,7 @@ _delay_change(void *data) efl_event_callback_legacy_call(data, EFL_UI_SLIDER_EVENT_DELAY_CHANGED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_value_changed_signal_emit(data); + efl_access_value_changed_signal_emit(data); return ECORE_CALLBACK_CANCEL; } @@ -208,7 +208,7 @@ _val_set(Evas_Object *obj) // emit accessiblity event also if value was chagend by API if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_value_changed_signal_emit(obj); + efl_access_value_changed_signal_emit(obj); } static void @@ -1213,7 +1213,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); return obj; } diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c index 9d6cd83b30..a47f1c455f 100644 --- a/src/lib/elementary/efl_ui_slider_interval.c +++ b/src/lib/elementary/efl_ui_slider_interval.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_INTERFACE_ATSPI_VALUE_PROTECTED @@ -79,7 +79,7 @@ _val_set(Evas_Object *obj) // emit accessiblity event also if value was chagend by API if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_value_changed_signal_emit(obj); + efl_access_value_changed_signal_emit(obj); } static void diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index b3b4756383..afe06edb63 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #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 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); _validate(obj); } @@ -1230,7 +1230,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); if (_elm_config->selection_clear_enable) { @@ -2196,14 +2196,14 @@ _entry_changed_user_signal_cb(void *data, atspi_info.content = edje_info->change.insert.content; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); } else if (edje_info && !edje_info->insert) { atspi_info.content = edje_info->change.del.content; atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); } } } @@ -2258,7 +2258,7 @@ _entry_cursor_changed_signal_cb(void *data, _decoration_defer(obj); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -2270,7 +2270,7 @@ _entry_cursor_changed_manual_signal_cb(void *data, efl_event_callback_legacy_call (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -3380,7 +3380,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); 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) sd->single_line = EINA_TRUE; sd->line_wrap = ELM_WRAP_NONE; efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PASSWORD_TEXT); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); } else { @@ -3426,7 +3426,7 @@ _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password) _dnd_drop_cb, NULL); efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } 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 return EINA_TRUE; } -EOLIAN static Elm_Atspi_State_Set -_efl_ui_text_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_efl_ui_text_efl_access_state_set_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (efl_ui_text_interactive_editable_get(obj)) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); return ret; } EOLIAN static const char* -_efl_ui_text_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Text_Data *pd) +_efl_ui_text_efl_access_name_get(Eo *obj, Efl_Ui_Text_Data *pd) { const char *name; - name = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); + name = efl_access_name_get(efl_super(obj, EFL_UI_TEXT_CLASS)); if (name && strncmp("", name, 1)) return name; const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide"); return ret; diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 354dc9c95b..67ad82d034 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, Elm.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } - Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.state_set { get; } + Efl.Access.name { get; } Efl.Access.Text.text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/efl_ui_video.c b/src/lib/elementary/efl_ui_video.c index 97bafe8f9a..486b13da08 100644 --- a/src/lib/elementary/efl_ui_video.c +++ b/src/lib/elementary/efl_ui_video.c @@ -4,7 +4,7 @@ #include <Emotion.h> -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -265,7 +265,7 @@ _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); return obj; } diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 111032a73c..5d294fe3bf 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED @@ -1243,7 +1243,7 @@ _elm_win_focus_in(Ecore_Evas *ee) if (_elm_config->atspi_mode) { efl_access_window_activated_signal_emit(obj); - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_TRUE); } /* do nothing */ @@ -1277,7 +1277,7 @@ _elm_win_focus_out(Ecore_Evas *ee) if (_elm_config->atspi_mode) { efl_access_window_deactivated_signal_emit(obj); - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_ACTIVE, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_ACTIVE, EINA_FALSE); } /* do nothing */ @@ -2273,9 +2273,9 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd) { Eo *root; efl_access_window_created_signal_emit(obj); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); if (root) - elm_interface_atspi_accessible_children_changed_added_signal_emit(root, obj); + efl_access_children_changed_added_signal_emit(root, obj); } if (do_eval) @@ -2334,10 +2334,10 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd) if (_elm_config->atspi_mode) { Eo *root; - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); efl_access_window_destroyed_signal_emit(obj); if (root) - elm_interface_atspi_accessible_children_changed_del_signal_emit(root, obj); + efl_access_children_changed_del_signal_emit(root, obj); } 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) efreet_desktop_free(d); } } - elm_interface_atspi_accessible_type_set(sd->icon, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED); } 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 elm_win_focus_highlight_animate_set(obj, EINA_TRUE); } - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_WINDOW); + efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW); if (_elm_config->atspi_mode) efl_access_window_created_signal_emit(obj); @@ -6648,7 +6648,7 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUS target = efl_ui_focus_manager_focus_get(m); } if (target) - elm_interface_atspi_accessible_state_changed_signal_emit(target, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(target, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } else 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 } EOLIAN static Eo* -_efl_ui_win_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) +_efl_ui_win_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) { // attach all kinds of windows directly to ATSPI application root object Eo *root; - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); return root; } @@ -6699,23 +6699,23 @@ _efl_ui_win_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE return &atspi_actions[0]; } -EOLIAN static Elm_Atspi_State_Set -_efl_ui_win_elm_interface_atspi_accessible_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_efl_ui_win_efl_access_state_set_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); if (elm_win_focus_get(obj)) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_ACTIVE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE); return ret; } EOLIAN static const char* -_efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) +_efl_ui_win_efl_access_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED) { const char *ret; - ret = elm_interface_atspi_accessible_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); + ret = efl_access_name_get(efl_super(obj, EFL_UI_WIN_CLASS)); if (ret) return ret; const char *name = elm_win_title_get(obj); return name; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index cd0807ee51..d194dd294d 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, Elm.Widget.on_focus_update; Elm.Widget.widget_event; Elm.Widget.focus_manager_create; - Elm.Interface.Atspi_Accessible.parent { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.parent { get; } + Efl.Access.state_set { get; } + Efl.Access.name { get; } Efl.Access.Component.extents { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Input.State.modifier_enabled { get; } diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c index fde189aa52..32c3a05ec7 100644 --- a/src/lib/elementary/elc_combobox.c +++ b/src/lib/elementary/elc_combobox.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -358,7 +358,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); //hover-parent 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 1799b657d9..7f633338b2 100644 --- a/src/lib/elementary/elc_ctxpopup.c +++ b/src/lib/elementary/elc_ctxpopup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1124,7 +1124,7 @@ _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); + efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); return obj; } @@ -1536,13 +1536,13 @@ _elm_ctxpopup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNU return &atspi_actions[0]; } -EOLIAN static Elm_Atspi_State_Set -_elm_ctxpopup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_ctxpopup_efl_access_state_set_get(Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); return ret; } diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c index 5ae7ed5fa7..55f24ad084 100644 --- a/src/lib/elementary/elc_fileselector.c +++ b/src/lib/elementary/elc_fileselector.c @@ -9,7 +9,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -2049,7 +2049,7 @@ _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILE_CHOOSER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER); return obj; } diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 1c670124fe..4e31179951 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -272,7 +272,7 @@ _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 08c0d9f7a4..ac49e18219 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -3,7 +3,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -338,7 +338,7 @@ _elm_fileselector_entry_efl_object_constructor(Eo *obj, Elm_Fileselector_Entry_D obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GROUPING); + efl_access_role_set(obj, EFL_ACCESS_ROLE_GROUPING); return obj; } diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c index 3f0f12611f..fd20759814 100644 --- a/src/lib/elementary/elc_hoversel.c +++ b/src/lib/elementary/elc_hoversel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -694,7 +694,7 @@ _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c index aac415a559..125da1c228 100644 --- a/src/lib/elementary/elc_multibuttonentry.c +++ b/src/lib/elementary/elc_multibuttonentry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -535,8 +535,8 @@ _on_item_clicked(void *data, _item_select(WIDGET(it), it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, - ELM_ATSPI_STATE_CHECKED, + efl_access_state_changed_signal_emit(eo_it, + EFL_ACCESS_STATE_CHECKED, EINA_TRUE); if (sd->selected_it) @@ -699,7 +699,7 @@ _elm_multibuttonentry_item_efl_object_destructor(Eo *eo_it, Elm_Multibuttonentry_Item_Data *it) { if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it), eo_it); + efl_access_children_changed_del_signal_emit(WIDGET(it), eo_it); _item_del(it); efl_destructor(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); @@ -793,12 +793,12 @@ _item_new(Elm_Multibuttonentry_Data *sd, return NULL; WIDGET_ITEM_DATA_SET(eo_item, data); - elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_RADIO_BUTTON); + efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item); VIEW(item) = elm_layout_add(obj); - elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED); if (!elm_layout_theme_set (VIEW(item), "multibuttonentry", "btn", elm_widget_style_get(obj))) @@ -971,8 +971,8 @@ _item_new(Elm_Multibuttonentry_Data *sd, if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); - elm_interface_atspi_accessible_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); } return eo_item; @@ -1694,7 +1694,7 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); return obj; } @@ -1985,38 +1985,38 @@ _elm_multibuttonentry_class_constructor(Efl_Class *klass) } EOLIAN static Eina_List* -_elm_multibuttonentry_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd) +_elm_multibuttonentry_efl_access_children_get(Eo *obj, Elm_Multibuttonentry_Data *sd) { Eina_List *ret; - ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); + ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS)); return eina_list_merge(eina_list_clone(sd->items), ret); } EOLIAN static const char* -_elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) +_elm_multibuttonentry_item_efl_access_name_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *item) { const char *ret; - ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); if (ret) return ret; ret = elm_object_part_text_get(VIEW(item), "elm.btn.text"); return _elm_widget_item_accessible_plain_name_get(eo_it, ret); } -EOLIAN static Elm_Atspi_State_Set -_elm_multibuttonentry_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_multibuttonentry_item_efl_access_state_set_get(Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS)); sel = elm_obj_multibuttonentry_item_selected_get(eo_it); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); return ret; } diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c index 36889719b2..a544c59f93 100644 --- a/src/lib/elementary/elc_naviframe.c +++ b/src/lib/elementary/elc_naviframe.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define ELM_WIDGET_PROTECTED @@ -542,7 +542,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it, if (nit->title_label) strncat(buf, " ", 1); strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2); } - elm_interface_atspi_accessible_name_set(eo_it, buf); + efl_access_name_set(eo_it, buf); elm_layout_sizing_eval(WIDGET(nit)); } @@ -1265,8 +1265,8 @@ _item_new(Evas_Object *obj, ELM_NAVIFRAME_DATA_GET(obj, sd); eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj); - elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_PAGE_TAB); - elm_interface_atspi_accessible_name_set(eo_item, (char*)title_label); + efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB); + efl_access_name_set(eo_item, (char*)title_label); if (!eo_item) { @@ -1591,7 +1591,7 @@ _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PAGE_TAB_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST); return obj; } @@ -1943,7 +1943,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED, } EOLIAN static Eina_List* -_elm_naviframe_item_elm_interface_atspi_accessible_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) +_elm_naviframe_item_efl_access_children_get(Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit) { Eina_List *ret = NULL; diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c index ac6d35ed17..ae06fa717d 100644 --- a/src/lib/elementary/elc_player.c +++ b/src/lib/elementary/elc_player.c @@ -4,7 +4,7 @@ #include <Emotion.h> -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -667,7 +667,7 @@ _elm_player_efl_object_constructor(Eo *obj, Elm_Player_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); return obj; } diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c index 61e8c12514..bd88611b38 100644 --- a/src/lib/elementary/elc_popup.c +++ b/src/lib/elementary/elc_popup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1531,7 +1531,7 @@ _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_NOTIFICATION); return obj; } @@ -1799,13 +1799,13 @@ _elm_popup_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED return &atspi_actions[0]; } -EOLIAN static Elm_Atspi_State_Set -_elm_popup_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_popup_efl_access_state_set_get(Eo *obj, Elm_Popup_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, MY_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, MY_CLASS)); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MODAL); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL); return ret; } diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc index 93744c8363..50ed67db46 100644 --- a/src/lib/elementary/elementary_js.cc +++ b/src/lib/elementary/elementary_js.cc @@ -35,7 +35,7 @@ #endif /* ! _WIN32 */ EAPI void register_elm_atspi_app_object(v8::Handle<v8::Object> global, v8::Isolate* isolate); -EAPI void register_elm_interface_atspi_accessible(v8::Handle<v8::Object> global, v8::Isolate* isolate); +EAPI void register_efl_access(v8::Handle<v8::Object> global, v8::Isolate* isolate); EAPI void register_efl_access_action(v8::Handle<v8::Object> global, v8::Isolate* isolate); EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate); EAPI 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) elm::register_icon(exports, v8::Isolate::GetCurrent()); elm::register_image(exports, v8::Isolate::GetCurrent()); elm::register_index(exports, v8::Isolate::GetCurrent()); - ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent()); + ::register_efl_access(exports, v8::Isolate::GetCurrent()); ::register_efl_access_action(exports, v8::Isolate::GetCurrent()); ::register_efl_access_component(exports, v8::Isolate::GetCurrent()); ::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 0dc7211a0f..fd953d15d2 100644 --- a/src/lib/elementary/elm_access.c +++ b/src/lib/elementary/elm_access.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -1521,17 +1521,17 @@ _elm_access_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSE return &atspi_actions[0]; } -EOLIAN static Elm_Atspi_State_Set -_elm_access_elm_interface_atspi_accessible_state_set_get(Eo *obj, void *pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_access_efl_access_state_set_get(Eo *obj, void *pd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, ELM_ACCESS_CLASS)); Elm_Access_Info *info = _elm_access_info_get(obj); if (info && !evas_object_visible_get(info->part_object)) { - STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_VISIBLE); - STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_SHOWING); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_VISIBLE); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_SHOWING); } return ret; diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo index fb1519f624..7a23915db5 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) Elm.Widget.on_access_activate; Elm.Widget.on_focus_update; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c index 8177f69045..698d8bba42 100644 --- a/src/lib/elementary/elm_actionslider.c +++ b/src/lib/elementary/elm_actionslider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -548,7 +548,7 @@ _elm_actionslider_efl_object_constructor(Eo *obj, Elm_Actionslider_Data *_pd EIN obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SLIDER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER); return obj; } diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c index 2b905523fa..b1d45c1960 100644 --- a/src/lib/elementary/elm_atspi_app_object.c +++ b/src/lib/elementary/elm_atspi_app_object.c @@ -2,7 +2,7 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_widget.h" @@ -26,18 +26,18 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O } EOLIAN static Eina_List* -_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { Eina_List *l, *accs = NULL; Evas_Object *win; EINA_LIST_FOREACH(_elm_win_list, l, win) { - Elm_Atspi_Type type; - if (!efl_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + Efl_Access_Type type; + if (!efl_isa(win, EFL_ACCESS_MIXIN)) continue; - type = elm_interface_atspi_accessible_type_get(win); - if (type == ELM_ATSPI_TYPE_REGULAR) + type = efl_access_type_get(win); + if (type == EFL_ACCESS_TYPE_REGULAR) accs = eina_list_append(accs, win); } @@ -45,7 +45,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U } EOLIAN static const char* -_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_efl_access_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { const char *ret; ret = elm_app_name_get(); @@ -53,21 +53,21 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSE } EOLIAN static const char* -_elm_atspi_app_object_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) +_elm_atspi_app_object_efl_access_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) { return _pd->descr; } EOLIAN static void -_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) +_elm_atspi_app_object_efl_access_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) { eina_stringshare_replace(&_pd->descr, descr); } -EOLIAN static Elm_Atspi_Role -_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +EOLIAN static Efl_Access_Role +_elm_atspi_app_object_efl_access_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { - return ELM_ATSPI_ROLE_APPLICATION; + return EFL_ACCESS_ROLE_APPLICATION; } #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 250a567846..2d6bd1396f 100644 --- a/src/lib/elementary/elm_atspi_app_object.eo +++ b/src/lib/elementary/elm_atspi_app_object.eo @@ -1,13 +1,13 @@ -class Elm.Atspi.App.Object (Efl.Object, Elm.Interface.Atspi_Accessible) +class Elm.Atspi.App.Object (Efl.Object, Efl.Access) { [[AT-SPI application object class]] legacy_prefix: elm_atspi_app_object; data: Elm_Atspi_App_Object_Data; implements { Efl.Object.destructor; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.description { get; set; } - Elm.Interface.Atspi_Accessible.role { get; } - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.name { get; } + Efl.Access.description { get; set; } + Efl.Access.role { get; } + Efl.Access.children { get; } } } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 0d8fd28bfd..3d3b3ff521 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_COMPONENT_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define EFL_ACCESS_IMAGE_PROTECTED @@ -93,14 +93,14 @@ typedef struct _Elm_Atspi_Bridge_Data Eldbus_Service_Interface *text; Eldbus_Service_Interface *value; } interfaces; - Elm_Atspi_Event_Handler *event_hdlr; + Efl_Access_Event_Handler *event_hdlr; Eina_Hash *event_hash; Eina_Bool connected : 1; } Elm_Atspi_Bridge_Data; struct collection_match_rule { - Elm_Atspi_State_Set states; + Efl_Access_State_Set states; AtspiCollectionMatchType statematchtype; Eina_List *attributes; AtspiCollectionMatchType attributematchtype; @@ -149,14 +149,14 @@ typedef struct { } Elm_Atspi_Bridge_Event_Handler; static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = { - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_STATE_CHANGED, _state_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, _on_object_add}, - { ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, _on_object_del}, + { EFL_ACCESS_EVENT_CHILDREN_CHANGED, _children_changed_signal_send}, + { EFL_ACCESS_EVENT_PROPERTY_CHANGED, _property_changed_signal_send}, + { EFL_ACCESS_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send}, + { EFL_ACCESS_EVENT_STATE_CHANGED, _state_changed_signal_send}, + { EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send}, + { EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send}, + { EFL_ACCESS_EVENT_ADDED, _on_object_add}, + { EFL_ACCESS_EVENT_REMOVED, _on_object_del}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send}, { EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send}, @@ -283,185 +283,185 @@ static const Eldbus_Signal _window_obj_signals[] = { }; static const int elm_roles_to_atspi_roles[][2] = { - { ELM_ATSPI_ROLE_INVALID, ATSPI_ROLE_INVALID }, - { ELM_ATSPI_ROLE_ACCELERATOR_LABEL, ATSPI_ROLE_ACCELERATOR_LABEL }, - { ELM_ATSPI_ROLE_ALERT, ATSPI_ROLE_ALERT }, - { ELM_ATSPI_ROLE_ANIMATION, ATSPI_ROLE_ANIMATION }, - { ELM_ATSPI_ROLE_ARROW, ATSPI_ROLE_ARROW }, - { ELM_ATSPI_ROLE_CALENDAR, ATSPI_ROLE_CALENDAR }, - { ELM_ATSPI_ROLE_CANVAS, ATSPI_ROLE_CANVAS }, - { ELM_ATSPI_ROLE_CHECK_BOX, ATSPI_ROLE_CHECK_BOX }, - { ELM_ATSPI_ROLE_CHECK_MENU_ITEM, ATSPI_ROLE_CHECK_MENU_ITEM }, - { ELM_ATSPI_ROLE_COLOR_CHOOSER, ATSPI_ROLE_COLOR_CHOOSER }, - { ELM_ATSPI_ROLE_COLUMN_HEADER, ATSPI_ROLE_COLUMN_HEADER }, - { ELM_ATSPI_ROLE_COMBO_BOX, ATSPI_ROLE_COMBO_BOX }, - { ELM_ATSPI_ROLE_DATE_EDITOR, ATSPI_ROLE_DATE_EDITOR }, - { ELM_ATSPI_ROLE_DESKTOP_ICON, ATSPI_ROLE_DESKTOP_ICON }, - { ELM_ATSPI_ROLE_DESKTOP_FRAME, ATSPI_ROLE_DESKTOP_FRAME }, - { ELM_ATSPI_ROLE_DIAL, ATSPI_ROLE_DIAL }, - { ELM_ATSPI_ROLE_DIALOG, ATSPI_ROLE_DIALOG }, - { ELM_ATSPI_ROLE_DIRECTORY_PANE, ATSPI_ROLE_DIRECTORY_PANE }, - { ELM_ATSPI_ROLE_DRAWING_AREA, ATSPI_ROLE_DRAWING_AREA }, - { ELM_ATSPI_ROLE_FILE_CHOOSER, ATSPI_ROLE_FILE_CHOOSER }, - { ELM_ATSPI_ROLE_FILLER, ATSPI_ROLE_FILLER }, - { ELM_ATSPI_ROLE_FOCUS_TRAVERSABLE, ATSPI_ROLE_FOCUS_TRAVERSABLE }, - { ELM_ATSPI_ROLE_FONT_CHOOSER, ATSPI_ROLE_FONT_CHOOSER }, - { ELM_ATSPI_ROLE_FRAME, ATSPI_ROLE_FRAME }, - { ELM_ATSPI_ROLE_GLASS_PANE, ATSPI_ROLE_GLASS_PANE }, - { ELM_ATSPI_ROLE_HTML_CONTAINER, ATSPI_ROLE_HTML_CONTAINER }, - { ELM_ATSPI_ROLE_ICON, ATSPI_ROLE_ICON }, - { ELM_ATSPI_ROLE_IMAGE, ATSPI_ROLE_IMAGE }, - { ELM_ATSPI_ROLE_INTERNAL_FRAME, ATSPI_ROLE_INTERNAL_FRAME }, - { ELM_ATSPI_ROLE_LABEL, ATSPI_ROLE_LABEL }, - { ELM_ATSPI_ROLE_LAYERED_PANE, ATSPI_ROLE_LAYERED_PANE }, - { ELM_ATSPI_ROLE_LIST, ATSPI_ROLE_LIST }, - { ELM_ATSPI_ROLE_LIST_ITEM, ATSPI_ROLE_LIST_ITEM }, - { ELM_ATSPI_ROLE_MENU, ATSPI_ROLE_MENU }, - { ELM_ATSPI_ROLE_MENU_BAR, ATSPI_ROLE_MENU_BAR }, - { ELM_ATSPI_ROLE_MENU_ITEM, ATSPI_ROLE_MENU_ITEM }, - { ELM_ATSPI_ROLE_OPTION_PANE, ATSPI_ROLE_OPTION_PANE }, - { ELM_ATSPI_ROLE_PAGE_TAB, ATSPI_ROLE_PAGE_TAB }, - { ELM_ATSPI_ROLE_PAGE_TAB_LIST, ATSPI_ROLE_PAGE_TAB_LIST }, - { ELM_ATSPI_ROLE_PANEL, ATSPI_ROLE_PANEL }, - { ELM_ATSPI_ROLE_PASSWORD_TEXT, ATSPI_ROLE_PASSWORD_TEXT }, - { ELM_ATSPI_ROLE_POPUP_MENU, ATSPI_ROLE_POPUP_MENU }, - { ELM_ATSPI_ROLE_PROGRESS_BAR, ATSPI_ROLE_PROGRESS_BAR }, - { ELM_ATSPI_ROLE_PUSH_BUTTON, ATSPI_ROLE_PUSH_BUTTON }, - { ELM_ATSPI_ROLE_RADIO_BUTTON, ATSPI_ROLE_RADIO_BUTTON }, - { ELM_ATSPI_ROLE_RADIO_MENU_ITEM, ATSPI_ROLE_RADIO_MENU_ITEM }, - { ELM_ATSPI_ROLE_ROOT_PANE, ATSPI_ROLE_ROOT_PANE }, - { ELM_ATSPI_ROLE_ROW_HEADER, ATSPI_ROLE_ROW_HEADER }, - { ELM_ATSPI_ROLE_SCROLL_BAR, ATSPI_ROLE_SCROLL_BAR }, - { ELM_ATSPI_ROLE_SCROLL_PANE, ATSPI_ROLE_SCROLL_PANE }, - { ELM_ATSPI_ROLE_SEPARATOR, ATSPI_ROLE_SEPARATOR }, - { ELM_ATSPI_ROLE_SLIDER, ATSPI_ROLE_SLIDER }, - { ELM_ATSPI_ROLE_SPIN_BUTTON, ATSPI_ROLE_SPIN_BUTTON }, - { ELM_ATSPI_ROLE_SPLIT_PANE, ATSPI_ROLE_SPLIT_PANE }, - { ELM_ATSPI_ROLE_STATUS_BAR, ATSPI_ROLE_STATUS_BAR }, - { ELM_ATSPI_ROLE_TABLE, ATSPI_ROLE_TABLE }, - { ELM_ATSPI_ROLE_TABLE_CELL, ATSPI_ROLE_TABLE_CELL }, - { ELM_ATSPI_ROLE_TABLE_COLUMN_HEADER, ATSPI_ROLE_TABLE_COLUMN_HEADER }, - { ELM_ATSPI_ROLE_TABLE_ROW_HEADER, ATSPI_ROLE_TABLE_ROW_HEADER }, - { ELM_ATSPI_ROLE_TEAROFF_MENU_ITEM, ATSPI_ROLE_TEAROFF_MENU_ITEM }, - { ELM_ATSPI_ROLE_TERMINAL, ATSPI_ROLE_TERMINAL }, - { ELM_ATSPI_ROLE_TEXT, ATSPI_ROLE_TEXT }, - { ELM_ATSPI_ROLE_TOGGLE_BUTTON, ATSPI_ROLE_TOGGLE_BUTTON }, - { ELM_ATSPI_ROLE_TOOL_BAR, ATSPI_ROLE_TOOL_BAR }, - { ELM_ATSPI_ROLE_TOOL_TIP, ATSPI_ROLE_TOOL_TIP }, - { ELM_ATSPI_ROLE_TREE, ATSPI_ROLE_TREE }, - { ELM_ATSPI_ROLE_TREE_TABLE, ATSPI_ROLE_TREE_TABLE }, - { ELM_ATSPI_ROLE_UNKNOWN, ATSPI_ROLE_UNKNOWN }, - { ELM_ATSPI_ROLE_VIEWPORT, ATSPI_ROLE_VIEWPORT }, - { ELM_ATSPI_ROLE_WINDOW, ATSPI_ROLE_WINDOW }, - { ELM_ATSPI_ROLE_EXTENDED, ATSPI_ROLE_EXTENDED }, - { ELM_ATSPI_ROLE_HEADER, ATSPI_ROLE_HEADER }, - { ELM_ATSPI_ROLE_FOOTER, ATSPI_ROLE_FOOTER }, - { ELM_ATSPI_ROLE_PARAGRAPH, ATSPI_ROLE_PARAGRAPH }, - { ELM_ATSPI_ROLE_RULER, ATSPI_ROLE_RULER }, - { ELM_ATSPI_ROLE_APPLICATION, ATSPI_ROLE_APPLICATION }, - { ELM_ATSPI_ROLE_AUTOCOMPLETE, ATSPI_ROLE_AUTOCOMPLETE }, - { ELM_ATSPI_ROLE_EDITBAR, ATSPI_ROLE_EDITBAR }, - { ELM_ATSPI_ROLE_EMBEDDED, ATSPI_ROLE_EMBEDDED }, - { ELM_ATSPI_ROLE_ENTRY, ATSPI_ROLE_ENTRY }, - { ELM_ATSPI_ROLE_CHART, ATSPI_ROLE_CHART }, - { ELM_ATSPI_ROLE_CAPTION, ATSPI_ROLE_CAPTION }, - { ELM_ATSPI_ROLE_DOCUMENT_FRAME, ATSPI_ROLE_DOCUMENT_FRAME }, - { ELM_ATSPI_ROLE_HEADING, ATSPI_ROLE_HEADING }, - { ELM_ATSPI_ROLE_PAGE, ATSPI_ROLE_PAGE }, - { ELM_ATSPI_ROLE_SECTION, ATSPI_ROLE_SECTION }, - { ELM_ATSPI_ROLE_REDUNDANT_OBJECT, ATSPI_ROLE_REDUNDANT_OBJECT }, - { ELM_ATSPI_ROLE_FORM, ATSPI_ROLE_FORM }, - { ELM_ATSPI_ROLE_LINK, ATSPI_ROLE_LINK }, - { ELM_ATSPI_ROLE_INPUT_METHOD_WINDOW, ATSPI_ROLE_INPUT_METHOD_WINDOW }, - { ELM_ATSPI_ROLE_TABLE_ROW, ATSPI_ROLE_TABLE_ROW }, - { ELM_ATSPI_ROLE_TREE_ITEM, ATSPI_ROLE_TREE_ITEM }, - { ELM_ATSPI_ROLE_DOCUMENT_SPREADSHEET, ATSPI_ROLE_DOCUMENT_SPREADSHEET }, - { ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION, ATSPI_ROLE_DOCUMENT_PRESENTATION }, - { ELM_ATSPI_ROLE_DOCUMENT_TEXT, ATSPI_ROLE_DOCUMENT_TEXT }, - { ELM_ATSPI_ROLE_DOCUMENT_WEB, ATSPI_ROLE_DOCUMENT_WEB }, - { ELM_ATSPI_ROLE_DOCUMENT_EMAIL, ATSPI_ROLE_DOCUMENT_EMAIL }, - { ELM_ATSPI_ROLE_COMMENT, ATSPI_ROLE_COMMENT }, - { ELM_ATSPI_ROLE_LIST_BOX, ATSPI_ROLE_LIST_BOX }, - { ELM_ATSPI_ROLE_GROUPING, ATSPI_ROLE_GROUPING }, - { ELM_ATSPI_ROLE_IMAGE_MAP, ATSPI_ROLE_IMAGE_MAP }, - { ELM_ATSPI_ROLE_NOTIFICATION, ATSPI_ROLE_NOTIFICATION }, - { ELM_ATSPI_ROLE_INFO_BAR, ATSPI_ROLE_INFO_BAR }, - { ELM_ATSPI_ROLE_LAST_DEFINED, ATSPI_ROLE_LAST_DEFINED }, + { EFL_ACCESS_ROLE_INVALID, ATSPI_ROLE_INVALID }, + { EFL_ACCESS_ROLE_ACCELERATOR_LABEL, ATSPI_ROLE_ACCELERATOR_LABEL }, + { EFL_ACCESS_ROLE_ALERT, ATSPI_ROLE_ALERT }, + { EFL_ACCESS_ROLE_ANIMATION, ATSPI_ROLE_ANIMATION }, + { EFL_ACCESS_ROLE_ARROW, ATSPI_ROLE_ARROW }, + { EFL_ACCESS_ROLE_CALENDAR, ATSPI_ROLE_CALENDAR }, + { EFL_ACCESS_ROLE_CANVAS, ATSPI_ROLE_CANVAS }, + { EFL_ACCESS_ROLE_CHECK_BOX, ATSPI_ROLE_CHECK_BOX }, + { EFL_ACCESS_ROLE_CHECK_MENU_ITEM, ATSPI_ROLE_CHECK_MENU_ITEM }, + { EFL_ACCESS_ROLE_COLOR_CHOOSER, ATSPI_ROLE_COLOR_CHOOSER }, + { EFL_ACCESS_ROLE_COLUMN_HEADER, ATSPI_ROLE_COLUMN_HEADER }, + { EFL_ACCESS_ROLE_COMBO_BOX, ATSPI_ROLE_COMBO_BOX }, + { EFL_ACCESS_ROLE_DATE_EDITOR, ATSPI_ROLE_DATE_EDITOR }, + { EFL_ACCESS_ROLE_DESKTOP_ICON, ATSPI_ROLE_DESKTOP_ICON }, + { EFL_ACCESS_ROLE_DESKTOP_FRAME, ATSPI_ROLE_DESKTOP_FRAME }, + { EFL_ACCESS_ROLE_DIAL, ATSPI_ROLE_DIAL }, + { EFL_ACCESS_ROLE_DIALOG, ATSPI_ROLE_DIALOG }, + { EFL_ACCESS_ROLE_DIRECTORY_PANE, ATSPI_ROLE_DIRECTORY_PANE }, + { EFL_ACCESS_ROLE_DRAWING_AREA, ATSPI_ROLE_DRAWING_AREA }, + { EFL_ACCESS_ROLE_FILE_CHOOSER, ATSPI_ROLE_FILE_CHOOSER }, + { EFL_ACCESS_ROLE_FILLER, ATSPI_ROLE_FILLER }, + { EFL_ACCESS_ROLE_FOCUS_TRAVERSABLE, ATSPI_ROLE_FOCUS_TRAVERSABLE }, + { EFL_ACCESS_ROLE_FONT_CHOOSER, ATSPI_ROLE_FONT_CHOOSER }, + { EFL_ACCESS_ROLE_FRAME, ATSPI_ROLE_FRAME }, + { EFL_ACCESS_ROLE_GLASS_PANE, ATSPI_ROLE_GLASS_PANE }, + { EFL_ACCESS_ROLE_HTML_CONTAINER, ATSPI_ROLE_HTML_CONTAINER }, + { EFL_ACCESS_ROLE_ICON, ATSPI_ROLE_ICON }, + { EFL_ACCESS_ROLE_IMAGE, ATSPI_ROLE_IMAGE }, + { EFL_ACCESS_ROLE_INTERNAL_FRAME, ATSPI_ROLE_INTERNAL_FRAME }, + { EFL_ACCESS_ROLE_LABEL, ATSPI_ROLE_LABEL }, + { EFL_ACCESS_ROLE_LAYERED_PANE, ATSPI_ROLE_LAYERED_PANE }, + { EFL_ACCESS_ROLE_LIST, ATSPI_ROLE_LIST }, + { EFL_ACCESS_ROLE_LIST_ITEM, ATSPI_ROLE_LIST_ITEM }, + { EFL_ACCESS_ROLE_MENU, ATSPI_ROLE_MENU }, + { EFL_ACCESS_ROLE_MENU_BAR, ATSPI_ROLE_MENU_BAR }, + { EFL_ACCESS_ROLE_MENU_ITEM, ATSPI_ROLE_MENU_ITEM }, + { EFL_ACCESS_ROLE_OPTION_PANE, ATSPI_ROLE_OPTION_PANE }, + { EFL_ACCESS_ROLE_PAGE_TAB, ATSPI_ROLE_PAGE_TAB }, + { EFL_ACCESS_ROLE_PAGE_TAB_LIST, ATSPI_ROLE_PAGE_TAB_LIST }, + { EFL_ACCESS_ROLE_PANEL, ATSPI_ROLE_PANEL }, + { EFL_ACCESS_ROLE_PASSWORD_TEXT, ATSPI_ROLE_PASSWORD_TEXT }, + { EFL_ACCESS_ROLE_POPUP_MENU, ATSPI_ROLE_POPUP_MENU }, + { EFL_ACCESS_ROLE_PROGRESS_BAR, ATSPI_ROLE_PROGRESS_BAR }, + { EFL_ACCESS_ROLE_PUSH_BUTTON, ATSPI_ROLE_PUSH_BUTTON }, + { EFL_ACCESS_ROLE_RADIO_BUTTON, ATSPI_ROLE_RADIO_BUTTON }, + { EFL_ACCESS_ROLE_RADIO_MENU_ITEM, ATSPI_ROLE_RADIO_MENU_ITEM }, + { EFL_ACCESS_ROLE_ROOT_PANE, ATSPI_ROLE_ROOT_PANE }, + { EFL_ACCESS_ROLE_ROW_HEADER, ATSPI_ROLE_ROW_HEADER }, + { EFL_ACCESS_ROLE_SCROLL_BAR, ATSPI_ROLE_SCROLL_BAR }, + { EFL_ACCESS_ROLE_SCROLL_PANE, ATSPI_ROLE_SCROLL_PANE }, + { EFL_ACCESS_ROLE_SEPARATOR, ATSPI_ROLE_SEPARATOR }, + { EFL_ACCESS_ROLE_SLIDER, ATSPI_ROLE_SLIDER }, + { EFL_ACCESS_ROLE_SPIN_BUTTON, ATSPI_ROLE_SPIN_BUTTON }, + { EFL_ACCESS_ROLE_SPLIT_PANE, ATSPI_ROLE_SPLIT_PANE }, + { EFL_ACCESS_ROLE_STATUS_BAR, ATSPI_ROLE_STATUS_BAR }, + { EFL_ACCESS_ROLE_TABLE, ATSPI_ROLE_TABLE }, + { EFL_ACCESS_ROLE_TABLE_CELL, ATSPI_ROLE_TABLE_CELL }, + { EFL_ACCESS_ROLE_TABLE_COLUMN_HEADER, ATSPI_ROLE_TABLE_COLUMN_HEADER }, + { EFL_ACCESS_ROLE_TABLE_ROW_HEADER, ATSPI_ROLE_TABLE_ROW_HEADER }, + { EFL_ACCESS_ROLE_TEAROFF_MENU_ITEM, ATSPI_ROLE_TEAROFF_MENU_ITEM }, + { EFL_ACCESS_ROLE_TERMINAL, ATSPI_ROLE_TERMINAL }, + { EFL_ACCESS_ROLE_TEXT, ATSPI_ROLE_TEXT }, + { EFL_ACCESS_ROLE_TOGGLE_BUTTON, ATSPI_ROLE_TOGGLE_BUTTON }, + { EFL_ACCESS_ROLE_TOOL_BAR, ATSPI_ROLE_TOOL_BAR }, + { EFL_ACCESS_ROLE_TOOL_TIP, ATSPI_ROLE_TOOL_TIP }, + { EFL_ACCESS_ROLE_TREE, ATSPI_ROLE_TREE }, + { EFL_ACCESS_ROLE_TREE_TABLE, ATSPI_ROLE_TREE_TABLE }, + { EFL_ACCESS_ROLE_UNKNOWN, ATSPI_ROLE_UNKNOWN }, + { EFL_ACCESS_ROLE_VIEWPORT, ATSPI_ROLE_VIEWPORT }, + { EFL_ACCESS_ROLE_WINDOW, ATSPI_ROLE_WINDOW }, + { EFL_ACCESS_ROLE_EXTENDED, ATSPI_ROLE_EXTENDED }, + { EFL_ACCESS_ROLE_HEADER, ATSPI_ROLE_HEADER }, + { EFL_ACCESS_ROLE_FOOTER, ATSPI_ROLE_FOOTER }, + { EFL_ACCESS_ROLE_PARAGRAPH, ATSPI_ROLE_PARAGRAPH }, + { EFL_ACCESS_ROLE_RULER, ATSPI_ROLE_RULER }, + { EFL_ACCESS_ROLE_APPLICATION, ATSPI_ROLE_APPLICATION }, + { EFL_ACCESS_ROLE_AUTOCOMPLETE, ATSPI_ROLE_AUTOCOMPLETE }, + { EFL_ACCESS_ROLE_EDITBAR, ATSPI_ROLE_EDITBAR }, + { EFL_ACCESS_ROLE_EMBEDDED, ATSPI_ROLE_EMBEDDED }, + { EFL_ACCESS_ROLE_ENTRY, ATSPI_ROLE_ENTRY }, + { EFL_ACCESS_ROLE_CHART, ATSPI_ROLE_CHART }, + { EFL_ACCESS_ROLE_CAPTION, ATSPI_ROLE_CAPTION }, + { EFL_ACCESS_ROLE_DOCUMENT_FRAME, ATSPI_ROLE_DOCUMENT_FRAME }, + { EFL_ACCESS_ROLE_HEADING, ATSPI_ROLE_HEADING }, + { EFL_ACCESS_ROLE_PAGE, ATSPI_ROLE_PAGE }, + { EFL_ACCESS_ROLE_SECTION, ATSPI_ROLE_SECTION }, + { EFL_ACCESS_ROLE_REDUNDANT_OBJECT, ATSPI_ROLE_REDUNDANT_OBJECT }, + { EFL_ACCESS_ROLE_FORM, ATSPI_ROLE_FORM }, + { EFL_ACCESS_ROLE_LINK, ATSPI_ROLE_LINK }, + { EFL_ACCESS_ROLE_INPUT_METHOD_WINDOW, ATSPI_ROLE_INPUT_METHOD_WINDOW }, + { EFL_ACCESS_ROLE_TABLE_ROW, ATSPI_ROLE_TABLE_ROW }, + { EFL_ACCESS_ROLE_TREE_ITEM, ATSPI_ROLE_TREE_ITEM }, + { EFL_ACCESS_ROLE_DOCUMENT_SPREADSHEET, ATSPI_ROLE_DOCUMENT_SPREADSHEET }, + { EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION, ATSPI_ROLE_DOCUMENT_PRESENTATION }, + { EFL_ACCESS_ROLE_DOCUMENT_TEXT, ATSPI_ROLE_DOCUMENT_TEXT }, + { EFL_ACCESS_ROLE_DOCUMENT_WEB, ATSPI_ROLE_DOCUMENT_WEB }, + { EFL_ACCESS_ROLE_DOCUMENT_EMAIL, ATSPI_ROLE_DOCUMENT_EMAIL }, + { EFL_ACCESS_ROLE_COMMENT, ATSPI_ROLE_COMMENT }, + { EFL_ACCESS_ROLE_LIST_BOX, ATSPI_ROLE_LIST_BOX }, + { EFL_ACCESS_ROLE_GROUPING, ATSPI_ROLE_GROUPING }, + { EFL_ACCESS_ROLE_IMAGE_MAP, ATSPI_ROLE_IMAGE_MAP }, + { EFL_ACCESS_ROLE_NOTIFICATION, ATSPI_ROLE_NOTIFICATION }, + { EFL_ACCESS_ROLE_INFO_BAR, ATSPI_ROLE_INFO_BAR }, + { EFL_ACCESS_ROLE_LAST_DEFINED, ATSPI_ROLE_LAST_DEFINED }, }; struct atspi_state_desc { - Elm_Atspi_State_Type elm_state; + Efl_Access_State_Type elm_state; AtspiStateType atspi_state; const char *name; }; static const struct atspi_state_desc elm_states_to_atspi_state[] = { - { ELM_ATSPI_STATE_INVALID, ATSPI_STATE_INVALID, "invalid" }, - { ELM_ATSPI_STATE_ACTIVE, ATSPI_STATE_ACTIVE, "active" }, - { ELM_ATSPI_STATE_ARMED, ATSPI_STATE_ARMED, "armed" }, - { ELM_ATSPI_STATE_BUSY, ATSPI_STATE_BUSY, "busy" }, - { ELM_ATSPI_STATE_CHECKED, ATSPI_STATE_CHECKED, "checked" }, - { ELM_ATSPI_STATE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" }, - { ELM_ATSPI_STATE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" }, - { ELM_ATSPI_STATE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" }, - { ELM_ATSPI_STATE_ENABLED, ATSPI_STATE_ENABLED, "enabled" }, - { ELM_ATSPI_STATE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" }, - { ELM_ATSPI_STATE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" }, - { ELM_ATSPI_STATE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" }, - { ELM_ATSPI_STATE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" }, - { ELM_ATSPI_STATE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" }, - { ELM_ATSPI_STATE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" }, - { ELM_ATSPI_STATE_ICONIFIED, ATSPI_STATE_ICONIFIED, "iconified" }, - { ELM_ATSPI_STATE_MODAL, ATSPI_STATE_MODAL, "modal" }, - { ELM_ATSPI_STATE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" }, - { ELM_ATSPI_STATE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" }, - { ELM_ATSPI_STATE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" }, - { ELM_ATSPI_STATE_PRESSED, ATSPI_STATE_PRESSED, "pressed" }, - { ELM_ATSPI_STATE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" }, - { ELM_ATSPI_STATE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" }, - { ELM_ATSPI_STATE_SELECTED, ATSPI_STATE_SELECTED, "selected" }, - { ELM_ATSPI_STATE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" }, - { ELM_ATSPI_STATE_SHOWING, ATSPI_STATE_SHOWING, "showing" }, - { ELM_ATSPI_STATE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" }, - { ELM_ATSPI_STATE_STALE, ATSPI_STATE_STALE, "stale" }, - { ELM_ATSPI_STATE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" }, - { ELM_ATSPI_STATE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" }, - { ELM_ATSPI_STATE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" }, - { ELM_ATSPI_STATE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" }, - { ELM_ATSPI_STATE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" }, - { ELM_ATSPI_STATE_REQUIRED, ATSPI_STATE_REQUIRED, "required" }, - { ELM_ATSPI_STATE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" }, - { ELM_ATSPI_STATE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" }, - { ELM_ATSPI_STATE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" }, - { ELM_ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" }, - { ELM_ATSPI_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, - { ELM_ATSPI_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, - { ELM_ATSPI_STATE_VISITED, ATSPI_STATE_VISITED, "visited" }, - { ELM_ATSPI_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" }, + { EFL_ACCESS_STATE_INVALID, ATSPI_STATE_INVALID, "invalid" }, + { EFL_ACCESS_STATE_ACTIVE, ATSPI_STATE_ACTIVE, "active" }, + { EFL_ACCESS_STATE_ARMED, ATSPI_STATE_ARMED, "armed" }, + { EFL_ACCESS_STATE_BUSY, ATSPI_STATE_BUSY, "busy" }, + { EFL_ACCESS_STATE_CHECKED, ATSPI_STATE_CHECKED, "checked" }, + { EFL_ACCESS_STATE_COLLAPSED, ATSPI_STATE_COLLAPSED, "collapsed" }, + { EFL_ACCESS_STATE_DEFUNCT, ATSPI_STATE_DEFUNCT, "defunct" }, + { EFL_ACCESS_STATE_EDITABLE, ATSPI_STATE_EDITABLE, "editable" }, + { EFL_ACCESS_STATE_ENABLED, ATSPI_STATE_ENABLED, "enabled" }, + { EFL_ACCESS_STATE_EXPANDABLE, ATSPI_STATE_EXPANDABLE, "expandable" }, + { EFL_ACCESS_STATE_EXPANDED, ATSPI_STATE_EXPANDED, "expanded" }, + { EFL_ACCESS_STATE_FOCUSABLE, ATSPI_STATE_FOCUSABLE, "focusable" }, + { EFL_ACCESS_STATE_FOCUSED, ATSPI_STATE_FOCUSED, "focused" }, + { EFL_ACCESS_STATE_HAS_TOOLTIP, ATSPI_STATE_HAS_TOOLTIP, "has-tooltip" }, + { EFL_ACCESS_STATE_HORIZONTAL, ATSPI_STATE_HORIZONTAL, "horizontal" }, + { EFL_ACCESS_STATE_ICONIFIED, ATSPI_STATE_ICONIFIED, "iconified" }, + { EFL_ACCESS_STATE_MODAL, ATSPI_STATE_MODAL, "modal" }, + { EFL_ACCESS_STATE_MULTI_LINE, ATSPI_STATE_MULTI_LINE, "multi-line" }, + { EFL_ACCESS_STATE_MULTISELECTABLE, ATSPI_STATE_MULTISELECTABLE, "multiselectable" }, + { EFL_ACCESS_STATE_OPAQUE, ATSPI_STATE_OPAQUE, "opaque" }, + { EFL_ACCESS_STATE_PRESSED, ATSPI_STATE_PRESSED, "pressed" }, + { EFL_ACCESS_STATE_RESIZABLE, ATSPI_STATE_RESIZABLE, "resizable" }, + { EFL_ACCESS_STATE_SELECTABLE, ATSPI_STATE_SELECTABLE, "selectable" }, + { EFL_ACCESS_STATE_SELECTED, ATSPI_STATE_SELECTED, "selected" }, + { EFL_ACCESS_STATE_SENSITIVE, ATSPI_STATE_SENSITIVE, "sensitive" }, + { EFL_ACCESS_STATE_SHOWING, ATSPI_STATE_SHOWING, "showing" }, + { EFL_ACCESS_STATE_SINGLE_LINE, ATSPI_STATE_SINGLE_LINE, "single-line" }, + { EFL_ACCESS_STATE_STALE, ATSPI_STATE_STALE, "stale" }, + { EFL_ACCESS_STATE_TRANSIENT, ATSPI_STATE_TRANSIENT, "transient" }, + { EFL_ACCESS_STATE_VERTICAL, ATSPI_STATE_VERTICAL, "vertical" }, + { EFL_ACCESS_STATE_VISIBLE, ATSPI_STATE_VISIBLE, "visible" }, + { EFL_ACCESS_STATE_MANAGES_DESCENDANTS, ATSPI_STATE_MANAGES_DESCENDANTS, "manages-descendants" }, + { EFL_ACCESS_STATE_INDETERMINATE, ATSPI_STATE_INDETERMINATE, "indeterminate" }, + { EFL_ACCESS_STATE_REQUIRED, ATSPI_STATE_REQUIRED, "required" }, + { EFL_ACCESS_STATE_TRUNCATED, ATSPI_STATE_TRUNCATED, "truncated" }, + { EFL_ACCESS_STATE_ANIMATED, ATSPI_STATE_ANIMATED, "animated" }, + { EFL_ACCESS_STATE_INVALID_ENTRY, ATSPI_STATE_INVALID_ENTRY, "invalid-entry" }, + { EFL_ACCESS_STATE_SUPPORTS_AUTOCOMPLETION, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION, "supports-autocompletion" }, + { EFL_ACCESS_STATE_SELECTABLE_TEXT, ATSPI_STATE_SELECTABLE_TEXT, "selectable-text" }, + { EFL_ACCESS_STATE_IS_DEFAULT, ATSPI_STATE_IS_DEFAULT, "is-default" }, + { EFL_ACCESS_STATE_VISITED, ATSPI_STATE_VISITED, "visited" }, + { EFL_ACCESS_STATE_LAST_DEFINED, ATSPI_STATE_LAST_DEFINED, "last-defined" }, }; static const int elm_relation_to_atspi_relation_mapping[] = { - [ELM_ATSPI_RELATION_NULL] = ATSPI_RELATION_NULL, - [ELM_ATSPI_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR, - [ELM_ATSPI_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY, - [ELM_ATSPI_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR, - [ELM_ATSPI_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY, - [ELM_ATSPI_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF, - [ELM_ATSPI_RELATION_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR, - [ELM_ATSPI_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF, - [ELM_ATSPI_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF, - [ELM_ATSPI_RELATION_EXTENDED] = ATSPI_RELATION_EXTENDED, - [ELM_ATSPI_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO, - [ELM_ATSPI_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM, - [ELM_ATSPI_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF, - [ELM_ATSPI_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS, - [ELM_ATSPI_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY, - [ELM_ATSPI_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR, - [ELM_ATSPI_RELATION_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF, - [ELM_ATSPI_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR, - [ELM_ATSPI_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY, - [ELM_ATSPI_RELATION_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED, + [EFL_ACCESS_RELATION_NULL] = ATSPI_RELATION_NULL, + [EFL_ACCESS_RELATION_LABEL_FOR] = ATSPI_RELATION_LABEL_FOR, + [EFL_ACCESS_RELATION_LABELLED_BY] = ATSPI_RELATION_LABELLED_BY, + [EFL_ACCESS_RELATION_CONTROLLER_FOR] = ATSPI_RELATION_CONTROLLER_FOR, + [EFL_ACCESS_RELATION_CONTROLLED_BY] = ATSPI_RELATION_CONTROLLED_BY, + [EFL_ACCESS_RELATION_MEMBER_OF] = ATSPI_RELATION_MEMBER_OF, + [EFL_ACCESS_RELATION_TOOLTIP_FOR] = ATSPI_RELATION_TOOLTIP_FOR, + [EFL_ACCESS_RELATION_NODE_CHILD_OF] = ATSPI_RELATION_NODE_CHILD_OF, + [EFL_ACCESS_RELATION_NODE_PARENT_OF] = ATSPI_RELATION_NODE_PARENT_OF, + [EFL_ACCESS_RELATION_EXTENDED] = ATSPI_RELATION_EXTENDED, + [EFL_ACCESS_RELATION_FLOWS_TO] = ATSPI_RELATION_FLOWS_TO, + [EFL_ACCESS_RELATION_FLOWS_FROM] = ATSPI_RELATION_FLOWS_FROM, + [EFL_ACCESS_RELATION_SUBWINDOW_OF] = ATSPI_RELATION_SUBWINDOW_OF, + [EFL_ACCESS_RELATION_EMBEDS] = ATSPI_RELATION_EMBEDS, + [EFL_ACCESS_RELATION_EMBEDDED_BY] = ATSPI_RELATION_EMBEDDED_BY, + [EFL_ACCESS_RELATION_POPUP_FOR] = ATSPI_RELATION_POPUP_FOR, + [EFL_ACCESS_RELATION_PARENT_WINDOW_OF] = ATSPI_RELATION_PARENT_WINDOW_OF, + [EFL_ACCESS_RELATION_DESCRIPTION_FOR] = ATSPI_RELATION_DESCRIPTION_FOR, + [EFL_ACCESS_RELATION_DESCRIBED_BY] = ATSPI_RELATION_DESCRIBED_BY, + [EFL_ACCESS_RELATION_LAST_DEFINED] = ATSPI_RELATION_LAST_DEFINED, }; static 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 * return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.UnknownObject", "Path is not valid accessible object reference."); } -static AtspiRelationType _elm_relation_to_atspi_relation(Elm_Atspi_Relation_Type type) +static AtspiRelationType _elm_relation_to_atspi_relation(Efl_Access_Relation_Type type) { - if ((type < ELM_ATSPI_RELATION_LAST_DEFINED) && (type > ELM_ATSPI_RELATION_NULL)) + if ((type < EFL_ACCESS_RELATION_LAST_DEFINED) && (type > EFL_ACCESS_RELATION_NULL)) return elm_relation_to_atspi_relation_mapping[type]; return ATSPI_RELATION_NULL; } @@ -483,16 +483,16 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); AtspiRole atspi_role = ATSPI_ROLE_INVALID; - Elm_Atspi_Role role; + Efl_Access_Role role; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); - role = elm_interface_atspi_accessible_role_get(obj); + role = efl_access_role_get(obj); Eldbus_Message *ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - atspi_role = role > ELM_ATSPI_ROLE_LAST_DEFINED ? ATSPI_ROLE_LAST_DEFINED : elm_roles_to_atspi_roles[role][1]; + atspi_role = role > EFL_ACCESS_ROLE_LAST_DEFINED ? ATSPI_ROLE_LAST_DEFINED : elm_roles_to_atspi_roles[role][1]; eldbus_message_arguments_append(ret, "u", atspi_role); return ret; } @@ -504,9 +504,9 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); - role_name = elm_interface_atspi_accessible_role_name_get(obj); + role_name = efl_access_role_name_get(obj); Eldbus_Message *ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -522,9 +522,9 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); - l_role_name = elm_interface_atspi_accessible_localized_role_name_get(obj); + l_role_name = efl_access_localized_role_name_get(obj); EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); Eldbus_Message *ret = eldbus_message_method_return_new(msg); @@ -545,9 +545,9 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes Eldbus_Message_Iter *iter, *iter_array; Eo *children; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); - children_list = elm_interface_atspi_accessible_children_get(obj); + children_list = efl_access_children_get(obj); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -580,13 +580,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_ Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); _bridge_iter_object_reference_append(bridge, iter, root); return ret; @@ -596,7 +596,7 @@ static Eldbus_Message * _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg) { Eina_List *attrs = NULL, *l; - Elm_Atspi_Attribute *attr; + Efl_Access_Attribute *attr; Eldbus_Message_Iter *iter, *iter_dict = NULL, *iter_entry; Eldbus_Message *ret; @@ -604,12 +604,12 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); if (!ret) goto error; - attrs = elm_interface_atspi_accessible_attributes_get(obj); + attrs = efl_access_attributes_get(obj); iter = eldbus_message_iter_get(ret); if (!iter) goto error; @@ -627,13 +627,13 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M } eldbus_message_iter_container_close(iter, iter_dict); - elm_atspi_attributes_list_free(attrs); + efl_access_attributes_list_free(attrs); return ret; error: if (iter_dict) eldbus_message_iter_container_close(iter, iter_dict); if (ret) eldbus_message_unref(ret); - elm_atspi_attributes_list_free(attrs); + efl_access_attributes_list_free(attrs); return NULL; } @@ -646,7 +646,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -658,7 +658,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M } static uint64_t -_elm_atspi_state_set_to_atspi_state_set(Elm_Atspi_State_Set states) +_elm_atspi_state_set_to_atspi_state_set(Efl_Access_State_Set states) { uint64_t ret = 0; unsigned int i = 0; @@ -671,12 +671,12 @@ _elm_atspi_state_set_to_atspi_state_set(Elm_Atspi_State_Set states) return ret; } -static Elm_Atspi_State_Set +static Efl_Access_State_Set _atspi_state_set_to_elm_atspi_state_set(uint64_t states) { //Currently Elm_Atspi_State and Atspi_State_Set are binary compatible, //implement proper coversion when it will be needed. - Elm_Atspi_State_Set ret = states; + Efl_Access_State_Set ret = states; return ret; } @@ -709,14 +709,14 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag { Eldbus_Message *ret; Eldbus_Message_Iter *iter, *iter_array; - Elm_Atspi_State_Set states; + Efl_Access_State_Set states; uint64_t atspi_states = 0; const char *obj_path = eldbus_message_path_get(msg); Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -725,7 +725,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag iter_array = eldbus_message_iter_container_new(iter, 'a', "u"); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - states = elm_interface_atspi_accessible_state_set_get(obj); + states = efl_access_state_set_get(obj); atspi_states = _elm_atspi_state_set_to_atspi_state_set(states); @@ -752,12 +752,12 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE Eldbus_Message *ret; int idx = -1; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - idx = elm_interface_atspi_accessible_index_in_parent_get(obj); + idx = efl_access_index_in_parent_get(obj); eldbus_message_arguments_append(ret, "i", idx); @@ -776,7 +776,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co Eldbus_Message *ret; Eldbus_Message_Iter *iter; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "i", &idx)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -785,7 +785,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); iter = eldbus_message_iter_get(ret); - children = elm_interface_atspi_accessible_children_get(obj); + children = efl_access_children_get(obj); child = eina_list_nth(children, idx); _bridge_iter_object_reference_append(bridge, iter, child); @@ -803,11 +803,11 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED, Eo *rel_obj, *obj = _bridge_object_from_path(bridge, obj_path); Eldbus_Message *ret = NULL; Eldbus_Message_Iter *iter = NULL, *iter_array = NULL, *iter_array2 = NULL, *iter_struct; - Elm_Atspi_Relation *rel; + Efl_Access_Relation *rel; Eina_List *l, *l2; - Elm_Atspi_Relation_Set rels; + Efl_Access_Relation_Set rels; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -816,7 +816,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED, iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))"); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - rels = elm_interface_atspi_accessible_relation_set_get(obj); + rels = efl_access_relation_set_get(obj); EINA_LIST_FOREACH(rels, l, rel) { @@ -832,7 +832,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED, eldbus_message_iter_container_close(iter_struct, iter_array2); eldbus_message_iter_container_close(iter_array, iter_struct); } - elm_atspi_relation_set_free(rels); + efl_access_relation_set_free(rels); eldbus_message_iter_container_close(iter, iter_array); return ret; @@ -2026,7 +2026,7 @@ _bridge_object_from_path(Eo *bridge, const char *path) tmp = path + len; /* Skip over the prefix */ if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) { - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); return root; } @@ -2040,7 +2040,7 @@ _bridge_object_from_path(Eo *bridge, const char *path) return NULL; } - ret = efl_isa(eo, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? eo : NULL; + ret = efl_isa(eo, EFL_ACCESS_MIXIN) ? eo : NULL; return ret; } @@ -2053,7 +2053,7 @@ _path_from_object(const Eo *eo) if (!eo) return ATSPI_DBUS_PATH_NULL; - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); if (eo == root) snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); @@ -2071,11 +2071,11 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, request_msg, error); + ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error); if (!strcmp(property, "Name")) { - ret = elm_interface_atspi_accessible_name_get(obj); + ret = efl_access_name_get(obj); if (!ret) ret = ""; eldbus_message_iter_basic_append(iter, 's', ret); @@ -2083,7 +2083,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * } else if (!strcmp(property, "Description")) { - ret = elm_interface_atspi_accessible_description_get(obj); + ret = efl_access_description_get(obj); if (!ret) ret = ""; eldbus_message_iter_basic_append(iter, 's', ret); @@ -2091,10 +2091,10 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * } else if (!strcmp(property, "Parent")) { - ret_obj = elm_interface_atspi_accessible_parent_get(obj); - Elm_Atspi_Role role = ELM_ATSPI_ROLE_INVALID; - role = elm_interface_atspi_accessible_role_get(obj); - if ((!ret_obj) && (ELM_ATSPI_ROLE_APPLICATION == role)) + ret_obj = efl_access_parent_get(obj); + Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; + role = efl_access_role_get(obj); + if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) _object_desktop_reference_append(iter); else _bridge_iter_object_reference_append(bridge, iter, ret_obj); @@ -2103,7 +2103,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char * else if (!strcmp(property, "ChildCount")) { Eina_List *l = NULL; - l = elm_interface_atspi_accessible_children_get(obj); + l = efl_access_children_get(obj); eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l)); eina_list_free(l); return EINA_TRUE; @@ -2416,7 +2416,7 @@ static const Eldbus_Service_Interface_Desc application_iface_desc = { void _collection_match_rule_free(struct collection_match_rule *rule) { - Elm_Atspi_Attribute *attr; + Efl_Access_Attribute *attr; eina_list_free(rule->ifaces); EINA_LIST_FREE(rule->attributes, attr) { @@ -2488,7 +2488,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat const char *key, *value; if (eldbus_message_iter_arguments_get(iter_arg, "ss", &key, &value)) { - Elm_Atspi_Attribute *attrib = calloc(1, sizeof(Elm_Atspi_Attribute)); + Efl_Access_Attribute *attrib = calloc(1, sizeof(Efl_Access_Attribute)); attrib->key = eina_stringshare_add(key); attrib->value = eina_stringshare_add(value); rule->attributes = eina_list_append(rule->attributes, attrib); @@ -2570,9 +2570,9 @@ static Eina_Bool _collection_match_states_lookup(Eo *obj, struct collection_match_rule *rule) { Eina_Bool ret = EINA_FALSE; - Elm_Atspi_State_Set ss; + Efl_Access_State_Set ss; - ss = elm_interface_atspi_accessible_state_set_get(obj); + ss = efl_access_state_set_get(obj); switch (rule->statematchtype) { @@ -2599,10 +2599,10 @@ static Eina_Bool _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule) { Eina_Bool ret = EINA_FALSE; - Elm_Atspi_Role role; + Efl_Access_Role role; int64_t role_set; - role = elm_interface_atspi_accessible_role_get(obj); + role = efl_access_role_get(obj); if (role >= 64) { @@ -2614,7 +2614,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule) if (role >= 64) { - ERR("Elm_Atspi_Role enum value exceeds 127. Unable to compare with roles bit field."); + ERR("Efl_Access_Role enum value exceeds 127. Unable to compare with roles bit field."); return EINA_FALSE; } @@ -2641,7 +2641,7 @@ static Eina_Bool _collection_match_attributes_helper(Eina_List *obj_attribs, Eina_List *attribs, Eina_Bool compare, Eina_Bool ret_if_compare, Eina_Bool ret_default) { Eina_List *l, *l2; - Elm_Atspi_Attribute *attr, *attr2; + Efl_Access_Attribute *attr, *attr2; EINA_LIST_FOREACH(attribs, l, attr) { @@ -2666,7 +2666,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule) Eina_Bool ret = EINA_FALSE; Eina_List *obj_attribs; - obj_attribs = elm_interface_atspi_accessible_attributes_get(obj); + obj_attribs = efl_access_attributes_get(obj); switch (rule->attributematchtype) { @@ -2689,7 +2689,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule) break; } - elm_atspi_attributes_list_free(obj_attribs); + efl_access_attributes_list_free(obj_attribs); return ret; } @@ -2702,7 +2702,7 @@ _collection_sort_order_canonical(struct collection_match_rule *rule, Eina_List * { int i = index; Eina_List *children; - children = elm_interface_atspi_accessible_children_get(obj); + children = efl_access_children_get(obj); long acount = eina_list_count(children); Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE; @@ -2766,21 +2766,21 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein flag = EINA_TRUE; /* Get the current nodes index in it's parent and the parent object. */ - indexinparent = elm_interface_atspi_accessible_index_in_parent_get(obj); - parent = elm_interface_atspi_accessible_parent_get(obj); + indexinparent = efl_access_index_in_parent_get(obj); + parent = efl_access_parent_get(obj); if ((indexinparent > 0) && ((max == 0) || (count < max))) { /* there are still some siblings to visit so get the previous sibling and get it's last descendant. First, get the previous sibling */ - children = elm_interface_atspi_accessible_children_get(parent); + children = efl_access_children_get(parent); nextobj = eina_list_nth(children, indexinparent - 1); eina_list_free(children); /* Now, drill down the right side to the last descendant */ do { - children = elm_interface_atspi_accessible_children_get(nextobj); + children = efl_access_children_get(nextobj); if (children) nextobj = eina_list_last_data_get(children); eina_list_free(children); } while (children); @@ -2823,8 +2823,8 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis while ((max == 0 || count < max) && obj && obj != collection) { Eo *parent; - parent = elm_interface_atspi_accessible_parent_get(obj); - idx = elm_interface_atspi_accessible_index_in_parent_get(obj); + parent = efl_access_parent_get(obj); + idx = efl_access_index_in_parent_get(obj); count = _collection_sort_order_canonical(rule, list, count, max, parent, idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); obj = parent; @@ -2900,8 +2900,8 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti result = eina_list_reverse(result); break; case ATSPI_Collection_TREE_RESTRICT_CHILDREN: - idx = elm_interface_atspi_accessible_index_in_parent_get(current); - parent = elm_interface_atspi_accessible_parent_get(current); + idx = efl_access_index_in_parent_get(current); + parent = efl_access_parent_get(current); _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); break; case ATSPI_Collection_TREE_RESTRICT_SIBLING: @@ -2929,7 +2929,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED, AtspiCollectionSortOrder sortby; Eina_List *result = NULL; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -2941,7 +2941,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED, current = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); if (!_collection_iter_match_rule_get(rule_iter, &rule)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); @@ -2962,7 +2962,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_ Eo *collection = obj; if (limit) - collection = elm_interface_atspi_accessible_parent_get(obj); + collection = efl_access_parent_get(obj); switch (tree) { @@ -3001,7 +3001,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co Eina_List *result = NULL; Eina_Bool limit; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -3013,7 +3013,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co current = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg); if (!_collection_iter_match_rule_get(rule_iter, &rule)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); @@ -3041,7 +3041,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess AtspiCollectionSortOrder sortby; Eina_List *result = NULL; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg); iter = eldbus_message_iter_get(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); @@ -3115,7 +3115,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); if (!iter_array) return; - if (efl_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (efl_isa(obj, EFL_ACCESS_MIXIN)) { eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); @@ -3147,12 +3147,12 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ return EINA_TRUE; Eldbus_Message_Iter *iter_struct, *iter_sub_array; - Elm_Atspi_State_Set states; - Elm_Atspi_Role role; + Efl_Access_State_Set states; + Efl_Access_Role role; Eo *root; - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); - role = elm_interface_atspi_accessible_role_get(data); + role = efl_access_role_get(data); iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE); @@ -3164,9 +3164,9 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ _bridge_iter_object_reference_append(bridge, iter_struct, root); Eo *parent = NULL; - parent = elm_interface_atspi_accessible_parent_get(data); + parent = efl_access_parent_get(data); /* Marshall parent */ - if ((!parent) && (ELM_ATSPI_ROLE_APPLICATION == role)) + if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) _object_desktop_reference_append(iter_struct); else _bridge_iter_object_reference_append(bridge, iter_struct, parent); @@ -3175,7 +3175,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ Eina_List *children_list = NULL, *l; Eo *child; - children_list = elm_interface_atspi_accessible_children_get(data); + children_list = efl_access_children_get(data); iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)"); EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); @@ -3190,7 +3190,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ /* Marshall name */ const char *name = NULL; - name = elm_interface_atspi_accessible_name_get(data); + name = efl_access_name_get(data); if (!name) name = ""; @@ -3201,7 +3201,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ /* Marshall description */ const char* descritpion = NULL; - descritpion = elm_interface_atspi_accessible_description_get(data); + descritpion = efl_access_description_get(data); if (!descritpion) descritpion = ""; eldbus_message_iter_basic_append(iter_struct, 's', descritpion); @@ -3210,7 +3210,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_ iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u"); EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail); - states = elm_interface_atspi_accessible_state_set_get(data); + states = efl_access_state_set_get(data); unsigned int s1 = states & 0xFFFFFFFF; unsigned int s2 = (states >> 32) & 0xFFFFFFFF; @@ -3247,7 +3247,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); to_process = eina_list_append(NULL, root); while (to_process) @@ -3258,7 +3258,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms _bridge_object_register(bridge, obj); Eina_List *children; - children = elm_interface_atspi_accessible_children_get(obj); + children = efl_access_children_get(obj); to_process = eina_list_merge(to_process, children); } @@ -3630,7 +3630,7 @@ _elm_atspi_bridge_app_register(Eo *bridge) "Embed"); Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); _bridge_iter_object_reference_append(bridge, iter, root); eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); @@ -3643,7 +3643,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge) Eo *root; ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, ATSPI_DBUS_PATH_ROOT, @@ -3814,7 +3814,7 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED) static void _state_changed_signal_send(void *data, const Efl_Event *event) { - Elm_Atspi_Event_State_Changed_Data *state_data = event->info; + Efl_Access_Event_State_Changed_Data *state_data = event->info; const char *type_desc; ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); @@ -3824,7 +3824,7 @@ _state_changed_signal_send(void *data, const Efl_Event *event) return; } - if ((state_data->type > ELM_ATSPI_STATE_LAST_DEFINED) || + if ((state_data->type > EFL_ACCESS_STATE_LAST_DEFINED) || (int)state_data->type < 0) { efl_event_callback_stop(event->object); @@ -3840,7 +3840,7 @@ _state_changed_signal_send(void *data, const Efl_Event *event) static void _bounds_changed_signal_send(void *data, const Efl_Event *event) { - Elm_Atspi_Event_Geometry_Changed_Data *geo_data = event->info; + Efl_Access_Event_Geometry_Changed_Data *geo_data = event->info; _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_BOUNDS_CHANGED], "", 0, 0, "(iiii)", @@ -3928,7 +3928,7 @@ _active_descendant_changed_signal_send(void *data, const Efl_Event *event) return; } - idx = elm_interface_atspi_accessible_index_in_parent_get(child); + idx = efl_access_index_in_parent_get(child); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", @@ -3939,7 +3939,7 @@ static void _children_changed_signal_send(void *data, const Efl_Event *event) { const char *atspi_desc = NULL; - Elm_Atspi_Event_Children_Changed_Data *ev_data = event->info; + Efl_Access_Event_Children_Changed_Data *ev_data = event->info; int idx; enum _Atspi_Object_Child_Event_Type type; @@ -3962,7 +3962,7 @@ _children_changed_signal_send(void *data, const Efl_Event *event) return; } - idx = elm_interface_atspi_accessible_index_in_parent_get(ev_data->child); + idx = efl_access_index_in_parent_get(ev_data->child); _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); @@ -4043,7 +4043,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); path = _path_from_object(obj); - root = elm_interface_atspi_accessible_root_get(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN); + root = efl_access_root_get(EFL_ACCESS_MIXIN); msg = eldbus_message_signal_new(path, infc, signal->name); if (!msg) return; @@ -4293,7 +4293,7 @@ _a11y_connection_shutdown(Eo *bridge) if (pd->event_hash) eina_hash_free(pd->event_hash); pd->event_hash = NULL; - elm_interface_atspi_accessible_event_handler_del(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, pd->event_hdlr); + efl_access_event_handler_del(EFL_ACCESS_MIXIN, pd->event_hdlr); pd->event_hdlr = NULL; efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); @@ -4385,7 +4385,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr) _elm_atspi_bridge_app_register(obj); // register accesible object event listener - pd->event_hdlr = elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _bridge_accessible_event_dispatch, obj); + pd->event_hdlr = efl_access_event_handler_add(EFL_ACCESS_MIXIN, _bridge_accessible_event_dispatch, obj); } static void @@ -4463,9 +4463,9 @@ static void _bridge_object_register(Eo *bridge, Eo *obj) { ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); - if (!efl_isa(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) + if (!efl_isa(obj, EFL_ACCESS_MIXIN)) { - WRN("Unable to register class w/o Elm_Interface_Atspi_Accessible!"); + WRN("Unable to register class w/o Efl_Access!"); return; } @@ -4499,7 +4499,7 @@ _elm_atspi_bridge_shutdown(void) efl_del(_instance); _init_count = 0; } - _elm_interface_atspi_shutdown(); + _efl_access_shutdown(); } static Key_Event_Info* diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index ba71a6a496..fd97093d09 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include <Elementary.h> @@ -363,11 +363,11 @@ elm_box_add(Evas_Object *parent) EOLIAN static Eo * _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED) { - elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED); obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_bubble.c b/src/lib/elementary/elm_bubble.c index b761cbc5b0..4f6818bd54 100644 --- a/src/lib/elementary/elm_bubble.c +++ b/src/lib/elementary/elm_bubble.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -196,7 +196,7 @@ _elm_bubble_efl_object_constructor(Eo *obj, Elm_Bubble_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index fcb6eb1e97..42d1308d9e 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -1658,7 +1658,7 @@ _elm_calendar_efl_object_constructor(Eo *obj, Elm_Calendar_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_CALENDAR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_CALENDAR); return obj; } diff --git a/src/lib/elementary/elm_clock.c b/src/lib/elementary/elm_clock.c index b63922bd68..0d66802e03 100644 --- a/src/lib/elementary/elm_clock.c +++ b/src/lib/elementary/elm_clock.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include <Elementary.h> @@ -784,7 +784,7 @@ _elm_clock_efl_object_constructor(Eo *obj, Elm_Clock_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TEXT); + efl_access_role_set(obj, EFL_ACCESS_ROLE_TEXT); return obj; } diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index 771cf06894..0b04b0b51e 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -44,8 +44,8 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Elm.Interface.Atspi_W Elm.Widget.Item.focus { get; set; } Efl.Ui.Focus.Object.focus { set; } Efl.Ui.Focus.Object.focus_geometry { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.state_set { get; } + Efl.Access.name { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index c8dd6974f7..9885fb5ff7 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -1735,8 +1735,8 @@ _item_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) elm_object_signal_emit(VIEW(item), "elm,state,selected", "elm"); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, - ELM_ATSPI_STATE_CHECKED, + efl_access_state_changed_signal_emit(obj, + EFL_ACCESS_STATE_CHECKED, EINA_TRUE); elm_colorselector_color_set(WIDGET(item), item->color->r, item->color->g, item->color->b, item->color->a); @@ -1802,7 +1802,7 @@ _elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item) if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) elm_wdg_item_access_register(eo_item); - elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_RADIO_BUTTON); + efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON); return eo_item; } @@ -2267,7 +2267,7 @@ _elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd E obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_COLOR_CHOOSER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_COLOR_CHOOSER); return obj; } @@ -2592,11 +2592,11 @@ _elm_colorselector_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EIN } EOLIAN static Eina_List* -_elm_colorselector_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) +_elm_colorselector_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd) { Eina_List *ret = NULL; - ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS)); + ret = efl_access_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS)); // filter - out box contiainer ret = eina_list_remove(ret, sd->palette_box); // append items as colorselector children @@ -2605,18 +2605,18 @@ _elm_colorselector_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUS return ret; } -EOLIAN static Elm_Atspi_State_Set -_elm_color_item_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_color_item_efl_access_state_set_get(Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS)); sel = elm_obj_color_item_selected_get(obj); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_CHECKED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED); return ret; } @@ -2669,14 +2669,14 @@ _elm_color_item_elm_interface_atspi_widget_action_elm_actions_get(Eo *eo_it EINA } EOLIAN static const char* -_elm_color_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Color_Item_Data *it) +_elm_color_item_efl_access_name_get(Eo *eo_it, Elm_Color_Item_Data *it) { Eina_Strbuf *buf; const char *color_name = NULL; const char *name; char *accessible_name; - name = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); + name = efl_access_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS)); if (name) return name; buf = eina_strbuf_new(); diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index 63c830a11d..c38ebcfcd2 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -113,7 +113,7 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Widget.on_access_update; Elm.Widget.widget_event; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } } events { color,item,selected; [[Called when color item was selected]] diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c index e0f15680f2..ee4032eef1 100644 --- a/src/lib/elementary/elm_conform.c +++ b/src/lib/elementary/elm_conform.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -997,7 +997,7 @@ _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); Efl_Event event = {}; event.object = sd->win; diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 1e1b16f70c..b7d7515e87 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -212,7 +212,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widge Efl.Ui.Menu.last_item { get; } Efl.Ui.Menu.items { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c index aeaa1a906d..0b80f68025 100644 --- a/src/lib/elementary/elm_datetime.c +++ b/src/lib/elementary/elm_datetime.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_priv.h" diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c index 4b2190c08e..3296c0fe29 100644 --- a/src/lib/elementary/elm_dayselector.c +++ b/src/lib/elementary/elm_dayselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #include <Elementary.h> @@ -456,7 +456,7 @@ _elm_dayselector_efl_object_constructor(Eo *obj, Elm_Dayselector_Data *_pd EINA_ obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); return obj; } diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c index 2ce14d4d86..a2befbcb35 100644 --- a/src/lib/elementary/elm_diskselector.c +++ b/src/lib/elementary/elm_diskselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -1416,7 +1416,7 @@ _elm_diskselector_efl_object_constructor(Eo *obj, Elm_Diskselector_Data *_pd EIN obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index e2b9a714a9..a9b1d5397b 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -1267,7 +1267,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); _return_key_enabled_check(obj); _validate(obj); } @@ -1282,7 +1282,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); if (_elm_config->selection_clear_enable) { @@ -2197,14 +2197,14 @@ _entry_changed_user_signal_cb(void *data, atspi_info.content = edje_info->change.insert.content; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); } else if (edje_info && !edje_info->insert) { atspi_info.content = edje_info->change.del.content; atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); } } } @@ -2229,7 +2229,7 @@ _entry_preedit_changed_signal_cb(void *data, atspi_info.content = text; atspi_info.pos = edje_info->change.insert.pos; atspi_info.len = edje_info->change.insert.plain_length; - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); @@ -2316,7 +2316,7 @@ _entry_selection_changed_signal_cb(void *data, _selection_store(ELM_SEL_TYPE_PRIMARY, data); _update_selection_handler(data); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); } static void @@ -2420,7 +2420,7 @@ _entry_cursor_changed_signal_cb(void *data, efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -2432,7 +2432,7 @@ _entry_cursor_changed_manual_signal_cb(void *data, efl_event_callback_legacy_call (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); } static void @@ -4036,7 +4036,7 @@ _elm_entry_efl_object_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL); @@ -4121,7 +4121,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password) sd->line_wrap = ELM_WRAP_NONE; elm_entry_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA)); _entry_selection_callbacks_unregister(obj); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PASSWORD_TEXT); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); } else { @@ -4134,7 +4134,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password) elm_entry_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA)); _entry_selection_callbacks_register(obj); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ENTRY); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY); } elm_obj_widget_theme_apply(obj); @@ -6007,23 +6007,23 @@ _elm_entry_efl_access_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED return EINA_TRUE; } -EOLIAN static Elm_Atspi_State_Set -_elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_entry_efl_access_state_set_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_ENTRY_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, ELM_ENTRY_CLASS)); if (elm_entry_editable_get(obj)) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EDITABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE); return ret; } EOLIAN static const char* -_elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd) +_elm_entry_efl_access_name_get(Eo *obj, Elm_Entry_Data *sd) { const char *name; - name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_ENTRY_CLASS)); + name = efl_access_name_get(efl_super(obj, ELM_ENTRY_CLASS)); if (name && strncmp("", name, 1)) return name; if (sd->password) return NULL; diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 72cca8d721..ea7d43daf5 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -965,8 +965,8 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Widget.widget_sub_object_del; Elm.Interface_Scrollable.policy { set; } Elm.Interface_Scrollable.bounce_allow { set; } - Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.state_set { get; } + Efl.Access.name { get; } Efl.Access.Text.text { get; } Efl.Access.Text.string { get; } Efl.Access.Text.attribute { get; } diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c index 8f2b6434b7..6ce90361e1 100644 --- a/src/lib/elementary/elm_flipselector.c +++ b/src/lib/elementary/elm_flipselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -676,7 +676,7 @@ _elm_flipselector_efl_object_constructor(Eo *obj, Elm_Flipselector_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c index cd6b27d353..d3a028126b 100644 --- a/src/lib/elementary/elm_gengrid.c +++ b/src/lib/elementary/elm_gengrid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -703,7 +703,7 @@ _item_unselect(Elm_Gen_Item *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_FALSE); } } @@ -1009,7 +1009,7 @@ _item_text_realize(Elm_Gen_Item *it, edje_object_part_text_set(target, key, ""); } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_name_changed_signal_emit(EO_OBJ(it)); + efl_access_name_changed_signal_emit(EO_OBJ(it)); } } @@ -2306,7 +2306,7 @@ _elm_gengrid_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } static void @@ -2336,7 +2336,7 @@ _elm_gengrid_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_GENGRID_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); } static Eina_Bool @@ -3968,7 +3968,7 @@ _item_select(Elm_Gen_Item *it) { efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); } it->walking--; @@ -3992,7 +3992,7 @@ _elm_gengrid_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM); + efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -4245,7 +4245,7 @@ _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TREE_TABLE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE); return obj; } @@ -4335,8 +4335,8 @@ _elm_gengrid_item_append(Eo *obj, Elm_Gengrid_Data *sd, const Elm_Gengrid_Item_C if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(EO_OBJ(it)); - elm_interface_atspi_accessible_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); + efl_access_added(EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); } return EO_OBJ(it); @@ -4361,8 +4361,8 @@ _elm_gengrid_item_prepend(Eo *obj, Elm_Gengrid_Data *sd, const Elm_Gengrid_Item_ if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(EO_OBJ(it)); - elm_interface_atspi_accessible_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); + efl_access_added(EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); } return EO_OBJ(it); @@ -5350,32 +5350,32 @@ _elm_gengrid_item_select_mode_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return it->select_mode; } -EOLIAN Elm_Atspi_State_Set -_elm_gengrid_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) +EOLIAN Efl_Access_State_Set +_elm_gengrid_item_efl_access_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); sel = elm_obj_gengrid_item_selected_get(eo_it); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); return ret; } EOLIAN const char* -_elm_gengrid_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_gengrid_item_efl_access_name_get(Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); @@ -5555,7 +5555,7 @@ _elm_gengrid_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUS } EOLIAN Eina_List* -_elm_gengrid_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Gengrid_Data *sd) +_elm_gengrid_efl_access_children_get(Eo *obj, Elm_Gengrid_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Gen_Item *it; @@ -5563,19 +5563,19 @@ _elm_gengrid_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Gengrid_Da EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); - ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_GENGRID_CLASS)); + ret2 = efl_access_children_get(efl_super(obj, ELM_GENGRID_CLASS)); return eina_list_merge(ret, ret2); } -EOLIAN Elm_Atspi_State_Set -_elm_gengrid_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) +EOLIAN Efl_Access_State_Set +_elm_gengrid_efl_access_state_set_get(Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_GENGRID_CLASS)); + ret = efl_access_state_set_get(efl_super(obj, ELM_GENGRID_CLASS)); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); return ret; } diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 43191b46fb..6be46b33d9 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -558,8 +558,8 @@ class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { set; } Elm.Interface_Scrollable.policy { get; set; } - Elm.Interface.Atspi_Accessible.children { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.children { get; } + Efl.Access.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo index 2f5fd3e74a..cf0898cd42 100644 --- a/src/lib/elementary/elm_gengrid_item.eo +++ b/src/lib/elementary/elm_gengrid_item.eo @@ -253,7 +253,7 @@ class Elm.Gengrid.Item(Elm.Widget.Item, Efl.Ui.Focus.Object) Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index fdaa0fa7f7..9c1be93333 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -4,7 +4,7 @@ #include <fnmatch.h> -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -362,7 +362,7 @@ _item_text_realize(Elm_Gen_Item *it, edje_object_part_text_set(target, key, ""); } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_name_changed_signal_emit(EO_OBJ(it)); + efl_access_name_changed_signal_emit(EO_OBJ(it)); } } @@ -2766,7 +2766,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it) _elm_genlist_item_focus_update(it); efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } static void @@ -2794,7 +2794,7 @@ _elm_genlist_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_GENLIST_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); } static Eina_Bool @@ -3758,7 +3758,7 @@ _item_unselect(Elm_Gen_Item *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); } static void @@ -4716,8 +4716,8 @@ _item_queue(Elm_Genlist_Data *sd, if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(EO_OBJ(it)); - elm_interface_atspi_accessible_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); + efl_access_added(EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(sd->obj, EO_OBJ(it)); } } @@ -5724,7 +5724,7 @@ _elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } @@ -5847,7 +5847,7 @@ _item_select(Elm_Gen_Item *it) if ((it->base)->on_deletion) goto item_deleted; efl_event_callback_legacy_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); // delete item if it's requested deletion in the above callbacks. if ((it->base)->on_deletion) goto item_deleted; it->walking--; @@ -5962,7 +5962,7 @@ _elm_genlist_item_elm_widget_item_del_pre(Eo *eo_it EINA_UNUSED, return EINA_FALSE; } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_del_signal_emit(WIDGET(it),eo_it); + efl_access_children_changed_del_signal_emit(WIDGET(it),eo_it); _item_del(it); return EINA_TRUE; @@ -6070,7 +6070,7 @@ _elm_genlist_item_efl_object_constructor(Eo *eo_it, Elm_Gen_Item *it) eo_it = efl_constructor(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM); + efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -6996,7 +6996,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B (WIDGET(it), ELM_GENLIST_EVENT_EXPANDED, EO_OBJ(it)); sd->auto_scroll_enabled = EINA_TRUE; if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_item, ELM_ATSPI_STATE_EXPANDED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_EXPANDED, EINA_TRUE); } else { @@ -7006,7 +7006,7 @@ _elm_genlist_item_expanded_set(Eo *eo_item EINA_UNUSED, Elm_Gen_Item *it, Eina_B (WIDGET(it), ELM_GENLIST_EVENT_CONTRACTED, EO_OBJ(it)); sd->auto_scroll_enabled = EINA_FALSE; if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_item, ELM_ATSPI_STATE_EXPANDED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_EXPANDED, EINA_FALSE); } } @@ -8270,39 +8270,39 @@ _elm_genlist_item_select_mode_get(Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it) return it->select_mode; } -EOLIAN Elm_Atspi_State_Set -_elm_genlist_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) +EOLIAN Efl_Access_State_Set +_elm_genlist_item_efl_access_state_set_get(Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); sel = elm_obj_genlist_item_selected_get(eo_it); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); if (elm_genlist_item_type_get(eo_it) == ELM_GENLIST_ITEM_TREE) { - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EXPANDABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EXPANDABLE); if (elm_genlist_item_expanded_get(eo_it)) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_EXPANDED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EXPANDED); } return ret; } EOLIAN const char* -_elm_genlist_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Gen_Item *it) +_elm_genlist_item_efl_access_name_get(Eo *eo_it, Elm_Gen_Item *it) { const char *ret; Eina_Strbuf *buf; char *accessible_name; - ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS)); if (ret) return ret; buf = eina_strbuf_new(); @@ -8522,7 +8522,7 @@ _elm_genlist_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUS } EOLIAN Eina_List* -_elm_genlist_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Genlist_Data *sd) +_elm_genlist_efl_access_children_get(Eo *obj, Elm_Genlist_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Gen_Item *it; @@ -8530,19 +8530,19 @@ _elm_genlist_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Genlist_Da EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); - ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_GENLIST_CLASS)); + ret2 = efl_access_children_get(efl_super(obj, ELM_GENLIST_CLASS)); return eina_list_merge(ret, ret2); } -EOLIAN Elm_Atspi_State_Set -_elm_genlist_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED) +EOLIAN Efl_Access_State_Set +_elm_genlist_efl_access_state_set_get(Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_GENLIST_CLASS)); + ret = efl_access_state_set_get(efl_super(obj, ELM_GENLIST_CLASS)); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_MANAGES_DESCENDANTS); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS); return ret; } diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 595fb4db80..3a6969e6f3 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -543,8 +543,8 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.bounce_allow { get; set; } Elm.Interface_Scrollable.policy { get; set; } - Elm.Interface.Atspi_Accessible.children { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.children { get; } + Efl.Access.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo index 4763df2710..a8076618a6 100644 --- a/src/lib/elementary/elm_genlist_item.eo +++ b/src/lib/elementary/elm_genlist_item.eo @@ -442,7 +442,7 @@ class Elm.Genlist.Item(Elm.Widget.Item) Elm.Widget.Item.tooltip_unset; Elm.Widget.Item.cursor { set; } Elm.Widget.Item.cursor_unset; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 7107fb898c..5069835a13 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -363,7 +363,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd, efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_ANIMATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION); efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL); } diff --git a/src/lib/elementary/elm_grid.c b/src/lib/elementary/elm_grid.c index 65c96ff461..b8da1a3c6d 100644 --- a/src/lib/elementary/elm_grid.c +++ b/src/lib/elementary/elm_grid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include <Elementary.h> @@ -98,7 +98,7 @@ _elm_grid_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index 8892a0043d..fdd9257a2f 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_LAYOUT_PROTECTED @@ -704,7 +704,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_POPUP_MENU); + efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU); pd->manager = elm_obj_widget_focus_manager_create(obj, obj); diff --git a/src/lib/elementary/elm_icon.c b/src/lib/elementary/elm_icon.c index 0941cd90c0..9ac04585cb 100644 --- a/src/lib/elementary/elm_icon.c +++ b/src/lib/elementary/elm_icon.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -615,7 +615,7 @@ _elm_icon_efl_object_constructor(Eo *obj, Elm_Icon_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index 4ac5040eaf..bc60d6868f 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -544,7 +544,7 @@ _elm_index_item_efl_object_constructor(Eo *obj, Elm_Index_Item_Data *it) { obj = efl_constructor(efl_super(obj, ELM_INDEX_ITEM_CLASS)); it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PUSH_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON); return obj; } @@ -1212,7 +1212,7 @@ _elm_index_efl_object_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_BAR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SCROLL_BAR); return obj; } @@ -1354,8 +1354,8 @@ _elm_index_item_append(Eo *obj, Elm_Index_Data *sd, const char *letter, Evas_Sma if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); } return eo_item; @@ -1376,8 +1376,8 @@ _elm_index_item_prepend(Eo *obj, Elm_Index_Data *sd, const char *letter, Evas_Sm if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); } return eo_item; @@ -1411,8 +1411,8 @@ _elm_index_item_insert_after(Eo *obj, Elm_Index_Data *sd, Elm_Object_Item *after if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); } return eo_item; @@ -1435,8 +1435,8 @@ _elm_index_item_insert_before(Eo *obj, Elm_Index_Data *sd, Elm_Object_Item *befo if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); } return eo_item; @@ -1479,8 +1479,8 @@ _elm_index_item_sorted_insert(Eo *obj, Elm_Index_Data *sd, const char *letter, E if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(obj, eo_item); } return eo_item; @@ -1676,18 +1676,18 @@ _item_action_activate(Eo *obj, const char *params EINA_UNUSED EINA_UNUSED) } EOLIAN static Eina_List* -_elm_index_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Index_Data *data) +_elm_index_efl_access_children_get(Eo *obj, Elm_Index_Data *data) { Eina_List *ret; - ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_INDEX_CLASS)); + ret = efl_access_children_get(efl_super(obj, ELM_INDEX_CLASS)); return eina_list_merge(eina_list_clone(data->items), ret); } EOLIAN static const char* -_elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Index_Item_Data *data) +_elm_index_item_efl_access_name_get(Eo *eo_it, Elm_Index_Item_Data *data) { const char *name; - name = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); + name = efl_access_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS)); if (name) return name; return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter); diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index 1ca5fc66a1..3dce6e8b2c 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -200,7 +200,7 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction, Elm.Widget.theme_apply; Elm.Widget.on_access_update; Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] } - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } } events { changed; [[Called when index changed]] diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo index 2b46519276..8db78b1d2b 100644 --- a/src/lib/elementary/elm_index_item.eo +++ b/src/lib/elementary/elm_index_item.eo @@ -44,7 +44,7 @@ class Elm.Index.Item(Elm.Widget.Item, Elm.Interface.Atspi_Widget_Action) Efl.Object.constructor; Efl.Object.destructor; Elm.Widget.Item.access_register; - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.name { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_interface_atspi_accessible.h b/src/lib/elementary/elm_interface_atspi_accessible.h deleted file mode 100644 index 5116983c22..0000000000 --- a/src/lib/elementary/elm_interface_atspi_accessible.h +++ /dev/null @@ -1,165 +0,0 @@ -#ifndef ELM_INTERFACE_ATSPI_ACCESSIBLE_H -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_H - -#ifdef EFL_BETA_API_SUPPORT - -#ifdef EFL_EO_API_SUPPORT -#include "elm_interface_atspi_accessible.eo.h" -#endif -#ifndef EFL_NOLEGACY_API_SUPPORT -#include "elm_interface_atspi_accessible.eo.legacy.h" -#endif - -/* - * Sets a particilar state type for given state set. - */ -#define STATE_TYPE_SET(state_set, type) (state_set|= (1ULL << type)) - -/** - * Unsets a particilar state type for given state set. - */ -#define STATE_TYPE_UNSET(state_set, type) (state_set &= ~(1ULL << type)) - -/** - * Gets value of a particilar state type for given state set. - */ -#define STATE_TYPE_GET(state_set, type) (state_set & (1ULL << type)) - -/** - * Free Elm_Atspi_Attributes_List - */ -EAPI void elm_atspi_attributes_list_free(Eina_List *list); - -/** - * Frees relation. - */ -EAPI void elm_atspi_relation_free(Elm_Atspi_Relation *relation); - -/** - * Clones relation. - */ -EAPI Elm_Atspi_Relation * elm_atspi_relation_clone(const Elm_Atspi_Relation *relation); - -/** - * Appends relation to relation set - */ -EAPI Eina_Bool elm_atspi_relation_set_relation_append(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj); - -/** - * Removes relation from relation set - */ -EAPI void elm_atspi_relation_set_relation_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type, const Eo *rel_obj); - -/** - * Removes all relation from relation set of a given type - */ -EAPI void elm_atspi_relation_set_relation_type_remove(Elm_Atspi_Relation_Set *set, Elm_Atspi_Relation_Type type); - -/** - * Frees Elm_Atspi_Relation_Set - */ -EAPI void elm_atspi_relation_set_free(Elm_Atspi_Relation_Set set); - -/** - * Clones Elm_Atspi_Relation_Set - */ -EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relation_Set set); - -#ifdef EFL_EO_API_SUPPORT - -/** - * Emits ATSPI 'StateChanged' dbus signal. - */ -#define elm_interface_atspi_accessible_state_changed_signal_emit(obj, tp, nvl) \ - { do { \ - Elm_Atspi_Event_State_Changed_Data evinfo; \ - evinfo.type = (tp); \ - evinfo.new_value = (nvl); \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_STATE_CHANGED, (void*)&evinfo); \ - } while(0); } - -/** - * Emits ATSPI 'BoundsChanged' dbus signal. - */ -#define elm_interface_atspi_accessible_bounds_changed_signal_emit(obj, x, y, width, height) \ - do { \ - Elm_Atspi_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ - } while(0); - -/** - * Emits ATSPI 'PropertyChanged' dbus signal for 'Name' property. - */ -#define elm_interface_atspi_accessible_name_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "name"); - -/** - * Emits ATSPI 'PropertyChanged' dbus signal for 'Description' property. - */ -#define elm_interface_atspi_accessible_description_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "description"); - -/** - * Emits ATSPI 'PropertyChanged' dbus signal for 'Parent' property. - */ -#define elm_interface_atspi_accessible_parent_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "parent"); - -/** - * Emits ATSPI 'PropertyChanged' dbus signal for 'Role' property. - */ -#define elm_interface_atspi_accessible_role_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "role"); - -/** - * Emits ATSPI 'PropertyChanged' dbus signal for 'Value' property. - */ -#define elm_interface_atspi_accessible_value_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_PROPERTY_CHANGED, "value"); - -/** - * Emits ATSPI 'ChildrenChanged' dbus signal with added child as argument. - */ -#define elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, child) \ - do { \ - Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data); \ - } while(0); - -/** - * Emits ATSPI 'ChildrenChanged' dbus signal with deleted child as argument. - */ -#define elm_interface_atspi_accessible_children_changed_del_signal_emit(obj, child) \ - do { \ - Elm_Atspi_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED, &atspi_data); \ - } while(0); - -/** - * Emits ATSPI 'ActiveDescendantChanged' dbus signal. - */ -#define elm_interface_atspi_accessible_active_descendant_changed_signal_emit(obj, child) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ACTIVE_DESCENDANT_CHANGED, child); - -/** - * Emits ATSPI 'VisibleDataChanged' dbus signal. - */ -#define elm_interface_atspi_accessible_visible_data_changed_signal_emit(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_VISIBLE_DATA_CHANGED, NULL); - -/** - * Emits ATSPI 'AddAccessible' dbus signal. - */ -#define elm_interface_atspi_accessible_added(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_ADDED, NULL); - -/** - * Emits ATSPI 'RemoveAccessible' dbus signal. - */ -#define elm_interface_atspi_accessible_removed(obj) \ - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, NULL); - -#endif - -#endif -#endif diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index 09696a4008..b2025b30a2 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -1,4 +1,4 @@ -#include "elm_interface_atspi_accessible.h" +#include "efl_access.h" #include "efl_access_text.h" #include "elm_interface_atspi_widget_action.h" #include "efl_access_window.h" diff --git a/src/lib/elementary/elm_inwin.c b/src/lib/elementary/elm_inwin.c index 6510b03d48..76becb4b75 100644 --- a/src/lib/elementary/elm_inwin.c +++ b/src/lib/elementary/elm_inwin.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -92,7 +92,7 @@ _elm_inwin_efl_object_constructor(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_GLASS_PANE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE); return obj; } diff --git a/src/lib/elementary/elm_label.c b/src/lib/elementary/elm_label.c index 3e5d90540d..cb222bbc4e 100644 --- a/src/lib/elementary/elm_label.c +++ b/src/lib/elementary/elm_label.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_LAYOUT_PROTECTED #include <Elementary.h> @@ -426,7 +426,7 @@ _elm_label_efl_object_constructor(Eo *obj, Elm_Label_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LABEL); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LABEL); return obj; } diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c index d9dea2b1ad..a461c5038f 100644 --- a/src/lib/elementary/elm_list.c +++ b/src/lib/elementary/elm_list.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -1139,7 +1139,7 @@ _elm_list_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (WIDGET(it), ELM_LIST_EVENT_ITEM_FOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } static void @@ -1166,7 +1166,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it) sd->focused_item = NULL; efl_event_callback_legacy_call(obj, ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); } /* @@ -1396,7 +1396,7 @@ call: if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_SELECTED, EINA_TRUE); sd->last_selected_item = eo_it; _elm_list_unwalk(obj, sd); @@ -1466,7 +1466,7 @@ _item_unselect(Elm_List_Item_Data *it) efl_event_callback_legacy_call (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); } _elm_list_unwalk(obj, sd); @@ -2103,33 +2103,33 @@ _elm_list_item_elm_widget_item_focus_get(Eo *eo_it, Elm_List_Item_Data *it) return EINA_FALSE; } -EOLIAN static Elm_Atspi_State_Set -_elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_list_item_efl_access_state_set_get(Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); if (elm_object_item_disabled_get(eo_it)) return ret; - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); sel = elm_obj_list_item_selected_get(eo_it); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); else - STATE_TYPE_UNSET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_UNSET(ret, EFL_ACCESS_STATE_SELECTED); return ret; } EOLIAN static const char* -_elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_List_Item_Data *data) +_elm_list_item_efl_access_name_get(Eo *eo_it, Elm_List_Item_Data *data) { const char *ret; - ret = elm_interface_atspi_accessible_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_it, data->label); } @@ -2256,7 +2256,7 @@ _elm_list_item_efl_object_constructor(Eo *eo_it, Elm_List_Item_Data *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_LIST_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_LIST_ITEM); + efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM); return eo_it; } @@ -2284,8 +2284,8 @@ _item_new(Evas_Object *obj, if (_elm_config->atspi_mode) { - if (it->icon) elm_interface_atspi_accessible_parent_set(it->icon, eo_it); - if (it->end) elm_interface_atspi_accessible_parent_set(it->end, eo_it); + if (it->icon) efl_access_parent_set(it->icon, eo_it); + if (it->end) efl_access_parent_set(it->end, eo_it); } /* access */ @@ -2312,7 +2312,7 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - elm_interface_atspi_accessible_type_set(it->icon, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE); } if (it->end) @@ -2321,12 +2321,12 @@ _item_new(Evas_Object *obj, evas_object_event_callback_add (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb, obj); - elm_interface_atspi_accessible_type_set(it->end, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED); elm_widget_tree_unfocusable_set(it->end, EINA_TRUE); } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_added(eo_it); + efl_access_added(eo_it); return it; } @@ -2391,7 +2391,7 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv) priv->box = elm_box_add(obj); evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0); - elm_interface_atspi_accessible_type_set(priv->box, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED); /* FIXME: change this ugly code path later */ elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL); @@ -2514,7 +2514,7 @@ _elm_list_efl_object_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } @@ -2751,7 +2751,7 @@ _elm_list_item_append(Eo *obj, Elm_List_Data *sd, const char *label, Evas_Object elm_box_pack_end(sd->box, VIEW(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(obj, EO_OBJ(it)); return EO_OBJ(it); } @@ -2768,7 +2768,7 @@ _elm_list_item_prepend(Eo *obj, Elm_List_Data *sd, const char *label, Evas_Objec elm_box_pack_start(sd->box, VIEW(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(obj, EO_OBJ(it)); return EO_OBJ(it); } @@ -2790,7 +2790,7 @@ _elm_list_item_insert_before(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *eo_bef elm_box_pack_before(sd->box, VIEW(it), VIEW(before_it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(obj, EO_OBJ(it)); return EO_OBJ(it); } @@ -2812,7 +2812,7 @@ _elm_list_item_insert_after(Eo *obj, Elm_List_Data *sd, Elm_Object_Item *eo_afte elm_box_pack_after(sd->box, VIEW(it), VIEW(after_it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(obj, EO_OBJ(it)); return EO_OBJ(it); } @@ -2843,7 +2843,7 @@ _elm_list_item_sorted_insert(Eo *obj, Elm_List_Data *sd, const char *label, Evas } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_children_changed_added_signal_emit(obj, EO_OBJ(it)); + efl_access_children_changed_added_signal_emit(obj, EO_OBJ(it)); return EO_OBJ(it); } @@ -2856,9 +2856,9 @@ _elm_list_item_separator_set(Eo *eo_item, Elm_List_Item_Data *it, Eina_Bool sett it->is_separator = !!setting; if (it->is_separator) - elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_SEPARATOR); + efl_access_role_set(eo_item, EFL_ACCESS_ROLE_SEPARATOR); else - elm_interface_atspi_accessible_role_set(eo_item, ELM_ATSPI_ROLE_LIST_ITEM); + efl_access_role_set(eo_item, EFL_ACCESS_ROLE_LIST_ITEM); } EOLIAN static Eina_Bool @@ -3142,10 +3142,10 @@ _elm_list_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, } EOLIAN Eina_List* -_elm_list_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_List_Data *pd) +_elm_list_efl_access_children_get(Eo *obj, Elm_List_Data *pd) { Eina_List *ret; - ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_LIST_CLASS)); + ret = efl_access_children_get(efl_super(obj, ELM_LIST_CLASS)); return eina_list_merge(eina_list_clone(pd->items), ret); } diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index afe83cdd49..e30d036d08 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -445,7 +445,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable, Elm.Interface_Scrollable.item_loop_enabled { get; set; } Elm.Interface_Scrollable.policy { set; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Access.Selection.selected_child_deselect; diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo index d80db9408c..23729d3837 100644 --- a/src/lib/elementary/elm_list_item.eo +++ b/src/lib/elementary/elm_list_item.eo @@ -115,7 +115,7 @@ class Elm.List.Item(Elm.Widget.Item) Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } } } diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c index 9fa8d251ad..c4cbf2304e 100644 --- a/src/lib/elementary/elm_map.c +++ b/src/lib/elementary/elm_map.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -4293,7 +4293,7 @@ _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); return obj; } diff --git a/src/lib/elementary/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c index 45d5caad6f..71adea505e 100644 --- a/src/lib/elementary/elm_mapbuf.c +++ b/src/lib/elementary/elm_mapbuf.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -317,7 +317,7 @@ _elm_mapbuf_efl_object_constructor(Eo *obj, Elm_Mapbuf_Data *sd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE_MAP); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP); return obj; } diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c index d426464c32..771e596125 100644 --- a/src/lib/elementary/elm_menu.c +++ b/src/lib/elementary/elm_menu.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED @@ -128,7 +128,7 @@ _submenu_sizing_eval(Elm_Menu_Item_Data *parent_it) ELM_MENU_ITEM_DATA_GET(eo_item, item); elm_layout_sizing_eval(VIEW(item)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_item, ELM_ATSPI_STATE_SHOWING, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_item, EFL_ACCESS_STATE_SHOWING, EINA_TRUE); } @@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data, if (eo_item2 != EO_OBJ(item)) elm_menu_item_selected_set(eo_item2, 0); } - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); } else { @@ -513,12 +513,12 @@ _menu_item_activate_cb(void *data, elm_menu_item_selected_set(eo_item2, 0); } } - elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); + efl_access_event_emit(EFL_ACCESS_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); if (sd->menu_bar && was_open) _menu_item_select_cb(item, NULL, NULL, NULL); } if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_TRUE); } static void @@ -532,7 +532,7 @@ _menu_item_inactivate_cb(void *data, item->selected = 0; if (item->submenu.open) _submenu_hide(item); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); } static void @@ -580,7 +580,7 @@ static void _item_obj_create(Elm_Menu_Item_Data *item) { VIEW(item) = elm_layout_add(WIDGET(item)); - elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -604,7 +604,7 @@ static void _item_separator_obj_create(Elm_Menu_Item_Data *item) { VIEW(item) = elm_layout_add(WIDGET(item)); - elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED); evas_object_size_hint_weight_set (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -627,9 +627,9 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item) char style[1024]; item->submenu.location = elm_icon_add(sd->bx); - elm_interface_atspi_accessible_type_set(item->submenu.location, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED); item->submenu.hv = hv = elm_hover_add(sd->bx); - elm_interface_atspi_accessible_type_set(item->submenu.hv, ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(hv, EINA_FALSE); elm_hover_target_set(hv, item->submenu.location); elm_hover_parent_set(hv, sd->parent); @@ -695,10 +695,10 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) elm_widget_can_focus_set(obj, EINA_FALSE); priv->location = elm_icon_add(obj); - elm_interface_atspi_accessible_type_set(priv->location, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED); priv->hv = elm_hover_add(obj); - elm_interface_atspi_accessible_type_set(priv->hv, ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->hv, EINA_FALSE); elm_object_style_set(priv->hv, "menu/default"); @@ -706,7 +706,7 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv) (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj); priv->bx = elm_box_add(obj); - elm_interface_atspi_accessible_type_set(priv->bx, ELM_ATSPI_TYPE_SKIPPED); + efl_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED); efl_ui_mirrored_set(priv->bx, EINA_FALSE); evas_object_size_hint_weight_set (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -829,7 +829,7 @@ _elm_menu_efl_object_constructor(Eo *obj, Elm_Menu_Data *sd) efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); parent = efl_parent_get(obj); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_MENU); + efl_access_role_set(obj, EFL_ACCESS_ROLE_MENU); elm_menu_parent_set(obj, parent); elm_hover_target_set(sd->hv, sd->location); @@ -1115,7 +1115,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch Evas_Object *icon_obj; icon_obj = elm_icon_add(obj); - elm_interface_atspi_accessible_type_set(icon_obj, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED); if (!icon_obj) return NULL; eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj); @@ -1151,8 +1151,8 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch } if (_elm_config->atspi_mode) { - elm_interface_atspi_accessible_added(eo_item); - elm_interface_atspi_accessible_children_changed_added_signal_emit(parent ? parent : obj, eo_item); + efl_access_added(eo_item); + efl_access_children_changed_added_signal_emit(parent ? parent : obj, eo_item); } return eo_item; @@ -1380,50 +1380,50 @@ _elm_menu_class_constructor(Efl_Class *klass) } EOLIAN static Eina_List* -_elm_menu_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_Menu_Data *sd) +_elm_menu_efl_access_children_get(Eo *obj, Elm_Menu_Data *sd) { Eina_List *ret; - ret = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_MENU_CLASS)); + ret = efl_access_children_get(efl_super(obj, ELM_MENU_CLASS)); return eina_list_merge(eina_list_clone(sd->items), ret); } EOLIAN static Eina_List* -_elm_menu_item_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { return eina_list_clone(sd->submenu.items); } -EOLIAN static Elm_Interface_Atspi_Accessible* -_elm_menu_item_elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +EOLIAN static Efl_Access* +_elm_menu_item_efl_access_parent_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { return sd->parent ? EO_OBJ(sd->parent) : WIDGET(sd); } -EOLIAN static Elm_Atspi_Role -_elm_menu_item_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +EOLIAN static Efl_Access_Role +_elm_menu_item_efl_access_role_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { - return sd->submenu.items ? ELM_ATSPI_ROLE_MENU : ELM_ATSPI_ROLE_MENU_ITEM; + return sd->submenu.items ? EFL_ACCESS_ROLE_MENU : EFL_ACCESS_ROLE_MENU_ITEM; } EOLIAN static const char* -_elm_menu_item_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Menu_Item_Data *sd) +_elm_menu_item_efl_access_name_get(Eo *obj, Elm_Menu_Item_Data *sd) { const char *ret; - ret = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); if (ret) return ret; return sd->label; } -EOLIAN static Elm_Atspi_State_Set -_elm_menu_item_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) +EOLIAN static Efl_Access_State_Set +_elm_menu_item_efl_access_state_set_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd) { - Elm_Atspi_State_Set ret; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); + Efl_Access_State_Set ret; + ret = efl_access_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS)); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); if (sd->selected) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); return ret; } diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index 094b12954b..322557c910 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -61,7 +61,7 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu, Elm.Widget.theme_apply; Efl.Ui.Translatable.translation_update; Elm.Widget.focus_manager_create; - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Ui.Menu.selected_item { get; } diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo index 6a3dc0dad7..249b0f04c1 100644 --- a/src/lib/elementary/elm_menu_item.eo +++ b/src/lib/elementary/elm_menu_item.eo @@ -63,11 +63,11 @@ class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection, Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } - Elm.Interface.Atspi_Accessible.children { get; } - Elm.Interface.Atspi_Accessible.parent { get; } - Elm.Interface.Atspi_Accessible.role { get; } - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.children { get; } + Efl.Access.parent { get; } + Efl.Access.role { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Ui.Item.selected { get; set; } diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index 88a7c54549..b37048f6d4 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -183,7 +183,7 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable) Elm.Widget.on_focus_update; Efl.Ui.Translatable.translation_update; Elm.Widget.widget_event; - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo index aee3d4f067..a3875a9a47 100644 --- a/src/lib/elementary/elm_multibuttonentry_item.eo +++ b/src/lib/elementary/elm_multibuttonentry_item.eo @@ -30,8 +30,8 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item, Elm.Widget.Item.signal_emit; Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.disable; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } } diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo index 292f742884..6e372e7dce 100644 --- a/src/lib/elementary/elm_naviframe_item.eo +++ b/src/lib/elementary/elm_naviframe_item.eo @@ -82,6 +82,6 @@ class Elm.Naviframe.Item(Elm.Widget.Item) Elm.Widget.Item.part_text { get; set; } Elm.Widget.Item.part_content { get; set; } Elm.Widget.Item.part_content_unset; - Elm.Interface.Atspi_Accessible.children { get; } + Efl.Access.children { get; } } } diff --git a/src/lib/elementary/elm_notify.c b/src/lib/elementary/elm_notify.c index b5effa6882..82d1725018 100644 --- a/src/lib/elementary/elm_notify.c +++ b/src/lib/elementary/elm_notify.c @@ -3,7 +3,7 @@ #endif #define ELM_WIDGET_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -479,7 +479,7 @@ _elm_notify_efl_object_constructor(Eo *obj, Elm_Notify_Data *sd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_NOTIFICATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_NOTIFICATION); return obj; } diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c index 573c3b1c65..c2fe4dc0dd 100644 --- a/src/lib/elementary/elm_panel.c +++ b/src/lib/elementary/elm_panel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_LAYER_PROTECTED @@ -969,7 +969,7 @@ _elm_panel_efl_object_constructor(Eo *obj, Elm_Panel_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_PANEL); + efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL); efl_ui_focus_layer_behaviour_set(obj, EINA_FALSE, EINA_FALSE); diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c index d45f38ccc8..3fc4cf0398 100644 --- a/src/lib/elementary/elm_photo.c +++ b/src/lib/elementary/elm_photo.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -306,7 +306,7 @@ _elm_photo_efl_object_constructor(Eo *obj, Elm_Photo_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/elm_plug.c b/src/lib/elementary/elm_plug.c index 2d36a4e653..9855f510f3 100644 --- a/src/lib/elementary/elm_plug.c +++ b/src/lib/elementary/elm_plug.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -145,7 +145,7 @@ _elm_plug_efl_object_constructor(Eo *obj, void *sd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); return obj; } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 4db45e2e52..00a56c14c9 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -176,7 +176,7 @@ class Elm.Popup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface.Atspi_Widget_A Elm.Widget.widget_event; Efl.Canvas.Layout_Signal.signal_emit; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } Efl.Part.part; } events { diff --git a/src/lib/elementary/elm_prefs.c b/src/lib/elementary/elm_prefs.c index 8296824c44..f5bb2898cd 100644 --- a/src/lib/elementary/elm_prefs.c +++ b/src/lib/elementary/elm_prefs.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -492,7 +492,7 @@ _elm_prefs_efl_object_constructor(Eo *obj, Elm_Prefs_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_prefs_smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_REDUNDANT_OBJECT); + efl_access_role_set(obj, EFL_ACCESS_ROLE_REDUNDANT_OBJECT); return obj; } diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 03051baa3f..f3168bbea3 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -549,7 +549,7 @@ void _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor void _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, Eo *obj); void _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, Eo *obj); -void _elm_interface_atspi_shutdown(void); +void _efl_access_shutdown(void); /* Combobox: no proper support for Efl.Part API yet. */ void _elm_combobox_part_text_set(Eo *obj, const char * part, const char *label); diff --git a/src/lib/elementary/elm_scroller.c b/src/lib/elementary/elm_scroller.c index 1e4f4064b0..89bdb3bf14 100644 --- a/src/lib/elementary/elm_scroller.c +++ b/src/lib/elementary/elm_scroller.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> @@ -857,7 +857,7 @@ _elm_scroller_efl_object_constructor(Eo *obj, Elm_Scroller_Data *_pd EINA_UNUSED obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SCROLL_PANE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SCROLL_PANE); return obj; } diff --git a/src/lib/elementary/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c index 08c4baf761..56a58f1179 100644 --- a/src/lib/elementary/elm_segment_control.c +++ b/src/lib/elementary/elm_segment_control.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -682,7 +682,7 @@ _elm_segment_control_efl_object_constructor(Eo *obj, Elm_Segment_Control_Data *s efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_LIST); + efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST); return obj; } diff --git a/src/lib/elementary/elm_separator.c b/src/lib/elementary/elm_separator.c index 9f50a6f9cb..4af76fc476 100644 --- a/src/lib/elementary/elm_separator.c +++ b/src/lib/elementary/elm_separator.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -71,7 +71,7 @@ _elm_separator_efl_object_constructor(Eo *obj, Elm_Separator_Data *sd EINA_UNUSE { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SEPARATOR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SEPARATOR); return obj; } diff --git a/src/lib/elementary/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c index 932c740b68..af57fa505c 100644 --- a/src/lib/elementary/elm_slideshow.c +++ b/src/lib/elementary/elm_slideshow.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -376,7 +376,7 @@ _elm_slideshow_efl_object_constructor(Eo *obj, Elm_Slideshow_Data *_pd EINA_UNUS obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); + efl_access_role_set(obj, EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); return obj; } diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c index d70a2251f0..4087de35b5 100644 --- a/src/lib/elementary/elm_spinner.c +++ b/src/lib/elementary/elm_spinner.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED @@ -220,7 +220,7 @@ apply: else elm_layout_text_set(obj, "elm.text", buf); - elm_interface_atspi_accessible_name_changed_signal_emit(obj); + efl_access_name_changed_signal_emit(obj); if (sd->entry_visible) _entry_show(sd); } @@ -269,7 +269,7 @@ _value_set(Evas_Object *obj, efl_event_callback_legacy_call(obj, ELM_SPINNER_EVENT_MAX_REACHED, NULL); efl_event_callback_legacy_call(obj, ELM_SPINNER_EVENT_CHANGED, NULL); - elm_interface_atspi_accessible_value_changed_signal_emit(obj); + efl_access_value_changed_signal_emit(obj); ecore_timer_del(sd->delay_change_timer); sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME, _delay_change_timer_cb, obj); @@ -1409,7 +1409,7 @@ _elm_spinner_efl_object_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_SPIN_BUTTON); + efl_access_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON); return obj; } @@ -1690,10 +1690,10 @@ _elm_spinner_efl_access_value_increment_get(Eo *obj EINA_UNUSED, Elm_Spinner_Dat } EOLIAN static const char* -_elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED) +_elm_spinner_efl_access_name_get(Eo *obj, Elm_Spinner_Data *sd EINA_UNUSED) { const char *name; - name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_SPINNER_CLASS)); + name = efl_access_name_get(efl_super(obj, ELM_SPINNER_CLASS)); if (name) return name; const char *ret = elm_layout_text_get(obj, "elm.text"); return ret; diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index 1145b50015..53192c146b 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -154,7 +154,7 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Spin.step { get; set; } Efl.Ui.Spin.value { get; set; } Efl.Ui.Spin.interval { get; set; } - Elm.Interface.Atspi_Accessible.name { get; } + Efl.Access.name { get; } Efl.Access.Value.value_and_text { get; set; } Efl.Access.Value.range { get; } Efl.Access.Value.increment { get; } diff --git a/src/lib/elementary/elm_table.c b/src/lib/elementary/elm_table.c index bee56656f7..55527574ad 100644 --- a/src/lib/elementary/elm_table.c +++ b/src/lib/elementary/elm_table.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED #include <Elementary.h> @@ -137,7 +137,7 @@ _elm_table_efl_object_constructor(Eo *obj, void *_pd EINA_UNUSED) { obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_FILLER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER); return obj; } diff --git a/src/lib/elementary/elm_thumb.c b/src/lib/elementary/elm_thumb.c index 9a0484f899..68202c64cf 100644 --- a/src/lib/elementary/elm_thumb.c +++ b/src/lib/elementary/elm_thumb.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -588,7 +588,7 @@ _elm_thumb_efl_object_constructor(Eo *obj, Elm_Thumb_Data *sd) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, "Elm_Thumb"); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_IMAGE); + efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE); sd->obj = obj; diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 8c69e640a7..1597c4d916 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -3,7 +3,7 @@ #endif #define EFL_UI_FOCUS_COMPOSITION_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -161,7 +161,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item) elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); efl_event_callback_legacy_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); + efl_access_state_changed_signal_emit(EO_OBJ(item), EFL_ACCESS_STATE_SELECTED, EINA_FALSE); } static void @@ -638,7 +638,7 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (obj, ELM_TOOLBAR_EVENT_ITEM_FOCUSED, EO_OBJ(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } static void @@ -665,7 +665,7 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it) efl_event_callback_legacy_call (obj, ELM_TOOLBAR_EVENT_ITEM_UNFOCUSED, eo_it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); + efl_access_state_changed_signal_emit(eo_it, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); } /* @@ -1075,7 +1075,7 @@ _item_select(Elm_Toolbar_Item_Data *it) } efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it)); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE); + efl_access_state_changed_signal_emit(EO_OBJ(it), EFL_ACCESS_STATE_SELECTED, EINA_TRUE); } /* Send order signals when item is added/deleted. @@ -2364,7 +2364,7 @@ _elm_toolbar_item_efl_object_constructor(Eo *eo_it, Elm_Toolbar_Item_Data *it) { eo_it = efl_constructor(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS); - elm_interface_atspi_accessible_role_set(eo_it, ELM_ATSPI_ROLE_MENU_ITEM); + efl_access_role_set(eo_it, EFL_ACCESS_ROLE_MENU_ITEM); return eo_it; } @@ -2397,12 +2397,12 @@ _item_new(Evas_Object *obj, VIEW(it) = elm_layout_add(obj); elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE); evas_object_data_set(VIEW(it), "item", it); - elm_interface_atspi_accessible_type_set(VIEW(it), ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(VIEW(it), EFL_ACCESS_TYPE_DISABLED); icon_obj = elm_icon_add(VIEW(it)); if (_elm_config->atspi_mode) - if (icon_obj) elm_interface_atspi_accessible_parent_set(icon_obj, eo_it); + if (icon_obj) efl_access_parent_set(icon_obj, eo_it); if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) _access_widget_item_register(it); @@ -2471,7 +2471,7 @@ _item_new(Evas_Object *obj, _item_select(it); if (_elm_config->atspi_mode) - elm_interface_atspi_accessible_added(eo_it); + efl_access_added(eo_it); return it; } @@ -2785,7 +2785,7 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv) else elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm"); - elm_interface_atspi_accessible_type_set(priv->more, ELM_ATSPI_TYPE_DISABLED); + efl_access_type_set(priv->more, EFL_ACCESS_TYPE_DISABLED); elm_widget_sub_object_add(obj, priv->more); evas_object_show(priv->more); @@ -2964,7 +2964,7 @@ _elm_toolbar_efl_object_constructor(Eo *obj, Elm_Toolbar_Data *_pd EINA_UNUSED) obj = efl_constructor(efl_super(obj, MY_CLASS)); efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_TOOL_BAR); + efl_access_role_set(obj, EFL_ACCESS_ROLE_TOOL_BAR); efl_ui_focus_composition_custom_manager_set(obj, obj); @@ -3872,28 +3872,28 @@ _elm_toolbar_item_bring_in(Eo *eo_item EINA_UNUSED, Elm_Toolbar_Item_Data *item, } EOLIAN static const char* -_elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item) +_elm_toolbar_item_efl_access_name_get(Eo *eo_item, Elm_Toolbar_Item_Data *item) { const char *ret; - ret = elm_interface_atspi_accessible_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); + ret = efl_access_name_get(efl_super(eo_item, ELM_TOOLBAR_ITEM_CLASS)); if (ret) return ret; return _elm_widget_item_accessible_plain_name_get(eo_item, item->label); } -EOLIAN static Elm_Atspi_State_Set -_elm_toolbar_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_Toolbar_Item_Data *item EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_toolbar_item_efl_access_state_set_get(Eo *eo_it, Elm_Toolbar_Item_Data *item EINA_UNUSED) { - Elm_Atspi_State_Set ret; + Efl_Access_State_Set ret; Eina_Bool sel; - ret = elm_interface_atspi_accessible_state_set_get(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); + ret = efl_access_state_set_get(efl_super(eo_it, ELM_TOOLBAR_ITEM_CLASS)); sel = efl_ui_item_selected_get(eo_it); - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTABLE); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE); if (sel) - STATE_TYPE_SET(ret, ELM_ATSPI_STATE_SELECTED); + STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTED); return ret; } @@ -3921,11 +3921,11 @@ _elm_toolbar_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UNUS } EOLIAN static Eina_List* -_elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) +_elm_toolbar_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd) { Eina_List *ret = NULL, *ret2 = NULL; Elm_Toolbar_Item_Data *it; - ret2 = elm_interface_atspi_accessible_children_get(efl_super(obj, ELM_TOOLBAR_CLASS)); + ret2 = efl_access_children_get(efl_super(obj, ELM_TOOLBAR_CLASS)); EINA_INLIST_FOREACH(sd->items, it) ret = eina_list_append(ret, EO_OBJ(it)); @@ -3933,10 +3933,10 @@ _elm_toolbar_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, El return eina_list_merge(ret, ret2); } -EOLIAN static Elm_Atspi_State_Set -_elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_toolbar_efl_access_state_set_get(Eo *obj, Elm_Toolbar_Data *sd EINA_UNUSED) { - return elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_TOOLBAR_CLASS)); + return efl_access_state_set_get(efl_super(obj, ELM_TOOLBAR_CLASS)); } EOLIAN int diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index c194043b1e..cec74dcbcc 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -330,8 +330,8 @@ class Elm.Toolbar (Elm.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollabl Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] } Elm.Widget.focus_state_apply; Elm.Interface.Atspi_Widget_Action.elm_actions { get; } - Elm.Interface.Atspi_Accessible.children { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.children { get; } + Efl.Access.state_set { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Access.Selection.selected_child_deselect; diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo index c6d3ff159c..a9af54ee0d 100644 --- a/src/lib/elementary/elm_toolbar_item.eo +++ b/src/lib/elementary/elm_toolbar_item.eo @@ -274,8 +274,8 @@ class Elm.Toolbar.Item(Elm.Widget.Item, Efl.Ui.Item, Efl.Ui.Focus.Object) Elm.Widget.Item.part_content_unset; Efl.Ui.Focus.Object.focus_geometry { get; } Efl.Ui.Focus.Object.focus { set; } - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } Efl.Ui.Item.selected { get; set; } Efl.Ui.Item.prev { get; } Efl.Ui.Item.next { get; } diff --git a/src/lib/elementary/elm_web2.c b/src/lib/elementary/elm_web2.c index 8f6688d2dd..e1174976fa 100644 --- a/src/lib/elementary/elm_web2.c +++ b/src/lib/elementary/elm_web2.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> @@ -98,7 +98,7 @@ _elm_web_efl_object_constructor(Eo *obj, Elm_Web_Data *sd) sd->obj = obj; efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY); evas_object_smart_callbacks_descriptions_set(obj, _elm_web_smart_callbacks); - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_HTML_CONTAINER); + efl_access_role_set(obj, EFL_ACCESS_ROLE_HTML_CONTAINER); return obj; } diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index fcc71abfeb..66995c9a93 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED @@ -875,13 +875,13 @@ _elm_widget_efl_gfx_visible_set(Eo *obj, Elm_Widget_Smart_Data *pd, Eina_Bool vi if (vis) { - elm_interface_atspi_accessible_added(obj); + efl_access_added(obj); if (_elm_widget_onscreen_is(obj)) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_SHOWING, EINA_TRUE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_SHOWING, EINA_TRUE); } else { - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_SHOWING, EINA_FALSE); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_SHOWING, EINA_FALSE); } } @@ -1491,10 +1491,10 @@ _elm_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec evas_object_size_hint_display_mode_get(obj)); if (_elm_config->atspi_mode && !sd->on_create) { - Elm_Interface_Atspi_Accessible *aparent; - aparent = elm_interface_atspi_accessible_parent_get(sobj); + Efl_Access *aparent; + aparent = efl_access_parent_get(sobj); if (aparent) - elm_interface_atspi_accessible_children_changed_added_signal_emit(aparent, sobj); + efl_access_children_changed_added_signal_emit(aparent, sobj); } } @@ -1569,10 +1569,10 @@ _elm_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Objec } if (_elm_config->atspi_mode && !sd->on_destroy) { - Elm_Interface_Atspi_Accessible *aparent; - aparent = elm_interface_atspi_accessible_parent_get(sobj); + Efl_Access *aparent; + aparent = efl_access_parent_get(sobj); if (aparent) - elm_interface_atspi_accessible_children_changed_del_signal_emit(aparent, sobj); + efl_access_children_changed_del_signal_emit(aparent, sobj); } ELM_WIDGET_DATA_GET(sobj, sdc); @@ -3841,7 +3841,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item) } eina_hash_free(item->labels); - elm_interface_atspi_accessible_removed(eo_item); + efl_access_removed(eo_item); EINA_MAGIC_SET(item, EINA_MAGIC_NONE); @@ -4052,24 +4052,24 @@ _elm_widget_item_accessible_plain_name_get(Elm_Object_Item *item, const char* na return id->accessible_name; } -EOLIAN static Elm_Atspi_State_Set -_elm_widget_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_item, +EOLIAN static Efl_Access_State_Set +_elm_widget_item_efl_access_state_set_get(Eo *eo_item, Elm_Widget_Item_Data *item EINA_UNUSED) { - Elm_Atspi_State_Set states = 0; + Efl_Access_State_Set states = 0; - STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSABLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSABLE); if (elm_object_item_focus_get(eo_item)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSED); if (!elm_object_item_disabled_get(eo_item)) { - STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED); - STATE_TYPE_SET(states, ELM_ATSPI_STATE_SENSITIVE); - STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_ENABLED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_SENSITIVE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_VISIBLE); } if (_elm_widget_item_onscreen_is(eo_item)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_SHOWING); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_SHOWING); return states; } @@ -5119,7 +5119,7 @@ _elm_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UNUSE elm_obj_widget_parent_set(obj, parent); sd->on_create = EINA_FALSE; - elm_interface_atspi_accessible_role_set(obj, ELM_ATSPI_ROLE_UNKNOWN); + efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); return obj; } @@ -5146,7 +5146,7 @@ _elm_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd) sd->manager.provider = NULL; } - elm_interface_atspi_accessible_removed(obj); + efl_access_removed(obj); if (sd->logical.parent) { efl_weak_unref(&sd->logical.parent); @@ -5193,7 +5193,7 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item efl_event_callback_legacy_call(obj, desc, NULL); if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) - elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, focused); + efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, focused); return EINA_TRUE; } @@ -5239,10 +5239,10 @@ _elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd E } EOLIAN static const char* -_elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) +_elm_widget_efl_access_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED) { const char *ret, *name; - name = elm_interface_atspi_accessible_name_get(efl_super(obj, ELM_WIDGET_CLASS)); + name = efl_access_name_get(efl_super(obj, ELM_WIDGET_CLASS)); if (name) return name; @@ -5253,22 +5253,22 @@ _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Widget_Smart_Da } EOLIAN static Eina_List* -_elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) +_elm_widget_efl_access_children_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd) { Eina_List *l, *accs = NULL; Evas_Object *widget; - Elm_Atspi_Type type; + Efl_Access_Type type; EINA_LIST_FOREACH(pd->subobjs, l, widget) { if (!elm_object_widget_check(widget)) continue; - if (!efl_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) continue; - type = elm_interface_atspi_accessible_type_get(widget); - if (type == ELM_ATSPI_TYPE_DISABLED) continue; - if (type == ELM_ATSPI_TYPE_SKIPPED) + if (!efl_isa(widget, EFL_ACCESS_MIXIN)) continue; + type = efl_access_type_get(widget); + if (type == EFL_ACCESS_TYPE_DISABLED) continue; + if (type == EFL_ACCESS_TYPE_SKIPPED) { Eina_List *children; - children = elm_interface_atspi_accessible_children_get(widget); + children = efl_access_children_get(widget); accs = eina_list_merge(accs, children); continue; } @@ -5278,54 +5278,54 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm } EOLIAN static Eo* -_elm_widget_elm_interface_atspi_accessible_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_elm_widget_efl_access_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { - Elm_Atspi_Type type; - Elm_Interface_Atspi_Accessible *parent = obj; + Efl_Access_Type type; + Efl_Access *parent = obj; do { ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd, NULL); parent = wd->parent_obj; - type = elm_interface_atspi_accessible_type_get(parent); - } while (parent && (type == ELM_ATSPI_TYPE_SKIPPED)); + type = efl_access_type_get(parent); + } while (parent && (type == EFL_ACCESS_TYPE_SKIPPED)); - return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL; + return efl_isa(parent, EFL_ACCESS_MIXIN) ? parent : NULL; } -EOLIAN static Elm_Atspi_State_Set -_elm_widget_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +EOLIAN static Efl_Access_State_Set +_elm_widget_efl_access_state_set_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { - Elm_Atspi_State_Set states = 0; + Efl_Access_State_Set states = 0; - states = elm_interface_atspi_accessible_state_set_get(efl_super(obj, ELM_WIDGET_CLASS)); + states = efl_access_state_set_get(efl_super(obj, ELM_WIDGET_CLASS)); if (evas_object_visible_get(obj)) { - STATE_TYPE_SET(states, ELM_ATSPI_STATE_VISIBLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_VISIBLE); if (_elm_widget_onscreen_is(obj)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_SHOWING); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_SHOWING); } if (!elm_widget_child_can_focus_get(obj)) { if (elm_object_focus_allow_get(obj)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSABLE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSABLE); if (elm_object_focus_get(obj)) - STATE_TYPE_SET(states, ELM_ATSPI_STATE_FOCUSED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_FOCUSED); } if (!elm_object_disabled_get(obj)) { - STATE_TYPE_SET(states, ELM_ATSPI_STATE_ENABLED); - STATE_TYPE_SET(states, ELM_ATSPI_STATE_SENSITIVE); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_ENABLED); + STATE_TYPE_SET(states, EFL_ACCESS_STATE_SENSITIVE); } return states; } EOLIAN static Eina_List* -_elm_widget_elm_interface_atspi_accessible_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_elm_widget_efl_access_attributes_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { Eina_List *ret = NULL; - Elm_Atspi_Attribute *attr = calloc(1, sizeof(Elm_Atspi_Attribute)); + Efl_Access_Attribute *attr = calloc(1, sizeof(Efl_Access_Attribute)); if (!attr) return NULL; attr->key = eina_stringshare_add("type"); diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 74b0a4f73d..aa05194238 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -17,7 +17,7 @@ struct Elm.Widget.Focus_State { logical : bool; [[$true if this is registered as logical currently]] } -abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, +abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part, Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable) @@ -636,11 +636,11 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_member_del; Efl.Canvas.Group.group_member_add; - Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Accessible.children { get; } - Elm.Interface.Atspi_Accessible.parent { get; } - Elm.Interface.Atspi_Accessible.attributes { get; } + Efl.Access.name { get; } + Efl.Access.state_set { get; } + Efl.Access.children { get; } + Efl.Access.parent { get; } + Efl.Access.attributes { get; } Efl.Access.Component.focus_grab; Efl.Ui.Focus.User.manager { get; } Efl.Ui.Focus.User.parent { get; } diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index 081aba042b..b7ad3c33be 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -4,7 +4,7 @@ import efl_ui; type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]] type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]] -class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible, +class Elm.Widget.Item(Efl.Object, Efl.Access, Efl.Access.Component) { [[Elementary widget item class]] @@ -540,7 +540,7 @@ class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible, implements { Efl.Object.constructor; Efl.Object.destructor; - Elm.Interface.Atspi_Accessible.state_set { get; } + Efl.Access.state_set { get; } Efl.Access.Component.extents { get; set; } Efl.Access.Component.alpha { get; } Efl.Access.Component.layer { get; } diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c index a6d7137fb0..ef5f849d8f 100644 --- a/src/tests/elementary/elm_test_actionslider.c +++ b/src/tests/elementary/elm_test_actionslider.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *actionslider; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); actionslider = elm_actionslider_add(win); - role = elm_interface_atspi_accessible_role_get(actionslider); + role = efl_access_role_get(actionslider); - ck_assert(role == ELM_ATSPI_ROLE_SLIDER); + ck_assert(role == EFL_ACCESS_ROLE_SLIDER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c index 8f9e043870..1875fb24fc 100644 --- a/src/tests/elementary/elm_test_atspi.c +++ b/src/tests/elementary/elm_test_atspi.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERNAL_API_ARGESFSDFEFC -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_priv.h" @@ -25,7 +25,7 @@ void generate_app(void) evas_object_show(g_win); } -START_TEST (elm_atspi_app_obj_name_get) +START_TEST (test_efl_access_app_obj_name_get) { elm_init(0, NULL); @@ -37,7 +37,7 @@ START_TEST (elm_atspi_app_obj_name_get) elm_app_name_set("Test name"); - ret = elm_interface_atspi_accessible_name_get(root); + ret = efl_access_name_get(root); ck_assert_str_eq(ret, "Test name"); @@ -46,14 +46,14 @@ START_TEST (elm_atspi_app_obj_name_get) } END_TEST -START_TEST (elm_atspi_name_get) +START_TEST (test_efl_access_name_get) { elm_init(0, NULL); generate_app(); const char *name; - name = elm_interface_atspi_accessible_name_get(g_btn); + name = efl_access_name_get(g_btn); if (name && name[0]) { ck_assert(0); @@ -62,7 +62,7 @@ START_TEST (elm_atspi_name_get) // Set name with additional text tags elm_object_text_set(g_btn, "Some<br>text"); - name = elm_interface_atspi_accessible_name_get(g_btn); + name = efl_access_name_get(g_btn); // Accessible name should have cleared tags ck_assert(name != NULL); @@ -72,7 +72,7 @@ START_TEST (elm_atspi_name_get) } END_TEST -START_TEST (elm_atspi_name_set) +START_TEST (test_efl_access_name_set) { elm_init(0, NULL); generate_app(); @@ -80,15 +80,15 @@ START_TEST (elm_atspi_name_set) const char *name; elm_object_text_set(g_btn, "Other text"); - elm_interface_atspi_accessible_name_set(g_btn, "Test name"); + efl_access_name_set(g_btn, "Test name"); - name = elm_interface_atspi_accessible_name_get(g_btn); + name = efl_access_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Test name"); - elm_interface_atspi_accessible_name_set(g_btn, NULL); - name = elm_interface_atspi_accessible_name_get(g_btn); + efl_access_name_set(g_btn, NULL); + name = efl_access_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Other text"); @@ -97,48 +97,46 @@ START_TEST (elm_atspi_name_set) } END_TEST -START_TEST (elm_atspi_role_get) +START_TEST (test_efl_access_role_get) { elm_init(0, NULL); Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); - Elm_Atspi_Role role; + Efl_Access_Role role; - role = elm_interface_atspi_accessible_role_get(root); + role = efl_access_role_get(root); - ck_assert(role == ELM_ATSPI_ROLE_APPLICATION); + ck_assert(role == EFL_ACCESS_ROLE_APPLICATION); efl_unref(root); elm_shutdown(); } END_TEST -START_TEST (elm_atspi_role_set) +START_TEST (test_efl_access_role_set) { elm_init(0, NULL); generate_app(); - Elm_Atspi_Role role; + Efl_Access_Role role; - elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ACCELERATOR_LABEL); - role = elm_interface_atspi_accessible_role_get(g_btn); + efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL); + role = efl_access_role_get(g_btn); - if (role != ELM_ATSPI_ROLE_ACCELERATOR_LABEL) + if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL) ck_assert(0); - elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ENTRY); - role = elm_interface_atspi_accessible_role_get(g_btn); + efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY); + role = efl_access_role_get(g_btn); - if (role != ELM_ATSPI_ROLE_ENTRY) + if (role != EFL_ACCESS_ROLE_ENTRY) ck_assert(0); elm_shutdown(); } END_TEST - - -START_TEST (elm_atspi_role_name_get) +START_TEST (test_efl_access_role_name_get) { elm_init(0, NULL); @@ -146,7 +144,7 @@ START_TEST (elm_atspi_role_name_get) const char *ret = NULL; - ret = elm_interface_atspi_accessible_role_name_get(root); + ret = efl_access_role_name_get(root); ck_assert(ret != NULL); @@ -155,7 +153,7 @@ START_TEST (elm_atspi_role_name_get) } END_TEST -START_TEST (elm_atspi_localized_role_name_get) +START_TEST (test_efl_access_localized_role_name_get) { elm_init(0, NULL); @@ -163,7 +161,7 @@ START_TEST (elm_atspi_localized_role_name_get) const char *ret = NULL; - ret = elm_interface_atspi_accessible_localized_role_name_get(root); + ret = efl_access_localized_role_name_get(root); ck_assert(ret != NULL); @@ -172,7 +170,7 @@ START_TEST (elm_atspi_localized_role_name_get) } END_TEST -START_TEST (elm_atspi_description_set) +START_TEST (test_efl_access_description_set) { elm_init(0, NULL); @@ -182,18 +180,18 @@ START_TEST (elm_atspi_description_set) const char *desc = "Test description"; - ret = elm_interface_atspi_accessible_description_get(root); + ret = efl_access_description_get(root); ck_assert(ret == NULL); - elm_interface_atspi_accessible_description_set(root, desc); - ret = elm_interface_atspi_accessible_description_get(root); + efl_access_description_set(root, desc); + ret = efl_access_description_get(root); ck_assert(ret != NULL); ck_assert_str_eq(ret, "Test description"); - elm_interface_atspi_accessible_description_set(root, NULL); - ret = elm_interface_atspi_accessible_description_get(root); + efl_access_description_set(root, NULL); + ret = efl_access_description_get(root); ck_assert(ret == NULL); @@ -203,13 +201,13 @@ START_TEST (elm_atspi_description_set) END_TEST /* Test if initial description value is NULL */ -START_TEST (elm_atspi_description_get) +START_TEST (test_efl_access_description_get) { elm_init(0, NULL); generate_app(); const char *descr; - descr = elm_interface_atspi_accessible_description_get(g_bg); + descr = efl_access_description_get(g_bg); ck_assert(descr == NULL); @@ -217,7 +215,7 @@ START_TEST (elm_atspi_description_get) } END_TEST -START_TEST (elm_atspi_children_and_parent) +START_TEST (test_efl_access_children_and_parent) { elm_init(0, NULL); @@ -226,9 +224,9 @@ START_TEST (elm_atspi_children_and_parent) Eina_List *child_list = NULL; - child_list = elm_interface_atspi_accessible_children_get(root); + child_list = efl_access_children_get(root); - //bg_child_list = elm_interface_atspi_accessible_children_get(eina_list_nth(child_list, 0)); + //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0)); ck_assert(eina_list_count(child_list) == 1); @@ -244,7 +242,7 @@ START_TEST (elm_atspi_children_and_parent) } END_TEST -START_TEST (elm_atspi_children_and_parent2) +START_TEST (test_efl_access_children_and_parent2) { elm_init(0, NULL); @@ -254,11 +252,11 @@ START_TEST (elm_atspi_children_and_parent2) Eo *win = NULL; Eina_List *root_children; - root_children = elm_interface_atspi_accessible_children_get(root); + root_children = efl_access_children_get(root); win = eina_list_nth(root_children, 0); Eina_List *win_children; - win_children = elm_interface_atspi_accessible_children_get(win); + win_children = efl_access_children_get(win); ck_assert(eina_list_count(win_children) == 1); @@ -274,14 +272,14 @@ START_TEST (elm_atspi_children_and_parent2) END_TEST /* Initial value of translation domain should be NULL */ -START_TEST (elm_atspi_translation_domain_get) +START_TEST (test_efl_access_translation_domain_get) { elm_init(0, NULL); generate_app(); const char *domain; - domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); + domain = efl_access_translation_domain_get(g_btn); ck_assert(domain == NULL); @@ -289,21 +287,21 @@ START_TEST (elm_atspi_translation_domain_get) } END_TEST -START_TEST (elm_atspi_translation_domain_set) +START_TEST (test_efl_access_translation_domain_set) { elm_init(0, NULL); generate_app(); const char *domain; - elm_interface_atspi_accessible_translation_domain_set(g_btn, "Test translation_domain"); - domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); + efl_access_translation_domain_set(g_btn, "Test translation_domain"); + domain = efl_access_translation_domain_get(g_btn); ck_assert(domain != NULL); ck_assert_str_eq(domain, "Test translation_domain"); - elm_interface_atspi_accessible_translation_domain_set(g_btn, NULL); - domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); + efl_access_translation_domain_set(g_btn, NULL); + domain = efl_access_translation_domain_get(g_btn); ck_assert(domain == NULL); @@ -311,18 +309,18 @@ START_TEST (elm_atspi_translation_domain_set) } END_TEST -START_TEST (elm_atspi_relationship_append) +START_TEST (test_efl_access_relationship_append) { elm_init(0, NULL); generate_app(); - Elm_Atspi_Relation_Set set; - Elm_Atspi_Relation *rel, *rel_to, *rel_from; + Efl_Access_Relation_Set set; + Efl_Access_Relation *rel, *rel_to, *rel_from; Eina_List *l; - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + set = efl_access_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 2); @@ -330,9 +328,9 @@ START_TEST (elm_atspi_relationship_append) rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) { - if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) rel_to = rel; - if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) rel_from = rel; } @@ -342,19 +340,19 @@ START_TEST (elm_atspi_relationship_append) ck_assert(rel_from != NULL); ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); /* Check if append do not procude duplicated relations */ - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + set = efl_access_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) { - if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) rel_to = rel; - if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) rel_from = rel; } @@ -368,26 +366,26 @@ START_TEST (elm_atspi_relationship_append) rel_from->objects = eina_list_remove(rel_from->objects, g_win); ck_assert(eina_list_data_find(rel_from->objects, g_win) == NULL); - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); elm_shutdown(); } END_TEST -START_TEST (elm_atspi_relationship_remove) +START_TEST (test_efl_access_relationship_remove) { elm_init(0, NULL); generate_app(); - Elm_Atspi_Relation_Set set; - Elm_Atspi_Relation *rel, *rel_to, *rel_from; + Efl_Access_Relation_Set set; + Efl_Access_Relation *rel, *rel_to, *rel_from; Eina_List *l; /* Test if removal of single relationship works */ - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); - elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); + efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + set = efl_access_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 1); @@ -395,9 +393,9 @@ START_TEST (elm_atspi_relationship_remove) rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) { - if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) rel_to = rel; - if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) rel_from = rel; } @@ -405,20 +403,20 @@ START_TEST (elm_atspi_relationship_remove) ck_assert(rel_from != NULL); ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); /* Test if removal of type relationship works */ - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); - elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, NULL); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); + efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL); + set = efl_access_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) { - if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) rel_to = rel; - if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) rel_from = rel; } @@ -426,77 +424,77 @@ START_TEST (elm_atspi_relationship_remove) ck_assert(rel_from != NULL); ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); /* Test if relationship is implicity removed when object is deleted */ - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); efl_del(g_bg); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + set = efl_access_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) { - if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO) rel_to = rel; - if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) + if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) rel_from = rel; } if (rel_to) ck_assert(eina_list_data_find(rel_to->objects, g_bg) == NULL); if (rel_from) ck_assert(eina_list_data_find(rel_from->objects, g_bg) == NULL); - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); elm_shutdown(); } END_TEST -START_TEST (elm_atspi_relationships_clear) +START_TEST (test_efl_access_relationships_clear) { - Elm_Atspi_Relation_Set set; - Elm_Atspi_Relation *rel; + Efl_Access_Relation_Set set; + Efl_Access_Relation *rel; Eina_List *l; elm_init(0, NULL); generate_app(); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); - elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); + efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); - elm_interface_atspi_accessible_relationships_clear(g_btn); + efl_access_relationships_clear(g_btn); - set = elm_interface_atspi_accessible_relation_set_get(g_btn); + set = efl_access_relation_set_get(g_btn); EINA_LIST_FOREACH(set, l, rel) { - ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); - ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); - ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); + ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); } - elm_atspi_relation_set_free(set); + efl_access_relation_set_free(set); elm_shutdown(); } END_TEST void elm_test_atspi(TCase *tc) { - tcase_add_test(tc, elm_atspi_app_obj_name_get); - tcase_add_test(tc, elm_atspi_name_get); - tcase_add_test(tc, elm_atspi_name_set); - tcase_add_test(tc, elm_atspi_role_get); - tcase_add_test(tc, elm_atspi_role_set); - tcase_add_test(tc, elm_atspi_role_name_get); - tcase_add_test(tc, elm_atspi_localized_role_name_get); - tcase_add_test(tc, elm_atspi_description_set); - tcase_add_test(tc, elm_atspi_description_get); - tcase_add_test(tc, elm_atspi_children_and_parent); - tcase_add_test(tc, elm_atspi_children_and_parent2); - tcase_add_test(tc, elm_atspi_translation_domain_get); - tcase_add_test(tc, elm_atspi_translation_domain_set); - tcase_add_test(tc, elm_atspi_relationship_append); - tcase_add_test(tc, elm_atspi_relationship_remove); - tcase_add_test(tc, elm_atspi_relationships_clear); + tcase_add_test(tc, test_efl_access_app_obj_name_get); + tcase_add_test(tc, test_efl_access_name_get); + tcase_add_test(tc, test_efl_access_name_set); + tcase_add_test(tc, test_efl_access_role_get); + tcase_add_test(tc, test_efl_access_role_set); + tcase_add_test(tc, test_efl_access_role_name_get); + tcase_add_test(tc, test_efl_access_localized_role_name_get); + tcase_add_test(tc, test_efl_access_description_set); + tcase_add_test(tc, test_efl_access_description_get); + tcase_add_test(tc, test_efl_access_children_and_parent); + tcase_add_test(tc, test_efl_access_children_and_parent2); + tcase_add_test(tc, test_efl_access_translation_domain_get); + tcase_add_test(tc, test_efl_access_translation_domain_set); + tcase_add_test(tc, test_efl_access_relationship_append); + tcase_add_test(tc, test_efl_access_relationship_remove); + tcase_add_test(tc, test_efl_access_relationships_clear); } diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c index eb14a53aa5..ca675f2f26 100644 --- a/src/tests/elementary/elm_test_box.c +++ b/src/tests/elementary/elm_test_box.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *box; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "box", ELM_WIN_BASIC); box = elm_box_add(win); - role = elm_interface_atspi_accessible_role_get(box); + role = efl_access_role_get(box); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c index bbae3ce1d6..c227b4e133 100644 --- a/src/tests/elementary/elm_test_bubble.c +++ b/src/tests/elementary/elm_test_bubble.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *bubble; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); bubble = elm_bubble_add(win); - role = elm_interface_atspi_accessible_role_get(bubble); + role = efl_access_role_get(bubble); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c index a07abc41c2..ed3552455c 100644 --- a/src/tests/elementary/elm_test_button.c +++ b/src/tests/elementary/elm_test_button.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_ACTION_PROTECTED #include <Elementary.h> @@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *button; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "button", ELM_WIN_BASIC); button = elm_button_add(win); - role = elm_interface_atspi_accessible_role_get(button); + role = efl_access_role_get(button); - ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); + ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); elm_shutdown(); } @@ -34,7 +34,7 @@ START_TEST (elm_atspi_interfaces_check) button = elm_button_add(win); - ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); + ck_assert(efl_isa(button, EFL_ACCESS_MIXIN)); ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN)); ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN)); diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c index 433b5d14bc..866b60d9b8 100644 --- a/src/tests/elementary/elm_test_calendar.c +++ b/src/tests/elementary/elm_test_calendar.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *calendar; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); calendar = elm_calendar_add(win); - role = elm_interface_atspi_accessible_role_get(calendar); + role = efl_access_role_get(calendar); - ck_assert(role == ELM_ATSPI_ROLE_CALENDAR); + ck_assert(role == EFL_ACCESS_ROLE_CALENDAR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c index 8abfe3a05c..b498ee9fc6 100644 --- a/src/tests/elementary/elm_test_check.c +++ b/src/tests/elementary/elm_test_check.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -53,15 +53,15 @@ END_TEST START_TEST (elm_atspi_role_get) { Evas_Object *win, *check; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "check", ELM_WIN_BASIC); check = elm_check_add(win); - role = elm_interface_atspi_accessible_role_get(check); + role = efl_access_role_get(check); - ck_assert(role == ELM_ATSPI_ROLE_CHECK_BOX); + ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c index 713858d718..34c5a9534d 100644 --- a/src/tests/elementary/elm_test_clock.c +++ b/src/tests/elementary/elm_test_clock.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *clk; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); clk = elm_clock_add(win); - role = elm_interface_atspi_accessible_role_get(clk); + role = efl_access_role_get(clk); - ck_assert(role == ELM_ATSPI_ROLE_TEXT); + ck_assert(role == EFL_ACCESS_ROLE_TEXT); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c index 321f3df03d..472e61e608 100644 --- a/src/tests/elementary/elm_test_colorselector.c +++ b/src/tests/elementary/elm_test_colorselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -36,15 +36,15 @@ END_TEST START_TEST (elm_atspi_role_get) { Evas_Object *win, *c; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); c = elm_colorselector_add(win); - role = elm_interface_atspi_accessible_role_get(c); + role = efl_access_role_get(c); - ck_assert(role == ELM_ATSPI_ROLE_COLOR_CHOOSER); + ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c index f1c6b14baf..d2d880e9cb 100644 --- a/src/tests/elementary/elm_test_config.c +++ b/src/tests/elementary/elm_test_config.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c index a646e5ecb9..60e3087bb7 100644 --- a/src/tests/elementary/elm_test_conformant.c +++ b/src/tests/elementary/elm_test_conformant.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *conformant; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); conformant = elm_conformant_add(win); - role = elm_interface_atspi_accessible_role_get(conformant); + role = efl_access_role_get(conformant); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c index 5c5ed6f9cc..8db2564d72 100644 --- a/src/tests/elementary/elm_test_ctxpopup.c +++ b/src/tests/elementary/elm_test_ctxpopup.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *ctxpopup; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); ctxpopup = elm_ctxpopup_add(win); - role = elm_interface_atspi_accessible_role_get(ctxpopup); + role = efl_access_role_get(ctxpopup); - ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); + ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c index 0935f88667..67cd56f639 100644 --- a/src/tests/elementary/elm_test_datetime.c +++ b/src/tests/elementary/elm_test_datetime.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *datetime; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); datetime = elm_datetime_add(win); - role = elm_interface_atspi_accessible_role_get(datetime); + role = efl_access_role_get(datetime); - ck_assert(role == ELM_ATSPI_ROLE_DATE_EDITOR); + ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c index d4f0288782..9c5fe717db 100644 --- a/src/tests/elementary/elm_test_dayselector.c +++ b/src/tests/elementary/elm_test_dayselector.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *dayselector; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); dayselector = elm_dayselector_add(win); - role = elm_interface_atspi_accessible_role_get(dayselector); + role = efl_access_role_get(dayselector); - ck_assert(role == ELM_ATSPI_ROLE_PANEL); + ck_assert(role == EFL_ACCESS_ROLE_PANEL); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c index e902939d5a..ab9752d8dd 100644 --- a/src/tests/elementary/elm_test_diskselector.c +++ b/src/tests/elementary/elm_test_diskselector.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *diskselector; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); diskselector = elm_diskselector_add(win); - role = elm_interface_atspi_accessible_role_get(diskselector); + role = efl_access_role_get(diskselector); - ck_assert(role == ELM_ATSPI_ROLE_LIST); + ck_assert(role == EFL_ACCESS_ROLE_LIST); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c index e2a9a5d386..fe412ccf08 100644 --- a/src/tests/elementary/elm_test_entry.c +++ b/src/tests/elementary/elm_test_entry.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_TEXT_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -380,15 +380,15 @@ END_TEST START_TEST (elm_atspi_role_get) { Evas_Object *win, *entry; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); entry = elm_entry_add(win); - role = elm_interface_atspi_accessible_role_get(entry); + role = efl_access_role_get(entry); - ck_assert(role == ELM_ATSPI_ROLE_ENTRY); + ck_assert(role == EFL_ACCESS_ROLE_ENTRY); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c index 880054324f..de78924fa4 100644 --- a/src/tests/elementary/elm_test_fileselector.c +++ b/src/tests/elementary/elm_test_fileselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *fileselector; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); fileselector = elm_fileselector_add(win); - role = elm_interface_atspi_accessible_role_get(fileselector); + role = efl_access_role_get(fileselector); - ck_assert(role == ELM_ATSPI_ROLE_FILE_CHOOSER); + ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c index 653678d9dd..586c441077 100644 --- a/src/tests/elementary/elm_test_fileselector_button.c +++ b/src/tests/elementary/elm_test_fileselector_button.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *fs_button; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); fs_button = elm_fileselector_button_add(win); - role = elm_interface_atspi_accessible_role_get(fs_button); + role = efl_access_role_get(fs_button); - ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); + ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c index d78cf1b239..86fae967d0 100644 --- a/src/tests/elementary/elm_test_fileselector_entry.c +++ b/src/tests/elementary/elm_test_fileselector_entry.c @@ -2,22 +2,22 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" START_TEST (elm_atspi_role_get) { Evas_Object *win, *fs_entry; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); fs_entry = elm_fileselector_entry_add(win); - role = elm_interface_atspi_accessible_role_get(fs_entry); + role = efl_access_role_get(fs_entry); - ck_assert(role == ELM_ATSPI_ROLE_GROUPING); + ck_assert(role == EFL_ACCESS_ROLE_GROUPING); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c index 947c020ddc..a5d74b3f97 100644 --- a/src/tests/elementary/elm_test_flip.c +++ b/src/tests/elementary/elm_test_flip.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *flip; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); flip = elm_flip_add(win); - role = elm_interface_atspi_accessible_role_get(flip); + role = efl_access_role_get(flip); - ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); + ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c index 2ede134a04..fbbf0b049d 100644 --- a/src/tests/elementary/elm_test_flipselector.c +++ b/src/tests/elementary/elm_test_flipselector.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *flipselector; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); flipselector = elm_flipselector_add(win); - role = elm_interface_atspi_accessible_role_get(flipselector); + role = efl_access_role_get(flipselector); - ck_assert(role == ELM_ATSPI_ROLE_LIST); + ck_assert(role == EFL_ACCESS_ROLE_LIST); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h index 13587ef0d4..7105d7f736 100644 --- a/src/tests/elementary/elm_test_focus_common.h +++ b/src/tests/elementary/elm_test_focus_common.h @@ -5,7 +5,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define ELM_INTERNAL_API_ARGESFSDFEFC #include <Elementary.h> #include "elm_suite.h" diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c index 2527544a39..fe3cea724d 100644 --- a/src/tests/elementary/elm_test_frame.c +++ b/src/tests/elementary/elm_test_frame.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *frame; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); frame = elm_frame_add(win); - role = elm_interface_atspi_accessible_role_get(frame); + role = efl_access_role_get(frame); - ck_assert(role == ELM_ATSPI_ROLE_FRAME); + ck_assert(role == EFL_ACCESS_ROLE_FRAME); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c index 54e37e20c2..e83e419a67 100644 --- a/src/tests/elementary/elm_test_gengrid.c +++ b/src/tests/elementary/elm_test_gengrid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" #include "elm_test_helper.h" @@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *gengrid; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); gengrid = elm_gengrid_add(win); - role = elm_interface_atspi_accessible_role_get(gengrid); + role = efl_access_role_get(gengrid); - ck_assert(role == ELM_ATSPI_ROLE_TREE_TABLE); + ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE); elm_shutdown(); } @@ -53,7 +53,7 @@ START_TEST(elm_atspi_children_parent) Evas_Object *gengrid = elm_gengrid_add(win); evas_object_resize(gengrid, 100, 100); - Elm_Interface_Atspi_Accessible *parent; + Efl_Access *parent; content = NULL; itc.item_style = "default"; @@ -66,7 +66,7 @@ START_TEST(elm_atspi_children_parent) elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT); ck_assert(content != NULL); - parent = elm_interface_atspi_accessible_parent_get(content); + parent = efl_access_parent_get(content); ck_assert(it == parent); elm_shutdown(); diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c index dd43419dff..fd1fd40458 100644 --- a/src/tests/elementary/elm_test_genlist.c +++ b/src/tests/elementary/elm_test_genlist.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,7 +10,7 @@ static Evas_Object *win, *genlist; static Elm_Gen_Item_Class itc; static Eo *current; static int counter; -static Elm_Atspi_Event_Children_Changed_Data ev_data; +static Efl_Access_Event_Children_Changed_Data ev_data; Evas_Object *content; @@ -26,11 +26,11 @@ START_TEST (elm_atspi_role_get) { test_init(); - Elm_Atspi_Role role; + Efl_Access_Role role; - role = elm_interface_atspi_accessible_role_get(genlist); + role = efl_access_role_get(genlist); - ck_assert(role == ELM_ATSPI_ROLE_LIST); + ck_assert(role == EFL_ACCESS_ROLE_LIST); elm_shutdown(); } @@ -42,14 +42,14 @@ START_TEST(elm_atspi_children_get1) Eina_List *children; Elm_Object_Item *it[3]; - children = elm_interface_atspi_accessible_children_get(genlist); + children = efl_access_children_get(genlist); ck_assert(children == NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - children = elm_interface_atspi_accessible_children_get(genlist); + children = efl_access_children_get(genlist); ck_assert(eina_list_count(children) == 3); ck_assert(eina_list_nth(children, 0) == it[0]); ck_assert(eina_list_nth(children, 1) == it[1]); @@ -71,7 +71,7 @@ START_TEST(elm_atspi_children_get2) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - children = elm_interface_atspi_accessible_children_get(genlist); + children = efl_access_children_get(genlist); ck_assert(eina_list_nth(children, 1) == it[0]); ck_assert(eina_list_nth(children, 0) == it[1]); ck_assert(eina_list_nth(children, 2) == it[2]); @@ -83,10 +83,10 @@ END_TEST static void _children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) { - if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) + if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED) return; - ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; + ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info; current = event->object; counter++; } @@ -100,7 +100,7 @@ START_TEST(elm_atspi_children_events_add) Elm_Object_Item *it[3]; - elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); + efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); ck_assert(genlist == current); @@ -137,7 +137,7 @@ START_TEST(elm_atspi_children_events_del1) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); + efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); elm_object_item_del(it[0]); ck_assert(genlist == current); @@ -165,7 +165,7 @@ START_TEST(elm_atspi_children_events_del2) it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); + efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); elm_genlist_clear(genlist); ck_assert(genlist == current); diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c index 556c22f6ee..09dc2cbfd6 100644 --- a/src/tests/elementary/elm_test_glview.c +++ b/src/tests/elementary/elm_test_glview.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,7 +10,7 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *glview; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "glview", ELM_WIN_BASIC); @@ -20,8 +20,8 @@ START_TEST (elm_atspi_role_get) // if no gl backend skip test if (glview) { - role = elm_interface_atspi_accessible_role_get(glview); - ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); + role = efl_access_role_get(glview); + ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); } elm_shutdown(); diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c index f1350d49e6..dfd977c60f 100644 --- a/src/tests/elementary/elm_test_grid.c +++ b/src/tests/elementary/elm_test_grid.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *grid; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); grid = elm_grid_add(win); - role = elm_interface_atspi_accessible_role_get(grid); + role = efl_access_role_get(grid); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c index b23f892112..bbdc1114b7 100644 --- a/src/tests/elementary/elm_test_hover.c +++ b/src/tests/elementary/elm_test_hover.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *hover; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); hover = elm_hover_add(win); - role = elm_interface_atspi_accessible_role_get(hover); + role = efl_access_role_get(hover); - ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); + ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c index 14f1148b55..8693b21acf 100644 --- a/src/tests/elementary/elm_test_hoversel.c +++ b/src/tests/elementary/elm_test_hoversel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *hoversel; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); hoversel = elm_hoversel_add(win); - role = elm_interface_atspi_accessible_role_get(hoversel); + role = efl_access_role_get(hoversel); - ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); + ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c index 7cc9469d81..46f830c7e7 100644 --- a/src/tests/elementary/elm_test_icon.c +++ b/src/tests/elementary/elm_test_icon.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *icon; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); icon = elm_icon_add(win); - role = elm_interface_atspi_accessible_role_get(icon); + role = efl_access_role_get(icon); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c index 290c23d973..5953f2c8ba 100644 --- a/src/tests/elementary/elm_test_image.c +++ b/src/tests/elementary/elm_test_image.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -20,15 +20,15 @@ struct _Test_Data START_TEST (elm_atspi_role_get) { Evas_Object *win, *image; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "image", ELM_WIN_BASIC); image = elm_image_add(win); - role = elm_interface_atspi_accessible_role_get(image); + role = efl_access_role_get(image); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c index 1a34933cc1..7c4e7b5f10 100644 --- a/src/tests/elementary/elm_test_index.c +++ b/src/tests/elementary/elm_test_index.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *idx; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "index", ELM_WIN_BASIC); idx = elm_index_add(win); - role = elm_interface_atspi_accessible_role_get(idx); + role = efl_access_role_get(idx); - ck_assert(role == ELM_ATSPI_ROLE_SCROLL_BAR); + ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c index 942945dff5..1e9fdad897 100644 --- a/src/tests/elementary/elm_test_inwin.c +++ b/src/tests/elementary/elm_test_inwin.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *inwin; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); inwin = elm_win_inwin_add(win); - role = elm_interface_atspi_accessible_role_get(inwin); + role = efl_access_role_get(inwin); - ck_assert(role == ELM_ATSPI_ROLE_GLASS_PANE); + ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c index a81fdf4418..1518ac08e7 100644 --- a/src/tests/elementary/elm_test_label.c +++ b/src/tests/elementary/elm_test_label.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *label; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "label", ELM_WIN_BASIC); label = elm_label_add(win); - role = elm_interface_atspi_accessible_role_get(label); + role = efl_access_role_get(label); - ck_assert(role == ELM_ATSPI_ROLE_LABEL); + ck_assert(role == EFL_ACCESS_ROLE_LABEL); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c index 52e5dbee23..779b0adb14 100644 --- a/src/tests/elementary/elm_test_layout.c +++ b/src/tests/elementary/elm_test_layout.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST(elm_atspi_role_get) { Evas_Object *win, *layout; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); layout = elm_layout_add(win); - role = elm_interface_atspi_accessible_role_get(layout); + role = efl_access_role_get(layout); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c index 3b3a8bfc9e..8346bc5b3f 100644 --- a/src/tests/elementary/elm_test_list.c +++ b/src/tests/elementary/elm_test_list.c @@ -3,7 +3,7 @@ #endif #define EFL_ACCESS_SELECTION_PROTECTED -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -186,15 +186,15 @@ END_TEST START_TEST (elm_atspi_role_get) { Evas_Object *win, *list; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "list", ELM_WIN_BASIC); list = elm_list_add(win); - role = elm_interface_atspi_accessible_role_get(list); + role = efl_access_role_get(list); - ck_assert(role == ELM_ATSPI_ROLE_LIST); + ck_assert(role == EFL_ACCESS_ROLE_LIST); elm_shutdown(); } @@ -207,7 +207,7 @@ END_TEST */ START_TEST(elm_atspi_children_parent) { - Elm_Interface_Atspi_Accessible *parent; + Efl_Access *parent; elm_init(1, NULL); Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC); @@ -220,10 +220,10 @@ START_TEST(elm_atspi_children_parent) evas_object_show(list); - parent = elm_interface_atspi_accessible_parent_get(icon); + parent = efl_access_parent_get(icon); ck_assert(list == parent); - parent = elm_interface_atspi_accessible_parent_get(end); + parent = efl_access_parent_get(end); ck_assert(list == parent); elm_shutdown(); diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c index efaaa8f7f5..d054653896 100644 --- a/src/tests/elementary/elm_test_map.c +++ b/src/tests/elementary/elm_test_map.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *map; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "map", ELM_WIN_BASIC); map = elm_map_add(win); - role = elm_interface_atspi_accessible_role_get(map); + role = efl_access_role_get(map); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c index 570d37f4cd..8a496e3a1d 100644 --- a/src/tests/elementary/elm_test_mapbuf.c +++ b/src/tests/elementary/elm_test_mapbuf.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *mapbuf; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); mapbuf = elm_mapbuf_add(win); - role = elm_interface_atspi_accessible_role_get(mapbuf); + role = efl_access_role_get(mapbuf); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c index 015bc89855..d2fe2538d1 100644 --- a/src/tests/elementary/elm_test_menu.c +++ b/src/tests/elementary/elm_test_menu.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *menu; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); menu = elm_menu_add(win); - role = elm_interface_atspi_accessible_role_get(menu); + role = efl_access_role_get(menu); - ck_assert(role == ELM_ATSPI_ROLE_MENU); + ck_assert(role == EFL_ACCESS_ROLE_MENU); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c index f476c25ee7..3252507839 100644 --- a/src/tests/elementary/elm_test_multibuttonentry.c +++ b/src/tests/elementary/elm_test_multibuttonentry.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *multibuttonentry; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); multibuttonentry = elm_multibuttonentry_add(win); - role = elm_interface_atspi_accessible_role_get(multibuttonentry); + role = efl_access_role_get(multibuttonentry); - ck_assert_int_eq(role, ELM_ATSPI_ROLE_PANEL); + ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c index a34ce3e6ed..249dfdc1e8 100644 --- a/src/tests/elementary/elm_test_naviframe.c +++ b/src/tests/elementary/elm_test_naviframe.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *naviframe; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); naviframe = elm_naviframe_add(win); - role = elm_interface_atspi_accessible_role_get(naviframe); + role = efl_access_role_get(naviframe); - ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); + ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c index 9fe99cf01f..56be4c70da 100644 --- a/src/tests/elementary/elm_test_notify.c +++ b/src/tests/elementary/elm_test_notify.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *notify; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); notify = elm_notify_add(win); - role = elm_interface_atspi_accessible_role_get(notify); + role = efl_access_role_get(notify); - ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); + ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c index e98792ee6f..81ea083188 100644 --- a/src/tests/elementary/elm_test_panel.c +++ b/src/tests/elementary/elm_test_panel.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *panel; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); panel = elm_panel_add(win); - role = elm_interface_atspi_accessible_role_get(panel); + role = efl_access_role_get(panel); - ck_assert(role == ELM_ATSPI_ROLE_PANEL); + ck_assert(role == EFL_ACCESS_ROLE_PANEL); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c index fea0a02e27..cf66ae5c3a 100644 --- a/src/tests/elementary/elm_test_panes.c +++ b/src/tests/elementary/elm_test_panes.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *panes; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); panes = elm_panes_add(win); - role = elm_interface_atspi_accessible_role_get(panes); + role = efl_access_role_get(panes); - ck_assert(role == ELM_ATSPI_ROLE_SPLIT_PANE); + ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c index 3d8bc5fc45..5ddbc64346 100644 --- a/src/tests/elementary/elm_test_photo.c +++ b/src/tests/elementary/elm_test_photo.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *photo; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); photo = elm_photo_add(win); - role = elm_interface_atspi_accessible_role_get(photo); + role = efl_access_role_get(photo); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c index 8d9cff1158..34122723c7 100644 --- a/src/tests/elementary/elm_test_photocam.c +++ b/src/tests/elementary/elm_test_photocam.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *photocam; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); photocam = elm_photocam_add(win); - role = elm_interface_atspi_accessible_role_get(photocam); + role = efl_access_role_get(photocam); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c index 863bfba009..a2b22c5e77 100644 --- a/src/tests/elementary/elm_test_player.c +++ b/src/tests/elementary/elm_test_player.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *player; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "player", ELM_WIN_BASIC); player = elm_player_add(win); - role = elm_interface_atspi_accessible_role_get(player); + role = efl_access_role_get(player); - ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); + ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c index 8139ae538a..6db1190cc2 100644 --- a/src/tests/elementary/elm_test_plug.c +++ b/src/tests/elementary/elm_test_plug.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *plug; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); plug = elm_plug_add(win); - role = elm_interface_atspi_accessible_role_get(plug); + role = efl_access_role_get(plug); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c index b284475441..abeb4fc8fa 100644 --- a/src/tests/elementary/elm_test_popup.c +++ b/src/tests/elementary/elm_test_popup.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *popup; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); popup = elm_popup_add(win); - role = elm_interface_atspi_accessible_role_get(popup); + role = efl_access_role_get(popup); - ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); + ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c index 091e69731d..e1f753db83 100644 --- a/src/tests/elementary/elm_test_prefs.c +++ b/src/tests/elementary/elm_test_prefs.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get) { #if 0 Evas_Object *win, *prefs; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); prefs = elm_prefs_add(win); - role = elm_interface_atspi_accessible_role_get(prefs); + role = efl_access_role_get(prefs); - ck_assert(role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT); + ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT); elm_shutdown(); #endif diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c index 53319d7fff..5e76b6cdcb 100644 --- a/src/tests/elementary/elm_test_progressbar.c +++ b/src/tests/elementary/elm_test_progressbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *progressbar; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); progressbar = elm_progressbar_add(win); - role = elm_interface_atspi_accessible_role_get(progressbar); + role = efl_access_role_get(progressbar); - ck_assert(role == ELM_ATSPI_ROLE_PROGRESS_BAR); + ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c index 874dbe7d4b..bce91e644b 100644 --- a/src/tests/elementary/elm_test_radio.c +++ b/src/tests/elementary/elm_test_radio.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *radio; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); radio = elm_radio_add(win); - role = elm_interface_atspi_accessible_role_get(radio); + role = efl_access_role_get(radio); - ck_assert(role == ELM_ATSPI_ROLE_RADIO_BUTTON); + ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c index 537710f4d5..5996e86019 100644 --- a/src/tests/elementary/elm_test_scroller.c +++ b/src/tests/elementary/elm_test_scroller.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *scroller; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); scroller = elm_scroller_add(win); - role = elm_interface_atspi_accessible_role_get(scroller); + role = efl_access_role_get(scroller); - ck_assert(role == ELM_ATSPI_ROLE_SCROLL_PANE); + ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c index 31812e6fef..c4de3c8ea4 100644 --- a/src/tests/elementary/elm_test_segmentcontrol.c +++ b/src/tests/elementary/elm_test_segmentcontrol.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *segmentcontrol; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); segmentcontrol = elm_segment_control_add(win); - role = elm_interface_atspi_accessible_role_get(segmentcontrol); + role = efl_access_role_get(segmentcontrol); - ck_assert(role == ELM_ATSPI_ROLE_LIST); + ck_assert(role == EFL_ACCESS_ROLE_LIST); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c index a786cd367b..2f24da66c7 100644 --- a/src/tests/elementary/elm_test_separator.c +++ b/src/tests/elementary/elm_test_separator.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *separator; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); separator = elm_separator_add(win); - role = elm_interface_atspi_accessible_role_get(separator); + role = efl_access_role_get(separator); - ck_assert(role == ELM_ATSPI_ROLE_SEPARATOR); + ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c index 59e359de53..75f08ead12 100644 --- a/src/tests/elementary/elm_test_slider.c +++ b/src/tests/elementary/elm_test_slider.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *slider; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); slider = elm_slider_add(win); - role = elm_interface_atspi_accessible_role_get(slider); + role = efl_access_role_get(slider); - ck_assert(role == ELM_ATSPI_ROLE_SLIDER); + ck_assert(role == EFL_ACCESS_ROLE_SLIDER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c index 8edacc5e9f..5764ccd709 100644 --- a/src/tests/elementary/elm_test_slideshow.c +++ b/src/tests/elementary/elm_test_slideshow.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *slideshow; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); slideshow = elm_slideshow_add(win); - role = elm_interface_atspi_accessible_role_get(slideshow); + role = efl_access_role_get(slideshow); - ck_assert(role == ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); + ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c index bc77c97380..d9956539d8 100644 --- a/src/tests/elementary/elm_test_spinner.c +++ b/src/tests/elementary/elm_test_spinner.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *spinner; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); spinner = elm_spinner_add(win); - role = elm_interface_atspi_accessible_role_get(spinner); + role = efl_access_role_get(spinner); - ck_assert(role == ELM_ATSPI_ROLE_SPIN_BUTTON); + ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c index bb7edc5b19..7fa9323efb 100644 --- a/src/tests/elementary/elm_test_table.c +++ b/src/tests/elementary/elm_test_table.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *table; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "table", ELM_WIN_BASIC); table = elm_table_add(win); - role = elm_interface_atspi_accessible_role_get(table); + role = efl_access_role_get(table); - ck_assert(role == ELM_ATSPI_ROLE_FILLER); + ck_assert(role == EFL_ACCESS_ROLE_FILLER); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c index 3a06b0cd73..895a5f80a3 100644 --- a/src/tests/elementary/elm_test_thumb.c +++ b/src/tests/elementary/elm_test_thumb.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *thumb; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); thumb = elm_thumb_add(win); - role = elm_interface_atspi_accessible_role_get(thumb); + role = efl_access_role_get(thumb); - ck_assert(role == ELM_ATSPI_ROLE_IMAGE); + ck_assert(role == EFL_ACCESS_ROLE_IMAGE); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c index d50f50b455..b1136f6c43 100644 --- a/src/tests/elementary/elm_test_toolbar.c +++ b/src/tests/elementary/elm_test_toolbar.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *toolbar; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); toolbar = elm_toolbar_add(win); - role = elm_interface_atspi_accessible_role_get(toolbar); + role = efl_access_role_get(toolbar); - ck_assert(role == ELM_ATSPI_ROLE_TOOL_BAR); + ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c index f3b7fea2d2..444af9d48f 100644 --- a/src/tests/elementary/elm_test_video.c +++ b/src/tests/elementary/elm_test_video.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -10,15 +10,15 @@ START_TEST (elm_atspi_role_get) { Evas_Object *win, *video; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "video", ELM_WIN_BASIC); video = elm_video_add(win); - role = elm_interface_atspi_accessible_role_get(video); + role = efl_access_role_get(video); - ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); + ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); elm_shutdown(); } diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c index e986e8c1ed..b094376ea9 100644 --- a/src/tests/elementary/elm_test_web.c +++ b/src/tests/elementary/elm_test_web.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #include <Elementary.h> #include "elm_suite.h" @@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get) { #if 0 Evas_Object *win, *web; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "web", ELM_WIN_BASIC); web = elm_web_add(win); - role = elm_interface_atspi_accessible_role_get(web); + role = efl_access_role_get(web); - ck_assert(role == ELM_ATSPI_ROLE_HTML_CONTAINER); + ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER); elm_shutdown(); #endif diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c index b8524b323f..45855647ba 100644 --- a/src/tests/elementary/elm_test_win.c +++ b/src/tests/elementary/elm_test_win.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED +#define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED #include <Elementary.h> #ifdef HAVE_ELEMENTARY_X @@ -64,14 +64,14 @@ _timer_fail_flag_cb(void *data) START_TEST (elm_atspi_role_get) { Evas_Object *win; - Elm_Atspi_Role role; + Efl_Access_Role role; elm_init(1, NULL); win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - role = elm_interface_atspi_accessible_role_get(win); + role = efl_access_role_get(win); - ck_assert(role == ELM_ATSPI_ROLE_WINDOW); + ck_assert(role == EFL_ACCESS_ROLE_WINDOW); elm_shutdown(); } |