diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index b83a07cb23..04331a3582 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -32,7 +32,7 @@ elm_public_eolian_files = \ lib/elementary/elm_interface_atspi_action.eo \ lib/elementary/elm_interface_atspi_component.eo \ lib/elementary/elm_interface_atspi_text_editable.eo \ - lib/elementary/elm_interface_atspi_image.eo \ + lib/elementary/efl_access_image.eo \ lib/elementary/elm_interface_atspi_selection.eo \ lib/elementary/elm_interface_atspi_text.eo \ lib/elementary/efl_access_value.eo \ @@ -613,7 +613,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_interface_atspi_action.c \ lib/elementary/elm_interface_atspi_component.c \ lib/elementary/elm_interface_atspi_text_editable.c \ - lib/elementary/elm_interface_atspi_image.c \ + lib/elementary/efl_access_image.c \ lib/elementary/elm_interface_atspi_selection.c \ lib/elementary/elm_interface_atspi_text.c \ lib/elementary/efl_access_value.c \ diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/efl_access_image.c similarity index 74% rename from src/lib/elementary/elm_interface_atspi_image.c rename to src/lib/elementary/efl_access_image.c index 510a6545c2..73e8553541 100644 --- a/src/lib/elementary/elm_interface_atspi_image.c +++ b/src/lib/elementary/efl_access_image.c @@ -2,7 +2,7 @@ #include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED +#define EFL_ACCESS_IMAGE_PROTECTED #include #include "elm_widget.h" @@ -15,7 +15,7 @@ _free_desc_cb(void *data, const Efl_Event *event EINA_UNUSED) } EOLIAN static const char* -_elm_interface_atspi_image_description_get(Eo *obj, void *sd EINA_UNUSED) +_efl_access_image_description_get(Eo *obj, void *sd EINA_UNUSED) { const char *descr = NULL; @@ -24,7 +24,7 @@ _elm_interface_atspi_image_description_get(Eo *obj, void *sd EINA_UNUSED) } EOLIAN static void -_elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const char *description) +_efl_access_image_description_set(Eo *obj, void *sd EINA_UNUSED, const char *description) { const char *key = "atspi_image_description"; const char *descr = eina_stringshare_add(description); @@ -43,11 +43,11 @@ _elm_interface_atspi_image_description_set(Eo *obj, void *sd EINA_UNUSED, const } EOLIAN static const char* -_elm_interface_atspi_image_locale_get(Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) +_efl_access_image_locale_get(Eo *obj EINA_UNUSED, void *sd EINA_UNUSED) { // by default assume that descriptions are given in language of current // locale. return getenv("LANG"); } -#include "elm_interface_atspi_image.eo.c" +#include "efl_access_image.eo.c" diff --git a/src/lib/elementary/elm_interface_atspi_image.eo b/src/lib/elementary/efl_access_image.eo similarity index 89% rename from src/lib/elementary/elm_interface_atspi_image.eo rename to src/lib/elementary/efl_access_image.eo index a3e76498f5..adfc607d02 100644 --- a/src/lib/elementary/elm_interface_atspi_image.eo +++ b/src/lib/elementary/efl_access_image.eo @@ -1,7 +1,6 @@ -mixin Elm.Interface.Atspi_Image () +mixin Efl.Access.Image () { - [[AT-SPI image mixin]] - eo_prefix: elm_interface_atspi_image; + [[Accessible image mixin]] data: null; methods { @property extents @protected { diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index c62ae92f3a..b8f0486241 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -2,7 +2,7 @@ # include "elementary_config.h" #endif -#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED +#define EFL_ACCESS_IMAGE_PROTECTED #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_CANVAS_LAYOUT_CALC_PROTECTED @@ -1584,7 +1584,7 @@ _efl_ui_image_align_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, double *alig // A11Y EOLIAN static void -_efl_ui_image_elm_interface_atspi_image_extents_get(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) +_efl_ui_image_efl_access_image_extents_get(Eo *obj, Efl_Ui_Image_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) { int ee_x, ee_y; Evas_Object *image = elm_image_object_get(obj); diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index 25c35db592..5810e5508a 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -44,7 +44,7 @@ struct Efl.Ui.Image.Error class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.File, Efl.Image, Efl.Image.Load, Efl.Player, Efl.Gfx.View, - Elm.Interface.Atspi_Image, Elm.Interface.Atspi_Widget_Action, + Efl.Access.Image, Elm.Interface.Atspi_Widget_Action, Efl.Orientation, Efl.Flipable, Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Canvas.Layout_Calc, Efl.Canvas.Layout_Group, Efl.Canvas.Layout_Signal) @@ -149,7 +149,7 @@ class Efl.Ui.Image (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.Ui.View.model { get; set; } Elm.Widget.theme_apply; Elm.Widget.widget_event; - Elm.Interface.Atspi_Image.extents { get; } + Efl.Access.Image.extents { get; } Elm.Interface.Atspi_Widget_Action.elm_actions { get; } } events { diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 6f2d9e61cb..6563754d23 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c @@ -6,7 +6,7 @@ #define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED #define ELM_INTERFACE_ATSPI_ACTION_PROTECTED #define EFL_ACCESS_VALUE_PROTECTED -#define ELM_INTERFACE_ATSPI_IMAGE_PROTECTED +#define EFL_ACCESS_IMAGE_PROTECTED #define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED #define ELM_INTERFACE_ATSPI_TEXT_PROTECTED #define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED @@ -1221,7 +1221,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message * x = y = w = h = -1; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_IMAGE_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -1230,7 +1230,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message * EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - elm_interface_atspi_image_extents_get(obj, screen_coords, &x, &y, &w, &h); + efl_access_image_extents_get(obj, screen_coords, &x, &y, &w, &h); eldbus_message_arguments_append(ret, "iiii", x, y, w, h); return ret; @@ -1247,7 +1247,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message int x = -1, y = -1; Eina_Bool screen_coords; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_IMAGE_MIXIN, msg); if (!eldbus_message_arguments_get(msg, "u", &type)) return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); @@ -1256,7 +1256,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; - elm_interface_atspi_image_extents_get(obj, screen_coords, &x, &y, NULL, NULL); + efl_access_image_extents_get(obj, screen_coords, &x, &y, NULL, NULL); eldbus_message_arguments_append(ret, "i", x); eldbus_message_arguments_append(ret, "i", y); @@ -1272,12 +1272,12 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg Eo *obj = _bridge_object_from_path(bridge, obj_path); int w = -1, h = -1; - ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN, msg); + ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_IMAGE_MIXIN, msg); ret = eldbus_message_method_return_new(msg); EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); - elm_interface_atspi_image_extents_get(obj, EINA_FALSE, NULL, NULL, &w, &h); + efl_access_image_extents_get(obj, EINA_FALSE, NULL, NULL, &w, &h); eldbus_message_arguments_append(ret, "i", w); eldbus_message_arguments_append(ret, "i", h); @@ -2231,18 +2231,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 *obj = _bridge_object_from_path(bridge, obj_path); - ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN, request_msg, error); + ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_IMAGE_MIXIN, request_msg, error); if (!strcmp(property, "ImageDescription")) { - value = elm_interface_atspi_image_description_get(obj); + value = efl_access_image_description_get(obj); value = value ? value : ""; eldbus_message_iter_basic_append(iter, 's', value); return EINA_TRUE; } if (!strcmp(property, "ImageLocale")) { - value = elm_interface_atspi_image_locale_get(obj); + value = efl_access_image_locale_get(obj); value = value ? value : ""; eldbus_message_iter_basic_append(iter, 's', value); return EINA_TRUE; @@ -3128,7 +3128,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj) 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); - if (efl_isa(obj, ELM_INTERFACE_ATSPI_IMAGE_MIXIN)) + if (efl_isa(obj, EFL_ACCESS_IMAGE_MIXIN)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); if (efl_isa(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE)) eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h index ef58de7af3..bd3623278b 100644 --- a/src/lib/elementary/elm_interfaces.h +++ b/src/lib/elementary/elm_interfaces.h @@ -9,7 +9,7 @@ #include "elm_interface_atspi_action.eo.h" #include "elm_interface_atspi_component.eo.h" #include "elm_interface_atspi_text_editable.eo.h" -#include "elm_interface_atspi_image.eo.h" +#include "efl_access_image.eo.h" #include "elm_interface_atspi_selection.eo.h" #include "efl_access_value.eo.h" #endif @@ -19,7 +19,7 @@ #include "elm_interface_atspi_action.eo.legacy.h" #include "elm_interface_atspi_component.eo.legacy.h" #include "elm_interface_atspi_text_editable.eo.legacy.h" -#include "elm_interface_atspi_image.eo.legacy.h" +#include "efl_access_image.eo.legacy.h" #include "elm_interface_atspi_selection.eo.legacy.h" #include "efl_access_value.eo.legacy.h" #endif