kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elm: rename Elm_Interface_Atspi_Accessible interface 

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D5341
This commit is contained in:
Lukasz Stanislawski 2017-10-19 10:13:54 +09:00 committed by Jean-Philippe Andre
parent 98622623a0
commit 57aefc53c1
176 changed files with 1518 additions and 1520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Elementary.am
View File

@ -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 \

220
src/lib/elementary/elm_interface_atspi_accessible.c → src/lib/elementary/efl_access.c
View File

@ -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"

92
src/lib/elementary/elm_interface_atspi_accessible.eo → src/lib/elementary/efl_access.eo
View File

@ -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]]

165
src/lib/elementary/efl_access.h Normal file
View File

@ -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

4
src/lib/elementary/efl_access_component.c
View File

@ -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)
{

14
src/lib/elementary/efl_access_window.h
View File

@ -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

4
src/lib/elementary/efl_ui_bg.c
View File

@ -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);

4
src/lib/elementary/efl_ui_box.c
View File

@ -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;

4
src/lib/elementary/efl_ui_button.c
View File

@ -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;
}

26
src/lib/elementary/efl_ui_check.c
View File

@ -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;
}

2
src/lib/elementary/efl_ui_check.eo
View File

@ -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 {

4
src/lib/elementary/efl_ui_clock.c
View File

@ -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;
}

4
src/lib/elementary/efl_ui_flip.c
View File

@ -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;
}

4
src/lib/elementary/efl_ui_frame.c
View File

@ -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;
}

2
src/lib/elementary/efl_ui_grid.c
View File

@ -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;

2
src/lib/elementary/efl_ui_grid_static.c
View File

@ -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;

4
src/lib/elementary/efl_ui_image.c
View File

@ -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;

4
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -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;
}

8
src/lib/elementary/efl_ui_layout.c
View File

@ -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;
}

4
src/lib/elementary/efl_ui_panes.c
View File

@ -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;
}

4
src/lib/elementary/efl_ui_progressbar.c
View File

@ -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;
}

16
src/lib/elementary/efl_ui_radio.c
View File

@ -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;
}

2
src/lib/elementary/efl_ui_radio.eo
View File

@ -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 {

8
src/lib/elementary/efl_ui_slider.c
View File

@ -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;
}

4
src/lib/elementary/efl_ui_slider_interval.c
View File

@ -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

34
src/lib/elementary/efl_ui_text.c
View File

@ -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;

4
src/lib/elementary/efl_ui_text.eo
View File

@ -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; }

4
src/lib/elementary/efl_ui_video.c
View File

@ -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;
}

38
src/lib/elementary/efl_ui_win.c
View File

@ -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;

6
src/lib/elementary/efl_ui_win.eo
View File

@ -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; }

4
src/lib/elementary/elc_combobox.c
View File

@ -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);

14
src/lib/elementary/elc_ctxpopup.c
View File

@ -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;
}

4
src/lib/elementary/elc_fileselector.c
View File

@ -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;
}

4
src/lib/elementary/elc_fileselector_button.c
View File

@ -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;
}

4
src/lib/elementary/elc_fileselector_entry.c
View File

@ -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;
}

4
src/lib/elementary/elc_hoversel.c
View File

@ -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;
}

38
src/lib/elementary/elc_multibuttonentry.c
View File

@ -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;
}

12
src/lib/elementary/elc_naviframe.c
View File

@ -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;

4
src/lib/elementary/elc_player.c
View File

@ -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;
}

14
src/lib/elementary/elc_popup.c
View File

@ -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;
}

4
src/lib/elementary/elementary_js.cc
View File

@ -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());

14
src/lib/elementary/elm_access.c
View File

@ -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;

2
src/lib/elementary/elm_access.eo
View File

@ -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; }
}
}

4
src/lib/elementary/elm_actionslider.c
View File

@ -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;
}

24
src/lib/elementary/elm_atspi_app_object.c
View File

@ -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"

10
src/lib/elementary/elm_atspi_app_object.eo
View File

@ -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; }
}
}

552
src/lib/elementary/elm_atspi_bridge.c
View File

File diff suppressed because it is too large Load Diff

6
src/lib/elementary/elm_box.c
View File

