elm: Define and rename internal atspi struct in EO

This thing is used by only 2 EO APIs that are marked as @beta. I wonder
if the @beta tag or the ptr() expression made it work for eolian,
because it simply wasn't defined in EO.

I'm renaming it just so that it's more consistent with the new names
used by atspi (and EO API in general).
This commit is contained in:
Jean-Philippe Andre 2017-11-16 11:55:06 +09:00
parent c838e30a24
commit e9ebe5c676
38 changed files with 84 additions and 78 deletions

View File

@ -1,4 +1,3 @@
/* FIXME: This shouldn't be using undefined Elm_Access_Action */
import elm_general; import elm_general;
mixin Efl.Access.Action () mixin Efl.Access.Action ()
@ -43,11 +42,13 @@ mixin Efl.Access.Action ()
} }
} }
@property actions @protected @beta { @property actions @protected @beta {
/* C-only, internal API */
[[Get list of available widget actions]] [[Get list of available widget actions]]
get @pure_virtual { get @pure_virtual {
} }
values { values {
actions: list<ptr(Elm_Access_Action)>; [[Contains statically allocated strings]] actions: list<ptr(Efl.Access.Action_Data)>;
[[Contains statically allocated strings.]]
} }
} }
action_do @protected @pure_virtual @beta { action_do @protected @pure_virtual @beta {

View File

@ -15,7 +15,7 @@ extern Eina_Hash *_elm_key_bindings;
EOLIAN static Eina_Bool EOLIAN static Eina_Bool
_efl_access_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id) _efl_access_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNUSED, int id)
{ {
const Elm_Access_Action *actions = NULL; const Efl_Access_Action_Data *actions = NULL;
const char *param; const char *param;
Eina_Bool (*func)(Eo *eo, const char *params) = NULL; Eina_Bool (*func)(Eo *eo, const char *params) = NULL;
int tmp = 0; int tmp = 0;
@ -43,7 +43,7 @@ _efl_access_widget_action_efl_access_action_action_do(Eo *obj, void *pd EINA_UNU
EOLIAN static char* EOLIAN static char*
_efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id) _efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void *pd EINA_UNUSED, int id)
{ {
const Elm_Access_Action *actions = NULL; const Efl_Access_Action_Data *actions = NULL;
Eina_List *l1, *binding_list; Eina_List *l1, *binding_list;
const char *action = NULL, *param = NULL; const char *action = NULL, *param = NULL;
Elm_Config_Binding_Key *binding; Elm_Config_Binding_Key *binding;
@ -96,7 +96,7 @@ _efl_access_widget_action_efl_access_action_action_keybinding_get(Eo *obj, void
EOLIAN static const char * EOLIAN static const char *
_efl_access_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id) _efl_access_widget_action_efl_access_action_action_name_get(Eo *obj, void *pd EINA_UNUSED, int id)
{ {
const Elm_Access_Action *actions = NULL; const Efl_Access_Action_Data *actions = NULL;
int tmp = 0; int tmp = 0;
actions = efl_access_widget_action_elm_actions_get(obj); actions = efl_access_widget_action_elm_actions_get(obj);
@ -125,7 +125,7 @@ _efl_access_widget_action_efl_access_action_action_description_get(Eo *obj EINA_
EOLIAN static Eina_List* EOLIAN static Eina_List*
_efl_access_widget_action_efl_access_action_actions_get(Eo *obj, void *pd EINA_UNUSED) _efl_access_widget_action_efl_access_action_actions_get(Eo *obj, void *pd EINA_UNUSED)
{ {
const Elm_Access_Action *actions = NULL; const Efl_Access_Action_Data *actions = NULL;
Eina_List *ret = NULL; Eina_List *ret = NULL;
int tmp = 0; int tmp = 0;

View File

@ -6,11 +6,13 @@ mixin Efl.Access.Widget.Action (Efl.Access.Action)
data: null; data: null;
methods { methods {
@property elm_actions @protected @beta { @property elm_actions @protected @beta {
/* C-only, internal API */
[[Elementary actions]] [[Elementary actions]]
get @pure_virtual { get @pure_virtual {
} }
values { values {
@cref actions: ptr(const(Elm_Access_Action)); [[NULL-terminated array of Elm_Atspi_Action]] @cref actions: ptr(const(Efl.Access.Action_Data));
[[NULL-terminated array of Efl.Access.Action_Data.]]
} }
} }
} }

View File

@ -3,7 +3,7 @@
#ifdef EFL_BETA_API_SUPPORT #ifdef EFL_BETA_API_SUPPORT
struct _Elm_Access_Action struct _Efl_Access_Action_Data
{ {
const char *name; const char *name;
const char *action; const char *action;
@ -11,7 +11,7 @@ struct _Elm_Access_Action
Eina_Bool (*func)(Evas_Object *obj, const char *params); Eina_Bool (*func)(Evas_Object *obj, const char *params);
}; };
typedef struct _Elm_Access_Action Elm_Access_Action; typedef struct _Efl_Access_Action_Data Efl_Access_Action_Data;
#ifdef EFL_EO_API_SUPPORT #ifdef EFL_EO_API_SUPPORT
#include "efl_access_widget_action.eo.h" #include "efl_access_widget_action.eo.h"

View File

@ -389,10 +389,10 @@ _efl_ui_button_efl_ui_autorepeat_autorepeat_gap_timeout_get(Eo *obj EINA_UNUSED,
return sd->ar_gap_timeout; return sd->ar_gap_timeout;
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_button_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED) _efl_ui_button_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Button_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate }, { "activate", "activate", NULL, _key_action_activate },
{ NULL, NULL, NULL, NULL} { NULL, NULL, NULL, NULL}
}; };

View File

@ -1252,10 +1252,10 @@ _efl_ui_calendar_class_constructor(Efl_Class *klass)
_efl_ui_calendar_smart_focus_next_enable = EINA_TRUE; _efl_ui_calendar_smart_focus_next_enable = EINA_TRUE;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_efl_ui_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *sd EINA_UNUSED) _efl_ui_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Calendar_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate}, { "activate", "activate", NULL, _key_action_activate},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -382,10 +382,10 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
} }
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_check_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED) _efl_ui_check_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Check_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_action[] = { static Efl_Access_Action_Data atspi_action[] = {
{ "activate", "activate", NULL, _key_action_activate }, { "activate", "activate", NULL, _key_action_activate },
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -1606,10 +1606,10 @@ _efl_ui_image_efl_access_image_extents_get(Eo *obj, Efl_Ui_Image_Data *sd EINA_U
elm_image_object_size_get(obj, w, h); elm_image_object_size_get(obj, w, h);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_image_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd EINA_UNUSED) _efl_ui_image_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate }, { "activate", "activate", NULL, _key_action_activate },
{ NULL, NULL, NULL, NULL }, { NULL, NULL, NULL, NULL },
}; };

