forked from enlightenment/efl
Revert "atspi: event broadcast added. Orca screen reader now ables to read UI."
Breaks elementary applications compilation See https://phab.enlightenment.org/T917 This reverts commit 71cd5a1a077807bc32a67d309fba9e1474fffa4d.
This commit is contained in:
U. Artie Eoff
parent
b2d43d4cf4
commit
2ac7caba96
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,24 +1 @@
|
|||
typedef Eo Elm_Atspi_Object;
|
||||
|
||||
typedef uint64_t Elm_Atspi_State;
|
||||
|
||||
typedef enum _Elm_Atspi_Event Elm_Atspi_Event;
|
||||
|
||||
#define BIT_FLAG_SET(mask, bit) (mask |= (1 << bit))
|
||||
#define BIT_FLAG_UNSET(mask, bit) (mask &= ~(1 << bit))
|
||||
#define BIT_FLAG_GET(mask, bit) (mask & (1 << bit))
|
||||
|
||||
/*
|
||||
* @brief Gets root (application) type atspi-object.
|
||||
*/
|
||||
Elm_Atspi_Object * _elm_atspi_root_object_get(void);
|
||||
|
||||
/*
|
||||
* @brief Constructs atspi-object for evas_object
|
||||
*/
|
||||
Elm_Atspi_Object * _elm_atspi_factory_construct(Evas_Object *obj);
|
||||
|
||||
void _elm_atspi_object_init(void);
|
||||
|
||||
void _elm_atspi_object_shutdown(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,47 +1,32 @@
|
|||
void _elm_atspi_object_global_callback_add(Eo_Event_Cb cv, void *user_data);
|
||||
void _elm_atspi_object_global_callback_del(Eo_Event_Cb cv);
|
||||
|
||||
#define ELM_ATSPI_CLASS elm_atspi_obj_class_get()
|
||||
const Eo_Class *elm_atspi_obj_class_get(void) EINA_CONST;
|
||||
|
||||
#define ELM_ATSPI_WIDGET_CLASS elm_atspi_widget_obj_class_get()
|
||||
const Eo_Class *elm_atspi_widget_obj_class_get(void) EINA_CONST;
|
||||
const Eo_Class *elm_atspi_obj_class_get(void) EINA_CONST;
|
||||
|
||||
extern EAPI Eo_Op ELM_ATSPI_OBJ_BASE_ID;
|
||||
|
||||
enum
|
||||
{
|
||||
ELM_ATSPI_OBJ_SUB_ID_NAME_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_DESCRIPTION_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_NAME_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_NAME_SET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_DESCRIPTION_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_DESCRIPTION_SET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_PARENT_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_CHILD_AT_INDEX_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_CHILDREN_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_PARENT_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_OBJECT_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_CHILDREN_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_INDEX_IN_PARENT_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_RELATION_SET_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_ROLE_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_RELATION_SET_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_RELATION_SET_SET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_ROLE_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_ROLE_SET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_ROLE_NAME_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_LOCALIZED_ROLE_NAME_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_STATE_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_ATTRIBUTES_GET, /* virtual */
|
||||
ELM_ATSPI_OBJ_SUB_ID_STATE_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_ATTRIBUTES_GET,
|
||||
ELM_ATSPI_OBJ_SUB_ID_LAST
|
||||
};
|
||||
|
||||
#define ELM_ATSPI_OBJ_ID(sub_id) (ELM_ATSPI_OBJ_BASE_ID + sub_id)
|
||||
|
||||
/* Elm_Atspi_Object events */
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_NAME_CHANGED;
|
||||
#define EV_ATSPI_OBJ_NAME_CHANGED (&(_EV_ATSPI_OBJ_NAME_CHANGED))
|
||||
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_CHILD_ADD;
|
||||
#define EV_ATSPI_OBJ_CHILD_ADD (&(_EV_ATSPI_OBJ_CHILD_ADD))
|
||||
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_CHILD_DEL;
|
||||
#define EV_ATSPI_OBJ_CHILD_DEL (&(_EV_ATSPI_OBJ_CHILD_DEL))
|
||||
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_STATE_CHANGED;
|
||||
#define EV_ATSPI_OBJ_STATE_CHANGED (&(_EV_ATSPI_OBJ_STATE_CHANGED))
|
||||
|
||||
/* Component Interface */
|
||||
#define ELM_ATSPI_COMPONENT_INTERFACE elm_atspi_component_interface_get()
|
||||
|
||||
|
|
@ -69,17 +54,6 @@ enum
|
|||
#define ELM_ATSPI_COMPONENT_INTERFACE_ID(sub_id) (ELM_ATSPI_COMPONENT_INTERFACE_BASE_ID + sub_id)
|
||||
/* Component Interface - END */
|
||||
|
||||
/* Window Interface */
|
||||
#define ELM_ATSPI_WINDOW_INTERFACE elm_atspi_window_interface_get()
|
||||
const Eo_Class *elm_atspi_window_interface_get(void) EINA_CONST;
|
||||
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_WINDOW_ACTIVATED;
|
||||
#define EV_ATSPI_OBJ_WINDOW_ACTIVATED (&(_EV_ATSPI_OBJ_WINDOW_ACTIVATED))
|
||||
|
||||
extern const Eo_Event_Description _EV_ATSPI_OBJ_WINDOW_DEACTIVATED;
|
||||
#define EV_ATSPI_OBJ_WINDOW_DEACTIVATED (&(_EV_ATSPI_OBJ_WINDOW_DEACTIVATED))
|
||||
/* Window Interface - END */
|
||||
|
||||
/* Action Interface */
|
||||
#define ELM_ATSPI_ACTION_INTERFACE elm_accessible_action_interface_get()
|
||||
|
||||
|
|
@ -134,7 +108,6 @@ enum
|
|||
};
|
||||
/* Text Interface - END */
|
||||
|
||||
|
||||
/* EditableText Interface */
|
||||
#define ELM_ATSPI_EDITABLE_TEXT_INTERFACE elm_accessible_editable_text_interface_get()
|
||||
|
||||
|
|
@ -154,9 +127,10 @@ enum
|
|||
};
|
||||
/* EditableText Interface - END */
|
||||
|
||||
/* Value Interface */
|
||||
#define ELM_ATSPI_VALUE_INTERFACE elm_accessible_value_interface_get()
|
||||
|
||||
|
||||
/* Value Interface */
|
||||
const Eo_Class *elm_accessible_value_interface_get(void) EINA_CONST;
|
||||
|
||||
extern EAPI Eo_Op ELM_ATSPI_VALUE_INTERFACE_BASE_ID;
|
||||
|
|
@ -210,10 +184,18 @@ enum
|
|||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_NAME_GET), \
|
||||
EO_TYPECHECK(const char **, ret)
|
||||
|
||||
#define elm_atspi_obj_name_set(name)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_NAME_SET),\
|
||||
EO_TYPECHECK(const char *, name)
|
||||
|
||||
#define elm_atspi_obj_role_get(role)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ROLE_GET), \
|
||||
EO_TYPECHECK(AtspiRole*, role)
|
||||
|
||||
#define elm_atspi_obj_role_set(role)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ROLE_SET),\
|
||||
EO_TYPECHECK(AtspiRole, role)
|
||||
|
||||
#define elm_atspi_obj_role_name_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ROLE_NAME_GET),\
|
||||
EO_TYPECHECK(const char **, ret)
|
||||
|
|
@ -226,6 +208,14 @@ enum
|
|||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_DESCRIPTION_GET),\
|
||||
EO_TYPECHECK(const char **, ret)
|
||||
|
||||
#define elm_atspi_obj_description_set(desc)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_DESCRIPTION_SET),\
|
||||
EO_TYPECHECK(const char *, desc)
|
||||
|
||||
#define elm_atspi_obj_parent_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_PARENT_GET),\
|
||||
EO_TYPECHECK(Elm_Atspi_Object**, ret)
|
||||
|
||||
#define elm_atspi_obj_child_at_index_get(idx, ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_CHILD_AT_INDEX_GET), \
|
||||
EO_TYPECHECK(int, idx),\
|
||||
|
|
@ -235,14 +225,6 @@ enum
|
|||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_CHILDREN_GET),\
|
||||
EO_TYPECHECK(Eina_List**, ret)
|
||||
|
||||
#define elm_atspi_obj_parent_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_PARENT_GET),\
|
||||
EO_TYPECHECK(Elm_Atspi_Object**, ret)
|
||||
|
||||
#define elm_atspi_obj_object_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_OBJECT_GET),\
|
||||
EO_TYPECHECK(Evas_Object**, ret)
|
||||
|
||||
#define elm_atspi_obj_index_in_parent_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_INDEX_IN_PARENT_GET),\
|
||||
EO_TYPECHECK(int*, ret)
|
||||
|
|
@ -251,13 +233,11 @@ enum
|
|||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_RELATION_SET_GET),\
|
||||
EO_TYPECHECK()
|
||||
|
||||
#define elm_atspi_obj_state_get(ret)\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_STATE_GET),\
|
||||
EO_TYPECHECK(Elm_Atspi_State*, ret)
|
||||
#define elm_atspi_obj_relation_set_set() ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_RELATION_SET_SET), EO_TYPECHECK()
|
||||
|
||||
#define elm_atspi_obj_attributes_get()\
|
||||
ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ATTRIBUTES_GET),\
|
||||
EO_TYPECHECK()
|
||||
#define elm_atspi_obj_state_get() ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_STATE_GET), EO_TYPECHECK()
|
||||
|
||||
#define elm_atspi_obj_attributes_get() ELM_ATSPI_OBJ_ID(ELM_ATSPI_OBJ_SUB_ID_ATTRIBUTES_GET), EO_TYPECHECK()
|
||||
|
||||
#define elm_atspi_component_interface_contains(x, y, type, ret)\
|
||||
ELM_ATSPI_COMPONENT_INTERFACE_ID(ELM_ATSPI_COMPONENT_INTERFACE_SUB_ID_CONTAINS),\
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
// to be removed to private:
|
||||
|
||||
EAPI Elm_Atspi_Object * elm_atspi_root_object_get(void);
|
||||
|
|
|
|||
|
|
@ -6318,19 +6318,6 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
|
|||
#endif
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_atspi_obj_create(void *data)
|
||||
{
|
||||
Elm_Atspi_Object *parent = NULL;
|
||||
Elm_Atspi_Object *obj = _elm_atspi_factory_construct(data);
|
||||
if (obj)
|
||||
{
|
||||
eo_do(obj, elm_atspi_obj_parent_get(&parent));
|
||||
eo_do(parent, eo_event_callback_call(EV_ATSPI_OBJ_CHILD_ADD, obj, NULL));
|
||||
}
|
||||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
|
|
@ -6344,9 +6331,6 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
eo_parent_get(&parent));
|
||||
eo_do(obj, elm_wdg_parent_set(parent));
|
||||
sd->on_create = EINA_FALSE;
|
||||
|
||||
if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
|
||||
ecore_idle_enterer_add(_atspi_obj_create, obj);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
Loading…
Reference in New Issue