elementary: move types to elm_interface_atspi_accessible.eo

Move structs, enums and typedefs definitions from
elm_interface_atspi_accessible.h to elm_interface_atspi_accessible.eo.
Give them namespace names to conform with Eolian policies.

Replace all occurrences in elm_interface_atspi_accessible.eo with the
Eolian names.

Adjust include order in elm_interface_atspi_accessible.h to avoid
errors.
This commit is contained in:
Vitor Sousa 2016-02-01 12:14:17 -02:00 committed by Felipe Magno de Almeida
parent be2f2f526f
commit bbde4caccd
2 changed files with 230 additions and 255 deletions

View File

@ -6,6 +6,219 @@ enum Elm.Atspi.Type
skipped [[skip object in accessibility hierarchy]]
}
enum Elm.Atspi.Role
{
[[Describes the role of an object visible to AT-SPI Clients.]]
invalid,
accelerator_label,
alert,
animation,
arrow,
calendar,
canvas,
check_box,
check_menu_item,
color_chooser,
column_header,
combo_box,
date_editor,
desktop_icon,
desktop_frame,
dial,
dialog,
directory_pane,
drawing_area,
file_chooser,
filler,
focus_traversable,
font_chooser,
frame,
glass_pane,
html_container,
icon,
image,
internal_frame,
label,
layered_pane,
list,
list_item,
menu,
menu_bar,
menu_item,
option_pane,
page_tab,
page_tab_list,
panel,
password_text,
popup_menu,
progress_bar,
push_button,
radio_button,
radio_menu_item,
root_pane,
row_header,
scroll_bar,
scroll_pane,
separator,
slider,
spin_button,
split_pane,
status_bar,
table,
table_cell,
table_column_header,
table_row_header,
tearoff_menu_item,
terminal,
text,
toggle_button,
tool_bar,
tool_tip,
tree,
tree_table,
unknown,
viewport,
window,
extended,
header,
footer,
paragraph,
ruler,
application,
autocomplete,
editbar,
embedded,
entry,
chart,
caption,
document_frame,
heading,
page,
section,
redundant_object,
form,
link,
input_method_window,
table_row,
tree_item,
document_spreadsheet,
document_presentation,
document_text,
document_web,
document_email,
comment,
list_box,
grouping,
image_map,
notification,
info_bar,
last_defined,
}
enum Elm.Atspi.State_Type
{
[[Describes a possible states of an object visible to AT-SPI clients.]]
legacy: elm_atspi_state;
invalid,
active,
armed,
busy,
checked,
collapsed,
defunct,
editable,
enabled,
expandable,
expanded,
focusable,
focused,
has_tooltip,
horizontal,
iconified,
modal,
multi_line,
multiselectable,
opaque,
pressed,
resizable,
selectable,
selected,
sensitive,
showing,
single_line,
stale,
transient,
vertical,
visible,
manages_descendants,
indeterminate,
required,
truncated,
animated,
invalid_entry,
supports_autocompletion,
selectable_text,
is_default,
visited,
last_defined,
}
enum Elm.Atspi.Relation_Type
{
[[Describes relation between two objects.]]
legacy: elm_atspi_relation;
null,
label_for,
labelled_by,
controller_for,
controlled_by,
member_of,
tooltip_for,
node_child_of,
node_parent_of,
extended,
flows_to,
flows_from,
subwindow_of,
embeds,
embedded_by,
popup_for,
parent_window_of,
description_for,
described_by,
last_defined,
}
type Elm.Atspi.State_Set: uint64; [[ATSPI object state set.]]
struct Elm.Atspi.Event.Handler; [[ATSPI event listener]]
struct Elm.Atspi.Event.State_Changed.Data
{
type: Elm.Atspi.State_Type;
new_value: bool;
}
struct Elm.Atspi.Event.Children_Changed.Data
{
is_added: bool;
child: Eo.Base *;
}
struct Elm.Atspi.Attribute
{
key: const(char) *;
value: const(char) *;
}
struct Elm.Atspi.Relation
{
type: Elm.Atspi.Relation_Type;
objects: list<Eo.Base *> *;
}
type Elm.Atspi.Relation_Set: list<Elm.Atspi.Relation *> *;
mixin Elm.Interface_Atspi_Accessible ()
{
legacy_prefix: null;
@ -35,7 +248,7 @@ mixin Elm.Interface_Atspi_Accessible ()
[[Gets an string describing ATSPI widget role name. Lists and elements Should be free by a user.]]
}
values {
relations: Elm_Atspi_Relation_Set;
relations: Elm.Atspi.Relation_Set;
}
}
@property role {
@ -45,7 +258,7 @@ mixin Elm.Interface_Atspi_Accessible ()
set {
}
values {
role: Elm_Atspi_Role;
role: Elm.Atspi.Role;
}
}
@property children @protected {
@ -69,7 +282,7 @@ mixin Elm.Interface_Atspi_Accessible ()
[[Gets key-value pairs indentifying widget extra attributes. Must be free by a user.]]
}
values {
attributes: free(own(list<own(Elm_Atspi_Attribute *)> *), elm_atspi_attributes_list_free);
attributes: free(own(list<own(Elm.Atspi.Attribute *)> *), elm_atspi_attributes_list_free);
}
}
@property index_in_parent @protected {
@ -107,7 +320,7 @@ mixin Elm.Interface_Atspi_Accessible ()
[[Gets set describing widget accessible states.]]
}
values {
states: Elm_Atspi_State_Set;
states: Elm.Atspi.State_Set;
}
}
event_handler_add @class @protected {
@ -116,18 +329,18 @@ mixin Elm.Interface_Atspi_Accessible ()
@in cb: Eo_Event_Cb; [[callback]]
@in data: void*; [[data]]
}
return: Elm_Atspi_Event_Handler*; [[Event handler]]
return: Elm.Atspi.Event.Handler*; [[Event handler]]
}
event_handler_del @class @protected {
[[Deregister accessibility event listener]]
params {
@in handler: Elm_Atspi_Event_Handler *; [[Event handler]]
@in handler: Elm.Atspi.Event.Handler *; [[Event handler]]
}
}
event_emit @class @protected {
params {
@in accessible: Elm.Interface_Atspi_Accessible *; [[Accessibility object.]]
@in event: const(Eo_Event_Description)*; [[Accessibility event type.]]
@in event: const(Eo.Event_Description)*; [[Accessibility event type.]]
@in event_info: void*; [[Accessibility event details.]]
}
}
@ -184,7 +397,7 @@ mixin Elm.Interface_Atspi_Accessible ()
otherwise]]
return: bool;
params {
@in type: Elm_Atspi_Relation_Type;
@in type: Elm.Atspi.Relation_Type;
@in relation_object: const(Elm.Interface_Atspi_Accessible)*;
}
}
@ -195,7 +408,7 @@ mixin Elm.Interface_Atspi_Accessible ()
of given type.
]]
params {
@in type: Elm_Atspi_Relation_Type;
@in type: Elm.Atspi.Relation_Type;
@in relation_object: const(Elm.Interface_Atspi_Accessible)*;
}
}
@ -213,8 +426,8 @@ mixin Elm.Interface_Atspi_Accessible ()
}
events {
property,changed: const(char)*;
children,changed: Elm_Atspi_Event_Children_Changed_Data;
state,changed: Elm_Atspi_Event_State_Changed_Data;
children,changed: Elm.Atspi.Event.Children_Changed.Data;
state,changed: Elm.Atspi.Event.State_Changed.Data;
visible,data,changed;
active,descendant,changed;
added;

View File

@ -3,16 +3,12 @@
#ifdef EFL_BETA_API_SUPPORT
/**
* ATSPI event listener
*/
typedef struct _Elm_Atspi_Event_Handler Elm_Atspi_Event_Handler;
/**
* ATSPI object state set.
*/
typedef uint64_t Elm_Atspi_State_Set;
#ifdef EFL_EO_API_SUPPORT
#include "elm_interface_atspi_accessible.eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_interface_atspi_accessible.eo.legacy.h"
#endif
/*
* Sets a particilar state type for given state set.
@ -29,241 +25,11 @@ typedef uint64_t Elm_Atspi_State_Set;
*/
#define STATE_TYPE_GET(state_set, type) (state_set & (1L << type))
/**
* @enum _Elm_Atspi_Role
* Describes the role of an object visible to AT-SPI Clients.
*/
enum _Elm_Atspi_Role
{
ELM_ATSPI_ROLE_INVALID,
ELM_ATSPI_ROLE_ACCELERATOR_LABEL,
ELM_ATSPI_ROLE_ALERT,
ELM_ATSPI_ROLE_ANIMATION,
ELM_ATSPI_ROLE_ARROW,
ELM_ATSPI_ROLE_CALENDAR,
ELM_ATSPI_ROLE_CANVAS,
ELM_ATSPI_ROLE_CHECK_BOX,
ELM_ATSPI_ROLE_CHECK_MENU_ITEM,
ELM_ATSPI_ROLE_COLOR_CHOOSER,
ELM_ATSPI_ROLE_COLUMN_HEADER,
ELM_ATSPI_ROLE_COMBO_BOX,
ELM_ATSPI_ROLE_DATE_EDITOR,
ELM_ATSPI_ROLE_DESKTOP_ICON,
ELM_ATSPI_ROLE_DESKTOP_FRAME,
ELM_ATSPI_ROLE_DIAL,
ELM_ATSPI_ROLE_DIALOG,
ELM_ATSPI_ROLE_DIRECTORY_PANE,
ELM_ATSPI_ROLE_DRAWING_AREA,
ELM_ATSPI_ROLE_FILE_CHOOSER,
ELM_ATSPI_ROLE_FILLER,
ELM_ATSPI_ROLE_FOCUS_TRAVERSABLE,
ELM_ATSPI_ROLE_FONT_CHOOSER,
ELM_ATSPI_ROLE_FRAME,
ELM_ATSPI_ROLE_GLASS_PANE,
ELM_ATSPI_ROLE_HTML_CONTAINER,
ELM_ATSPI_ROLE_ICON,
ELM_ATSPI_ROLE_IMAGE,
ELM_ATSPI_ROLE_INTERNAL_FRAME,
ELM_ATSPI_ROLE_LABEL,
ELM_ATSPI_ROLE_LAYERED_PANE,
ELM_ATSPI_ROLE_LIST,
ELM_ATSPI_ROLE_LIST_ITEM,
ELM_ATSPI_ROLE_MENU,
ELM_ATSPI_ROLE_MENU_BAR,
ELM_ATSPI_ROLE_MENU_ITEM,
ELM_ATSPI_ROLE_OPTION_PANE,
ELM_ATSPI_ROLE_PAGE_TAB,
ELM_ATSPI_ROLE_PAGE_TAB_LIST,
ELM_ATSPI_ROLE_PANEL,
ELM_ATSPI_ROLE_PASSWORD_TEXT,
ELM_ATSPI_ROLE_POPUP_MENU,
ELM_ATSPI_ROLE_PROGRESS_BAR,
ELM_ATSPI_ROLE_PUSH_BUTTON,
ELM_ATSPI_ROLE_RADIO_BUTTON,
ELM_ATSPI_ROLE_RADIO_MENU_ITEM,
ELM_ATSPI_ROLE_ROOT_PANE,
ELM_ATSPI_ROLE_ROW_HEADER,
ELM_ATSPI_ROLE_SCROLL_BAR,
ELM_ATSPI_ROLE_SCROLL_PANE,
ELM_ATSPI_ROLE_SEPARATOR,
ELM_ATSPI_ROLE_SLIDER,
ELM_ATSPI_ROLE_SPIN_BUTTON,
ELM_ATSPI_ROLE_SPLIT_PANE,
ELM_ATSPI_ROLE_STATUS_BAR,
ELM_ATSPI_ROLE_TABLE,
ELM_ATSPI_ROLE_TABLE_CELL,
ELM_ATSPI_ROLE_TABLE_COLUMN_HEADER,
ELM_ATSPI_ROLE_TABLE_ROW_HEADER,
ELM_ATSPI_ROLE_TEAROFF_MENU_ITEM,
ELM_ATSPI_ROLE_TERMINAL,
ELM_ATSPI_ROLE_TEXT,
ELM_ATSPI_ROLE_TOGGLE_BUTTON,
ELM_ATSPI_ROLE_TOOL_BAR,
ELM_ATSPI_ROLE_TOOL_TIP,
ELM_ATSPI_ROLE_TREE,
ELM_ATSPI_ROLE_TREE_TABLE,
ELM_ATSPI_ROLE_UNKNOWN,
ELM_ATSPI_ROLE_VIEWPORT,
ELM_ATSPI_ROLE_WINDOW,
ELM_ATSPI_ROLE_EXTENDED,
ELM_ATSPI_ROLE_HEADER,
ELM_ATSPI_ROLE_FOOTER,
ELM_ATSPI_ROLE_PARAGRAPH,
ELM_ATSPI_ROLE_RULER,
ELM_ATSPI_ROLE_APPLICATION,
ELM_ATSPI_ROLE_AUTOCOMPLETE,
ELM_ATSPI_ROLE_EDITBAR,
ELM_ATSPI_ROLE_EMBEDDED,
ELM_ATSPI_ROLE_ENTRY,
ELM_ATSPI_ROLE_CHART,
ELM_ATSPI_ROLE_CAPTION,
ELM_ATSPI_ROLE_DOCUMENT_FRAME,
ELM_ATSPI_ROLE_HEADING,
ELM_ATSPI_ROLE_PAGE,
ELM_ATSPI_ROLE_SECTION,
ELM_ATSPI_ROLE_REDUNDANT_OBJECT,
ELM_ATSPI_ROLE_FORM,
ELM_ATSPI_ROLE_LINK,
ELM_ATSPI_ROLE_INPUT_METHOD_WINDOW,
ELM_ATSPI_ROLE_TABLE_ROW,
ELM_ATSPI_ROLE_TREE_ITEM,
ELM_ATSPI_ROLE_DOCUMENT_SPREADSHEET,
ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION,
ELM_ATSPI_ROLE_DOCUMENT_TEXT,
ELM_ATSPI_ROLE_DOCUMENT_WEB,
ELM_ATSPI_ROLE_DOCUMENT_EMAIL,
ELM_ATSPI_ROLE_COMMENT,
ELM_ATSPI_ROLE_LIST_BOX,
ELM_ATSPI_ROLE_GROUPING,
ELM_ATSPI_ROLE_IMAGE_MAP,
ELM_ATSPI_ROLE_NOTIFICATION,
ELM_ATSPI_ROLE_INFO_BAR,
ELM_ATSPI_ROLE_LAST_DEFINED,
};
typedef enum _Elm_Atspi_Role Elm_Atspi_Role;
/**
* @enum _Elm_Atspi_State_Type
* Describes a possible states of an object visible to AT-SPI clients.
*/
enum _Elm_Atspi_State_Type
{
ELM_ATSPI_STATE_INVALID,
ELM_ATSPI_STATE_ACTIVE,
ELM_ATSPI_STATE_ARMED,
ELM_ATSPI_STATE_BUSY,
ELM_ATSPI_STATE_CHECKED,
ELM_ATSPI_STATE_COLLAPSED,
ELM_ATSPI_STATE_DEFUNCT,
ELM_ATSPI_STATE_EDITABLE,
ELM_ATSPI_STATE_ENABLED,
ELM_ATSPI_STATE_EXPANDABLE,
ELM_ATSPI_STATE_EXPANDED,
ELM_ATSPI_STATE_FOCUSABLE,
ELM_ATSPI_STATE_FOCUSED,
ELM_ATSPI_STATE_HAS_TOOLTIP,
ELM_ATSPI_STATE_HORIZONTAL,
ELM_ATSPI_STATE_ICONIFIED,
ELM_ATSPI_STATE_MODAL,
ELM_ATSPI_STATE_MULTI_LINE,
ELM_ATSPI_STATE_MULTISELECTABLE,
ELM_ATSPI_STATE_OPAQUE,
ELM_ATSPI_STATE_PRESSED,
ELM_ATSPI_STATE_RESIZABLE,
ELM_ATSPI_STATE_SELECTABLE,
ELM_ATSPI_STATE_SELECTED,
ELM_ATSPI_STATE_SENSITIVE,
ELM_ATSPI_STATE_SHOWING,
ELM_ATSPI_STATE_SINGLE_LINE,
ELM_ATSPI_STATE_STALE,
ELM_ATSPI_STATE_TRANSIENT,
ELM_ATSPI_STATE_VERTICAL,
ELM_ATSPI_STATE_VISIBLE,
ELM_ATSPI_STATE_MANAGES_DESCENDANTS,
ELM_ATSPI_STATE_INDETERMINATE,
ELM_ATSPI_STATE_REQUIRED,
ELM_ATSPI_STATE_TRUNCATED,
ELM_ATSPI_STATE_ANIMATED,
ELM_ATSPI_STATE_INVALID_ENTRY,
ELM_ATSPI_STATE_SUPPORTS_AUTOCOMPLETION,
ELM_ATSPI_STATE_SELECTABLE_TEXT,
ELM_ATSPI_STATE_IS_DEFAULT,
ELM_ATSPI_STATE_VISITED,
ELM_ATSPI_STATE_LAST_DEFINED,
};
typedef enum _Elm_Atspi_State_Type Elm_Atspi_State_Type;
/**
* Elm_Atspi_Relation_Type describes relation between two objects.
*/
enum _Elm_Atspi_Relation_Type {
ELM_ATSPI_RELATION_NULL,
ELM_ATSPI_RELATION_LABEL_FOR,
ELM_ATSPI_RELATION_LABELLED_BY,
ELM_ATSPI_RELATION_CONTROLLER_FOR,
ELM_ATSPI_RELATION_CONTROLLED_BY,
ELM_ATSPI_RELATION_MEMBER_OF,
ELM_ATSPI_RELATION_TOOLTIP_FOR,
ELM_ATSPI_RELATION_NODE_CHILD_OF,
ELM_ATSPI_RELATION_NODE_PARENT_OF,
ELM_ATSPI_RELATION_EXTENDED,
ELM_ATSPI_RELATION_FLOWS_TO,
ELM_ATSPI_RELATION_FLOWS_FROM,
ELM_ATSPI_RELATION_SUBWINDOW_OF,
ELM_ATSPI_RELATION_EMBEDS,
ELM_ATSPI_RELATION_EMBEDDED_BY,
ELM_ATSPI_RELATION_POPUP_FOR,
ELM_ATSPI_RELATION_PARENT_WINDOW_OF,
ELM_ATSPI_RELATION_DESCRIPTION_FOR,
ELM_ATSPI_RELATION_DESCRIBED_BY,
ELM_ATSPI_RELATION_LAST_DEFINED,
};
typedef enum _Elm_Atspi_Relation_Type Elm_Atspi_Relation_Type;
struct _Elm_Atspi_Event_State_Changed_Data
{
Elm_Atspi_State_Type type;
Eina_Bool new_value;
};
typedef struct _Elm_Atspi_Event_State_Changed_Data Elm_Atspi_Event_State_Changed_Data;
struct _Elm_Atspi_Event_Children_Changed_Data
{
Eina_Bool is_added;
Eo *child;
};
typedef struct _Elm_Atspi_Event_Children_Changed_Data Elm_Atspi_Event_Children_Changed_Data;
struct _Elm_Atspi_Attribute
{
const char *key;
const char *value;
};
typedef struct _Elm_Atspi_Attribute Elm_Atspi_Attribute;
struct _Elm_Atspi_Relation
{
Elm_Atspi_Relation_Type type;
Eina_List *objects;
};
typedef struct _Elm_Atspi_Relation Elm_Atspi_Relation;
/**
* Free Elm_Atspi_Attributes_List
*/
EAPI void elm_atspi_attributes_list_free(Eina_List *list);
typedef Eina_List *Elm_Atspi_Relation_Set;
/**
* Frees relation.
*/
@ -384,10 +150,6 @@ EAPI Elm_Atspi_Relation_Set elm_atspi_relation_set_clone(const Elm_Atspi_Relatio
#define elm_interface_atspi_accessible_removed(obj) \
eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_emit(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_REMOVED, NULL));
#include "elm_interface_atspi_accessible.eo.h"
#endif
#ifndef EFL_NOLEGACY_API_SUPPORT
#include "elm_interface_atspi_accessible.eo.legacy.h"
#endif
#endif