@ -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;
}

4
src/lib/elementary/elm_bubble.c
View File

@ -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;
}

4
src/lib/elementary/elm_calendar.c
View File

@ -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;
}

4
src/lib/elementary/elm_clock.c
View File

@ -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;
}

4
src/lib/elementary/elm_color_item.eo
View File

@ -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; }
}
}

28
src/lib/elementary/elm_colorselector.c
View File

@ -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();

2
src/lib/elementary/elm_colorselector.eo
View File

@ -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]]

4
src/lib/elementary/elm_conform.c
View File

@ -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;

2
src/lib/elementary/elm_ctxpopup.eo
View File

@ -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 {

2
src/lib/elementary/elm_datetime.c
View File

@ -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"

4
src/lib/elementary/elm_dayselector.c
View File

@ -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;
}

4
src/lib/elementary/elm_diskselector.c
View File

@ -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;
}

38
src/lib/elementary/elm_entry.c
View File

@ -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;

4
src/lib/elementary/elm_entry.eo
View File

@ -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; }

4
src/lib/elementary/elm_flipselector.c
View File

@ -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;
}

54
src/lib/elementary/elm_gengrid.c
View File

@ -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;
}

4
src/lib/elementary/elm_gengrid.eo
View File

@ -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; }

4
src/lib/elementary/elm_gengrid_item.eo
View File

@ -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; }
}
}

60
src/lib/elementary/elm_genlist.c
View File

@ -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;
}

4
src/lib/elementary/elm_genlist.eo
View File

@ -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; }

4
src/lib/elementary/elm_genlist_item.eo
View File

@ -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; }
}
}

4
src/lib/elementary/elm_glview.c
View File

@ -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);
}

4
src/lib/elementary/elm_grid.c
View File

@ -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;
}

4
src/lib/elementary/elm_hover.c
View File

@ -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);

4
src/lib/elementary/elm_icon.c
View File

@ -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;
}

34
src/lib/elementary/elm_index.c
View File

@ -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);

2
src/lib/elementary/elm_index.eo
View File

@ -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]]

2
src/lib/elementary/elm_index_item.eo
View File

@ -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; }
}
}

165
src/lib/elementary/elm_interface_atspi_accessible.h
View File

@ -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

2
src/lib/elementary/elm_interfaces.h
View File

@ -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"

4
src/lib/elementary/elm_inwin.c
View File

@ -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;
}

4
src/lib/elementary/elm_label.c
View File

@ -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;
}

62
src/lib/elementary/elm_list.c
View File

@ -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);
}

2
src/lib/elementary/elm_list.eo
View File

@ -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;

4
src/lib/elementary/elm_list_item.eo
View File

@ -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; }
}
}

4
src/lib/elementary/elm_map.c
View File

@ -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;
}

4
src/lib/elementary/elm_mapbuf.c
View File

@ -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;
}

66
src/lib/elementary/elm_menu.c
View File

@ -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;
}

2
src/lib/elementary/elm_menu.eo
View File

@ -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; }

10
src/lib/elementary/elm_menu_item.eo
View File

@ -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; }

2
src/lib/elementary/elm_multibuttonentry.eo
View File

@ -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 {

4
src/lib/elementary/elm_multibuttonentry_item.eo
View File

@ -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; }
}
}

2
src/lib/elementary/elm_naviframe_item.eo
View File

@ -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; }
}
}

4
src/lib/elementary/elm_notify.c
View File

@ -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;
}

4
src/lib/elementary/elm_panel.c
View File

@ -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);

4
src/lib/elementary/elm_photo.c
View File

@ -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;
}

4
src/lib/elementary/elm_plug.c
View File

@ -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;
}

2
src/lib/elementary/elm_popup.eo
View File

@ -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 {

4
src/lib/elementary/elm_prefs.c
View File

@ -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;
}

2
src/lib/elementary/elm_priv.h
View File

@ -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);

4
src/lib/elementary/elm_scroller.c
View File

@ -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;
}

4
src/lib/elementary/elm_segment_control.c
View File

@ -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;
}

4
src/lib/elementary/elm_separator.c
View File

@ -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;
}

Some files were not shown because too many files have changed in this diff Show More