forked from enlightenment/efl
Efl.Access.Object (from Efl.Access)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
This commit is contained in:
parent
65ee277a66
commit
9dcc31ed4a
|
@ -90,7 +90,7 @@ elm_public_eolian_files = \
|
||||||
lib/elementary/efl_ui_scroller.eo \
|
lib/elementary/efl_ui_scroller.eo \
|
||||||
lib/elementary/efl_ui_scroll_manager.eo \
|
lib/elementary/efl_ui_scroll_manager.eo \
|
||||||
lib/elementary/efl_ui_pan.eo \
|
lib/elementary/efl_ui_pan.eo \
|
||||||
lib/elementary/efl_access.eo \
|
lib/elementary/efl_access_object.eo \
|
||||||
lib/elementary/efl_access_action.eo \
|
lib/elementary/efl_access_action.eo \
|
||||||
lib/elementary/efl_access_component.eo \
|
lib/elementary/efl_access_component.eo \
|
||||||
lib/elementary/efl_access_editable_text.eo \
|
lib/elementary/efl_access_editable_text.eo \
|
||||||
|
@ -305,7 +305,7 @@ includesdir = $(includedir)/elementary-@VMAJ@
|
||||||
includesunstable_HEADERS = \
|
includesunstable_HEADERS = \
|
||||||
lib/elementary/elm_gen_common.h \
|
lib/elementary/elm_gen_common.h \
|
||||||
lib/elementary/elm_atspi_bridge.h \
|
lib/elementary/elm_atspi_bridge.h \
|
||||||
lib/elementary/efl_access.h \
|
lib/elementary/efl_access_object.h \
|
||||||
lib/elementary/efl_access_text.h \
|
lib/elementary/efl_access_text.h \
|
||||||
lib/elementary/efl_access_widget_action.h \
|
lib/elementary/efl_access_widget_action.h \
|
||||||
lib/elementary/efl_access_window.h \
|
lib/elementary/efl_access_window.h \
|
||||||
|
@ -701,7 +701,7 @@ lib_elementary_libelementary_la_SOURCES = \
|
||||||
lib/elementary/elm_icon.c \
|
lib/elementary/elm_icon.c \
|
||||||
lib/elementary/efl_ui_image.c \
|
lib/elementary/efl_ui_image.c \
|
||||||
lib/elementary/elm_index.c \
|
lib/elementary/elm_index.c \
|
||||||
lib/elementary/efl_access.c \
|
lib/elementary/efl_access_object.c \
|
||||||
lib/elementary/efl_access_action.c \
|
lib/elementary/efl_access_action.c \
|
||||||
lib/elementary/efl_access_component.c \
|
lib/elementary/efl_access_component.c \
|
||||||
lib/elementary/efl_access_editable_text.c \
|
lib/elementary/efl_access_editable_text.c \
|
||||||
|
|
|
@ -161,7 +161,7 @@ typedef Eo Efl_Ui_Focus_Manager;
|
||||||
# include <efl_ui_translatable.eo.h>
|
# include <efl_ui_translatable.eo.h>
|
||||||
# include <efl_ui_focus_composition.eo.h>
|
# include <efl_ui_focus_composition.eo.h>
|
||||||
# include <efl_ui_focus_layer.eo.h>
|
# include <efl_ui_focus_layer.eo.h>
|
||||||
# include <efl_access.h>
|
# include <efl_access_object.h>
|
||||||
# include <efl_access_text.h>
|
# include <efl_access_text.h>
|
||||||
# include <efl_access_window.h>
|
# include <efl_access_window.h>
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_BETA
|
#define EFL_ACCESS_COMPONENT_BETA
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ _efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Ei
|
||||||
Eina_List *l, *children;
|
Eina_List *l, *children;
|
||||||
Eo *ret = NULL, *child;
|
Eo *ret = NULL, *child;
|
||||||
|
|
||||||
children = efl_access_children_get(obj);
|
children = efl_access_object_access_children_get(obj);
|
||||||
|
|
||||||
EINA_LIST_FOREACH(children, l, child)
|
EINA_LIST_FOREACH(children, l, child)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "elementary_config.h"
|
#include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_widget.h"
|
#include "elm_widget.h"
|
||||||
|
@ -121,7 +121,7 @@ struct _Efl_Access_Event_Handler
|
||||||
void *data;
|
void *data;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _Efl_Access_Data
|
struct _Efl_Access_Object_Data
|
||||||
{
|
{
|
||||||
Efl_Access_Relation_Set relations;
|
Efl_Access_Relation_Set relations;
|
||||||
Eina_List *attr_list;
|
Eina_List *attr_list;
|
||||||
|
@ -133,23 +133,23 @@ struct _Efl_Access_Data
|
||||||
Efl_Access_Type type: 2;
|
Efl_Access_Type type: 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct _Efl_Access_Data Efl_Access_Data;
|
typedef struct _Efl_Access_Object_Data Efl_Access_Object_Data;
|
||||||
|
|
||||||
|
|
||||||
static Eina_List *global_callbacks;
|
static Eina_List *global_callbacks;
|
||||||
static Eo *root;
|
static Eo *root;
|
||||||
|
|
||||||
EOLIAN static int
|
EOLIAN static int
|
||||||
_efl_access_index_in_parent_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
_efl_access_object_index_in_parent_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_List *l, *children = NULL;
|
Eina_List *l, *children = NULL;
|
||||||
Eo *chld, *parent = NULL;
|
Eo *chld, *parent = NULL;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
if (!parent) return -1;
|
if (!parent) return -1;
|
||||||
|
|
||||||
children = efl_access_children_get(parent);
|
children = efl_access_object_access_children_get(parent);
|
||||||
if (!children) return -1;
|
if (!children) return -1;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(children, l, chld)
|
EINA_LIST_FOREACH(children, l, chld)
|
||||||
|
@ -169,22 +169,22 @@ _efl_access_index_in_parent_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
||||||
|
|
||||||
|
|
||||||
EOLIAN static Efl_Object *
|
EOLIAN static Efl_Object *
|
||||||
_efl_access_efl_object_provider_find(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED, const Efl_Object *klass)
|
_efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED, const Efl_Object *klass)
|
||||||
{
|
{
|
||||||
if (efl_isa(obj, klass))
|
if (efl_isa(obj, klass))
|
||||||
{
|
{
|
||||||
if (klass == EFL_ACCESS_MIXIN)
|
if (klass == EFL_ACCESS_OBJECT_MIXIN)
|
||||||
{
|
{
|
||||||
Efl_Access_Type type = efl_access_type_get(obj);
|
Efl_Access_Type type = efl_access_object_access_type_get(obj);
|
||||||
if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj;
|
if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj;
|
||||||
}
|
}
|
||||||
else return (Eo*)obj;
|
else return (Eo*)obj;
|
||||||
}
|
}
|
||||||
return efl_provider_find(efl_super(obj, EFL_ACCESS_MIXIN), klass);
|
return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
Eina_List *attr_list = NULL;
|
Eina_List *attr_list = NULL;
|
||||||
if (pd->attr_list)
|
if (pd->attr_list)
|
||||||
|
@ -206,7 +206,7 @@ _efl_access_attributes_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *key, const char *value)
|
_efl_access_object_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *key, const char *value)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Efl_Access_Attribute *attr = NULL;
|
Efl_Access_Attribute *attr = NULL;
|
||||||
|
@ -232,7 +232,7 @@ _efl_access_attribute_append(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const cha
|
||||||
pd->attr_list = eina_list_append(pd->attr_list, attr);
|
pd->attr_list = eina_list_append(pd->attr_list, attr);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
EOLIAN static void _efl_access_object_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
if (!pd->attr_list) return;
|
if (!pd->attr_list) return;
|
||||||
Efl_Access_Attribute *attr;
|
Efl_Access_Attribute *attr;
|
||||||
|
@ -246,7 +246,7 @@ EOLIAN static void _efl_access_attributes_clear(Eo *obj EINA_UNUSED, Efl_Access_
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Reading_Info_Type reading_info)
|
_efl_access_object_reading_info_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Reading_Info_Type reading_info)
|
||||||
{
|
{
|
||||||
Eina_Strbuf *buf = NULL;
|
Eina_Strbuf *buf = NULL;
|
||||||
pd->reading_info = reading_info;
|
pd->reading_info = reading_info;
|
||||||
|
@ -271,24 +271,24 @@ _efl_access_reading_info_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Readi
|
||||||
{
|
{
|
||||||
eina_strbuf_append(buf, "state");
|
eina_strbuf_append(buf, "state");
|
||||||
}
|
}
|
||||||
efl_access_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf));
|
efl_access_object_attribute_append(obj, "reading_info_type", eina_strbuf_string_get(buf));
|
||||||
eina_strbuf_free(buf);
|
eina_strbuf_free(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_Reading_Info_Type
|
EOLIAN Efl_Access_Reading_Info_Type
|
||||||
_efl_access_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_reading_info_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->reading_info;
|
return pd->reading_info;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_Role
|
EOLIAN static Efl_Access_Role
|
||||||
_efl_access_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->role;
|
return pd->role;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role)
|
_efl_access_object_role_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Role role)
|
||||||
{
|
{
|
||||||
if (pd->role != role)
|
if (pd->role != role)
|
||||||
{
|
{
|
||||||
|
@ -298,17 +298,17 @@ _efl_access_role_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Role role)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN const char *
|
EOLIAN const char *
|
||||||
_efl_access_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
_efl_access_object_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_Role role;
|
Efl_Access_Role role;
|
||||||
|
|
||||||
role = efl_access_role_get(obj);
|
role = efl_access_object_role_get(obj);
|
||||||
|
|
||||||
return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role];
|
return role > EFL_ACCESS_ROLE_LAST_DEFINED ? "" : Access_Name[role];
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN const char *
|
EOLIAN const char *
|
||||||
_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_NLS
|
#ifdef ENABLE_NLS
|
||||||
if (pd->translation_domain)
|
if (pd->translation_domain)
|
||||||
|
@ -318,12 +318,12 @@ _efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
|
_efl_access_object_i18n_name_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val)
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&pd->name, val);
|
eina_stringshare_replace(&pd->name, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
const char * _efl_access_object_description_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
#ifdef ENABLE_NLS
|
#ifdef ENABLE_NLS
|
||||||
if (pd->translation_domain)
|
if (pd->translation_domain)
|
||||||
|
@ -333,16 +333,16 @@ const char * _efl_access_description_get(const Eo *obj EINA_UNUSED, Efl_Access_D
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_description_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *val)
|
_efl_access_object_description_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *val)
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&pd->description, val);
|
eina_stringshare_replace(&pd->description, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char *
|
EOLIAN static const char *
|
||||||
_efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
_efl_access_object_localized_role_name_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *ret = NULL;
|
const char *ret = NULL;
|
||||||
ret = efl_access_role_name_get(obj);
|
ret = efl_access_object_role_name_get(obj);
|
||||||
#ifdef ENABLE_NLS
|
#ifdef ENABLE_NLS
|
||||||
ret = gettext(ret);
|
ret = gettext(ret);
|
||||||
#endif
|
#endif
|
||||||
|
@ -350,7 +350,7 @@ _efl_access_localized_role_name_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUS
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List *
|
EOLIAN static Eina_List *
|
||||||
_efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
_efl_access_object_access_children_get(const Eo *obj, Efl_Access_Object_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_List *children = NULL;
|
Eina_List *children = NULL;
|
||||||
Eina_Iterator *iter = NULL;
|
Eina_Iterator *iter = NULL;
|
||||||
|
@ -363,7 +363,7 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
||||||
|
|
||||||
EINA_ITERATOR_FOREACH(iter, chld)
|
EINA_ITERATOR_FOREACH(iter, chld)
|
||||||
{
|
{
|
||||||
if (efl_isa(chld, EFL_ACCESS_MIXIN))
|
if (efl_isa(chld, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
children = eina_list_append(children, chld);
|
children = eina_list_append(children, chld);
|
||||||
}
|
}
|
||||||
eina_iterator_free(iter);
|
eina_iterator_free(iter);
|
||||||
|
@ -372,13 +372,13 @@ _efl_access_access_children_get(const Eo *obj, Efl_Access_Data *pd EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_efl_access_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd EINA_UNUSED)
|
_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_Relation_Set
|
EOLIAN Efl_Access_Relation_Set
|
||||||
_efl_access_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_relation_set_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
return efl_access_relation_set_clone(pd->relations);
|
return efl_access_relation_set_clone(pd->relations);
|
||||||
}
|
}
|
||||||
|
@ -395,26 +395,26 @@ EAPI void efl_access_attributes_list_free(Eina_List *list)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
|
_efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessible, const Efl_Event_Description *event, void *event_info)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
Efl_Access_Event_Handler *hdl;
|
Efl_Access_Event_Handler *hdl;
|
||||||
Efl_Access_Type type;
|
Efl_Access_Type type;
|
||||||
|
|
||||||
if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_MIXIN))
|
if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
{
|
{
|
||||||
CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
|
CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
type = efl_access_type_get(accessible);
|
type = efl_access_object_access_type_get(accessible);
|
||||||
if (type != EFL_ACCESS_TYPE_REGULAR)
|
if (type != EFL_ACCESS_TYPE_REGULAR)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (event == EFL_ACCESS_EVENT_CHILDREN_CHANGED)
|
if (event == EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED)
|
||||||
{
|
{
|
||||||
Efl_Access_Event_Children_Changed_Data *event_data = event_info;
|
Efl_Access_Event_Children_Changed_Data *event_data = event_info;
|
||||||
type = efl_access_type_get(event_data->child);
|
type = efl_access_object_access_type_get(event_data->child);
|
||||||
if (type != EFL_ACCESS_TYPE_REGULAR)
|
if (type != EFL_ACCESS_TYPE_REGULAR)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -431,7 +431,7 @@ _efl_access_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *accessib
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_Event_Handler *
|
EOLIAN Efl_Access_Event_Handler *
|
||||||
_efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
|
_efl_access_object_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Event_Cb cb, void *data)
|
||||||
{
|
{
|
||||||
Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
|
Efl_Access_Event_Handler *ret = calloc(1, sizeof(Efl_Access_Event_Handler));
|
||||||
|
|
||||||
|
@ -444,7 +444,7 @@ _efl_access_event_handler_add(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_E
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
|
_efl_access_object_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_Access_Event_Handler *handler)
|
||||||
{
|
{
|
||||||
Eina_List *l, *l2;
|
Eina_List *l, *l2;
|
||||||
Efl_Access_Event_Handler *hdl;
|
Efl_Access_Event_Handler *hdl;
|
||||||
|
@ -460,14 +460,14 @@ _efl_access_event_handler_del(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Efl_A
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_efl_access_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Data *pd, const char *domain)
|
_efl_access_object_translation_domain_set(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd, const char *domain)
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&pd->translation_domain, domain);
|
eina_stringshare_replace(&pd->translation_domain, domain);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
EOLIAN const char*
|
EOLIAN const char*
|
||||||
_efl_access_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_translation_domain_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->translation_domain;
|
return pd->translation_domain;
|
||||||
}
|
}
|
||||||
|
@ -519,7 +519,7 @@ efl_access_relation_set_relation_append(Efl_Access_Relation_Set *set, Efl_Access
|
||||||
Efl_Access_Relation *rel;
|
Efl_Access_Relation *rel;
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
|
|
||||||
if (!efl_isa(rel_obj, EFL_ACCESS_MIXIN))
|
if (!efl_isa(rel_obj, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
|
|
||||||
EINA_LIST_FOREACH(*set, l, rel)
|
EINA_LIST_FOREACH(*set, l, rel)
|
||||||
|
@ -623,13 +623,13 @@ efl_access_relation_set_clone(const Efl_Access_Relation_Set set)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
_efl_access_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
|
_efl_access_object_relationship_append(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd, Efl_Access_Relation_Type type, const Efl_Access_Object *relation_obj)
|
||||||
{
|
{
|
||||||
return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj);
|
return efl_access_relation_set_relation_append(&sd->relations, type, relation_obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Access_Relation_Type type, const Efl_Access *relation_obj)
|
_efl_access_object_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd, Efl_Access_Relation_Type type, const Efl_Access_Object *relation_obj)
|
||||||
{
|
{
|
||||||
if (relation_obj)
|
if (relation_obj)
|
||||||
efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj);
|
efl_access_relation_set_relation_remove(&sd->relations, type, relation_obj);
|
||||||
|
@ -638,14 +638,14 @@ _efl_access_relationship_remove(Eo *obj EINA_UNUSED, Efl_Access_Data *sd, Efl_Ac
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_efl_access_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Data *sd)
|
_efl_access_object_relationships_clear(Eo *obj EINA_UNUSED, Efl_Access_Object_Data *sd)
|
||||||
{
|
{
|
||||||
efl_access_relation_set_free(sd->relations);
|
efl_access_relation_set_free(sd->relations);
|
||||||
sd->relations = NULL;
|
sd->relations = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eo*
|
EOLIAN Eo*
|
||||||
_efl_access_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
|
_efl_access_object_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (!root)
|
if (!root)
|
||||||
root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
|
root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
|
||||||
|
@ -654,19 +654,19 @@ _efl_access_access_root_get(const Eo *class EINA_UNUSED, void *pd EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_Type
|
EOLIAN Efl_Access_Type
|
||||||
_efl_access_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Data *pd)
|
_efl_access_object_access_type_get(const Eo *obj EINA_UNUSED, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
return pd->type;
|
return pd->type;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
|
_efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Access_Type val)
|
||||||
{
|
{
|
||||||
Efl_Access *parent;
|
Efl_Access_Object *parent;
|
||||||
if (val == pd->type)
|
if (val == pd->type)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
switch (val)
|
switch (val)
|
||||||
{
|
{
|
||||||
|
@ -683,14 +683,14 @@ _efl_access_access_type_set(Eo *obj, Efl_Access_Data *pd, Efl_Access_Type val)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN void
|
EOLIAN void
|
||||||
_efl_access_efl_object_destructor(Eo *obj, Efl_Access_Data *pd)
|
_efl_access_object_efl_object_destructor(Eo *obj, Efl_Access_Object_Data *pd)
|
||||||
{
|
{
|
||||||
eina_stringshare_del(pd->name);
|
eina_stringshare_del(pd->name);
|
||||||
eina_stringshare_del(pd->description);
|
eina_stringshare_del(pd->description);
|
||||||
eina_stringshare_del(pd->translation_domain);
|
eina_stringshare_del(pd->translation_domain);
|
||||||
efl_access_relation_set_free(pd->relations);
|
efl_access_relation_set_free(pd->relations);
|
||||||
|
|
||||||
efl_destructor(efl_super(obj, EFL_ACCESS_MIXIN));
|
efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN));
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -704,4 +704,4 @@ _efl_access_shutdown(void)
|
||||||
ELM_SAFE_DEL(root);
|
ELM_SAFE_DEL(root);
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "efl_access.eo.c"
|
#include "efl_access_object.eo.c"
|
|
@ -244,11 +244,11 @@ struct Efl.Access.Relation
|
||||||
|
|
||||||
type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]]
|
type Efl.Access.Relation_Set: list<ptr(Efl.Access.Relation)>; [[Elementary Accessibility relation set type]]
|
||||||
|
|
||||||
mixin Efl.Access (Efl.Interface, Efl.Object)
|
mixin Efl.Access.Object (Efl.Interface, Efl.Object)
|
||||||
{
|
{
|
||||||
[[Accessibility accessible mixin]]
|
[[Accessibility accessible mixin]]
|
||||||
eo_prefix: efl_access;
|
eo_prefix: efl_access_object;
|
||||||
data: Efl_Access_Data;
|
data: Efl_Access_Object_Data;
|
||||||
methods {
|
methods {
|
||||||
@property localized_role_name @protected @beta {
|
@property localized_role_name @protected @beta {
|
||||||
[[Gets an localized string describing accessible object role name.]]
|
[[Gets an localized string describing accessible object role name.]]
|
||||||
|
@ -291,7 +291,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
|
||||||
get {
|
get {
|
||||||
}
|
}
|
||||||
values {
|
values {
|
||||||
children: list<Efl.Access> @owned; [[List of widget's children]]
|
children: list<Efl.Access.Object> @owned; [[List of widget's children]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@property role_name @protected @beta {
|
@property role_name @protected @beta {
|
||||||
|
@ -378,7 +378,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
|
||||||
event_emit @class @protected @beta {
|
event_emit @class @protected @beta {
|
||||||
[[Emit event]]
|
[[Emit event]]
|
||||||
params {
|
params {
|
||||||
@in accessible: Efl.Access; [[Accessibility object.]]
|
@in accessible: Efl.Access.Object; [[Accessibility object.]]
|
||||||
@cref event: Efl.Event.Description; [[Accessibility event type.]]
|
@cref event: Efl.Event.Description; [[Accessibility event type.]]
|
||||||
@in event_info: void_ptr; [[Accessibility event details.]]
|
@in event_info: void_ptr; [[Accessibility event details.]]
|
||||||
}
|
}
|
||||||
|
@ -431,7 +431,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
|
||||||
return: bool; [[$true if relationship was successfully appended, $false otherwise]]
|
return: bool; [[$true if relationship was successfully appended, $false otherwise]]
|
||||||
params {
|
params {
|
||||||
@in type: Efl.Access.Relation_Type; [[Relation type]]
|
@in type: Efl.Access.Relation_Type; [[Relation type]]
|
||||||
@in relation_object: const(Efl.Access); [[Object to relate to]]
|
@in relation_object: const(Efl.Access.Object); [[Object to relate to]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
relationship_remove @beta {
|
relationship_remove @beta {
|
||||||
|
@ -442,7 +442,7 @@ mixin Efl.Access (Efl.Interface, Efl.Object)
|
||||||
]]
|
]]
|
||||||
params {
|
params {
|
||||||
@in type: Efl.Access.Relation_Type; [[Relation type]]
|
@in type: Efl.Access.Relation_Type; [[Relation type]]
|
||||||
@in relation_object: const(Efl.Access); [[Object to remove relation from]]
|
@in relation_object: const(Efl.Access.Object); [[Object to remove relation from]]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
relationships_clear @beta {
|
relationships_clear @beta {
|
|
@ -4,10 +4,10 @@
|
||||||
#ifdef EFL_BETA_API_SUPPORT
|
#ifdef EFL_BETA_API_SUPPORT
|
||||||
|
|
||||||
#ifdef EFL_EO_API_SUPPORT
|
#ifdef EFL_EO_API_SUPPORT
|
||||||
#include "efl_access.eo.h"
|
#include "efl_access_object.eo.h"
|
||||||
#endif
|
#endif
|
||||||
#ifndef EFL_NOLEGACY_API_SUPPORT
|
#ifndef EFL_NOLEGACY_API_SUPPORT
|
||||||
#include "efl_access.eo.legacy.h"
|
#include "efl_access_object.eo.legacy.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -75,7 +75,7 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
|
||||||
Efl_Access_Event_State_Changed_Data evinfo; \
|
Efl_Access_Event_State_Changed_Data evinfo; \
|
||||||
evinfo.type = (tp); \
|
evinfo.type = (tp); \
|
||||||
evinfo.new_value = (nvl); \
|
evinfo.new_value = (nvl); \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_STATE_CHANGED, (void*)&evinfo); \
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
|
||||||
} while(0); }
|
} while(0); }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -84,38 +84,38 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
|
||||||
#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
|
#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
|
||||||
do { \
|
do { \
|
||||||
Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
|
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); \
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
|
||||||
} while(0);
|
} while(0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'PropertyChanged' signal for 'Name' property.
|
* Emits Accessible 'PropertyChanged' signal for 'Name' property.
|
||||||
*/
|
*/
|
||||||
#define efl_access_i18n_name_changed_signal_emit(obj) \
|
#define efl_access_i18n_name_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "i18n_name");
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'PropertyChanged' signal for 'Description' property.
|
* Emits Accessible 'PropertyChanged' signal for 'Description' property.
|
||||||
*/
|
*/
|
||||||
#define efl_access_description_changed_signal_emit(obj) \
|
#define efl_access_description_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "description");
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'PropertyChanged' signal for 'Parent' property.
|
* Emits Accessible 'PropertyChanged' signal for 'Parent' property.
|
||||||
*/
|
*/
|
||||||
#define efl_access_parent_changed_signal_emit(obj) \
|
#define efl_access_parent_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "parent");
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'PropertyChanged' signal for 'Role' property.
|
* Emits Accessible 'PropertyChanged' signal for 'Role' property.
|
||||||
*/
|
*/
|
||||||
#define efl_access_role_changed_signal_emit(obj) \
|
#define efl_access_role_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "role");
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'PropertyChanged' signal for 'Value' property.
|
* Emits Accessible 'PropertyChanged' signal for 'Value' property.
|
||||||
*/
|
*/
|
||||||
#define efl_access_value_changed_signal_emit(obj) \
|
#define efl_access_value_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_PROPERTY_CHANGED, "value");
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'ChildrenChanged' signal with added child as argument.
|
* Emits Accessible 'ChildrenChanged' signal with added child as argument.
|
||||||
|
@ -123,7 +123,7 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
|
||||||
#define efl_access_children_changed_added_signal_emit(obj, child) \
|
#define efl_access_children_changed_added_signal_emit(obj, child) \
|
||||||
do { \
|
do { \
|
||||||
Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
|
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); \
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
|
||||||
} while(0);
|
} while(0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -132,32 +132,32 @@ EAPI Efl_Access_Relation_Set efl_access_relation_set_clone(const Efl_Access_Rela
|
||||||
#define efl_access_children_changed_del_signal_emit(obj, child) \
|
#define efl_access_children_changed_del_signal_emit(obj, child) \
|
||||||
do { \
|
do { \
|
||||||
Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
|
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); \
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
|
||||||
} while(0);
|
} while(0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'ActiveDescendantChanged' signal.
|
* Emits Accessible 'ActiveDescendantChanged' signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_active_descendant_changed_signal_emit(obj, child) \
|
#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);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'VisibleDataChanged' signal.
|
* Emits Accessible 'VisibleDataChanged' signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_visible_data_changed_signal_emit(obj) \
|
#define efl_access_visible_data_changed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'AddAccessible' signal.
|
* Emits Accessible 'AddAccessible' signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_added(obj) \
|
#define efl_access_added(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_ADDED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits Accessible 'RemoveAccessible' signal.
|
* Emits Accessible 'RemoveAccessible' signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_removed(obj) \
|
#define efl_access_removed(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_EVENT_REMOVED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -14,43 +14,43 @@
|
||||||
* Emits 'Window:Activated' accessible signal.
|
* Emits 'Window:Activated' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_activated_signal_emit(obj) \
|
#define efl_access_window_activated_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Deactivated' accessible signal.
|
* Emits 'Window:Deactivated' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_deactivated_signal_emit(obj) \
|
#define efl_access_window_deactivated_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Created' accessible signal.
|
* Emits 'Window:Created' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_created_signal_emit(obj) \
|
#define efl_access_window_created_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Destroyed' accessible signal.
|
* Emits 'Window:Destroyed' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_destroyed_signal_emit(obj) \
|
#define efl_access_window_destroyed_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Maximized' accessible signal.
|
* Emits 'Window:Maximized' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_maximized_signal_emit(obj) \
|
#define efl_access_window_maximized_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Minimized' accessible signal.
|
* Emits 'Window:Minimized' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_minimized_signal_emit(obj) \
|
#define efl_access_window_minimized_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Emits 'Window:Restored' accessible signal.
|
* Emits 'Window:Restored' accessible signal.
|
||||||
*/
|
*/
|
||||||
#define efl_access_window_restored_signal_emit(obj) \
|
#define efl_access_window_restored_signal_emit(obj) \
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -48,7 +48,7 @@ _efl_ui_bg_widget_efl_object_constructor(Eo *obj, Efl_Ui_Bg_Widget_Data *pd)
|
||||||
pd->file = NULL;
|
pd->file = NULL;
|
||||||
pd->key = NULL;
|
pd->key = NULL;
|
||||||
|
|
||||||
efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
|
||||||
|
|
||||||
efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
|
efl_ui_widget_focus_allow_set(obj, EINA_FALSE);
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,8 @@ _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
pd->align.h = 0.5;
|
pd->align.h = 0.5;
|
||||||
pd->align.v = 0.5;
|
pd->align.v = 0.5;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -236,7 +236,7 @@ _efl_ui_button_efl_object_constructor(Eo *obj, Efl_Ui_Button_Data *_pd EINA_UNUS
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1028,7 +1028,7 @@ _efl_ui_calendar_efl_object_constructor(Eo *obj, Efl_Ui_Calendar_Data *sd)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
|
||||||
|
|
||||||
obj = _efl_ui_calendar_constructor_internal(obj, sd);
|
obj = _efl_ui_calendar_constructor_internal(obj, sd);
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
#define EFL_UI_NSTATE_PROTECTED
|
#define EFL_UI_NSTATE_PROTECTED
|
||||||
|
@ -86,11 +86,11 @@ _activate(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_efl_ui_check_efl_access_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
|
_efl_ui_check_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Check_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set states = 0;
|
Efl_Access_State_Set states = 0;
|
||||||
|
|
||||||
states = efl_access_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
|
states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_CHECK_CLASS));
|
||||||
|
|
||||||
if (elm_check_state_get(obj))
|
if (elm_check_state_get(obj))
|
||||||
STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED);
|
STATE_TYPE_SET(states, EFL_ACCESS_STATE_CHECKED);
|
||||||
|
@ -287,7 +287,7 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
|
||||||
efl_layout_signal_callback_add
|
efl_layout_signal_callback_add
|
||||||
(wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
|
(wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
|
||||||
|
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
|
||||||
_elm_access_object_register(obj, wd->resize_obj);
|
_elm_access_object_register(obj, wd->resize_obj);
|
||||||
_elm_access_text_set
|
_elm_access_text_set
|
||||||
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check"));
|
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check"));
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action)
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Ui.Nstate.count { set; }
|
Efl.Ui.Nstate.count { set; }
|
||||||
Efl.Ui.Nstate.value { set; }
|
Efl.Ui.Nstate.value { set; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_UI_TRANSLATABLE_PROTECTED
|
#define EFL_UI_TRANSLATABLE_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -933,7 +933,7 @@ _efl_ui_clock_efl_object_constructor(Eo *obj, Efl_Ui_Clock_Data *_pd EINA_UNUSED
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DATE_EDITOR);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_priv.h"
|
#include "elm_priv.h"
|
||||||
|
@ -1868,7 +1868,7 @@ _efl_ui_flip_efl_object_constructor(Eo *obj, Efl_Ui_Flip_Data *sd)
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
|
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -132,7 +132,7 @@ _efl_ui_frame_efl_object_constructor(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UNUSED
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FRAME);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FRAME);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_IMAGE_PROTECTED
|
#define EFL_ACCESS_IMAGE_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_LAYOUT_CALC_PROTECTED
|
#define EFL_LAYOUT_CALC_PROTECTED
|
||||||
|
@ -855,7 +855,7 @@ _efl_ui_image_efl_object_constructor(Eo *obj, Efl_Ui_Image_Data *pd)
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
|
||||||
|
|
||||||
pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE;
|
pd->scale_type = EFL_IMAGE_SCALE_TYPE_FIT_INSIDE;
|
||||||
pd->self = obj;
|
pd->self = obj;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_UI_SCROLL_MANAGER_PROTECTED
|
#define EFL_UI_SCROLL_MANAGER_PROTECTED
|
||||||
#define EFL_UI_SCROLLBAR_PROTECTED
|
#define EFL_UI_SCROLLBAR_PROTECTED
|
||||||
|
@ -1789,7 +1789,7 @@ _efl_ui_image_zoomable_efl_object_constructor(Eo *obj, Efl_Ui_Image_Zoomable_Dat
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
#define EFL_UI_WIDGET_PART_BG_PROTECTED
|
#define EFL_UI_WIDGET_PART_BG_PROTECTED
|
||||||
|
|
||||||
|
@ -2116,7 +2116,7 @@ _efl_ui_layout_efl_object_constructor(Eo *obj, Efl_Ui_Layout_Data *sd)
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
#define EFL_GFX_SIZE_HINT_PROTECTED
|
#define EFL_GFX_SIZE_HINT_PROTECTED
|
||||||
|
|
||||||
|
@ -465,7 +465,7 @@ _efl_ui_panes_efl_object_constructor(Eo *obj, Efl_Ui_Panes_Data *_pd EINA_UNUSED
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPLIT_PANE);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
#define EFL_ACCESS_VALUE_PROTECTED
|
#define EFL_ACCESS_VALUE_PROTECTED
|
||||||
|
|
||||||
|
@ -381,7 +381,7 @@ _efl_ui_progressbar_efl_object_constructor(Eo *obj, Efl_Ui_Progressbar_Data *_pd
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PROGRESS_BAR);
|
||||||
efl_ui_range_min_max_set(obj, 0.0, 1.0);
|
efl_ui_range_min_max_set(obj, 0.0, 1.0);
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
|
@ -196,7 +196,7 @@ _efl_ui_radio_efl_object_constructor(Eo *obj, Efl_Ui_Radio_Data *pd)
|
||||||
|
|
||||||
elm_layout_sizing_eval(obj);
|
elm_layout_sizing_eval(obj);
|
||||||
|
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
||||||
_elm_access_text_set
|
_elm_access_text_set
|
||||||
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
|
(_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
|
||||||
_elm_access_callback_set
|
_elm_access_callback_set
|
||||||
|
@ -323,11 +323,11 @@ _efl_ui_radio_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_State_Set
|
EOLIAN Efl_Access_State_Set
|
||||||
_efl_ui_radio_efl_access_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED)
|
_efl_ui_radio_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Radio_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_RADIO_CLASS));
|
||||||
if (obj == elm_radio_selected_object_get(obj))
|
if (obj == elm_radio_selected_object_get(obj))
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_CHECKED);
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content)
|
||||||
Efl.Ui.Widget.theme_apply;
|
Efl.Ui.Widget.theme_apply;
|
||||||
Efl.Ui.Widget.on_access_activate;
|
Efl.Ui.Widget.on_access_activate;
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Ui.Nstate.value { set; get; }
|
Efl.Ui.Nstate.value { set; get; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_VALUE_PROTECTED
|
#define EFL_ACCESS_VALUE_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
@ -1216,7 +1216,7 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
|
#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_VALUE_PROTECTED
|
#define EFL_ACCESS_VALUE_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_VALUE_PROTECTED
|
#define EFL_ACCESS_VALUE_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
|
@ -792,7 +792,7 @@ _efl_ui_spin_button_efl_object_constructor(Eo *obj, Efl_Ui_Spin_Button_Data *sd)
|
||||||
|
|
||||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||||
|
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SPIN_BUTTON);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -883,10 +883,10 @@ _efl_ui_spin_button_efl_access_value_increment_get(const Eo *obj EINA_UNUSED, Ef
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_efl_ui_spin_button_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
|
_efl_ui_spin_button_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Spin_Button_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_SPIN_BUTTON_CLASS));
|
||||||
if (name) return name;
|
if (name) return name;
|
||||||
const char *ret = elm_layout_text_get(obj, "elm.text");
|
const char *ret = elm_layout_text_get(obj, "elm.text");
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -68,7 +68,7 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Ui.Focus.Object.on_focus_update;
|
Efl.Ui.Focus.Object.on_focus_update;
|
||||||
Efl.Ui.Range.range_value { set; }
|
Efl.Ui.Range.range_value { set; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Value.value_and_text { get; set; }
|
Efl.Access.Value.value_and_text { get; set; }
|
||||||
Efl.Access.Value.range { get; }
|
Efl.Access.Value.range { get; }
|
||||||
Efl.Access.Value.increment { get; }
|
Efl.Access.Value.increment { get; }
|
||||||
|
|
|
@ -188,7 +188,7 @@ _efl_ui_table_efl_object_constructor(Eo *obj, Efl_Ui_Table_Data *pd)
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
pd->dir1 = EFL_UI_DIR_RIGHT;
|
pd->dir1 = EFL_UI_DIR_RIGHT;
|
||||||
pd->dir2 = EFL_UI_DIR_DOWN;
|
pd->dir2 = EFL_UI_DIR_DOWN;
|
||||||
|
|
|
@ -11,7 +11,7 @@ _efl_ui_table_static_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
|
||||||
|
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
gd = efl_data_scope_get(obj, EFL_UI_TABLE_CLASS);
|
gd = efl_data_scope_get(obj, EFL_UI_TABLE_CLASS);
|
||||||
gd->req_cols = 100;
|
gd->req_cols = 100;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_TEXT_PROTECTED
|
#define EFL_ACCESS_TEXT_PROTECTED
|
||||||
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
|
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
@ -2130,14 +2130,14 @@ _entry_changed_user_signal_cb(void *data,
|
||||||
atspi_info.content = edje_info->change.insert.content;
|
atspi_info.content = edje_info->change.insert.content;
|
||||||
atspi_info.pos = edje_info->change.insert.pos;
|
atspi_info.pos = edje_info->change.insert.pos;
|
||||||
atspi_info.len = edje_info->change.insert.plain_length;
|
atspi_info.len = edje_info->change.insert.plain_length;
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
|
||||||
}
|
}
|
||||||
else if (edje_info && !edje_info->insert)
|
else if (edje_info && !edje_info->insert)
|
||||||
{
|
{
|
||||||
atspi_info.content = edje_info->change.del.content;
|
atspi_info.content = edje_info->change.del.content;
|
||||||
atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
|
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;
|
atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2192,7 +2192,7 @@ _entry_cursor_changed_signal_cb(void *data,
|
||||||
_decoration_defer(obj);
|
_decoration_defer(obj);
|
||||||
|
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2203,7 +2203,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
|
||||||
{
|
{
|
||||||
efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
|
efl_event_callback_call(data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -3010,7 +3010,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
|
||||||
elm_widget_sub_object_parent_add(obj);
|
elm_widget_sub_object_parent_add(obj);
|
||||||
|
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
efl_access_object_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_ADD, _cb_added, NULL);
|
||||||
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
|
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
|
||||||
|
|
||||||
|
@ -3317,7 +3317,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password
|
||||||
sd->single_line = EINA_TRUE;
|
sd->single_line = EINA_TRUE;
|
||||||
sd->line_wrap = ELM_WRAP_NONE;
|
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));
|
efl_ui_text_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA));
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -3329,7 +3329,7 @@ _efl_ui_text_password_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password
|
||||||
_dnd_drop_cb, NULL);
|
_dnd_drop_cb, NULL);
|
||||||
|
|
||||||
efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
|
efl_ui_text_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
||||||
}
|
}
|
||||||
|
|
||||||
efl_ui_widget_theme_apply(obj);
|
efl_ui_widget_theme_apply(obj);
|
||||||
|
@ -4460,10 +4460,10 @@ _efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNU
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_efl_ui_text_efl_access_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
|
_efl_ui_text_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, EFL_UI_TEXT_CLASS));
|
||||||
|
|
||||||
if (efl_ui_text_interactive_editable_get(obj))
|
if (efl_ui_text_interactive_editable_get(obj))
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
|
||||||
|
@ -4472,10 +4472,10 @@ _efl_ui_text_efl_access_state_set_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_efl_ui_text_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd)
|
_efl_ui_text_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Text_Data *pd)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_TEXT_CLASS));
|
||||||
if (name && strncmp("", name, 1)) return name;
|
if (name && strncmp("", name, 1)) return name;
|
||||||
const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide");
|
const char *ret = edje_object_part_text_get(pd->entry_edje, "elm.guide");
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -337,8 +337,8 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
|
||||||
Efl.Ui.Widget.widget_sub_object_del;
|
Efl.Ui.Widget.widget_sub_object_del;
|
||||||
Elm.Interface_Scrollable.policy { set; }
|
Elm.Interface_Scrollable.policy { set; }
|
||||||
Elm.Interface_Scrollable.bounce_allow { set; }
|
Elm.Interface_Scrollable.bounce_allow { set; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Text.access_text { get; }
|
Efl.Access.Text.access_text { get; }
|
||||||
Efl.Access.Text.string { get; }
|
Efl.Access.Text.string { get; }
|
||||||
Efl.Access.Text.attribute { get; }
|
Efl.Access.Text.attribute { get; }
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <Emotion.h>
|
#include <Emotion.h>
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -261,7 +261,7 @@ _efl_ui_video_efl_object_constructor(Eo *obj, Efl_Ui_Video_Data *_pd EINA_UNUSED
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
#define EFL_UI_SCROLL_MANAGER_PROTECTED
|
#define EFL_UI_SCROLL_MANAGER_PROTECTED
|
||||||
|
@ -657,7 +657,7 @@ _efl_ui_view_list_efl_canvas_group_group_add(Eo *obj, Efl_Ui_View_List_Data *pd)
|
||||||
|
|
||||||
efl_gfx_visible_set(pd->pan_obj, EINA_TRUE);
|
efl_gfx_visible_set(pd->pan_obj, EINA_TRUE);
|
||||||
|
|
||||||
efl_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_DISABLED);
|
||||||
|
|
||||||
edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h);
|
edje_object_size_min_calc(wd->resize_obj, &min.w, &min.h);
|
||||||
efl_gfx_size_hint_restricted_min_set(obj, min);
|
efl_gfx_size_hint_restricted_min_set(obj, min);
|
||||||
|
@ -719,7 +719,7 @@ _efl_ui_view_list_efl_object_constructor(Eo *obj, Efl_Ui_View_List_Data *pd)
|
||||||
pd->obj = obj;
|
pd->obj = obj;
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
||||||
|
|
||||||
pd->segarray = efl_add(EFL_UI_VIEW_LIST_SEGARRAY_CLASS, obj, efl_ui_view_list_segarray_setup(efl_added, 32));
|
pd->segarray = efl_add(EFL_UI_VIEW_LIST_SEGARRAY_CLASS, obj, efl_ui_view_list_segarray_setup(efl_added, 32));
|
||||||
|
|
||||||
|
@ -970,12 +970,12 @@ _efl_ui_view_list_efl_ui_focus_composition_prepare(Eo *obj, Efl_Ui_View_List_Dat
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_efl_ui_view_list_efl_access_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd)
|
_efl_ui_view_list_efl_access_object_access_children_get(const Eo *obj, Efl_Ui_View_List_Data *pd)
|
||||||
{
|
{
|
||||||
Eina_List *ret = NULL, *ret2 = NULL;
|
Eina_List *ret = NULL, *ret2 = NULL;
|
||||||
|
|
||||||
ret = efl_ui_view_list_relayout_elements_get(pd->relayout);
|
ret = efl_ui_view_list_relayout_elements_get(pd->relayout);
|
||||||
ret2 = efl_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS));
|
ret2 = efl_access_object_access_children_get(efl_super(obj, EFL_UI_VIEW_LIST_CLASS));
|
||||||
|
|
||||||
return eina_list_merge(ret, ret2);
|
return eina_list_merge(ret, ret2);
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,7 @@ class Efl.Ui.View.List (Efl.Ui.Layout, Efl.Ui.View, Efl.Ui.Scrollable.Interactiv
|
||||||
// Elm.Interface.Atspi_Accessible.children { get; }
|
// Elm.Interface.Atspi_Accessible.children { get; }
|
||||||
// Elm.Interface.Atspi_Widget.Action.elm_actions { get; }
|
// Elm.Interface.Atspi_Widget.Action.elm_actions { get; }
|
||||||
// Efl.Access.Widget.Action.elm_actions { get; }
|
// Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
Efl.Access.Selection.selected_child_deselect;
|
Efl.Access.Selection.selected_child_deselect;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -1565,8 +1565,8 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
|
||||||
evas_object_size_hint_display_mode_get(obj));
|
evas_object_size_hint_display_mode_get(obj));
|
||||||
if (_elm_config->atspi_mode && !sd->on_create)
|
if (_elm_config->atspi_mode && !sd->on_create)
|
||||||
{
|
{
|
||||||
Efl_Access *aparent;
|
Efl_Access_Object *aparent;
|
||||||
aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN);
|
aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
if (aparent)
|
if (aparent)
|
||||||
efl_access_children_changed_added_signal_emit(aparent, sobj);
|
efl_access_children_changed_added_signal_emit(aparent, sobj);
|
||||||
}
|
}
|
||||||
|
@ -1643,8 +1643,8 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
|
||||||
}
|
}
|
||||||
if (_elm_config->atspi_mode && !sd->on_destroy)
|
if (_elm_config->atspi_mode && !sd->on_destroy)
|
||||||
{
|
{
|
||||||
Efl_Access *aparent;
|
Efl_Access_Object *aparent;
|
||||||
aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_MIXIN);
|
aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
if (aparent)
|
if (aparent)
|
||||||
efl_access_children_changed_del_signal_emit(aparent, sobj);
|
efl_access_children_changed_del_signal_emit(aparent, sobj);
|
||||||
}
|
}
|
||||||
|
@ -3967,7 +3967,7 @@ _elm_widget_item_efl_object_destructor(Eo *eo_item, Elm_Widget_Item_Data *item)
|
||||||
}
|
}
|
||||||
eina_hash_free(item->labels);
|
eina_hash_free(item->labels);
|
||||||
|
|
||||||
efl_access_attributes_clear(eo_item);
|
efl_access_object_attributes_clear(eo_item);
|
||||||
efl_access_removed(eo_item);
|
efl_access_removed(eo_item);
|
||||||
|
|
||||||
EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
|
EINA_MAGIC_SET(item, EINA_MAGIC_NONE);
|
||||||
|
@ -4184,8 +4184,8 @@ _elm_widget_item_accessible_plain_name_get(const Elm_Object_Item *item, const ch
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_widget_item_efl_access_state_set_get(const Eo *eo_item,
|
_elm_widget_item_efl_access_object_state_set_get(const Eo *eo_item,
|
||||||
Elm_Widget_Item_Data *item EINA_UNUSED)
|
Elm_Widget_Item_Data *item EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set states = 0;
|
Efl_Access_State_Set states = 0;
|
||||||
|
|
||||||
|
@ -5258,7 +5258,7 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
|
||||||
efl_ui_widget_parent_set(obj, parent);
|
efl_ui_widget_parent_set(obj, parent);
|
||||||
sd->on_create = EINA_FALSE;
|
sd->on_create = EINA_FALSE;
|
||||||
|
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
|
||||||
|
|
||||||
efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_event_changed, NULL);
|
efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _focus_event_changed, NULL);
|
||||||
|
|
||||||
|
@ -5286,7 +5286,7 @@ _efl_ui_widget_efl_object_destructor(Eo *obj, Elm_Widget_Smart_Data *sd)
|
||||||
efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj);
|
efl_event_callback_del(sd->manager.provider, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _manager_changed_cb, obj);
|
||||||
sd->manager.provider = NULL;
|
sd->manager.provider = NULL;
|
||||||
}
|
}
|
||||||
efl_access_attributes_clear(obj);
|
efl_access_object_attributes_clear(obj);
|
||||||
efl_access_removed(obj);
|
efl_access_removed(obj);
|
||||||
if (sd->logical.parent)
|
if (sd->logical.parent)
|
||||||
{
|
{
|
||||||
|
@ -5371,10 +5371,10 @@ _efl_ui_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *p
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
|
_efl_ui_widget_efl_access_object_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *ret, *name;
|
const char *ret, *name;
|
||||||
name = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
||||||
|
|
||||||
if (name) return name;
|
if (name) return name;
|
||||||
|
|
||||||
|
@ -5385,7 +5385,7 @@ _efl_ui_widget_efl_access_i18n_name_get(const Eo *obj, Elm_Widget_Smart_Data *_p
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
|
_efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
|
||||||
{
|
{
|
||||||
Eina_List *l, *accs = NULL;
|
Eina_List *l, *accs = NULL;
|
||||||
Evas_Object *widget;
|
Evas_Object *widget;
|
||||||
|
@ -5394,13 +5394,13 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid
|
||||||
EINA_LIST_FOREACH(pd->subobjs, l, widget)
|
EINA_LIST_FOREACH(pd->subobjs, l, widget)
|
||||||
{
|
{
|
||||||
if (!elm_object_widget_check(widget)) continue;
|
if (!elm_object_widget_check(widget)) continue;
|
||||||
if (!efl_isa(widget, EFL_ACCESS_MIXIN)) continue;
|
if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue;
|
||||||
type = efl_access_type_get(widget);
|
type = efl_access_object_access_type_get(widget);
|
||||||
if (type == EFL_ACCESS_TYPE_DISABLED) continue;
|
if (type == EFL_ACCESS_TYPE_DISABLED) continue;
|
||||||
if (type == EFL_ACCESS_TYPE_SKIPPED)
|
if (type == EFL_ACCESS_TYPE_SKIPPED)
|
||||||
{
|
{
|
||||||
Eina_List *children;
|
Eina_List *children;
|
||||||
children = efl_access_children_get(widget);
|
children = efl_access_object_access_children_get(widget);
|
||||||
accs = eina_list_merge(accs, children);
|
accs = eina_list_merge(accs, children);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -5410,11 +5410,11 @@ _efl_ui_widget_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Wid
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
|
_efl_ui_widget_efl_access_object_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set states = 0;
|
Efl_Access_State_Set states = 0;
|
||||||
|
|
||||||
states = efl_access_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
states = efl_access_object_state_set_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
||||||
|
|
||||||
if (evas_object_visible_get(obj))
|
if (evas_object_visible_get(obj))
|
||||||
{
|
{
|
||||||
|
@ -5439,14 +5439,14 @@ _efl_ui_widget_efl_access_state_set_get(const Eo *obj, Elm_Widget_Smart_Data *pd
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_efl_ui_widget_efl_access_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
|
_efl_ui_widget_efl_access_object_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *type = NULL;
|
const char *type = NULL;
|
||||||
const char *style = NULL;
|
const char *style = NULL;
|
||||||
Eina_List *attr_list = NULL;
|
Eina_List *attr_list = NULL;
|
||||||
Efl_Access_Attribute *attr = NULL;
|
Efl_Access_Attribute *attr = NULL;
|
||||||
|
|
||||||
attr_list = efl_access_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
attr_list = efl_access_object_attributes_get(efl_super(obj, EFL_UI_WIDGET_CLASS));
|
||||||
|
|
||||||
//Add type and style information in addition.
|
//Add type and style information in addition.
|
||||||
type = elm_widget_type_get(obj);
|
type = elm_widget_type_get(obj);
|
||||||
|
@ -5477,13 +5477,13 @@ _efl_ui_widget_efl_access_attributes_get(const Eo *obj, Elm_Widget_Smart_Data *p
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List *
|
EOLIAN static Eina_List *
|
||||||
_elm_widget_item_efl_access_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED)
|
_elm_widget_item_efl_access_object_attributes_get(const Eo *eo_item, Elm_Widget_Item_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *style = NULL;
|
const char *style = NULL;
|
||||||
Eina_List *attr_list = NULL;
|
Eina_List *attr_list = NULL;
|
||||||
Efl_Access_Attribute *attr = NULL;
|
Efl_Access_Attribute *attr = NULL;
|
||||||
|
|
||||||
attr_list = efl_access_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS));
|
attr_list = efl_access_object_attributes_get(efl_super(eo_item, ELM_WIDGET_ITEM_CLASS));
|
||||||
|
|
||||||
style = elm_object_item_style_get(eo_item);
|
style = elm_object_item_style_get(eo_item);
|
||||||
if (style)
|
if (style)
|
||||||
|
@ -5542,9 +5542,9 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd
|
||||||
if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
|
if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
|
||||||
return _efl_config_obj;
|
return _efl_config_obj;
|
||||||
|
|
||||||
if (klass == EFL_ACCESS_MIXIN)
|
if (klass == EFL_ACCESS_OBJECT_MIXIN)
|
||||||
{
|
{
|
||||||
Efl_Access_Type type = efl_access_type_get(obj);
|
Efl_Access_Type type = efl_access_object_access_type_get(obj);
|
||||||
if (type != EFL_ACCESS_TYPE_SKIPPED)
|
if (type != EFL_ACCESS_TYPE_SKIPPED)
|
||||||
return (Eo*)obj;
|
return (Eo*)obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ struct Efl.Ui.Widget.Focus_State {
|
||||||
logical : bool; [[$true if this is registered as logical currently]]
|
logical : bool; [[$true if this is registered as logical currently]]
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
|
abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
|
||||||
Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
|
Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
|
||||||
Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable,
|
Efl.Ui.Base, Efl.Ui.Cursor, Efl.Ui.Translatable,
|
||||||
Efl.Selection, Efl.Ui.Dnd)
|
Efl.Selection, Efl.Ui.Dnd)
|
||||||
|
@ -585,10 +585,10 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access,
|
||||||
Efl.Canvas.Group.group_calculate;
|
Efl.Canvas.Group.group_calculate;
|
||||||
Efl.Canvas.Group.group_member_del;
|
Efl.Canvas.Group.group_member_del;
|
||||||
Efl.Canvas.Group.group_member_add;
|
Efl.Canvas.Group.group_member_add;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.attributes { get; }
|
Efl.Access.Object.attributes { get; }
|
||||||
Efl.Access.Component.focus_grab;
|
Efl.Access.Component.focus_grab;
|
||||||
Efl.Ui.Focus.Object.focus_manager { get; }
|
Efl.Ui.Focus.Object.focus_manager { get; }
|
||||||
Efl.Ui.Focus.Object.focus_parent { get; }
|
Efl.Ui.Focus.Object.focus_parent { get; }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_INPUT_EVENT_PROTECTED
|
#define EFL_INPUT_EVENT_PROTECTED
|
||||||
|
@ -2271,7 +2271,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
|
||||||
{
|
{
|
||||||
Eo *root;
|
Eo *root;
|
||||||
efl_access_window_created_signal_emit(obj);
|
efl_access_window_created_signal_emit(obj);
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
if (root)
|
if (root)
|
||||||
efl_access_children_changed_added_signal_emit(root, obj);
|
efl_access_children_changed_added_signal_emit(root, obj);
|
||||||
}
|
}
|
||||||
|
@ -2325,7 +2325,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
{
|
{
|
||||||
Eo *root;
|
Eo *root;
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
efl_access_window_destroyed_signal_emit(obj);
|
efl_access_window_destroyed_signal_emit(obj);
|
||||||
if (root)
|
if (root)
|
||||||
efl_access_children_changed_del_signal_emit(root, obj);
|
efl_access_children_changed_del_signal_emit(root, obj);
|
||||||
|
@ -4324,7 +4324,7 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
|
||||||
efreet_desktop_free(d);
|
efreet_desktop_free(d);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
efl_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(sd->icon, EFL_ACCESS_TYPE_DISABLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
|
edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
|
||||||
|
@ -5376,7 +5376,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U
|
||||||
elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
|
elm_win_focus_highlight_animate_set(obj, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_WINDOW);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_WINDOW);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_window_created_signal_emit(obj);
|
efl_access_window_created_signal_emit(obj);
|
||||||
|
|
||||||
|
@ -6955,10 +6955,10 @@ _efl_ui_win_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_efl_ui_win_efl_access_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
|
_efl_ui_win_efl_access_object_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
|
||||||
|
|
||||||
if (elm_win_focus_get(obj))
|
if (elm_win_focus_get(obj))
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_ACTIVE);
|
||||||
|
@ -6967,10 +6967,10 @@ _efl_ui_win_efl_access_state_set_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNU
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_efl_ui_win_efl_access_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
|
_efl_ui_win_efl_access_object_i18n_name_get(const Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
ret = efl_access_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
const char *name = elm_win_title_get(obj);
|
const char *name = elm_win_title_get(obj);
|
||||||
return name;
|
return name;
|
||||||
|
@ -7024,7 +7024,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
|
||||||
return (Eo *)obj;
|
return (Eo *)obj;
|
||||||
|
|
||||||
// attach all kinds of windows directly to ATSPI application root object
|
// attach all kinds of windows directly to ATSPI application root object
|
||||||
if (klass == EFL_ACCESS_MIXIN) return efl_access_root_get(EFL_ACCESS_MIXIN);
|
if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
|
if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
|
||||||
return pd->provider;
|
return pd->provider;
|
||||||
|
|
|
@ -788,8 +788,8 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Acces
|
||||||
Efl.Ui.Focus.Object.on_focus_update;
|
Efl.Ui.Focus.Object.on_focus_update;
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Ui.Widget.focus_manager_create;
|
Efl.Ui.Widget.focus_manager_create;
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Component.extents { get; }
|
Efl.Access.Component.extents { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Input.State.modifier_enabled { get; }
|
Efl.Input.State.modifier_enabled { get; }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define EFL_UI_TRANSLATABLE_PROTECTED
|
#define EFL_UI_TRANSLATABLE_PROTECTED
|
||||||
|
@ -373,7 +373,7 @@ _elm_combobox_efl_object_constructor(Eo *obj, Elm_Combobox_Data *sd)
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
|
||||||
|
|
||||||
//hover-parent
|
//hover-parent
|
||||||
sd->hover_parent = elm_object_top_widget_get(obj);
|
sd->hover_parent = elm_object_top_widget_get(obj);
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_UI_WIDGET_PROTECTED
|
#define EFL_UI_WIDGET_PROTECTED
|
||||||
//#define EFL_UI_WIDGET_BETA
|
//#define EFL_UI_WIDGET_BETA
|
||||||
|
@ -1145,7 +1145,7 @@ _elm_ctxpopup_efl_object_constructor(Eo *obj, Elm_Ctxpopup_Data *_pd EINA_UNUSED
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1532,10 +1532,10 @@ _elm_ctxpopup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_ctxpopup_efl_access_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
|
_elm_ctxpopup_efl_access_object_state_set_get(const Eo *obj, Elm_Ctxpopup_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -2051,7 +2051,7 @@ _elm_fileselector_efl_object_constructor(Eo *obj, Elm_Fileselector_Data *sd)
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILE_CHOOSER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_priv.h"
|
#include "elm_priv.h"
|
||||||
|
@ -274,7 +274,7 @@ _elm_fileselector_button_efl_object_constructor(Eo *obj, Elm_Fileselector_Button
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_priv.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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_GROUPING);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GROUPING);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -705,7 +705,7 @@ _elm_hoversel_efl_object_constructor(Eo *obj, Elm_Hoversel_Data *_pd EINA_UNUSED
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PUSH_BUTTON);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1042,7 +1042,7 @@ _elm_hoversel_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_elm_hoversel_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd)
|
_elm_hoversel_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd)
|
||||||
{
|
{
|
||||||
return eina_list_clone(pd->items);
|
return eina_list_clone(pd->items);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
//#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
|
//#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
@ -748,12 +748,12 @@ _item_new(Elm_Multibuttonentry_Data *sd,
|
||||||
return NULL;
|
return NULL;
|
||||||
WIDGET_ITEM_DATA_SET(eo_item, data);
|
WIDGET_ITEM_DATA_SET(eo_item, data);
|
||||||
|
|
||||||
efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
||||||
|
|
||||||
ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
|
ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
|
||||||
VIEW(item) = elm_layout_add(obj);
|
VIEW(item) = elm_layout_add(obj);
|
||||||
|
|
||||||
efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_DISABLED);
|
||||||
|
|
||||||
if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON,
|
if (!elm_layout_theme_set(VIEW(item), "multibuttonentry", PART_NAME_BUTTON,
|
||||||
elm_widget_style_get(obj)))
|
elm_widget_style_get(obj)))
|
||||||
|
@ -1683,7 +1683,7 @@ _elm_multibuttonentry_efl_object_constructor(Eo *obj, Elm_Multibuttonentry_Data
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL);
|
||||||
|
|
||||||
//listen to manager changes here
|
//listen to manager changes here
|
||||||
efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL);
|
efl_event_callback_add(obj, EFL_UI_FOCUS_OBJECT_EVENT_MANAGER_CHANGED, _legacy_manager_changed_cb, NULL);
|
||||||
|
@ -1977,18 +1977,18 @@ _elm_multibuttonentry_class_constructor(Efl_Class *klass)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_multibuttonentry_efl_access_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd)
|
_elm_multibuttonentry_efl_access_object_access_children_get(const Eo *obj, Elm_Multibuttonentry_Data *sd)
|
||||||
{
|
{
|
||||||
Eina_List *ret;
|
Eina_List *ret;
|
||||||
ret = efl_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
|
ret = efl_access_object_access_children_get(efl_super(obj, ELM_MULTIBUTTONENTRY_CLASS));
|
||||||
return eina_list_merge(eina_list_clone(sd->items), ret);
|
return eina_list_merge(eina_list_clone(sd->items), ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_multibuttonentry_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item)
|
_elm_multibuttonentry_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *item)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
|
|
||||||
ret = elm_object_part_text_get(VIEW(item), "elm.btn.text");
|
ret = elm_object_part_text_get(VIEW(item), "elm.btn.text");
|
||||||
|
@ -1996,12 +1996,12 @@ _elm_multibuttonentry_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Multibu
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_multibuttonentry_item_efl_access_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED)
|
_elm_multibuttonentry_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Multibuttonentry_Item_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
Eina_Bool sel;
|
Eina_Bool sel;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS));
|
||||||
|
|
||||||
sel = elm_obj_multibuttonentry_item_selected_get(eo_it);
|
sel = elm_obj_multibuttonentry_item_selected_get(eo_it);
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
|
@ -544,7 +544,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it,
|
||||||
if (nit->title_label) strncat(buf, " ", 1);
|
if (nit->title_label) strncat(buf, " ", 1);
|
||||||
strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
|
strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
|
||||||
}
|
}
|
||||||
efl_access_i18n_name_set(eo_it, buf);
|
efl_access_object_i18n_name_set(eo_it, buf);
|
||||||
|
|
||||||
elm_layout_sizing_eval(WIDGET(nit));
|
elm_layout_sizing_eval(WIDGET(nit));
|
||||||
}
|
}
|
||||||
|
@ -1267,8 +1267,8 @@ _item_new(Evas_Object *obj,
|
||||||
ELM_NAVIFRAME_DATA_GET(obj, sd);
|
ELM_NAVIFRAME_DATA_GET(obj, sd);
|
||||||
|
|
||||||
eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
|
eo_item = efl_add(ELM_NAVIFRAME_ITEM_CLASS, obj);
|
||||||
efl_access_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB);
|
efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_PAGE_TAB);
|
||||||
efl_access_i18n_name_set(eo_item, (char*)title_label);
|
efl_access_object_i18n_name_set(eo_item, (char*)title_label);
|
||||||
|
|
||||||
if (!eo_item)
|
if (!eo_item)
|
||||||
{
|
{
|
||||||
|
@ -1593,7 +1593,7 @@ _elm_naviframe_efl_object_constructor(Eo *obj, Elm_Naviframe_Data *sd)
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PAGE_TAB_LIST);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1950,7 +1950,7 @@ _elm_naviframe_item_pop_cb_set(Eo *eo_item EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_naviframe_item_efl_access_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
|
_elm_naviframe_item_efl_access_object_access_children_get(const Eo *eo_item EINA_UNUSED, Elm_Naviframe_Item_Data *nit)
|
||||||
{
|
{
|
||||||
Eina_List *ret = NULL;
|
Eina_List *ret = NULL;
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <Emotion.h>
|
#include <Emotion.h>
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -1523,7 +1523,7 @@ _elm_popup_efl_object_constructor(Eo *obj, Elm_Popup_Data *_pd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_DIALOG);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_DIALOG);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1794,10 +1794,10 @@ _elm_popup_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, E
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
|
_elm_popup_efl_access_object_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, MY_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MODAL);
|
||||||
|
|
||||||
|
@ -1805,12 +1805,12 @@ _elm_popup_efl_access_state_set_get(const Eo *obj, Elm_Popup_Data *sd EINA_UNUSE
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_popup_efl_access_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd)
|
_elm_popup_efl_access_object_i18n_name_get(const Eo *obj, Elm_Popup_Data *sd)
|
||||||
{
|
{
|
||||||
const char *name = NULL;
|
const char *name = NULL;
|
||||||
Eina_Strbuf *buf;
|
Eina_Strbuf *buf;
|
||||||
|
|
||||||
name = efl_access_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(obj, ELM_POPUP_CLASS));
|
||||||
if (name) return name;
|
if (name) return name;
|
||||||
|
|
||||||
buf = eina_strbuf_new();
|
buf = eina_strbuf_new();
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#define EFL_CANVAS_OBJECT_PROTECTED
|
#define EFL_CANVAS_OBJECT_PROTECTED
|
||||||
#define EFL_CANVAS_GROUP_PROTECTED
|
#define EFL_CANVAS_GROUP_PROTECTED
|
||||||
#define EFL_CANVAS_GROUP_BETA
|
#define EFL_CANVAS_GROUP_BETA
|
||||||
#define EFL_ACCESS_BETA
|
#define EFL_ACCESS_OBJECT_BETA
|
||||||
#define EFL_ACCESS_COMPONENT_BETA
|
#define EFL_ACCESS_COMPONENT_BETA
|
||||||
#define EFL_ACCESS_EDITABLE_TEXT_BETA
|
#define EFL_ACCESS_EDITABLE_TEXT_BETA
|
||||||
#define EFL_ACCESS_IMAGE_BETA
|
#define EFL_ACCESS_IMAGE_BETA
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -1522,10 +1522,10 @@ _elm_access_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_access_efl_access_state_set_get(const Eo *obj, void *pd EINA_UNUSED)
|
_elm_access_efl_access_object_state_set_get(const Eo *obj, void *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_ACCESS_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_ACCESS_CLASS));
|
||||||
|
|
||||||
Elm_Access_Info *info = _elm_access_info_get(obj);
|
Elm_Access_Info *info = _elm_access_info_get(obj);
|
||||||
if (info && !evas_object_visible_get(info->part_object))
|
if (info && !evas_object_visible_get(info->part_object))
|
||||||
|
|
|
@ -10,6 +10,6 @@ class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
|
||||||
Efl.Ui.Widget.on_access_activate;
|
Efl.Ui.Widget.on_access_activate;
|
||||||
Efl.Ui.Focus.Object.on_focus_update;
|
Efl.Ui.Focus.Object.on_focus_update;
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SLIDER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "elementary_config.h"
|
#include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_widget.h"
|
#include "elm_widget.h"
|
||||||
|
@ -26,7 +26,7 @@ _elm_atspi_app_object_efl_object_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_O
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
_elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Eina_List *l, *accs = NULL;
|
Eina_List *l, *accs = NULL;
|
||||||
Evas_Object *win;
|
Evas_Object *win;
|
||||||
|
@ -34,9 +34,9 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED,
|
||||||
EINA_LIST_FOREACH(_elm_win_list, l, win)
|
EINA_LIST_FOREACH(_elm_win_list, l, win)
|
||||||
{
|
{
|
||||||
Efl_Access_Type type;
|
Efl_Access_Type type;
|
||||||
if (!efl_isa(win, EFL_ACCESS_MIXIN))
|
if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
continue;
|
continue;
|
||||||
type = efl_access_type_get(win);
|
type = efl_access_object_access_type_get(win);
|
||||||
if (type == EFL_ACCESS_TYPE_REGULAR)
|
if (type == EFL_ACCESS_TYPE_REGULAR)
|
||||||
accs = eina_list_append(accs, win);
|
accs = eina_list_append(accs, win);
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ _elm_atspi_app_object_efl_access_access_children_get(const Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_atspi_app_object_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
_elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
ret = elm_app_name_get();
|
ret = elm_app_name_get();
|
||||||
|
@ -53,19 +53,19 @@ _elm_atspi_app_object_efl_access_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_At
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_atspi_app_object_efl_access_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
|
_elm_atspi_app_object_efl_access_object_description_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd)
|
||||||
{
|
{
|
||||||
return _pd->descr;
|
return _pd->descr;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static void
|
EOLIAN static void
|
||||||
_elm_atspi_app_object_efl_access_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr)
|
_elm_atspi_app_object_efl_access_object_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr)
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&_pd->descr, descr);
|
eina_stringshare_replace(&_pd->descr, descr);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_Role
|
EOLIAN static Efl_Access_Role
|
||||||
_elm_atspi_app_object_efl_access_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
_elm_atspi_app_object_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
return EFL_ACCESS_ROLE_APPLICATION;
|
return EFL_ACCESS_ROLE_APPLICATION;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
class Elm.Atspi.App.Object (Efl.Object, Efl.Access)
|
class Elm.Atspi.App.Object (Efl.Object, Efl.Access.Object)
|
||||||
{
|
{
|
||||||
[[AT-SPI application object class]]
|
[[AT-SPI application object class]]
|
||||||
legacy_prefix: elm_atspi_app_object;
|
legacy_prefix: elm_atspi_app_object;
|
||||||
data: Elm_Atspi_App_Object_Data;
|
data: Elm_Atspi_App_Object_Data;
|
||||||
implements {
|
implements {
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.description { get; set; }
|
Efl.Access.Object.description { get; set; }
|
||||||
Efl.Access.role { get; }
|
Efl.Access.Object.role { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_ACTION_PROTECTED
|
#define EFL_ACCESS_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_VALUE_PROTECTED
|
#define EFL_ACCESS_VALUE_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
|
@ -151,14 +151,14 @@ typedef struct {
|
||||||
} Elm_Atspi_Bridge_Event_Handler;
|
} Elm_Atspi_Bridge_Event_Handler;
|
||||||
|
|
||||||
static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
|
static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
|
||||||
{ EFL_ACCESS_EVENT_CHILDREN_CHANGED, _children_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, _children_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_PROPERTY_CHANGED, _property_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, _property_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, _bounds_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_STATE_CHANGED, _state_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, _state_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, _visible_data_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
|
{ EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, _active_descendant_changed_signal_send},
|
||||||
{ EFL_ACCESS_EVENT_ADDED, _on_object_add},
|
{ EFL_ACCESS_OBJECT_EVENT_ADDED, _on_object_add},
|
||||||
{ EFL_ACCESS_EVENT_REMOVED, _on_object_del},
|
{ EFL_ACCESS_OBJECT_EVENT_REMOVED, _on_object_del},
|
||||||
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, _window_signal_send},
|
||||||
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, _window_signal_send},
|
||||||
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
|
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, _window_signal_send},
|
||||||
|
@ -487,9 +487,9 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
|
||||||
AtspiRole atspi_role = ATSPI_ROLE_INVALID;
|
AtspiRole atspi_role = ATSPI_ROLE_INVALID;
|
||||||
Efl_Access_Role role;
|
Efl_Access_Role role;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
role = efl_access_role_get(obj);
|
role = efl_access_object_role_get(obj);
|
||||||
|
|
||||||
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -506,9 +506,9 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
role_name = efl_access_role_name_get(obj);
|
role_name = efl_access_object_role_name_get(obj);
|
||||||
|
|
||||||
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -524,9 +524,9 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
l_role_name = efl_access_localized_role_name_get(obj);
|
l_role_name = efl_access_object_localized_role_name_get(obj);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
|
||||||
|
|
||||||
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
Eldbus_Message *ret = eldbus_message_method_return_new(msg);
|
||||||
|
@ -547,9 +547,9 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
|
||||||
Eldbus_Message_Iter *iter, *iter_array;
|
Eldbus_Message_Iter *iter, *iter_array;
|
||||||
Eo *children;
|
Eo *children;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
children_list = efl_access_children_get(obj);
|
children_list = efl_access_object_access_children_get(obj);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
|
||||||
Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
|
Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
_bridge_iter_object_reference_append(bridge, iter, root);
|
_bridge_iter_object_reference_append(bridge, iter, root);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -606,12 +606,12 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
if (!ret) goto error;
|
if (!ret) goto error;
|
||||||
|
|
||||||
attrs = efl_access_attributes_get(obj);
|
attrs = efl_access_object_attributes_get(obj);
|
||||||
|
|
||||||
iter = eldbus_message_iter_get(ret);
|
iter = eldbus_message_iter_get(ret);
|
||||||
if (!iter) goto error;
|
if (!iter) goto error;
|
||||||
|
@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
|
||||||
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -727,7 +727,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
|
||||||
iter_array = eldbus_message_iter_container_new(iter, 'a', "u");
|
iter_array = eldbus_message_iter_container_new(iter, 'a', "u");
|
||||||
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
||||||
|
|
||||||
states = efl_access_state_set_get(obj);
|
states = efl_access_object_state_set_get(obj);
|
||||||
|
|
||||||
atspi_states = _elm_atspi_state_set_to_atspi_state_set(states);
|
atspi_states = _elm_atspi_state_set_to_atspi_state_set(states);
|
||||||
|
|
||||||
|
@ -754,12 +754,12 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
|
||||||
Eldbus_Message *ret;
|
Eldbus_Message *ret;
|
||||||
int idx = -1;
|
int idx = -1;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
|
||||||
idx = efl_access_index_in_parent_get(obj);
|
idx = efl_access_object_index_in_parent_get(obj);
|
||||||
|
|
||||||
eldbus_message_arguments_append(ret, "i", idx);
|
eldbus_message_arguments_append(ret, "i", idx);
|
||||||
|
|
||||||
|
@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
|
||||||
Eldbus_Message *ret;
|
Eldbus_Message *ret;
|
||||||
Eldbus_Message_Iter *iter;
|
Eldbus_Message_Iter *iter;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
if (!eldbus_message_arguments_get(msg, "i", &idx))
|
if (!eldbus_message_arguments_get(msg, "i", &idx))
|
||||||
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
||||||
|
@ -787,7 +787,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
|
||||||
iter = eldbus_message_iter_get(ret);
|
iter = eldbus_message_iter_get(ret);
|
||||||
children = efl_access_children_get(obj);
|
children = efl_access_object_access_children_get(obj);
|
||||||
|
|
||||||
child = eina_list_nth(children, idx);
|
child = eina_list_nth(children, idx);
|
||||||
_bridge_iter_object_reference_append(bridge, iter, child);
|
_bridge_iter_object_reference_append(bridge, iter, child);
|
||||||
|
@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
|
||||||
Eina_List *l, *l2;
|
Eina_List *l, *l2;
|
||||||
Efl_Access_Relation_Set rels;
|
Efl_Access_Relation_Set rels;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -818,7 +818,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
|
||||||
iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))");
|
iter_array = eldbus_message_iter_container_new(iter, 'a', "(ua(so))");
|
||||||
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
||||||
|
|
||||||
rels = efl_access_relation_set_get(obj);
|
rels = efl_access_object_relation_set_get(obj);
|
||||||
|
|
||||||
EINA_LIST_FOREACH(rels, l, rel)
|
EINA_LIST_FOREACH(rels, l, rel)
|
||||||
{
|
{
|
||||||
|
@ -1221,7 +1221,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
Eina_Rect r;
|
Eina_Rect r;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
if (!eldbus_message_arguments_get(msg, "u", &type))
|
if (!eldbus_message_arguments_get(msg, "u", &type))
|
||||||
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
||||||
|
@ -1247,7 +1247,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
|
||||||
int x = -1, y = -1;
|
int x = -1, y = -1;
|
||||||
Eina_Bool screen_coords;
|
Eina_Bool screen_coords;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
if (!eldbus_message_arguments_get(msg, "u", &type))
|
if (!eldbus_message_arguments_get(msg, "u", &type))
|
||||||
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
|
||||||
|
@ -1275,7 +1275,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
int w = -1, h = -1;
|
int w = -1, h = -1;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
ret = eldbus_message_method_return_new(msg);
|
ret = eldbus_message_method_return_new(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
|
||||||
|
@ -2029,7 +2029,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
|
||||||
tmp = path + len; /* Skip over the prefix */
|
tmp = path + len; /* Skip over the prefix */
|
||||||
if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
|
if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
|
||||||
{
|
{
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2043,7 +2043,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = efl_isa(eo, EFL_ACCESS_MIXIN) ? eo : NULL;
|
ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL;
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -2056,7 +2056,7 @@ _path_from_object(const Eo *eo)
|
||||||
|
|
||||||
if (!eo)
|
if (!eo)
|
||||||
return ATSPI_DBUS_PATH_NULL;
|
return ATSPI_DBUS_PATH_NULL;
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
if (eo == root)
|
if (eo == root)
|
||||||
snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
|
snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
|
||||||
|
@ -2074,11 +2074,11 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
|
||||||
Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error);
|
ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error);
|
||||||
|
|
||||||
if (!strcmp(property, "Name"))
|
if (!strcmp(property, "Name"))
|
||||||
{
|
{
|
||||||
ret = efl_access_i18n_name_get(obj);
|
ret = efl_access_object_i18n_name_get(obj);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = "";
|
ret = "";
|
||||||
eldbus_message_iter_basic_append(iter, 's', ret);
|
eldbus_message_iter_basic_append(iter, 's', ret);
|
||||||
|
@ -2086,7 +2086,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
|
||||||
}
|
}
|
||||||
else if (!strcmp(property, "Description"))
|
else if (!strcmp(property, "Description"))
|
||||||
{
|
{
|
||||||
ret = efl_access_description_get(obj);
|
ret = efl_access_object_description_get(obj);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
ret = "";
|
ret = "";
|
||||||
eldbus_message_iter_basic_append(iter, 's', ret);
|
eldbus_message_iter_basic_append(iter, 's', ret);
|
||||||
|
@ -2094,9 +2094,9 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
|
||||||
}
|
}
|
||||||
else if (!strcmp(property, "Parent"))
|
else if (!strcmp(property, "Parent"))
|
||||||
{
|
{
|
||||||
ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
|
Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
|
||||||
role = efl_access_role_get(obj);
|
role = efl_access_object_role_get(obj);
|
||||||
if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
|
if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
|
||||||
_object_desktop_reference_append(iter);
|
_object_desktop_reference_append(iter);
|
||||||
else
|
else
|
||||||
|
@ -2106,7 +2106,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
|
||||||
else if (!strcmp(property, "ChildCount"))
|
else if (!strcmp(property, "ChildCount"))
|
||||||
{
|
{
|
||||||
Eina_List *l = NULL;
|
Eina_List *l = NULL;
|
||||||
l = efl_access_children_get(obj);
|
l = efl_access_object_access_children_get(obj);
|
||||||
eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l));
|
eldbus_message_iter_basic_append(iter, 'i', eina_list_count(l));
|
||||||
eina_list_free(l);
|
eina_list_free(l);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
@ -2234,18 +2234,18 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
|
||||||
Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
|
||||||
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
Eo *obj = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, request_msg, error);
|
ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error);
|
||||||
|
|
||||||
if (!strcmp(property, "ImageDescription"))
|
if (!strcmp(property, "ImageDescription"))
|
||||||
{
|
{
|
||||||
value = efl_access_description_get(obj);
|
value = efl_access_object_description_get(obj);
|
||||||
value = value ? value : "";
|
value = value ? value : "";
|
||||||
eldbus_message_iter_basic_append(iter, 's', value);
|
eldbus_message_iter_basic_append(iter, 's', value);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
if (!strcmp(property, "ImageLocale"))
|
if (!strcmp(property, "ImageLocale"))
|
||||||
{
|
{
|
||||||
value = efl_access_translation_domain_get(obj);
|
value = efl_access_object_translation_domain_get(obj);
|
||||||
value = value ? value : "";
|
value = value ? value : "";
|
||||||
eldbus_message_iter_basic_append(iter, 's', value);
|
eldbus_message_iter_basic_append(iter, 's', value);
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
@ -2575,7 +2575,7 @@ _collection_match_states_lookup(Eo *obj, struct collection_match_rule *rule)
|
||||||
Eina_Bool ret = EINA_FALSE;
|
Eina_Bool ret = EINA_FALSE;
|
||||||
Efl_Access_State_Set ss;
|
Efl_Access_State_Set ss;
|
||||||
|
|
||||||
ss = efl_access_state_set_get(obj);
|
ss = efl_access_object_state_set_get(obj);
|
||||||
|
|
||||||
switch (rule->statematchtype)
|
switch (rule->statematchtype)
|
||||||
{
|
{
|
||||||
|
@ -2605,7 +2605,7 @@ _collection_match_roles_lookup(Eo *obj, struct collection_match_rule *rule)
|
||||||
Efl_Access_Role role;
|
Efl_Access_Role role;
|
||||||
int64_t role_set;
|
int64_t role_set;
|
||||||
|
|
||||||
role = efl_access_role_get(obj);
|
role = efl_access_object_role_get(obj);
|
||||||
|
|
||||||
if (role >= 64)
|
if (role >= 64)
|
||||||
{
|
{
|
||||||
|
@ -2725,7 +2725,7 @@ _collection_match_attributes_lookup(Eo *obj, struct collection_match_rule *rule)
|
||||||
Eina_Bool ret = EINA_FALSE;
|
Eina_Bool ret = EINA_FALSE;
|
||||||
Eina_List *obj_attribs;
|
Eina_List *obj_attribs;
|
||||||
|
|
||||||
obj_attribs = efl_access_attributes_get(obj);
|
obj_attribs = efl_access_object_attributes_get(obj);
|
||||||
|
|
||||||
switch (rule->attributematchtype)
|
switch (rule->attributematchtype)
|
||||||
{
|
{
|
||||||
|
@ -2756,7 +2756,7 @@ _collection_sort_order_canonical(struct collection_match_rule *rule, Eina_List *
|
||||||
{
|
{
|
||||||
int i = index;
|
int i = index;
|
||||||
Eina_List *children;
|
Eina_List *children;
|
||||||
children = efl_access_children_get(obj);
|
children = efl_access_object_access_children_get(obj);
|
||||||
long acount = eina_list_count(children);
|
long acount = eina_list_count(children);
|
||||||
Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE;
|
Eina_Bool prev = pobj ? EINA_TRUE : EINA_FALSE;
|
||||||
|
|
||||||
|
@ -2820,21 +2820,21 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
|
||||||
flag = EINA_TRUE;
|
flag = EINA_TRUE;
|
||||||
|
|
||||||
/* Get the current nodes index in it's parent and the parent object. */
|
/* Get the current nodes index in it's parent and the parent object. */
|
||||||
indexinparent = efl_access_index_in_parent_get(obj);
|
indexinparent = efl_access_object_index_in_parent_get(obj);
|
||||||
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
if ((indexinparent > 0) && ((max == 0) || (count < max)))
|
if ((indexinparent > 0) && ((max == 0) || (count < max)))
|
||||||
{
|
{
|
||||||
/* there are still some siblings to visit so get the previous sibling
|
/* there are still some siblings to visit so get the previous sibling
|
||||||
and get it's last descendant.
|
and get it's last descendant.
|
||||||
First, get the previous sibling */
|
First, get the previous sibling */
|
||||||
children = efl_access_children_get(parent);
|
children = efl_access_object_access_children_get(parent);
|
||||||
nextobj = eina_list_nth(children, indexinparent - 1);
|
nextobj = eina_list_nth(children, indexinparent - 1);
|
||||||
eina_list_free(children);
|
eina_list_free(children);
|
||||||
|
|
||||||
/* Now, drill down the right side to the last descendant */
|
/* Now, drill down the right side to the last descendant */
|
||||||
do {
|
do {
|
||||||
children = efl_access_children_get(nextobj);
|
children = efl_access_object_access_children_get(nextobj);
|
||||||
if (children) nextobj = eina_list_last_data_get(children);
|
if (children) nextobj = eina_list_last_data_get(children);
|
||||||
eina_list_free(children);
|
eina_list_free(children);
|
||||||
} while (children);
|
} while (children);
|
||||||
|
@ -2877,8 +2877,8 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
|
||||||
while ((max == 0 || count < max) && obj && obj != collection)
|
while ((max == 0 || count < max) && obj && obj != collection)
|
||||||
{
|
{
|
||||||
Eo *parent;
|
Eo *parent;
|
||||||
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
idx = efl_access_index_in_parent_get(obj);
|
idx = efl_access_object_index_in_parent_get(obj);
|
||||||
count = _collection_sort_order_canonical(rule, list, count, max, parent,
|
count = _collection_sort_order_canonical(rule, list, count, max, parent,
|
||||||
idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
|
idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
|
||||||
obj = parent;
|
obj = parent;
|
||||||
|
@ -2954,8 +2954,8 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
|
||||||
result = eina_list_reverse(result);
|
result = eina_list_reverse(result);
|
||||||
break;
|
break;
|
||||||
case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
|
case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
|
||||||
idx = efl_access_index_in_parent_get(current);
|
idx = efl_access_object_index_in_parent_get(current);
|
||||||
parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
_collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
|
_collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
|
||||||
break;
|
break;
|
||||||
case ATSPI_Collection_TREE_RESTRICT_SIBLING:
|
case ATSPI_Collection_TREE_RESTRICT_SIBLING:
|
||||||
|
@ -2983,7 +2983,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
|
||||||
AtspiCollectionSortOrder sortby;
|
AtspiCollectionSortOrder sortby;
|
||||||
Eina_List *result = NULL;
|
Eina_List *result = NULL;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
iter = eldbus_message_iter_get(msg);
|
iter = eldbus_message_iter_get(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
||||||
|
@ -2995,7 +2995,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
|
||||||
|
|
||||||
current = _bridge_object_from_path(bridge, obj_path);
|
current = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
if (!_collection_iter_match_rule_get(rule_iter, &rule))
|
if (!_collection_iter_match_rule_get(rule_iter, &rule))
|
||||||
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
|
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
|
||||||
|
@ -3016,7 +3016,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
|
||||||
Eo *collection = obj;
|
Eo *collection = obj;
|
||||||
|
|
||||||
if (limit)
|
if (limit)
|
||||||
collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_MIXIN);
|
collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
switch (tree)
|
switch (tree)
|
||||||
{
|
{
|
||||||
|
@ -3055,7 +3055,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
|
||||||
Eina_List *result = NULL;
|
Eina_List *result = NULL;
|
||||||
Eina_Bool limit;
|
Eina_Bool limit;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
iter = eldbus_message_iter_get(msg);
|
iter = eldbus_message_iter_get(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
||||||
|
@ -3067,7 +3067,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
|
||||||
|
|
||||||
current = _bridge_object_from_path(bridge, obj_path);
|
current = _bridge_object_from_path(bridge, obj_path);
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
if (!_collection_iter_match_rule_get(rule_iter, &rule))
|
if (!_collection_iter_match_rule_get(rule_iter, &rule))
|
||||||
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
|
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
|
||||||
|
@ -3095,7 +3095,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess
|
||||||
AtspiCollectionSortOrder sortby;
|
AtspiCollectionSortOrder sortby;
|
||||||
Eina_List *result = NULL;
|
Eina_List *result = NULL;
|
||||||
|
|
||||||
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_MIXIN, msg);
|
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg);
|
||||||
|
|
||||||
iter = eldbus_message_iter_get(msg);
|
iter = eldbus_message_iter_get(msg);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
||||||
|
@ -3169,7 +3169,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
|
||||||
iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
|
iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
|
||||||
if (!iter_array) return;
|
if (!iter_array) return;
|
||||||
|
|
||||||
if (efl_isa(obj, EFL_ACCESS_MIXIN))
|
if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
{
|
{
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
|
||||||
|
@ -3182,7 +3182,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
|
||||||
if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
|
if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
|
||||||
if (efl_isa(obj, EFL_ACCESS_MIXIN))
|
if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
|
||||||
if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
|
if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
|
||||||
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
|
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
|
||||||
|
@ -3204,9 +3204,9 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
Efl_Access_State_Set states;
|
Efl_Access_State_Set states;
|
||||||
Efl_Access_Role role;
|
Efl_Access_Role role;
|
||||||
Eo *root;
|
Eo *root;
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
role = efl_access_role_get(data);
|
role = efl_access_object_role_get(data);
|
||||||
|
|
||||||
iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL);
|
iter_struct = eldbus_message_iter_container_new(iter_array, 'r', NULL);
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(iter_struct, EINA_TRUE);
|
||||||
|
@ -3218,7 +3218,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
_bridge_iter_object_reference_append(bridge, iter_struct, root);
|
_bridge_iter_object_reference_append(bridge, iter_struct, root);
|
||||||
|
|
||||||
Eo *parent = NULL;
|
Eo *parent = NULL;
|
||||||
parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_MIXIN);
|
parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN);
|
||||||
/* Marshall parent */
|
/* Marshall parent */
|
||||||
if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
|
if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
|
||||||
_object_desktop_reference_append(iter_struct);
|
_object_desktop_reference_append(iter_struct);
|
||||||
|
@ -3229,7 +3229,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
Eina_List *children_list = NULL, *l;
|
Eina_List *children_list = NULL, *l;
|
||||||
Eo *child;
|
Eo *child;
|
||||||
|
|
||||||
children_list = efl_access_children_get(data);
|
children_list = efl_access_object_access_children_get(data);
|
||||||
iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)");
|
iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "(so)");
|
||||||
EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
|
EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
|
||||||
|
|
||||||
|
@ -3244,7 +3244,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
|
|
||||||
/* Marshall name */
|
/* Marshall name */
|
||||||
const char *name = NULL;
|
const char *name = NULL;
|
||||||
name = efl_access_i18n_name_get(data);
|
name = efl_access_object_i18n_name_get(data);
|
||||||
if (!name)
|
if (!name)
|
||||||
name = "";
|
name = "";
|
||||||
|
|
||||||
|
@ -3255,7 +3255,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
|
|
||||||
/* Marshall description */
|
/* Marshall description */
|
||||||
const char* description = NULL;
|
const char* description = NULL;
|
||||||
description = efl_access_description_get(data);
|
description = efl_access_object_description_get(data);
|
||||||
if (!description)
|
if (!description)
|
||||||
description = "";
|
description = "";
|
||||||
eldbus_message_iter_basic_append(iter_struct, 's', description);
|
eldbus_message_iter_basic_append(iter_struct, 's', description);
|
||||||
|
@ -3264,7 +3264,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
|
||||||
iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u");
|
iter_sub_array = eldbus_message_iter_container_new(iter_struct, 'a', "u");
|
||||||
EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
|
EINA_SAFETY_ON_NULL_GOTO(iter_sub_array, fail);
|
||||||
|
|
||||||
states = efl_access_state_set_get(data);
|
states = efl_access_object_state_set_get(data);
|
||||||
|
|
||||||
unsigned int s1 = states & 0xFFFFFFFF;
|
unsigned int s1 = states & 0xFFFFFFFF;
|
||||||
unsigned int s2 = (states >> 32) & 0xFFFFFFFF;
|
unsigned int s2 = (states >> 32) & 0xFFFFFFFF;
|
||||||
|
@ -3301,7 +3301,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
|
||||||
iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
|
iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
|
||||||
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
|
||||||
|
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
to_process = eina_list_append(NULL, root);
|
to_process = eina_list_append(NULL, root);
|
||||||
|
|
||||||
while (to_process)
|
while (to_process)
|
||||||
|
@ -3312,7 +3312,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
|
||||||
_bridge_object_register(bridge, obj);
|
_bridge_object_register(bridge, obj);
|
||||||
|
|
||||||
Eina_List *children;
|
Eina_List *children;
|
||||||
children = efl_access_children_get(obj);
|
children = efl_access_object_access_children_get(obj);
|
||||||
to_process = eina_list_merge(to_process, children);
|
to_process = eina_list_merge(to_process, children);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3706,7 +3706,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
|
||||||
"Embed");
|
"Embed");
|
||||||
Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
|
Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
|
||||||
|
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
_bridge_iter_object_reference_append(bridge, iter, root);
|
_bridge_iter_object_reference_append(bridge, iter, root);
|
||||||
eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
|
eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
|
||||||
|
|
||||||
|
@ -3719,7 +3719,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
|
||||||
Eo *root;
|
Eo *root;
|
||||||
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
|
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
|
||||||
|
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
|
Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
|
||||||
ATSPI_DBUS_PATH_ROOT,
|
ATSPI_DBUS_PATH_ROOT,
|
||||||
|
@ -4004,7 +4004,7 @@ _active_descendant_changed_signal_send(void *data, const Efl_Event *event)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
idx = efl_access_index_in_parent_get(child);
|
idx = efl_access_object_index_in_parent_get(child);
|
||||||
|
|
||||||
_bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
|
_bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
|
||||||
&_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
|
&_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
|
||||||
|
@ -4038,7 +4038,7 @@ _children_changed_signal_send(void *data, const Efl_Event *event)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
idx = efl_access_index_in_parent_get(ev_data->child);
|
idx = efl_access_object_index_in_parent_get(ev_data->child);
|
||||||
_bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
|
_bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
|
||||||
&_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
|
&_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
|
||||||
idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
|
idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
|
||||||
|
@ -4119,7 +4119,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
|
||||||
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
|
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
|
||||||
|
|
||||||
path = _path_from_object(obj);
|
path = _path_from_object(obj);
|
||||||
root = efl_access_root_get(EFL_ACCESS_MIXIN);
|
root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN);
|
||||||
|
|
||||||
msg = eldbus_message_signal_new(path, infc, signal->name);
|
msg = eldbus_message_signal_new(path, infc, signal->name);
|
||||||
if (!msg) return;
|
if (!msg) return;
|
||||||
|
@ -4369,7 +4369,7 @@ _a11y_connection_shutdown(Eo *bridge)
|
||||||
if (pd->event_hash) eina_hash_free(pd->event_hash);
|
if (pd->event_hash) eina_hash_free(pd->event_hash);
|
||||||
pd->event_hash = NULL;
|
pd->event_hash = NULL;
|
||||||
|
|
||||||
efl_access_event_handler_del(EFL_ACCESS_MIXIN, pd->event_hdlr);
|
efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr);
|
||||||
pd->event_hdlr = NULL;
|
pd->event_hdlr = NULL;
|
||||||
|
|
||||||
efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
|
efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
|
||||||
|
@ -4461,7 +4461,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
|
||||||
_elm_atspi_bridge_app_register(obj);
|
_elm_atspi_bridge_app_register(obj);
|
||||||
|
|
||||||
// register accessible object event listener
|
// register accessible object event listener
|
||||||
pd->event_hdlr = efl_access_event_handler_add(EFL_ACCESS_MIXIN, _bridge_accessible_event_dispatch, obj);
|
pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -4539,9 +4539,9 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
|
||||||
{
|
{
|
||||||
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
|
ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
|
||||||
|
|
||||||
if (!efl_isa(obj, EFL_ACCESS_MIXIN))
|
if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN))
|
||||||
{
|
{
|
||||||
WRN("Unable to register class w/o Efl_Access!");
|
WRN("Unable to register class w/o Efl_Access_Object!");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -375,8 +375,8 @@ _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(obj, EFL_ACCESS_TYPE_SKIPPED);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
#define EFL_UI_FOCUS_OBJECT_PROTECTED
|
#define EFL_UI_FOCUS_OBJECT_PROTECTED
|
||||||
|
@ -1614,7 +1614,7 @@ _elm_calendar_efl_object_constructor(Eo *obj, Elm_Calendar_Data *sd)
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_CALENDAR);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_CALENDAR);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_TEXT);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TEXT);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,8 +44,8 @@ class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Act
|
||||||
Elm.Widget.Item.item_focus { get; set; }
|
Elm.Widget.Item.item_focus { get; set; }
|
||||||
Efl.Ui.Focus.Object.focus { set; }
|
Efl.Ui.Focus.Object.focus { set; }
|
||||||
Efl.Ui.Focus.Object.focus_geometry { get; }
|
Efl.Ui.Focus.Object.focus_geometry { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
|
@ -1804,7 +1804,7 @@ _elm_color_item_efl_object_constructor(Eo *eo_item, Elm_Color_Item_Data *item)
|
||||||
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
|
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
|
||||||
elm_wdg_item_access_register(eo_item);
|
elm_wdg_item_access_register(eo_item);
|
||||||
|
|
||||||
efl_access_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_RADIO_BUTTON);
|
||||||
|
|
||||||
return eo_item;
|
return eo_item;
|
||||||
}
|
}
|
||||||
|
@ -2276,7 +2276,7 @@ _elm_colorselector_efl_object_constructor(Eo *obj, Elm_Colorselector_Data *_pd E
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_COLOR_CHOOSER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_COLOR_CHOOSER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -2601,11 +2601,11 @@ _elm_colorselector_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_U
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_colorselector_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
|
_elm_colorselector_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd)
|
||||||
{
|
{
|
||||||
Eina_List *ret = NULL;
|
Eina_List *ret = NULL;
|
||||||
|
|
||||||
ret = efl_access_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS));
|
ret = efl_access_object_access_children_get(efl_super(obj, ELM_COLORSELECTOR_CLASS));
|
||||||
// filter - out box contiainer
|
// filter - out box contiainer
|
||||||
ret = eina_list_remove(ret, sd->palette_box);
|
ret = eina_list_remove(ret, sd->palette_box);
|
||||||
// append items as colorselector children
|
// append items as colorselector children
|
||||||
|
@ -2615,12 +2615,12 @@ _elm_colorselector_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_color_item_efl_access_state_set_get(const Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED)
|
_elm_color_item_efl_access_object_state_set_get(const Eo *obj, Elm_Color_Item_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
Eina_Bool sel;
|
Eina_Bool sel;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_COLOR_ITEM_CLASS));
|
||||||
|
|
||||||
sel = elm_obj_color_item_selected_get(obj);
|
sel = elm_obj_color_item_selected_get(obj);
|
||||||
|
|
||||||
|
@ -2678,14 +2678,14 @@ _elm_color_item_efl_access_widget_action_elm_actions_get(const Eo *eo_it EINA_UN
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_color_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Color_Item_Data *it)
|
_elm_color_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Color_Item_Data *it)
|
||||||
{
|
{
|
||||||
Eina_Strbuf *buf;
|
Eina_Strbuf *buf;
|
||||||
const char *color_name = NULL;
|
const char *color_name = NULL;
|
||||||
const char *name;
|
const char *name;
|
||||||
char *accessible_name;
|
char *accessible_name;
|
||||||
|
|
||||||
name = efl_access_i18n_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_COLOR_ITEM_CLASS));
|
||||||
if (name) return name;
|
if (name) return name;
|
||||||
|
|
||||||
buf = eina_strbuf_new();
|
buf = eina_strbuf_new();
|
||||||
|
|
|
@ -115,7 +115,7 @@ class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
|
||||||
Efl.Ui.Widget.on_access_update;
|
Efl.Ui.Widget.on_access_update;
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
color,item,selected; [[Called when color item was selected]]
|
color,item,selected; [[Called when color item was selected]]
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -1001,7 +1001,7 @@ _elm_conformant_efl_object_constructor(Eo *obj, Elm_Conformant_Data *sd)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
Efl_Event event = {};
|
Efl_Event event = {};
|
||||||
event.object = sd->win;
|
event.object = sd->win;
|
||||||
|
|
|
@ -239,7 +239,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action,
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Ui.Widget.focused_item { get; }
|
Efl.Ui.Widget.focused_item { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Part.part;
|
Efl.Part.part;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include "elm_priv.h"
|
#include "elm_priv.h"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_UI_TRANSLATABLE_PROTECTED
|
#define EFL_UI_TRANSLATABLE_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PANEL);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PANEL);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
#define EFL_UI_TRANSLATABLE_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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_LAYOUT_CALC_PROTECTED
|
#define EFL_LAYOUT_CALC_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_TEXT_PROTECTED
|
#define EFL_ACCESS_TEXT_PROTECTED
|
||||||
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
|
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
@ -2218,14 +2218,14 @@ _entry_changed_user_signal_cb(void *data,
|
||||||
atspi_info.content = edje_info->change.insert.content;
|
atspi_info.content = edje_info->change.insert.content;
|
||||||
atspi_info.pos = edje_info->change.insert.pos;
|
atspi_info.pos = edje_info->change.insert.pos;
|
||||||
atspi_info.len = edje_info->change.insert.plain_length;
|
atspi_info.len = edje_info->change.insert.plain_length;
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
|
||||||
}
|
}
|
||||||
else if (edje_info && !edje_info->insert)
|
else if (edje_info && !edje_info->insert)
|
||||||
{
|
{
|
||||||
atspi_info.content = edje_info->change.del.content;
|
atspi_info.content = edje_info->change.del.content;
|
||||||
atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
|
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;
|
atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2250,7 +2250,7 @@ _entry_preedit_changed_signal_cb(void *data,
|
||||||
atspi_info.content = text;
|
atspi_info.content = text;
|
||||||
atspi_info.pos = edje_info->change.insert.pos;
|
atspi_info.pos = edje_info->change.insert.pos;
|
||||||
atspi_info.len = edje_info->change.insert.plain_length;
|
atspi_info.len = edje_info->change.insert.plain_length;
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN,
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN,
|
||||||
data,
|
data,
|
||||||
EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
|
EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
|
||||||
&atspi_info);
|
&atspi_info);
|
||||||
|
@ -2342,7 +2342,7 @@ _entry_selection_changed_signal_cb(void *data,
|
||||||
_selection_store(ELM_SEL_TYPE_PRIMARY, data);
|
_selection_store(ELM_SEL_TYPE_PRIMARY, data);
|
||||||
_update_selection_handler(data);
|
_update_selection_handler(data);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2453,7 +2453,7 @@ _entry_cursor_changed_signal_cb(void *data,
|
||||||
efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
|
efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
|
||||||
|
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -2465,7 +2465,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
|
||||||
efl_event_callback_legacy_call
|
efl_event_callback_legacy_call
|
||||||
(data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
|
(data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
|
||||||
if (_elm_config->atspi_mode)
|
if (_elm_config->atspi_mode)
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -4104,7 +4104,7 @@ _elm_entry_efl_object_constructor(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
efl_access_object_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_ADD, _cb_added, NULL);
|
||||||
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
|
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_DEL, _cb_deleted, NULL);
|
||||||
|
|
||||||
|
@ -4189,7 +4189,7 @@ _elm_entry_password_set(Eo *obj, Elm_Entry_Data *sd, Eina_Bool password)
|
||||||
sd->line_wrap = ELM_WRAP_NONE;
|
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));
|
elm_entry_input_hint_set(obj, ((sd->input_hints & ~ELM_INPUT_HINT_AUTO_COMPLETE) | ELM_INPUT_HINT_SENSITIVE_DATA));
|
||||||
_entry_selection_callbacks_unregister(obj);
|
_entry_selection_callbacks_unregister(obj);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -4202,7 +4202,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));
|
elm_entry_input_hint_set(obj, ((sd->input_hints | ELM_INPUT_HINT_AUTO_COMPLETE) & ~ELM_INPUT_HINT_SENSITIVE_DATA));
|
||||||
_entry_selection_callbacks_register(obj);
|
_entry_selection_callbacks_register(obj);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
|
||||||
}
|
}
|
||||||
|
|
||||||
efl_ui_widget_theme_apply(obj);
|
efl_ui_widget_theme_apply(obj);
|
||||||
|
@ -6094,10 +6094,10 @@ _elm_entry_efl_access_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_entry_efl_access_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
|
_elm_entry_efl_access_object_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_ENTRY_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_ENTRY_CLASS));
|
||||||
|
|
||||||
if (elm_entry_editable_get(obj))
|
if (elm_entry_editable_get(obj))
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_EDITABLE);
|
||||||
|
@ -6106,10 +6106,10 @@ _elm_entry_efl_access_state_set_get(const Eo *obj, Elm_Entry_Data *_pd EINA_UNUS
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_entry_efl_access_i18n_name_get(const Eo *obj, Elm_Entry_Data *sd)
|
_elm_entry_efl_access_object_i18n_name_get(const Eo *obj, Elm_Entry_Data *sd)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
name = efl_access_i18n_name_get(efl_super(obj, ELM_ENTRY_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(obj, ELM_ENTRY_CLASS));
|
||||||
if (name && strncmp("", name, 1)) return name;
|
if (name && strncmp("", name, 1)) return name;
|
||||||
|
|
||||||
if (sd->password) return NULL;
|
if (sd->password) return NULL;
|
||||||
|
|
|
@ -851,8 +851,8 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
|
||||||
Efl.Ui.Widget.widget_sub_object_del;
|
Efl.Ui.Widget.widget_sub_object_del;
|
||||||
Elm.Interface_Scrollable.policy { set; }
|
Elm.Interface_Scrollable.policy { set; }
|
||||||
Elm.Interface_Scrollable.bounce_allow { set; }
|
Elm.Interface_Scrollable.bounce_allow { set; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Text.access_text { get; }
|
Efl.Access.Text.access_text { get; }
|
||||||
Efl.Access.Text.string { get; }
|
Efl.Access.Text.string { get; }
|
||||||
Efl.Access.Text.attribute { get; }
|
Efl.Access.Text.attribute { get; }
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -664,7 +664,7 @@ _elm_flipselector_efl_object_constructor(Eo *obj, Elm_Flipselector_Data *sd)
|
||||||
sd->obj = obj;
|
sd->obj = obj;
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -3961,7 +3961,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));
|
eo_it = efl_constructor(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
|
||||||
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
||||||
efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
||||||
|
|
||||||
return eo_it;
|
return eo_it;
|
||||||
}
|
}
|
||||||
|
@ -4274,7 +4274,7 @@ _elm_gengrid_efl_object_constructor(Eo *obj, Elm_Gengrid_Data *sd)
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_TREE_TABLE);
|
||||||
|
|
||||||
efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _gengrid_element_focused, obj);
|
efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _gengrid_element_focused, obj);
|
||||||
|
|
||||||
|
@ -5382,12 +5382,12 @@ _elm_gengrid_item_select_mode_get(const Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_State_Set
|
EOLIAN Efl_Access_State_Set
|
||||||
_elm_gengrid_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED)
|
_elm_gengrid_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
Eina_Bool sel;
|
Eina_Bool sel;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
|
||||||
|
|
||||||
sel = elm_obj_gengrid_item_selected_get(eo_it);
|
sel = elm_obj_gengrid_item_selected_get(eo_it);
|
||||||
|
|
||||||
|
@ -5400,13 +5400,13 @@ _elm_gengrid_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EIN
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN const char*
|
EOLIAN const char*
|
||||||
_elm_gengrid_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it)
|
_elm_gengrid_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
Eina_Strbuf *buf;
|
Eina_Strbuf *buf;
|
||||||
char *accessible_name;
|
char *accessible_name;
|
||||||
|
|
||||||
ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_GENGRID_ITEM_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
|
|
||||||
buf = eina_strbuf_new();
|
buf = eina_strbuf_new();
|
||||||
|
@ -5582,7 +5582,7 @@ _elm_gengrid_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_elm_gengrid_efl_access_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd)
|
_elm_gengrid_efl_access_object_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd)
|
||||||
{
|
{
|
||||||
Eina_List *ret = NULL, *ret2 = NULL;
|
Eina_List *ret = NULL, *ret2 = NULL;
|
||||||
Elm_Gen_Item *it;
|
Elm_Gen_Item *it;
|
||||||
|
@ -5590,17 +5590,17 @@ _elm_gengrid_efl_access_access_children_get(const Eo *obj, Elm_Gengrid_Data *sd)
|
||||||
EINA_INLIST_FOREACH(sd->items, it)
|
EINA_INLIST_FOREACH(sd->items, it)
|
||||||
ret = eina_list_append(ret, EO_OBJ(it));
|
ret = eina_list_append(ret, EO_OBJ(it));
|
||||||
|
|
||||||
ret2 = efl_access_children_get(efl_super(obj, ELM_GENGRID_CLASS));
|
ret2 = efl_access_object_access_children_get(efl_super(obj, ELM_GENGRID_CLASS));
|
||||||
|
|
||||||
return eina_list_merge(ret, ret2);
|
return eina_list_merge(ret, ret2);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_State_Set
|
EOLIAN Efl_Access_State_Set
|
||||||
_elm_gengrid_efl_access_state_set_get(const Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
|
_elm_gengrid_efl_access_object_state_set_get(const Eo *obj, Elm_Gengrid_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_GENGRID_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENGRID_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS);
|
||||||
|
|
||||||
|
|
|
@ -514,8 +514,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.item_loop_enabled { get; set; }
|
||||||
Elm.Interface_Scrollable.bounce_allow { set; }
|
Elm.Interface_Scrollable.bounce_allow { set; }
|
||||||
Elm.Interface_Scrollable.policy { get; set; }
|
Elm.Interface_Scrollable.policy { get; set; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
|
|
|
@ -228,8 +228,8 @@ class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui
|
||||||
Elm.Widget.Item.tooltip_unset;
|
Elm.Widget.Item.tooltip_unset;
|
||||||
Elm.Widget.Item.cursor { set; }
|
Elm.Widget.Item.cursor { set; }
|
||||||
Elm.Widget.Item.cursor_unset;
|
Elm.Widget.Item.cursor_unset;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Ui.Focus.Object.prepare_logical_none_recursive;
|
Efl.Ui.Focus.Object.prepare_logical_none_recursive;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -5842,7 +5842,7 @@ _elm_genlist_efl_object_constructor(Eo *obj, Elm_Genlist_Data *sd)
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
||||||
|
|
||||||
efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _genlist_element_focused, obj);
|
efl_event_callback_add(obj, EFL_UI_FOCUS_MANAGER_EVENT_FOCUSED, _genlist_element_focused, obj);
|
||||||
|
|
||||||
|
@ -6200,7 +6200,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));
|
eo_it = efl_constructor(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
|
||||||
|
|
||||||
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
||||||
efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
||||||
|
|
||||||
return eo_it;
|
return eo_it;
|
||||||
}
|
}
|
||||||
|
@ -8598,12 +8598,12 @@ _elm_genlist_item_select_mode_get(const Eo *eo_it EINA_UNUSED, Elm_Gen_Item *it)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_State_Set
|
EOLIAN Efl_Access_State_Set
|
||||||
_elm_genlist_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED)
|
_elm_genlist_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
Eina_Bool sel;
|
Eina_Bool sel;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
|
||||||
|
|
||||||
sel = elm_obj_genlist_item_selected_get(eo_it);
|
sel = elm_obj_genlist_item_selected_get(eo_it);
|
||||||
|
|
||||||
|
@ -8623,13 +8623,13 @@ _elm_genlist_item_efl_access_state_set_get(const Eo *eo_it, Elm_Gen_Item *it EIN
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN const char*
|
EOLIAN const char*
|
||||||
_elm_genlist_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it)
|
_elm_genlist_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Gen_Item *it)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
Eina_Strbuf *buf;
|
Eina_Strbuf *buf;
|
||||||
char *accessible_name;
|
char *accessible_name;
|
||||||
|
|
||||||
ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_GENLIST_ITEM_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
|
|
||||||
buf = eina_strbuf_new();
|
buf = eina_strbuf_new();
|
||||||
|
@ -8849,7 +8849,7 @@ _elm_genlist_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED,
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_elm_genlist_efl_access_access_children_get(const Eo *obj, Elm_Genlist_Data *sd)
|
_elm_genlist_efl_access_object_access_children_get(const Eo *obj, Elm_Genlist_Data *sd)
|
||||||
{
|
{
|
||||||
Eina_List *ret = NULL, *ret2 = NULL;
|
Eina_List *ret = NULL, *ret2 = NULL;
|
||||||
Elm_Gen_Item *it;
|
Elm_Gen_Item *it;
|
||||||
|
@ -8857,17 +8857,17 @@ _elm_genlist_efl_access_access_children_get(const Eo *obj, Elm_Genlist_Data *sd)
|
||||||
EINA_INLIST_FOREACH(sd->items, it)
|
EINA_INLIST_FOREACH(sd->items, it)
|
||||||
ret = eina_list_append(ret, EO_OBJ(it));
|
ret = eina_list_append(ret, EO_OBJ(it));
|
||||||
|
|
||||||
ret2 = efl_access_children_get(efl_super(obj, ELM_GENLIST_CLASS));
|
ret2 = efl_access_object_access_children_get(efl_super(obj, ELM_GENLIST_CLASS));
|
||||||
|
|
||||||
return eina_list_merge(ret, ret2);
|
return eina_list_merge(ret, ret2);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Efl_Access_State_Set
|
EOLIAN Efl_Access_State_Set
|
||||||
_elm_genlist_efl_access_state_set_get(const Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED)
|
_elm_genlist_efl_access_object_state_set_get(const Eo *obj, Elm_Genlist_Data *sd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_GENLIST_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_GENLIST_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_MANAGES_DESCENDANTS);
|
||||||
|
|
||||||
|
|
|
@ -543,8 +543,8 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
|
||||||
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
|
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
|
||||||
Elm.Interface_Scrollable.bounce_allow { get; set; }
|
Elm.Interface_Scrollable.bounce_allow { get; set; }
|
||||||
Elm.Interface_Scrollable.policy { get; set; }
|
Elm.Interface_Scrollable.policy { get; set; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
|
|
|
@ -422,8 +422,8 @@ class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy)
|
||||||
Elm.Widget.Item.tooltip_unset;
|
Elm.Widget.Item.tooltip_unset;
|
||||||
Elm.Widget.Item.cursor { set; }
|
Elm.Widget.Item.cursor { set; }
|
||||||
Elm.Widget.Item.cursor_unset;
|
Elm.Widget.Item.cursor_unset;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Ui.Focus.Object.prepare_logical_none_recursive;
|
Efl.Ui.Focus.Object.prepare_logical_none_recursive;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
|
||||||
|
@ -358,7 +358,7 @@ _elm_glview_version_constructor(Eo *obj, Elm_Glview_Data *sd,
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ANIMATION);
|
||||||
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
|
efl_event_callback_add(obj, EFL_EVENT_CALLBACK_ADD, _cb_added, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
#define EFL_UI_FOCUS_COMPOSITION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_FILLER);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
|
@ -695,7 +695,7 @@ _elm_hover_efl_object_constructor(Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_POPUP_MENU);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -853,10 +853,10 @@ _elm_hover_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, E
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_hover_efl_access_state_set_get(const Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
|
_elm_hover_efl_access_object_state_set_get(const Eo *obj, Elm_Hover_Data *pd EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set states;
|
Efl_Access_State_Set states;
|
||||||
states = efl_access_state_set_get(efl_super(obj, MY_CLASS));
|
states = efl_access_object_state_set_get(efl_super(obj, MY_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(states, EFL_ACCESS_STATE_MODAL);
|
STATE_TYPE_SET(states, EFL_ACCESS_STATE_MODAL);
|
||||||
return states;
|
return states;
|
||||||
|
|
|
@ -70,7 +70,7 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
|
||||||
Efl.Ui.Widget.widget_parent { get; set; }
|
Efl.Ui.Widget.widget_parent { get; set; }
|
||||||
Efl.Ui.Widget.widget_sub_object_del;
|
Efl.Ui.Widget.widget_sub_object_del;
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Part.part;
|
Efl.Part.part;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
|
|
|
@ -102,7 +102,7 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable,
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Ui.Autorepeat.autorepeat_supported { get; }
|
Efl.Ui.Autorepeat.autorepeat_supported { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
dismissed; [[Called when hoversel is dismissed]]
|
dismissed; [[Called when hoversel is dismissed]]
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_ICON);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ICON);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_COMPONENT_PROTECTED
|
#define EFL_ACCESS_COMPONENT_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -543,7 +543,7 @@ _elm_index_item_efl_object_constructor(Eo *obj, Elm_Index_Item_Data *it)
|
||||||
{
|
{
|
||||||
obj = efl_constructor(efl_super(obj, ELM_INDEX_ITEM_CLASS));
|
obj = efl_constructor(efl_super(obj, ELM_INDEX_ITEM_CLASS));
|
||||||
it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
|
it->base = efl_data_scope_get(obj, ELM_WIDGET_ITEM_CLASS);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_RADIO_MENU_ITEM);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_RADIO_MENU_ITEM);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1211,7 +1211,7 @@ _elm_index_efl_object_constructor(Eo *obj, Elm_Index_Data *_pd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_SCROLL_BAR);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_SCROLL_BAR);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -1677,18 +1677,18 @@ _item_action_activate(Eo *obj, const char *params EINA_UNUSED EINA_UNUSED)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_index_efl_access_access_children_get(const Eo *obj, Elm_Index_Data *data)
|
_elm_index_efl_access_object_access_children_get(const Eo *obj, Elm_Index_Data *data)
|
||||||
{
|
{
|
||||||
Eina_List *ret;
|
Eina_List *ret;
|
||||||
ret = efl_access_children_get(efl_super(obj, ELM_INDEX_CLASS));
|
ret = efl_access_object_access_children_get(efl_super(obj, ELM_INDEX_CLASS));
|
||||||
return eina_list_merge(eina_list_clone(data->items), ret);
|
return eina_list_merge(eina_list_clone(data->items), ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_index_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_Index_Item_Data *data)
|
_elm_index_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_Index_Item_Data *data)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
name = efl_access_i18n_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS));
|
name = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_INDEX_ITEM_CLASS));
|
||||||
if (name) return name;
|
if (name) return name;
|
||||||
|
|
||||||
return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter);
|
return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter);
|
||||||
|
|
|
@ -200,7 +200,7 @@ class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
|
||||||
Efl.Ui.Widget.theme_apply;
|
Efl.Ui.Widget.theme_apply;
|
||||||
Efl.Ui.Widget.on_access_update;
|
Efl.Ui.Widget.on_access_update;
|
||||||
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
|
Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $vertical.]] }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
changed; [[Called when index changed]]
|
changed; [[Called when index changed]]
|
||||||
|
|
|
@ -44,7 +44,7 @@ class Elm.Index.Item(Elm.Widget.Item, Efl.Access.Widget.Action, Efl.Ui.Legacy)
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Object.destructor;
|
Efl.Object.destructor;
|
||||||
Elm.Widget.Item.access_register;
|
Elm.Widget.Item.access_register;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "efl_access.h"
|
#include "efl_access_object.h"
|
||||||
#include "efl_access_text.h"
|
#include "efl_access_text.h"
|
||||||
#include "efl_access_widget_action.h"
|
#include "efl_access_widget_action.h"
|
||||||
#include "efl_access_window.h"
|
#include "efl_access_window.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -86,7 +86,7 @@ _elm_inwin_efl_object_constructor(Eo *obj, Elm_Inwin_Data *pd EINA_UNUSED)
|
||||||
|
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_GLASS_PANE);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define ELM_LAYOUT_PROTECTED
|
#define ELM_LAYOUT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LABEL);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LABEL);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
|
@ -2119,12 +2119,12 @@ _elm_list_item_elm_widget_item_item_focus_get(const Eo *eo_it, Elm_List_Item_Dat
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_list_item_efl_access_state_set_get(const Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED)
|
_elm_list_item_efl_access_object_state_set_get(const Eo *eo_it, Elm_List_Item_Data *data EINA_UNUSED)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
Eina_Bool sel;
|
Eina_Bool sel;
|
||||||
|
|
||||||
ret = efl_access_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
|
||||||
|
|
||||||
if (elm_object_item_disabled_get(eo_it))
|
if (elm_object_item_disabled_get(eo_it))
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -2141,10 +2141,10 @@ _elm_list_item_efl_access_state_set_get(const Eo *eo_it, Elm_List_Item_Data *dat
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_list_item_efl_access_i18n_name_get(const Eo *eo_it, Elm_List_Item_Data *data)
|
_elm_list_item_efl_access_object_i18n_name_get(const Eo *eo_it, Elm_List_Item_Data *data)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
ret = efl_access_i18n_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
return _elm_widget_item_accessible_plain_name_get(eo_it, data->label);
|
return _elm_widget_item_accessible_plain_name_get(eo_it, data->label);
|
||||||
}
|
}
|
||||||
|
@ -2271,7 +2271,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));
|
eo_it = efl_constructor(efl_super(eo_it, ELM_LIST_ITEM_CLASS));
|
||||||
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
it->base = efl_data_scope_get(eo_it, ELM_WIDGET_ITEM_CLASS);
|
||||||
efl_access_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
efl_access_object_role_set(eo_it, EFL_ACCESS_ROLE_LIST_ITEM);
|
||||||
|
|
||||||
return eo_it;
|
return eo_it;
|
||||||
}
|
}
|
||||||
|
@ -2324,7 +2324,7 @@ _item_new(Evas_Object *obj,
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
(it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
|
(it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
|
||||||
obj);
|
obj);
|
||||||
efl_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(it->icon, EFL_ACCESS_TYPE_DISABLED);
|
||||||
elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE);
|
elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE);
|
||||||
}
|
}
|
||||||
if (it->end)
|
if (it->end)
|
||||||
|
@ -2333,7 +2333,7 @@ _item_new(Evas_Object *obj,
|
||||||
evas_object_event_callback_add
|
evas_object_event_callback_add
|
||||||
(it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
|
(it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
|
||||||
obj);
|
obj);
|
||||||
efl_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(it->end, EFL_ACCESS_TYPE_DISABLED);
|
||||||
elm_widget_tree_unfocusable_set(it->end, EINA_TRUE);
|
elm_widget_tree_unfocusable_set(it->end, EINA_TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2403,7 +2403,7 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
|
||||||
priv->box = elm_box_add(obj);
|
priv->box = elm_box_add(obj);
|
||||||
evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0);
|
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);
|
evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0);
|
||||||
efl_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(priv->box, EFL_ACCESS_TYPE_DISABLED);
|
||||||
|
|
||||||
/* FIXME: change this ugly code path later */
|
/* FIXME: change this ugly code path later */
|
||||||
elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL);
|
elm_widget_on_show_region_hook_set(priv->box, obj, _show_region_hook, NULL);
|
||||||
|
@ -2525,7 +2525,7 @@ _elm_list_efl_object_constructor(Eo *obj, Elm_List_Data *sd EINA_UNUSED)
|
||||||
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_LIST);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
@ -2867,9 +2867,9 @@ _elm_list_item_separator_set(Eo *eo_item, Elm_List_Item_Data *it, Eina_Bool sett
|
||||||
it->is_separator = !!setting;
|
it->is_separator = !!setting;
|
||||||
|
|
||||||
if (it->is_separator)
|
if (it->is_separator)
|
||||||
efl_access_role_set(eo_item, EFL_ACCESS_ROLE_SEPARATOR);
|
efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_SEPARATOR);
|
||||||
else
|
else
|
||||||
efl_access_role_set(eo_item, EFL_ACCESS_ROLE_LIST_ITEM);
|
efl_access_object_role_set(eo_item, EFL_ACCESS_ROLE_LIST_ITEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_Bool
|
EOLIAN static Eina_Bool
|
||||||
|
@ -3157,10 +3157,10 @@ _elm_list_efl_access_widget_action_elm_actions_get(const Eo *obj EINA_UNUSED, El
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN Eina_List*
|
EOLIAN Eina_List*
|
||||||
_elm_list_efl_access_access_children_get(const Eo *obj, Elm_List_Data *pd)
|
_elm_list_efl_access_object_access_children_get(const Eo *obj, Elm_List_Data *pd)
|
||||||
{
|
{
|
||||||
Eina_List *ret;
|
Eina_List *ret;
|
||||||
ret = efl_access_children_get(efl_super(obj, ELM_LIST_CLASS));
|
ret = efl_access_object_access_children_get(efl_super(obj, ELM_LIST_CLASS));
|
||||||
return eina_list_merge(eina_list_clone(pd->items), ret);
|
return eina_list_merge(eina_list_clone(pd->items), ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import elm_general;
|
import elm_general;
|
||||||
|
|
||||||
class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
|
class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
|
||||||
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access,
|
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
|
||||||
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
|
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
|
||||||
{
|
{
|
||||||
[[Elementary list class]]
|
[[Elementary list class]]
|
||||||
|
@ -409,7 +409,7 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
|
||||||
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
|
Elm.Interface_Scrollable.item_loop_enabled { get; set; }
|
||||||
Elm.Interface_Scrollable.policy { set; }
|
Elm.Interface_Scrollable.policy { set; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
Efl.Access.Selection.selected_child_deselect;
|
Efl.Access.Selection.selected_child_deselect;
|
||||||
|
|
|
@ -115,7 +115,7 @@ class Elm.List.Item(Elm.Widget.Item, Efl.Ui.Legacy)
|
||||||
Elm.Widget.Item.part_text { get; set; }
|
Elm.Widget.Item.part_text { get; set; }
|
||||||
Elm.Widget.Item.part_content { get; set; }
|
Elm.Widget.Item.part_content { get; set; }
|
||||||
Elm.Widget.Item.part_content_unset;
|
Elm.Widget.Item.part_content_unset;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
@ -4288,7 +4288,7 @@ _elm_map_efl_object_constructor(Eo *obj, Elm_Map_Data *sd)
|
||||||
|
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
|
|
||||||
#include <Elementary.h>
|
#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));
|
obj = efl_constructor(efl_super(obj, MY_CLASS));
|
||||||
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_IMAGE_MAP);
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ELM_WIDGET_PROTECTED
|
#define ELM_WIDGET_PROTECTED
|
||||||
#define EFL_ACCESS_PROTECTED
|
#define EFL_ACCESS_OBJECT_PROTECTED
|
||||||
#define EFL_ACCESS_SELECTION_PROTECTED
|
#define EFL_ACCESS_SELECTION_PROTECTED
|
||||||
#define ELM_WIDGET_ITEM_PROTECTED
|
#define ELM_WIDGET_ITEM_PROTECTED
|
||||||
#define EFL_UI_TRANSLATABLE_PROTECTED
|
#define EFL_UI_TRANSLATABLE_PROTECTED
|
||||||
|
@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
|
||||||
if (eo_item2 != EO_OBJ(item))
|
if (eo_item2 != EO_OBJ(item))
|
||||||
elm_menu_item_selected_set(eo_item2, 0);
|
elm_menu_item_selected_set(eo_item2, 0);
|
||||||
}
|
}
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
|
||||||
elm_menu_item_selected_set(eo_item2, 0);
|
elm_menu_item_selected_set(eo_item2, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
efl_access_event_emit(EFL_ACCESS_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
|
efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
|
||||||
if (sd->menu_bar && was_open)
|
if (sd->menu_bar && was_open)
|
||||||
_menu_item_select_cb(item, NULL, NULL, NULL);
|
_menu_item_select_cb(item, NULL, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
@ -580,7 +580,7 @@ static void
|
||||||
_item_obj_create(Elm_Menu_Item_Data *item)
|
_item_obj_create(Elm_Menu_Item_Data *item)
|
||||||
{
|
{
|
||||||
VIEW(item) = elm_layout_add(WIDGET(item));
|
VIEW(item) = elm_layout_add(WIDGET(item));
|
||||||
efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
|
||||||
evas_object_size_hint_weight_set
|
evas_object_size_hint_weight_set
|
||||||
(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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)
|
_item_separator_obj_create(Elm_Menu_Item_Data *item)
|
||||||
{
|
{
|
||||||
VIEW(item) = elm_layout_add(WIDGET(item));
|
VIEW(item) = elm_layout_add(WIDGET(item));
|
||||||
efl_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(VIEW(item), EFL_ACCESS_TYPE_SKIPPED);
|
||||||
evas_object_size_hint_weight_set
|
evas_object_size_hint_weight_set
|
||||||
(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
(VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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];
|
char style[1024];
|
||||||
|
|
||||||
item->submenu.location = elm_icon_add(sd->bx);
|
item->submenu.location = elm_icon_add(sd->bx);
|
||||||
efl_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(item->submenu.location, EFL_ACCESS_TYPE_DISABLED);
|
||||||
item->submenu.hv = hv = elm_hover_add(sd->bx);
|
item->submenu.hv = hv = elm_hover_add(sd->bx);
|
||||||
efl_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(item->submenu.hv, EFL_ACCESS_TYPE_SKIPPED);
|
||||||
efl_ui_mirrored_set(hv, EINA_FALSE);
|
efl_ui_mirrored_set(hv, EINA_FALSE);
|
||||||
elm_hover_target_set(hv, item->submenu.location);
|
elm_hover_target_set(hv, item->submenu.location);
|
||||||
elm_hover_parent_set(hv, sd->parent);
|
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);
|
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||||
|
|
||||||
priv->location = elm_icon_add(obj);
|
priv->location = elm_icon_add(obj);
|
||||||
efl_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(priv->location, EFL_ACCESS_TYPE_DISABLED);
|
||||||
|
|
||||||
priv->hv = elm_hover_add(obj);
|
priv->hv = elm_hover_add(obj);
|
||||||
efl_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(priv->hv, EFL_ACCESS_TYPE_SKIPPED);
|
||||||
efl_ui_mirrored_set(priv->hv, EINA_FALSE);
|
efl_ui_mirrored_set(priv->hv, EINA_FALSE);
|
||||||
|
|
||||||
elm_object_style_set(priv->hv, "menu/default");
|
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->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj);
|
||||||
|
|
||||||
priv->bx = elm_box_add(obj);
|
priv->bx = elm_box_add(obj);
|
||||||
efl_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED);
|
efl_access_object_access_type_set(priv->bx, EFL_ACCESS_TYPE_SKIPPED);
|
||||||
efl_ui_mirrored_set(priv->bx, EINA_FALSE);
|
efl_ui_mirrored_set(priv->bx, EINA_FALSE);
|
||||||
evas_object_size_hint_weight_set
|
evas_object_size_hint_weight_set
|
||||||
(priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
(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);
|
efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
|
||||||
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
|
||||||
parent = efl_parent_get(obj);
|
parent = efl_parent_get(obj);
|
||||||
efl_access_role_set(obj, EFL_ACCESS_ROLE_MENU);
|
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_MENU);
|
||||||
|
|
||||||
elm_menu_parent_set(obj, parent);
|
elm_menu_parent_set(obj, parent);
|
||||||
elm_hover_target_set(sd->hv, sd->location);
|
elm_hover_target_set(sd->hv, sd->location);
|
||||||
|
@ -1057,7 +1057,7 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
|
||||||
Evas_Object *icon_obj;
|
Evas_Object *icon_obj;
|
||||||
|
|
||||||
icon_obj = elm_icon_add(obj);
|
icon_obj = elm_icon_add(obj);
|
||||||
efl_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED);
|
efl_access_object_access_type_set(icon_obj, EFL_ACCESS_TYPE_DISABLED);
|
||||||
if (!icon_obj) return NULL;
|
if (!icon_obj) return NULL;
|
||||||
|
|
||||||
eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj);
|
eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj);
|
||||||
|
@ -1322,15 +1322,15 @@ _elm_menu_class_constructor(Efl_Class *klass)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_menu_efl_access_access_children_get(const Eo *obj, Elm_Menu_Data *sd)
|
_elm_menu_efl_access_object_access_children_get(const Eo *obj, Elm_Menu_Data *sd)
|
||||||
{
|
{
|
||||||
Eina_List *ret;
|
Eina_List *ret;
|
||||||
ret = efl_access_children_get(efl_super(obj, ELM_MENU_CLASS));
|
ret = efl_access_object_access_children_get(efl_super(obj, ELM_MENU_CLASS));
|
||||||
return eina_list_merge(eina_list_clone(sd->items), ret);
|
return eina_list_merge(eina_list_clone(sd->items), ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Eina_List*
|
EOLIAN static Eina_List*
|
||||||
_elm_menu_item_efl_access_access_children_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
_elm_menu_item_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
||||||
{
|
{
|
||||||
return eina_list_clone(sd->submenu.items);
|
return eina_list_clone(sd->submenu.items);
|
||||||
}
|
}
|
||||||
|
@ -1344,25 +1344,25 @@ _elm_menu_item_efl_object_parent_get(const Eo *obj, Elm_Menu_Item_Data *sd)
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_Role
|
EOLIAN static Efl_Access_Role
|
||||||
_elm_menu_item_efl_access_role_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
_elm_menu_item_efl_access_object_role_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
||||||
{
|
{
|
||||||
return sd->submenu.items ? EFL_ACCESS_ROLE_MENU : EFL_ACCESS_ROLE_MENU_ITEM;
|
return sd->submenu.items ? EFL_ACCESS_ROLE_MENU : EFL_ACCESS_ROLE_MENU_ITEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static const char*
|
EOLIAN static const char*
|
||||||
_elm_menu_item_efl_access_i18n_name_get(const Eo *obj, Elm_Menu_Item_Data *sd)
|
_elm_menu_item_efl_access_object_i18n_name_get(const Eo *obj, Elm_Menu_Item_Data *sd)
|
||||||
{
|
{
|
||||||
const char *ret;
|
const char *ret;
|
||||||
ret = efl_access_i18n_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
|
ret = efl_access_object_i18n_name_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
|
||||||
if (ret) return ret;
|
if (ret) return ret;
|
||||||
return sd->label;
|
return sd->label;
|
||||||
}
|
}
|
||||||
|
|
||||||
EOLIAN static Efl_Access_State_Set
|
EOLIAN static Efl_Access_State_Set
|
||||||
_elm_menu_item_efl_access_state_set_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
_elm_menu_item_efl_access_object_state_set_get(const Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
|
||||||
{
|
{
|
||||||
Efl_Access_State_Set ret;
|
Efl_Access_State_Set ret;
|
||||||
ret = efl_access_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
|
ret = efl_access_object_state_set_get(efl_super(obj, ELM_MENU_ITEM_CLASS));
|
||||||
|
|
||||||
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE);
|
STATE_TYPE_SET(ret, EFL_ACCESS_STATE_SELECTABLE);
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable,
|
||||||
Efl.Ui.Widget.theme_apply;
|
Efl.Ui.Widget.theme_apply;
|
||||||
Efl.Ui.Translatable.translation_update;
|
Efl.Ui.Translatable.translation_update;
|
||||||
Efl.Ui.Widget.focus_manager_create;
|
Efl.Ui.Widget.focus_manager_create;
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
Efl.Object.provider_find;
|
Efl.Object.provider_find;
|
||||||
|
|
|
@ -111,10 +111,10 @@ class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection, Efl.Ui.Legacy)
|
||||||
Elm.Widget.Item.signal_emit;
|
Elm.Widget.Item.signal_emit;
|
||||||
Elm.Widget.Item.part_text { get; set; }
|
Elm.Widget.Item.part_text { get; set; }
|
||||||
Elm.Widget.Item.part_content { get; set; }
|
Elm.Widget.Item.part_content { get; set; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Access.role { get; }
|
Efl.Access.Object.role { get; }
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Selection.selected_children_count { get; }
|
Efl.Access.Selection.selected_children_count { get; }
|
||||||
Efl.Access.Selection.selected_child { get; }
|
Efl.Access.Selection.selected_child { get; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -178,11 +178,11 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
|
||||||
implements {
|
implements {
|
||||||
class.constructor;
|
class.constructor;
|
||||||
Efl.Object.constructor;
|
Efl.Object.constructor;
|
||||||
Efl.Ui.Widget.theme_apply;
|
Efl.Ui.Widget.theme_apply;
|
||||||
Efl.Ui.Widget.on_access_update;
|
Efl.Ui.Widget.on_access_update;
|
||||||
Efl.Ui.Translatable.translation_update;
|
Efl.Ui.Translatable.translation_update;
|
||||||
Efl.Ui.Widget.widget_event;
|
Efl.Ui.Widget.widget_event;
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
Efl.Part.part;
|
Efl.Part.part;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
|
|
|
@ -31,8 +31,8 @@ class Elm.Multibuttonentry.Item(Elm.Widget.Item,
|
||||||
Elm.Widget.Item.signal_emit;
|
Elm.Widget.Item.signal_emit;
|
||||||
Elm.Widget.Item.part_text { get; set; }
|
Elm.Widget.Item.part_text { get; set; }
|
||||||
Elm.Widget.Item.disable;
|
Elm.Widget.Item.disable;
|
||||||
Efl.Access.i18n_name { get; }
|
Efl.Access.Object.i18n_name { get; }
|
||||||
Efl.Access.state_set { get; }
|
Efl.Access.Object.state_set { get; }
|
||||||
Efl.Access.Widget.Action.elm_actions { get; }
|
Efl.Access.Widget.Action.elm_actions { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,6 @@ class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy)
|
||||||
Elm.Widget.Item.part_content { get; set; }
|
Elm.Widget.Item.part_content { get; set; }
|
||||||
Elm.Widget.Item.part_content_unset;
|
Elm.Widget.Item.part_content_unset;
|
||||||
Elm.Widget.Item.style { set; }
|
Elm.Widget.Item.style { set; }
|
||||||
Efl.Access.access_children { get; }
|
Efl.Access.Object.access_children { get; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue