summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-05 17:00:37 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-06 13:02:36 -0800
commitef5853b6d5196e44ae43a9a6561e5cc7b1daa7a0 (patch)
tree9befd1eec66d81fad528739938c3a6a3d1409761 /src
parent971e4dd2a60b0dea8e6fa7e23aaa902e5363443c (diff)
efl_text_cursor: remove all legacy usage from eo files
this takes the current generated output from eolian for legacy code in evas and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8119
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_efl_ui_text.c6
-rw-r--r--src/lib/edje/edje_legacy.c2
-rw-r--r--src/lib/efl/interfaces/efl_text_cursor.eo33
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c18
-rw-r--r--src/lib/elementary/efl_ui_text.c28
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
6 files changed, 31 insertions, 60 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index d7aa2a44e4..f8863b1201 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -251,7 +251,7 @@ _on_factory_bt_image_clicked(void *data, const Efl_Event *event EINA_UNUSED)
251 251
252 image_idx = (image_idx + 1) % IMAGES_SZ; 252 image_idx = (image_idx + 1) % IMAGES_SZ;
253 efl_text_cursor_item_insert(en, 253 efl_text_cursor_item_insert(en,
254 efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN), 254 efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN),
255 images[image_idx], "size=32x32"); 255 images[image_idx], "size=32x32");
256 printf("Inserted image: key = %s\n", images[image_idx]); 256 printf("Inserted image: key = %s\n", images[image_idx]);
257} 257}
@@ -260,7 +260,7 @@ static void
260_on_factory_bt_emoticon_clicked(void *data, const Efl_Event *event EINA_UNUSED) 260_on_factory_bt_emoticon_clicked(void *data, const Efl_Event *event EINA_UNUSED)
261{ 261{
262 Evas_Object *en = data; 262 Evas_Object *en = data;
263 efl_text_cursor_item_insert(en, efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN), 263 efl_text_cursor_item_insert(en, efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN),
264 "emoticon/evil-laugh", "size=32x32"); 264 "emoticon/evil-laugh", "size=32x32");
265} 265}
266 266
@@ -353,7 +353,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
353 efl_text_font_set(en, "Sans", 14); 353 efl_text_font_set(en, "Sans", 14);
354 efl_text_normal_color_set(en, 255, 255, 255, 255); 354 efl_text_normal_color_set(en, 255, 255, 255, 255);
355 355
356 main_cur = efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN); 356 main_cur = efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
357 cur = efl_text_cursor_new(en); 357 cur = efl_text_cursor_new(en);
358 358
359 efl_text_cursor_position_set(en, cur, 2); 359 efl_text_cursor_position_set(en, cur, 2);
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 5906ff1969..edcc185a33 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -428,7 +428,7 @@ EAPI void
428edje_object_part_text_cursor_geometry_get(const Edje_Object *obj, const char * part, int *x, int *y, int *w, int *h) 428edje_object_part_text_cursor_geometry_get(const Edje_Object *obj, const char * part, int *x, int *y, int *w, int *h)
429{ 429{
430 efl_text_cursor_geometry_get(efl_part(obj, part), 430 efl_text_cursor_geometry_get(efl_part(obj, part),
431 efl_text_cursor_get(efl_part(obj, part), EFL_TEXT_CURSOR_GET_MAIN), 431 efl_text_cursor_get(efl_part(obj, part), EFL_TEXT_CURSOR_GET_TYPE_MAIN),
432 EFL_TEXT_CURSOR_TYPE_BEFORE, 432 EFL_TEXT_CURSOR_TYPE_BEFORE,
433 x, y, w, h, NULL, NULL, NULL, NULL 433 x, y, w, h, NULL, NULL, NULL, NULL
434 ); 434 );
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index 855c49f207..1f8b4ed59b 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -3,7 +3,6 @@ import efl_text_types;
3 3
4enum Efl.Text_Cursor_Get_Type { 4enum Efl.Text_Cursor_Get_Type {
5 [[All available cursor states]] 5 [[All available cursor states]]
6 legacy: efl_text_cursor_get;
7 default = 0, [[Main cursor state (alias to "main")]] 6 default = 0, [[Main cursor state (alias to "main")]]
8 main, [[Main cursor state]] 7 main, [[Main cursor state]]
9 selection_begin, [[Selection begin cursor state]] 8 selection_begin, [[Selection begin cursor state]]
@@ -17,7 +16,6 @@ enum Efl.Text_Cursor_Get_Type {
17enum Efl.Text_Cursor_Type 16enum Efl.Text_Cursor_Type
18{ 17{
19 [[Text cursor types]] 18 [[Text cursor types]]
20 legacy: efl_text_cursor_type;
21 before, [[Cursor type before]] 19 before, [[Cursor type before]]
22 under [[Cursor type under]] 20 under [[Cursor type under]]
23} 21}
@@ -35,7 +33,6 @@ interface @beta Efl.Text_Cursor {
35 @since 1.18 33 @since 1.18
36 ]] 34 ]]
37 get { 35 get {
38 legacy: null;
39 return: ptr(Efl.Text_Cursor_Cursor); [[Text cursor object]] 36 return: ptr(Efl.Text_Cursor_Cursor); [[Text cursor object]]
40 } 37 }
41 keys { 38 keys {
@@ -44,8 +41,8 @@ interface @beta Efl.Text_Cursor {
44 } 41 }
45 @property cursor_position { 42 @property cursor_position {
46 [[Cursor position]] 43 [[Cursor position]]
47 set { legacy: null; } 44 set { }
48 get { legacy: null; } 45 get { }
49 values { 46 values {
50 position: int; [[Cursor position]] 47 position: int; [[Cursor position]]
51 } 48 }
@@ -56,7 +53,6 @@ interface @beta Efl.Text_Cursor {
56 @property cursor_content { 53 @property cursor_content {
57 [[The content of the cursor (the character under the cursor)]] 54 [[The content of the cursor (the character under the cursor)]]
58 get { 55 get {
59 legacy: null;
60 } 56 }
61 values { 57 values {
62 content: Eina.Unicode; [[The unicode codepoint of the character]] 58 content: Eina.Unicode; [[The unicode codepoint of the character]]
@@ -75,7 +71,6 @@ interface @beta Efl.Text_Cursor {
75 In this case $true is returned and $cx2, $cy2, $cw2, $ch2 are set. 71 In this case $true is returned and $cx2, $cy2, $cw2, $ch2 are set.
76 ]] 72 ]]
77 get { 73 get {
78 legacy: null;
79 return: bool; [[ $true if split cursor, $false otherwise.]] 74 return: bool; [[ $true if split cursor, $false otherwise.]]
80 } 75 }
81 keys { 76 keys {
@@ -95,19 +90,16 @@ interface @beta Efl.Text_Cursor {
95 } 90 }
96 cursor_new { 91 cursor_new {
97 [[Create new cursor]] 92 [[Create new cursor]]
98 legacy: null;
99 return: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 93 return: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
100 } 94 }
101 cursor_free { 95 cursor_free {
102 [[Free existing cursor]] 96 [[Free existing cursor]]
103 legacy: null;
104 params { 97 params {
105 cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 98 cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
106 } 99 }
107 } 100 }
108 cursor_equal { 101 cursor_equal {
109 [[Check if two cursors are equal]] 102 [[Check if two cursors are equal]]
110 legacy: null;
111 params { 103 params {
112 @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]] 104 @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]]
113 @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]] 105 @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]]
@@ -116,7 +108,6 @@ interface @beta Efl.Text_Cursor {
116 } 108 }
117 cursor_compare { 109 cursor_compare {
118 [[Compare two cursors]] 110 [[Compare two cursors]]
119 legacy: null;
120 params { 111 params {
121 @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]] 112 @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]]
122 @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]] 113 @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]]
@@ -125,7 +116,6 @@ interface @beta Efl.Text_Cursor {
125 } 116 }
126 cursor_copy { 117 cursor_copy {
127 [[Copy existing cursor]] 118 [[Copy existing cursor]]
128 legacy: null;
129 params { 119 params {
130 /* @out */ dst: ptr(Efl.Text_Cursor_Cursor); [[Destination cursor]] 120 /* @out */ dst: ptr(Efl.Text_Cursor_Cursor); [[Destination cursor]]
131 @cref src: Efl.Text_Cursor_Cursor; [[Source cursor]] 121 @cref src: Efl.Text_Cursor_Cursor; [[Source cursor]]
@@ -133,105 +123,90 @@ interface @beta Efl.Text_Cursor {
133 } 123 }
134 cursor_char_next { 124 cursor_char_next {
135 [[Advances to the next character]] 125 [[Advances to the next character]]
136 legacy: null;
137 params { 126 params {
138 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 127 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
139 } 128 }
140 } 129 }
141 cursor_char_prev { 130 cursor_char_prev {
142 [[Advances to the previous character]] 131 [[Advances to the previous character]]
143 legacy: null;
144 params { 132 params {
145 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 133 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
146 } 134 }
147 } 135 }
148 cursor_cluster_next { 136 cursor_cluster_next {
149 [[Advances to the next grapheme cluster]] 137 [[Advances to the next grapheme cluster]]
150 legacy: null;
151 params { 138 params {
152 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 139 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
153 } 140 }
154 } 141 }
155 cursor_cluster_prev { 142 cursor_cluster_prev {
156 [[Advances to the previous grapheme cluster]] 143 [[Advances to the previous grapheme cluster]]
157 legacy: null;
158 params { 144 params {
159 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 145 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
160 } 146 }
161 } 147 }
162 cursor_paragraph_char_first { 148 cursor_paragraph_char_first {
163 [[Advances to the first character in this paragraph]] 149 [[Advances to the first character in this paragraph]]
164 legacy: null;
165 params { 150 params {
166 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 151 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
167 } 152 }
168 } 153 }
169 cursor_paragraph_char_last { 154 cursor_paragraph_char_last {
170 [[Advances to the last character in this paragraph]] 155 [[Advances to the last character in this paragraph]]
171 legacy: null;
172 params { 156 params {
173 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 157 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
174 } 158 }
175 } 159 }
176 cursor_word_start { 160 cursor_word_start {
177 [[Advance to current word start]] 161 [[Advance to current word start]]
178 legacy: null;
179 params { 162 params {
180 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 163 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
181 } 164 }
182 } 165 }
183 cursor_word_end { 166 cursor_word_end {
184 [[Advance to current word end]] 167 [[Advance to current word end]]
185 legacy: null;
186 params { 168 params {
187 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 169 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
188 } 170 }
189 } 171 }
190 cursor_line_char_first { 172 cursor_line_char_first {
191 [[Advance to current line first character]] 173 [[Advance to current line first character]]
192 legacy: null;
193 params { 174 params {
194 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 175 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
195 } 176 }
196 } 177 }
197 cursor_line_char_last { 178 cursor_line_char_last {
198 [[Advance to current line last character]] 179 [[Advance to current line last character]]
199 legacy: null;
200 params { 180 params {
201 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 181 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
202 } 182 }
203 } 183 }
204 cursor_paragraph_first { 184 cursor_paragraph_first {
205 [[Advance to current paragraph first character]] 185 [[Advance to current paragraph first character]]
206 legacy: null;
207 params { 186 params {
208 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 187 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
209 } 188 }
210 } 189 }
211 cursor_paragraph_last { 190 cursor_paragraph_last {
212 [[Advance to current paragraph last character]] 191 [[Advance to current paragraph last character]]
213 legacy: null;
214 params { 192 params {
215 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 193 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
216 } 194 }
217 } 195 }
218 cursor_paragraph_next { 196 cursor_paragraph_next {
219 [[Advances to the start of the next text node]] 197 [[Advances to the start of the next text node]]
220 legacy: null;
221 params { 198 params {
222 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 199 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
223 } 200 }
224 } 201 }
225 cursor_paragraph_prev { 202 cursor_paragraph_prev {
226 [[Advances to the end of the previous text node]] 203 [[Advances to the end of the previous text node]]
227 legacy: null;
228 params { 204 params {
229 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 205 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
230 } 206 }
231 } 207 }
232 cursor_line_jump_by { 208 cursor_line_jump_by {
233 [[Jump the cursor by the given number of lines]] 209 [[Jump the cursor by the given number of lines]]
234 legacy: null;
235 params { 210 params {
236 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 211 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
237 by: int; [[Number of lines]] 212 by: int; [[Number of lines]]
@@ -239,7 +214,6 @@ interface @beta Efl.Text_Cursor {
239 } 214 }
240 cursor_coord_set { 215 cursor_coord_set {
241 [[Set cursor coordinates]] 216 [[Set cursor coordinates]]
242 legacy: null;
243 params { 217 params {
244 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 218 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
245 @in x: int; [[X coord to set by.]] 219 @in x: int; [[X coord to set by.]]
@@ -250,7 +224,6 @@ interface @beta Efl.Text_Cursor {
250 [[Set cursor coordinates according to grapheme clusters. 224 [[Set cursor coordinates according to grapheme clusters.
251 It does not allow to put a cursor to the middle of a grapheme cluster. 225 It does not allow to put a cursor to the middle of a grapheme cluster.
252 ]] 226 ]]
253 legacy: null;
254 params { 227 params {
255 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 228 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
256 @in x: int; [[X coord to set by.]] 229 @in x: int; [[X coord to set by.]]
@@ -261,7 +234,6 @@ interface @beta Efl.Text_Cursor {
261 [[Adds text to the current cursor position and set the cursor to 234 [[Adds text to the current cursor position and set the cursor to
262 *after* the start of the text just added. 235 *after* the start of the text just added.
263 ]] 236 ]]
264 legacy: null;
265 params { 237 params {
266 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 238 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
267 @in text: string; [[Text to append (UTF-8 format).]] 239 @in text: string; [[Text to append (UTF-8 format).]]
@@ -270,7 +242,6 @@ interface @beta Efl.Text_Cursor {
270 } 242 }
271 cursor_char_delete { 243 cursor_char_delete {
272 [[Deletes a single character from position pointed by given cursor.]] 244 [[Deletes a single character from position pointed by given cursor.]]
273 legacy: null;
274 params { 245 params {
275 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] 246 /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]]
276 } 247 }
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 70571a94e5..eaada5c2a4 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -75,7 +75,7 @@ static Eina_Bool
75_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) 75_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
76{ 76{
77 Efl_Canvas_Text *obj = data; 77 Efl_Canvas_Text *obj = data;
78 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 78 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
79 const char *str; 79 const char *str;
80 80
81 if (text) 81 if (text)
@@ -177,7 +177,7 @@ static void
177_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) 177_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
178{ 178{
179 Efl_Canvas_Text *obj = data; 179 Efl_Canvas_Text *obj = data;
180 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 180 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
181 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 181 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
182 int cursor_pos; 182 int cursor_pos;
183 int preedit_start_pos, preedit_end_pos; 183 int preedit_start_pos, preedit_end_pos;
@@ -330,7 +330,7 @@ static void
330_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 330_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
331{ 331{
332 Efl_Canvas_Text *obj = data; 332 Efl_Canvas_Text *obj = data;
333 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 333 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
334 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 334 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
335 Ecore_IMF_Event_Delete_Surrounding *ev = event_info; 335 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
336 Evas_Textblock_Cursor *del_start, *del_end; 336 Evas_Textblock_Cursor *del_start, *del_end;
@@ -374,7 +374,7 @@ static void
374_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 374_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
375{ 375{
376 Efl_Canvas_Text *obj = data; 376 Efl_Canvas_Text *obj = data;
377 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 377 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
378 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 378 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
379 Ecore_IMF_Event_Selection *ev = event_info; 379 Ecore_IMF_Event_Selection *ev = event_info;
380 380
@@ -465,7 +465,7 @@ _focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
465 465
466 if (!en->imf_context) return; 466 if (!en->imf_context) return;
467 467
468 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 468 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
469 ecore_imf_context_focus_in(en->imf_context); 469 ecore_imf_context_focus_in(en->imf_context);
470 _entry_imf_cursor_info_set(obj, cur, en); 470 _entry_imf_cursor_info_set(obj, cur, en);
471#endif 471#endif
@@ -727,7 +727,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
727 /* FIXME: Maybe allow selctions to happen even when not editable. */ 727 /* FIXME: Maybe allow selctions to happen even when not editable. */
728 if (!en->editable) return; 728 if (!en->editable) return;
729 729
730 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 730 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
731 old_cur_pos = evas_textblock_cursor_pos_get(cur); 731 old_cur_pos = evas_textblock_cursor_pos_get(cur);
732 if (old_cur_pos < 0) return; 732 if (old_cur_pos < 0) return;
733 733
@@ -1112,7 +1112,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1112 Evas_Coord cx, cy; 1112 Evas_Coord cx, cy;
1113 Evas_Event_Mouse_Down *ev = event_info; 1113 Evas_Event_Mouse_Down *ev = event_info;
1114 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1114 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1115 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 1115 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
1116 Evas_Textblock_Cursor *tc = NULL; 1116 Evas_Textblock_Cursor *tc = NULL;
1117 Eina_Bool dosel = EINA_FALSE; 1117 Eina_Bool dosel = EINA_FALSE;
1118 Eina_Bool shift; 1118 Eina_Bool shift;
@@ -1223,7 +1223,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1223{ 1223{
1224 Evas_Coord cx, cy; 1224 Evas_Coord cx, cy;
1225 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1225 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1226 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 1226 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
1227 Evas_Event_Mouse_Up *ev = event_info; 1227 Evas_Event_Mouse_Up *ev = event_info;
1228 1228
1229 if ((!ev) || (ev->button != 1)) return; 1229 if ((!ev) || (ev->button != 1)) return;
@@ -1264,7 +1264,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
1264{ 1264{
1265 Evas_Coord cx, cy; 1265 Evas_Coord cx, cy;
1266 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1266 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1267 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 1267 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
1268 Evas_Event_Mouse_Move *ev = event_info; 1268 Evas_Event_Mouse_Move *ev = event_info;
1269 Evas_Coord x, y, w, h; 1269 Evas_Coord x, y, w, h;
1270 Evas_Textblock_Cursor *tc; 1270 Evas_Textblock_Cursor *tc;
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 1a50a7494d..eb18a80233 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -611,7 +611,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
611 { 611 {
612 efl_canvas_text_range_delete(obj, start, end); 612 efl_canvas_text_range_delete(obj, start, end);
613 } 613 }
614 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 614 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
615 info.insert = EINA_TRUE; 615 info.insert = EINA_TRUE;
616 info.position = efl_text_cursor_position_get(obj, cur); 616 info.position = efl_text_cursor_position_get(obj, cur);
617 info.length = len; 617 info.length = len;
@@ -834,7 +834,7 @@ _cursor_geometry_recalc(Evas_Object *obj)
834 x = y = w = h = 0; 834 x = y = w = h = 0;
835 835
836 Efl_Text_Cursor_Cursor *main_cur = 836 Efl_Text_Cursor_Cursor *main_cur =
837 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 837 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
838 838
839 efl_text_cursor_geometry_get(obj, main_cur, 839 efl_text_cursor_geometry_get(obj, main_cur,
840 EFL_TEXT_CURSOR_TYPE_BEFORE, 840 EFL_TEXT_CURSOR_TYPE_BEFORE,
@@ -995,7 +995,7 @@ _efl_ui_text_efl_ui_widget_interest_region_get(const Eo *obj EINA_UNUSED, Efl_Ui
995 Eina_Rect r = {}; 995 Eina_Rect r = {};
996 996
997 efl_text_cursor_geometry_get(obj, 997 efl_text_cursor_geometry_get(obj,
998 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), 998 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN),
999 EFL_TEXT_CURSOR_TYPE_BEFORE, 999 EFL_TEXT_CURSOR_TYPE_BEFORE,
1000 &r.x, &r.y, &r.w, &r.h, 1000 &r.x, &r.y, &r.w, &r.h,
1001 NULL, NULL, NULL, NULL); 1001 NULL, NULL, NULL, NULL);
@@ -1705,7 +1705,7 @@ _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler)
1705 1705
1706 pos = efl_gfx_entity_position_get(sd->text_obj); 1706 pos = efl_gfx_entity_position_get(sd->text_obj);
1707 efl_text_cursor_geometry_get(obj, 1707 efl_text_cursor_geometry_get(obj,
1708 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), 1708 efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN),
1709 EFL_TEXT_CURSOR_TYPE_BEFORE, 1709 EFL_TEXT_CURSOR_TYPE_BEFORE,
1710 &cx, &cy, &cw, &ch, 1710 &cx, &cy, &cw, &ch,
1711 NULL, NULL, NULL, NULL); 1711 NULL, NULL, NULL, NULL);
@@ -1743,7 +1743,7 @@ _start_handler_mouse_down_cb(void *data,
1743 1743
1744 /* Get the cursors */ 1744 /* Get the cursors */
1745 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 1745 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
1746 main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN); 1746 main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
1747 1747
1748 start_pos = efl_text_cursor_position_get(text_obj, sel_start); 1748 start_pos = efl_text_cursor_position_get(text_obj, sel_start);
1749 end_pos = efl_text_cursor_position_get(text_obj, sel_end); 1749 end_pos = efl_text_cursor_position_get(text_obj, sel_end);
@@ -1802,7 +1802,7 @@ _start_handler_mouse_move_cb(void *data,
1802 1802
1803 /* Set the main cursor. */ 1803 /* Set the main cursor. */
1804 efl_text_cursor_position_set(sd->text_obj, 1804 efl_text_cursor_position_set(sd->text_obj,
1805 efl_text_cursor_get(sd->text_obj, EFL_TEXT_CURSOR_GET_MAIN), pos); 1805 efl_text_cursor_get(sd->text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), pos);
1806 1806
1807 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); 1807 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
1808 sd->long_pressed = EINA_FALSE; 1808 sd->long_pressed = EINA_FALSE;
@@ -1825,7 +1825,7 @@ _end_handler_mouse_down_cb(void *data,
1825 Eo *text_obj = sd->text_obj; 1825 Eo *text_obj = sd->text_obj;
1826 1826
1827 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 1827 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
1828 main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN); 1828 main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
1829 1829
1830 start_pos = efl_text_cursor_position_get(text_obj, sel_start); 1830 start_pos = efl_text_cursor_position_get(text_obj, sel_start);
1831 end_pos = efl_text_cursor_position_get(text_obj, sel_end); 1831 end_pos = efl_text_cursor_position_get(text_obj, sel_end);
@@ -1883,7 +1883,7 @@ _end_handler_mouse_move_cb(void *data,
1883 efl_text_cursor_coord_set(sd->text_obj, sd->sel_handler_cursor, cx, cy); 1883 efl_text_cursor_coord_set(sd->text_obj, sd->sel_handler_cursor, cx, cy);
1884 pos = efl_text_cursor_position_get(sd->text_obj, sd->sel_handler_cursor); 1884 pos = efl_text_cursor_position_get(sd->text_obj, sd->sel_handler_cursor);
1885 /* Set the main cursor. */ 1885 /* Set the main cursor. */
1886 efl_text_cursor_position_set(sd->text_obj, efl_text_cursor_get(data, EFL_TEXT_CURSOR_GET_MAIN), pos); 1886 efl_text_cursor_position_set(sd->text_obj, efl_text_cursor_get(data, EFL_TEXT_CURSOR_GET_TYPE_MAIN), pos);
1887 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); 1887 ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
1888 sd->long_pressed = EINA_FALSE; 1888 sd->long_pressed = EINA_FALSE;
1889} 1889}
@@ -2384,7 +2384,7 @@ _efl_ui_text_selection_handler_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Te
2384static void 2384static void
2385_efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry) 2385_efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
2386{ 2386{
2387 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 2387 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
2388 efl_text_cursor_text_insert(obj, cur_obj, entry); 2388 efl_text_cursor_text_insert(obj, cur_obj, entry);
2389 sd->text_changed = EINA_TRUE; 2389 sd->text_changed = EINA_TRUE;
2390 elm_layout_sizing_eval(obj); 2390 elm_layout_sizing_eval(obj);
@@ -2987,13 +2987,13 @@ fail:
2987EOLIAN static int 2987EOLIAN static int
2988_efl_ui_text_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) 2988_efl_ui_text_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
2989{ 2989{
2990 return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN)); 2990 return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN));
2991} 2991}
2992 2992
2993EOLIAN static Eina_Bool 2993EOLIAN static Eina_Bool
2994_efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) 2994_efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
2995{ 2995{
2996 efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), offset); 2996 efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), offset);
2997 return EINA_TRUE; 2997 return EINA_TRUE;
2998} 2998}
2999 2999
@@ -3300,7 +3300,7 @@ _efl_ui_text_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Text_Data
3300EOLIAN static Eina_Bool 3300EOLIAN static Eina_Bool
3301_efl_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position) 3301_efl_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position)
3302{ 3302{
3303 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 3303 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
3304 efl_text_cursor_position_set(obj, cur_obj, position); 3304 efl_text_cursor_position_set(obj, cur_obj, position);
3305 _efl_ui_text_entry_insert(obj, pd, string); 3305 _efl_ui_text_entry_insert(obj, pd, string);
3306 3306
@@ -3350,7 +3350,7 @@ _efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int
3350EOLIAN static Eina_Bool 3350EOLIAN static Eina_Bool
3351_efl_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position) 3351_efl_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
3352{ 3352{
3353 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); 3353 Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
3354 efl_text_cursor_position_set(obj, cur_obj, position); 3354 efl_text_cursor_position_set(obj, cur_obj, position);
3355 efl_ui_text_selection_paste(obj); 3355 efl_ui_text_selection_paste(obj);
3356 return EINA_TRUE; 3356 return EINA_TRUE;
@@ -3471,7 +3471,7 @@ _update_text_cursors(Eo *obj)
3471 xx = yy = ww = hh = -1; 3471 xx = yy = ww = hh = -1;
3472 off =_decoration_calc_offset(sd); 3472 off =_decoration_calc_offset(sd);
3473 bidi_cursor = efl_text_cursor_geometry_get(obj, 3473 bidi_cursor = efl_text_cursor_geometry_get(obj,
3474 efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN), 3474 efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN),
3475 EFL_TEXT_CURSOR_TYPE_BEFORE, &xx, &yy, &ww, &hh, &xx2, &yy2, 3475 EFL_TEXT_CURSOR_TYPE_BEFORE, &xx, &yy, &ww, &hh, &xx2, &yy2,
3476 NULL, NULL); 3476 NULL, NULL);
3477 if (ww < 1) ww = 1; 3477 if (ww < 1) ww = 1;
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 34ebbe9b64..db5d94672b 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16456,7 +16456,7 @@ ppar(Evas_Object_Textblock_Paragraph *par)
16456EOLIAN static Efl_Text_Cursor_Cursor * 16456EOLIAN static Efl_Text_Cursor_Cursor *
16457_efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Get_Type get_type) 16457_efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Get_Type get_type)
16458{ 16458{
16459 if (get_type > EFL_TEXT_CURSOR_GET_MAIN) 16459 if (get_type > EFL_TEXT_CURSOR_GET_TYPE_MAIN)
16460 { 16460 {
16461 ERR("Unsupported cursor types other than main!"); 16461 ERR("Unsupported cursor types other than main!");
16462 } 16462 }
@@ -16466,7 +16466,7 @@ _efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, E
16466EAPI Efl_Text_Cursor_Cursor * 16466EAPI Efl_Text_Cursor_Cursor *
16467evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED) 16467evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED)
16468{ 16468{
16469 return efl_text_cursor_get(eo_obj, EFL_TEXT_CURSOR_GET_MAIN); 16469 return efl_text_cursor_get(eo_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
16470} 16470}
16471 16471
16472EOLIAN static Efl_Text_Cursor_Cursor * 16472EOLIAN static Efl_Text_Cursor_Cursor *