View File

@ -2694,10 +2694,10 @@ _efl_ui_image_zoomable_class_constructor(Efl_Class *klass)
PHOTO_FILE_LOAD_ERROR_UNKNOWN_FORMAT = eina_error_msg_static_register("File is not a known format"); PHOTO_FILE_LOAD_ERROR_UNKNOWN_FORMAT = eina_error_msg_static_register("File is not a known format");
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_image_zoomable_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED) _efl_ui_image_zoomable_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -2120,10 +2120,10 @@ _key_action_longpress(Eo *obj, const char *params EINA_UNUSED)
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_multibuttonentry_item_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Item_Data *pd EINA_UNUSED) _elm_multibuttonentry_item_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Multibuttonentry_Item_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", NULL, NULL, _key_action_activate }, { "activate", NULL, NULL, _key_action_activate },
{ "delete", NULL, NULL, _key_action_delete}, { "delete", NULL, NULL, _key_action_delete},
{ "longpress", NULL, NULL, _key_action_longpress}, { "longpress", NULL, NULL, _key_action_longpress},

View File

@ -341,10 +341,10 @@ _efl_ui_radio_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_radio_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *pd EINA_UNUSED) _efl_ui_radio_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Radio_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate}, { "activate", "activate", NULL, _key_action_activate},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -1393,10 +1393,10 @@ _efl_ui_slider_efl_ui_format_format_cb_set(Eo *obj, Efl_Ui_Slider_Data *sd, void
efl_canvas_group_change(obj); efl_canvas_group_change(obj);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd EINA_UNUSED) _efl_ui_slider_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "drag,left", "drag", "left", _key_action_drag}, { "drag,left", "drag", "left", _key_action_drag},
{ "drag,right", "drag", "right", _key_action_drag}, { "drag,right", "drag", "right", _key_action_drag},
{ "drag,up", "drag", "up", _key_action_drag}, { "drag,up", "drag", "up", _key_action_drag},

