summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-01-06 23:21:45 +0100
committerLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-01-06 23:44:41 +0100
commitc403dc5c7ab21a0c6ad826237e1a6c0f9a82f896 (patch)
tree3f589dfcfd0d63c1ebca3db2dcf0e2adcb41e0b1
parentefd0efb316324281ecd50c1cba2aaf0ee1feab10 (diff)
access: refactor access object into classdevs/stanluk/standalone
-rw-r--r--src/lib/elementary/efl_access_object.c16
-rw-r--r--src/lib/elementary/efl_access_object.eo2
-rw-r--r--src/lib/elementary/efl_access_object.h26
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_check.eo4
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo14
-rw-r--r--src/lib/elementary/efl_ui_radio.eo4
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo9
-rw-r--r--src/lib/elementary/efl_ui_text.eo27
-rw-r--r--src/lib/elementary/efl_ui_widget.c41
-rw-r--r--src/lib/elementary/efl_ui_widget.eo20
-rw-r--r--src/lib/elementary/efl_ui_win.c6
-rw-r--r--src/lib/elementary/efl_ui_win.eo7
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c82
-rw-r--r--src/lib/elementary/elm_ctxpopup.eo4
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_genlist.eo12
-rw-r--r--src/lib/elementary/elm_hover.eo4
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_multibuttonentry.eo1
-rw-r--r--src/lib/elementary/elm_multibuttonentry_item.eo4
-rw-r--r--src/lib/elementary/elm_spinner.eo7
-rw-r--r--src/lib/elementary/elm_toolbar.eo12
-rw-r--r--src/lib/elementary/elm_toolbar_item.eo2
-rw-r--r--src/lib/elementary/elm_widget.h3
-rw-r--r--src/lib/elementary/elm_widget_item.eo19
27 files changed, 156 insertions, 202 deletions
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index b9626274e2..cbc9673732 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -146,7 +146,7 @@ _efl_access_object_index_in_parent_get(const Eo *obj, Efl_Access_Object_Data *pd
146 Eo *chld, *parent = NULL; 146 Eo *chld, *parent = NULL;
147 int ret = 0; 147 int ret = 0;
148 148
149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
150 if (!parent) return -1; 150 if (!parent) return -1;
151 151
152 children = efl_access_object_access_children_get(parent); 152 children = efl_access_object_access_children_get(parent);
@@ -173,14 +173,14 @@ _efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Dat
173{ 173{
174 if (efl_isa(obj, klass)) 174 if (efl_isa(obj, klass))
175 { 175 {
176 if (klass == EFL_ACCESS_OBJECT_MIXIN) 176 if (klass == EFL_ACCESS_OBJECT_CLASS)
177 { 177 {
178 Efl_Access_Type type = efl_access_object_access_type_get(obj); 178 Efl_Access_Type type = efl_access_object_access_type_get(obj);
179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; 179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj;
180 } 180 }
181 else return (Eo*)obj; 181 else return (Eo*)obj;
182 } 182 }
183 return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass); 183 return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_CLASS), klass);
184} 184}
185 185
186EOLIAN Eina_List* 186EOLIAN Eina_List*
@@ -363,7 +363,7 @@ _efl_access_object_access_children_get(const Eo *obj, Efl_Access_Object_Data *pd
363 363
364 EINA_ITERATOR_FOREACH(iter, chld) 364 EINA_ITERATOR_FOREACH(iter, chld)
365 { 365 {
366 if (efl_isa(chld, EFL_ACCESS_OBJECT_MIXIN)) 366 if (efl_isa(chld, EFL_ACCESS_OBJECT_CLASS))
367 children = eina_list_append(children, chld); 367 children = eina_list_append(children, chld);
368 } 368 }
369 eina_iterator_free(iter); 369 eina_iterator_free(iter);
@@ -401,7 +401,7 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a
401 Efl_Access_Event_Handler *hdl; 401 Efl_Access_Event_Handler *hdl;
402 Efl_Access_Type type; 402 Efl_Access_Type type;
403 403
404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN)) 404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_CLASS))
405 { 405 {
406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); 406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
407 return; 407 return;
@@ -610,7 +610,7 @@ _efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Acce
610 if (val == pd->type) 610 if (val == pd->type)
611 return; 611 return;
612 612
613 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 613 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
614 614
615 switch (val) 615 switch (val)
616 { 616 {
@@ -631,7 +631,7 @@ _efl_access_object_efl_object_invalidate(Eo *obj, Efl_Access_Object_Data *pd)
631{ 631{
632 efl_access_relation_set_free(pd); 632 efl_access_relation_set_free(pd);
633 633
634 efl_invalidate(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN)); 634 efl_invalidate(efl_super(obj, EFL_ACCESS_OBJECT_CLASS));
635} 635}
636 636
637EOLIAN void 637EOLIAN void
@@ -641,7 +641,7 @@ _efl_access_object_efl_object_destructor(Eo *obj, Efl_Access_Object_Data *pd)
641 eina_stringshare_del(pd->description); 641 eina_stringshare_del(pd->description);
642 eina_stringshare_del(pd->translation_domain); 642 eina_stringshare_del(pd->translation_domain);
643 643
644 efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN)); 644 efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_CLASS));
645} 645}
646 646
647void 647void
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index ad82be2357..a75ce3c9da 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -239,7 +239,7 @@ struct Efl.Access.Relation
239 objects: list<Efl.Object>; [[List with relation objects]] 239 objects: list<Efl.Object>; [[List with relation objects]]
240} 240}
241 241
242mixin Efl.Access.Object (Efl.Interface, Efl.Object) 242class Efl.Access.Object (Efl.Object)
243{ 243{
244 [[Accessibility accessible mixin]] 244 [[Accessibility accessible mixin]]
245 eo_prefix: efl_access_object; 245 eo_prefix: efl_access_object;
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index 72fb57734e..3930e3beb1 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -40,7 +40,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
40 Efl_Access_Event_State_Changed_Data evinfo; \ 40 Efl_Access_Event_State_Changed_Data evinfo; \
41 evinfo.type = (tp); \ 41 evinfo.type = (tp); \
42 evinfo.new_value = (nvl); \ 42 evinfo.new_value = (nvl); \
43 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \ 43 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
44 } while(0); } 44 } while(0); }
45 45
46/** 46/**
@@ -49,38 +49,38 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
49#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ 49#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
50 do { \ 50 do { \
51 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ 51 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
52 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ 52 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
53 } while(0); 53 } while(0);
54 54
55/** 55/**
56 * Emits Accessible 'PropertyChanged' signal for 'Name' property. 56 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
57 */ 57 */
58#define efl_access_i18n_name_changed_signal_emit(obj) \ 58#define efl_access_i18n_name_changed_signal_emit(obj) \
59 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name"); 59 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
60 60
61/** 61/**
62 * Emits Accessible 'PropertyChanged' signal for 'Description' property. 62 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
63 */ 63 */
64#define efl_access_description_changed_signal_emit(obj) \ 64#define efl_access_description_changed_signal_emit(obj) \
65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description"); 65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
66 66
67/** 67/**
68 * Emits Accessible 'PropertyChanged' signal for 'Parent' property. 68 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
69 */ 69 */
70#define efl_access_parent_changed_signal_emit(obj) \ 70#define efl_access_parent_changed_signal_emit(obj) \
71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent"); 71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
72 72
73/** 73/**
74 * Emits Accessible 'PropertyChanged' signal for 'Role' property. 74 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
75 */ 75 */
76#define efl_access_role_changed_signal_emit(obj) \ 76#define efl_access_role_changed_signal_emit(obj) \
77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role"); 77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
78 78
79/** 79/**
80 * Emits Accessible 'PropertyChanged' signal for 'Value' property. 80 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
81 */ 81 */
82#define efl_access_value_changed_signal_emit(obj) \ 82#define efl_access_value_changed_signal_emit(obj) \
83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value"); 83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
84 84
85/** 85/**
86 * Emits Accessible 'ChildrenChanged' signal with added child as argument. 86 * Emits Accessible 'ChildrenChanged' signal with added child as argument.
@@ -88,7 +88,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
88#define efl_access_children_changed_added_signal_emit(obj, child) \ 88#define efl_access_children_changed_added_signal_emit(obj, child) \
89 do { \ 89 do { \
90 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ 90 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
91 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 91 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
92 } while(0); 92 } while(0);
93 93
94/** 94/**
@@ -97,32 +97,32 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
97#define efl_access_children_changed_del_signal_emit(obj, child) \ 97#define efl_access_children_changed_del_signal_emit(obj, child) \
98 do { \ 98 do { \
99 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ 99 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
100 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 100 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
101 } while(0); 101 } while(0);
102 102
103/** 103/**
104 * Emits Accessible 'ActiveDescendantChanged' signal. 104 * Emits Accessible 'ActiveDescendantChanged' signal.
105 */ 105 */
106#define efl_access_active_descendant_changed_signal_emit(obj, child) \ 106#define efl_access_active_descendant_changed_signal_emit(obj, child) \
107 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child); 107 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
108 108
109/** 109/**
110 * Emits Accessible 'VisibleDataChanged' signal. 110 * Emits Accessible 'VisibleDataChanged' signal.
111 */ 111 */
112#define efl_access_visible_data_changed_signal_emit(obj) \ 112#define efl_access_visible_data_changed_signal_emit(obj) \
113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL); 113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
114 114
115/** 115/**
116 * Emits Accessible 'AddAccessible' signal. 116 * Emits Accessible 'AddAccessible' signal.
117 */ 117 */
118#define efl_access_added(obj) \ 118#define efl_access_added(obj) \
119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL); 119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
120 120
121/** 121/**
122 * Emits Accessible 'RemoveAccessible' signal. 122 * Emits Accessible 'RemoveAccessible' signal.
123 */ 123 */
124#define efl_access_removed(obj) \ 124#define efl_access_removed(obj) \
125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); 125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
126 126
127#endif 127#endif
128 128
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 38938d21ca..342fd111d3 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#endif
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index ef0f76de79..0caf70bba7 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action) 1class Efl.Ui.Check (Efl.Ui.Nstate)
2{ 2{
3 [[Check widget 3 [[Check widget
4 4
@@ -26,7 +26,5 @@ class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action)
26 Efl.Ui.Widget.theme_apply; 26 Efl.Ui.Widget.theme_apply;
27 Efl.Ui.Widget.widget_event; 27 Efl.Ui.Widget.widget_event;
28 Efl.Ui.Nstate.value { set; } 28 Efl.Ui.Nstate.value { set; }
29 Efl.Access.Object.state_set { get; }
30 Efl.Access.Widget.Action.elm_actions { get; }
31 } 29 }
32} 30}
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 971a0187c8..7b8570d684 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -7,7 +7,7 @@ struct Efl.Ui.List_View_Item_Event
7 index: int; 7 index: int;
8} 8}
9class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar, 9class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
10 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub, 10 Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
11 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager) 11 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager)
12{ 12{
13 methods { 13 methods {
@@ -86,17 +86,5 @@ class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scr
86// Efl.Ui.Scrollable_Interactive.scroll; 86// Efl.Ui.Scrollable_Interactive.scroll;
87 Efl.Layout.Signal.signal_callback_add; 87 Efl.Layout.Signal.signal_callback_add;
88 Efl.Layout.Signal.signal_callback_del; 88 Efl.Layout.Signal.signal_callback_del;
89// Elm.Interface.Atspi_Accessible.children { get; }
90// Elm.Interface.Atspi_Widget.Action.elm_actions { get; }
91// Efl.Access.Widget.Action.elm_actions { get; }
92 Efl.Access.Object.access_children { get; }
93 Efl.Access.Selection.selected_children_count { get; }
94 Efl.Access.Selection.selected_child { get; }
95 Efl.Access.Selection.selected_child_deselect;
96 Efl.Access.Selection.child_select;
97 Efl.Access.Selection.child_deselect;
98 Efl.Access.Selection.is_child_selected;
99 Efl.Access.Selection.all_children_select;
100 Efl.Access.Selection.access_selection_clear;
101 } 89 }
102} 90}
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index 44d3df9276..91814ac02f 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content) 1class Efl.Ui.Radio (Efl.Ui.Check, Efl.Content)
2{ 2{
3 [[Elementary radio class]] 3 [[Elementary radio class]]
4 legacy_prefix: elm_radio; 4 legacy_prefix: elm_radio;
@@ -64,8 +64,6 @@ class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content)
64 Efl.Ui.Widget.theme_apply; 64 Efl.Ui.Widget.theme_apply;
65 Efl.Ui.Widget.on_access_activate; 65 Efl.Ui.Widget.on_access_activate;
66 Efl.Ui.Widget.widget_event; 66 Efl.Ui.Widget.widget_event;
67 Efl.Access.Object.state_set { get; }
68 Efl.Access.Widget.Action.elm_actions { get; }
69 Efl.Ui.Nstate.value { set; get; } 67 Efl.Ui.Nstate.value { set; get; }
70 } 68 }
71} 69}
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 116fdd39e0..8b95cd7da2 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -1,5 +1,5 @@
1class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Direction, 1class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition,
2 Efl.Access.Widget.Action) 2 Efl.Ui.Direction)
3{ 3{
4 [[A Button Spin. 4 [[A Button Spin.
5 5
@@ -69,11 +69,6 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Directio
69 Efl.Ui.Focus.Object.on_focus_update; 69 Efl.Ui.Focus.Object.on_focus_update;
70 Efl.Ui.Range.range_value { set; } 70 Efl.Ui.Range.range_value { set; }
71 Efl.Ui.Direction.direction { get; set; } 71 Efl.Ui.Direction.direction { get; set; }
72 Efl.Access.Object.i18n_name { get; }
73 Efl.Access.Value.value_and_text { get; set; }
74 Efl.Access.Value.range { get; }
75 Efl.Access.Value.increment { get; }
76 Efl.Access.Widget.Action.elm_actions { get; }
77 } 72 }
78 events { 73 events {
79 delay,changed: void; [[Called when spin delay is changed.]] 74 delay,changed: void; [[Called when spin delay is changed.]]
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 70bb87861b..cda930520d 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,8 +1,7 @@
1/* FIXME - Text object must stop using elm_general! */ 1/* FIXME - Text object must stop using elm_general! */
2import elm_general; 2import elm_general;
3 3
4class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable, 4class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.File,
5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
6 Efl.Ui.Selectable, Efl.Text_Interactive) 5 Efl.Ui.Selectable, Efl.Text_Interactive)
7{ 6{
8 [[Efl UI text class]] 7 [[Efl UI text class]]
@@ -338,30 +337,6 @@ class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
338 //Efl.Ui.Widget.widget_sub_object_del; 337 //Efl.Ui.Widget.widget_sub_object_del;
339 //Elm.Interface_Scrollable.policy { set; } 338 //Elm.Interface_Scrollable.policy { set; }
340 //Elm.Interface_Scrollable.bounce_allow { set; } 339 //Elm.Interface_Scrollable.bounce_allow { set; }
341 Efl.Access.Object.state_set { get; }
342 Efl.Access.Object.i18n_name { get; }
343 Efl.Access.Text.access_text { get; }
344 Efl.Access.Text.string { get; }
345 Efl.Access.Text.attribute { get; }
346 Efl.Access.Text.text_attributes { get; }
347 Efl.Access.Text.default_attributes { get; }
348 Efl.Access.Text.caret_offset { get; set; }
349 Efl.Access.Text.character { get; }
350 Efl.Access.Text.character_extents { get; }
351 Efl.Access.Text.character_count { get; }
352 Efl.Access.Text.offset_at_point { get; }
353 Efl.Access.Text.bounded_ranges { get; }
354 Efl.Access.Text.range_extents { get; }
355 Efl.Access.Text.access_selection { get; set; }
356 Efl.Access.Text.selections_count { get; }
357 Efl.Access.Text.selection_add;
358 Efl.Access.Text.selection_remove;
359 Efl.Access.Editable.Text.text_content { set; }
360 Efl.Access.Editable.Text.insert;
361 Efl.Access.Editable.Text.copy;
362 Efl.Access.Editable.Text.cut;
363 Efl.Access.Editable.Text.delete;
364 Efl.Access.Editable.Text.paste;
365 Efl.File.file { get; set; } 340 Efl.File.file { get; set; }
366 Efl.Text_Interactive.editable { set; } 341 Efl.Text_Interactive.editable { set; }
367 Efl.Part.part_get; 342 Efl.Part.part_get;
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index eec2bde180..718d69ce48 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1576,7 +1576,7 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1576 if (_elm_config->atspi_mode && !sd->on_create) 1576 if (_elm_config->atspi_mode && !sd->on_create)
1577 { 1577 {
1578 Efl_Access_Object *aparent; 1578 Efl_Access_Object *aparent;
1579 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); 1579 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_CLASS);
1580 if (aparent) 1580 if (aparent)
1581 efl_access_children_changed_added_signal_emit(aparent, sobj); 1581 efl_access_children_changed_added_signal_emit(aparent, sobj);
1582 } 1582 }
@@ -1654,7 +1654,7 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1654 if (_elm_config->atspi_mode && !sd->on_destroy) 1654 if (_elm_config->atspi_mode && !sd->on_destroy)
1655 { 1655 {
1656 Efl_Access_Object *aparent; 1656 Efl_Access_Object *aparent;
1657 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); 1657 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_CLASS);
1658 if (aparent) 1658 if (aparent)
1659 efl_access_children_changed_del_signal_emit(aparent, sobj); 1659 efl_access_children_changed_del_signal_emit(aparent, sobj);
1660 } 1660 }
@@ -5342,8 +5342,6 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
5342 efl_ui_widget_parent_set(obj, parent); 5342 efl_ui_widget_parent_set(obj, parent);
5343 sd->on_create = EINA_FALSE; 5343 sd->on_create = EINA_FALSE;
5344 5344
5345 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
5346
5347 return obj; 5345 return obj;
5348} 5346}
5349 5347
@@ -5476,7 +5474,7 @@ _efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED,
5476 EINA_LIST_FOREACH(pd->subobjs, l, widget) 5474 EINA_LIST_FOREACH(pd->subobjs, l, widget)
5477 { 5475 {
5478 if (!elm_object_widget_check(widget)) continue; 5476 if (!elm_object_widget_check(widget)) continue;
5479 if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue; 5477 if (!efl_isa(widget, EFL_ACCESS_OBJECT_CLASS)) continue;
5480 type = efl_access_object_access_type_get(widget); 5478 type = efl_access_object_access_type_get(widget);
5481 if (type == EFL_ACCESS_TYPE_DISABLED) continue; 5479 if (type == EFL_ACCESS_TYPE_DISABLED) continue;
5482 if (type == EFL_ACCESS_TYPE_SKIPPED) 5480 if (type == EFL_ACCESS_TYPE_SKIPPED)
@@ -5624,7 +5622,7 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd
5624 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS)) 5622 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
5625 return _efl_config_obj; 5623 return _efl_config_obj;
5626 5624
5627 if (klass == EFL_ACCESS_OBJECT_MIXIN) 5625 if (klass == EFL_ACCESS_OBJECT_CLASS)
5628 { 5626 {
5629 Efl_Access_Type type = efl_access_object_access_type_get(obj); 5627 Efl_Access_Type type = efl_access_object_access_type_get(obj);
5630 if (type != EFL_ACCESS_TYPE_SKIPPED) 5628 if (type != EFL_ACCESS_TYPE_SKIPPED)
@@ -6139,6 +6137,37 @@ _efl_ui_widget_part_bg_efl_gfx_image_scale_type_get(const Eo *obj, void *pd EINA
6139 6137
6140/* Efl.Part Bg end */ 6138/* Efl.Part Bg end */
6141 6139
6140EOLIAN static Efl_Access_Object*
6141_efl_ui_widget_access_object_get(const Eo *obj, Elm_Widget_Smart_Data *wd)
6142{
6143 if (!wd->access_object)
6144 wd->access_object = efl_ui_widget_access_object_create((Eo*)obj);
6145 return wd->access_object;
6146}
6147
6148EOLIAN static Efl_Access_Object*
6149_efl_ui_widget_access_object_create(Eo *obj, Elm_Widget_Smart_Data *wd EINA_UNUSED)
6150{
6151 Efl_Access_Object *access = efl_add(EFL_ACCESS_OBJECT_CLASS, obj);
6152 efl_access_object_role_set(access, EFL_ACCESS_ROLE_UNKNOWN);
6153 return access;
6154}
6155
6156EOLIAN static Efl_Access_Object*
6157_elm_widget_item_access_object_get(const Eo *obj, Elm_Widget_Item_Data *wd)
6158{
6159 if (!wd->access_object)
6160 wd->access_object = efl_ui_widget_access_object_create((Eo*)obj);
6161 return wd->access_object;
6162}
6163
6164EOLIAN static Efl_Access_Object*
6165_elm_widget_item_access_object_create(Eo *obj, Elm_Widget_Item_Data *wd EINA_UNUSED)
6166{
6167 Efl_Access_Object *access = efl_add(EFL_ACCESS_OBJECT_CLASS, obj);
6168 efl_access_object_role_set(access, EFL_ACCESS_ROLE_UNKNOWN);
6169 return access;
6170}
6142 6171
6143/* Internal EO APIs and hidden overrides */ 6172/* Internal EO APIs and hidden overrides */
6144 6173
diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo
index 08fdcde4e9..6462a494a5 100644
--- a/src/lib/elementary/efl_ui_widget.eo
+++ b/src/lib/elementary/efl_ui_widget.eo
@@ -13,8 +13,7 @@ struct Efl.Ui.Widget_Focus_State {
13 logical : bool; [[$true if this is registered as logical currently]] 13 logical : bool; [[$true if this is registered as logical currently]]
14} 14}
15 15
16abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, 16abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Part, Efl.Ui.Focus.Object,
17 Efl.Access.Component, Efl.Part, Efl.Ui.Focus.Object,
18 Efl.Ui.Cursor, Efl.Ui.L10n, 17 Efl.Ui.Cursor, Efl.Ui.L10n,
19 Efl.Ui.Selection, Efl.Ui.Dnd) 18 Efl.Ui.Selection, Efl.Ui.Dnd)
20{ 19{
@@ -111,6 +110,18 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
111 return: bool; [[$true on success, $false otherwise]] 110 return: bool; [[$true on success, $false otherwise]]
112 legacy: null; 111 legacy: null;
113 } 112 }
113 @property access_object {
114 [[ Return accessibile object representation of widget ]]
115 get {
116 return: Efl.Access.Object;
117 }
118 }
119 access_object_create @protected {
120 [[ Virtual function returning new instance of widget accessible
121 representation. Expected to be overloaded in derived classes. ]]
122 return: Efl.Access.Object;
123 legacy: null;
124 }
114 // FIXME: focus_allow? can_focus? focusable? 125 // FIXME: focus_allow? can_focus? focusable?
115 @property focus_allow { 126 @property focus_allow {
116 [[The ability for a widget to be focused. 127 [[The ability for a widget to be focused.
@@ -574,11 +585,6 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object,
574 Efl.Canvas.Group.group_calculate; 585 Efl.Canvas.Group.group_calculate;
575 Efl.Canvas.Group.group_member_del; 586 Efl.Canvas.Group.group_member_del;
576 Efl.Canvas.Group.group_member_add; 587 Efl.Canvas.Group.group_member_add;
577 Efl.Access.Object.i18n_name { get; }
578 Efl.Access.Object.state_set { get; }
579 Efl.Access.Object.access_children { get; }
580 Efl.Access.Object.attributes { get; }
581 Efl.Access.Component.focus_grab;
582 Efl.Ui.Focus.Object.focus_manager { get; } 588 Efl.Ui.Focus.Object.focus_manager { get; }
583 Efl.Ui.Focus.Object.focus_parent { get; } 589 Efl.Ui.Focus.Object.focus_parent { get; }
584 Efl.Ui.Focus.Object.focus_geometry { get; } 590 Efl.Ui.Focus.Object.focus_geometry { get; }
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 02ac728dd2..c3a1afb0be 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2370,7 +2370,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2370 { 2370 {
2371 Eo *root; 2371 Eo *root;
2372 efl_access_window_created_signal_emit(obj); 2372 efl_access_window_created_signal_emit(obj);
2373 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2373 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2374 if (root) 2374 if (root)
2375 efl_access_children_changed_added_signal_emit(root, obj); 2375 efl_access_children_changed_added_signal_emit(root, obj);
2376 } 2376 }
@@ -2439,7 +2439,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2439 if (_elm_config->atspi_mode) 2439 if (_elm_config->atspi_mode)
2440 { 2440 {
2441 Eo *root; 2441 Eo *root;
2442 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2442 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2443 efl_access_window_destroyed_signal_emit(obj); 2443 efl_access_window_destroyed_signal_emit(obj);
2444 if (root) 2444 if (root)
2445 efl_access_children_changed_del_signal_emit(root, obj); 2445 efl_access_children_changed_del_signal_emit(root, obj);
@@ -7307,7 +7307,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
7307 return (Eo *)obj; 7307 return (Eo *)obj;
7308 7308
7309 // attach all kinds of windows directly to ATSPI application root object 7309 // attach all kinds of windows directly to ATSPI application root object
7310 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 7310 if (klass == EFL_ACCESS_OBJECT_CLASS) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
7311 7311
7312 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 7312 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
7313 return pd->provider; 7313 return pd->provider;
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 000b4e9ebc..52bd9d2573 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -154,8 +154,7 @@ enum Efl.Ui.Win_Move_Resize_Mode
154 right = (1 << 4) [[Start resizing window to the right]] 154 right = (1 << 4) [[Start resizing window to the right]]
155} 155}
156 156
157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Access.Window, 157class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene,
158 Efl.Access.Component, Efl.Access.Widget.Action,
159 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 158 Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
160 Efl.Text, Efl.Config, 159 Efl.Text, Efl.Config,
161 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root) 160 Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root)
@@ -788,10 +787,6 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Access.Window,
788 Efl.Ui.Focus.Object.on_focus_update; 787 Efl.Ui.Focus.Object.on_focus_update;
789 Efl.Ui.Widget.widget_event; 788 Efl.Ui.Widget.widget_event;
790 Efl.Ui.Widget_Focus_Manager.focus_manager_create; 789 Efl.Ui.Widget_Focus_Manager.focus_manager_create;
791 Efl.Access.Object.state_set { get; }
792 Efl.Access.Object.i18n_name { get; }
793 Efl.Access.Component.extents { get; }
794 Efl.Access.Widget.Action.elm_actions { get; }
795 Efl.Input.State.modifier_enabled { get; } 790 Efl.Input.State.modifier_enabled { get; }
796 Efl.Input.State.lock_enabled { get; } 791 Efl.Input.State.lock_enabled { get; }
797 Efl.Screen.screen_dpi { get; } 792 Efl.Screen.screen_dpi { get; }
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 77cfe7f93c..87546a2773 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -34,7 +34,7 @@ _elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_U
34 EINA_LIST_FOREACH(_elm_win_list, l, win) 34 EINA_LIST_FOREACH(_elm_win_list, l, win)
35 { 35 {
36 Efl_Access_Type type; 36 Efl_Access_Type type;
37 if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN)) 37 if (!efl_isa(win, EFL_ACCESS_OBJECT_CLASS))
38 continue; 38 continue;
39 type = efl_access_object_access_type_get(win); 39 type = efl_access_object_access_type_get(win);
40 if (type == EFL_ACCESS_TYPE_REGULAR) 40 if (type == EFL_ACCESS_TYPE_REGULAR)
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index cca6176dee..833d5be87f 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -487,7 +487,7 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
487 AtspiRole atspi_role = ATSPI_ROLE_INVALID; 487 AtspiRole atspi_role = ATSPI_ROLE_INVALID;
488 Efl_Access_Role role; 488 Efl_Access_Role role;
489 489
490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
491 491
492 role = efl_access_object_role_get(obj); 492 role = efl_access_object_role_get(obj);
493 493
@@ -506,7 +506,7 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
507 Eo *obj = _bridge_object_from_path(bridge, obj_path); 507 Eo *obj = _bridge_object_from_path(bridge, obj_path);
508 508
509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
510 510
511 role_name = efl_access_object_role_name_get(obj); 511 role_name = efl_access_object_role_name_get(obj);
512 512
@@ -524,7 +524,7 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
525 Eo *obj = _bridge_object_from_path(bridge, obj_path); 525 Eo *obj = _bridge_object_from_path(bridge, obj_path);
526 526
527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
528 528
529 l_role_name = efl_access_object_localized_role_name_get(obj); 529 l_role_name = efl_access_object_localized_role_name_get(obj);
530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); 530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
@@ -547,7 +547,7 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
547 Eldbus_Message_Iter *iter, *iter_array; 547 Eldbus_Message_Iter *iter, *iter_array;
548 Eo *children; 548 Eo *children;
549 549
550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
551 551
552 children_list = efl_access_object_access_children_get(obj); 552 children_list = efl_access_object_access_children_get(obj);
553 553
@@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); 583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
584 584
585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
586 586
587 ret = eldbus_message_method_return_new(msg); 587 ret = eldbus_message_method_return_new(msg);
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -606,7 +606,7 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
607 Eo *obj = _bridge_object_from_path(bridge, obj_path); 607 Eo *obj = _bridge_object_from_path(bridge, obj_path);
608 608
609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
610 610
611 ret = eldbus_message_method_return_new(msg); 611 ret = eldbus_message_method_return_new(msg);
612 if (!ret) goto error; 612 if (!ret) goto error;
@@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M
648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
649 Eo *obj = _bridge_object_from_path(bridge, obj_path); 649 Eo *obj = _bridge_object_from_path(bridge, obj_path);
650 650
651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
652 652
653 ret = eldbus_message_method_return_new(msg); 653 ret = eldbus_message_method_return_new(msg);
654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
719 Eo *obj = _bridge_object_from_path(bridge, obj_path); 719 Eo *obj = _bridge_object_from_path(bridge, obj_path);
720 720
721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
722 722
723 ret = eldbus_message_method_return_new(msg); 723 ret = eldbus_message_method_return_new(msg);
724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -754,7 +754,7 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
754 Eldbus_Message *ret; 754 Eldbus_Message *ret;
755 int idx = -1; 755 int idx = -1;
756 756
757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
758 758
759 ret = eldbus_message_method_return_new(msg); 759 ret = eldbus_message_method_return_new(msg);
760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
778 Eldbus_Message *ret; 778 Eldbus_Message *ret;
779 Eldbus_Message_Iter *iter; 779 Eldbus_Message_Iter *iter;
780 780
781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
782 782
783 if (!eldbus_message_arguments_get(msg, "i", &idx)) 783 if (!eldbus_message_arguments_get(msg, "i", &idx))
784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
809 Eina_List *l; 809 Eina_List *l;
810 Eina_Iterator *it; 810 Eina_Iterator *it;
811 811
812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
813 813
814 ret = eldbus_message_method_return_new(msg); 814 ret = eldbus_message_method_return_new(msg);
815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -1220,7 +1220,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
1220 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1220 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1221 Eina_Rect r; 1221 Eina_Rect r;
1222 1222
1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1224 1224
1225 if (!eldbus_message_arguments_get(msg, "u", &type)) 1225 if (!eldbus_message_arguments_get(msg, "u", &type))
1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1246,7 +1246,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1246 int x = -1, y = -1; 1246 int x = -1, y = -1;
1247 Eina_Bool screen_coords; 1247 Eina_Bool screen_coords;
1248 1248
1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1250 1250
1251 if (!eldbus_message_arguments_get(msg, "u", &type)) 1251 if (!eldbus_message_arguments_get(msg, "u", &type))
1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1274,7 +1274,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
1274 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1274 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1275 int w = -1, h = -1; 1275 int w = -1, h = -1;
1276 1276
1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1278 1278
1279 ret = eldbus_message_method_return_new(msg); 1279 ret = eldbus_message_method_return_new(msg);
1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -2028,7 +2028,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2028 tmp = path + len; /* Skip over the prefix */ 2028 tmp = path + len; /* Skip over the prefix */
2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2030 { 2030 {
2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2032 return root; 2032 return root;
2033 } 2033 }
2034 2034
@@ -2042,7 +2042,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2042 return NULL; 2042 return NULL;
2043 } 2043 }
2044 2044
2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL; 2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_CLASS) ? eo : NULL;
2046 2046
2047 return ret; 2047 return ret;
2048} 2048}
@@ -2055,7 +2055,7 @@ _path_from_object(const Eo *eo)
2055 2055
2056 if (!eo) 2056 if (!eo)
2057 return ATSPI_DBUS_PATH_NULL; 2057 return ATSPI_DBUS_PATH_NULL;
2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2059 2059
2060 if (eo == root) 2060 if (eo == root)
2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -2073,7 +2073,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); 2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
2075 2075
2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2077 2077
2078 if (!strcmp(property, "Name")) 2078 if (!strcmp(property, "Name"))
2079 { 2079 {
@@ -2093,7 +2093,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2093 } 2093 }
2094 else if (!strcmp(property, "Parent")) 2094 else if (!strcmp(property, "Parent"))
2095 { 2095 {
2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; 2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
2098 role = efl_access_object_role_get(obj); 2098 role = efl_access_object_role_get(obj);
2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) 2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
@@ -2233,7 +2233,7 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2234 Eo *obj = _bridge_object_from_path(bridge, obj_path); 2234 Eo *obj = _bridge_object_from_path(bridge, obj_path);
2235 2235
2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2237 2237
2238 if (!strcmp(property, "ImageDescription")) 2238 if (!strcmp(property, "ImageDescription"))
2239 { 2239 {
@@ -2820,7 +2820,7 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
2820 2820
2821 /* Get the current nodes index in it's parent and the parent object. */ 2821 /* Get the current nodes index in it's parent and the parent object. */
2822 indexinparent = efl_access_object_index_in_parent_get(obj); 2822 indexinparent = efl_access_object_index_in_parent_get(obj);
2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2824 2824
2825 if ((indexinparent > 0) && ((max == 0) || (count < max))) 2825 if ((indexinparent > 0) && ((max == 0) || (count < max)))
2826 { 2826 {
@@ -2876,7 +2876,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
2876 while ((max == 0 || count < max) && obj && obj != collection) 2876 while ((max == 0 || count < max) && obj && obj != collection)
2877 { 2877 {
2878 Eo *parent; 2878 Eo *parent;
2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2880 idx = efl_access_object_index_in_parent_get(obj); 2880 idx = efl_access_object_index_in_parent_get(obj);
2881 count = _collection_sort_order_canonical(rule, list, count, max, parent, 2881 count = _collection_sort_order_canonical(rule, list, count, max, parent,
2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); 2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
@@ -2954,7 +2954,7 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
2954 break; 2954 break;
2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN: 2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
2956 idx = efl_access_object_index_in_parent_get(current); 2956 idx = efl_access_object_index_in_parent_get(current);
2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN); 2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_CLASS);
2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); 2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
2959 break; 2959 break;
2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING: 2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -2982,7 +2982,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2982 AtspiCollectionSortOrder sortby; 2982 AtspiCollectionSortOrder sortby;
2983 Eina_List *result = NULL; 2983 Eina_List *result = NULL;
2984 2984
2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
2986 2986
2987 iter = eldbus_message_iter_get(msg); 2987 iter = eldbus_message_iter_get(msg);
2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -2994,7 +2994,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2994 2994
2995 current = _bridge_object_from_path(bridge, obj_path); 2995 current = _bridge_object_from_path(bridge, obj_path);
2996 2996
2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
2998 2998
2999 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 2999 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3015,7 +3015,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
3015 Eo *collection = obj; 3015 Eo *collection = obj;
3016 3016
3017 if (limit) 3017 if (limit)
3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
3019 3019
3020 switch (tree) 3020 switch (tree)
3021 { 3021 {
@@ -3054,7 +3054,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3054 Eina_List *result = NULL; 3054 Eina_List *result = NULL;
3055 Eina_Bool limit; 3055 Eina_Bool limit;
3056 3056
3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3058 3058
3059 iter = eldbus_message_iter_get(msg); 3059 iter = eldbus_message_iter_get(msg);
3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3066,7 +3066,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3066 3066
3067 current = _bridge_object_from_path(bridge, obj_path); 3067 current = _bridge_object_from_path(bridge, obj_path);
3068 3068
3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
3070 3070
3071 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 3071 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3094,7 +3094,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess
3094 AtspiCollectionSortOrder sortby; 3094 AtspiCollectionSortOrder sortby;
3095 Eina_List *result = NULL; 3095 Eina_List *result = NULL;
3096 3096
3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3098 3098
3099 iter = eldbus_message_iter_get(msg); 3099 iter = eldbus_message_iter_get(msg);
3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3168,7 +3168,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); 3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
3169 if (!iter_array) return; 3169 if (!iter_array) return;
3170 3170
3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3172 { 3172 {
3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); 3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); 3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
@@ -3181,7 +3181,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE)) 3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) 3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
@@ -3203,7 +3203,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3203 Efl_Access_State_Set states; 3203 Efl_Access_State_Set states;
3204 Efl_Access_Role role; 3204 Efl_Access_Role role;
3205 Eo *root; 3205 Eo *root;
3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3207 3207
3208 role = efl_access_object_role_get(data); 3208 role = efl_access_object_role_get(data);
3209 3209
@@ -3217,7 +3217,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3217 _bridge_iter_object_reference_append(bridge, iter_struct, root); 3217 _bridge_iter_object_reference_append(bridge, iter_struct, root);
3218 3218
3219 Eo *parent = NULL; 3219 Eo *parent = NULL;
3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN); 3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_CLASS);
3221 /* Marshall parent */ 3221 /* Marshall parent */
3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) 3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
3223 _object_desktop_reference_append(iter_struct); 3223 _object_desktop_reference_append(iter_struct);
@@ -3300,7 +3300,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3302 3302
3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3304 to_process = eina_list_append(NULL, root); 3304 to_process = eina_list_append(NULL, root);
3305 3305
3306 while (to_process) 3306 while (to_process)
@@ -3705,7 +3705,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3705 "Embed"); 3705 "Embed");
3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3707 3707
3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3709 _bridge_iter_object_reference_append(bridge, iter, root); 3709 _bridge_iter_object_reference_append(bridge, iter, root);
3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3711 3711
@@ -3718,7 +3718,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3718 Eo *root; 3718 Eo *root;
3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3720 3720
3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3722 3722
3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3724 ATSPI_DBUS_PATH_ROOT, 3724 ATSPI_DBUS_PATH_ROOT,
@@ -4118,7 +4118,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4119 4119
4120 path = _path_from_object(obj); 4120 path = _path_from_object(obj);
4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
4122 4122
4123 msg = eldbus_message_signal_new(path, infc, signal->name); 4123 msg = eldbus_message_signal_new(path, infc, signal->name);
4124 if (!msg) return; 4124 if (!msg) return;
@@ -4368,7 +4368,7 @@ _a11y_connection_shutdown(Eo *bridge)
4368 if (pd->event_hash) eina_hash_free(pd->event_hash); 4368 if (pd->event_hash) eina_hash_free(pd->event_hash);
4369 pd->event_hash = NULL; 4369 pd->event_hash = NULL;
4370 4370
4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); 4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_CLASS, pd->event_hdlr);
4372 pd->event_hdlr = NULL; 4372 pd->event_hdlr = NULL;
4373 4373
4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4460,7 +4460,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
4460 _elm_atspi_bridge_app_register(obj); 4460 _elm_atspi_bridge_app_register(obj);
4461 4461
4462 // register accessible object event listener 4462 // register accessible object event listener
4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); 4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_CLASS, _bridge_accessible_event_dispatch, obj);
4464} 4464}
4465 4465
4466static void 4466static void
@@ -4538,7 +4538,7 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
4538{ 4538{
4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4540 4540
4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
4542 { 4542 {
4543 WRN("Unable to register class w/o Efl_Access_Object!"); 4543 WRN("Unable to register class w/o Efl_Access_Object!");
4544 return; 4544 return;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 35956c68f2..bbe87d7bd4 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
8 unknown [[Ctxpopup does not determine it's direction yet.]] 8 unknown [[Ctxpopup does not determine it's direction yet.]]
9} 9}
10 10
11class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy) 11class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Legacy)
12{ 12{
13 [[Elementary context popup class]] 13 [[Elementary context popup class]]
14 legacy_prefix: elm_ctxpopup; 14 legacy_prefix: elm_ctxpopup;
@@ -238,8 +238,6 @@ class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action,
238 Efl.Ui.Widget.theme_apply; 238 Efl.Ui.Widget.theme_apply;
239 Efl.Ui.Widget.widget_event; 239 Efl.Ui.Widget.widget_event;
240 Efl.Ui.Widget.focused_item { get; } 240 Efl.Ui.Widget.focused_item { get; }
241 Efl.Access.Widget.Action.elm_actions { get; }
242 Efl.Access.Object.state_set { get; }
243 Efl.Part.part_get; 241 Efl.Part.part_get;
244 } 242 }
245 events { 243 events {
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index dac8e916f6..1bcd007dcc 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2225,14 +2225,14 @@ _entry_changed_user_signal_cb(void *data,
2225 atspi_info.content = edje_info->change.insert.content; 2225 atspi_info.content = edje_info->change.insert.content;
2226 atspi_info.pos = edje_info->change.insert.pos; 2226 atspi_info.pos = edje_info->change.insert.pos;
2227 atspi_info.len = edje_info->change.insert.plain_length; 2227 atspi_info.len = edje_info->change.insert.plain_length;
2228 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2228 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2229 } 2229 }
2230 else if (edje_info && !edje_info->insert) 2230 else if (edje_info && !edje_info->insert)
2231 { 2231 {
2232 atspi_info.content = edje_info->change.del.content; 2232 atspi_info.content = edje_info->change.del.content;
2233 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2233 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2234 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2234 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2235 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2235 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2236 } 2236 }
2237 } 2237 }
2238} 2238}
@@ -2257,7 +2257,7 @@ _entry_preedit_changed_signal_cb(void *data,
2257 atspi_info.content = text; 2257 atspi_info.content = text;
2258 atspi_info.pos = edje_info->change.insert.pos; 2258 atspi_info.pos = edje_info->change.insert.pos;
2259 atspi_info.len = edje_info->change.insert.plain_length; 2259 atspi_info.len = edje_info->change.insert.plain_length;
2260 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, 2260 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS,
2261 data, 2261 data,
2262 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, 2262 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
2263 &atspi_info); 2263 &atspi_info);
@@ -2349,7 +2349,7 @@ _entry_selection_changed_signal_cb(void *data,
2349 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2349 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2350 _update_selection_handler(data); 2350 _update_selection_handler(data);
2351 if (_elm_config->atspi_mode) 2351 if (_elm_config->atspi_mode)
2352 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); 2352 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2353} 2353}
2354 2354
2355static void 2355static void
@@ -2460,7 +2460,7 @@ _entry_cursor_changed_signal_cb(void *data,
2460 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); 2460 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
2461 2461
2462 if (_elm_config->atspi_mode) 2462 if (_elm_config->atspi_mode)
2463 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2463 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2464} 2464}
2465 2465
2466static void 2466static void
@@ -2472,7 +2472,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2472 efl_event_callback_legacy_call 2472 efl_event_callback_legacy_call
2473 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2473 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2474 if (_elm_config->atspi_mode) 2474 if (_elm_config->atspi_mode)
2475 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2475 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2476} 2476}
2477 2477
2478static void 2478static void
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 9747b4765f..f73814f9f8 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -1,7 +1,6 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 3class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
4 Efl.Access.Widget.Action, Efl.Access.Selection,
5 Efl.Ui.Selectable, Efl.Ui.Legacy) 4 Efl.Ui.Selectable, Efl.Ui.Legacy)
6{ 5{
7 [[Elementary genlist class]] 6 [[Elementary genlist class]]
@@ -542,17 +541,6 @@ class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
542 Elm.Interface_Scrollable.item_loop_enabled { get; set; } 541 Elm.Interface_Scrollable.item_loop_enabled { get; set; }
543 Elm.Interface_Scrollable.bounce_allow { get; set; } 542 Elm.Interface_Scrollable.bounce_allow { get; set; }
544 Elm.Interface_Scrollable.policy { get; set; } 543 Elm.Interface_Scrollable.policy { get; set; }
545 Efl.Access.Object.access_children { get; }
546 Efl.Access.Object.state_set { get; }
547 Efl.Access.Widget.Action.elm_actions { get; }
548 Efl.Access.Selection.selected_children_count { get; }
549 Efl.Access.Selection.selected_child { get; }
550 Efl.Access.Selection.selected_child_deselect;
551 Efl.Access.Selection.child_select;
552 Efl.Access.Selection.child_deselect;
553 Efl.Access.Selection.is_child_selected;
554 Efl.Access.Selection.all_children_select;
555 Efl.Access.Selection.access_selection_clear;
556 Efl.Ui.Widget.focus_state_apply; 544 Efl.Ui.Widget.focus_state_apply;
557 Efl.Ui.Focus.Manager.setup_on_first_touch; 545 Efl.Ui.Focus.Manager.setup_on_first_touch;
558 Efl.Ui.Focus.Manager.manager_focus { get; } 546 Efl.Ui.Focus.Manager.manager_focus { get; }
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 5f6f633c77..93fb3159de 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -8,7 +8,7 @@ enum Elm.Hover.Axis
8} 8}
9 9
10class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, 10class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
11 Efl.Access.Widget.Action, Efl.Ui.Legacy) 11 Efl.Ui.Legacy)
12{ 12{
13 [[Elementary hover class]] 13 [[Elementary hover class]]
14 legacy_prefix: elm_hover; 14 legacy_prefix: elm_hover;
@@ -69,8 +69,6 @@ class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
69 Efl.Ui.Widget.widget_sub_object_add; 69 Efl.Ui.Widget.widget_sub_object_add;
70 Efl.Ui.Widget.widget_parent { get; set; } 70 Efl.Ui.Widget.widget_parent { get; set; }
71 Efl.Ui.Widget.widget_sub_object_del; 71 Efl.Ui.Widget.widget_sub_object_del;
72 Efl.Access.Widget.Action.elm_actions { get; }
73 Efl.Access.Object.state_set { get; }
74 Efl.Part.part_get; 72 Efl.Part.part_get;
75 } 73 }
76 events { 74 events {
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 53cc85f2c9..9ec49c77d6 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
498 if (eo_item2 != EO_OBJ(item)) 498 if (eo_item2 != EO_OBJ(item))
499 elm_menu_item_selected_set(eo_item2, 0); 499 elm_menu_item_selected_set(eo_item2, 0);
500 } 500 }
501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
502 } 502 }
503 else 503 else
504 { 504 {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
513 elm_menu_item_selected_set(eo_item2, 0); 513 elm_menu_item_selected_set(eo_item2, 0);
514 } 514 }
515 } 515 }
516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
517 if (sd->menu_bar && was_open) 517 if (sd->menu_bar && was_open)
518 _menu_item_select_cb(item, NULL, NULL, NULL); 518 _menu_item_select_cb(item, NULL, NULL, NULL);
519 } 519 }
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 70d5547e02..e824c71179 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -182,7 +182,6 @@ class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
182 Efl.Ui.Widget.on_access_update; 182 Efl.Ui.Widget.on_access_update;
183 Efl.Ui.L10n.translation_update; 183 Efl.Ui.L10n.translation_update;
184 Efl.Ui.Widget.widget_event; 184 Efl.Ui.Widget.widget_event;
185 Efl.Access.Object.access_children { get; }
186 Efl.Part.part_get; 185 Efl.Part.part_get;
187 } 186 }
188 events { 187 events {
diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo
index a3dbe7b16c..81e8f3e48f 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/elm_multibuttonentry_item.eo
@@ -1,5 +1,4 @@
1class Elm.Multibuttonentry_Item(Elm.Widget.Item, 1class Elm.Multibuttonentry_Item(Elm.Widget.Item,
2 Efl.Access.Widget.Action,
3 Efl.Ui.Legacy) 2 Efl.Ui.Legacy)
4{ 3{
5 [[Elementary multibuttonentry class]] 4 [[Elementary multibuttonentry class]]
@@ -31,8 +30,5 @@ class Elm.Multibuttonentry_Item(Elm.Widget.Item,
31 Elm.Widget.Item.signal_emit; 30 Elm.Widget.Item.signal_emit;
32 Elm.Widget.Item.part_text { get; set; } 31 Elm.Widget.Item.part_text { get; set; }
33 Elm.Widget.Item.disable; 32 Elm.Widget.Item.disable;
34 Efl.Access.Object.i18n_name { get; }
35 Efl.Access.Object.state_set { get; }
36 Efl.Access.Widget.Action.elm_actions { get; }
37 } 33 }
38} 34}
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 326354f641..ba6f15a2f8 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,5 +1,5 @@
1class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition, 1class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
2 Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy) 2 Efl.Ui.Legacy)
3{ 3{
4 [[Elementary spinner class]] 4 [[Elementary spinner class]]
5 legacy_prefix: elm_spinner; 5 legacy_prefix: elm_spinner;
@@ -177,11 +177,6 @@ class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
177 Efl.Ui.Range.range_min_max { get; set; } 177 Efl.Ui.Range.range_min_max { get; set; }
178 Efl.Ui.Range.range_step { get; set; } 178 Efl.Ui.Range.range_step { get; set; }
179 Efl.Ui.Range.range_value { get; set; } 179 Efl.Ui.Range.range_value { get; set; }
180 Efl.Access.Object.i18n_name { get; }
181 Efl.Access.Value.value_and_text { get; set; }
182 Efl.Access.Value.range { get; }
183 Efl.Access.Value.increment { get; }
184 Efl.Access.Widget.Action.elm_actions { get; }
185 } 180 }
186 events { 181 events {
187 /* FIXME: Colorselector puts Colorselector_Data here! */ 182 /* FIXME: Colorselector puts Colorselector_Data here! */
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 1c70d47dc8..1e12261176 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -24,7 +24,6 @@ enum Elm.Toolbar_Shrink_Mode
24} 24}
25 25
26class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction, 26class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction,
27 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
28 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy) 27 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
29{ 28{
30 [[Elementary toolbar class]] 29 [[Elementary toolbar class]]
@@ -359,17 +358,6 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll
359 Efl.Ui.Widget.focused_item { get; } 358 Efl.Ui.Widget.focused_item { get; }
360 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] } 359 Efl.Ui.Direction.direction { get; set; [[Only supports $vertical and $horizontal. Default is $horizontal.]] }
361 Efl.Ui.Widget.focus_state_apply; 360 Efl.Ui.Widget.focus_state_apply;
362 Efl.Access.Widget.Action.elm_actions { get; }
363 Efl.Access.Object.access_children { get; }
364 Efl.Access.Object.state_set { get; }
365 Efl.Access.Selection.selected_children_count { get; }
366 Efl.Access.Selection.selected_child { get; }
367 Efl.Access.Selection.selected_child_deselect;
368 Efl.Access.Selection.child_select;
369 Efl.Access.Selection.child_deselect;
370 Efl.Access.Selection.is_child_selected;
371 Efl.Access.Selection.all_children_select;
372 Efl.Access.Selection.access_selection_clear;
373 Efl.Ui.Focus.Composition.prepare; 361 Efl.Ui.Focus.Composition.prepare;
374 } 362 }
375 events { 363 events {
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 8154c53615..bf8cbfa215 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -323,7 +323,5 @@ class Elm.Toolbar_Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
323 Efl.Ui.Focus.Object.focus_geometry { get; } 323 Efl.Ui.Focus.Object.focus_geometry { get; }
324 Efl.Ui.Focus.Object.focus { set; } 324 Efl.Ui.Focus.Object.focus { set; }
325 Efl.Ui.Focus.Object.focus_parent { get; } 325 Efl.Ui.Focus.Object.focus_parent { get; }
326 Efl.Access.Object.i18n_name { get; }
327 Efl.Access.Object.state_set { get; }
328 } 326 }
329} 327}
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index 99229851f8..5a10efce45 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -382,6 +382,8 @@ typedef struct _Elm_Widget_Smart_Data
382 Evas_Object *prev, *next, *up, *down, *right, *left; 382 Evas_Object *prev, *next, *up, *down, *right, *left;
383 Elm_Object_Item *item_prev, *item_next, *item_up, *item_down, *item_right, *item_left; 383 Elm_Object_Item *item_prev, *item_next, *item_up, *item_down, *item_right, *item_left;
384 } legacy_focus; 384 } legacy_focus;
385
386 Eo *access_object;
385 Eina_Bool scroll_x_locked : 1; 387 Eina_Bool scroll_x_locked : 1;
386 Eina_Bool scroll_y_locked : 1; 388 Eina_Bool scroll_y_locked : 1;
387 389
@@ -569,6 +571,7 @@ struct _Elm_Widget_Item_Data
569 Eina_List *signals; 571 Eina_List *signals;
570 Eina_Hash *labels; 572 Eina_Hash *labels;
571 Evas_Object *track_obj; 573 Evas_Object *track_obj;
574 Eo *access_object;
572 575
573 Eina_Bool disabled : 1; 576 Eina_Bool disabled : 1;
574 Eina_Bool on_deletion : 1; 577 Eina_Bool on_deletion : 1;
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index e409481008..50bcaac81d 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -4,8 +4,7 @@ import efl_ui;
4type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]] 4type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]]
5type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]] 5type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]]
6 6
7class Elm.Widget.Item(Efl.Object, Efl.Access.Object, 7class Elm.Widget.Item(Efl.Object)
8 Efl.Access.Component)
9{ 8{
10 [[Elementary widget item class]] 9 [[Elementary widget item class]]
11 eo_prefix: elm_wdg_item; 10 eo_prefix: elm_wdg_item;
@@ -534,14 +533,22 @@ class Elm.Widget.Item(Efl.Object, Efl.Access.Object,
534 dir: Efl.Ui.Focus.Direction; [[Focus direction]] 533 dir: Efl.Ui.Focus.Direction; [[Focus direction]]
535 } 534 }
536 } 535 }
536 @property access_object {
537 [[ Return accessibile object representation of widget ]]
538 get {
539 return: Efl.Access.Object;
540 }
541 }
542 access_object_create @protected {
543 [[ Virtual function returning new instance of widget accessible
544 representation. Expected to be overloaded in derived classes. ]]
545 return: Efl.Access.Object;
546 legacy: null;
547 }
537 } 548 }
538 implements { 549 implements {
539 Efl.Object.constructor; 550 Efl.Object.constructor;
540 Efl.Object.destructor; 551 Efl.Object.destructor;
541 Efl.Object.invalidate; 552 Efl.Object.invalidate;
542 Efl.Access.Object.state_set { get; }
543 Efl.Access.Object.attributes { get; }
544 Efl.Access.Component.extents { get; set; }
545 Efl.Access.Component.focus_grab;
546 } 553 }
547} 554}