summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2017-09-25 17:15:44 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 17:58:07 +0900
commitb3ffd78237282883c327082c841205f2f0643642 (patch)
tree6e5e776dbe7ff8990faa54c0f4bfd5ba60a6962c /src/lib/elementary
parentc9f51e450b33e3ba6d5c66434f9fb38081b0efb7 (diff)
elm: rename Elm.Interface.Atspi.Text => Efl.Access.Text
Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5167
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_access_editable_text.c (renamed from src/lib/elementary/elm_interface_atspi_text_editable.c)4
-rw-r--r--src/lib/elementary/efl_access_editable_text.eo (renamed from src/lib/elementary/elm_interface_atspi_text_editable.eo)5
-rw-r--r--src/lib/elementary/efl_access_text.c (renamed from src/lib/elementary/elm_interface_atspi_text.c)6
-rw-r--r--src/lib/elementary/efl_access_text.eo (renamed from src/lib/elementary/elm_interface_atspi_text.eo)27
-rw-r--r--src/lib/elementary/efl_access_text.h19
-rw-r--r--src/lib/elementary/efl_ui_text.c94
-rw-r--r--src/lib/elementary/efl_ui_text.eo46
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c138
-rw-r--r--src/lib/elementary/elm_code_widget.eo2
-rw-r--r--src/lib/elementary/elm_entry.c100
-rw-r--r--src/lib/elementary/elm_entry.eo46
-rw-r--r--src/lib/elementary/elm_interface_atspi_text.h19
-rw-r--r--src/lib/elementary/elm_interfaces.h6
13 files changed, 255 insertions, 257 deletions
diff --git a/src/lib/elementary/elm_interface_atspi_text_editable.c b/src/lib/elementary/efl_access_editable_text.c
index 6f7ec68075..bd03d6613e 100644
--- a/src/lib/elementary/elm_interface_atspi_text_editable.c
+++ b/src/lib/elementary/efl_access_editable_text.c
@@ -2,10 +2,10 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 5#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11#include "elm_interface_atspi_text_editable.eo.c" 11#include "efl_access_editable_text.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_text_editable.eo b/src/lib/elementary/efl_access_editable_text.eo
index 7bed45bee7..21c823b3f0 100644
--- a/src/lib/elementary/elm_interface_atspi_text_editable.eo
+++ b/src/lib/elementary/efl_access_editable_text.eo
@@ -1,7 +1,6 @@
1interface Elm.Interface.Atspi.Text.Editable () 1interface Efl.Access.Editable.Text ()
2{ 2{
3 [[Elementary AT-SPI text editable interface]] 3 [[Elementary editable text interface]]
4 eo_prefix: elm_interface_atspi_text_editable;
5 methods { 4 methods {
6 @property content @protected { 5 @property content @protected {
7 [[Editable content property]] 6 [[Editable content property]]
diff --git a/src/lib/elementary/elm_interface_atspi_text.c b/src/lib/elementary/efl_access_text.c
index 792d27c4c8..5f3f339f60 100644
--- a/src/lib/elementary/elm_interface_atspi_text.c
+++ b/src/lib/elementary/efl_access_text.c
@@ -2,14 +2,14 @@
2 #include "elementary_config.h" 2 #include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED 5#define EFL_ACCESS_TEXT_PROTECTED
6 6
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11void 11void
12EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr) 12EAPI elm_atspi_text_text_attribute_free(Efl_Access_Text_Attribute *attr)
13{ 13{
14 if (!attr) return; 14 if (!attr) return;
15 if (attr->name) eina_stringshare_del(attr->name); 15 if (attr->name) eina_stringshare_del(attr->name);
@@ -17,4 +17,4 @@ EAPI elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr)
17 free(attr); 17 free(attr);
18} 18}
19 19
20#include "elm_interface_atspi_text.eo.c" 20#include "efl_access_text.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_text.eo b/src/lib/elementary/efl_access_text.eo
index 3cd2ddcaaa..871cb68fc2 100644
--- a/src/lib/elementary/elm_interface_atspi_text.eo
+++ b/src/lib/elementary/efl_access_text.eo
@@ -1,6 +1,6 @@
1import eina_types; 1import eina_types;
2 2
3enum Elm.Atspi_Text.Granularity 3enum Efl.Access.Text.Granularity
4{ 4{
5 [[Text accessibility granularity]] 5 [[Text accessibility granularity]]
6 char, [[Character granularity]] 6 char, [[Character granularity]]
@@ -10,7 +10,7 @@ enum Elm.Atspi_Text.Granularity
10 paragraph [[Paragraph granularity]] 10 paragraph [[Paragraph granularity]]
11} 11}
12 12
13enum Elm.Atspi_Text.Clip_Type 13enum Efl.Access.Text.Clip_Type
14{ 14{
15 [[Text clip type]] 15 [[Text clip type]]
16 legacy: elm_atspi_text_clip; 16 legacy: elm_atspi_text_clip;
@@ -20,14 +20,14 @@ enum Elm.Atspi_Text.Clip_Type
20 both [[Both clip types]] 20 both [[Both clip types]]
21} 21}
22 22
23struct Elm.Atspi_Text.Attribute 23struct Efl.Access.Text.Attribute
24{ 24{
25 [[Text attribute]] 25 [[Text attribute]]
26 name: string; [[Text attribute name]] 26 name: string; [[Text attribute name]]
27 value: string; [[Text attribute value]] 27 value: string; [[Text attribute value]]
28} 28}
29 29
30struct Elm.Atspi_Text.Range 30struct Efl.Access.Text.Range
31{ 31{
32 [[Text range]] 32 [[Text range]]
33 start_offset: int; [[Range start offset]] 33 start_offset: int; [[Range start offset]]
@@ -35,7 +35,7 @@ struct Elm.Atspi_Text.Range
35 content: ptr(char); [[Range content]] 35 content: ptr(char); [[Range content]]
36} 36}
37 37
38struct Elm.Atspi_Text.Change_Info 38struct Efl.Access.Text.Change_Info
39{ 39{
40 [[Text change information]] 40 [[Text change information]]
41 content: string; [[Change content]] 41 content: string; [[Change content]]
@@ -44,10 +44,9 @@ struct Elm.Atspi_Text.Change_Info
44 len: size; [[Change length]] 44 len: size; [[Change length]]
45} 45}
46 46
47interface Elm.Interface.Atspi.Text () 47interface Efl.Access.Text ()
48{ 48{
49 [[Elementary AT-SPI text interface]] 49 [[Elementary accessible text interface]]
50 eo_prefix: elm_interface_atspi_text;
51 methods { 50 methods {
52 @property character @protected { 51 @property character @protected {
53 get { 52 get {
@@ -65,7 +64,7 @@ interface Elm.Interface.Atspi.Text ()
65 [[Gets string, start and end offset in text according to given initial offset and granularity.]] 64 [[Gets string, start and end offset in text according to given initial offset and granularity.]]
66 } 65 }
67 keys { 66 keys {
68 granularity: Elm.Atspi_Text.Granularity; [[Text granularity]] 67 granularity: Efl.Access.Text.Granularity; [[Text granularity]]
69 start_offset: ptr(int) @nonull; [[Offset indicating start of string according to given granularity. -1 in case of error.]] 68 start_offset: ptr(int) @nonull; [[Offset indicating start of string according to given granularity. -1 in case of error.]]
70 end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]] 69 end_offset: ptr(int); [[Offset indicating end of string according to given granularity. -1 in case of error.]]
71 } 70 }
@@ -120,7 +119,7 @@ interface Elm.Interface.Atspi.Text ()
120 end_offset: ptr(int); [[End offset]] 119 end_offset: ptr(int); [[End offset]]
121 } 120 }
122 values { 121 values {
123 attributes: list<ptr(Elm.Atspi_Text.Attribute) @owned> @owned; [[List of text attributes]] 122 attributes: list<ptr(Efl.Access.Text.Attribute) @owned> @owned; [[List of text attributes]]
124 } 123 }
125 } 124 }
126 @property default_attributes @protected { 125 @property default_attributes @protected {
@@ -128,7 +127,7 @@ interface Elm.Interface.Atspi.Text ()
128 get { 127 get {
129 } 128 }
130 values { 129 values {
131 attributes: list<ptr(Elm.Atspi_Text.Attribute) @owned> @owned; [[List of default attributes]] 130 attributes: list<ptr(Efl.Access.Text.Attribute) @owned> @owned; [[List of default attributes]]
132 } 131 }
133 } 132 }
134 @property character_extents @protected { 133 @property character_extents @protected {
@@ -172,11 +171,11 @@ interface Elm.Interface.Atspi.Text ()
172 keys { 171 keys {
173 screen_coords: bool; [[If $true, x and y values will be relative to screen origin, otherwise relative to canvas]] 172 screen_coords: bool; [[If $true, x and y values will be relative to screen origin, otherwise relative to canvas]]
174 rect: Eina.Rect; [[Bounding box]] 173 rect: Eina.Rect; [[Bounding box]]
175 xclip: Elm.Atspi_Text.Clip_Type; [[AT-SPI xclip]] 174 xclip: Efl.Access.Text.Clip_Type; [[xclip]]
176 yclip: Elm.Atspi_Text.Clip_Type; [[AT-SPI yclip]] 175 yclip: Efl.Access.Text.Clip_Type; [[yclip]]
177 } 176 }
178 values { 177 values {
179 ranges: list<ptr(Elm.Atspi_Text.Range) @owned> @owned; [[List of ranges]] 178 ranges: list<ptr(Efl.Access.Text.Range) @owned> @owned; [[List of ranges]]
180 } 179 }
181 } 180 }
182 @property range_extents @protected { 181 @property range_extents @protected {
diff --git a/src/lib/elementary/efl_access_text.h b/src/lib/elementary/efl_access_text.h
new file mode 100644
index 0000000000..edbb6e10f9
--- /dev/null
+++ b/src/lib/elementary/efl_access_text.h
@@ -0,0 +1,19 @@
1#ifndef ELM_INTERFACE_ATSPI_TEXT_H
2#define ELM_INTERFACE_ATSPI_TEXT_H
3
4#ifdef EFL_BETA_API_SUPPORT
5
6#ifdef EFL_EO_API_SUPPORT
7#include "efl_access_text.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "efl_access_text.eo.legacy.h"
11#endif
12
13/**
14 * @brief Free Efl_Access_Text_Attribute structure
15 */
16EAPI void elm_atspi_text_text_attribute_free(Efl_Access_Text_Attribute *attr);
17
18#endif
19#endif
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 8e94762da8..77b022a5d7 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED 6#define EFL_ACCESS_TEXT_PROTECTED
7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -2190,20 +2190,20 @@ _entry_changed_user_signal_cb(void *data,
2190 } 2190 }
2191 if (_elm_config->atspi_mode) 2191 if (_elm_config->atspi_mode)
2192 { 2192 {
2193 Elm_Atspi_Text_Change_Info atspi_info; 2193 Efl_Access_Text_Change_Info atspi_info;
2194 if (edje_info && edje_info->insert) 2194 if (edje_info && edje_info->insert)
2195 { 2195 {
2196 atspi_info.content = edje_info->change.insert.content; 2196 atspi_info.content = edje_info->change.insert.content;
2197 atspi_info.pos = edje_info->change.insert.pos; 2197 atspi_info.pos = edje_info->change.insert.pos;
2198 atspi_info.len = edje_info->change.insert.plain_length; 2198 atspi_info.len = edje_info->change.insert.plain_length;
2199 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2199 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2200 } 2200 }
2201 else if (edje_info && !edje_info->insert) 2201 else if (edje_info && !edje_info->insert)
2202 { 2202 {
2203 atspi_info.content = edje_info->change.del.content; 2203 atspi_info.content = edje_info->change.del.content;
2204 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2204 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2205 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2205 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2206 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2206 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2207 } 2207 }
2208 } 2208 }
2209} 2209}
@@ -2258,7 +2258,7 @@ _entry_cursor_changed_signal_cb(void *data,
2258 _decoration_defer(obj); 2258 _decoration_defer(obj);
2259 2259
2260 if (_elm_config->atspi_mode) 2260 if (_elm_config->atspi_mode)
2261 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2261 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2262} 2262}
2263 2263
2264static void 2264static void
@@ -2270,7 +2270,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2270 efl_event_callback_legacy_call 2270 efl_event_callback_legacy_call
2271 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2271 (data, EFL_UI_TEXT_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2272 if (_elm_config->atspi_mode) 2272 if (_elm_config->atspi_mode)
2273 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2273 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2274} 2274}
2275 2275
2276static void 2276static void
@@ -4089,7 +4089,7 @@ _efl_ui_text_class_constructor(Efl_Class *klass)
4089// ATSPI Accessibility 4089// ATSPI Accessibility
4090 4090
4091EOLIAN static Eina_Unicode 4091EOLIAN static Eina_Unicode
4092_efl_ui_text_elm_interface_atspi_text_character_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) 4092_efl_ui_text_efl_access_text_character_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
4093{ 4093{
4094 const char *txt; 4094 const char *txt;
4095 int idx = 0; 4095 int idx = 0;
@@ -4108,7 +4108,7 @@ _efl_ui_text_elm_interface_atspi_text_character_get(Eo *obj, Efl_Ui_Text_Data *_
4108} 4108}
4109 4109
4110EOLIAN static int 4110EOLIAN static int
4111_efl_ui_text_elm_interface_atspi_text_character_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4111_efl_ui_text_efl_access_text_character_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4112{ 4112{
4113 const char *txt; 4113 const char *txt;
4114 4114
@@ -4118,7 +4118,7 @@ _efl_ui_text_elm_interface_atspi_text_character_count_get(Eo *obj, Efl_Ui_Text_D
4118} 4118}
4119 4119
4120EOLIAN static char* 4120EOLIAN static char*
4121_efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, Elm_Atspi_Text_Granularity granularity, int *start_offset, int *end_offset) 4121_efl_ui_text_efl_access_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset)
4122{ 4122{
4123 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 4123 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
4124 char *ret = NULL; 4124 char *ret = NULL;
@@ -4133,18 +4133,18 @@ _efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Tex
4133 4133
4134 switch (granularity) 4134 switch (granularity)
4135 { 4135 {
4136 case ELM_ATSPI_TEXT_GRANULARITY_CHAR: 4136 case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
4137 break; 4137 break;
4138 case ELM_ATSPI_TEXT_GRANULARITY_WORD: 4138 case EFL_ACCESS_TEXT_GRANULARITY_WORD:
4139 evas_textblock_cursor_word_start(cur); 4139 evas_textblock_cursor_word_start(cur);
4140 break; 4140 break;
4141 case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE: 4141 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
4142 // TODO - add sentence support in textblock first 4142 // TODO - add sentence support in textblock first
4143 break; 4143 break;
4144 case ELM_ATSPI_TEXT_GRANULARITY_LINE: 4144 case EFL_ACCESS_TEXT_GRANULARITY_LINE:
4145 evas_textblock_cursor_line_char_first(cur); 4145 evas_textblock_cursor_line_char_first(cur);
4146 break; 4146 break;
4147 case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH: 4147 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
4148 evas_textblock_cursor_paragraph_char_first(cur); 4148 evas_textblock_cursor_paragraph_char_first(cur);
4149 break; 4149 break;
4150 } 4150 }
@@ -4154,23 +4154,23 @@ _efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj EINA_UNUSED, Efl_Ui_Tex
4154 4154
4155 switch (granularity) 4155 switch (granularity)
4156 { 4156 {
4157 case ELM_ATSPI_TEXT_GRANULARITY_CHAR: 4157 case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
4158 evas_textblock_cursor_char_next(cur2); 4158 evas_textblock_cursor_char_next(cur2);
4159 break; 4159 break;
4160 case ELM_ATSPI_TEXT_GRANULARITY_WORD: 4160 case EFL_ACCESS_TEXT_GRANULARITY_WORD:
4161 evas_textblock_cursor_word_end(cur2); 4161 evas_textblock_cursor_word_end(cur2);
4162 // since word_end sets cursor position ON (before) last 4162 // since word_end sets cursor position ON (before) last
4163 // char of word, we need to manually advance cursor to get 4163 // char of word, we need to manually advance cursor to get
4164 // proper string from function range_text_get 4164 // proper string from function range_text_get
4165 evas_textblock_cursor_char_next(cur2); 4165 evas_textblock_cursor_char_next(cur2);
4166 break; 4166 break;
4167 case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE: 4167 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
4168 // TODO - add sentence support in textblock first 4168 // TODO - add sentence support in textblock first
4169 break; 4169 break;
4170 case ELM_ATSPI_TEXT_GRANULARITY_LINE: 4170 case EFL_ACCESS_TEXT_GRANULARITY_LINE:
4171 evas_textblock_cursor_line_char_last(cur2); 4171 evas_textblock_cursor_line_char_last(cur2);
4172 break; 4172 break;
4173 case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH: 4173 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
4174 evas_textblock_cursor_paragraph_char_last(cur2); 4174 evas_textblock_cursor_paragraph_char_last(cur2);
4175 break; 4175 break;
4176 } 4176 }
@@ -4200,7 +4200,7 @@ fail:
4200} 4200}
4201 4201
4202EOLIAN static char* 4202EOLIAN static char*
4203_efl_ui_text_elm_interface_atspi_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset) 4203_efl_ui_text_efl_access_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
4204{ 4204{
4205 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 4205 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
4206 char *ret = NULL; 4206 char *ret = NULL;
@@ -4237,26 +4237,26 @@ fail:
4237} 4237}
4238 4238
4239EOLIAN static int 4239EOLIAN static int
4240_efl_ui_text_elm_interface_atspi_text_caret_offset_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4240_efl_ui_text_efl_access_text_caret_offset_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4241{ 4241{
4242 return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN)); 4242 return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN));
4243} 4243}
4244 4244
4245EOLIAN static Eina_Bool 4245EOLIAN static Eina_Bool
4246_efl_ui_text_elm_interface_atspi_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) 4246_efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
4247{ 4247{
4248 efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), offset); 4248 efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), offset);
4249 return EINA_TRUE; 4249 return EINA_TRUE;
4250} 4250}
4251 4251
4252EOLIAN static int 4252EOLIAN static int
4253_efl_ui_text_elm_interface_atspi_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4253_efl_ui_text_efl_access_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4254{ 4254{
4255 return _efl_ui_text_selection_get(obj, _pd) ? 1 : 0; 4255 return _efl_ui_text_selection_get(obj, _pd) ? 1 : 0;
4256} 4256}
4257 4257
4258EOLIAN static void 4258EOLIAN static void
4259_efl_ui_text_elm_interface_atspi_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset) 4259_efl_ui_text_efl_access_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
4260{ 4260{
4261 if (selection_number != 0) return; 4261 if (selection_number != 0) return;
4262 4262
@@ -4264,7 +4264,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_get(Eo *obj, Efl_Ui_Text_Data *_
4264} 4264}
4265 4265
4266EOLIAN static Eina_Bool 4266EOLIAN static Eina_Bool
4267_efl_ui_text_elm_interface_atspi_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset) 4267_efl_ui_text_efl_access_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
4268{ 4268{
4269 if (selection_number != 0) return EINA_FALSE; 4269 if (selection_number != 0) return EINA_FALSE;
4270 4270
@@ -4274,7 +4274,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_
4274} 4274}
4275 4275
4276EOLIAN static Eina_Bool 4276EOLIAN static Eina_Bool
4277_efl_ui_text_elm_interface_atspi_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number) 4277_efl_ui_text_efl_access_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number)
4278{ 4278{
4279 if (selection_number != 0) return EINA_FALSE; 4279 if (selection_number != 0) return EINA_FALSE;
4280 _efl_ui_text_select_none(obj, pd); 4280 _efl_ui_text_select_none(obj, pd);
@@ -4282,7 +4282,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_remove(Eo *obj, Efl_Ui_Text_Data
4282} 4282}
4283 4283
4284EOLIAN static Eina_Bool 4284EOLIAN static Eina_Bool
4285_efl_ui_text_elm_interface_atspi_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset) 4285_efl_ui_text_efl_access_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
4286{ 4286{
4287 _efl_ui_text_select_region_set(obj, pd, start_offset, end_offset); 4287 _efl_ui_text_select_region_set(obj, pd, start_offset, end_offset);
4288 4288
@@ -4290,13 +4290,13 @@ _efl_ui_text_elm_interface_atspi_text_selection_add(Eo *obj, Efl_Ui_Text_Data *p
4290} 4290}
4291 4291
4292EOLIAN static Eina_List* 4292EOLIAN static Eina_List*
4293_efl_ui_text_elm_interface_atspi_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Elm_Atspi_Text_Clip_Type xclip EINA_UNUSED, Elm_Atspi_Text_Clip_Type yclip EINA_UNUSED) 4293_efl_ui_text_efl_access_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED)
4294{ 4294{
4295 return NULL; 4295 return NULL;
4296} 4296}
4297 4297
4298EOLIAN static int 4298EOLIAN static int
4299_efl_ui_text_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y) 4299_efl_ui_text_efl_access_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
4300{ 4300{
4301 Evas_Textblock_Cursor *cur; 4301 Evas_Textblock_Cursor *cur;
4302 int ret; 4302 int ret;
@@ -4329,7 +4329,7 @@ _efl_ui_text_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_D
4329} 4329}
4330 4330
4331EOLIAN static Eina_Bool 4331EOLIAN static Eina_Bool
4332_efl_ui_text_elm_interface_atspi_text_character_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect) 4332_efl_ui_text_efl_access_text_character_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
4333{ 4333{
4334 Evas_Textblock_Cursor *cur; 4334 Evas_Textblock_Cursor *cur;
4335 int ret; 4335 int ret;
@@ -4360,7 +4360,7 @@ _efl_ui_text_elm_interface_atspi_text_character_extents_get(Eo *obj, Efl_Ui_Text
4360} 4360}
4361 4361
4362EOLIAN static Eina_Bool 4362EOLIAN static Eina_Bool
4363_efl_ui_text_elm_interface_atspi_text_range_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect) 4363_efl_ui_text_efl_access_text_range_extents_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
4364{ 4364{
4365 Evas_Textblock_Cursor *cur1, *cur2; 4365 Evas_Textblock_Cursor *cur1, *cur2;
4366 int ret; 4366 int ret;
@@ -4407,17 +4407,17 @@ _efl_ui_text_elm_interface_atspi_text_range_extents_get(Eo *obj, Efl_Ui_Text_Dat
4407 return EINA_TRUE; 4407 return EINA_TRUE;
4408} 4408}
4409 4409
4410static Elm_Atspi_Text_Attribute* 4410static Efl_Access_Text_Attribute*
4411_textblock_node_format_to_atspi_text_attr(Eo *obj, 4411_textblock_node_format_to_atspi_text_attr(Eo *obj,
4412 Efl_Text_Annotate_Annotation *annotation) 4412 Efl_Text_Annotate_Annotation *annotation)
4413{ 4413{
4414 Elm_Atspi_Text_Attribute *ret; 4414 Efl_Access_Text_Attribute *ret;
4415 const char *txt; 4415 const char *txt;
4416 4416
4417 txt = efl_text_annotation_get(obj, annotation); 4417 txt = efl_text_annotation_get(obj, annotation);
4418 if (!txt) return NULL; 4418 if (!txt) return NULL;
4419 4419
4420 ret = calloc(1, sizeof(Elm_Atspi_Text_Attribute)); 4420 ret = calloc(1, sizeof(Efl_Access_Text_Attribute));
4421 if (!ret) return NULL; 4421 if (!ret) return NULL;
4422 4422
4423 ret->value = eina_stringshare_add(txt); 4423 ret->value = eina_stringshare_add(txt);
@@ -4428,10 +4428,10 @@ _textblock_node_format_to_atspi_text_attr(Eo *obj,
4428} 4428}
4429 4429
4430EOLIAN static Eina_Bool 4430EOLIAN static Eina_Bool
4431_efl_ui_text_elm_interface_atspi_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value) 4431_efl_ui_text_efl_access_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
4432{ 4432{
4433 Evas_Textblock_Cursor *cur1, *cur2; 4433 Evas_Textblock_Cursor *cur1, *cur2;
4434 Elm_Atspi_Text_Attribute *attr; 4434 Efl_Access_Text_Attribute *attr;
4435 Eina_Iterator *annotations; 4435 Eina_Iterator *annotations;
4436 Efl_Text_Annotate_Annotation *an; 4436 Efl_Text_Annotate_Annotation *an;
4437 4437
@@ -4473,11 +4473,11 @@ _efl_ui_text_elm_interface_atspi_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_
4473} 4473}
4474 4474
4475EOLIAN static Eina_List* 4475EOLIAN static Eina_List*
4476_efl_ui_text_elm_interface_atspi_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset) 4476_efl_ui_text_efl_access_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
4477{ 4477{
4478 Evas_Textblock_Cursor *cur1, *cur2; 4478 Evas_Textblock_Cursor *cur1, *cur2;
4479 Eina_List *ret = NULL; 4479 Eina_List *ret = NULL;
4480 Elm_Atspi_Text_Attribute *attr; 4480 Efl_Access_Text_Attribute *attr;
4481 Eina_Iterator *annotations; 4481 Eina_Iterator *annotations;
4482 Efl_Text_Annotate_Annotation *an; 4482 Efl_Text_Annotate_Annotation *an;
4483 4483
@@ -4513,10 +4513,10 @@ _efl_ui_text_elm_interface_atspi_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *
4513} 4513}
4514 4514
4515EOLIAN static Eina_List* 4515EOLIAN static Eina_List*
4516_efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 4516_efl_ui_text_efl_access_text_default_attributes_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
4517{ 4517{
4518 Eina_List *ret = NULL; 4518 Eina_List *ret = NULL;
4519 Elm_Atspi_Text_Attribute *attr; 4519 Efl_Access_Text_Attribute *attr;
4520 Efl_Text_Cursor_Cursor *start, *end; 4520 Efl_Text_Cursor_Cursor *start, *end;
4521 Eina_Iterator *annotations; 4521 Eina_Iterator *annotations;
4522 Efl_Text_Annotate_Annotation *an; 4522 Efl_Text_Annotate_Annotation *an;
@@ -4542,14 +4542,14 @@ _efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj, Efl_Ui_Tex
4542} 4542}
4543 4543
4544EOLIAN static Eina_Bool 4544EOLIAN static Eina_Bool
4545_efl_ui_text_elm_interface_atspi_text_editable_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content) 4545_efl_ui_text_efl_access_editable_text_content_set(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, const char *content)
4546{ 4546{
4547 efl_text_set(obj, content); 4547 efl_text_set(obj, content);
4548 return EINA_TRUE; 4548 return EINA_TRUE;
4549} 4549}
4550 4550
4551EOLIAN static Eina_Bool 4551EOLIAN static Eina_Bool
4552_efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position) 4552_efl_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position)
4553{ 4553{
4554 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 4554 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
4555 efl_text_cursor_position_set(obj, cur_obj, position); 4555 efl_text_cursor_position_set(obj, cur_obj, position);
@@ -4559,7 +4559,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data
4559} 4559}
4560 4560
4561EOLIAN static Eina_Bool 4561EOLIAN static Eina_Bool
4562_efl_ui_text_elm_interface_atspi_text_editable_copy(Eo *obj, Efl_Ui_Text_Data *pd, int start, int end) 4562_efl_ui_text_efl_access_editable_text_copy(Eo *obj, Efl_Ui_Text_Data *pd, int start, int end)
4563{ 4563{
4564 _efl_ui_text_select_region_set(obj, pd, start, end); 4564 _efl_ui_text_select_region_set(obj, pd, start, end);
4565 efl_ui_text_selection_copy(obj); 4565 efl_ui_text_selection_copy(obj);
@@ -4568,7 +4568,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_copy(Eo *obj, Efl_Ui_Text_Data *p
4568} 4568}
4569 4569
4570EOLIAN static Eina_Bool 4570EOLIAN static Eina_Bool
4571_efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset) 4571_efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int start_offset, int end_offset)
4572{ 4572{
4573 Evas_Textblock_Cursor *cur1, *cur2; 4573 Evas_Textblock_Cursor *cur1, *cur2;
4574 Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text"); 4574 Eo *text_obj = edje_object_part_swallow_get(pd->entry_edje, "elm.text");
@@ -4599,7 +4599,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
4599} 4599}
4600 4600
4601EOLIAN static Eina_Bool 4601EOLIAN static Eina_Bool
4602_efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position) 4602_efl_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
4603{ 4603{
4604 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 4604 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN);
4605 efl_text_cursor_position_set(obj, cur_obj, position); 4605 efl_text_cursor_position_set(obj, cur_obj, position);
@@ -4608,7 +4608,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *
4608} 4608}
4609 4609
4610EOLIAN static Eina_Bool 4610EOLIAN static Eina_Bool
4611_efl_ui_text_elm_interface_atspi_text_editable_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start, int end) 4611_efl_ui_text_efl_access_editable_text_cut(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start, int end)
4612{ 4612{
4613 _efl_ui_text_select_region_set(obj, pd, start, end); 4613 _efl_ui_text_select_region_set(obj, pd, start, end);
4614 efl_ui_text_selection_cut(obj); 4614 efl_ui_text_selection_cut(obj);
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 6119d30cfd..27314bbb19 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -2,7 +2,7 @@ import elm_general;
2import elm_entry; 2import elm_entry;
3 3
4class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 4class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
5 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
6 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive) 6 Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Ui.Text.Interactive)
7{ 7{
8 [[Efl UI text class]] 8 [[Efl UI text class]]
@@ -370,28 +370,28 @@ class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
370 Elm.Interface_Scrollable.bounce_allow { set; } 370 Elm.Interface_Scrollable.bounce_allow { set; }
371 Elm.Interface.Atspi_Accessible.state_set { get; } 371 Elm.Interface.Atspi_Accessible.state_set { get; }
372 Elm.Interface.Atspi_Accessible.name { get; } 372 Elm.Interface.Atspi_Accessible.name { get; }
373 Elm.Interface.Atspi.Text.text { get; } 373 Efl.Access.Text.text { get; }
374 Elm.Interface.Atspi.Text.string { get; } 374 Efl.Access.Text.string { get; }
375 Elm.Interface.Atspi.Text.attribute { get; } 375 Efl.Access.Text.attribute { get; }
376 Elm.Interface.Atspi.Text.attributes { get; } 376 Efl.Access.Text.attributes { get; }
377 Elm.Interface.Atspi.Text.default_attributes { get; } 377 Efl.Access.Text.default_attributes { get; }
378 Elm.Interface.Atspi.Text.caret_offset { get; set; } 378 Efl.Access.Text.caret_offset { get; set; }
379 Elm.Interface.Atspi.Text.character { get; } 379 Efl.Access.Text.character { get; }
380 Elm.Interface.Atspi.Text.character_extents { get; } 380 Efl.Access.Text.character_extents { get; }
381 Elm.Interface.Atspi.Text.character_count { get; } 381 Efl.Access.Text.character_count { get; }
382 Elm.Interface.Atspi.Text.offset_at_point { get; } 382 Efl.Access.Text.offset_at_point { get; }
383 Elm.Interface.Atspi.Text.bounded_ranges { get; } 383 Efl.Access.Text.bounded_ranges { get; }
384 Elm.Interface.Atspi.Text.range_extents { get; } 384 Efl.Access.Text.range_extents { get; }
385 Elm.Interface.Atspi.Text.selection { get; set; } 385 Efl.Access.Text.selection { get; set; }
386 Elm.Interface.Atspi.Text.selections_count { get; } 386 Efl.Access.Text.selections_count { get; }
387 Elm.Interface.Atspi.Text.selection_add; 387 Efl.Access.Text.selection_add;
388 Elm.Interface.Atspi.Text.selection_remove; 388 Efl.Access.Text.selection_remove;
389 Elm.Interface.Atspi.Text.Editable.content { set; } 389 Efl.Access.Editable.Text.content { set; }
390 Elm.Interface.Atspi.Text.Editable.insert; 390 Efl.Access.Editable.Text.insert;
391 Elm.Interface.Atspi.Text.Editable.copy; 391 Efl.Access.Editable.Text.copy;
392 Elm.Interface.Atspi.Text.Editable.cut; 392 Efl.Access.Editable.Text.cut;
393 Elm.Interface.Atspi.Text.Editable.delete; 393 Efl.Access.Editable.Text.delete;
394 Elm.Interface.Atspi.Text.Editable.paste; 394 Efl.Access.Editable.Text.paste;
395 Efl.File.file { get; set; } 395 Efl.File.file { get; set; }
396 Efl.Ui.Text.Interactive.editable { set; } 396 Efl.Ui.Text.Interactive.editable { set; }
397 } 397 }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 56b27c24f2..8ff4f1231b 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -8,8 +8,8 @@
8#define EFL_ACCESS_VALUE_PROTECTED 8#define EFL_ACCESS_VALUE_PROTECTED
9#define EFL_ACCESS_IMAGE_PROTECTED 9#define EFL_ACCESS_IMAGE_PROTECTED
10#define EFL_ACCESS_SELECTION_PROTECTED 10#define EFL_ACCESS_SELECTION_PROTECTED
11#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED 11#define EFL_ACCESS_TEXT_PROTECTED
12#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 12#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
13 13
14#include "atspi/atspi-constants.h" 14#include "atspi/atspi-constants.h"
15 15
@@ -165,10 +165,10 @@ static const Elm_Atspi_Bridge_Event_Handler event_handlers[] = {
165 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send}, 165 { EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, _window_signal_send},
166 { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send}, 166 { EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, _window_signal_send},
167 { EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send}, 167 { EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, _selection_signal_send},
168 { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send }, 168 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, _text_caret_moved_send },
169 { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send }, 169 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, _text_text_inserted_send },
170 { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send }, 170 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, _text_text_removed_send },
171 { ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, _text_selection_changed_send } 171 { EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, _text_selection_changed_send }
172}; 172};
173 173
174enum _Atspi_Object_Child_Event_Type 174enum _Atspi_Object_Child_Event_Type
@@ -1296,13 +1296,13 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
1296{ 1296{
1297 const char *obj_path = eldbus_message_path_get(msg); 1297 const char *obj_path = eldbus_message_path_get(msg);
1298 char *str; 1298 char *str;
1299 Elm_Atspi_Text_Granularity gran; 1299 Efl_Access_Text_Granularity gran;
1300 int start, end; 1300 int start, end;
1301 Eldbus_Message *ret; 1301 Eldbus_Message *ret;
1302 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 1302 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
1303 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1303 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1304 1304
1305 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1305 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1306 1306
1307 if (!eldbus_message_arguments_get(msg, "iu", &start, &gran)) 1307 if (!eldbus_message_arguments_get(msg, "iu", &start, &gran))
1308 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected."); 1308 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected.");
@@ -1310,7 +1310,7 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
1310 ret = eldbus_message_method_return_new(msg); 1310 ret = eldbus_message_method_return_new(msg);
1311 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1311 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1312 1312
1313 str = elm_interface_atspi_text_string_get(obj, gran, &start, &end); 1313 str = efl_access_text_string_get(obj, gran, &start, &end);
1314 str = str ? str : strdup(""); 1314 str = str ? str : strdup("");
1315 1315
1316 eldbus_message_arguments_append(ret, "sii", str, start, end); 1316 eldbus_message_arguments_append(ret, "sii", str, start, end);
@@ -1328,7 +1328,7 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1328 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1328 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1329 int start, end; 1329 int start, end;
1330 1330
1331 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1331 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1332 1332
1333 if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) 1333 if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
1334 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected."); 1334 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and granularity expected.");
@@ -1336,7 +1336,7 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1336 Eldbus_Message *ret = eldbus_message_method_return_new(msg); 1336 Eldbus_Message *ret = eldbus_message_method_return_new(msg);
1337 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1337 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1338 1338
1339 str = elm_interface_atspi_text_get(obj, start, end); 1339 str = efl_access_text_get(obj, start, end);
1340 str = str ? str : strdup(""); 1340 str = str ? str : strdup("");
1341 1341
1342 eldbus_message_arguments_append(ret, "s", str); 1342 eldbus_message_arguments_append(ret, "s", str);
@@ -1355,7 +1355,7 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1355 Eldbus_Message *ret; 1355 Eldbus_Message *ret;
1356 Eina_Bool res; 1356 Eina_Bool res;
1357 1357
1358 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1358 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1359 1359
1360 if (!eldbus_message_arguments_get(msg, "i", &offset)) 1360 if (!eldbus_message_arguments_get(msg, "i", &offset))
1361 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected."); 1361 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1363,7 +1363,7 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1363 ret = eldbus_message_method_return_new(msg); 1363 ret = eldbus_message_method_return_new(msg);
1364 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1364 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1365 1365
1366 res = elm_interface_atspi_text_caret_offset_set(obj, offset); 1366 res = efl_access_text_caret_offset_set(obj, offset);
1367 1367
1368 eldbus_message_arguments_append(ret, "b", res); 1368 eldbus_message_arguments_append(ret, "b", res);
1369 1369
@@ -1380,7 +1380,7 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
1380 Eldbus_Message *ret; 1380 Eldbus_Message *ret;
1381 Eina_Unicode res; 1381 Eina_Unicode res;
1382 1382
1383 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1383 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1384 1384
1385 if (!eldbus_message_arguments_get(msg, "i", &offset)) 1385 if (!eldbus_message_arguments_get(msg, "i", &offset))
1386 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected."); 1386 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1388,7 +1388,7 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
1388 ret = eldbus_message_method_return_new(msg); 1388 ret = eldbus_message_method_return_new(msg);
1389 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1389 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1390 1390
1391 res = elm_interface_atspi_text_character_get(obj, offset); 1391 res = efl_access_text_character_get(obj, offset);
1392 1392
1393 eldbus_message_arguments_append(ret, "i", res); 1393 eldbus_message_arguments_append(ret, "i", res);
1394 1394
@@ -1406,7 +1406,7 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1406 Eldbus_Message *ret; 1406 Eldbus_Message *ret;
1407 Eina_Bool res; 1407 Eina_Bool res;
1408 1408
1409 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1409 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1410 1410
1411 if (!eldbus_message_arguments_get(msg, "is", &start, &name)) 1411 if (!eldbus_message_arguments_get(msg, "is", &start, &name))
1412 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and attribute name expected."); 1412 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and attribute name expected.");
@@ -1414,7 +1414,7 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1414 ret = eldbus_message_method_return_new(msg); 1414 ret = eldbus_message_method_return_new(msg);
1415 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1415 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1416 1416
1417 res = elm_interface_atspi_text_attribute_get(obj, name, &start, &end, &value); 1417 res = efl_access_text_attribute_get(obj, name, &start, &end, &value);
1418 eldbus_message_arguments_append(ret, "siib", value ? value : "", start, end, res); 1418 eldbus_message_arguments_append(ret, "siib", value ? value : "", start, end, res);
1419 1419
1420 if (value) free(value); 1420 if (value) free(value);
@@ -1431,9 +1431,9 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1431 Eldbus_Message *ret; 1431 Eldbus_Message *ret;
1432 Eldbus_Message_Iter *iter, *iter_array; 1432 Eldbus_Message_Iter *iter, *iter_array;
1433 Eina_List *attrs; 1433 Eina_List *attrs;
1434 Elm_Atspi_Text_Attribute *attr; 1434 Efl_Access_Text_Attribute *attr;
1435 1435
1436 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1436 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1437 1437
1438 if (!eldbus_message_arguments_get(msg, "i", &start)) 1438 if (!eldbus_message_arguments_get(msg, "i", &start))
1439 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected."); 1439 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset expected.");
@@ -1445,7 +1445,7 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1445 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}"); 1445 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
1446 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 1446 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
1447 1447
1448 attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end); 1448 attrs = efl_access_text_attributes_get(obj, &start, &end);
1449 1449
1450 EINA_LIST_FREE(attrs, attr) 1450 EINA_LIST_FREE(attrs, attr)
1451 { 1451 {
@@ -1472,9 +1472,9 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
1472 Eldbus_Message *ret; 1472 Eldbus_Message *ret;
1473 Eldbus_Message_Iter *iter, *iter_array; 1473 Eldbus_Message_Iter *iter, *iter_array;
1474 Eina_List *attrs; 1474 Eina_List *attrs;
1475 Elm_Atspi_Text_Attribute *attr; 1475 Efl_Access_Text_Attribute *attr;
1476 1476
1477 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1477 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1478 1478
1479 ret = eldbus_message_method_return_new(msg); 1479 ret = eldbus_message_method_return_new(msg);
1480 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1480 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -1483,7 +1483,7 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
1483 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}"); 1483 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
1484 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 1484 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
1485 1485
1486 attrs = elm_interface_atspi_text_default_attributes_get(obj); 1486 attrs = efl_access_text_default_attributes_get(obj);
1487 1487
1488 EINA_LIST_FREE(attrs, attr) 1488 EINA_LIST_FREE(attrs, attr)
1489 { 1489 {
@@ -1512,7 +1512,7 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
1512 Eina_Bool screen_coords, res; 1512 Eina_Bool screen_coords, res;
1513 Eldbus_Message *ret; 1513 Eldbus_Message *ret;
1514 1514
1515 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1515 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1516 1516
1517 if (!eldbus_message_arguments_get(msg, "iu", &offset, &type)) 1517 if (!eldbus_message_arguments_get(msg, "iu", &offset, &type))
1518 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected."); 1518 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected.");
@@ -1522,7 +1522,7 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
1522 1522
1523 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 1523 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
1524 1524
1525 res = elm_interface_atspi_text_character_extents_get(obj, offset, screen_coords, &rect); 1525 res = efl_access_text_character_extents_get(obj, offset, screen_coords, &rect);
1526 1526
1527 if (!res) 1527 if (!res)
1528 { 1528 {
@@ -1545,7 +1545,7 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1545 Eina_Bool screen_coords; 1545 Eina_Bool screen_coords;
1546 Eldbus_Message *ret; 1546 Eldbus_Message *ret;
1547 1547
1548 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1548 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1549 1549
1550 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &type)) 1550 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &type))
1551 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected."); 1551 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and coordinates type expected.");
@@ -1556,7 +1556,7 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1556 x = y = -1; 1556 x = y = -1;
1557 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 1557 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
1558 1558
1559 offset = elm_interface_atspi_text_offset_at_point_get(obj, screen_coords, x, y); 1559 offset = efl_access_text_offset_at_point_get(obj, screen_coords, x, y);
1560 1560
1561 eldbus_message_arguments_append(ret, "i", offset); 1561 eldbus_message_arguments_append(ret, "i", offset);
1562 1562
@@ -1572,12 +1572,12 @@ _text_n_selections_get(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1572 int n; 1572 int n;
1573 Eldbus_Message *ret; 1573 Eldbus_Message *ret;
1574 1574
1575 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1575 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1576 1576
1577 ret = eldbus_message_method_return_new(msg); 1577 ret = eldbus_message_method_return_new(msg);
1578 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1578 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1579 1579
1580 n = elm_interface_atspi_text_selections_count_get(obj); 1580 n = efl_access_text_selections_count_get(obj);
1581 1581
1582 eldbus_message_arguments_append(ret, "i", n); 1582 eldbus_message_arguments_append(ret, "i", n);
1583 1583
@@ -1593,7 +1593,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1593 int sel_num, start, end; 1593 int sel_num, start, end;
1594 Eldbus_Message *ret; 1594 Eldbus_Message *ret;
1595 1595
1596 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1596 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1597 1597
1598 if (!eldbus_message_arguments_get(msg, "i", &sel_num)) 1598 if (!eldbus_message_arguments_get(msg, "i", &sel_num))
1599 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected."); 1599 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1601,7 +1601,7 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1601 ret = eldbus_message_method_return_new(msg); 1601 ret = eldbus_message_method_return_new(msg);
1602 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1602 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1603 1603
1604 elm_interface_atspi_text_selection_get(obj, sel_num, &start, &end); 1604 efl_access_text_selection_get(obj, sel_num, &start, &end);
1605 1605
1606 eldbus_message_arguments_append(ret, "ii", start, end); 1606 eldbus_message_arguments_append(ret, "ii", start, end);
1607 1607
@@ -1618,7 +1618,7 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
1618 Eina_Bool res; 1618 Eina_Bool res;
1619 Eldbus_Message *ret; 1619 Eldbus_Message *ret;
1620 1620
1621 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1621 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1622 1622
1623 if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) 1623 if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
1624 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end text offset expected."); 1624 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end text offset expected.");
@@ -1626,7 +1626,7 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
1626 ret = eldbus_message_method_return_new(msg); 1626 ret = eldbus_message_method_return_new(msg);
1627 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1627 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1628 1628
1629 res = elm_interface_atspi_text_selection_add(obj, start, end); 1629 res = efl_access_text_selection_add(obj, start, end);
1630 1630
1631 eldbus_message_arguments_append(ret, "b", res); 1631 eldbus_message_arguments_append(ret, "b", res);
1632 1632
@@ -1643,7 +1643,7 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1643 Eina_Bool res; 1643 Eina_Bool res;
1644 Eldbus_Message *ret; 1644 Eldbus_Message *ret;
1645 1645
1646 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1646 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1647 1647
1648 if (!eldbus_message_arguments_get(msg, "i", &sel_num)) 1648 if (!eldbus_message_arguments_get(msg, "i", &sel_num))
1649 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected."); 1649 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1651,7 +1651,7 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1651 ret = eldbus_message_method_return_new(msg); 1651 ret = eldbus_message_method_return_new(msg);
1652 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1652 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1653 1653
1654 res = elm_interface_atspi_text_selection_remove(obj, sel_num); 1654 res = efl_access_text_selection_remove(obj, sel_num);
1655 1655
1656 eldbus_message_arguments_append(ret, "b", res); 1656 eldbus_message_arguments_append(ret, "b", res);
1657 1657
@@ -1668,7 +1668,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
1668 Eina_Bool res; 1668 Eina_Bool res;
1669 Eldbus_Message *ret; 1669 Eldbus_Message *ret;
1670 1670
1671 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1671 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1672 1672
1673 if (!eldbus_message_arguments_get(msg, "iii", &sel_num, &start, &end)) 1673 if (!eldbus_message_arguments_get(msg, "iii", &sel_num, &start, &end))
1674 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected."); 1674 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1676,7 +1676,7 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
1676 ret = eldbus_message_method_return_new(msg); 1676 ret = eldbus_message_method_return_new(msg);
1677 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1677 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1678 1678
1679 res = elm_interface_atspi_text_selection_set(obj, sel_num, start, end); 1679 res = efl_access_text_selection_set(obj, sel_num, start, end);
1680 1680
1681 eldbus_message_arguments_append(ret, "b", res); 1681 eldbus_message_arguments_append(ret, "b", res);
1682 1682
@@ -1695,7 +1695,7 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
1695 AtspiCoordType type; 1695 AtspiCoordType type;
1696 Eldbus_Message *ret; 1696 Eldbus_Message *ret;
1697 1697
1698 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1698 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1699 1699
1700 if (!eldbus_message_arguments_get(msg, "iiu", &start, &end, &type)) 1700 if (!eldbus_message_arguments_get(msg, "iiu", &start, &end, &type))
1701 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected."); 1701 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Selection number expected.");
@@ -1704,7 +1704,7 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
1704 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1704 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1705 1705
1706 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 1706 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
1707 res = elm_interface_atspi_text_range_extents_get(obj, screen_coords, start, end, &rect); 1707 res = efl_access_text_range_extents_get(obj, screen_coords, start, end, &rect);
1708 if (!res) 1708 if (!res)
1709 { 1709 {
1710 eldbus_message_unref(ret); 1710 eldbus_message_unref(ret);
@@ -1725,13 +1725,13 @@ _text_bounded_ranges_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1725 Eina_Rect rect; 1725 Eina_Rect rect;
1726 Eina_Bool screen_coords; 1726 Eina_Bool screen_coords;
1727 AtspiCoordType type; 1727 AtspiCoordType type;
1728 Elm_Atspi_Text_Clip_Type xclip, yclip; 1728 Efl_Access_Text_Clip_Type xclip, yclip;
1729 Eina_List *ranges; 1729 Eina_List *ranges;
1730 Eldbus_Message *ret; 1730 Eldbus_Message *ret;
1731 Elm_Atspi_Text_Range *range; 1731 Efl_Access_Text_Range *range;
1732 Eldbus_Message_Iter *iter, *iter_array, *iter_struct, *iter_var; 1732 Eldbus_Message_Iter *iter, *iter_array, *iter_struct, *iter_var;
1733 1733
1734 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1734 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1735 1735
1736 if (!eldbus_message_arguments_get(msg, "iiiiuuu", &rect.x, &rect.y, &rect.w, &rect.h, &type, &xclip, &yclip)) 1736 if (!eldbus_message_arguments_get(msg, "iiiiuuu", &rect.x, &rect.y, &rect.w, &rect.h, &type, &xclip, &yclip))
1737 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Expected (x,y,w,h) of bounding box, screen coord type and x, y text clip types."); 1737 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Expected (x,y,w,h) of bounding box, screen coord type and x, y text clip types.");
@@ -1744,7 +1744,7 @@ _text_bounded_ranges_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1744 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 1744 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
1745 1745
1746 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 1746 screen_coords = type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
1747 ranges = elm_interface_atspi_text_bounded_ranges_get(obj, screen_coords, rect, xclip, yclip); 1747 ranges = efl_access_text_bounded_ranges_get(obj, screen_coords, rect, xclip, yclip);
1748 1748
1749 EINA_LIST_FREE(ranges, range) 1749 EINA_LIST_FREE(ranges, range)
1750 { 1750 {
@@ -1789,10 +1789,10 @@ _text_run_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1789 Eldbus_Message *ret; 1789 Eldbus_Message *ret;
1790 Eldbus_Message_Iter *iter, *iter_array; 1790 Eldbus_Message_Iter *iter, *iter_array;
1791 Eina_List *attrs, *defaults; 1791 Eina_List *attrs, *defaults;
1792 Elm_Atspi_Text_Attribute *attr; 1792 Efl_Access_Text_Attribute *attr;
1793 Eina_Bool incl_def; 1793 Eina_Bool incl_def;
1794 1794
1795 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, msg); 1795 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, msg);
1796 1796
1797 if (!eldbus_message_arguments_get(msg, "ib", &start, &incl_def)) 1797 if (!eldbus_message_arguments_get(msg, "ib", &start, &incl_def))
1798 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and include defaults flag expected."); 1798 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Offset and include defaults flag expected.");
@@ -1804,11 +1804,11 @@ _text_run_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1804 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}"); 1804 iter_array = eldbus_message_iter_container_new(iter, 'a', "{ss}");
1805 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 1805 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
1806 1806
1807 attrs = elm_interface_atspi_text_attributes_get(obj, &start, &end); 1807 attrs = efl_access_text_attributes_get(obj, &start, &end);
1808 1808
1809 if (incl_def) 1809 if (incl_def)
1810 { 1810 {
1811 defaults = elm_interface_atspi_text_default_attributes_get(obj); 1811 defaults = efl_access_text_default_attributes_get(obj);
1812 attrs = eina_list_merge(attrs, defaults); 1812 attrs = eina_list_merge(attrs, defaults);
1813 } 1813 }
1814 1814
@@ -1859,7 +1859,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld
1859 Eldbus_Message *ret; 1859 Eldbus_Message *ret;
1860 Eina_Bool res; 1860 Eina_Bool res;
1861 1861
1862 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1862 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1863 1863
1864 if (!eldbus_message_arguments_get(msg, "s", &content)) 1864 if (!eldbus_message_arguments_get(msg, "s", &content))
1865 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "String expected."); 1865 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "String expected.");
@@ -1867,7 +1867,7 @@ _editable_text_text_content_set(const Eldbus_Service_Interface *iface, const Eld
1867 ret = eldbus_message_method_return_new(msg); 1867 ret = eldbus_message_method_return_new(msg);
1868 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1868 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1869 1869
1870 res = elm_interface_atspi_text_editable_content_set(obj, content); 1870 res = efl_access_editable_text_content_set(obj, content);
1871 1871
1872 eldbus_message_arguments_append(ret, "b", res); 1872 eldbus_message_arguments_append(ret, "b", res);
1873 1873
@@ -1885,7 +1885,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
1885 int pos, len; 1885 int pos, len;
1886 Eina_Bool res; 1886 Eina_Bool res;
1887 1887
1888 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1888 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1889 1889
1890 if (!eldbus_message_arguments_get(msg, "isi", &pos, &text, &len)) 1890 if (!eldbus_message_arguments_get(msg, "isi", &pos, &text, &len))
1891 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Postion, string, length expected."); 1891 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Postion, string, length expected.");
@@ -1893,7 +1893,7 @@ _editable_text_text_insert(const Eldbus_Service_Interface *iface, const Eldbus_M
1893 ret = eldbus_message_method_return_new(msg); 1893 ret = eldbus_message_method_return_new(msg);
1894 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1894 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1895 1895
1896 res = elm_interface_atspi_text_editable_insert(obj, text, pos); 1896 res = efl_access_editable_text_insert(obj, text, pos);
1897 1897
1898 eldbus_message_arguments_append(ret, "b", res); 1898 eldbus_message_arguments_append(ret, "b", res);
1899 1899
@@ -1910,7 +1910,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1910 int start, end; 1910 int start, end;
1911 Eina_Bool res; 1911 Eina_Bool res;
1912 1912
1913 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1913 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1914 1914
1915 if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) 1915 if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
1916 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); 1916 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1918,7 +1918,7 @@ _editable_text_text_copy(const Eldbus_Service_Interface *iface, const Eldbus_Mes
1918 ret = eldbus_message_method_return_new(msg); 1918 ret = eldbus_message_method_return_new(msg);
1919 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1919 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1920 1920
1921 res = elm_interface_atspi_text_editable_copy(obj, start, end); 1921 res = efl_access_editable_text_copy(obj, start, end);
1922 1922
1923 eldbus_message_arguments_append(ret, "b", res); 1923 eldbus_message_arguments_append(ret, "b", res);
1924 1924
@@ -1935,7 +1935,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess
1935 int start, end; 1935 int start, end;
1936 Eina_Bool res; 1936 Eina_Bool res;
1937 1937
1938 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1938 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1939 1939
1940 if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) 1940 if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
1941 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); 1941 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1943,7 +1943,7 @@ _editable_text_text_cut(const Eldbus_Service_Interface *iface, const Eldbus_Mess
1943 ret = eldbus_message_method_return_new(msg); 1943 ret = eldbus_message_method_return_new(msg);
1944 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1944 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1945 1945
1946 res = elm_interface_atspi_text_editable_cut(obj, start, end); 1946 res = efl_access_editable_text_cut(obj, start, end);
1947 1947
1948 eldbus_message_arguments_append(ret, "b", res); 1948 eldbus_message_arguments_append(ret, "b", res);
1949 1949
@@ -1960,7 +1960,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M
1960 int start, end; 1960 int start, end;
1961 Eina_Bool res; 1961 Eina_Bool res;
1962 1962
1963 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1963 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1964 1964
1965 if (!eldbus_message_arguments_get(msg, "ii", &start, &end)) 1965 if (!eldbus_message_arguments_get(msg, "ii", &start, &end))
1966 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); 1966 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1968,7 +1968,7 @@ _editable_text_text_delete(const Eldbus_Service_Interface *iface, const Eldbus_M
1968 ret = eldbus_message_method_return_new(msg); 1968 ret = eldbus_message_method_return_new(msg);
1969 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1969 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1970 1970
1971 res = elm_interface_atspi_text_editable_delete(obj, start, end); 1971 res = efl_access_editable_text_delete(obj, start, end);
1972 1972
1973 eldbus_message_arguments_append(ret, "b", res); 1973 eldbus_message_arguments_append(ret, "b", res);
1974 1974
@@ -1985,7 +1985,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me
1985 int pos; 1985 int pos;
1986 Eina_Bool res; 1986 Eina_Bool res;
1987 1987
1988 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE, msg); 1988 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, msg);
1989 1989
1990 if (!eldbus_message_arguments_get(msg, "i", &pos)) 1990 if (!eldbus_message_arguments_get(msg, "i", &pos))
1991 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected."); 1991 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Start and end index expected.");
@@ -1993,7 +1993,7 @@ _editable_text_text_paste(const Eldbus_Service_Interface *iface, const Eldbus_Me
1993 ret = eldbus_message_method_return_new(msg); 1993 ret = eldbus_message_method_return_new(msg);
1994 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1994 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
1995 1995
1996 res = elm_interface_atspi_text_editable_paste(obj, pos); 1996 res = efl_access_editable_text_paste(obj, pos);
1997 1997
1998 eldbus_message_arguments_append(ret, "b", res); 1998 eldbus_message_arguments_append(ret, "b", res);
1999 1999
@@ -2260,17 +2260,17 @@ _text_properties_get(const Eldbus_Service_Interface *interface, const char *prop
2260 Eo *obj = _bridge_object_from_path(bridge, obj_path); 2260 Eo *obj = _bridge_object_from_path(bridge, obj_path);
2261 int val; 2261 int val;
2262 2262
2263 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, request_msg, error); 2263 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_TEXT_INTERFACE, request_msg, error);
2264 2264
2265 if (!strcmp(property, "CharacterCount")) 2265 if (!strcmp(property, "CharacterCount"))
2266 { 2266 {
2267 val = elm_interface_atspi_text_character_count_get(obj); 2267 val = efl_access_text_character_count_get(obj);
2268 eldbus_message_iter_basic_append(iter, 'i', val); 2268 eldbus_message_iter_basic_append(iter, 'i', val);
2269 return EINA_TRUE; 2269 return EINA_TRUE;
2270 } 2270 }
2271 if (!strcmp(property, "CaretOffset")) 2271 if (!strcmp(property, "CaretOffset"))
2272 { 2272 {
2273 val = elm_interface_atspi_text_caret_offset_get(obj); 2273 val = efl_access_text_caret_offset_get(obj);
2274 eldbus_message_iter_basic_append(iter, 'i', val); 2274 eldbus_message_iter_basic_append(iter, 'i', val);
2275 return EINA_TRUE; 2275 return EINA_TRUE;
2276 } 2276 }
@@ -2504,9 +2504,9 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
2504 else if (!strcmp(ifc_name, "component")) 2504 else if (!strcmp(ifc_name, "component"))
2505 class = EFL_ACCESS_COMPONENT_MIXIN; 2505 class = EFL_ACCESS_COMPONENT_MIXIN;
2506 else if (!strcmp(ifc_name, "editabletext")) 2506 else if (!strcmp(ifc_name, "editabletext"))
2507 class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE; 2507 class = EFL_ACCESS_EDITABLE_TEXT_INTERFACE;
2508 else if (!strcmp(ifc_name, "text")) 2508 else if (!strcmp(ifc_name, "text"))
2509 class = ELM_INTERFACE_ATSPI_TEXT_INTERFACE; 2509 class = EFL_ACCESS_TEXT_INTERFACE;
2510 else if (!strcmp(ifc_name, "image")) 2510 else if (!strcmp(ifc_name, "image"))
2511 class = EFL_ACCESS_SELECTION_INTERFACE; 2511 class = EFL_ACCESS_SELECTION_INTERFACE;
2512 else if (!strcmp(ifc_name, "value")) 2512 else if (!strcmp(ifc_name, "value"))
@@ -3126,13 +3126,13 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3126 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION); 3126 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION);
3127 if (efl_isa(obj, EFL_ACCESS_COMPONENT_MIXIN)) 3127 if (efl_isa(obj, EFL_ACCESS_COMPONENT_MIXIN))
3128 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3128 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3129 if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE)) 3129 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
3130 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3130 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
3131 if (efl_isa(obj, EFL_ACCESS_IMAGE_MIXIN)) 3131 if (efl_isa(obj, EFL_ACCESS_IMAGE_MIXIN))
3132 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 3132 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
3133 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) 3133 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
3134 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 3134 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
3135 if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_INTERFACE)) 3135 if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
3136 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT); 3136 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_TEXT);
3137 if (efl_isa(obj, EFL_ACCESS_VALUE_INTERFACE)) 3137 if (efl_isa(obj, EFL_ACCESS_VALUE_INTERFACE))
3138 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE); 3138 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_VALUE);
@@ -4119,7 +4119,7 @@ _text_caret_moved_send(void *data, const Efl_Event *event)
4119 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED)) 4119 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
4120 return; 4120 return;
4121 4121
4122 cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object); 4122 cursor_pos = efl_access_text_caret_offset_get(event->object);
4123 4123
4124 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4124 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4125 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL); 4125 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
@@ -4128,7 +4128,7 @@ _text_caret_moved_send(void *data, const Efl_Event *event)
4128static void 4128static void
4129_text_text_inserted_send(void *data, const Efl_Event *event) 4129_text_text_inserted_send(void *data, const Efl_Event *event)
4130{ 4130{
4131 Elm_Atspi_Text_Change_Info *info = event->info; 4131 Efl_Access_Text_Change_Info *info = event->info;
4132 4132
4133 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 4133 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4134 4134
@@ -4142,7 +4142,7 @@ _text_text_inserted_send(void *data, const Efl_Event *event)
4142static void 4142static void
4143_text_text_removed_send(void *data, const Efl_Event *event) 4143_text_text_removed_send(void *data, const Efl_Event *event)
4144{ 4144{
4145 Elm_Atspi_Text_Change_Info *info = event->info; 4145 Efl_Access_Text_Change_Info *info = event->info;
4146 4146
4147 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd); 4147 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4148 4148
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 33863213a9..871f75c4c5 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -5,7 +5,7 @@ import elm_general;
5struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ 5struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
6struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ 6struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
7 7
8class Elm.Code_Widget (Efl.Ui.Layout, Elm.Interface.Atspi.Text) 8class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
9{ 9{
10 [[Elementary code widget]] 10 [[Elementary code widget]]
11 eo_prefix: elm_obj_code_widget; 11 eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 0dbe98b9a5..ebdb844ee4 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_TEXT_PROTECTED 6#define EFL_ACCESS_TEXT_PROTECTED
7#define ELM_INTERFACE_ATSPI_TEXT_EDITABLE_PROTECTED 7#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
8#define ELM_LAYOUT_PROTECTED 8#define ELM_LAYOUT_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
@@ -2191,20 +2191,20 @@ _entry_changed_user_signal_cb(void *data,
2191 } 2191 }
2192 if (_elm_config->atspi_mode) 2192 if (_elm_config->atspi_mode)
2193 { 2193 {
2194 Elm_Atspi_Text_Change_Info atspi_info; 2194 Efl_Access_Text_Change_Info atspi_info;
2195 if (edje_info && edje_info->insert) 2195 if (edje_info && edje_info->insert)
2196 { 2196 {
2197 atspi_info.content = edje_info->change.insert.content; 2197 atspi_info.content = edje_info->change.insert.content;
2198 atspi_info.pos = edje_info->change.insert.pos; 2198 atspi_info.pos = edje_info->change.insert.pos;
2199 atspi_info.len = edje_info->change.insert.plain_length; 2199 atspi_info.len = edje_info->change.insert.plain_length;
2200 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2200 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2201 } 2201 }
2202 else if (edje_info && !edje_info->insert) 2202 else if (edje_info && !edje_info->insert)
2203 { 2203 {
2204 atspi_info.content = edje_info->change.del.content; 2204 atspi_info.content = edje_info->change.del.content;
2205 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2205 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2206 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2206 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2207 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2207 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2208 } 2208 }
2209 } 2209 }
2210} 2210}
@@ -2222,7 +2222,7 @@ _entry_preedit_changed_signal_cb(void *data,
2222 2222
2223 if (_elm_config->atspi_mode) 2223 if (_elm_config->atspi_mode)
2224 { 2224 {
2225 Elm_Atspi_Text_Change_Info atspi_info; 2225 Efl_Access_Text_Change_Info atspi_info;
2226 if (edje_info && edje_info->insert) 2226 if (edje_info && edje_info->insert)
2227 { 2227 {
2228 text = elm_entry_markup_to_utf8(edje_info->change.insert.content); 2228 text = elm_entry_markup_to_utf8(edje_info->change.insert.content);
@@ -2231,7 +2231,7 @@ _entry_preedit_changed_signal_cb(void *data,
2231 atspi_info.len = edje_info->change.insert.plain_length; 2231 atspi_info.len = edje_info->change.insert.plain_length;
2232 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, 2232 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN,
2233 data, 2233 data,
2234 ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_INSERTED, 2234 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
2235 &atspi_info); 2235 &atspi_info);
2236 free(text); 2236 free(text);
2237 } 2237 }
@@ -2316,7 +2316,7 @@ _entry_selection_changed_signal_cb(void *data,
2316 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2316 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2317 _update_selection_handler(data); 2317 _update_selection_handler(data);
2318 if (_elm_config->atspi_mode) 2318 if (_elm_config->atspi_mode)
2319 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); 2319 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2320} 2320}
2321 2321
2322static void 2322static void
@@ -2420,7 +2420,7 @@ _entry_cursor_changed_signal_cb(void *data,
2420 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); 2420 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
2421 2421
2422 if (_elm_config->atspi_mode) 2422 if (_elm_config->atspi_mode)
2423 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2423 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2424} 2424}
2425 2425
2426static void 2426static void
@@ -2432,7 +2432,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2432 efl_event_callback_legacy_call 2432 efl_event_callback_legacy_call
2433 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2433 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2434 if (_elm_config->atspi_mode) 2434 if (_elm_config->atspi_mode)
2435 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, ELM_INTERFACE_ATSPI_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2435 elm_interface_atspi_accessible_event_emit(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2436} 2436}
2437 2437
2438static void 2438static void
@@ -5467,7 +5467,7 @@ _elm_entry_class_constructor(Efl_Class *klass)
5467// ATSPI Accessibility 5467// ATSPI Accessibility
5468 5468
5469EOLIAN static Eina_Unicode 5469EOLIAN static Eina_Unicode
5470_elm_entry_elm_interface_atspi_text_character_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset) 5470_elm_entry_efl_access_text_character_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
5471{ 5471{
5472 char *txt; 5472 char *txt;
5473 int idx = 0; 5473 int idx = 0;
@@ -5489,7 +5489,7 @@ _elm_entry_elm_interface_atspi_text_character_get(Eo *obj, Elm_Entry_Data *_pd E
5489} 5489}
5490 5490
5491EOLIAN static int 5491EOLIAN static int
5492_elm_entry_elm_interface_atspi_text_character_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 5492_elm_entry_efl_access_text_character_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
5493{ 5493{
5494 char *txt; 5494 char *txt;
5495 int ret = -1; 5495 int ret = -1;
@@ -5504,7 +5504,7 @@ _elm_entry_elm_interface_atspi_text_character_count_get(Eo *obj, Elm_Entry_Data
5504} 5504}
5505 5505
5506EOLIAN static char* 5506EOLIAN static char*
5507_elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Elm_Atspi_Text_Granularity granularity, int *start_offset, int *end_offset) 5507_elm_entry_efl_access_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Access_Text_Granularity granularity, int *start_offset, int *end_offset)
5508{ 5508{
5509 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 5509 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
5510 Evas_Object *tblk; 5510 Evas_Object *tblk;
@@ -5522,18 +5522,18 @@ _elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA
5522 5522
5523 switch (granularity) 5523 switch (granularity)
5524 { 5524 {
5525 case ELM_ATSPI_TEXT_GRANULARITY_CHAR: 5525 case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
5526 break; 5526 break;
5527 case ELM_ATSPI_TEXT_GRANULARITY_WORD: 5527 case EFL_ACCESS_TEXT_GRANULARITY_WORD:
5528 evas_textblock_cursor_word_start(cur); 5528 evas_textblock_cursor_word_start(cur);
5529 break; 5529 break;
5530 case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE: 5530 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
5531 // TODO - add sentence support in textblock first 5531 // TODO - add sentence support in textblock first
5532 break; 5532 break;
5533 case ELM_ATSPI_TEXT_GRANULARITY_LINE: 5533 case EFL_ACCESS_TEXT_GRANULARITY_LINE:
5534 evas_textblock_cursor_line_char_first(cur); 5534 evas_textblock_cursor_line_char_first(cur);
5535 break; 5535 break;
5536 case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH: 5536 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
5537 evas_textblock_cursor_paragraph_char_first(cur); 5537 evas_textblock_cursor_paragraph_char_first(cur);
5538 break; 5538 break;
5539 } 5539 }
@@ -5543,23 +5543,23 @@ _elm_entry_elm_interface_atspi_text_string_get(Eo *obj, Elm_Entry_Data *_pd EINA
5543 5543
5544 switch (granularity) 5544 switch (granularity)
5545 { 5545 {
5546 case ELM_ATSPI_TEXT_GRANULARITY_CHAR: 5546 case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
5547 evas_textblock_cursor_char_next(cur2); 5547 evas_textblock_cursor_char_next(cur2);
5548 break; 5548 break;
5549 case ELM_ATSPI_TEXT_GRANULARITY_WORD: 5549 case EFL_ACCESS_TEXT_GRANULARITY_WORD:
5550 evas_textblock_cursor_word_end(cur2); 5550 evas_textblock_cursor_word_end(cur2);
5551 // since word_end sets cursor position ON (before) last 5551 // since word_end sets cursor position ON (before) last
5552 // char of word, we need to manually advance cursor to get 5552 // char of word, we need to manually advance cursor to get
5553 // proper string from function range_text_get 5553 // proper string from function range_text_get
5554 evas_textblock_cursor_char_next(cur2); 5554 evas_textblock_cursor_char_next(cur2);
5555 break; 5555 break;
5556 case ELM_ATSPI_TEXT_GRANULARITY_SENTENCE: 5556 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE:
5557 // TODO - add sentence support in textblock first 5557 // TODO - add sentence support in textblock first
5558 break; 5558 break;
5559 case ELM_ATSPI_TEXT_GRANULARITY_LINE: 5559 case EFL_ACCESS_TEXT_GRANULARITY_LINE:
5560 evas_textblock_cursor_line_char_last(cur2); 5560 evas_textblock_cursor_line_char_last(cur2);
5561 break; 5561 break;
5562 case ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH: 5562 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
5563 evas_textblock_cursor_paragraph_char_last(cur2); 5563 evas_textblock_cursor_paragraph_char_last(cur2);
5564 break; 5564 break;
5565 } 5565 }
@@ -5589,7 +5589,7 @@ fail:
5589} 5589}
5590 5590
5591EOLIAN static char* 5591EOLIAN static char*
5592_elm_entry_elm_interface_atspi_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset) 5592_elm_entry_efl_access_text_text_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
5593{ 5593{
5594 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL; 5594 Evas_Textblock_Cursor *cur = NULL, *cur2 = NULL;
5595 Evas_Object *tblk; 5595 Evas_Object *tblk;
@@ -5629,26 +5629,26 @@ fail:
5629} 5629}
5630 5630
5631EOLIAN static int 5631EOLIAN static int
5632_elm_entry_elm_interface_atspi_text_caret_offset_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 5632_elm_entry_efl_access_text_caret_offset_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
5633{ 5633{
5634 return elm_entry_cursor_pos_get(obj); 5634 return elm_entry_cursor_pos_get(obj);
5635} 5635}
5636 5636
5637EOLIAN static Eina_Bool 5637EOLIAN static Eina_Bool
5638_elm_entry_elm_interface_atspi_text_caret_offset_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset) 5638_elm_entry_efl_access_text_caret_offset_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset)
5639{ 5639{
5640 elm_entry_cursor_pos_set(obj, offset); 5640 elm_entry_cursor_pos_set(obj, offset);
5641 return EINA_TRUE; 5641 return EINA_TRUE;
5642} 5642}
5643 5643
5644EOLIAN static int 5644EOLIAN static int
5645_elm_entry_elm_interface_atspi_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED) 5645_elm_entry_efl_access_text_selections_count_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED)
5646{ 5646{
5647 return elm_entry_selection_get(obj) ? 1 : 0; 5647 return elm_entry_selection_get(obj) ? 1 : 0;
5648} 5648}
5649 5649
5650EOLIAN static void 5650EOLIAN static void
5651_elm_entry_elm_interface_atspi_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset) 5651_elm_entry_efl_access_text_selection_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int *start_offset, int *end_offset)
5652{ 5652{
5653 if (selection_number != 0) return; 5653 if (selection_number != 0) return;
5654 5654
@@ -5656,7 +5656,7 @@ _elm_entry_elm_interface_atspi_text_selection_get(Eo *obj, Elm_Entry_Data *_pd E
5656} 5656}
5657 5657
5658EOLIAN static Eina_Bool 5658EOLIAN static Eina_Bool
5659_elm_entry_elm_interface_atspi_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset) 5659_elm_entry_efl_access_text_selection_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int selection_number, int start_offset, int end_offset)
5660{ 5660{
5661 if (selection_number != 0) return EINA_FALSE; 5661 if (selection_number != 0) return EINA_FALSE;
5662 5662
@@ -5666,7 +5666,7 @@ _elm_entry_elm_interface_atspi_text_selection_set(Eo *obj, Elm_Entry_Data *_pd E
5666} 5666}
5667 5667
5668EOLIAN static Eina_Bool 5668EOLIAN static Eina_Bool
5669_elm_entry_elm_interface_atspi_text_selection_remove(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int selection_number) 5669_elm_entry_efl_access_text_selection_remove(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int selection_number)
5670{ 5670{
5671 if (selection_number != 0) return EINA_FALSE; 5671 if (selection_number != 0) return EINA_FALSE;
5672 elm_entry_select_none(obj); 5672 elm_entry_select_none(obj);
@@ -5674,7 +5674,7 @@ _elm_entry_elm_interface_atspi_text_selection_remove(Eo *obj, Elm_Entry_Data *pd
5674} 5674}
5675 5675
5676EOLIAN static Eina_Bool 5676EOLIAN static Eina_Bool
5677_elm_entry_elm_interface_atspi_text_selection_add(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int start_offset, int end_offset) 5677_elm_entry_efl_access_text_selection_add(Eo *obj, Elm_Entry_Data *pd EINA_UNUSED, int start_offset, int end_offset)
5678{ 5678{
5679 elm_entry_select_region_set(obj, start_offset, end_offset); 5679 elm_entry_select_region_set(obj, start_offset, end_offset);
5680 5680
@@ -5682,13 +5682,13 @@ _elm_entry_elm_interface_atspi_text_selection_add(Eo *obj, Elm_Entry_Data *pd EI
5682} 5682}
5683 5683
5684EOLIAN static Eina_List* 5684EOLIAN static Eina_List*
5685_elm_entry_elm_interface_atspi_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Elm_Atspi_Text_Clip_Type xclip EINA_UNUSED, Elm_Atspi_Text_Clip_Type yclip EINA_UNUSED) 5685_elm_entry_efl_access_text_bounded_ranges_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods EINA_UNUSED, Eina_Rect rect EINA_UNUSED, Efl_Access_Text_Clip_Type xclip EINA_UNUSED, Efl_Access_Text_Clip_Type yclip EINA_UNUSED)
5686{ 5686{
5687 return NULL; 5687 return NULL;
5688} 5688}
5689 5689
5690EOLIAN static int 5690EOLIAN static int
5691_elm_entry_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y) 5691_elm_entry_efl_access_text_offset_at_point_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int x, int y)
5692{ 5692{
5693 Evas_Object *txtblk; 5693 Evas_Object *txtblk;
5694 Evas_Textblock_Cursor *cur; 5694 Evas_Textblock_Cursor *cur;
@@ -5722,7 +5722,7 @@ _elm_entry_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Elm_Entry_Data
5722} 5722}
5723 5723
5724EOLIAN static Eina_Bool 5724EOLIAN static Eina_Bool
5725_elm_entry_elm_interface_atspi_text_character_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect) 5725_elm_entry_efl_access_text_character_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int offset, Eina_Bool screen_coods, Eina_Rect *rect)
5726{ 5726{
5727 Evas_Object *txtblk; 5727 Evas_Object *txtblk;
5728 Evas_Textblock_Cursor *cur; 5728 Evas_Textblock_Cursor *cur;
@@ -5754,7 +5754,7 @@ _elm_entry_elm_interface_atspi_text_character_extents_get(Eo *obj, Elm_Entry_Dat
5754} 5754}
5755 5755
5756EOLIAN static Eina_Bool 5756EOLIAN static Eina_Bool
5757_elm_entry_elm_interface_atspi_text_range_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect) 5757_elm_entry_efl_access_text_range_extents_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Eina_Bool screen_coods, int start_offset, int end_offset, Eina_Rect *rect)
5758{ 5758{
5759 Evas_Object *txtblk; 5759 Evas_Object *txtblk;
5760 Evas_Textblock_Cursor *cur1, *cur2; 5760 Evas_Textblock_Cursor *cur1, *cur2;
@@ -5802,10 +5802,10 @@ _elm_entry_elm_interface_atspi_text_range_extents_get(Eo *obj, Elm_Entry_Data *_
5802 return EINA_TRUE; 5802 return EINA_TRUE;
5803} 5803}
5804 5804
5805static Elm_Atspi_Text_Attribute* 5805static Efl_Access_Text_Attribute*
5806_textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Format *format) 5806_textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Format *format)
5807{ 5807{
5808 Elm_Atspi_Text_Attribute *ret = NULL; 5808 Efl_Access_Text_Attribute *ret = NULL;
5809 const char *txt; 5809 const char *txt;
5810 5810
5811 txt = evas_textblock_node_format_text_get(format); 5811 txt = evas_textblock_node_format_text_get(format);
@@ -5820,7 +5820,7 @@ _textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Forma
5820 while (*tmp != '\0' && *tmp != '=') tmp++; 5820 while (*tmp != '\0' && *tmp != '=') tmp++;
5821 if (*tmp++ != '=') return NULL; 5821 if (*tmp++ != '=') return NULL;
5822 5822
5823 ret = calloc(1, sizeof(Elm_Atspi_Text_Attribute)); 5823 ret = calloc(1, sizeof(Efl_Access_Text_Attribute));
5824 if (!ret) return NULL; 5824 if (!ret) return NULL;
5825 5825
5826 ret->value = eina_stringshare_add(tmp); 5826 ret->value = eina_stringshare_add(tmp);
@@ -5832,13 +5832,13 @@ _textblock_node_format_to_atspi_text_attr(const Evas_Object_Textblock_Node_Forma
5832} 5832}
5833 5833
5834EOLIAN static Eina_Bool 5834EOLIAN static Eina_Bool
5835_elm_entry_elm_interface_atspi_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value) 5835_elm_entry_efl_access_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
5836{ 5836{
5837 Evas_Object *txtblk; 5837 Evas_Object *txtblk;
5838 Evas_Textblock_Cursor *cur1, *cur2; 5838 Evas_Textblock_Cursor *cur1, *cur2;
5839 Eina_List *formats, *l; 5839 Eina_List *formats, *l;
5840 Evas_Object_Textblock_Node_Format *format; 5840 Evas_Object_Textblock_Node_Format *format;
5841 Elm_Atspi_Text_Attribute *attr; 5841 Efl_Access_Text_Attribute *attr;
5842 5842
5843 txtblk = elm_entry_textblock_get(obj); 5843 txtblk = elm_entry_textblock_get(obj);
5844 if (!txtblk) return EINA_FALSE; 5844 if (!txtblk) return EINA_FALSE;
@@ -5880,13 +5880,13 @@ _elm_entry_elm_interface_atspi_text_attribute_get(Eo *obj, Elm_Entry_Data *_pd E
5880} 5880}
5881 5881
5882EOLIAN static Eina_List* 5882EOLIAN static Eina_List*
5883_elm_entry_elm_interface_atspi_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset) 5883_elm_entry_efl_access_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int *start_offset, int *end_offset)
5884{ 5884{
5885 Evas_Object *txtblk; 5885 Evas_Object *txtblk;
5886 Evas_Textblock_Cursor *cur1, *cur2; 5886 Evas_Textblock_Cursor *cur1, *cur2;
5887 Eina_List *formats, *ret = NULL, *l; 5887 Eina_List *formats, *ret = NULL, *l;
5888 Evas_Object_Textblock_Node_Format *format; 5888 Evas_Object_Textblock_Node_Format *format;
5889 Elm_Atspi_Text_Attribute *attr; 5889 Efl_Access_Text_Attribute *attr;
5890 5890
5891 txtblk = elm_entry_textblock_get(obj); 5891 txtblk = elm_entry_textblock_get(obj);
5892 if (!txtblk) return NULL; 5892 if (!txtblk) return NULL;
@@ -5922,12 +5922,12 @@ _elm_entry_elm_interface_atspi_text_attributes_get(Eo *obj, Elm_Entry_Data *_pd
5922} 5922}
5923 5923
5924EOLIAN static Eina_List* 5924EOLIAN static Eina_List*
5925_elm_entry_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED) 5925_elm_entry_efl_access_text_default_attributes_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *_pd EINA_UNUSED)
5926{ 5926{
5927 Evas_Object *txtblk; 5927 Evas_Object *txtblk;
5928 Eina_List *ret = NULL; 5928 Eina_List *ret = NULL;
5929 const Evas_Object_Textblock_Node_Format *format; 5929 const Evas_Object_Textblock_Node_Format *format;
5930 Elm_Atspi_Text_Attribute *attr; 5930 Efl_Access_Text_Attribute *attr;
5931 5931
5932 txtblk = elm_entry_textblock_get(obj); 5932 txtblk = elm_entry_textblock_get(obj);
5933 if (!txtblk) return NULL; 5933 if (!txtblk) return NULL;
@@ -5947,14 +5947,14 @@ _elm_entry_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED,
5947} 5947}
5948 5948
5949EOLIAN static Eina_Bool 5949EOLIAN static Eina_Bool
5950_elm_entry_elm_interface_atspi_text_editable_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content) 5950_elm_entry_efl_access_editable_text_content_set(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *content)
5951{ 5951{
5952 elm_entry_entry_set(obj, content); 5952 elm_entry_entry_set(obj, content);
5953 return EINA_TRUE; 5953 return EINA_TRUE;
5954} 5954}
5955 5955
5956EOLIAN static Eina_Bool 5956EOLIAN static Eina_Bool
5957_elm_entry_elm_interface_atspi_text_editable_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position) 5957_elm_entry_efl_access_editable_text_insert(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, const char *string, int position)
5958{ 5958{
5959 elm_entry_cursor_pos_set(obj, position); 5959 elm_entry_cursor_pos_set(obj, position);
5960 elm_entry_entry_insert(obj, string); 5960 elm_entry_entry_insert(obj, string);
@@ -5963,7 +5963,7 @@ _elm_entry_elm_interface_atspi_text_editable_insert(Eo *obj, Elm_Entry_Data *_pd
5963} 5963}
5964 5964
5965EOLIAN static Eina_Bool 5965EOLIAN static Eina_Bool
5966_elm_entry_elm_interface_atspi_text_editable_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) 5966_elm_entry_efl_access_editable_text_copy(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
5967{ 5967{
5968 elm_entry_select_region_set(obj, start, end); 5968 elm_entry_select_region_set(obj, start, end);
5969 elm_entry_selection_copy(obj); 5969 elm_entry_selection_copy(obj);
@@ -5972,7 +5972,7 @@ _elm_entry_elm_interface_atspi_text_editable_copy(Eo *obj, Elm_Entry_Data *_pd E
5972} 5972}
5973 5973
5974EOLIAN static Eina_Bool 5974EOLIAN static Eina_Bool
5975_elm_entry_elm_interface_atspi_text_editable_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset) 5975_elm_entry_efl_access_editable_text_delete(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start_offset, int end_offset)
5976{ 5976{
5977 Evas_Object *txtblk; 5977 Evas_Object *txtblk;
5978 Evas_Textblock_Cursor *cur1, *cur2; 5978 Evas_Textblock_Cursor *cur1, *cur2;
@@ -6004,7 +6004,7 @@ _elm_entry_elm_interface_atspi_text_editable_delete(Eo *obj, Elm_Entry_Data *_pd
6004} 6004}
6005 6005
6006EOLIAN static Eina_Bool 6006EOLIAN static Eina_Bool
6007_elm_entry_elm_interface_atspi_text_editable_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position) 6007_elm_entry_efl_access_editable_text_paste(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int position)
6008{ 6008{
6009 elm_entry_cursor_pos_set(obj, position); 6009 elm_entry_cursor_pos_set(obj, position);
6010 elm_entry_selection_paste(obj); 6010 elm_entry_selection_paste(obj);
@@ -6012,7 +6012,7 @@ _elm_entry_elm_interface_atspi_text_editable_paste(Eo *obj, Elm_Entry_Data *_pd
6012} 6012}
6013 6013
6014EOLIAN static Eina_Bool 6014EOLIAN static Eina_Bool
6015_elm_entry_elm_interface_atspi_text_editable_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end) 6015_elm_entry_efl_access_editable_text_cut(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, int start, int end)
6016{ 6016{
6017 elm_entry_select_region_set(obj, start, end); 6017 elm_entry_select_region_set(obj, start, end);
6018 elm_entry_selection_cut(obj); 6018 elm_entry_selection_cut(obj);
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index a76fda2356..22e8ece171 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -116,7 +116,7 @@ enum Elm.Cnp_Mode
116} 116}
117 117
118class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 118class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
119 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 119 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
120 Efl.Ui.Selectable, Efl.Ui.Scrollable) 120 Efl.Ui.Selectable, Efl.Ui.Scrollable)
121{ 121{
122 [[Elementary entry class]] 122 [[Elementary entry class]]
@@ -969,28 +969,28 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
969 Elm.Interface_Scrollable.bounce_allow { set; } 969 Elm.Interface_Scrollable.bounce_allow { set; }
970 Elm.Interface.Atspi_Accessible.state_set { get; } 970 Elm.Interface.Atspi_Accessible.state_set { get; }
971 Elm.Interface.Atspi_Accessible.name { get; } 971 Elm.Interface.Atspi_Accessible.name { get; }
972 Elm.Interface.Atspi.Text.text { get; } 972 Efl.Access.Text.text { get; }
973 Elm.Interface.Atspi.Text.string { get; } 973 Efl.Access.Text.string { get; }
974 Elm.Interface.Atspi.Text.attribute { get; } 974 Efl.Access.Text.attribute { get; }
975 Elm.Interface.Atspi.Text.attributes { get; } 975 Efl.Access.Text.attributes { get; }
976 Elm.Interface.Atspi.Text.default_attributes { get; } 976 Efl.Access.Text.default_attributes { get; }
977 Elm.Interface.Atspi.Text.caret_offset { get; set; } 977 Efl.Access.Text.caret_offset { get; set; }
978 Elm.Interface.Atspi.Text.character { get; } 978 Efl.Access.Text.character { get; }
979 Elm.Interface.Atspi.Text.character_extents { get; } 979 Efl.Access.Text.character_extents { get; }
980 Elm.Interface.Atspi.Text.character_count { get; } 980 Efl.Access.Text.character_count { get; }
981 Elm.Interface.Atspi.Text.offset_at_point { get; } 981 Efl.Access.Text.offset_at_point { get; }
982 Elm.Interface.Atspi.Text.bounded_ranges { get; } 982 Efl.Access.Text.bounded_ranges { get; }
983 Elm.Interface.Atspi.Text.range_extents { get; } 983 Efl.Access.Text.range_extents { get; }
984 Elm.Interface.Atspi.Text.selection { get; set; } 984 Efl.Access.Text.selection { get; set; }
985 Elm.Interface.Atspi.Text.selections_count { get; } 985 Efl.Access.Text.selections_count { get; }
986 Elm.Interface.Atspi.Text.selection_add; 986 Efl.Access.Text.selection_add;
987 Elm.Interface.Atspi.Text.selection_remove; 987 Efl.Access.Text.selection_remove;
988 Elm.Interface.Atspi.Text.Editable.content { set; } 988 Efl.Access.Editable.Text.content { set; }
989 Elm.Interface.Atspi.Text.Editable.insert; 989 Efl.Access.Editable.Text.insert;
990 Elm.Interface.Atspi.Text.Editable.copy; 990 Efl.Access.Editable.Text.copy;
991 Elm.Interface.Atspi.Text.Editable.cut; 991 Efl.Access.Editable.Text.cut;
992 Elm.Interface.Atspi.Text.Editable.delete; 992 Efl.Access.Editable.Text.delete;
993 Elm.Interface.Atspi.Text.Editable.paste; 993 Efl.Access.Editable.Text.paste;
994 Efl.File.file { get; set; } 994 Efl.File.file { get; set; }
995 Efl.Part.part; 995 Efl.Part.part;
996 } 996 }
diff --git a/src/lib/elementary/elm_interface_atspi_text.h b/src/lib/elementary/elm_interface_atspi_text.h
deleted file mode 100644
index 3b65d0e92a..0000000000
--- a/src/lib/elementary/elm_interface_atspi_text.h
+++ /dev/null
@@ -1,19 +0,0 @@
1#ifndef ELM_INTERFACE_ATSPI_TEXT_H
2#define ELM_INTERFACE_ATSPI_TEXT_H
3
4#ifdef EFL_BETA_API_SUPPORT
5
6#ifdef EFL_EO_API_SUPPORT
7#include "elm_interface_atspi_text.eo.h"
8#endif
9#ifndef EFL_NOLEGACY_API_SUPPORT
10#include "elm_interface_atspi_text.eo.legacy.h"
11#endif
12
13/**
14 * @brief Free Elm_Atspi_Text_Attribute structure
15 */
16EAPI void elm_atspi_text_text_attribute_free(Elm_Atspi_Text_Attribute *attr);
17
18#endif
19#endif
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index 32ae95ea5d..09696a4008 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -1,5 +1,5 @@
1#include "elm_interface_atspi_accessible.h" 1#include "elm_interface_atspi_accessible.h"
2#include "elm_interface_atspi_text.h" 2#include "efl_access_text.h"
3#include "elm_interface_atspi_widget_action.h" 3#include "elm_interface_atspi_widget_action.h"
4#include "efl_access_window.h" 4#include "efl_access_window.h"
5 5
@@ -8,7 +8,7 @@
8#ifdef EFL_BETA_API_SUPPORT 8#ifdef EFL_BETA_API_SUPPORT
9#include "efl_access_action.eo.h" 9#include "efl_access_action.eo.h"
10#include "efl_access_component.eo.h" 10#include "efl_access_component.eo.h"
11#include "elm_interface_atspi_text_editable.eo.h" 11#include "efl_access_editable_text.eo.h"
12#include "efl_access_image.eo.h" 12#include "efl_access_image.eo.h"
13#include "efl_access_selection.eo.h" 13#include "efl_access_selection.eo.h"
14#include "efl_access_value.eo.h" 14#include "efl_access_value.eo.h"
@@ -18,7 +18,7 @@
18#ifdef EFL_BETA_API_SUPPORT 18#ifdef EFL_BETA_API_SUPPORT
19#include "efl_access_action.eo.legacy.h" 19#include "efl_access_action.eo.legacy.h"
20#include "efl_access_component.eo.legacy.h" 20#include "efl_access_component.eo.legacy.h"
21#include "elm_interface_atspi_text_editable.eo.legacy.h" 21#include "efl_access_editable_text.eo.legacy.h"
22#include "efl_access_image.eo.legacy.h" 22#include "efl_access_image.eo.legacy.h"
23#include "efl_access_selection.eo.legacy.h" 23#include "efl_access_selection.eo.legacy.h"
24#include "efl_access_value.eo.legacy.h" 24#include "efl_access_value.eo.legacy.h"