View File

@ -367,10 +367,10 @@ _efl_ui_video_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_efl_ui_video_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *pd EINA_UNUSED) _efl_ui_video_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Video_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},
{ "move,right", "move", "right", _key_action_move}, { "move,right", "move", "right", _key_action_move},
{ "play", "play", NULL, _key_action_play}, { "play", "play", NULL, _key_action_play},

View File

@ -6822,10 +6822,10 @@ _efl_ui_win_efl_access_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_
return root; return root;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_efl_ui_win_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED) _efl_ui_win_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,previous", "move", "previous", _key_action_move}, { "move,previous", "move", "previous", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -513,12 +513,12 @@ _elm_combobox_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_combobox_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, _elm_combobox_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED,
Elm_Combobox_Data *pd Elm_Combobox_Data *pd
EINA_UNUSED) EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{"activate", "activate", "return", _key_action_activate}, {"activate", "activate", "return", _key_action_activate},
{"move,up", "move", "up", _key_action_move}, {"move,up", "move", "up", _key_action_move},
{"move,down", "move", "down", _key_action_move}, {"move,down", "move", "down", _key_action_move},

View File

@ -1554,10 +1554,10 @@ _elm_ctxpopup_item_init(Eo *eo_item,
sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN; sd->dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_ctxpopup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd EINA_UNUSED) _elm_ctxpopup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "escape", "escape", NULL, _key_action_escape}, { "escape", "escape", NULL, _key_action_escape},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -3147,10 +3147,10 @@ _elm_fileselector_class_destructor(Efl_Class *klass EINA_UNUSED)
} }
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_fileselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *pd EINA_UNUSED) _elm_fileselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "select", "select", NULL, _key_action_select }, { "select", "select", NULL, _key_action_select },
{ "escape", "escape", NULL, _key_action_escape}, { "escape", "escape", NULL, _key_action_escape},
{ "backspace", "backspace", NULL, _key_action_backspace}, { "backspace", "backspace", NULL, _key_action_backspace},

View File

@ -1016,10 +1016,10 @@ _elm_hoversel_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_hoversel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd EINA_UNUSED) _elm_hoversel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hoversel_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate}, { "activate", "activate", NULL, _key_action_activate},
{ "move,up", "move", "up", _key_action_move}, { "move,up", "move", "up", _key_action_move},
{ "move,down", "move", "down", _key_action_move}, { "move,down", "move", "down", _key_action_move},

View File

@ -1998,10 +1998,10 @@ _elm_naviframe_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_naviframe_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *pd EINA_UNUSED) _elm_naviframe_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Naviframe_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "top_item_get", "top_item_get", NULL, _key_action_top_item_get }, { "top_item_get", "top_item_get", NULL, _key_action_top_item_get },
{ "item_pop", "item_pop", NULL, _key_action_item_pop }, { "item_pop", "item_pop", NULL, _key_action_item_pop },
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }

View File

@ -678,10 +678,10 @@ _elm_player_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_player_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Player_Data *pd EINA_UNUSED) _elm_player_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Player_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},
{ "move,right", "move", "right", _key_action_move}, { "move,right", "move", "right", _key_action_move},
{ "play", "play", NULL, _key_action_play}, { "play", "play", NULL, _key_action_play},

View File

