enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm: rename Elm.Interface.Atspi.Selection => Efl.Access.Selection 

Reviewers: jpeg, cedric

Differential Revision: https://phab.enlightenment.org/D5165
This commit is contained in:
Lukasz Stanislawski 2017-09-19 11:18:22 +09:00 committed by Jean-Philippe Andre
parent 1e0b005829
commit 3e6cc83369
18 changed files with 116 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile_Elementary.am
View File

@ -33,7 +33,7 @@ elm_public_eolian_files = \
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 \
lib/elementary/efl_access_selection.eo \
lib/elementary/elm_interface_atspi_text.eo \
lib/elementary/efl_access_value.eo \
lib/elementary/elm_interface_atspi_widget_action.eo \
@ -616,7 +616,7 @@ lib_elementary_libelementary_la_SOURCES = \
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 \
lib/elementary/efl_access_selection.c \
lib/elementary/elm_interface_atspi_text.c \
lib/elementary/efl_access_value.c \
lib/elementary/elm_interface_atspi_widget_action.c \

4
src/lib/elementary/elm_interface_atspi_selection.c → src/lib/elementary/efl_access_selection.c
View File

@ -2,10 +2,10 @@
#include "elementary_config.h"
#endif
#define EFL_ACCESS_VALUE_PROTECTED
#define ELM_INTERFACE_ATSPI_VALUE_PROTECTED
#include <Elementary.h>
#include "elm_widget.h"
#include "elm_priv.h"
#include "elm_interface_atspi_selection.eo.c"
#include "efl_access_selection.eo.c"

5
src/lib/elementary/elm_interface_atspi_selection.eo → src/lib/elementary/efl_access_selection.eo
View File

