jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9cf8e756686b1e339ccd2505fbcfac4f579903a6
commit 9cf8e756686b1e339ccd2505fbcfac4f579903a6 Author: Lukasz Stanislawski <[email protected]> Date: Tue Sep 12 15:49:29 2017 +0900 elm: rename Elm.Interface.Atspi.Component => Efl.Access.Component Reviewers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D5164 --- src/Makefile_Elementary.am | 4 +- ...ce_atspi_component.c => efl_access_component.c} | 46 +++++++++++----------- ..._atspi_component.eo => efl_access_component.eo} | 3 +- src/lib/elementary/efl_ui_win.c | 4 +- src/lib/elementary/efl_ui_win.eo | 4 +- src/lib/elementary/elm_atspi_bridge.c | 46 +++++++++++----------- src/lib/elementary/elm_colorselector.c | 2 +- src/lib/elementary/elm_index.c | 2 +- src/lib/elementary/elm_interfaces.h | 4 +- src/lib/elementary/elm_widget.c | 14 +++---- src/lib/elementary/elm_widget.eo | 4 +- src/lib/elementary/elm_widget_item.eo | 10 ++--- 12 files changed, 71 insertions(+), 72 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 04331a3582..f1eb3fd8b7 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -30,7 +30,7 @@ elm_public_eolian_files = \ lib/elementary/elm_index.eo \ lib/elementary/elm_interface_atspi_accessible.eo \ lib/elementary/elm_interface_atspi_action.eo \ - lib/elementary/elm_interface_atspi_component.eo \ + lib/elementary/efl_access_component.eo \ lib/elementary/elm_interface_atspi_text_editable.eo \ lib/elementary/efl_access_image.eo \ lib/elementary/elm_interface_atspi_selection.eo \ @@ -611,7 +611,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_index.c \ lib/elementary/elm_interface_atspi_accessible.c \ lib/elementary/elm_interface_atspi_action.c \ - lib/elementary/elm_interface_atspi_component.c \ + lib/elementary/efl_access_component.c \ lib/elementary/elm_interface_atspi_text_editable.c \ lib/elementary/efl_access_image.c \ lib/elementary/elm_interface_atspi_selection.c \ diff --git a/src/lib/elementary/elm_interface_atspi_component.c b/src/lib/elementary/efl_access_component.c similarity index 51% rename from src/lib/elementary/elm_interface_atspi_component.c rename to src/lib/elementary/efl_access_component.c index e2d8ccab87..6a4e1566ab 100644 --- a/src/lib/elementary/elm_interface_atspi_component.c +++ b/src/lib/elementary/efl_access_component.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #include <Elementary.h> @@ -11,46 +11,46 @@ EOLIAN static void -_elm_interface_atspi_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int *x, int *y) +_efl_access_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int *x, int *y) { - elm_interface_atspi_component_extents_get(obj, type, x, y, NULL, NULL); + efl_access_component_extents_get(obj, type, x, y, NULL, NULL); } EOLIAN static Eina_Bool -_elm_interface_atspi_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) +_efl_access_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) { Eina_Bool ret = EINA_FALSE; int c_w, c_h; - elm_interface_atspi_component_extents_get(obj, type, NULL, NULL, &c_w, &c_h); - ret = elm_interface_atspi_component_extents_set(obj, type, x, y, c_w, c_h); + efl_access_component_extents_get(obj, type, NULL, NULL, &c_w, &c_h); + ret = efl_access_component_extents_set(obj, type, x, y, c_w, c_h); return ret; } EOLIAN static Eina_Bool -_elm_interface_atspi_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int w, int h) +_efl_access_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int w, int h) { Eina_Bool ret; int c_x = 0, c_y = 0; - elm_interface_atspi_component_extents_get(obj, EINA_FALSE, &c_x, &c_y, NULL, NULL); - ret = elm_interface_atspi_component_extents_set(obj, EINA_FALSE, c_x, c_y, w, h); + efl_access_component_extents_get(obj, EINA_FALSE, &c_x, &c_y, NULL, NULL); + ret = efl_access_component_extents_set(obj, EINA_FALSE, c_x, c_y, w, h); return ret; } EOLIAN static void -_elm_interface_atspi_component_size_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int *w, int *h) +_efl_access_component_size_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int *w, int *h) { - elm_interface_atspi_component_extents_get(obj, EINA_FALSE, NULL, NULL, w, h); + efl_access_component_extents_get(obj, EINA_FALSE, NULL, NULL, w, h); } EOLIAN static Eina_Bool -_elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) +_efl_access_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) { int w_x = 0, w_y = 0, w_w = 0, w_h = 0; - elm_interface_atspi_component_extents_get(obj, type, &w_x, &w_y, &w_w, &w_h); + efl_access_component_extents_get(obj, type, &w_x, &w_y, &w_w, &w_h); if ((x >= w_x) && (x <= w_x + w_w) && (y >= w_y) && (y <= w_y + w_h)) return EINA_TRUE; @@ -58,7 +58,7 @@ _elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUS } EOLIAN static double -_elm_interface_atspi_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_access_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED) { int alpha; @@ -67,7 +67,7 @@ _elm_interface_atspi_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED) } EOLIAN static Eo * -_elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y) +_efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y) { Eina_List *l, *children; Eo *ret = NULL, *child; @@ -77,9 +77,9 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U EINA_LIST_FOREACH(children, l, child) { Eina_Bool contains; - if (efl_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) + if (efl_isa(child, EFL_ACCESS_COMPONENT_MIXIN)) { - contains = elm_interface_atspi_component_contains(child, screen_coords, x, y); + contains = efl_access_component_contains(child, screen_coords, x, y); if (contains) { ret = child; @@ -93,7 +93,7 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U } EOLIAN static void -_elm_interface_atspi_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) +_efl_access_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) { int ee_x, ee_y; @@ -109,7 +109,7 @@ _elm_interface_atspi_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_ } EOLIAN static Eina_Bool -_elm_interface_atspi_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y, int w, int h) +_efl_access_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y, int w, int h) { int wx, wy; @@ -130,23 +130,23 @@ _elm_interface_atspi_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_ } EOLIAN static int -_elm_interface_atspi_component_layer_get(Eo *obj, void *_pd EINA_UNUSED) +_efl_access_component_layer_get(Eo *obj, void *_pd EINA_UNUSED) { return evas_object_layer_get(obj); } EOLIAN static int -_elm_interface_atspi_component_z_order_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_efl_access_component_z_order_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { // Currently not used. return 0; } EOLIAN static Eina_Bool -_elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) +_efl_access_component_focus_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { evas_object_focus_set(obj, EINA_TRUE); return evas_object_focus_get(obj); } -#include "elm_interface_atspi_component.eo.c" +#include "efl_access_component.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_component.eo b/src/lib/elementary/efl_access_component.eo similarity index 97% rename from src/lib/elementary/elm_interface_atspi_component.eo rename to src/lib/elementary/efl_access_component.eo index d43db98fbc..cb294b0ea7 100644 --- a/src/lib/elementary/elm_interface_atspi_component.eo +++ b/src/lib/elementary/efl_access_component.eo @@ -1,7 +1,6 @@ -mixin Elm.Interface.Atspi_Component () +mixin Efl.Access.Component () { [[AT-SPI component mixin]] - eo_prefix: elm_interface_atspi_component; data: null; methods { @property size @protected { diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index fdd2a9b234..3f96323947 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED #define EFL_GFX_SIZE_HINT_PROTECTED @@ -6717,7 +6717,7 @@ _efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd } EOLIAN static void -_efl_ui_win_elm_interface_atspi_component_extents_get(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) +_efl_ui_win_efl_access_component_extents_get(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) { int ee_x, ee_y; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index ae09d5c3f5..bcd0b99bbb 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -158,7 +158,7 @@ enum Efl.Ui.Win.Move_Resize_Mode } class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, - Elm.Interface.Atspi_Component, Elm.Interface.Atspi_Widget_Action, + Efl.Access.Component, Elm.Interface.Atspi_Widget_Action, Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen, Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager ) { @@ -837,7 +837,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, Elm.Interface.Atspi_Accessible.parent { get; } Elm.Interface.Atspi_Accessible.state_set { get; } Elm.Interface.Atspi_Accessible.name { get; } - Elm.Interface.Atspi_Component.extents { get; } + Efl.Access.Component.extents { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } Efl.Input.State.modifier_enabled { get; } Efl.Input.State.lock_enabled { get; } diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 6563754d23..ed8a813951 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED @@ -2502,7 +2502,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat if (!strcmp(ifc_name, "action")) class = ELM_INTERFACE_ATSPI_ACTION_MIXIN; else if (!strcmp(ifc_name, "component")) - class = ELM_INTERFACE_ATSPI_COMPONENT_MIXIN; + class = EFL_ACCESS_COMPONENT_MIXIN; else if (!strcmp(ifc_name, "editabletext")) class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE; else if (!strcmp(ifc_name, "text")) @@ -3124,7 +3124,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION); if (efl_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION); - if (efl_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) + if (efl_isa(obj, EFL_ACCESS_COMPONENT_MIXIN)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); @@ -3297,13 +3297,13 @@ _component_contains(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld AtspiCoordType coord_type; Eldbus_Message *ret; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - contains = elm_interface_atspi_component_contains(obj, type, x, y); + contains = efl_access_component_contains(obj, type, x, y); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3325,7 +3325,7 @@ _component_get_accessible_at_point(const Eldbus_Service_Interface *iface EINA_UN Eldbus_Message *ret; Eldbus_Message_Iter *iter; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -3335,7 +3335,7 @@ _component_get_accessible_at_point(const Eldbus_Service_Interface *iface EINA_UN iter = eldbus_message_iter_get(ret); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - accessible = elm_interface_atspi_component_accessible_at_point_get(obj, type, x, y); + accessible = efl_access_component_accessible_at_point_get(obj, type, x, y); _bridge_iter_object_reference_append(bridge, iter, accessible); _bridge_object_register(bridge, accessible); @@ -3353,7 +3353,7 @@ _component_get_extents(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *ret; Eldbus_Message_Iter *iter, *iter_struct; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -3364,7 +3364,7 @@ _component_get_extents(const Eldbus_Service_Interface *iface EINA_UNUSED, const iter = eldbus_message_iter_get(ret); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - elm_interface_atspi_component_extents_get(obj, type, &x, &y, &w, &h); + efl_access_component_extents_get(obj, type, &x, &y, &w, &h); iter_struct = eldbus_message_iter_container_new(iter, 'r', NULL); EINA_SAFETY_ON_NULL_GOTO(iter_struct, fail); @@ -3391,13 +3391,13 @@ _component_get_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const AtspiCoordType coord_type; Eldbus_Message *ret; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - elm_interface_atspi_component_position_get(obj, type, &x, &y); + efl_access_component_position_get(obj, type, &x, &y); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3417,9 +3417,9 @@ _component_get_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld int x, y; Eldbus_Message *ret; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); - elm_interface_atspi_component_size_get(obj, &x, &y); + efl_access_component_size_get(obj, &x, &y); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3450,9 +3450,9 @@ _component_get_layer(const Eldbus_Service_Interface *iface EINA_UNUSED, const El Eldbus_Message *ret; AtspiComponentLayer atspi_layer; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); - layer = elm_interface_atspi_component_layer_get(obj); + layer = efl_access_component_layer_get(obj); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3475,7 +3475,7 @@ _component_grab_focus(const Eldbus_Service_Interface *iface EINA_UNUSED, const E if (!obj) return _dbus_invalid_ref_error_new(msg); - focus = elm_interface_atspi_component_focus_grab(obj); + focus = efl_access_component_focus_grab(obj); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3497,7 +3497,7 @@ _component_get_alpha(const Eldbus_Service_Interface *iface EINA_UNUSED, const El if (!obj) return _dbus_invalid_ref_error_new(msg); - alpha = elm_interface_atspi_component_alpha_get(obj); + alpha = efl_access_component_alpha_get(obj); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3518,13 +3518,13 @@ _component_set_extends(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eldbus_Message *ret; Eina_Bool result = EINA_FALSE; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "iiiiu", &x, &y, &w, &h, &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - result = elm_interface_atspi_component_extents_set(obj, type, x, y, w, h); + result = efl_access_component_extents_set(obj, type, x, y, w, h); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3545,13 +3545,13 @@ _component_set_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const AtspiCoordType coord_type; Eldbus_Message *ret; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - result = elm_interface_atspi_component_position_set(obj, type, x, y); + result = efl_access_component_position_set(obj, type, x, y); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); @@ -3571,12 +3571,12 @@ _component_set_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld Eina_Bool result; Eldbus_Message *ret; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "ii", &w, &h)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); - result = elm_interface_atspi_component_size_set(obj, w, h); + result = efl_access_component_size_set(obj, w, h); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index b7f6419b99..75ac9c5cc9 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #include <Elementary.h> diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c index d21f3b5e5f..7365647254 100644 --- a/src/lib/elementary/elm_index.c +++ b/src/lib/elementary/elm_index.c @@ -4,7 +4,7 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #include <Elementary.h> diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index bd3623278b..bc5ffdc118 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -7,7 +7,7 @@ #include "elm_interface_scrollable.h" #ifdef EFL_BETA_API_SUPPORT #include "elm_interface_atspi_action.eo.h" -#include "elm_interface_atspi_component.eo.h" +#include "efl_access_component.eo.h" #include "elm_interface_atspi_text_editable.eo.h" #include "efl_access_image.eo.h" #include "elm_interface_atspi_selection.eo.h" @@ -17,7 +17,7 @@ #ifndef EFL_NOLEGACY_API_SUPPORT #ifdef EFL_BETA_API_SUPPORT #include "elm_interface_atspi_action.eo.legacy.h" -#include "elm_interface_atspi_component.eo.legacy.h" +#include "efl_access_component.eo.legacy.h" #include "elm_interface_atspi_text_editable.eo.legacy.h" #include "efl_access_image.eo.legacy.h" #include "elm_interface_atspi_selection.eo.legacy.h" diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index f1f0fb217b..d4983199f7 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -3,7 +3,7 @@ #endif #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED -#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED +#define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_WIDGET_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_CANVAS_OBJECT_BETA @@ -6313,7 +6313,7 @@ _elm_widget_class_constructor(Efl_Class *klass) } EOLIAN static Eina_Bool -_elm_widget_elm_interface_atspi_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) +_elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) { if (elm_object_focus_allow_get(obj)) { @@ -6424,7 +6424,7 @@ _elm_widget_elm_interface_atspi_accessible_attributes_get(Eo *obj, Elm_Widget_Sm } EOLIAN static void -_elm_widget_item_elm_interface_atspi_component_extents_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) +_elm_widget_item_efl_access_component_extents_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) { int ee_x, ee_y; @@ -6449,13 +6449,13 @@ _elm_widget_item_elm_interface_atspi_component_extents_get(Eo *obj EINA_UNUSED, } EOLIAN static Eina_Bool -_elm_widget_item_elm_interface_atspi_component_extents_set(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) +_elm_widget_item_efl_access_component_extents_set(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) { return EINA_FALSE; } EOLIAN static int -_elm_widget_item_elm_interface_atspi_component_layer_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) +_elm_widget_item_efl_access_component_layer_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) { if (!sd->view) return -1; @@ -6463,14 +6463,14 @@ _elm_widget_item_elm_interface_atspi_component_layer_get(Eo *obj EINA_UNUSED, El } EOLIAN static Eina_Bool -_elm_widget_item_elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *_pd EINA_UNUSED) +_elm_widget_item_efl_access_component_focus_grab(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *_pd EINA_UNUSED) { elm_object_item_focus_set(obj, EINA_TRUE); return elm_object_item_focus_get(obj); } EOLIAN static double -_elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) +_elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) { int alpha; diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 89d622f159..c351fed386 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -18,7 +18,7 @@ struct Elm.Widget.Focus_State { } abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, - Elm.Interface.Atspi_Component, Efl.Ui.Focus.User, + Efl.Access.Component, Efl.Ui.Focus.User, Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor) { [[Elementary widget abstract class]] @@ -857,7 +857,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Interface.Atspi_Accessible.children { get; } Elm.Interface.Atspi_Accessible.parent { get; } Elm.Interface.Atspi_Accessible.attributes { get; } - Elm.Interface.Atspi_Component.focus_grab; + Efl.Access.Component.focus_grab; Efl.Ui.Focus.User.manager { get; } Efl.Ui.Focus.User.parent { get; } Efl.Ui.Focus.Object.focus_geometry { get; } diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo index dac05ea4cd..822a4e5a01 100644 --- a/src/lib/elementary/elm_widget_item.eo +++ b/src/lib/elementary/elm_widget_item.eo @@ -1,7 +1,7 @@ import elm_general; class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible, - Elm.Interface.Atspi_Component) + Efl.Access.Component) { [[Elementary widget item class]] eo_prefix: elm_wdg_item; @@ -537,9 +537,9 @@ class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible, Efl.Object.constructor; Efl.Object.destructor; Elm.Interface.Atspi_Accessible.state_set { get; } - Elm.Interface.Atspi_Component.extents { get; set; } - Elm.Interface.Atspi_Component.alpha { get; } - Elm.Interface.Atspi_Component.layer { get; } - Elm.Interface.Atspi_Component.focus_grab; + Efl.Access.Component.extents { get; set; } + Efl.Access.Component.alpha { get; } + Efl.Access.Component.layer { get; } + Efl.Access.Component.focus_grab; } } --