@ -1787,10 +1787,10 @@ _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_popup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *pd EINA_UNUSED) _elm_popup_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Popup_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "dismiss", NULL, NULL, _action_dismiss}, { "dismiss", NULL, NULL, _action_dismiss},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -1504,10 +1504,10 @@ _access_atspi_action_do(Evas_Object *obj, const char *params)
return ret; return ret;
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_access_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED) _elm_access_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "highlight", NULL, "highlight", _access_atspi_action_do}, { "highlight", NULL, "highlight", _access_atspi_action_do},
{ "unhighlight", NULL, "unhighlight", _access_atspi_action_do}, { "unhighlight", NULL, "unhighlight", _access_atspi_action_do},
{ "highlight,next", NULL, "highlight,next", _access_atspi_action_do}, { "highlight,next", NULL, "highlight,next", _access_atspi_action_do},

View File

@ -2009,10 +2009,10 @@ _elm_calendar_class_constructor(Efl_Class *klass)
_elm_calendar_smart_focus_next_enable = EINA_TRUE; _elm_calendar_smart_focus_next_enable = EINA_TRUE;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Calendar_Data *sd EINA_UNUSED) _elm_calendar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Calendar_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _key_action_activate}, { "activate", "activate", NULL, _key_action_activate},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -2587,10 +2587,10 @@ _elm_colorselector_class_constructor(Efl_Class *klass)
_elm_colorselector_smart_focus_next_enable = EINA_TRUE; _elm_colorselector_smart_focus_next_enable = EINA_TRUE;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_colorselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd EINA_UNUSED) _elm_colorselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Colorselector_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},
{ "move,right", "move", "right", _key_action_move}, { "move,right", "move", "right", _key_action_move},
{ "move,up", "move", "up", _key_action_move}, { "move,up", "move", "up", _key_action_move},
@ -2667,10 +2667,10 @@ _elm_color_item_elm_widget_item_focus_get(Eo *eo_it, Elm_Color_Item_Data *it)
return EINA_FALSE; return EINA_FALSE;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_color_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it EINA_UNUSED) _elm_color_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Color_Item_Data *it EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _item_action_activate}, { "activate", "activate", NULL, _item_action_activate},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -1766,10 +1766,10 @@ _elm_diskselector_class_constructor(Efl_Class *klass)
_elm_diskselector_smart_focus_next_enable = EINA_TRUE; _elm_diskselector_smart_focus_next_enable = EINA_TRUE;
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_diskselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd EINA_UNUSED) _elm_diskselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Diskselector_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,previous", "move", "prev", _key_action_move}, { "move,previous", "move", "prev", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,first", "move", "first", _key_action_move}, { "move,first", "move", "first", _key_action_move},

View File

@ -887,10 +887,10 @@ _elm_flipselector_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_flipselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *pd EINA_UNUSED) _elm_flipselector_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Flipselector_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "flip,up", "flip", "up", _key_action_flip}, { "flip,up", "flip", "up", _key_action_flip},
{ "flip,down", "flip", "down", _key_action_flip}, { "flip,down", "flip", "down", _key_action_flip},
{ NULL, NULL, NULL, NULL} { NULL, NULL, NULL, NULL}

View File