@ -1,7 +1,6 @@
interface Elm.Interface.Atspi.Selection ()
interface Efl.Access.Selection ()
{
[[Elementary AT-SPI selection interface]]
eo_prefix: elm_interface_atspi_selection;
[[Elementary access selection interface]]
methods {
@property selected_children_count @protected {
get {

4
src/lib/elementary/elementary_js.cc
View File

@ -40,7 +40,7 @@ EAPI void register_elm_interface_atspi_action(v8::Handle<v8::Object> global, v8:
EAPI void register_efl_access_component(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_text_editable(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_image(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_selection(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_efl_access_selection(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_text(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_value(v8::Handle<v8::Object> global, v8::Isolate* isolate);
EAPI void register_elm_interface_atspi_widget_action(v8::Handle<v8::Object> global, v8::Isolate* isolate);
@ -205,7 +205,7 @@ void init(v8::Handle<v8::Object> exports)
::register_efl_access_component(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_selection(exports, v8::Isolate::GetCurrent());
::register_efl_access_selection(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_text(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_value(exports, v8::Isolate::GetCurrent());
::register_elm_interface_atspi_widget_action(exports, v8::Isolate::GetCurrent());

40
src/lib/elementary/elm_atspi_bridge.c
View File

@ -7,7 +7,7 @@
#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
#define EFL_ACCESS_VALUE_PROTECTED
#define EFL_ACCESS_IMAGE_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED
#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED
@ -164,7 +164,7 @@ static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, _window_signal_send},
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
{ EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
{ ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
{ EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
{ ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send },
@ -869,7 +869,7 @@ _selection_selected_child_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
Eldbus_Message *ret;
Eldbus_Message_Iter *iter;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "i", &idx))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@ -878,7 +878,7 @@ _selection_selected_child_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
iter = eldbus_message_iter_get(ret);
child = elm_interface_atspi_selection_selected_child_get(obj, idx);
child = efl_access_selection_selected_child_get(obj, idx);
_bridge_iter_object_reference_append(bridge, iter, child);
_bridge_object_register(bridge, child);
@ -896,7 +896,7 @@ _selection_child_select(const Eldbus_Service_Interface *iface, const Eldbus_Mess
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "i", &idx))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@ -904,7 +904,7 @@ _selection_child_select(const Eldbus_Service_Interface *iface, const Eldbus_Mess
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_child_select(obj, idx);
result = efl_access_selection_child_select(obj, idx);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -920,7 +920,7 @@ _selection_selected_child_deselect(const Eldbus_Service_Interface *iface, const
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "i", &idx))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@ -928,7 +928,7 @@ _selection_selected_child_deselect(const Eldbus_Service_Interface *iface, const
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_selected_child_deselect(obj, idx);
result = efl_access_selection_selected_child_deselect(obj, idx);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -944,7 +944,7 @@ _selection_is_child_selected(const Eldbus_Service_Interface *iface, const Eldbus
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "i", &idx))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@ -952,7 +952,7 @@ _selection_is_child_selected(const Eldbus_Service_Interface *iface, const Eldbus
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_is_child_selected(obj, idx);
result = efl_access_selection_is_child_selected(obj, idx);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -967,12 +967,12 @@ _selection_all_children_select(const Eldbus_Service_Interface *iface, const Eldb
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_all_children_select(obj);
result = efl_access_selection_all_children_select(obj);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -987,12 +987,12 @@ _selection_clear(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_clear(obj);
result = efl_access_selection_clear(obj);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -1008,7 +1008,7 @@ _selection_child_deselect(const Eldbus_Service_Interface *iface, const Eldbus_Me
Eldbus_Message *ret;
Eina_Bool result;
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_SELECTION_INTERFACE, msg);
ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, msg);
if (!eldbus_message_arguments_get(msg, "i", &idx))
return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@ -1016,7 +1016,7 @@ _selection_child_deselect(const Eldbus_Service_Interface *iface, const Eldbus_Me
ret = eldbus_message_method_return_new(msg);
EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
result = elm_interface_atspi_selection_child_deselect(obj, idx);
result = efl_access_selection_child_deselect(obj, idx);
eldbus_message_arguments_append(ret, "b", result);
return ret;
@ -2121,11 +2121,11 @@ _selection_property_get(const Eldbus_Service_Interface *interface, const char *p
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_SELECTION_INTERFACE, request_msg, error);
ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_SELECTION_INTERFACE, request_msg, error);
if (!strcmp(property, "NSelectedChildren"))
{
n = elm_interface_atspi_selection_selected_children_count_get(obj);
n = efl_access_selection_selected_children_count_get(obj);
eldbus_message_iter_basic_append(iter, 'i', n);
return EINA_TRUE;
}
@ -2508,7 +2508,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
else if (!strcmp(ifc_name, "text"))
class = ELM_INTERFACE_ATSPI_TEXT_INTERFACE;
else if (!strcmp(ifc_name, "image"))
class = ELM_INTERFACE_ATSPI_SELECTION_INTERFACE;
class = EFL_ACCESS_SELECTION_INTERFACE;
else if (!strcmp(ifc_name, "value"))
class = EFL_ACCESS_VALUE_INTERFACE;
@ -3130,7 +3130,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
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))
if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE))
eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);

18
src/lib/elementary/elm_gengrid.c
View File

@ -3,7 +3,7 @@
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
@ -5626,19 +5626,19 @@ _elm_gengrid_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Gengrid_D
}
EOLIAN int
_elm_gengrid_elm_interface_atspi_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Gengrid_Data *pd)
_elm_gengrid_efl_access_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Gengrid_Data *pd)
{
return eina_list_count(pd->selected);
}
EOLIAN Eo*
_elm_gengrid_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_idx)
_elm_gengrid_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_idx)
{
return eina_list_nth(pd->selected, child_idx);
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
_elm_gengrid_efl_access_selection_child_select(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
{
Elm_Gen_Item *item;
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)
@ -5656,7 +5656,7 @@ _elm_gengrid_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
_elm_gengrid_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
{
Eo *item;
Eina_List *l;
@ -5673,7 +5673,7 @@ _elm_gengrid_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
_elm_gengrid_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
{
Elm_Gen_Item *item;
@ -5688,7 +5688,7 @@ _elm_gengrid_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_all_children_select(Eo *obj, Elm_Gengrid_Data *pd)
_elm_gengrid_efl_access_selection_all_children_select(Eo *obj, Elm_Gengrid_Data *pd)
{
Elm_Gen_Item *item;
@ -5702,13 +5702,13 @@ _elm_gengrid_elm_interface_atspi_selection_all_children_select(Eo *obj, Elm_Geng
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd)
_elm_gengrid_efl_access_selection_clear(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd)
{
return _all_items_deselect(pd);
}
EOLIAN Eina_Bool
_elm_gengrid_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
_elm_gengrid_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Gengrid_Data *pd, int child_index)
{
Elm_Gen_Item *item;
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)

18
src/lib/elementary/elm_gengrid.eo
View File

@ -12,7 +12,7 @@ enum Elm.Gengrid.Reorder_Type
class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
Efl.Ui.Clickable, Elm.Interface.Atspi_Widget_Action,
Elm.Interface.Atspi.Selection)
Efl.Access.Selection)
{
[[Elementary gengrid class]]
legacy_prefix: elm_gengrid;
@ -564,14 +564,14 @@ class Elm.Gengrid (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Elm.Interface.Atspi.Selection.selected_child_deselect;
Elm.Interface.Atspi.Selection.child_select;
Elm.Interface.Atspi.Selection.child_deselect;
Elm.Interface.Atspi.Selection.is_child_selected;
Elm.Interface.Atspi.Selection.all_children_select;
Elm.Interface.Atspi.Selection.clear;
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;
Efl.Access.Selection.child_select;
Efl.Access.Selection.child_deselect;
Efl.Access.Selection.is_child_selected;
Efl.Access.Selection.all_children_select;
Efl.Access.Selection.clear;
}
events {
realized; [[Called when gengrid realized]]

18
src/lib/elementary/elm_genlist.c
View File

@ -5,7 +5,7 @@
#include <fnmatch.h>
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
@ -8608,19 +8608,19 @@ _elm_genlist_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Genlist_D
}
EOLIAN int
_elm_genlist_elm_interface_atspi_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Genlist_Data *pd)
_elm_genlist_efl_access_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_Genlist_Data *pd)
{
return eina_list_count(pd->selected);
}
EOLIAN Eo*
_elm_genlist_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_idx)
_elm_genlist_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_idx)
{
return eina_list_nth(pd->selected, child_idx);
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
_elm_genlist_efl_access_selection_child_select(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
{
Elm_Gen_Item *item;
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)
@ -8638,7 +8638,7 @@ _elm_genlist_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
_elm_genlist_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
{
Eo *item;
Eina_List *l;
@ -8655,7 +8655,7 @@ _elm_genlist_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
_elm_genlist_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
{
Elm_Gen_Item *item;
@ -8670,7 +8670,7 @@ _elm_genlist_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_all_children_select(Eo *obj, Elm_Genlist_Data *pd)
_elm_genlist_efl_access_selection_all_children_select(Eo *obj, Elm_Genlist_Data *pd)
{
Elm_Gen_Item *item;
@ -8684,13 +8684,13 @@ _elm_genlist_elm_interface_atspi_selection_all_children_select(Eo *obj, Elm_Genl
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd)
_elm_genlist_efl_access_selection_clear(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd)
{
return _all_items_deselect(pd);
}
EOLIAN Eina_Bool
_elm_genlist_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
_elm_genlist_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Genlist_Data *pd, int child_index)
{
Elm_Gen_Item *item;
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)

18
src/lib/elementary/elm_genlist.eo
View File

@ -3,7 +3,7 @@ import elm_list;
import elm_genlist_item;
class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection,
Efl.Ui.Selectable)
{
[[Elementary genlist class]]
@ -549,14 +549,14 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Elm.Interface.Atspi.Selection.selected_child_deselect;
Elm.Interface.Atspi.Selection.child_select;
Elm.Interface.Atspi.Selection.child_deselect;
Elm.Interface.Atspi.Selection.is_child_selected;
Elm.Interface.Atspi.Selection.all_children_select;
Elm.Interface.Atspi.Selection.clear;
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;
Efl.Access.Selection.child_select;
Efl.Access.Selection.child_deselect;
Efl.Access.Selection.is_child_selected;
Efl.Access.Selection.all_children_select;
Efl.Access.Selection.clear;
}
events {
item,focused; [[Called when genlist item got focus]]

4
src/lib/elementary/elm_interfaces.h
View File

@ -10,7 +10,7 @@
#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"
#include "efl_access_selection.eo.h"
#include "efl_access_value.eo.h"
#endif
#endif
@ -20,7 +20,7 @@
#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"
#include "efl_access_selection.eo.legacy.h"
#include "efl_access_value.eo.legacy.h"
#endif
#endif

18
src/lib/elementary/elm_list.c
View File

@ -4,7 +4,7 @@
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
#include <Elementary.h>
@ -3181,19 +3181,19 @@ _elm_list_elm_interface_atspi_accessible_children_get(Eo *obj, Elm_List_Data *pd
}
EOLIAN int
_elm_list_elm_interface_atspi_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_List_Data *pd)
_elm_list_efl_access_selection_selected_children_count_get(Eo *objm EINA_UNUSED, Elm_List_Data *pd)
{
return eina_list_count(pd->selected);
}
EOLIAN Eo*
_elm_list_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_idx)
_elm_list_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_idx)
{
return eina_list_nth(pd->selected, child_idx);
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
_elm_list_efl_access_selection_child_select(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
{
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)
{
@ -3206,7 +3206,7 @@ _elm_list_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_Li
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
_elm_list_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
{
Eo *item = eina_list_nth(pd->selected, child_index);
if (item)
@ -3218,7 +3218,7 @@ _elm_list_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_UNU
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
_elm_list_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
{
Eo *item = eina_list_nth(pd->items, child_index);
if (item)
@ -3228,7 +3228,7 @@ _elm_list_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED, E
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_all_children_select(Eo *obj EINA_UNUSED, Elm_List_Data *pd)
_elm_list_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Elm_List_Data *pd)
{
Eo *it;
Eina_List *l;
@ -3243,7 +3243,7 @@ _elm_list_elm_interface_atspi_selection_all_children_select(Eo *obj EINA_UNUSED,
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_List_Data *pd)
_elm_list_efl_access_selection_clear(Eo *obj EINA_UNUSED, Elm_List_Data *pd)
{
Eo *it;
Eina_List *l;
@ -3258,7 +3258,7 @@ _elm_list_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_List_Data
}
EOLIAN Eina_Bool
_elm_list_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
_elm_list_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_List_Data *pd, int child_index)
{
Eo *item = eina_list_nth(pd->items, child_index);
if (item)

18
src/lib/elementary/elm_list.eo
View File

@ -37,7 +37,7 @@ enum Elm.List.Mode
}
class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection,
Efl.Ui.Clickable, Efl.Ui.Selectable)
{
[[Elementary list class]]
@ -449,14 +449,14 @@ class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
Elm.Interface_Scrollable.policy { set; }
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Elm.Interface.Atspi.Selection.selected_child_deselect;
Elm.Interface.Atspi.Selection.child_select;
Elm.Interface.Atspi.Selection.child_deselect;
Elm.Interface.Atspi.Selection.is_child_selected;
Elm.Interface.Atspi.Selection.all_children_select;
Elm.Interface.Atspi.Selection.clear;
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;
Efl.Access.Selection.child_select;
Efl.Access.Selection.child_deselect;
Efl.Access.Selection.is_child_selected;
Efl.Access.Selection.all_children_select;
Efl.Access.Selection.clear;
}
events {
activated; [[Called when activated]]

14
src/lib/elementary/elm_menu.c
View File

@ -4,7 +4,7 @@
#define ELM_WIDGET_PROTECTED
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
#include <Elementary.h>
@ -497,7 +497,7 @@ _menu_item_activate_cb(void *data,
if (eo_item2 != EO_OBJ(item))
elm_menu_item_selected_set(eo_item2, 0);
}
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, EO_OBJ(item->parent), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL);
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
}
else
{
@ -512,7 +512,7 @@ _menu_item_activate_cb(void *data,
elm_menu_item_selected_set(eo_item2, 0);
}
}
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, WIDGET(item), ELM_INTERFACE_ATSPI_SELECTION_EVENT_SELECTION_CHANGED, NULL);
elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
if (sd->menu_bar && was_open)
_menu_item_select_cb(item, NULL, NULL, NULL);
}
@ -1428,7 +1428,7 @@ _elm_menu_item_elm_interface_atspi_accessible_state_set_get(Eo *obj EINA_UNUSED,
}
EOLIAN static int
_elm_menu_item_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
_elm_menu_item_efl_access_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd)
{
int ret = 0;
Elm_Object_Item *sobj = NULL;
@ -1445,7 +1445,7 @@ _elm_menu_item_elm_interface_atspi_selection_selected_children_count_get(Eo *obj
}
EOLIAN static Eo*
_elm_menu_item_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd, int child)
_elm_menu_item_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_Item_Data *sd, int child)
{
int seq = 0;
Elm_Object_Item *sobj = NULL;
@ -1467,7 +1467,7 @@ _elm_menu_item_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNU
}
EOLIAN static int
_elm_menu_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
_elm_menu_efl_access_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd)
{
Elm_Object_Item *sobj = NULL;
Eina_List *l;
@ -1483,7 +1483,7 @@ _elm_menu_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA
}
EOLIAN static Eo*
_elm_menu_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd, int child)
_elm_menu_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Menu_Data *sd, int child)
{
int seq = 0;
Elm_Object_Item *sobj = NULL;

6
src/lib/elementary/elm_menu.eo
View File

@ -1,5 +1,5 @@
class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
Elm.Interface.Atspi.Selection, Efl.Ui.Focus.Manager)
Efl.Access.Selection, Efl.Ui.Focus.Manager)
{
[[Elementary menu class]]
legacy_prefix: elm_menu;
@ -62,8 +62,8 @@ class Elm.Menu (Elm.Widget, Efl.Ui.Clickable, Efl.Ui.Menu,
Elm.Widget.translate;
Elm.Widget.focus_manager_create;
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Ui.Menu.selected_item { get; }
Efl.Ui.Menu.first_item { get; }
Efl.Ui.Menu.last_item { get; }

6
src/lib/elementary/elm_menu_item.eo
View File

@ -1,4 +1,4 @@
class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection,
class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection,
Efl.Ui.Item)
{
[[Elementary menu item class]]
@ -68,8 +68,8 @@ class Elm.Menu.Item(Elm.Widget.Item, Elm.Interface.Atspi.Selection,
Elm.Interface.Atspi_Accessible.role { get; }
Elm.Interface.Atspi_Accessible.name { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Ui.Item.selected { get; set; }
Efl.Ui.Item.prev { get; }
Efl.Ui.Item.next { get; }

18
src/lib/elementary/elm_toolbar.c
View File

@ -3,7 +3,7 @@
#endif
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
#define ELM_WIDGET_ITEM_PROTECTED
@ -4058,13 +4058,13 @@ _elm_toolbar_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Toolbar_D
}
EOLIAN int
_elm_toolbar_elm_interface_atspi_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
_elm_toolbar_efl_access_selection_selected_children_count_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
{
return pd->selected_item ? 1 : 0;
}
EOLIAN Eo*
_elm_toolbar_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_idx)
_elm_toolbar_efl_access_selection_selected_child_get(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_idx)
{
if (child_idx != 0)
return NULL;
@ -4073,7 +4073,7 @@ _elm_toolbar_elm_interface_atspi_selection_selected_child_get(Eo *obj EINA_UNUSE
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
_elm_toolbar_efl_access_selection_child_select(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
{
Elm_Toolbar_Item_Data *item;
EINA_INLIST_FOREACH(pd->items, item)
@ -4088,7 +4088,7 @@ _elm_toolbar_elm_interface_atspi_selection_child_select(Eo *obj EINA_UNUSED, Elm
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
_elm_toolbar_efl_access_selection_selected_child_deselect(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
{
if (child_index != 0)
return EINA_FALSE;
@ -4102,7 +4102,7 @@ _elm_toolbar_elm_interface_atspi_selection_selected_child_deselect(Eo *obj EINA_
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
_elm_toolbar_efl_access_selection_is_child_selected(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
{
Elm_Toolbar_Item_Data *item;
@ -4117,13 +4117,13 @@ _elm_toolbar_elm_interface_atspi_selection_is_child_selected(Eo *obj EINA_UNUSED
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_all_children_select(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd EINA_UNUSED)
_elm_toolbar_efl_access_selection_all_children_select(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd EINA_UNUSED)
{
return EINA_FALSE;
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
_elm_toolbar_efl_access_selection_clear(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd)
{
if (pd->selected_item)
elm_toolbar_item_selected_set(pd->selected_item, EINA_FALSE);
@ -4131,7 +4131,7 @@ _elm_toolbar_elm_interface_atspi_selection_clear(Eo *obj EINA_UNUSED, Elm_Toolba
}
EOLIAN Eina_Bool
_elm_toolbar_elm_interface_atspi_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
_elm_toolbar_efl_access_selection_child_deselect(Eo *obj EINA_UNUSED, Elm_Toolbar_Data *pd, int child_index)
{
Elm_Toolbar_Item_Data *item;
if (pd->select_mode != ELM_OBJECT_SELECT_MODE_NONE)

18
src/lib/elementary/elm_toolbar.eo
View File

@ -24,7 +24,7 @@ enum Elm.Toolbar.Shrink_Mode
}
class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Ui.Direction,
Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
Elm.Interface.Atspi_Widget_Action, Efl.Access.Selection,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Menu)
{
[[Elementary toolbar class]]
@ -334,14 +334,14 @@ class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Ui.Direction,
Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
Elm.Interface.Atspi_Accessible.children { get; }
Elm.Interface.Atspi_Accessible.state_set { get; }
Elm.Interface.Atspi.Selection.selected_children_count { get; }
Elm.Interface.Atspi.Selection.selected_child { get; }
Elm.Interface.Atspi.Selection.selected_child_deselect;
Elm.Interface.Atspi.Selection.child_select;
Elm.Interface.Atspi.Selection.child_deselect;
Elm.Interface.Atspi.Selection.is_child_selected;
Elm.Interface.Atspi.Selection.all_children_select;
Elm.Interface.Atspi.Selection.clear;
Efl.Access.Selection.selected_children_count { get; }
Efl.Access.Selection.selected_child { get; }
Efl.Access.Selection.selected_child_deselect;
Efl.Access.Selection.child_select;
Efl.Access.Selection.child_deselect;
Efl.Access.Selection.is_child_selected;
Efl.Access.Selection.all_children_select;
Efl.Access.Selection.clear;
Efl.Ui.Menu.selected_item { get; }
Efl.Ui.Menu.first_item { get; }
Efl.Ui.Menu.last_item { get; }

2
src/tests/elementary/elm_test_list.c
View File

@ -2,7 +2,7 @@
# include "elementary_config.h"
#endif
#define ELM_INTERFACE_ATSPI_SELECTION_PROTECTED
#define EFL_ACCESS_SELECTION_PROTECTED
#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
#include <Elementary.h>
#include "elm_suite.h"