@ -7,6 +7,9 @@ type Evas_Smart_Cb: __undefined_type; [[Evas smart callback type]]
type Eina_Compare_Cb: __undefined_type; [[Eina compare callback type]] type Eina_Compare_Cb: __undefined_type; [[Eina compare callback type]]
type @extern Elm.Glob.Match_Flags: __undefined_type; [[Elementary glob matching flags]] type @extern Elm.Glob.Match_Flags: __undefined_type; [[Elementary glob matching flags]]
/* Types for A11Y (internal/beta API) */
type @extern Efl.Access.Action_Data: __undefined_type; [[Internal struct for accesssibility.]]
/* FIXME: elm_policy API is not bound to EO */ /* FIXME: elm_policy API is not bound to EO */
struct Elm.Event.Policy_Changed struct Elm.Event.Policy_Changed
{ {
@ -135,4 +138,4 @@ enum Elm.Icon.Type
/* FIXME: shouldn't exist */ /* FIXME: shouldn't exist */
struct @extern Elm_Gen_Item; struct @extern Elm_Gen_Item;
struct @extern Elm_Access_Action; struct @extern Efl_Access_Action_Data;

View File

@ -5559,10 +5559,10 @@ _elm_gengrid_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_gengrid_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd EINA_UNUSED) _elm_gengrid_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -8586,10 +8586,10 @@ _elm_genlist_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_genlist_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd EINA_UNUSED) _elm_genlist_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -855,10 +855,10 @@ _action_dismiss(Evas_Object *obj, const char *params EINA_UNUSED)
return EINA_TRUE; return EINA_TRUE;
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_hover_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED) _elm_hover_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Hover_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "dismiss", NULL, NULL, _action_dismiss}, { "dismiss", NULL, NULL, _action_dismiss},
{ NULL, NULL, NULL, NULL} { NULL, NULL, NULL, NULL}
}; };

View File

@ -1693,10 +1693,10 @@ _elm_index_item_efl_access_name_get(Eo *eo_it, Elm_Index_Item_Data *data)
return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter); return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter);
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_index_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data EINA_UNUSED) _elm_index_item_efl_access_widget_action_elm_actions_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "activate", "activate", NULL, _item_action_activate}, { "activate", "activate", NULL, _item_action_activate},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -3118,10 +3118,10 @@ _elm_list_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_list_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd EINA_UNUSED) _elm_list_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -5600,10 +5600,10 @@ _elm_map_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_map_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Map_Data *pd EINA_UNUSED) _elm_map_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Map_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -1410,10 +1410,10 @@ _elm_panel_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_panel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Panel_Data *pd EINA_UNUSED) _elm_panel_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Panel_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "toggle", "toggle", NULL, _key_action_toggle}, { "toggle", "toggle", NULL, _key_action_toggle},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -1346,10 +1346,10 @@ _elm_scroller_elm_widget_focus_state_apply(Eo *obj, Elm_Scroller_Data *pd EINA_U
} }
EOLIAN const Elm_Access_Action * EOLIAN const Efl_Access_Action_Data *
_elm_scroller_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Scroller_Data *pd EINA_UNUSED) _elm_scroller_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Scroller_Data *pd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,prior", "move", "prior", _key_action_move}, { "move,prior", "move", "prior", _key_action_move},
{ "move,next", "move", "next", _key_action_move}, { "move,next", "move", "next", _key_action_move},
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},

View File

@ -694,10 +694,10 @@ _elm_slideshow_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_slideshow_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED) _elm_slideshow_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Slideshow_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "move,left", "move", "left", _key_action_move}, { "move,left", "move", "left", _key_action_move},
{ "move,right", "move", "right", _key_action_move}, { "move,right", "move", "right", _key_action_move},
{ "pause", "pause", NULL, _key_action_pause}, { "pause", "pause", NULL, _key_action_pause},

View File

@ -1645,10 +1645,10 @@ _elm_spinner_class_constructor(Efl_Class *klass)
_elm_spinner_smart_focus_next_enable = EINA_TRUE; _elm_spinner_smart_focus_next_enable = EINA_TRUE;
} }
EOLIAN static const Elm_Access_Action * EOLIAN static const Efl_Access_Action_Data *
_elm_spinner_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED) _elm_spinner_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Spinner_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "toggle", "toggle", NULL, _key_action_toggle}, { "toggle", "toggle", NULL, _key_action_toggle},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };

View File

@ -3911,10 +3911,10 @@ _elm_toolbar_class_constructor(Efl_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass); evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
} }
EOLIAN static const Elm_Access_Action* EOLIAN static const Efl_Access_Action_Data*
_elm_toolbar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd EINA_UNUSED) _elm_toolbar_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *sd EINA_UNUSED)
{ {
static Elm_Access_Action atspi_actions[] = { static Efl_Access_Action_Data atspi_actions[] = {
{ "select", "select", NULL, _key_action_select}, { "select", "select", NULL, _key_action_select},
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };