summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2020-04-07 11:11:13 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 12:25:55 +0200
commitf526ad8c26aef17ff1af444217d065d33ba2387a (patch)
treed2ee22ec668bd26c64bc980c1c869dbed9a2db74
parent8a155aecb6c98bccd92a3986d9224c600e08cbe5 (diff)
Fix namespace clashes for Efl.Text.Cursor
Three renames are applied here: Efl.Text.Cursor -> Efl.Text_Cursor.Object (class) Efl.Text.Cursor_Type -> Efl.Text_Cursor.Type (enum) Efl.Text.Cursor_Move_Type -> Efl.Text_Cursor.Move_Type (enum) Nothing changes for the enums on the C side. For the class... Well, the method names are a bit more verbose now. These renames are required to avoid clashing with the Efl.Text interface. This did not cause trouble to C# because interfaces are prefixed with "I", but it did cause trouble to Eolian when the EO files were installed and somebody tried to use them. Ref T8648 Differential Revision: https://phab.enlightenment.org/D11663
-rw-r--r--src/bin/elementary/test_efl_ui_text.c14
-rw-r--r--src/lib/elementary/efl_text_interactive.eo8
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c290
-rw-r--r--src/lib/elementary/efl_ui_textbox.c150
-rw-r--r--src/lib/elementary/efl_ui_textbox.eo2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c126
-rw-r--r--src/lib/evas/Efl_Canvas.h2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/Evas_Internal.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo8
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_internal.h8
-rw-r--r--src/lib/evas/canvas/efl_text_cursor_object.c (renamed from src/lib/evas/canvas/efl_text_cursor.c)104
-rw-r--r--src/lib/evas/canvas/efl_text_cursor_object.eo (renamed from src/lib/evas/canvas/efl_text_cursor.eo)31
-rw-r--r--src/lib/evas/canvas/efl_text_formatter.c44
-rw-r--r--src/lib/evas/canvas/efl_text_formatter.eo12
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c16
-rw-r--r--src/lib/evas/canvas/meson.build4
-rw-r--r--src/tests/elementary/efl_ui_test_text.c46
-rw-r--r--src/tests/evas/evas_test_textblock.c386
19 files changed, 628 insertions, 629 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 53914831e7..49cfff589f 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -8,13 +8,13 @@
8static void 8static void
9_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style) 9_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
10{ 10{
11 Efl_Text_Cursor *start, *end; 11 Efl_Text_Cursor_Object *start, *end;
12 12
13 start = efl_ui_textbox_cursor_create(obj); 13 start = efl_ui_textbox_cursor_create(obj);
14 end = efl_ui_textbox_cursor_create(obj); 14 end = efl_ui_textbox_cursor_create(obj);
15 15
16 efl_text_cursor_position_set(start, start_pos); 16 efl_text_cursor_object_position_set(start, start_pos);
17 efl_text_cursor_position_set(end, end_pos); 17 efl_text_cursor_object_position_set(end, end_pos);
18 18
19 efl_text_formatter_attribute_insert(start, end, style); 19 efl_text_formatter_attribute_insert(start, end, style);
20 20
@@ -101,15 +101,15 @@ typedef struct
101static void 101static void
102_on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED) 102_on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED)
103{ 103{
104 Efl_Text_Cursor *sel_start, *sel_end; 104 Efl_Text_Cursor_Object *sel_start, *sel_end;
105 Eo *en = data; 105 Eo *en = data;
106 106
107 efl_text_interactive_selection_cursors_get(en, &sel_start, &sel_end); 107 efl_text_interactive_selection_cursors_get(en, &sel_start, &sel_end);
108 const char *s = efl_text_cursor_range_text_get(sel_start, sel_end); 108 const char *s = efl_text_cursor_object_range_text_get(sel_start, sel_end);
109 109
110 printf("SELECTION REGION: %d - %d\n", 110 printf("SELECTION REGION: %d - %d\n",
111 efl_text_cursor_position_get( sel_start), 111 efl_text_cursor_object_position_get( sel_start),
112 efl_text_cursor_position_get(sel_end)); 112 efl_text_cursor_object_position_get(sel_end));
113 printf("SELECTION:\n"); 113 printf("SELECTION:\n");
114 if (s) printf("%s\n", s); 114 if (s) printf("%s\n", s);
115} 115}
diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo
index 9e917ca7ec..5f463f3c41 100644
--- a/src/lib/elementary/efl_text_interactive.eo
+++ b/src/lib/elementary/efl_text_interactive.eo
@@ -13,7 +13,7 @@ interface Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties,
13 [[The cursor used to insert new text, the one that's visible to the user.]] 13 [[The cursor used to insert new text, the one that's visible to the user.]]
14 get {} 14 get {}
15 values { 15 values {
16 cursor: Efl.Text.Cursor; [[The cursor visible to the user.]] 16 cursor: Efl.Text_Cursor.Object; [[The cursor visible to the user.]]
17 } 17 }
18 } 18 }
19 @property selection_allowed { 19 @property selection_allowed {
@@ -34,12 +34,12 @@ interface Efl.Text_Interactive extends Efl.Text, Efl.Text_Font_Properties,
34 } 34 }
35 set { 35 set {
36 [[The positions of passed cursors will be used to set selection cursors positions. 36 [[The positions of passed cursors will be used to set selection cursors positions.
37 Further modification for passed @Efl.Text.Cursor objects, will not affect selection. 37 Further modification for passed @Efl.Text_Cursor.Object objects, will not affect selection.
38 Setter is recommended to set new range for selection.]] 38 Setter is recommended to set new range for selection.]]
39 } 39 }
40 values { 40 values {
41 start: Efl.Text.Cursor; [[The start of the selection.]] 41 start: Efl.Text_Cursor.Object; [[The start of the selection.]]
42 end: Efl.Text.Cursor; [[The end of the selection.]] 42 end: Efl.Text_Cursor.Object; [[The end of the selection.]]
43 } 43 }
44 } 44 }
45 @property editable { 45 @property editable {
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 3fd39d1b26..b042f8e305 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -13,10 +13,10 @@
13 13
14typedef struct _Efl_Ui_Internal_Text_Interactive_Data 14typedef struct _Efl_Ui_Internal_Text_Interactive_Data
15{ 15{
16 Efl_Text_Cursor *sel_start, *sel_end; 16 Efl_Text_Cursor_Object *sel_start, *sel_end;
17 Eina_Bool watch_selection; 17 Eina_Bool watch_selection;
18 Efl_Text_Cursor *main_cursor; 18 Efl_Text_Cursor_Object *main_cursor;
19 Efl_Text_Cursor *preedit_start, *preedit_end; 19 Efl_Text_Cursor_Object *preedit_start, *preedit_end;
20 Ecore_Timer *pw_timer; 20 Ecore_Timer *pw_timer;
21 Eina_List *seq; 21 Eina_List *seq;
22 char *selection; 22 char *selection;
@@ -48,9 +48,9 @@ typedef struct _Efl_Ui_Internal_Text_Interactive_Data
48} Efl_Ui_Internal_Text_Interactive_Data; 48} Efl_Ui_Internal_Text_Interactive_Data;
49 49
50static void _sel_range_del_emit(Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en); 50static void _sel_range_del_emit(Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
51static void _sel_init(Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en); 51static void _sel_init(Efl_Text_Cursor_Object *c, Efl_Ui_Internal_Text_Interactive_Data *en);
52static void _sel_enable(Evas_Object *o,Efl_Ui_Internal_Text_Interactive_Data *en); 52static void _sel_enable(Evas_Object *o,Efl_Ui_Internal_Text_Interactive_Data *en);
53static void _sel_extend(Efl_Text_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en); 53static void _sel_extend(Efl_Text_Cursor_Object *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en);
54static void _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en); 54static void _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en);
55static void _emit_sel_state( Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en); 55static void _emit_sel_state( Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en);
56static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en); 56static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
@@ -61,33 +61,33 @@ static void _sel_watch_thaw(Efl_Ui_Internal_Text_Interactive_Data *en);
61 61
62static void 62static void
63_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 63_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
64 Efl_Text_Cursor *c, const char *text); 64 Efl_Text_Cursor_Object *c, const char *text);
65 65
66static Efl_Text_Change_Info * 66static Efl_Text_Change_Info *
67_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 67_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
68 Efl_Text_Cursor *c, 68 Efl_Text_Cursor_Object *c,
69 const char *text, 69 const char *text,
70 const char *fmtpre, const char *fmtpost, 70 const char *fmtpre, const char *fmtpost,
71 Eina_Bool clearsel, Eina_Bool changeinfo); 71 Eina_Bool clearsel, Eina_Bool changeinfo);
72 72
73static Efl_Text_Change_Info * 73static Efl_Text_Change_Info *
74_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 74_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
75 Efl_Text_Cursor *c, 75 Efl_Text_Cursor_Object *c,
76 char *text, 76 char *text,
77 const char *fmtpre, const char *fmtpost, 77 const char *fmtpre, const char *fmtpost,
78 Eina_Bool clearsel, Eina_Bool changeinfo); 78 Eina_Bool clearsel, Eina_Bool changeinfo);
79 79
80static Efl_Text_Change_Info * 80static Efl_Text_Change_Info *
81_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 81_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
82 Efl_Text_Cursor *c, 82 Efl_Text_Cursor_Object *c,
83 const char *text, 83 const char *text,
84 const char *fmtpre, const char *fmtpost, 84 const char *fmtpre, const char *fmtpost,
85 Eina_Bool clearsel, Eina_Bool changeinfo); 85 Eina_Bool clearsel, Eina_Bool changeinfo);
86 86
87static void 87static void
88_cur_pos_copy(Efl_Text_Cursor *src, Efl_Text_Cursor *dest) 88_cur_pos_copy(Efl_Text_Cursor_Object *src, Efl_Text_Cursor_Object *dest)
89{ 89{
90 efl_text_cursor_position_set(dest, efl_text_cursor_position_get(src)); 90 efl_text_cursor_object_position_set(dest, efl_text_cursor_object_position_get(src));
91} 91}
92 92
93static void 93static void
@@ -126,17 +126,17 @@ _preedit_del(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
126{ 126{
127 if (!en || !en->have_preedit) return; 127 if (!en || !en->have_preedit) return;
128 if (!en->preedit_start || !en->preedit_end) return; 128 if (!en->preedit_start || !en->preedit_end) return;
129 if (efl_text_cursor_equal(en->preedit_start, en->preedit_end)) return; 129 if (efl_text_cursor_object_equal(en->preedit_start, en->preedit_end)) return;
130 130
131 /* delete the preedit characters */ 131 /* delete the preedit characters */
132 efl_text_cursor_range_delete(en->preedit_start, en->preedit_end); 132 efl_text_cursor_object_range_delete(en->preedit_start, en->preedit_end);
133} 133}
134 134
135static Eina_Bool 135static Eina_Bool
136_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) 136_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
137{ 137{
138 Efl_Canvas_Textblock *obj = data; 138 Efl_Canvas_Textblock *obj = data;
139 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 139 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
140 const char *str; 140 const char *str;
141 141
142 if (text) 142 if (text)
@@ -153,7 +153,7 @@ _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSE
153 if (cursor_pos) 153 if (cursor_pos)
154 { 154 {
155 if (cur) 155 if (cur)
156 *cursor_pos = efl_text_cursor_position_get(cur); 156 *cursor_pos = efl_text_cursor_object_position_get(cur);
157 else 157 else
158 *cursor_pos = 0; 158 *cursor_pos = 0;
159 } 159 }
@@ -262,7 +262,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
262 262
263static Efl_Text_Change_Info * 263static Efl_Text_Change_Info *
264_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 264_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
265 Efl_Text_Cursor *c, 265 Efl_Text_Cursor_Object *c,
266 char *text, 266 char *text,
267 const char *fmtpre, const char *fmtpost, 267 const char *fmtpre, const char *fmtpost,
268 Eina_Bool clearsel, Eina_Bool changeinfo) 268 Eina_Bool clearsel, Eina_Bool changeinfo)
@@ -301,11 +301,11 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_
301 info->mergeable = EINA_TRUE; 301 info->mergeable = EINA_TRUE;
302 } 302 }
303 info->position = 303 info->position =
304 efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj)); 304 efl_text_cursor_object_position_get(efl_text_interactive_main_cursor_get(obj));
305 } 305 }
306 if (fmtpre) _text_filter_format_prepend(obj, en, efl_text_interactive_main_cursor_get(obj), fmtpre); 306 if (fmtpre) _text_filter_format_prepend(obj, en, efl_text_interactive_main_cursor_get(obj), fmtpre);
307 //evas_object_textblock_text_markup_prepend(c, text); 307 //evas_object_textblock_text_markup_prepend(c, text);
308 efl_text_cursor_text_insert(c, text); 308 efl_text_cursor_object_text_insert(c, text);
309 free(text); 309 free(text);
310 if (fmtpost) _text_filter_format_prepend(obj, en, efl_text_interactive_main_cursor_get(obj), fmtpost); 310 if (fmtpost) _text_filter_format_prepend(obj, en, efl_text_interactive_main_cursor_get(obj), fmtpost);
311 return info; 311 return info;
@@ -315,7 +315,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_
315 315
316static Efl_Text_Change_Info * 316static Efl_Text_Change_Info *
317_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 317_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
318 Efl_Text_Cursor *c, 318 Efl_Text_Cursor_Object *c,
319 const char *text, 319 const char *text,
320 const char *fmtpre, const char *fmtpost, 320 const char *fmtpre, const char *fmtpost,
321 Eina_Bool clearsel, Eina_Bool changeinfo) 321 Eina_Bool clearsel, Eina_Bool changeinfo)
@@ -344,7 +344,7 @@ _text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Inte
344 344
345static Efl_Text_Change_Info * 345static Efl_Text_Change_Info *
346_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 346_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
347 Efl_Text_Cursor *c, 347 Efl_Text_Cursor_Object *c,
348 const char *text, 348 const char *text,
349 const char *fmtpre, const char *fmtpost, 349 const char *fmtpre, const char *fmtpost,
350 Eina_Bool clearsel, Eina_Bool changeinfo) 350 Eina_Bool clearsel, Eina_Bool changeinfo)
@@ -369,7 +369,7 @@ _text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Intera
369 369
370static void 370static void
371_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 371_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
372 Efl_Text_Cursor *c, const char *text) 372 Efl_Text_Cursor_Object *c, const char *text)
373{ 373{
374 EINA_SAFETY_ON_NULL_RETURN(text); 374 EINA_SAFETY_ON_NULL_RETURN(text);
375 375
@@ -443,7 +443,7 @@ static void
443_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) 443_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
444{ 444{
445 Efl_Canvas_Textblock *obj = data; 445 Efl_Canvas_Textblock *obj = data;
446 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 446 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
447 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 447 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
448 Efl_Text_Change_Info *info = NULL; 448 Efl_Text_Change_Info *info = NULL;
449 int cursor_pos; 449 int cursor_pos;
@@ -482,7 +482,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
482 /* delete preedit characters */ 482 /* delete preedit characters */
483 _preedit_del(obj, en); 483 _preedit_del(obj, en);
484 484
485 preedit_start_pos = efl_text_cursor_position_get(cur); 485 preedit_start_pos = efl_text_cursor_object_position_get(cur);
486 486
487 /* insert preedit character(s) */ 487 /* insert preedit character(s) */
488 if (strlen(preedit_string) > 0) 488 if (strlen(preedit_string) > 0)
@@ -552,17 +552,17 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
552 en->preedit_end = efl_canvas_textblock_cursor_create(obj); 552 en->preedit_end = efl_canvas_textblock_cursor_create(obj);
553 _cur_pos_copy(cur, en->preedit_end); 553 _cur_pos_copy(cur, en->preedit_end);
554 554
555 preedit_end_pos = efl_text_cursor_position_get(cur); 555 preedit_end_pos = efl_text_cursor_object_position_get(cur);
556 556
557 for (i = 0; i < (preedit_end_pos - preedit_start_pos); i++) 557 for (i = 0; i < (preedit_end_pos - preedit_start_pos); i++)
558 { 558 {
559 efl_text_cursor_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS); 559 efl_text_cursor_object_move(en->preedit_start, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
560 } 560 }
561 561
562 en->have_preedit = EINA_TRUE; 562 en->have_preedit = EINA_TRUE;
563 563
564 /* set cursor position */ 564 /* set cursor position */
565 efl_text_cursor_position_set(cur, preedit_start_pos + cursor_pos); 565 efl_text_cursor_object_position_set(cur, preedit_start_pos + cursor_pos);
566 } 566 }
567 567
568 if (info) 568 if (info)
@@ -588,35 +588,35 @@ static void
588_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 588_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
589{ 589{
590 Efl_Canvas_Textblock *obj = data; 590 Efl_Canvas_Textblock *obj = data;
591 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 591 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
592 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 592 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
593 Ecore_IMF_Event_Delete_Surrounding *ev = event_info; 593 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
594 Efl_Text_Cursor *del_start, *del_end; 594 Efl_Text_Cursor_Object *del_start, *del_end;
595 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; 595 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
596 int cursor_pos; 596 int cursor_pos;
597 int start, end; 597 int start, end;
598 char *tmp; 598 char *tmp;
599 599
600 cursor_pos = efl_text_cursor_position_get(cur); 600 cursor_pos = efl_text_cursor_object_position_get(cur);
601 601
602 del_start = efl_canvas_textblock_cursor_create(obj); 602 del_start = efl_canvas_textblock_cursor_create(obj);
603 efl_text_cursor_position_set(del_start, cursor_pos + ev->offset); 603 efl_text_cursor_object_position_set(del_start, cursor_pos + ev->offset);
604 604
605 del_end = efl_canvas_textblock_cursor_create(obj); 605 del_end = efl_canvas_textblock_cursor_create(obj);
606 efl_text_cursor_position_set(del_end, cursor_pos + ev->offset + ev->n_chars); 606 efl_text_cursor_object_position_set(del_end, cursor_pos + ev->offset + ev->n_chars);
607 607
608 start = efl_text_cursor_position_get(del_start); 608 start = efl_text_cursor_object_position_get(del_start);
609 end = efl_text_cursor_position_get(del_end); 609 end = efl_text_cursor_object_position_get(del_end);
610 if (start == end) goto end; 610 if (start == end) goto end;
611 611
612 tmp = efl_text_cursor_range_text_get(del_start, del_end); 612 tmp = efl_text_cursor_object_range_text_get(del_start, del_end);
613 613
614 info.type = EFL_TEXT_CHANGE_TYPE_REMOVE; 614 info.type = EFL_TEXT_CHANGE_TYPE_REMOVE;
615 info.position = start; 615 info.position = start;
616 info.length = end - start; 616 info.length = end - start;
617 info.content = tmp; 617 info.content = tmp;
618 618
619 efl_text_cursor_range_delete(del_start, del_end); 619 efl_text_cursor_object_range_delete(del_start, del_end);
620 620
621 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 621 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
622 free(tmp); 622 free(tmp);
@@ -632,21 +632,21 @@ static void
632_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 632_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
633{ 633{
634 Efl_Canvas_Textblock *obj = data; 634 Efl_Canvas_Textblock *obj = data;
635 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 635 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
636 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 636 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
637 Ecore_IMF_Event_Selection *ev = event_info; 637 Ecore_IMF_Event_Selection *ev = event_info;
638 638
639 if (ev->start == ev->end) 639 if (ev->start == ev->end)
640 { 640 {
641 efl_text_cursor_position_set(cur, ev->start); 641 efl_text_cursor_object_position_set(cur, ev->start);
642 } 642 }
643 else 643 else
644 { 644 {
645 _sel_clear(obj, en); 645 _sel_clear(obj, en);
646 efl_text_cursor_position_set(cur, ev->start); 646 efl_text_cursor_object_position_set(cur, ev->start);
647 _sel_enable(obj, en); 647 _sel_enable(obj, en);
648 _sel_init(cur, en); 648 _sel_init(cur, en);
649 efl_text_cursor_position_set(cur, ev->end); 649 efl_text_cursor_object_position_set(cur, ev->end);
650 _sel_extend(cur, obj, en); 650 _sel_extend(cur, obj, en);
651 } 651 }
652} 652}
@@ -680,7 +680,7 @@ _entry_imf_cursor_location_set(Efl_Ui_Internal_Text_Interactive_Data *en)
680 Eina_Rect rect; 680 Eina_Rect rect;
681 if (!en->imf_context) return; 681 if (!en->imf_context) return;
682 682
683 rect = efl_text_cursor_geometry_get(en->main_cursor ,EFL_TEXT_CURSOR_TYPE_BEFORE); 683 rect = efl_text_cursor_object_cursor_geometry_get(en->main_cursor ,EFL_TEXT_CURSOR_TYPE_BEFORE);
684 ecore_imf_context_cursor_location_set(en->imf_context, rect.x, rect.y, rect.w, rect.h); 684 ecore_imf_context_cursor_location_set(en->imf_context, rect.x, rect.y, rect.w, rect.h);
685 // FIXME: ecore_imf_context_bidi_direction_set(en->imf_context, (Ecore_IMF_BiDi_Direction)dir); 685 // FIXME: ecore_imf_context_bidi_direction_set(en->imf_context, (Ecore_IMF_BiDi_Direction)dir);
686#else 686#else
@@ -698,13 +698,13 @@ _entry_imf_cursor_info_set(Efl_Ui_Internal_Text_Interactive_Data *en)
698 698
699 if (en->have_selection) 699 if (en->have_selection)
700 { 700 {
701 if (efl_text_cursor_compare(en->sel_start, en->sel_end) < 0) 701 if (efl_text_cursor_object_compare(en->sel_start, en->sel_end) < 0)
702 cursor_pos = efl_text_cursor_position_get(en->sel_start); 702 cursor_pos = efl_text_cursor_object_position_get(en->sel_start);
703 else 703 else
704 cursor_pos = efl_text_cursor_position_get(en->sel_end); 704 cursor_pos = efl_text_cursor_object_position_get(en->sel_end);
705 } 705 }
706 else 706 else
707 cursor_pos = efl_text_cursor_position_get(en->main_cursor); 707 cursor_pos = efl_text_cursor_object_position_get(en->main_cursor);
708 708
709 ecore_imf_context_cursor_position_set(en->imf_context, cursor_pos); 709 ecore_imf_context_cursor_position_set(en->imf_context, cursor_pos);
710 710
@@ -758,7 +758,7 @@ static const char *
758_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 758_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
759{ 759{
760 if ((!en->selection) && (en->have_selection)) 760 if ((!en->selection) && (en->have_selection))
761 en->selection = efl_text_cursor_range_text_get(en->sel_start, en->sel_end); 761 en->selection = efl_text_cursor_object_range_text_get(en->sel_start, en->sel_end);
762 return en->selection; 762 return en->selection;
763} 763}
764 764
@@ -768,12 +768,12 @@ _sel_reset(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en){
768 if (!en->watch_selection) 768 if (!en->watch_selection)
769 return; 769 return;
770 770
771 if (!en->have_selection && efl_text_cursor_equal(en->sel_start, en->sel_end)) 771 if (!en->have_selection && efl_text_cursor_object_equal(en->sel_start, en->sel_end))
772 return; 772 return;
773 773
774 if (en->have_selection) 774 if (en->have_selection)
775 { 775 {
776 if (efl_text_cursor_equal(en->sel_start, en->sel_end)) 776 if (efl_text_cursor_object_equal(en->sel_start, en->sel_end))
777 { 777 {
778 _sel_clear(obj, en); 778 _sel_clear(obj, en);
779 } 779 }
@@ -790,7 +790,7 @@ _sel_reset(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en){
790 } 790 }
791 else 791 else
792 { 792 {
793 if (!efl_text_cursor_equal(en->sel_start, en->sel_end)) 793 if (!efl_text_cursor_object_equal(en->sel_start, en->sel_end))
794 { 794 {
795 _sel_enable(obj, en); 795 _sel_enable(obj, en);
796 _entry_imf_cursor_info_set(en); 796 _entry_imf_cursor_info_set(en);
@@ -817,7 +817,7 @@ _sel_cursor_changed(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
817} 817}
818 818
819static void 819static void
820_sel_init(Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en) 820_sel_init(Efl_Text_Cursor_Object *c, Efl_Ui_Internal_Text_Interactive_Data *en)
821{ 821{
822 if (en->have_selection) 822 if (en->have_selection)
823 return; 823 return;
@@ -854,23 +854,23 @@ _sel_enable(Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en)
854static void 854static void
855_emit_sel_state( Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en) 855_emit_sel_state( Eo *o, Efl_Ui_Internal_Text_Interactive_Data *en)
856{ 856{
857 if (!efl_text_cursor_compare(en->sel_start, en->sel_end)) 857 if (!efl_text_cursor_object_compare(en->sel_start, en->sel_end))
858 { 858 {
859 _sel_clear(o, en); 859 _sel_clear(o, en);
860 } 860 }
861 else 861 else
862 { 862 {
863 Eina_Range range = eina_range_from_to(efl_text_cursor_position_get(en->sel_start), 863 Eina_Range range = eina_range_from_to(efl_text_cursor_object_position_get(en->sel_start),
864 efl_text_cursor_position_get(en->sel_end)); 864 efl_text_cursor_object_position_get(en->sel_end));
865 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, &range); 865 efl_event_callback_call(o, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, &range);
866 } 866 }
867} 867}
868 868
869static void 869static void
870_sel_extend(Efl_Text_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en) 870_sel_extend(Efl_Text_Cursor_Object *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en)
871{ 871{
872 _sel_enable(o, en); 872 _sel_enable(o, en);
873 if (efl_text_cursor_equal(c, en->sel_end)) return; 873 if (efl_text_cursor_object_equal(c, en->sel_end)) return;
874 874
875 _sel_watch_freeze(en); 875 _sel_watch_freeze(en);
876 _cur_pos_copy(c, en->sel_end); 876 _cur_pos_copy(c, en->sel_end);
@@ -919,7 +919,7 @@ _efl_ui_internal_text_interactive_efl_text_interactive_have_selection_get(
919 const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) 919 const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
920{ 920{
921 if (!en->have_selection) return en->have_selection; 921 if (!en->have_selection) return en->have_selection;
922 return !efl_text_cursor_equal(en->sel_start, en->sel_end); 922 return !efl_text_cursor_object_equal(en->sel_start, en->sel_end);
923} 923}
924 924
925 925
@@ -933,8 +933,8 @@ _efl_ui_internal_text_interactive_efl_text_interactive_all_select(
933 Eo *c1 = efl_canvas_textblock_cursor_create(obj); 933 Eo *c1 = efl_canvas_textblock_cursor_create(obj);
934 Eo *c2 = efl_canvas_textblock_cursor_create(obj); 934 Eo *c2 = efl_canvas_textblock_cursor_create(obj);
935 935
936 efl_text_cursor_move(c1, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 936 efl_text_cursor_object_move(c1, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
937 efl_text_cursor_move(c2, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 937 efl_text_cursor_object_move(c2, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
938 938
939 efl_text_interactive_selection_cursors_set(obj, c1, c2); 939 efl_text_interactive_selection_cursors_set(obj, c1, c2);
940 940
@@ -944,14 +944,14 @@ _efl_ui_internal_text_interactive_efl_text_interactive_all_select(
944 944
945 945
946static void 946static void
947_range_del_emit(Evas_Object *obj, Efl_Text_Cursor *cur1, Efl_Text_Cursor *cur2) 947_range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Object *cur1, Efl_Text_Cursor_Object *cur2)
948{ 948{
949 size_t start, end; 949 size_t start, end;
950 char *tmp; 950 char *tmp;
951 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; 951 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
952 952
953 start = efl_text_cursor_position_get(cur1); 953 start = efl_text_cursor_object_position_get(cur1);
954 end = efl_text_cursor_position_get(cur2); 954 end = efl_text_cursor_object_position_get(cur2);
955 if (start == end) 955 if (start == end)
956 return; 956 return;
957 957
@@ -959,10 +959,10 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor *cur1, Efl_Text_Cursor *cur2)
959 info.position = start; 959 info.position = start;
960 info.length = end - start; 960 info.length = end - start;
961 961
962 tmp = efl_text_cursor_range_text_get(cur1, cur2); 962 tmp = efl_text_cursor_object_range_text_get(cur1, cur2);
963 info.content = tmp; 963 info.content = tmp;
964 964
965 efl_text_cursor_range_delete(cur1, cur2); 965 efl_text_cursor_object_range_delete(cur1, cur2);
966 966
967 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 967 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
968 if (tmp) free(tmp); 968 if (tmp) free(tmp);
@@ -976,25 +976,25 @@ _sel_range_del_emit(Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
976} 976}
977 977
978static void 978static void
979_delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data *en EINA_UNUSED, size_t pos, 979_delete_emit(Eo *obj, Efl_Text_Cursor_Object *c, Efl_Ui_Internal_Text_Interactive_Data *en EINA_UNUSED, size_t pos,
980 Eina_Bool backspace) 980 Eina_Bool backspace)
981{ 981{
982 Eo * cur = efl_duplicate(c); 982 Eo * cur = efl_duplicate(c);
983 if (backspace) 983 if (backspace)
984 { 984 {
985 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)) 985 if (!efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
986 { 986 {
987 return; 987 return;
988 } 988 }
989 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT); 989 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
990 } 990 }
991 else 991 else
992 { 992 {
993 if (!efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)) 993 if (!efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
994 { 994 {
995 return; 995 return;
996 } 996 }
997 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS); 997 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
998 } 998 }
999 efl_del(cur); 999 efl_del(cur);
1000 cur = NULL; 1000 cur = NULL;
@@ -1006,7 +1006,7 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
1006 { 1006 {
1007 1007
1008 Evas_Textblock_Cursor *cc = evas_object_textblock_cursor_new(obj); 1008 Evas_Textblock_Cursor *cc = evas_object_textblock_cursor_new(obj);
1009 evas_textblock_cursor_copy(efl_text_cursor_handle_get(c), cc); 1009 evas_textblock_cursor_copy(efl_text_cursor_object_handle_get(c), cc);
1010 Eina_Bool remove_cluster = evas_textblock_cursor_at_cluster_as_single_glyph(cc,EINA_FALSE); 1010 Eina_Bool remove_cluster = evas_textblock_cursor_at_cluster_as_single_glyph(cc,EINA_FALSE);
1011 if (remove_cluster) 1011 if (remove_cluster)
1012 { 1012 {
@@ -1020,14 +1020,14 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
1020 info.position = evas_textblock_cursor_pos_get(cc); 1020 info.position = evas_textblock_cursor_pos_get(cc);
1021 info.length = pos -info.position; 1021 info.length = pos -info.position;
1022 1022
1023 tmp = evas_textblock_cursor_range_text_get(efl_text_cursor_handle_get(c), cc, EVAS_TEXTBLOCK_TEXT_MARKUP); 1023 tmp = evas_textblock_cursor_range_text_get(efl_text_cursor_object_handle_get(c), cc, EVAS_TEXTBLOCK_TEXT_MARKUP);
1024 evas_textblock_cursor_range_delete(efl_text_cursor_handle_get(c), cc); 1024 evas_textblock_cursor_range_delete(efl_text_cursor_object_handle_get(c), cc);
1025 evas_textblock_cursor_free(cc); 1025 evas_textblock_cursor_free(cc);
1026 } 1026 }
1027 else 1027 else
1028 { 1028 {
1029 Evas_Textblock_Cursor *cc = evas_object_textblock_cursor_new(obj); 1029 Evas_Textblock_Cursor *cc = evas_object_textblock_cursor_new(obj);
1030 evas_textblock_cursor_copy(efl_text_cursor_handle_get(c), cc); 1030 evas_textblock_cursor_copy(efl_text_cursor_object_handle_get(c), cc);
1031 1031
1032 Eina_Bool remove_cluster = evas_textblock_cursor_at_cluster_as_single_glyph(cc,EINA_TRUE); 1032 Eina_Bool remove_cluster = evas_textblock_cursor_at_cluster_as_single_glyph(cc,EINA_TRUE);
1033 if (remove_cluster) 1033 if (remove_cluster)
@@ -1042,8 +1042,8 @@ _delete_emit(Eo *obj, Efl_Text_Cursor *c, Efl_Ui_Internal_Text_Interactive_Data
1042 info.position = pos; 1042 info.position = pos;
1043 info.length = evas_textblock_cursor_pos_get(cc) - info.position; 1043 info.length = evas_textblock_cursor_pos_get(cc) - info.position;
1044 1044
1045 tmp = evas_textblock_cursor_range_text_get(efl_text_cursor_handle_get(c), cc, EVAS_TEXTBLOCK_TEXT_MARKUP); 1045 tmp = evas_textblock_cursor_range_text_get(efl_text_cursor_object_handle_get(c), cc, EVAS_TEXTBLOCK_TEXT_MARKUP);
1046 evas_textblock_cursor_range_delete(efl_text_cursor_handle_get(c), cc); 1046 evas_textblock_cursor_range_delete(efl_text_cursor_object_handle_get(c), cc);
1047 evas_textblock_cursor_free(cc); 1047 evas_textblock_cursor_free(cc);
1048 } 1048 }
1049 1049
@@ -1087,7 +1087,7 @@ _compose_seq_reset(Efl_Ui_Internal_Text_Interactive_Data *en)
1087 * movement_forward: if the movement we are going to do is forward (towards the end of the textblock) 1087 * movement_forward: if the movement we are going to do is forward (towards the end of the textblock)
1088 */ 1088 */
1089static void 1089static void
1090_key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward) 1090_key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Object *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift, Eina_Bool movement_forward)
1091{ 1091{
1092 if (en->select_allow) 1092 if (en->select_allow)
1093 { 1093 {
@@ -1097,7 +1097,7 @@ _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor *cur, E
1097 } 1097 }
1098 else if (en->have_selection) 1098 else if (en->have_selection)
1099 { 1099 {
1100 Eina_Bool sel_forward = efl_text_cursor_compare(en->sel_start, en->sel_end); 1100 Eina_Bool sel_forward = efl_text_cursor_object_compare(en->sel_start, en->sel_end);
1101 if ((sel_forward && movement_forward) || (!sel_forward && !movement_forward)) 1101 if ((sel_forward && movement_forward) || (!sel_forward && !movement_forward))
1102 _cur_pos_copy(en->sel_end, cur); 1102 _cur_pos_copy(en->sel_end, cur);
1103 else 1103 else
@@ -1109,7 +1109,7 @@ _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor *cur, E
1109} 1109}
1110 1110
1111static void 1111static void
1112_key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift) 1112_key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Text_Cursor_Object *cur, Efl_Ui_Internal_Text_Interactive_Data *en, Eina_Bool shift)
1113{ 1113{
1114 if (en->select_allow) 1114 if (en->select_allow)
1115 { 1115 {
@@ -1122,7 +1122,7 @@ static void
1122_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) 1122_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info)
1123{ 1123{
1124 Evas_Event_Key_Down *ev = event_info; 1124 Evas_Event_Key_Down *ev = event_info;
1125 Efl_Text_Cursor *cur; 1125 Efl_Text_Cursor_Object *cur;
1126 Eina_Bool control, alt, shift; 1126 Eina_Bool control, alt, shift;
1127#if defined(__APPLE__) && defined(__MACH__) 1127#if defined(__APPLE__) && defined(__MACH__)
1128 Eina_Bool super, altgr; 1128 Eina_Bool super, altgr;
@@ -1162,7 +1162,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1162#endif 1162#endif
1163 1163
1164 cur = efl_text_interactive_main_cursor_get(obj); 1164 cur = efl_text_interactive_main_cursor_get(obj);
1165 old_cur_pos = efl_text_cursor_position_get(cur); 1165 old_cur_pos = efl_text_cursor_object_position_get(cur);
1166 if (old_cur_pos < 0) return; 1166 if (old_cur_pos < 0) return;
1167 1167
1168 control = evas_key_modifier_is_set(ev->modifiers, "Control"); 1168 control = evas_key_modifier_is_set(ev->modifiers, "Control");
@@ -1217,7 +1217,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1217 1217
1218 if (efl_text_interactive_have_selection_get(obj)) 1218 if (efl_text_interactive_have_selection_get(obj))
1219 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1219 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1220 if (efl_text_cursor_line_jump_by(cur, -1)) 1220 if (efl_text_cursor_object_line_jump_by(cur, -1))
1221 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1221 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1222 1222
1223 _key_down_sel_post(obj, cur, en, shift); 1223 _key_down_sel_post(obj, cur, en, shift);
@@ -1233,7 +1233,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1233 1233
1234 if (efl_text_interactive_have_selection_get(obj)) 1234 if (efl_text_interactive_have_selection_get(obj))
1235 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1235 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1236 if (efl_text_cursor_line_jump_by(cur, 1)) 1236 if (efl_text_cursor_object_line_jump_by(cur, 1))
1237 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1237 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1238 1238
1239 _key_down_sel_post(obj, cur, en, shift); 1239 _key_down_sel_post(obj, cur, en, shift);
@@ -1246,14 +1246,14 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1246 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE); 1246 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE);
1247 1247
1248#if defined(__APPLE__) && defined(__MACH__) 1248#if defined(__APPLE__) && defined(__MACH__)
1249 if (altgr) efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1249 if (altgr) efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1250#else 1250#else
1251 /* If control is pressed, go to the start of the word */ 1251 /* If control is pressed, go to the start of the word */
1252 if (control) efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1252 if (control) efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1253#endif 1253#endif
1254 if (efl_text_interactive_have_selection_get(obj)) 1254 if (efl_text_interactive_have_selection_get(obj))
1255 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1255 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1256 if (efl_text_cursor_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)) 1256 if (efl_text_cursor_object_move(cur,EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS))
1257 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1257 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1258 1258
1259 _key_down_sel_post(obj, cur, en, shift); 1259 _key_down_sel_post(obj, cur, en, shift);
@@ -1265,14 +1265,14 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1265 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE); 1265 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE);
1266 1266
1267#if defined(__APPLE__) && defined(__MACH__) 1267#if defined(__APPLE__) && defined(__MACH__)
1268 if (altgr) efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1268 if (altgr) efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1269#else 1269#else
1270 /* If control is pressed, go to the end of the word */ 1270 /* If control is pressed, go to the end of the word */
1271 if (control) efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1271 if (control) efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1272#endif 1272#endif
1273 if (efl_text_interactive_have_selection_get(obj)) 1273 if (efl_text_interactive_have_selection_get(obj))
1274 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1274 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1275 if (efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)) 1275 if (efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT))
1276 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1276 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1277 1277
1278 _key_down_sel_post(obj, cur, en, shift); 1278 _key_down_sel_post(obj, cur, en, shift);
@@ -1283,10 +1283,10 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1283 if (control && !en->have_selection) 1283 if (control && !en->have_selection)
1284 { 1284 {
1285 // del to start of previous word 1285 // del to start of previous word
1286 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj); 1286 Efl_Text_Cursor_Object *tc = efl_canvas_textblock_cursor_create(obj);
1287 _cur_pos_copy(cur, tc); 1287 _cur_pos_copy(cur, tc);
1288 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS); 1288 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS);
1289 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1289 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1290 1290
1291 _range_del_emit(obj, cur, tc); 1291 _range_del_emit(obj, cur, tc);
1292 1292
@@ -1317,11 +1317,11 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1317 if (control) 1317 if (control)
1318 { 1318 {
1319 // del to end of next word 1319 // del to end of next word
1320 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj); 1320 Efl_Text_Cursor_Object *tc = efl_canvas_textblock_cursor_create(obj);
1321 1321
1322 _cur_pos_copy(cur, tc); 1322 _cur_pos_copy(cur, tc);
1323 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1323 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1324 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT); 1324 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1325 1325
1326 _range_del_emit(obj, cur, tc); 1326 _range_del_emit(obj, cur, tc);
1327 1327
@@ -1354,9 +1354,9 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1354 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE); 1354 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE);
1355 1355
1356 if ((control) && (multiline)) 1356 if ((control) && (multiline))
1357 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 1357 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
1358 else 1358 else
1359 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1359 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
1360 1360
1361 _key_down_sel_post(obj, cur, en, shift); 1361 _key_down_sel_post(obj, cur, en, shift);
1362 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1362 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -1369,9 +1369,9 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1369 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE); 1369 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE);
1370 1370
1371 if ((control) && (multiline)) 1371 if ((control) && (multiline))
1372 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1372 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1373 else 1373 else
1374 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END); 1374 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END);
1375 1375
1376 _key_down_sel_post(obj, cur, en, shift); 1376 _key_down_sel_post(obj, cur, en, shift);
1377 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1377 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -1444,7 +1444,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1444 _compose_seq_reset(en); 1444 _compose_seq_reset(en);
1445 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE); 1445 _key_down_sel_pre(obj, cur, en, shift, EINA_FALSE);
1446 1446
1447 efl_text_cursor_line_jump_by(cur, -10); 1447 efl_text_cursor_object_line_jump_by(cur, -10);
1448 1448
1449 _key_down_sel_post(obj, cur, en, shift); 1449 _key_down_sel_post(obj, cur, en, shift);
1450 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1450 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -1455,7 +1455,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1455 _compose_seq_reset(en); 1455 _compose_seq_reset(en);
1456 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE); 1456 _key_down_sel_pre(obj, cur, en, shift, EINA_TRUE);
1457 1457
1458 efl_text_cursor_line_jump_by(cur, 10); 1458 efl_text_cursor_object_line_jump_by(cur, 10);
1459 1459
1460 _key_down_sel_post(obj, cur, en, shift); 1460 _key_down_sel_post(obj, cur, en, shift);
1461 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1461 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -1533,10 +1533,10 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1533 } 1533 }
1534 info.type = EFL_TEXT_CHANGE_TYPE_INSERT; 1534 info.type = EFL_TEXT_CHANGE_TYPE_INSERT;
1535 info.content = string; 1535 info.content = string;
1536 info.position = efl_text_cursor_position_get(cur); 1536 info.position = efl_text_cursor_object_position_get(cur);
1537 info.length = eina_unicode_utf8_get_len(string); 1537 info.length = eina_unicode_utf8_get_len(string);
1538 1538
1539 efl_text_cursor_text_insert(cur, string); 1539 efl_text_cursor_object_text_insert(cur, string);
1540 changed_user = EINA_TRUE; 1540 changed_user = EINA_TRUE;
1541 1541
1542 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1542 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
@@ -1553,12 +1553,12 @@ end:
1553} 1553}
1554 1554
1555static void 1555static void
1556_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) 1556_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Object *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
1557{ 1557{
1558 Evas_Coord cx, cy; 1558 Evas_Coord cx, cy;
1559 Evas_Coord x, y, lh = 0, cly = 0; 1559 Evas_Coord x, y, lh = 0, cly = 0;
1560 Efl_Text_Cursor *line_cur; 1560 Efl_Text_Cursor_Object *line_cur;
1561 Efl_Text_Cursor *tc; 1561 Efl_Text_Cursor_Object *tc;
1562 1562
1563 tc = efl_canvas_textblock_cursor_create(obj); 1563 tc = efl_canvas_textblock_cursor_create(obj);
1564 _cur_pos_copy(cur, tc); 1564 _cur_pos_copy(cur, tc);
@@ -1567,15 +1567,15 @@ _cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coo
1567 cy = canvasy - y; 1567 cy = canvasy - y;
1568 1568
1569 line_cur = efl_canvas_textblock_cursor_create(obj); 1569 line_cur = efl_canvas_textblock_cursor_create(obj);
1570 efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1570 efl_text_cursor_object_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1571 evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, &lh); 1571 evas_textblock_cursor_line_geometry_get(efl_text_cursor_object_handle_get(line_cur), NULL, &cly, NULL, &lh);
1572 /* Consider a threshold of half the line height */ 1572 /* Consider a threshold of half the line height */
1573 if (cy > (cly + lh) && cy < (cly + lh + lh / 2)) 1573 if (cy > (cly + lh) && cy < (cly + lh + lh / 2))
1574 { 1574 {
1575 cy = cly + lh - 1; // Make it inside Textblock 1575 cy = cly + lh - 1; // Make it inside Textblock
1576 } 1576 }
1577 efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 1577 efl_text_cursor_object_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
1578 evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, NULL); 1578 evas_textblock_cursor_line_geometry_get(efl_text_cursor_object_handle_get(line_cur), NULL, &cly, NULL, NULL);
1579 1579
1580 if (cy < cly && cy > (cly - lh / 2)) 1580 if (cy < cly && cy > (cly - lh / 2))
1581 { 1581 {
@@ -1584,7 +1584,7 @@ _cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coo
1584 efl_del(line_cur); 1584 efl_del(line_cur);
1585 /* No need to check return value if not able to set the char coord Textblock 1585 /* No need to check return value if not able to set the char coord Textblock
1586 * will take care */ 1586 * will take care */
1587 efl_text_cursor_char_coord_set(cur, EINA_POSITION2D(cx, cy)); 1587 efl_text_cursor_object_char_coord_set(cur, EINA_POSITION2D(cx, cy));
1588 if (_cx) *_cx = cx; 1588 if (_cx) *_cx = cx;
1589 if (_cy) *_cy = cy; 1589 if (_cy) *_cy = cy;
1590} 1590}
@@ -1595,8 +1595,8 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1595 Evas_Coord cx, cy; 1595 Evas_Coord cx, cy;
1596 Evas_Event_Mouse_Down *ev = event_info; 1596 Evas_Event_Mouse_Down *ev = event_info;
1597 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1597 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1598 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 1598 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
1599 Efl_Text_Cursor *tc = NULL; 1599 Efl_Text_Cursor_Object *tc = NULL;
1600 Eina_Bool dosel = EINA_FALSE; 1600 Eina_Bool dosel = EINA_FALSE;
1601 Eina_Bool shift; 1601 Eina_Bool shift;
1602 1602
@@ -1627,10 +1627,10 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1627 { 1627 {
1628 tc = efl_canvas_textblock_cursor_create(obj); 1628 tc = efl_canvas_textblock_cursor_create(obj);
1629 _cur_pos_copy(cur, tc); 1629 _cur_pos_copy(cur, tc);
1630 if (efl_text_cursor_compare(cur, en->sel_start) < 0) 1630 if (efl_text_cursor_object_compare(cur, en->sel_start) < 0)
1631 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1631 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
1632 else 1632 else
1633 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END); 1633 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END);
1634 _sel_extend(cur, obj, en); 1634 _sel_extend(cur, obj, en);
1635 } 1635 }
1636 else 1636 else
@@ -1640,9 +1640,9 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1640 _sel_clear(obj, en); 1640 _sel_clear(obj, en);
1641 tc = efl_canvas_textblock_cursor_create(obj); 1641 tc = efl_canvas_textblock_cursor_create(obj);
1642 _cur_pos_copy(cur, tc); 1642 _cur_pos_copy(cur, tc);
1643 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1643 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
1644 _sel_init(cur, en); 1644 _sel_init(cur, en);
1645 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END); 1645 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END);
1646 _sel_extend(cur, obj, en); 1646 _sel_extend(cur, obj, en);
1647 } 1647 }
1648 goto end; 1648 goto end;
@@ -1653,12 +1653,12 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1653 { 1653 {
1654 tc = efl_canvas_textblock_cursor_create(obj); 1654 tc = efl_canvas_textblock_cursor_create(obj);
1655 _cur_pos_copy(cur, tc); 1655 _cur_pos_copy(cur, tc);
1656 if (efl_text_cursor_compare(cur, en->sel_start) < 0) 1656 if (efl_text_cursor_object_compare(cur, en->sel_start) < 0)
1657 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1657 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1658 else 1658 else
1659 { 1659 {
1660 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1660 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1661 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT); 1661 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1662 } 1662 }
1663 _sel_extend(cur, obj, en); 1663 _sel_extend(cur, obj, en);
1664 } 1664 }
@@ -1669,10 +1669,10 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1669 _sel_clear(obj, en); 1669 _sel_clear(obj, en);
1670 tc = efl_canvas_textblock_cursor_create(obj); 1670 tc = efl_canvas_textblock_cursor_create(obj);
1671 _cur_pos_copy(cur, tc); 1671 _cur_pos_copy(cur, tc);
1672 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1672 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1673 _sel_init(cur, en); 1673 _sel_init(cur, en);
1674 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1674 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1675 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT); 1675 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1676 _sel_extend(cur, obj, en); 1676 _sel_extend(cur, obj, en);
1677 } 1677 }
1678 goto end; 1678 goto end;
@@ -1703,7 +1703,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1703{ 1703{
1704 Evas_Coord cx, cy; 1704 Evas_Coord cx, cy;
1705 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1705 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1706 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 1706 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
1707 Evas_Event_Mouse_Up *ev = event_info; 1707 Evas_Event_Mouse_Up *ev = event_info;
1708 1708
1709 if ((!ev) || (ev->button != 1)) return; 1709 if ((!ev) || (ev->button != 1)) return;
@@ -1744,10 +1744,10 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
1744{ 1744{
1745 Evas_Coord cx, cy; 1745 Evas_Coord cx, cy;
1746 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 1746 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
1747 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 1747 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
1748 Evas_Event_Mouse_Move *ev = event_info; 1748 Evas_Event_Mouse_Move *ev = event_info;
1749 Evas_Coord x, y, w, h; 1749 Evas_Coord x, y, w, h;
1750 Efl_Text_Cursor *tc; 1750 Efl_Text_Cursor_Object *tc;
1751 Eina_Bool multiline; 1751 Eina_Bool multiline;
1752 1752
1753 multiline = efl_text_multiline_get(obj); 1753 multiline = efl_text_multiline_get(obj);
@@ -1774,28 +1774,28 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
1774 1774
1775 if (multiline) 1775 if (multiline)
1776 { 1776 {
1777 efl_text_cursor_char_coord_set(cur, EINA_POSITION2D(cx, cy)); 1777 efl_text_cursor_object_char_coord_set(cur, EINA_POSITION2D(cx, cy));
1778 } 1778 }
1779 else 1779 else
1780 { 1780 {
1781 Evas_Coord lx, ly, lw, lh; 1781 Evas_Coord lx, ly, lw, lh;
1782 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 1782 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
1783 evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(cur), &lx, &ly, &lw, &lh); 1783 evas_textblock_cursor_line_geometry_get(efl_text_cursor_object_handle_get(cur), &lx, &ly, &lw, &lh);
1784 efl_text_cursor_char_coord_set(cur, EINA_POSITION2D(cx, ly + (lh / 2))); 1784 efl_text_cursor_object_char_coord_set(cur, EINA_POSITION2D(cx, ly + (lh / 2)));
1785 } 1785 }
1786 1786
1787 if (en->select_allow) 1787 if (en->select_allow)
1788 { 1788 {
1789 _sel_extend(cur, obj, en); 1789 _sel_extend(cur, obj, en);
1790 1790
1791 if (!efl_text_cursor_equal(en->sel_start, en->sel_end)) 1791 if (!efl_text_cursor_object_equal(en->sel_start, en->sel_end))
1792 _sel_enable(obj, en); 1792 _sel_enable(obj, en);
1793 } 1793 }
1794 efl_del(tc); 1794 efl_del(tc);
1795 } 1795 }
1796} 1796}
1797 1797
1798EOLIAN static Efl_Text_Cursor * 1798EOLIAN static Efl_Text_Cursor_Object *
1799_efl_ui_internal_text_interactive_efl_text_interactive_main_cursor_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd) 1799_efl_ui_internal_text_interactive_efl_text_interactive_main_cursor_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd)
1800{ 1800{
1801 return pd->main_cursor; 1801 return pd->main_cursor;
@@ -1833,9 +1833,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
1833 en->sel_start = efl_canvas_textblock_cursor_create(obj); 1833 en->sel_start = efl_canvas_textblock_cursor_create(obj);
1834 en->sel_end = efl_canvas_textblock_cursor_create(obj); 1834 en->sel_end = efl_canvas_textblock_cursor_create(obj);
1835 1835
1836 efl_event_callback_add(en->sel_start, EFL_TEXT_CURSOR_EVENT_CHANGED, 1836 efl_event_callback_add(en->sel_start, EFL_TEXT_CURSOR_OBJECT_EVENT_CHANGED,
1837 _sel_cursor_changed, obj); 1837 _sel_cursor_changed, obj);
1838 efl_event_callback_add(en->sel_end, EFL_TEXT_CURSOR_EVENT_CHANGED, 1838 efl_event_callback_add(en->sel_end, EFL_TEXT_CURSOR_OBJECT_EVENT_CHANGED,
1839 _sel_cursor_changed, obj); 1839 _sel_cursor_changed, obj);
1840 1840
1841#ifdef HAVE_ECORE_IMF 1841#ifdef HAVE_ECORE_IMF
@@ -1908,7 +1908,7 @@ _efl_ui_internal_text_interactive_efl_text_text_set(Eo *eo_obj, Efl_Ui_Internal_
1908 const char *text) 1908 const char *text)
1909{ 1909{
1910 efl_text_set(efl_super(eo_obj, MY_CLASS), text); 1910 efl_text_set(efl_super(eo_obj, MY_CLASS), text);
1911 efl_text_cursor_move(o->main_cursor, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1911 efl_text_cursor_object_move(o->main_cursor, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1912} 1912}
1913 1913
1914EOLIAN void 1914EOLIAN void
@@ -1916,7 +1916,7 @@ _efl_ui_internal_text_interactive_efl_text_markup_markup_set(Eo *eo_obj, Efl_Ui_
1916 const char *text) 1916 const char *text)
1917{ 1917{
1918 efl_text_markup_set(efl_super(eo_obj, MY_CLASS), text); 1918 efl_text_markup_set(efl_super(eo_obj, MY_CLASS), text);
1919 efl_text_cursor_move(o->main_cursor, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1919 efl_text_cursor_object_move(o->main_cursor, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1920} 1920}
1921 1921
1922EOLIAN static void 1922EOLIAN static void
@@ -1939,10 +1939,10 @@ _efl_ui_internal_text_interactive_efl_text_interactive_selection_allowed_get(con
1939} 1939}
1940 1940
1941EOLIAN static void 1941EOLIAN static void
1942_efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Text_Cursor **start, Efl_Text_Cursor **end) 1942_efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_get(const Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *pd, Efl_Text_Cursor_Object **start, Efl_Text_Cursor_Object **end)
1943{ 1943{
1944 if (efl_text_cursor_position_get(pd->sel_start) > 1944 if (efl_text_cursor_object_position_get(pd->sel_start) >
1945 efl_text_cursor_position_get(pd->sel_end)) 1945 efl_text_cursor_object_position_get(pd->sel_end))
1946 { 1946 {
1947 if (start) *start = pd->sel_end; 1947 if (start) *start = pd->sel_end;
1948 if (end) *end = pd->sel_start; 1948 if (end) *end = pd->sel_start;
@@ -1955,16 +1955,16 @@ _efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_get(con
1955} 1955}
1956 1956
1957EOLIAN static void 1957EOLIAN static void
1958_efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *start, Efl_Text_Cursor *end) 1958_efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_set(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end)
1959{ 1959{
1960 if (!efl_text_interactive_selection_allowed_get(obj)) 1960 if (!efl_text_interactive_selection_allowed_get(obj))
1961 return; 1961 return;
1962 1962
1963 int new_sel_start_pos = efl_text_cursor_position_get(start); 1963 int new_sel_start_pos = efl_text_cursor_object_position_get(start);
1964 int new_sel_end_pos = efl_text_cursor_position_get(end); 1964 int new_sel_end_pos = efl_text_cursor_object_position_get(end);
1965 1965
1966 int current_sel_start_pos = efl_text_cursor_position_get(en->sel_start); 1966 int current_sel_start_pos = efl_text_cursor_object_position_get(en->sel_start);
1967 int current_sel_end_pos = efl_text_cursor_position_get(en->sel_end); 1967 int current_sel_end_pos = efl_text_cursor_object_position_get(en->sel_end);
1968 1968
1969 Eina_Bool b_start_changed = (new_sel_start_pos == current_sel_start_pos); 1969 Eina_Bool b_start_changed = (new_sel_start_pos == current_sel_start_pos);
1970 Eina_Bool b_end_changed = (new_sel_end_pos == current_sel_end_pos); 1970 Eina_Bool b_end_changed = (new_sel_end_pos == current_sel_end_pos);
@@ -1973,8 +1973,8 @@ _efl_ui_internal_text_interactive_efl_text_interactive_selection_cursors_set(Eo
1973 return; 1973 return;
1974 1974
1975 _sel_watch_freeze(en); 1975 _sel_watch_freeze(en);
1976 efl_text_cursor_position_set(en->sel_start, new_sel_start_pos); 1976 efl_text_cursor_object_position_set(en->sel_start, new_sel_start_pos);
1977 efl_text_cursor_position_set(en->sel_end, new_sel_end_pos); 1977 efl_text_cursor_object_position_set(en->sel_end, new_sel_end_pos);
1978 _sel_watch_thaw(en); 1978 _sel_watch_thaw(en);
1979 _sel_reset(obj, en); 1979 _sel_reset(obj, en);
1980} 1980}
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index d6b7b782fd..64f1034638 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -59,7 +59,7 @@ struct _Efl_Ui_Textbox_Data
59 Mod_Api *api; // module api if supplied 59 Mod_Api *api; // module api if supplied
60 int cursor_pos; 60 int cursor_pos;
61 Elm_Scroller_Policy policy_h, policy_v; 61 Elm_Scroller_Policy policy_h, policy_v;
62 Efl_Text_Cursor *sel_handler_cursor; 62 Efl_Text_Cursor_Object *sel_handler_cursor;
63 struct 63 struct
64 { 64 {
65 Evas_Object *hover_parent; /**< hover parent object. entry is a hover parent object by default */ 65 Evas_Object *hover_parent; /**< hover parent object. entry is a hover parent object by default */
@@ -311,7 +311,7 @@ _update_selection_handler(Eo *obj)
311 Eina_Position2D off; 311 Eina_Position2D off;
312 Evas_Coord hx, hy; 312 Evas_Coord hx, hy;
313 Eina_Bool hidden = EINA_FALSE; 313 Eina_Bool hidden = EINA_FALSE;
314 Efl_Text_Cursor *sel_start, *sel_end; 314 Efl_Text_Cursor_Object *sel_start, *sel_end;
315 Eina_Rect rc_tmp; 315 Eina_Rect rc_tmp;
316 316
317 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end); 317 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
@@ -321,7 +321,7 @@ _update_selection_handler(Eo *obj)
321 321
322 //evas_object_geometry_get(sd->entry_edje, &ent_x, &ent_y, NULL, NULL); 322 //evas_object_geometry_get(sd->entry_edje, &ent_x, &ent_y, NULL, NULL);
323 323
324 rc_tmp = efl_text_cursor_geometry_get(sel_start, EFL_TEXT_CURSOR_TYPE_BEFORE); 324 rc_tmp = efl_text_cursor_object_cursor_geometry_get(sel_start, EFL_TEXT_CURSOR_TYPE_BEFORE);
325 sx = rc_tmp.x; 325 sx = rc_tmp.x;
326 sy = rc_tmp.y; 326 sy = rc_tmp.y;
327 sh = rc_tmp.h; 327 sh = rc_tmp.h;
@@ -352,7 +352,7 @@ _update_selection_handler(Eo *obj)
352 } 352 }
353 353
354 hidden = EINA_FALSE; 354 hidden = EINA_FALSE;
355 rc_tmp = efl_text_cursor_geometry_get(sel_end, EFL_TEXT_CURSOR_TYPE_BEFORE); 355 rc_tmp = efl_text_cursor_object_cursor_geometry_get(sel_end, EFL_TEXT_CURSOR_TYPE_BEFORE);
356 ex = rc_tmp.x; 356 ex = rc_tmp.x;
357 ey = rc_tmp.y; 357 ey = rc_tmp.y;
358 eh = rc_tmp.h; 358 eh = rc_tmp.h;
@@ -401,7 +401,7 @@ _selection_data_cb(Efl_Ui_Textbox *obj, void *data EINA_UNUSED, const Eina_Value
401{ 401{
402 Eina_Content *content; 402 Eina_Content *content;
403 Eina_Slice slice; 403 Eina_Slice slice;
404 Efl_Text_Cursor *cur, *start, *end; 404 Efl_Text_Cursor_Object *cur, *start, *end;
405 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; 405 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
406 406
407 if (eina_value_type_get(&value) != EINA_VALUE_TYPE_CONTENT) 407 if (eina_value_type_get(&value) != EINA_VALUE_TYPE_CONTENT)
@@ -410,19 +410,19 @@ _selection_data_cb(Efl_Ui_Textbox *obj, void *data EINA_UNUSED, const Eina_Value
410 content = eina_value_to_content(&value); 410 content = eina_value_to_content(&value);
411 slice = eina_content_data_get(content); 411 slice = eina_content_data_get(content);
412 efl_text_interactive_selection_cursors_get(obj, &start, &end); 412 efl_text_interactive_selection_cursors_get(obj, &start, &end);
413 if (!efl_text_cursor_equal(start, end)) 413 if (!efl_text_cursor_object_equal(start, end))
414 { 414 {
415 efl_text_cursor_range_delete(start, end); 415 efl_text_cursor_object_range_delete(start, end);
416 efl_text_interactive_all_unselect(obj); 416 efl_text_interactive_all_unselect(obj);
417 } 417 }
418 cur = efl_text_interactive_main_cursor_get(obj); 418 cur = efl_text_interactive_main_cursor_get(obj);
419 info.type = EFL_TEXT_CHANGE_TYPE_INSERT; 419 info.type = EFL_TEXT_CHANGE_TYPE_INSERT;
420 info.position = efl_text_cursor_position_get(cur); 420 info.position = efl_text_cursor_object_position_get(cur);
421 info.length = slice.len; 421 info.length = slice.len;
422 info.content = slice.mem; 422 info.content = slice.mem;
423 if (eina_streq(eina_content_type_get(content), "application/x-elementary-markup")) 423 if (eina_streq(eina_content_type_get(content), "application/x-elementary-markup"))
424 { 424 {
425 efl_text_cursor_markup_insert(cur, slice.mem); 425 efl_text_cursor_object_markup_insert(cur, slice.mem);
426 } 426 }
427 else if (!strncmp(eina_content_type_get(content), "image/", strlen("image/"))) 427 else if (!strncmp(eina_content_type_get(content), "image/", strlen("image/")))
428 { 428 {
@@ -430,12 +430,12 @@ _selection_data_cb(Efl_Ui_Textbox *obj, void *data EINA_UNUSED, const Eina_Value
430 eina_strbuf_append_printf(result, "<item absize=240x180 href="); 430 eina_strbuf_append_printf(result, "<item absize=240x180 href=");
431 eina_strbuf_append_slice(result, slice); 431 eina_strbuf_append_slice(result, slice);
432 eina_strbuf_append_printf(result, "></item>"); 432 eina_strbuf_append_printf(result, "></item>");
433 efl_text_cursor_markup_insert(cur, eina_strbuf_string_get(result)); 433 efl_text_cursor_object_markup_insert(cur, eina_strbuf_string_get(result));
434 eina_strbuf_free(result); 434 eina_strbuf_free(result);
435 } 435 }
436 else // TEXT 436 else // TEXT
437 { 437 {
438 efl_text_cursor_text_insert(cur, slice.mem); 438 efl_text_cursor_object_text_insert(cur, slice.mem);
439 } 439 }
440 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 440 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
441 441
@@ -649,10 +649,10 @@ _cursor_geometry_recalc(Evas_Object *obj)
649 649
650 cx = cy = cw = ch = 0; 650 cx = cy = cw = ch = 0;
651 651
652 Efl_Text_Cursor *main_cur = 652 Efl_Text_Cursor_Object *main_cur =
653 efl_text_interactive_main_cursor_get(obj); 653 efl_text_interactive_main_cursor_get(obj);
654 654
655 rc = efl_text_cursor_geometry_get(main_cur, EFL_TEXT_CURSOR_TYPE_BEFORE); 655 rc = efl_text_cursor_object_cursor_geometry_get(main_cur, EFL_TEXT_CURSOR_TYPE_BEFORE);
656 cx = rc.x; 656 cx = rc.x;
657 cy = rc.y; 657 cy = rc.y;
658 cw = rc.w; 658 cw = rc.w;
@@ -779,7 +779,7 @@ _efl_ui_textbox_efl_ui_widget_interest_region_get(const Eo *obj EINA_UNUSED, Efl
779 Eina_Rect edje, elm; 779 Eina_Rect edje, elm;
780 Eina_Rect r = {}; 780 Eina_Rect r = {};
781 781
782 r = efl_text_cursor_geometry_get( 782 r = efl_text_cursor_object_cursor_geometry_get(
783 efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_TYPE_BEFORE); 783 efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_TYPE_BEFORE);
784 784
785 if (!efl_text_multiline_get(obj)) 785 if (!efl_text_multiline_get(obj))
@@ -849,11 +849,11 @@ _selection_store(Efl_Ui_Cnp_Buffer buffer,
849 Evas_Object *obj) 849 Evas_Object *obj)
850{ 850{
851 char *sel; 851 char *sel;
852 Efl_Text_Cursor *start, *end; 852 Efl_Text_Cursor_Object *start, *end;
853 Eina_Content *content; 853 Eina_Content *content;
854 854
855 efl_text_interactive_selection_cursors_get(obj, &start, &end); 855 efl_text_interactive_selection_cursors_get(obj, &start, &end);
856 sel = efl_text_cursor_range_markup_get(start, end); 856 sel = efl_text_cursor_object_range_markup_get(start, end);
857 857
858 if ((!sel) || (!sel[0])) return; /* avoid deleting our own selection */ 858 if ((!sel) || (!sel[0])) return; /* avoid deleting our own selection */
859 859
@@ -1254,7 +1254,7 @@ _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler)
1254 EFL_UI_TEXT_DATA_GET(obj, sd); 1254 EFL_UI_TEXT_DATA_GET(obj, sd);
1255 1255
1256 pos = efl_gfx_entity_position_get(sd->text_obj); 1256 pos = efl_gfx_entity_position_get(sd->text_obj);
1257 rc = efl_text_cursor_geometry_get( 1257 rc = efl_text_cursor_object_cursor_geometry_get(
1258 efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_TYPE_BEFORE); 1258 efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_TYPE_BEFORE);
1259 cx = rc.x; 1259 cx = rc.x;
1260 cy = rc.y; 1260 cy = rc.y;
@@ -1283,8 +1283,8 @@ _start_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1283 EFL_UI_TEXT_DATA_GET(data, sd); 1283 EFL_UI_TEXT_DATA_GET(data, sd);
1284 1284
1285 int start_pos, end_pos, pos; 1285 int start_pos, end_pos, pos;
1286 Efl_Text_Cursor *sel_start, *sel_end; 1286 Efl_Text_Cursor_Object *sel_start, *sel_end;
1287 Efl_Text_Cursor *main_cur; 1287 Efl_Text_Cursor_Object *main_cur;
1288 1288
1289 Eo *text_obj = sd->text_obj; 1289 Eo *text_obj = sd->text_obj;
1290 1290
@@ -1294,8 +1294,8 @@ _start_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1294 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 1294 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
1295 main_cur = efl_text_interactive_main_cursor_get(text_obj); 1295 main_cur = efl_text_interactive_main_cursor_get(text_obj);
1296 1296
1297 start_pos = efl_text_cursor_position_get(sel_start); 1297 start_pos = efl_text_cursor_object_position_get(sel_start);
1298 end_pos = efl_text_cursor_position_get(sel_end); 1298 end_pos = efl_text_cursor_object_position_get(sel_end);
1299 1299
1300 if (start_pos <= end_pos) 1300 if (start_pos <= end_pos)
1301 { 1301 {
@@ -1307,7 +1307,7 @@ _start_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1307 pos = end_pos; 1307 pos = end_pos;
1308 sd->sel_handler_cursor = sel_end; 1308 sd->sel_handler_cursor = sel_end;
1309 } 1309 }
1310 efl_text_cursor_position_set(main_cur, pos); 1310 efl_text_cursor_object_position_set(main_cur, pos);
1311 _selection_handlers_offset_calc(data, sd->start_handler); 1311 _selection_handlers_offset_calc(data, sd->start_handler);
1312} 1312}
1313 1313
@@ -1341,11 +1341,11 @@ _start_handler_mouse_move_cb(void *data, const Efl_Event *event)
1341 cy = ev->cur.y - sd->oy - re.y; 1341 cy = ev->cur.y - sd->oy - re.y;
1342 if (cx <= 0) cx = 1; 1342 if (cx <= 0) cx = 1;
1343 1343
1344 efl_text_cursor_char_coord_set(sd->sel_handler_cursor, EINA_POSITION2D(cx, cy)); 1344 efl_text_cursor_object_char_coord_set(sd->sel_handler_cursor, EINA_POSITION2D(cx, cy));
1345 pos = efl_text_cursor_position_get(sd->sel_handler_cursor); 1345 pos = efl_text_cursor_object_position_get(sd->sel_handler_cursor);
1346 1346
1347 /* Set the main cursor. */ 1347 /* Set the main cursor. */
1348 efl_text_cursor_position_set( 1348 efl_text_cursor_object_position_set(
1349 efl_text_interactive_main_cursor_get(sd->text_obj), pos); 1349 efl_text_interactive_main_cursor_get(sd->text_obj), pos);
1350 1350
1351 efl_input_clickable_longpress_abort(data, 1); 1351 efl_input_clickable_longpress_abort(data, 1);
@@ -1357,8 +1357,8 @@ _end_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1357{ 1357{
1358 EFL_UI_TEXT_DATA_GET(data, sd); 1358 EFL_UI_TEXT_DATA_GET(data, sd);
1359 1359
1360 Efl_Text_Cursor *sel_start, *sel_end; 1360 Efl_Text_Cursor_Object *sel_start, *sel_end;
1361 Efl_Text_Cursor *main_cur; 1361 Efl_Text_Cursor_Object *main_cur;
1362 int pos, start_pos, end_pos; 1362 int pos, start_pos, end_pos;
1363 1363
1364 sd->end_handler_down = EINA_TRUE; 1364 sd->end_handler_down = EINA_TRUE;
@@ -1368,8 +1368,8 @@ _end_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1368 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 1368 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
1369 main_cur = efl_text_interactive_main_cursor_get(text_obj); 1369 main_cur = efl_text_interactive_main_cursor_get(text_obj);
1370 1370
1371 start_pos = efl_text_cursor_position_get(sel_start); 1371 start_pos = efl_text_cursor_object_position_get(sel_start);
1372 end_pos = efl_text_cursor_position_get(sel_end); 1372 end_pos = efl_text_cursor_object_position_get(sel_end);
1373 1373
1374 if (start_pos < end_pos) 1374 if (start_pos < end_pos)
1375 { 1375 {
@@ -1382,7 +1382,7 @@ _end_handler_mouse_down_cb(void *data, const Efl_Event *event EINA_UNUSED)
1382 sd->sel_handler_cursor = sel_start; 1382 sd->sel_handler_cursor = sel_start;
1383 } 1383 }
1384 1384
1385 efl_text_cursor_position_set(main_cur, pos); 1385 efl_text_cursor_object_position_set(main_cur, pos);
1386 _selection_handlers_offset_calc(data, sd->end_handler); 1386 _selection_handlers_offset_calc(data, sd->end_handler);
1387} 1387}
1388 1388
@@ -1416,10 +1416,10 @@ _end_handler_mouse_move_cb(void *data, const Efl_Event *event)
1416 cy = ev->cur.y - sd->oy - re.y; 1416 cy = ev->cur.y - sd->oy - re.y;
1417 if (cx <= 0) cx = 1; 1417 if (cx <= 0) cx = 1;
1418 1418
1419 efl_text_cursor_char_coord_set(sd->sel_handler_cursor, EINA_POSITION2D(cx, cy)); 1419 efl_text_cursor_object_char_coord_set(sd->sel_handler_cursor, EINA_POSITION2D(cx, cy));
1420 pos = efl_text_cursor_position_get(sd->sel_handler_cursor); 1420 pos = efl_text_cursor_object_position_get(sd->sel_handler_cursor);
1421 /* Set the main cursor. */ 1421 /* Set the main cursor. */
1422 efl_text_cursor_position_set(efl_text_interactive_main_cursor_get(data), pos); 1422 efl_text_cursor_object_position_set(efl_text_interactive_main_cursor_get(data), pos);
1423 efl_input_clickable_longpress_abort(data, 1); 1423 efl_input_clickable_longpress_abort(data, 1);
1424 sd->long_pressed = EINA_FALSE; 1424 sd->long_pressed = EINA_FALSE;
1425} 1425}
@@ -1707,7 +1707,7 @@ _efl_ui_textbox_efl_object_finalize(Eo *obj,
1707 _efl_ui_textbox_selection_start_clear_cb, obj); 1707 _efl_ui_textbox_selection_start_clear_cb, obj);
1708 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, 1708 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED,
1709 _efl_ui_textbox_selection_changed_cb, obj); 1709 _efl_ui_textbox_selection_changed_cb, obj);
1710 efl_event_callback_add(efl_text_interactive_main_cursor_get(sd->text_obj), EFL_TEXT_CURSOR_EVENT_CHANGED, 1710 efl_event_callback_add(efl_text_interactive_main_cursor_get(sd->text_obj), EFL_TEXT_CURSOR_OBJECT_EVENT_CHANGED,
1711 _efl_ui_textbox_cursor_changed_cb, obj); 1711 _efl_ui_textbox_cursor_changed_cb, obj);
1712 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, 1712 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
1713 _text_position_changed_cb, obj); 1713 _text_position_changed_cb, obj);
@@ -1822,12 +1822,12 @@ _efl_ui_textbox_calc_force(Eo *obj, Efl_Ui_Textbox_Data *sd)
1822static const char* 1822static const char*
1823_efl_ui_textbox_selection_get(const Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED) 1823_efl_ui_textbox_selection_get(const Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED)
1824{ 1824{
1825 Efl_Text_Cursor *start_obj, *end_obj; 1825 Efl_Text_Cursor_Object *start_obj, *end_obj;
1826 1826
1827 if ((efl_text_password_get(obj))) return NULL; 1827 if ((efl_text_password_get(obj))) return NULL;
1828 1828
1829 efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj); 1829 efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
1830 return efl_text_cursor_range_text_get(start_obj, end_obj); 1830 return efl_text_cursor_object_range_text_get(start_obj, end_obj);
1831} 1831}
1832 1832
1833EOLIAN static void 1833EOLIAN static void
@@ -1846,17 +1846,17 @@ _efl_ui_textbox_selection_handles_enabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_
1846static void 1846static void
1847_efl_ui_textbox_entry_insert(Eo *obj, Efl_Ui_Textbox_Data *sd, const char *entry) 1847_efl_ui_textbox_entry_insert(Eo *obj, Efl_Ui_Textbox_Data *sd, const char *entry)
1848{ 1848{
1849 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 1849 Efl_Text_Cursor_Object *cur_obj = efl_text_interactive_main_cursor_get(obj);
1850 efl_text_cursor_text_insert(cur_obj, entry); 1850 efl_text_cursor_object_text_insert(cur_obj, entry);
1851 sd->text_changed = EINA_TRUE; 1851 sd->text_changed = EINA_TRUE;
1852 efl_canvas_group_change(obj); 1852 efl_canvas_group_change(obj);
1853} 1853}
1854 1854
1855EOLIAN static Efl_Text_Cursor * 1855EOLIAN static Efl_Text_Cursor_Object *
1856_efl_ui_textbox_cursor_create(Eo *obj, Efl_Ui_Textbox_Data *pd) 1856_efl_ui_textbox_cursor_create(Eo *obj, Efl_Ui_Textbox_Data *pd)
1857{ 1857{
1858 Eo* cursor = efl_text_cursor_create(pd->text_obj);; 1858 Eo* cursor = efl_text_cursor_object_create(pd->text_obj);;
1859 efl_text_cursor_text_object_set(cursor, pd->text_obj, obj); 1859 efl_text_cursor_object_text_object_set(cursor, pd->text_obj, obj);
1860 return cursor; 1860 return cursor;
1861} 1861}
1862 1862
@@ -1887,31 +1887,31 @@ _efl_ui_textbox_efl_text_interactive_editable_set(Eo *obj, Efl_Ui_Textbox_Data *
1887static void 1887static void
1888_efl_ui_textbox_select_region_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, int start, int end) 1888_efl_ui_textbox_select_region_set(Eo *obj, Efl_Ui_Textbox_Data *sd EINA_UNUSED, int start, int end)
1889{ 1889{
1890 Efl_Text_Cursor *sel_start, *sel_end; 1890 Efl_Text_Cursor_Object *sel_start, *sel_end;
1891 1891
1892 if (efl_text_password_get(obj)) return; 1892 if (efl_text_password_get(obj)) return;
1893 1893
1894 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end); 1894 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
1895 1895
1896 efl_text_cursor_position_set(sel_start, start); 1896 efl_text_cursor_object_position_set(sel_start, start);
1897 efl_text_cursor_position_set(sel_end, end); 1897 efl_text_cursor_object_position_set(sel_end, end);
1898} 1898}
1899 1899
1900static void 1900static void
1901_efl_ui_textbox_select_region_get(Eo *obj, int *start, int *end) 1901_efl_ui_textbox_select_region_get(Eo *obj, int *start, int *end)
1902{ 1902{
1903 Efl_Text_Cursor *sel_start, *sel_end; 1903 Efl_Text_Cursor_Object *sel_start, *sel_end;
1904 1904
1905 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end); 1905 efl_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
1906 1906
1907 if(start) *start = efl_text_cursor_position_get(sel_start); 1907 if(start) *start = efl_text_cursor_object_position_get(sel_start);
1908 if(end) *end = efl_text_cursor_position_get(sel_end); 1908 if(end) *end = efl_text_cursor_object_position_get(sel_end);
1909} 1909}
1910 1910
1911EOLIAN static void 1911EOLIAN static void
1912_efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd) 1912_efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd)
1913{ 1913{
1914 Efl_Text_Cursor *start, *end; 1914 Efl_Text_Cursor_Object *start, *end;
1915 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 }; 1915 Efl_Text_Change_Info info = { NULL, 0, 0, 0, 0 };
1916 char *tmp; 1916 char *tmp;
1917 int end_pos, start_pos; 1917 int end_pos, start_pos;
@@ -1931,14 +1931,14 @@ _efl_ui_textbox_selection_cut(Eo *obj, Efl_Ui_Textbox_Data *sd)
1931 _selection_store(EFL_UI_CNP_BUFFER_COPY_AND_PASTE, obj); 1931 _selection_store(EFL_UI_CNP_BUFFER_COPY_AND_PASTE, obj);
1932 efl_text_interactive_selection_cursors_get(obj, &start, &end); 1932 efl_text_interactive_selection_cursors_get(obj, &start, &end);
1933 1933
1934 start_pos = efl_text_cursor_position_get(start); 1934 start_pos = efl_text_cursor_object_position_get(start);
1935 end_pos = efl_text_cursor_position_get(end); 1935 end_pos = efl_text_cursor_object_position_get(end);
1936 tmp = efl_text_cursor_range_text_get(start, end); 1936 tmp = efl_text_cursor_object_range_text_get(start, end);
1937 info.type = EFL_TEXT_CHANGE_TYPE_REMOVE; 1937 info.type = EFL_TEXT_CHANGE_TYPE_REMOVE;
1938 info.position = start_pos; 1938 info.position = start_pos;
1939 info.length = end_pos - start_pos; 1939 info.length = end_pos - start_pos;
1940 info.content = tmp; 1940 info.content = tmp;
1941 efl_text_cursor_range_delete(start, end); 1941 efl_text_cursor_object_range_delete(start, end);
1942 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info); 1942 efl_event_callback_call(obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, &info);
1943 free(tmp); 1943 free(tmp);
1944 tmp = NULL; 1944 tmp = NULL;
@@ -2220,13 +2220,13 @@ fail:
2220EOLIAN static int 2220EOLIAN static int
2221_efl_ui_textbox_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED) 2221_efl_ui_textbox_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED)
2222{ 2222{
2223 return efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(obj)); 2223 return efl_text_cursor_object_position_get(efl_text_interactive_main_cursor_get(obj));
2224} 2224}
2225 2225
2226EOLIAN static Eina_Bool 2226EOLIAN static Eina_Bool
2227_efl_ui_textbox_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int offset) 2227_efl_ui_textbox_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int offset)
2228{ 2228{
2229 efl_text_cursor_position_set(efl_text_interactive_main_cursor_get(obj), offset); 2229 efl_text_cursor_object_position_set(efl_text_interactive_main_cursor_get(obj), offset);
2230 return EINA_TRUE; 2230 return EINA_TRUE;
2231} 2231}
2232 2232
@@ -2410,7 +2410,7 @@ _textblock_node_format_to_atspi_text_attr(Efl_Text_Attribute_Handle *annotation)
2410EOLIAN static Eina_Bool 2410EOLIAN static Eina_Bool
2411_efl_ui_textbox_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value) 2411_efl_ui_textbox_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, const char *attr_name EINA_UNUSED, int *start_offset, int *end_offset, char **value)
2412{ 2412{
2413 Efl_Text_Cursor *cur1, *cur2; 2413 Efl_Text_Cursor_Object *cur1, *cur2;
2414 Efl_Access_Text_Attribute *attr; 2414 Efl_Access_Text_Attribute *attr;
2415 Eina_Iterator *annotations; 2415 Eina_Iterator *annotations;
2416 Efl_Text_Attribute_Handle *an; 2416 Efl_Text_Attribute_Handle *an;
@@ -2426,8 +2426,8 @@ _efl_ui_textbox_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Textbox_Data
2426 return EINA_FALSE; 2426 return EINA_FALSE;
2427 } 2427 }
2428 2428
2429 efl_text_cursor_position_set(cur1, *start_offset); 2429 efl_text_cursor_object_position_set(cur1, *start_offset);
2430 efl_text_cursor_position_set(cur2, *end_offset); 2430 efl_text_cursor_object_position_set(cur2, *end_offset);
2431 2431
2432 annotations = efl_text_formatter_range_attributes_get(cur1, cur2); 2432 annotations = efl_text_formatter_range_attributes_get(cur1, cur2);
2433 2433
@@ -2456,7 +2456,7 @@ _efl_ui_textbox_efl_access_text_attribute_get(const Eo *obj, Efl_Ui_Textbox_Data
2456EOLIAN static Eina_List* 2456EOLIAN static Eina_List*
2457_efl_ui_textbox_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int *start_offset, int *end_offset) 2457_efl_ui_textbox_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Textbox_Data *pd EINA_UNUSED, int *start_offset, int *end_offset)
2458{ 2458{
2459 Efl_Text_Cursor *cur1, *cur2; 2459 Efl_Text_Cursor_Object *cur1, *cur2;
2460 Eina_List *ret = NULL; 2460 Eina_List *ret = NULL;
2461 Efl_Access_Text_Attribute *attr; 2461 Efl_Access_Text_Attribute *attr;
2462 Eina_Iterator *annotations; 2462 Eina_Iterator *annotations;
@@ -2472,8 +2472,8 @@ _efl_ui_textbox_efl_access_text_text_attributes_get(const Eo *obj, Efl_Ui_Textbo
2472 return NULL; 2472 return NULL;
2473 } 2473 }
2474 2474
2475 efl_text_cursor_position_set(cur1, *start_offset); 2475 efl_text_cursor_object_position_set(cur1, *start_offset);
2476 efl_text_cursor_position_set(cur2, *end_offset); 2476 efl_text_cursor_object_position_set(cur2, *end_offset);
2477 2477
2478 annotations = efl_text_formatter_range_attributes_get(cur1, cur2); 2478 annotations = efl_text_formatter_range_attributes_get(cur1, cur2);
2479 2479
@@ -2498,7 +2498,7 @@ _efl_ui_textbox_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Tex
2498{ 2498{
2499 Eina_List *ret = NULL; 2499 Eina_List *ret = NULL;
2500 Efl_Access_Text_Attribute *attr; 2500 Efl_Access_Text_Attribute *attr;
2501 Efl_Text_Cursor *start, *end; 2501 Efl_Text_Cursor_Object *start, *end;
2502 Eina_Iterator *annotations; 2502 Eina_Iterator *annotations;
2503 Efl_Text_Attribute_Handle *an; 2503 Efl_Text_Attribute_Handle *an;
2504 2504
@@ -2507,8 +2507,8 @@ _efl_ui_textbox_efl_access_text_default_attributes_get(const Eo *obj, Efl_Ui_Tex
2507 start = efl_ui_textbox_cursor_create(mobj); 2507 start = efl_ui_textbox_cursor_create(mobj);
2508 end = efl_ui_textbox_cursor_create(mobj); 2508 end = efl_ui_textbox_cursor_create(mobj);
2509 2509
2510 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 2510 efl_text_cursor_object_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
2511 efl_text_cursor_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 2511 efl_text_cursor_object_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
2512 2512
2513 annotations = efl_text_formatter_range_attributes_get(start, end); 2513 annotations = efl_text_formatter_range_attributes_get(start, end);
2514 2514
@@ -2533,8 +2533,8 @@ _efl_ui_textbox_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Textbo
2533EOLIAN static Eina_Bool 2533EOLIAN static Eina_Bool
2534_efl_ui_textbox_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Textbox_Data *pd, const char *string, int position) 2534_efl_ui_textbox_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Textbox_Data *pd, const char *string, int position)
2535{ 2535{
2536 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 2536 Efl_Text_Cursor_Object *cur_obj = efl_text_interactive_main_cursor_get(obj);
2537 efl_text_cursor_position_set(cur_obj, position); 2537 efl_text_cursor_object_position_set(cur_obj, position);
2538 _efl_ui_textbox_entry_insert(obj, pd, string); 2538 _efl_ui_textbox_entry_insert(obj, pd, string);
2539 2539
2540 return EINA_TRUE; 2540 return EINA_TRUE;
@@ -2583,8 +2583,8 @@ _efl_ui_textbox_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Textbox_Data *pd
2583EOLIAN static Eina_Bool 2583EOLIAN static Eina_Bool
2584_efl_ui_textbox_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int position) 2584_efl_ui_textbox_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Textbox_Data *_pd EINA_UNUSED, int position)
2585{ 2585{
2586 Efl_Text_Cursor *cur_obj = efl_text_interactive_main_cursor_get(obj); 2586 Efl_Text_Cursor_Object *cur_obj = efl_text_interactive_main_cursor_get(obj);
2587 efl_text_cursor_position_set(cur_obj, position); 2587 efl_text_cursor_object_position_set(cur_obj, position);
2588 efl_ui_textbox_selection_paste(obj); 2588 efl_ui_textbox_selection_paste(obj);
2589 return EINA_TRUE; 2589 return EINA_TRUE;
2590} 2590}
@@ -2696,8 +2696,8 @@ _update_text_cursors(Eo *obj)
2696 2696
2697 xx = yy = ww = hh = -1; 2697 xx = yy = ww = hh = -1;
2698 off =_decoration_calc_offset(sd); 2698 off =_decoration_calc_offset(sd);
2699 rc_tmp1 = efl_text_cursor_geometry_get(efl_text_interactive_main_cursor_get(text_obj), EFL_TEXT_CURSOR_TYPE_BEFORE); 2699 rc_tmp1 = efl_text_cursor_object_cursor_geometry_get(efl_text_interactive_main_cursor_get(text_obj), EFL_TEXT_CURSOR_TYPE_BEFORE);
2700 bidi_cursor = efl_text_cursor_lower_cursor_geometry_get(efl_text_interactive_main_cursor_get(text_obj), &rc_tmp2); 2700 bidi_cursor = efl_text_cursor_object_lower_cursor_geometry_get(efl_text_interactive_main_cursor_get(text_obj), &rc_tmp2);
2701 xx = rc_tmp1.x; 2701 xx = rc_tmp1.x;
2702 yy = rc_tmp1.y; 2702 yy = rc_tmp1.y;
2703 ww = rc_tmp1.w; 2703 ww = rc_tmp1.w;
@@ -2747,7 +2747,7 @@ static void
2747_update_text_selection(Eo *obj, Eo *text_obj) 2747_update_text_selection(Eo *obj, Eo *text_obj)
2748{ 2748{
2749 Eina_Position2D off; 2749 Eina_Position2D off;
2750 Efl_Text_Cursor *sel_start, *sel_end; 2750 Efl_Text_Cursor_Object *sel_start, *sel_end;
2751 2751
2752 Eina_List *l; 2752 Eina_List *l;
2753 Eina_Iterator *range; 2753 Eina_Iterator *range;
@@ -2763,7 +2763,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
2763 2763
2764 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 2764 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
2765 2765
2766 range = efl_text_cursor_range_geometry_get(sel_start, sel_end); 2766 range = efl_text_cursor_object_range_geometry_get(sel_start, sel_end);
2767 2767
2768 l = sd->sel; 2768 l = sd->sel;
2769 EINA_ITERATOR_FOREACH(range, r) 2769 EINA_ITERATOR_FOREACH(range, r)
@@ -2913,7 +2913,7 @@ _anchors_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
2913 Evas_Object *smart, *clip; 2913 Evas_Object *smart, *clip;
2914 Eina_Iterator *it; 2914 Eina_Iterator *it;
2915 Eina_Position2D off; 2915 Eina_Position2D off;
2916 Efl_Text_Cursor *start, *end; 2916 Efl_Text_Cursor_Object *start, *end;
2917 Efl_Text_Attribute_Handle *an; 2917 Efl_Text_Attribute_Handle *an;
2918 Eina_List *i, *ii; 2918 Eina_List *i, *ii;
2919 Anchor *anc; 2919 Anchor *anc;
@@ -2927,8 +2927,8 @@ _anchors_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
2927 end = efl_canvas_textblock_cursor_create(sd->text_obj); 2927 end = efl_canvas_textblock_cursor_create(sd->text_obj);
2928 2928
2929 /* Retrieve all annotations in the text. */ 2929 /* Retrieve all annotations in the text. */
2930 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 2930 efl_text_cursor_object_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
2931 efl_text_cursor_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 2931 efl_text_cursor_object_move(end, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
2932 2932
2933 it = efl_text_formatter_range_attributes_get(start, end); 2933 it = efl_text_formatter_range_attributes_get(start, end);
2934 efl_del(start); 2934 efl_del(start);
@@ -2988,7 +2988,7 @@ _anchors_update(Eo *obj, Efl_Ui_Textbox_Data *sd)
2988 end = efl_ui_textbox_cursor_create(obj); 2988 end = efl_ui_textbox_cursor_create(obj);
2989 efl_text_formatter_attribute_cursors_get(anc->annotation, start, end); 2989 efl_text_formatter_attribute_cursors_get(anc->annotation, start, end);
2990 2990
2991 range = efl_text_cursor_range_geometry_get(start, end); 2991 range = efl_text_cursor_object_range_geometry_get(start, end);
2992 count = eina_list_count(eina_iterator_container_get(range)); 2992 count = eina_list_count(eina_iterator_container_get(range));
2993 2993
2994 // Add additional rectangles if needed 2994 // Add additional rectangles if needed
diff --git a/src/lib/elementary/efl_ui_textbox.eo b/src/lib/elementary/efl_ui_textbox.eo
index 4a9456ffb5..304a6e82ee 100644
--- a/src/lib/elementary/efl_ui_textbox.eo
+++ b/src/lib/elementary/efl_ui_textbox.eo
@@ -83,7 +83,7 @@ class Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
83 } 83 }
84 cursor_create { 84 cursor_create {
85 [[Creates and returns a new cursor for the text.]] 85 [[Creates and returns a new cursor for the text.]]
86 return: Efl.Text.Cursor @move; [[Text cursor.]] 86 return: Efl.Text_Cursor.Object @move; [[Text cursor.]]
87 } 87 }
88 selection_copy { 88 selection_copy {
89 [[This executes a "copy" action on the selected text in the widget.]] 89 [[This executes a "copy" action on the selected text in the widget.]]
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index ff0f35e102..abc442aa25 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -1315,30 +1315,30 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
1315 1315
1316 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1316 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1317 { 1317 {
1318 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 1318 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
1319 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 1319 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
1320 efl_text_cursor_position_set(sel1, start); 1320 efl_text_cursor_object_position_set(sel1, start);
1321 efl_text_cursor_position_set(sel2, start); 1321 efl_text_cursor_object_position_set(sel2, start);
1322 1322
1323 switch(gran) 1323 switch(gran)
1324 { 1324 {
1325 case EFL_ACCESS_TEXT_GRANULARITY_CHAR: 1325 case EFL_ACCESS_TEXT_GRANULARITY_CHAR:
1326 efl_text_cursor_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT); 1326 efl_text_cursor_object_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT);
1327 break; 1327 break;
1328 1328
1329 case EFL_ACCESS_TEXT_GRANULARITY_WORD: 1329 case EFL_ACCESS_TEXT_GRANULARITY_WORD:
1330 efl_text_cursor_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1330 efl_text_cursor_object_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1331 efl_text_cursor_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1331 efl_text_cursor_object_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
1332 break; 1332 break;
1333 1333
1334 case EFL_ACCESS_TEXT_GRANULARITY_LINE: 1334 case EFL_ACCESS_TEXT_GRANULARITY_LINE:
1335 efl_text_cursor_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1335 efl_text_cursor_object_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
1336 efl_text_cursor_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END); 1336 efl_text_cursor_object_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END);
1337 break; 1337 break;
1338 1338
1339 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH: 1339 case EFL_ACCESS_TEXT_GRANULARITY_PARAGRAPH:
1340 efl_text_cursor_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START); 1340 efl_text_cursor_object_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START);
1341 efl_text_cursor_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END); 1341 efl_text_cursor_object_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END);
1342 break; 1342 break;
1343 1343
1344 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE: /* this one is not supported by efl */ 1344 case EFL_ACCESS_TEXT_GRANULARITY_SENTENCE: /* this one is not supported by efl */
@@ -1348,9 +1348,9 @@ _text_string_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbus_M
1348 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Granularity not suported."); 1348 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Granularity not suported.");
1349 } 1349 }
1350 1350
1351 str = efl_text_cursor_range_text_get(sel1, sel2); 1351 str = efl_text_cursor_object_range_text_get(sel1, sel2);
1352 start = efl_text_cursor_position_get(sel1); 1352 start = efl_text_cursor_object_position_get(sel1);
1353 end = efl_text_cursor_position_get(sel2); 1353 end = efl_text_cursor_object_position_get(sel2);
1354 1354
1355 efl_del(sel1); 1355 efl_del(sel1);
1356 efl_del(sel2); 1356 efl_del(sel2);
@@ -1392,11 +1392,11 @@ _text_text_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
1392 1392
1393 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1393 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1394 { 1394 {
1395 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 1395 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
1396 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 1396 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
1397 efl_text_cursor_position_set(sel1, start); 1397 efl_text_cursor_object_position_set(sel1, start);
1398 efl_text_cursor_position_set(sel2, end); 1398 efl_text_cursor_object_position_set(sel2, end);
1399 str = efl_text_cursor_range_text_get(sel1, sel2); 1399 str = efl_text_cursor_object_range_text_get(sel1, sel2);
1400 efl_del(sel1); 1400 efl_del(sel1);
1401 efl_del(sel2); 1401 efl_del(sel2);
1402 } 1402 }
@@ -1438,8 +1438,8 @@ _text_caret_offset_set(const Eldbus_Service_Interface *iface, const Eldbus_Messa
1438 1438
1439 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1439 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1440 { 1440 {
1441 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 1441 Efl_Text_Cursor_Object *cur = efl_text_interactive_main_cursor_get(obj);
1442 efl_text_cursor_position_set(cur, offset); 1442 efl_text_cursor_object_position_set(cur, offset);
1443 res = EINA_TRUE; 1443 res = EINA_TRUE;
1444 } 1444 }
1445 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 1445 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
@@ -1476,9 +1476,9 @@ _text_character_at_offset_get(const Eldbus_Service_Interface *iface, const Eldbu
1476 1476
1477 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1477 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1478 { 1478 {
1479 Efl_Text_Cursor *cur = efl_ui_textbox_cursor_create(obj); 1479 Efl_Text_Cursor_Object *cur = efl_ui_textbox_cursor_create(obj);
1480 efl_text_cursor_position_set(cur, offset); 1480 efl_text_cursor_object_position_set(cur, offset);
1481 res = efl_text_cursor_content_get(cur); 1481 res = efl_text_cursor_object_content_get(cur);
1482 efl_del(cur); 1482 efl_del(cur);
1483 } 1483 }
1484 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 1484 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
@@ -1537,11 +1537,11 @@ _text_attribute_value_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1537 1537
1538 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1538 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1539 { 1539 {
1540 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 1540 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
1541 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 1541 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
1542 end = start+1; 1542 end = start+1;
1543 efl_text_cursor_position_set(sel1, start); 1543 efl_text_cursor_object_position_set(sel1, start);
1544 efl_text_cursor_position_set(sel2, end); 1544 efl_text_cursor_object_position_set(sel2, end);
1545 annotations = efl_text_formatter_range_attributes_get(sel1, sel2); 1545 annotations = efl_text_formatter_range_attributes_get(sel1, sel2);
1546 1546
1547 if (annotations) 1547 if (annotations)
@@ -1610,12 +1610,12 @@ _text_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1610 { 1610 {
1611 Eina_Iterator *annotations; 1611 Eina_Iterator *annotations;
1612 Efl_Text_Attribute_Handle *an; 1612 Efl_Text_Attribute_Handle *an;
1613 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 1613 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
1614 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 1614 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
1615 1615
1616 end = start+1; 1616 end = start+1;
1617 efl_text_cursor_position_set(sel1, start); 1617 efl_text_cursor_object_position_set(sel1, start);
1618 efl_text_cursor_position_set(sel2, end); 1618 efl_text_cursor_object_position_set(sel2, end);
1619 annotations = efl_text_formatter_range_attributes_get(sel1, sel2); 1619 annotations = efl_text_formatter_range_attributes_get(sel1, sel2);
1620 1620
1621 efl_del(sel1); 1621 efl_del(sel1);
@@ -1682,11 +1682,11 @@ _text_default_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus
1682 { 1682 {
1683 Eina_Iterator *annotations; 1683 Eina_Iterator *annotations;
1684 Efl_Text_Attribute_Handle *an; 1684 Efl_Text_Attribute_Handle *an;
1685 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 1685 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
1686 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 1686 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
1687 1687
1688 efl_text_cursor_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 1688 efl_text_cursor_object_move(sel1, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
1689 efl_text_cursor_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1689 efl_text_cursor_object_move(sel2, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1690 annotations = efl_text_formatter_range_attributes_get(sel1, sel2); 1690 annotations = efl_text_formatter_range_attributes_get(sel1, sel2);
1691 1691
1692 EINA_ITERATOR_FOREACH(annotations, an) 1692 EINA_ITERATOR_FOREACH(annotations, an)
@@ -1800,9 +1800,9 @@ _text_character_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_
1800 1800
1801 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1801 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1802 { 1802 {
1803 Efl_Text_Cursor *cur = efl_ui_textbox_cursor_create(obj); 1803 Efl_Text_Cursor_Object *cur = efl_ui_textbox_cursor_create(obj);
1804 efl_text_cursor_position_set(cur, offset); 1804 efl_text_cursor_object_position_set(cur, offset);
1805 rect = efl_text_cursor_geometry_get(cur, EFL_TEXT_CURSOR_TYPE_UNDER); 1805 rect = efl_text_cursor_object_cursor_geometry_get(cur, EFL_TEXT_CURSOR_TYPE_UNDER);
1806 efl_del(cur); 1806 efl_del(cur);
1807 rect = _text_interactive_get_pos(obj, rect, screen_coords); 1807 rect = _text_interactive_get_pos(obj, rect, screen_coords);
1808 res = rect.w != 0 ? EINA_TRUE : EINA_FALSE; 1808 res = rect.w != 0 ? EINA_TRUE : EINA_FALSE;
@@ -1860,9 +1860,9 @@ _text_offset_at_point_get(const Eldbus_Service_Interface *iface, const Eldbus_Me
1860 x -= r_obj.x - r_win.x; 1860 x -= r_obj.x - r_win.x;
1861 y -= r_obj.y - r_win.y; 1861 y -= r_obj.y - r_win.y;
1862 } 1862 }
1863 Efl_Text_Cursor *cur = efl_ui_textbox_cursor_create(obj); 1863 Efl_Text_Cursor_Object *cur = efl_ui_textbox_cursor_create(obj);
1864 efl_text_cursor_char_coord_set(cur, EINA_POSITION2D(x,y)); 1864 efl_text_cursor_object_char_coord_set(cur, EINA_POSITION2D(x,y));
1865 offset = efl_text_cursor_position_get(cur); 1865 offset = efl_text_cursor_object_position_get(cur);
1866 efl_del(cur); 1866 efl_del(cur);
1867 } 1867 }
1868 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 1868 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
@@ -1920,10 +1920,10 @@ _text_selection_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1920 { 1920 {
1921 if (sel_num == 0) 1921 if (sel_num == 0)
1922 { 1922 {
1923 Efl_Text_Cursor *sel1, *sel2; 1923 Efl_Text_Cursor_Object *sel1, *sel2;
1924 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2); 1924 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2);
1925 start = efl_text_cursor_position_get(sel1); 1925 start = efl_text_cursor_object_position_get(sel1);
1926 end = efl_text_cursor_position_get(sel2); 1926 end = efl_text_cursor_object_position_get(sel2);
1927 } 1927 }
1928 } 1928 }
1929 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 1929 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
@@ -1959,10 +1959,10 @@ _text_selection_add(const Eldbus_Service_Interface *iface, const Eldbus_Message
1959 1959
1960 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 1960 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
1961 { 1961 {
1962 Efl_Text_Cursor *sel1, *sel2; 1962 Efl_Text_Cursor_Object *sel1, *sel2;
1963 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2); 1963 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2);
1964 efl_text_cursor_position_set(sel1, start); 1964 efl_text_cursor_object_position_set(sel1, start);
1965 efl_text_cursor_position_set(sel2, end); 1965 efl_text_cursor_object_position_set(sel2, end);
1966 res = EINA_TRUE; 1966 res = EINA_TRUE;
1967 } 1967 }
1968 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 1968 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
@@ -2000,9 +2000,9 @@ _text_selection_remove(const Eldbus_Service_Interface *iface, const Eldbus_Messa
2000 { 2000 {
2001 if (sel_num == 0) 2001 if (sel_num == 0)
2002 { 2002 {
2003 Efl_Text_Cursor *sel1, *sel2; 2003 Efl_Text_Cursor_Object *sel1, *sel2;
2004 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2); 2004 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2);
2005 efl_text_cursor_range_delete(sel1, sel2); 2005 efl_text_cursor_object_range_delete(sel1, sel2);
2006 res = EINA_TRUE; 2006 res = EINA_TRUE;
2007 } 2007 }
2008 } 2008 }
@@ -2041,10 +2041,10 @@ _text_selection_set(const Eldbus_Service_Interface *iface, const Eldbus_Message
2041 { 2041 {
2042 if (sel_num == 0) 2042 if (sel_num == 0)
2043 { 2043 {
2044 Efl_Text_Cursor *sel1, *sel2; 2044 Efl_Text_Cursor_Object *sel1, *sel2;
2045 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2); 2045 efl_text_interactive_selection_cursors_get(obj, &sel1, &sel2);
2046 efl_text_cursor_position_set(sel1, start); 2046 efl_text_cursor_object_position_set(sel1, start);
2047 efl_text_cursor_position_set(sel2, end); 2047 efl_text_cursor_object_position_set(sel2, end);
2048 res = EINA_TRUE; 2048 res = EINA_TRUE;
2049 } 2049 }
2050 } 2050 }
@@ -2086,11 +2086,11 @@ _text_range_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Mess
2086 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE)) 2086 if (efl_isa(obj, EFL_TEXT_INTERACTIVE_INTERFACE))
2087 { 2087 {
2088 Eina_Rectangle *r; 2088 Eina_Rectangle *r;
2089 Efl_Text_Cursor *sel1 = efl_ui_textbox_cursor_create(obj); 2089 Efl_Text_Cursor_Object *sel1 = efl_ui_textbox_cursor_create(obj);
2090 Efl_Text_Cursor *sel2 = efl_ui_textbox_cursor_create(obj); 2090 Efl_Text_Cursor_Object *sel2 = efl_ui_textbox_cursor_create(obj);
2091 efl_text_cursor_position_set(sel1, start); 2091 efl_text_cursor_object_position_set(sel1, start);
2092 efl_text_cursor_position_set(sel2, end); 2092 efl_text_cursor_object_position_set(sel2, end);
2093 Eina_Iterator *range = efl_text_cursor_range_precise_geometry_get(sel1, sel2); 2093 Eina_Iterator *range = efl_text_cursor_object_range_precise_geometry_get(sel1, sel2);
2094 2094
2095 /* This rect represent coordinates x1, y1, x2, y2 (not x,y,w,h). 2095 /* This rect represent coordinates x1, y1, x2, y2 (not x,y,w,h).
2096 * In this way we bypass corner cases 2096 * In this way we bypass corner cases
@@ -2713,16 +2713,16 @@ _text_properties_get(const Eldbus_Service_Interface *interface, const char *prop
2713 { 2713 {
2714 if (checkCharacterCount) 2714 if (checkCharacterCount)
2715 { 2715 {
2716 Efl_Text_Cursor *cur = efl_ui_textbox_cursor_create(obj); 2716 Efl_Text_Cursor_Object *cur = efl_ui_textbox_cursor_create(obj);
2717 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 2717 efl_text_cursor_object_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
2718 result = efl_text_cursor_position_get(cur); 2718 result = efl_text_cursor_object_position_get(cur);
2719 efl_del(cur); 2719 efl_del(cur);
2720 } 2720 }
2721 2721
2722 if (checkCarretOffset) 2722 if (checkCarretOffset)
2723 { 2723 {
2724 Efl_Text_Cursor *main_cur = efl_text_interactive_main_cursor_get(obj); 2724 Efl_Text_Cursor_Object *main_cur = efl_text_interactive_main_cursor_get(obj);
2725 result = efl_text_cursor_position_get(main_cur); 2725 result = efl_text_cursor_object_position_get(main_cur);
2726 } 2726 }
2727 } 2727 }
2728 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE)) 2728 else if (efl_isa(obj, EFL_ACCESS_TEXT_INTERFACE))
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index 55534b17dc..e54773040b 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -83,7 +83,7 @@ extern "C" {
83#include <canvas/efl_canvas_scene3d.eo.h> 83#include <canvas/efl_canvas_scene3d.eo.h>
84*/ 84*/
85#include <canvas/efl_canvas_snapshot.eo.h> 85#include <canvas/efl_canvas_snapshot.eo.h>
86#include <canvas/efl_text_cursor.eo.h> 86#include <canvas/efl_text_cursor_object.eo.h>
87#include <canvas/efl_text_formatter.eo.h> 87#include <canvas/efl_text_formatter.eo.h>
88#include <canvas/efl_canvas_textblock.eo.h> 88#include <canvas/efl_canvas_textblock.eo.h>
89#include <canvas/efl_canvas_textblock_factory.eo.h> 89#include <canvas/efl_canvas_textblock_factory.eo.h>
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index aefbe144f7..bd62df03ab 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -34,7 +34,7 @@ struct _Efl_Canvas_Object_Animation_Event
34 * 34 *
35 * @{ 35 * @{
36 */ 36 */
37#include "canvas/efl_text_cursor.eo.h" 37#include "canvas/efl_text_cursor_object.eo.h"
38#include "canvas/efl_text_formatter.eo.h" 38#include "canvas/efl_text_formatter.eo.h"
39#include "canvas/efl_canvas_textblock.eo.h" 39#include "canvas/efl_canvas_textblock.eo.h"
40#include "canvas/efl_canvas_textblock_factory.eo.h" 40#include "canvas/efl_canvas_textblock_factory.eo.h"
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 4282488644..7fa7021e50 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -323,8 +323,8 @@ EAPI Eina_Bool evas_textblock_cursor_at_cluster_as_single_glyph(Evas_Textblock_C
323 323
324/*Attribute Factory Internal function*/ 324/*Attribute Factory Internal function*/
325EAPI const char * efl_text_formatter_attribute_get(Efl_Text_Attribute_Handle *annotation); 325EAPI const char * efl_text_formatter_attribute_get(Efl_Text_Attribute_Handle *annotation);
326EAPI Eina_Iterator * efl_text_formatter_range_attributes_get(const Efl_Text_Cursor *start, const Efl_Text_Cursor *end); 326EAPI Eina_Iterator * efl_text_formatter_range_attributes_get(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end);
327EAPI void efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor *start, Efl_Text_Cursor *end); 327EAPI void efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end);
328EAPI void efl_text_formatter_remove(Efl_Text_Attribute_Handle *annotation); 328EAPI void efl_text_formatter_remove(Efl_Text_Attribute_Handle *annotation);
329EAPI Eina_Bool efl_text_formatter_attribute_is_item(Efl_Text_Attribute_Handle *annotation); 329EAPI Eina_Bool efl_text_formatter_attribute_is_item(Efl_Text_Attribute_Handle *annotation);
330EAPI Eina_Bool efl_text_formatter_item_geometry_get(const Efl_Text_Attribute_Handle *annotation, int *x, int *y, int *w, int *h); 330EAPI Eina_Bool efl_text_formatter_item_geometry_get(const Efl_Text_Attribute_Handle *annotation, int *x, int *y, int *w, int *h);
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index ca3d218e34..2be31b7e16 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -29,7 +29,7 @@ class Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
29 [[Creates a new cursor and adds it to the text object. 29 [[Creates a new cursor and adds it to the text object.
30 This cursor can be used to manipulate and iterate the content of the text object. 30 This cursor can be used to manipulate and iterate the content of the text object.
31 ]] 31 ]]
32 return: Efl.Text.Cursor @move; [[The created text cursor.]] 32 return: Efl.Text_Cursor.Object @move; [[The created text cursor.]]
33 } 33 }
34 visible_range_get { 34 visible_range_get {
35 [[Returns the currently visible range. 35 [[Returns the currently visible range.
@@ -40,8 +40,8 @@ class Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
40 ]] 40 ]]
41 return: bool; [[$true on success.]] 41 return: bool; [[$true on success.]]
42 params { 42 params {
43 @in start: Efl.Text.Cursor; [[Range start position.]] 43 @in start: Efl.Text_Cursor.Object; [[Range start position.]]
44 @in end: Efl.Text.Cursor; [[Range end position.]] 44 @in end: Efl.Text_Cursor.Object; [[Range end position.]]
45 } 45 }
46 } 46 }
47 @property style_insets { 47 @property style_insets {
@@ -73,7 +73,7 @@ class Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
73 @property newline_as_paragraph_separator { 73 @property newline_as_paragraph_separator {
74 [[When $true, the newline character will behave as a paragraph separator. 74 [[When $true, the newline character will behave as a paragraph separator.
75 Paragraph separator equal U+2029, and new line equal U+000A. 75 Paragraph separator equal U+2029, and new line equal U+000A.
76 This will effect a lot of text behaviour like @Efl.Text.Cursor.move method. 76 This will effect a lot of text behaviour like @Efl.Text_Cursor.Object.move method.
77 ]] 77 ]]
78 set {} 78 set {}
79 get {} 79 get {}
diff --git a/src/lib/evas/canvas/efl_canvas_textblock_internal.h b/src/lib/evas/canvas/efl_canvas_textblock_internal.h
index eb137455ea..98bc7f6ac6 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock_internal.h
+++ b/src/lib/evas/canvas/efl_canvas_textblock_internal.h
@@ -290,7 +290,7 @@ _evas_textblock_relayout_if_needed(Evas_Object *o);
290 * @param canvas_text_obj the canvas text object, where cursor methods will take effect. 290 * @param canvas_text_obj the canvas text object, where cursor methods will take effect.
291 * @param text_obj the text_object that user can get using cursor text_object property. 291 * @param text_obj the text_object that user can get using cursor text_object property.
292 */ 292 */
293EAPI void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj); 293EAPI void efl_text_cursor_object_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj);
294 294
295 295
296/** 296/**
@@ -298,7 +298,7 @@ EAPI void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *t
298 * 298 *
299 * @param parent the parent of the cursor object. 299 * @param parent the parent of the cursor object.
300 */ 300 */
301EAPI Eo* efl_text_cursor_create(Eo *parent); 301EAPI Eo* efl_text_cursor_object_create(Eo *parent);
302 302
303 303
304/** 304/**
@@ -307,7 +307,7 @@ EAPI Eo* efl_text_cursor_create(Eo *parent);
307 * @param obj the cursor object. 307 * @param obj the cursor object.
308 * @param handle the text cursor handle. 308 * @param handle the text cursor handle.
309 */ 309 */
310EAPI void efl_text_cursor_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle); 310EAPI void efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle);
311 311
312/** 312/**
313 * Internally gets cursor handle(legacy textblock cursor) from cursor object. 313 * Internally gets cursor handle(legacy textblock cursor) from cursor object.
@@ -315,7 +315,7 @@ EAPI void efl_text_cursor_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle);
315 * @param obj the cursor object. 315 * @param obj the cursor object.
316 * @return the internal text cursor handle. 316 * @return the internal text cursor handle.
317 */ 317 */
318EAPI Efl_Text_Cursor_Handle *efl_text_cursor_handle_get(const Eo *obj); 318EAPI Efl_Text_Cursor_Handle *efl_text_cursor_object_handle_get(const Eo *obj);
319 319
320#undef EAPI 320#undef EAPI
321#define EAPI 321#define EAPI
diff --git a/src/lib/evas/canvas/efl_text_cursor.c b/src/lib/evas/canvas/efl_text_cursor_object.c
index c1e344136d..e15f12898f 100644
--- a/src/lib/evas/canvas/efl_text_cursor.c
+++ b/src/lib/evas/canvas/efl_text_cursor_object.c
@@ -3,14 +3,14 @@
3#include "efl_canvas_textblock_internal.h" 3#include "efl_canvas_textblock_internal.h"
4#include "eo_internal.h" 4#include "eo_internal.h"
5 5
6#define MY_CLASS EFL_TEXT_CURSOR_CLASS 6#define MY_CLASS EFL_TEXT_CURSOR_OBJECT_CLASS
7#define MY_CLASS_NAME "Efl.Text.Cursor" 7#define MY_CLASS_NAME "Efl.Text.Cursor"
8 8
9typedef struct 9typedef struct
10{ 10{
11 Efl_Text_Cursor_Handle *handle; 11 Efl_Text_Cursor_Handle *handle;
12 Efl_Canvas_Object *text_obj; 12 Efl_Canvas_Object *text_obj;
13} Efl_Text_Cursor_Data; 13} Efl_Text_Cursor_Object_Data;
14 14
15struct _Evas_Textblock_Selection_Iterator 15struct _Evas_Textblock_Selection_Iterator
16{ 16{
@@ -21,22 +21,22 @@ struct _Evas_Textblock_Selection_Iterator
21 21
22typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Iterator; 22typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Iterator;
23 23
24EFL_CLASS_SIMPLE_CLASS(efl_text_cursor, "Efl.Text.Cursor", EFL_TEXT_CURSOR_CLASS) 24EFL_CLASS_SIMPLE_CLASS(efl_text_cursor_object, "Efl.Text.Cursor", EFL_TEXT_CURSOR_OBJECT_CLASS)
25 25
26EOLIAN static void 26EOLIAN static void
27_efl_text_cursor_position_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, int position) 27_efl_text_cursor_object_position_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, int position)
28{ 28{
29 evas_textblock_cursor_pos_set(pd->handle, position); 29 evas_textblock_cursor_pos_set(pd->handle, position);
30} 30}
31 31
32EOLIAN static int 32EOLIAN static int
33_efl_text_cursor_position_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 33_efl_text_cursor_object_position_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
34{ 34{
35 return evas_textblock_cursor_pos_get(pd->handle); 35 return evas_textblock_cursor_pos_get(pd->handle);
36} 36}
37 37
38EOLIAN static Eina_Unicode 38EOLIAN static Eina_Unicode
39_efl_text_cursor_content_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 39_efl_text_cursor_object_content_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
40{ 40{
41 if (pd->handle && pd->handle->node) 41 if (pd->handle && pd->handle->node)
42 return eina_ustrbuf_string_get(pd->handle->node->unicode)[pd->handle->pos]; 42 return eina_ustrbuf_string_get(pd->handle->node->unicode)[pd->handle->pos];
@@ -45,7 +45,7 @@ _efl_text_cursor_content_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd
45} 45}
46 46
47EOLIAN static Eina_Rect 47EOLIAN static Eina_Rect
48_efl_text_cursor_content_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 48_efl_text_cursor_object_content_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
49{ 49{
50 Eina_Rect rect = {0}; 50 Eina_Rect rect = {0};
51 Eina_Bool item_is = evas_textblock_cursor_format_item_geometry_get(pd->handle, &(rect.x), &(rect.y), &(rect.w), &(rect.h)); 51 Eina_Bool item_is = evas_textblock_cursor_format_item_geometry_get(pd->handle, &(rect.x), &(rect.y), &(rect.w), &(rect.h));
@@ -58,13 +58,13 @@ _efl_text_cursor_content_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor
58} 58}
59 59
60EOLIAN static void 60EOLIAN static void
61_efl_text_cursor_line_number_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, int line_number) 61_efl_text_cursor_object_line_number_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, int line_number)
62{ 62{
63 evas_textblock_cursor_line_set(pd->handle, line_number); 63 evas_textblock_cursor_line_set(pd->handle, line_number);
64} 64}
65 65
66EOLIAN static int 66EOLIAN static int
67_efl_text_cursor_line_number_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 67_efl_text_cursor_object_line_number_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
68{ 68{
69 Eina_Rect rect = {0}; 69 Eina_Rect rect = {0};
70 70
@@ -72,7 +72,7 @@ _efl_text_cursor_line_number_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data
72} 72}
73 73
74EOLIAN static Eina_Rect 74EOLIAN static Eina_Rect
75_efl_text_cursor_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor_Type ctype) 75_efl_text_cursor_object_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Type ctype)
76{ 76{
77 Eina_Rect rc = {0}; 77 Eina_Rect rc = {0};
78 Evas_Textblock_Cursor_Type cursor_type = (ctype == EFL_TEXT_CURSOR_TYPE_BEFORE) ? EVAS_TEXTBLOCK_CURSOR_BEFORE : EVAS_TEXTBLOCK_CURSOR_UNDER; 78 Evas_Textblock_Cursor_Type cursor_type = (ctype == EFL_TEXT_CURSOR_TYPE_BEFORE) ? EVAS_TEXTBLOCK_CURSOR_BEFORE : EVAS_TEXTBLOCK_CURSOR_UNDER;
@@ -81,7 +81,7 @@ _efl_text_cursor_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_
81} 81}
82 82
83EOLIAN static Eina_Bool 83EOLIAN static Eina_Bool
84_efl_text_cursor_lower_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Eina_Rect *geometry2) 84_efl_text_cursor_object_lower_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Eina_Rect *geometry2)
85{ 85{
86 Eina_Rect rc = {0}; 86 Eina_Rect rc = {0};
87 Eina_Bool b_ret = EINA_FALSE; 87 Eina_Bool b_ret = EINA_FALSE;
@@ -94,24 +94,24 @@ _efl_text_cursor_lower_cursor_geometry_get(const Eo *obj EINA_UNUSED, Efl_Text_C
94} 94}
95 95
96EOLIAN static Eina_Bool 96EOLIAN static Eina_Bool
97_efl_text_cursor_equal(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, const Efl_Text_Cursor *dst) 97_efl_text_cursor_object_equal(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, const Efl_Text_Cursor_Object *dst)
98{ 98{
99 return evas_textblock_cursor_equal(pd->handle, efl_text_cursor_handle_get(dst)); 99 return evas_textblock_cursor_equal(pd->handle, efl_text_cursor_object_handle_get(dst));
100} 100}
101 101
102EOLIAN static int 102EOLIAN static int
103_efl_text_cursor_compare(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, const Efl_Text_Cursor *dst) 103_efl_text_cursor_object_compare(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, const Efl_Text_Cursor_Object *dst)
104{ 104{
105 return evas_textblock_cursor_compare(pd->handle, efl_text_cursor_handle_get(dst)); 105 return evas_textblock_cursor_compare(pd->handle, efl_text_cursor_object_handle_get(dst));
106} 106}
107 107
108static void 108static void
109_efl_text_cursor_copy(const Efl_Text_Cursor *obj, Efl_Text_Cursor *dst) 109_efl_text_cursor_object_copy(const Efl_Text_Cursor_Object *obj, Efl_Text_Cursor_Object *dst)
110{ 110{
111 Efl_Text_Cursor_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); 111 Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS);
112 EINA_SAFETY_ON_NULL_RETURN(pd); 112 EINA_SAFETY_ON_NULL_RETURN(pd);
113 113
114 Efl_Text_Cursor_Data *pd_dest = efl_data_scope_safe_get(dst, MY_CLASS); 114 Efl_Text_Cursor_Object_Data *pd_dest = efl_data_scope_safe_get(dst, MY_CLASS);
115 EINA_SAFETY_ON_NULL_RETURN(pd_dest); 115 EINA_SAFETY_ON_NULL_RETURN(pd_dest);
116 116
117 if (!pd->handle) return; 117 if (!pd->handle) return;
@@ -119,22 +119,22 @@ _efl_text_cursor_copy(const Efl_Text_Cursor *obj, Efl_Text_Cursor *dst)
119 Efl_Text_Cursor_Handle *handle = evas_object_textblock_cursor_new(pd->handle->obj); 119 Efl_Text_Cursor_Handle *handle = evas_object_textblock_cursor_new(pd->handle->obj);
120 evas_textblock_cursor_copy(pd->handle, handle); 120 evas_textblock_cursor_copy(pd->handle, handle);
121 pd_dest->text_obj = pd->text_obj; 121 pd_dest->text_obj = pd->text_obj;
122 efl_text_cursor_handle_set(dst, handle); 122 efl_text_cursor_object_handle_set(dst, handle);
123 evas_textblock_cursor_unref(handle, NULL); 123 evas_textblock_cursor_unref(handle, NULL);
124} 124}
125 125
126EOLIAN static Efl_Text_Cursor * 126EOLIAN static Efl_Text_Cursor_Object *
127_efl_text_cursor_efl_duplicate_duplicate(const Eo *obj, Efl_Text_Cursor_Data *pd EINA_UNUSED) 127_efl_text_cursor_object_efl_duplicate_duplicate(const Eo *obj, Efl_Text_Cursor_Object_Data *pd EINA_UNUSED)
128{ 128{
129 Efl_Text_Cursor *dup = efl_text_cursor_create(efl_parent_get(obj)); 129 Efl_Text_Cursor_Object *dup = efl_text_cursor_object_create(efl_parent_get(obj));
130 130
131 _efl_text_cursor_copy(obj, dup); 131 _efl_text_cursor_object_copy(obj, dup);
132 132
133 return dup; 133 return dup;
134} 134}
135 135
136EOLIAN static Eina_Bool 136EOLIAN static Eina_Bool
137_efl_text_cursor_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor_Move_Type type) 137_efl_text_cursor_object_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Move_Type type)
138{ 138{
139 Eina_Bool moved = EINA_FALSE; 139 Eina_Bool moved = EINA_FALSE;
140 int pos = evas_textblock_cursor_pos_get(pd->handle); 140 int pos = evas_textblock_cursor_pos_get(pd->handle);
@@ -200,13 +200,13 @@ _efl_text_cursor_move(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cu
200} 200}
201 201
202EOLIAN static void 202EOLIAN static void
203_efl_text_cursor_char_delete(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 203_efl_text_cursor_object_char_delete(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
204{ 204{
205 evas_textblock_cursor_char_delete(pd->handle); 205 evas_textblock_cursor_char_delete(pd->handle);
206} 206}
207 207
208EOLIAN static Eina_Bool 208EOLIAN static Eina_Bool
209_efl_text_cursor_line_jump_by(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, int by) 209_efl_text_cursor_object_line_jump_by(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, int by)
210{ 210{
211 if (!pd->handle) return EINA_FALSE; 211 if (!pd->handle) return EINA_FALSE;
212 212
@@ -218,13 +218,13 @@ _efl_text_cursor_line_jump_by(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, int
218} 218}
219 219
220EOLIAN static void 220EOLIAN static void
221_efl_text_cursor_char_coord_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Eina_Position2D coord) 221_efl_text_cursor_object_char_coord_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Eina_Position2D coord)
222{ 222{
223 evas_textblock_cursor_char_coord_set(pd->handle, coord.x, coord.y); 223 evas_textblock_cursor_char_coord_set(pd->handle, coord.x, coord.y);
224} 224}
225 225
226EOLIAN static void 226EOLIAN static void
227_efl_text_cursor_cluster_coord_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Eina_Position2D coord) 227_efl_text_cursor_object_cluster_coord_set(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Eina_Position2D coord)
228{ 228{
229 evas_textblock_cursor_cluster_coord_set(pd->handle, coord.x, coord.y); 229 evas_textblock_cursor_cluster_coord_set(pd->handle, coord.x, coord.y);
230} 230}
@@ -294,33 +294,33 @@ _cursor_text_append(Efl_Text_Cursor_Handle *cur,
294} 294}
295 295
296EOLIAN static void 296EOLIAN static void
297_efl_text_cursor_text_insert(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, const char *text) 297_efl_text_cursor_object_text_insert(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, const char *text)
298{ 298{
299 _cursor_text_append(pd->handle, text); 299 _cursor_text_append(pd->handle, text);
300} 300}
301 301
302EOLIAN static char * 302EOLIAN static char *
303_efl_text_cursor_range_text_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor *cur2) 303_efl_text_cursor_object_range_text_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Object *cur2)
304{ 304{
305 return evas_textblock_cursor_range_text_get(pd->handle, efl_text_cursor_handle_get(cur2), EVAS_TEXTBLOCK_TEXT_PLAIN); 305 return evas_textblock_cursor_range_text_get(pd->handle, efl_text_cursor_object_handle_get(cur2), EVAS_TEXTBLOCK_TEXT_PLAIN);
306} 306}
307 307
308EOLIAN static void 308EOLIAN static void
309_efl_text_cursor_markup_insert(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, const char *markup) 309_efl_text_cursor_object_markup_insert(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, const char *markup)
310{ 310{
311 evas_object_textblock_text_markup_prepend(pd->handle, markup); 311 evas_object_textblock_text_markup_prepend(pd->handle, markup);
312} 312}
313 313
314EOLIAN static char * 314EOLIAN static char *
315_efl_text_cursor_range_markup_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor *cur2) 315_efl_text_cursor_object_range_markup_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Object *cur2)
316{ 316{
317 return evas_textblock_cursor_range_text_get(pd->handle,efl_text_cursor_handle_get(cur2), EVAS_TEXTBLOCK_TEXT_MARKUP); 317 return evas_textblock_cursor_range_text_get(pd->handle,efl_text_cursor_object_handle_get(cur2), EVAS_TEXTBLOCK_TEXT_MARKUP);
318} 318}
319 319
320EOLIAN static Eina_Iterator * 320EOLIAN static Eina_Iterator *
321_efl_text_cursor_range_geometry_get(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor *cur2) 321_efl_text_cursor_object_range_geometry_get(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Object *cur2)
322{ 322{
323 return evas_textblock_cursor_range_simple_geometry_get(pd->handle, efl_text_cursor_handle_get(cur2)); 323 return evas_textblock_cursor_range_simple_geometry_get(pd->handle, efl_text_cursor_object_handle_get(cur2));
324} 324}
325 325
326/** selection iterator */ 326/** selection iterator */
@@ -405,22 +405,22 @@ _evas_textblock_selection_iterator_new(Eina_List *list)
405} 405}
406 406
407EOLIAN static Eina_Iterator * 407EOLIAN static Eina_Iterator *
408_efl_text_cursor_range_precise_geometry_get(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor *cur2) 408_efl_text_cursor_object_range_precise_geometry_get(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Object *cur2)
409{ 409{
410 Eina_List *rects = evas_textblock_cursor_range_geometry_get(pd->handle, efl_text_cursor_handle_get(cur2)); 410 Eina_List *rects = evas_textblock_cursor_range_geometry_get(pd->handle, efl_text_cursor_object_handle_get(cur2));
411 return _evas_textblock_selection_iterator_new(rects); 411 return _evas_textblock_selection_iterator_new(rects);
412} 412}
413 413
414EOLIAN static void 414EOLIAN static void
415_efl_text_cursor_range_delete(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd, Efl_Text_Cursor *cur2) 415_efl_text_cursor_object_range_delete(Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd, Efl_Text_Cursor_Object *cur2)
416{ 416{
417 evas_textblock_cursor_range_delete(pd->handle, efl_text_cursor_handle_get(cur2)); 417 evas_textblock_cursor_range_delete(pd->handle, efl_text_cursor_object_handle_get(cur2));
418} 418}
419 419
420EAPI void 420EAPI void
421efl_text_cursor_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle) 421efl_text_cursor_object_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle)
422{ 422{
423 Efl_Text_Cursor_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); 423 Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS);
424 EINA_SAFETY_ON_NULL_RETURN(pd); 424 EINA_SAFETY_ON_NULL_RETURN(pd);
425 if (handle == pd->handle) 425 if (handle == pd->handle)
426 return; 426 return;
@@ -436,21 +436,21 @@ efl_text_cursor_handle_set(Eo *obj, Efl_Text_Cursor_Handle *handle)
436} 436}
437 437
438EAPI Efl_Text_Cursor_Handle * 438EAPI Efl_Text_Cursor_Handle *
439efl_text_cursor_handle_get(const Eo *obj) 439efl_text_cursor_object_handle_get(const Eo *obj)
440{ 440{
441 Efl_Text_Cursor_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS); 441 Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(obj, MY_CLASS);
442 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL); 442 EINA_SAFETY_ON_NULL_RETURN_VAL(pd, NULL);
443 return pd->handle; 443 return pd->handle;
444} 444}
445 445
446Eo* efl_text_cursor_create(Eo *parent) 446Eo* efl_text_cursor_object_create(Eo *parent)
447{ 447{
448 return efl_add(efl_text_cursor_realized_class_get(), parent); 448 return efl_add(efl_text_cursor_object_realized_class_get(), parent);
449} 449}
450 450
451void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj) 451void efl_text_cursor_object_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_obj)
452{ 452{
453 Efl_Text_Cursor_Data *pd = efl_data_scope_safe_get(cursor, MY_CLASS); 453 Efl_Text_Cursor_Object_Data *pd = efl_data_scope_safe_get(cursor, MY_CLASS);
454 EINA_SAFETY_ON_NULL_RETURN(pd); 454 EINA_SAFETY_ON_NULL_RETURN(pd);
455 Efl_Text_Cursor_Handle *handle = NULL; 455 Efl_Text_Cursor_Handle *handle = NULL;
456 if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXTBLOCK_CLASS)) 456 if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXTBLOCK_CLASS))
@@ -465,19 +465,19 @@ void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_o
465 465
466 if (handle) 466 if (handle)
467 { 467 {
468 efl_text_cursor_handle_set(cursor, handle); 468 efl_text_cursor_object_handle_set(cursor, handle);
469 evas_textblock_cursor_unref(handle, NULL); 469 evas_textblock_cursor_unref(handle, NULL);
470 } 470 }
471} 471}
472 472
473EOLIAN static Efl_Canvas_Object * 473EOLIAN static Efl_Canvas_Object *
474_efl_text_cursor_text_object_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Data *pd) 474_efl_text_cursor_object_text_object_get(const Eo *obj EINA_UNUSED, Efl_Text_Cursor_Object_Data *pd)
475{ 475{
476 return pd->text_obj; 476 return pd->text_obj;
477} 477}
478 478
479EOLIAN static void 479EOLIAN static void
480_efl_text_cursor_efl_object_destructor(Eo *obj, Efl_Text_Cursor_Data *pd) 480_efl_text_cursor_object_efl_object_destructor(Eo *obj, Efl_Text_Cursor_Object_Data *pd)
481{ 481{
482 if (pd->handle) 482 if (pd->handle)
483 { 483 {
@@ -494,4 +494,4 @@ _efl_text_cursor_efl_object_destructor(Eo *obj, Efl_Text_Cursor_Data *pd)
494 494
495} 495}
496 496
497#include "efl_text_cursor.eo.c" 497#include "efl_text_cursor_object.eo.c"
diff --git a/src/lib/evas/canvas/efl_text_cursor.eo b/src/lib/evas/canvas/efl_text_cursor_object.eo
index 4337185001..9c936047c9 100644
--- a/src/lib/evas/canvas/efl_text_cursor.eo
+++ b/src/lib/evas/canvas/efl_text_cursor_object.eo
@@ -1,14 +1,14 @@
1enum Efl.Text.Cursor_Type 1enum Efl.Text_Cursor.Type
2{ 2{
3 [[Shape of the text cursor. 3 [[Shape of the text cursor.
4 This is normally used in @Efl.Text.Cursor methods to retrieve the cursor's geometry. 4 This is normally used in @Efl.Text_Cursor.Object methods to retrieve the cursor's geometry.
5 @since 1.24 5 @since 1.24
6 ]] 6 ]]
7 before, [[Cursor is a vertical bar (I-beam) placed before the selected character.]] 7 before, [[Cursor is a vertical bar (I-beam) placed before the selected character.]]
8 under [[Cursor is an horizontal line (underscore) placed under the selected character.]] 8 under [[Cursor is an horizontal line (underscore) placed under the selected character.]]
9} 9}
10 10
11enum Efl.Text.Cursor_Move_Type 11enum Efl.Text_Cursor.Move_Type
12{ 12{
13 [[Text cursor movement types. 13 [[Text cursor movement types.
14 14
@@ -32,12 +32,11 @@ enum Efl.Text.Cursor_Move_Type
32 paragraph_previous [[Advances to the end of the previous paragraph.]] 32 paragraph_previous [[Advances to the end of the previous paragraph.]]
33} 33}
34 34
35abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{ 35abstract Efl.Text_Cursor.Object extends Efl.Object implements Efl.Duplicate{
36 [[Cursor API. 36 [[Cursor API.
37 37
38 @since 1.24 38 @since 1.24
39 ]] 39 ]]
40 c_prefix: efl_text_cursor;
41 methods { 40 methods {
42 41
43 @property position { 42 @property position {
@@ -80,11 +79,11 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
80 of the same direction as paragraph,else ("split cursor") will return 79 of the same direction as paragraph,else ("split cursor") will return
81 and you need to consider the lower ("split cursor") @.lower_cursor_geometry 80 and you need to consider the lower ("split cursor") @.lower_cursor_geometry
82 81
83 Split cursor geometry is valid only in @Efl.Text.Cursor_Type.before cursor mode.]] 82 Split cursor geometry is valid only in @Efl.Text_Cursor.Type.before cursor mode.]]
84 get { 83 get {
85 } 84 }
86 keys { 85 keys {
87 ctype: Efl.Text.Cursor_Type; [[The type of the cursor.]] 86 ctype: Efl.Text_Cursor.Type; [[The type of the cursor.]]
88 } 87 }
89 values { 88 values {
90 geometry: Eina.Rect; [[The geometry of the cursor (or upper cursor) in pixels.]] 89 geometry: Eina.Rect; [[The geometry of the cursor (or upper cursor) in pixels.]]
@@ -95,7 +94,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
95 [[Returns the geometry of the lower ("split cursor"), if logical cursor is 94 [[Returns the geometry of the lower ("split cursor"), if logical cursor is
96 between LTR/RTL text. 95 between LTR/RTL text.
97 96
98 To get the upper ("split cursor") @.cursor_geometry with @Efl.Text.Cursor_Type.before cursor mode.]] 97 To get the upper ("split cursor") @.cursor_geometry with @Efl.Text_Cursor.Type.before cursor mode.]]
99 get { 98 get {
100 return: bool; [[$true if split cursor, $false otherwise.]] 99 return: bool; [[$true if split cursor, $false otherwise.]]
101 } 100 }
@@ -107,7 +106,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
107 equal @const { 106 equal @const {
108 [[Check if two cursors are equal - faster than compare if all you want is equality.]] 107 [[Check if two cursors are equal - faster than compare if all you want is equality.]]
109 params { 108 params {
110 dst: const(Efl.Text.Cursor); [[Destination Cursor.]] 109 dst: const(Efl.Text_Cursor.Object); [[Destination Cursor.]]
111 } 110 }
112 return: bool; [[$true if cursors are equal, $false otherwise.]] 111 return: bool; [[$true if cursors are equal, $false otherwise.]]
113 } 112 }
@@ -116,7 +115,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
116 [[Compare two cursors 115 [[Compare two cursors
117 Return <0 if cursor position less than dst, 0 if cursor == dest and >0 otherwise.]] 116 Return <0 if cursor position less than dst, 0 if cursor == dest and >0 otherwise.]]
118 params { 117 params {
119 dst: const(Efl.Text.Cursor); [[Destination Cursor.]] 118 dst: const(Efl.Text_Cursor.Object); [[Destination Cursor.]]
120 } 119 }
121 return: int; [[Difference between cursors.]] 120 return: int; [[Difference between cursors.]]
122 } 121 }
@@ -124,7 +123,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
124 move { 123 move {
125 [[Move the cursor.]] 124 [[Move the cursor.]]
126 params { 125 params {
127 @in type: Efl.Text.Cursor_Move_Type; [[The type of movement.]] 126 @in type: Efl.Text_Cursor.Move_Type; [[The type of movement.]]
128 } 127 }
129 return: bool; [[True if actually moved.]] 128 return: bool; [[True if actually moved.]]
130 } 129 }
@@ -175,7 +174,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
175 [[Markup of a given range in the text.]] 174 [[Markup of a given range in the text.]]
176 return: mstring @move; [[The markup in the given range.]] 175 return: mstring @move; [[The markup in the given range.]]
177 params { 176 params {
178 cur2: Efl.Text.Cursor; [[End of range.]] 177 cur2: Efl.Text_Cursor.Object; [[End of range.]]
179 } 178 }
180 } 179 }
181 180
@@ -183,7 +182,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
183 [[Returns the text in the range between cursor and $cur2.]] 182 [[Returns the text in the range between cursor and $cur2.]]
184 return: mstring @move; [[The text in the given range.]] 183 return: mstring @move; [[The text in the given range.]]
185 params { 184 params {
186 cur2: Efl.Text.Cursor; [[End of range.]] 185 cur2: Efl.Text_Cursor.Object; [[End of range.]]
187 } 186 }
188 } 187 }
189 188
@@ -194,7 +193,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
194 range are merged into one big rectangle. This is an optimized 193 range are merged into one big rectangle. This is an optimized
195 version of @.range_precise_geometry_get.]] 194 version of @.range_precise_geometry_get.]]
196 params { 195 params {
197 cur2: Efl.Text.Cursor; [[End of range.]] 196 cur2: Efl.Text_Cursor.Object; [[End of range.]]
198 } 197 }
199 return: iterator<Eina.Rect> @move; [[ 198 return: iterator<Eina.Rect> @move; [[
200 Iterator on all geometries of the given range.]] 199 Iterator on all geometries of the given range.]]
@@ -206,7 +205,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
206 The geometry is represented as rectangles for each of the line 205 The geometry is represented as rectangles for each of the line
207 segments in the given range [$cur1, $cur2].]] 206 segments in the given range [$cur1, $cur2].]]
208 params { 207 params {
209 cur2: Efl.Text.Cursor; [[End of range.]] 208 cur2: Efl.Text_Cursor.Object; [[End of range.]]
210 } 209 }
211 return: iterator<Eina.Rect> @move; [[ 210 return: iterator<Eina.Rect> @move; [[
212 Iterator on all simple geometries of the given range.]] 211 Iterator on all simple geometries of the given range.]]
@@ -217,7 +216,7 @@ abstract Efl.Text.Cursor extends Efl.Object implements Efl.Duplicate{
217 216
218 This removes all the text in given range [$start,$end].]] 217 This removes all the text in given range [$start,$end].]]
219 params { 218 params {
220 @in cur2: Efl.Text.Cursor; [[Range end position.]] 219 @in cur2: Efl.Text_Cursor.Object; [[Range end position.]]
221 } 220 }
222 } 221 }
223 222
diff --git a/src/lib/evas/canvas/efl_text_formatter.c b/src/lib/evas/canvas/efl_text_formatter.c
index aea3e42356..96eab7ad9f 100644
--- a/src/lib/evas/canvas/efl_text_formatter.c
+++ b/src/lib/evas/canvas/efl_text_formatter.c
@@ -2,7 +2,7 @@
2#include "evas_common_private.h" 2#include "evas_common_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4#include "efl_canvas_textblock_internal.h" 4#include "efl_canvas_textblock_internal.h"
5#include "efl_text_cursor.eo.h" 5#include "efl_text_cursor_object.eo.h"
6 6
7#define MY_CLASS EFL_TEXT_FORMATTER_CLASS 7#define MY_CLASS EFL_TEXT_FORMATTER_CLASS
8 8
@@ -12,22 +12,22 @@ typedef struct
12} Efl_Text_Formatter_Data; 12} Efl_Text_Formatter_Data;
13 13
14EOLIAN static void 14EOLIAN static void
15_efl_text_formatter_attribute_insert(const Efl_Text_Cursor *start, const Efl_Text_Cursor *end, const char *format) 15_efl_text_formatter_attribute_insert(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end, const char *format)
16{ 16{
17 EINA_SAFETY_ON_TRUE_RETURN(!efl_text_cursor_handle_get(start) || 17 EINA_SAFETY_ON_TRUE_RETURN(!efl_text_cursor_object_handle_get(start) ||
18 !efl_text_cursor_handle_get(end) || 18 !efl_text_cursor_object_handle_get(end) ||
19 efl_text_cursor_handle_get(start)->obj != efl_text_cursor_handle_get(end)->obj); 19 efl_text_cursor_object_handle_get(start)->obj != efl_text_cursor_object_handle_get(end)->obj);
20 20
21 Eo *eo_obj= efl_text_cursor_handle_get(start)->obj; 21 Eo *eo_obj= efl_text_cursor_object_handle_get(start)->obj;
22 evas_textblock_async_block(eo_obj); 22 evas_textblock_async_block(eo_obj);
23 23
24 _evas_textblock_annotations_insert(eo_obj, efl_text_cursor_handle_get(start), efl_text_cursor_handle_get(end), format, 24 _evas_textblock_annotations_insert(eo_obj, efl_text_cursor_object_handle_get(start), efl_text_cursor_object_handle_get(end), format,
25 EINA_FALSE); 25 EINA_FALSE);
26 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 26 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
27} 27}
28 28
29EOLIAN static unsigned int 29EOLIAN static unsigned int
30_efl_text_formatter_attribute_clear(const Efl_Text_Cursor *start, const Efl_Text_Cursor *end) 30_efl_text_formatter_attribute_clear(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end)
31{ 31{
32 unsigned int ret = 0; 32 unsigned int ret = 0;
33 Eina_Iterator *annotations; 33 Eina_Iterator *annotations;
@@ -55,29 +55,29 @@ efl_text_formatter_attribute_get(Efl_Text_Attribute_Handle *annotation)
55} 55}
56 56
57Eina_Iterator * 57Eina_Iterator *
58efl_text_formatter_range_attributes_get(const Efl_Text_Cursor *start, const Efl_Text_Cursor *end) 58efl_text_formatter_range_attributes_get(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end)
59{ 59{
60 Eina_List *lst = NULL; 60 Eina_List *lst = NULL;
61 Efl_Text_Attribute_Handle *it; 61 Efl_Text_Attribute_Handle *it;
62 62
63 EINA_SAFETY_ON_TRUE_RETURN_VAL(!efl_text_cursor_handle_get(start) || 63 EINA_SAFETY_ON_TRUE_RETURN_VAL(!efl_text_cursor_object_handle_get(start) ||
64 !efl_text_cursor_handle_get(end) || 64 !efl_text_cursor_object_handle_get(end) ||
65 efl_text_cursor_handle_get(start)->obj != efl_text_cursor_handle_get(end)->obj, NULL); 65 efl_text_cursor_object_handle_get(start)->obj != efl_text_cursor_object_handle_get(end)->obj, NULL);
66 66
67 Eina_Inlist *annotations = _evas_textblock_annotations_get(efl_text_cursor_handle_get(start)->obj); 67 Eina_Inlist *annotations = _evas_textblock_annotations_get(efl_text_cursor_object_handle_get(start)->obj);
68 68
69 EINA_INLIST_FOREACH(annotations, it) 69 EINA_INLIST_FOREACH(annotations, it)
70 { 70 {
71 Efl_Text_Cursor_Handle start2, end2; 71 Efl_Text_Cursor_Handle start2, end2;
72 _evas_textblock_cursor_init(&start2, efl_text_cursor_handle_get(start)->obj); 72 _evas_textblock_cursor_init(&start2, efl_text_cursor_object_handle_get(start)->obj);
73 _evas_textblock_cursor_init(&end2, efl_text_cursor_handle_get(start)->obj); 73 _evas_textblock_cursor_init(&end2, efl_text_cursor_object_handle_get(start)->obj);
74 74
75 if (!it->start_node || !it->end_node) continue; 75 if (!it->start_node || !it->end_node) continue;
76 _textblock_cursor_pos_at_fnode_set(&start2, it->start_node); 76 _textblock_cursor_pos_at_fnode_set(&start2, it->start_node);
77 _textblock_cursor_pos_at_fnode_set(&end2, it->end_node); 77 _textblock_cursor_pos_at_fnode_set(&end2, it->end_node);
78 evas_textblock_cursor_char_prev(&end2); 78 evas_textblock_cursor_char_prev(&end2);
79 if (!((evas_textblock_cursor_compare(&start2, efl_text_cursor_handle_get(end)) > 0) || 79 if (!((evas_textblock_cursor_compare(&start2, efl_text_cursor_object_handle_get(end)) > 0) ||
80 (evas_textblock_cursor_compare(&end2, efl_text_cursor_handle_get(start)) < 0))) 80 (evas_textblock_cursor_compare(&end2, efl_text_cursor_object_handle_get(start)) < 0)))
81 { 81 {
82 lst = eina_list_append(lst, it); 82 lst = eina_list_append(lst, it);
83 } 83 }
@@ -86,14 +86,14 @@ efl_text_formatter_range_attributes_get(const Efl_Text_Cursor *start, const Efl_
86} 86}
87 87
88void 88void
89efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor *start, Efl_Text_Cursor *end) 89efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end)
90{ 90{
91 EINA_SAFETY_ON_TRUE_RETURN (!handle || !(handle->obj)); 91 EINA_SAFETY_ON_TRUE_RETURN (!handle || !(handle->obj));
92 92
93 efl_text_cursor_text_object_set(start, handle->obj, handle->obj); 93 efl_text_cursor_object_text_object_set(start, handle->obj, handle->obj);
94 efl_text_cursor_text_object_set(end, handle->obj, handle->obj); 94 efl_text_cursor_object_text_object_set(end, handle->obj, handle->obj);
95 _textblock_cursor_pos_at_fnode_set(efl_text_cursor_handle_get(start), handle->start_node); 95 _textblock_cursor_pos_at_fnode_set(efl_text_cursor_object_handle_get(start), handle->start_node);
96 _textblock_cursor_pos_at_fnode_set(efl_text_cursor_handle_get(end), handle->end_node); 96 _textblock_cursor_pos_at_fnode_set(efl_text_cursor_object_handle_get(end), handle->end_node);
97} 97}
98 98
99void 99void
diff --git a/src/lib/evas/canvas/efl_text_formatter.eo b/src/lib/evas/canvas/efl_text_formatter.eo
index 875b8521a2..9e4d025c72 100644
--- a/src/lib/evas/canvas/efl_text_formatter.eo
+++ b/src/lib/evas/canvas/efl_text_formatter.eo
@@ -2,9 +2,9 @@ import efl_text_types;
2 2
3abstract Efl.Text_Formatter extends Efl.Object { 3abstract Efl.Text_Formatter extends Efl.Object {
4 [[Text Formatter API to manage text formatting(attributes). 4 [[Text Formatter API to manage text formatting(attributes).
5 Use it to insert and remove style attributes (font, size, color, ...) using @Efl.Text.Cursor on EFL Widgets. 5 Use it to insert and remove style attributes (font, size, color, ...) using @Efl.Text_Cursor.Object on EFL Widgets.
6 6
7 Attributes can be assigned to character ranges, selected using two @Efl.Text.Cursor instances. 7 Attributes can be assigned to character ranges, selected using two @Efl.Text_Cursor.Object instances.
8 Cursor instances are already bound to a text object so there's no need to provide it to this class. 8 Cursor instances are already bound to a text object so there's no need to provide it to this class.
9 Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply. 9 Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply.
10 10
@@ -20,8 +20,8 @@ abstract Efl.Text_Formatter extends Efl.Object {
20 The passed cursors must belong to same text object, otherwise insertion will be ignored. 20 The passed cursors must belong to same text object, otherwise insertion will be ignored.
21 ]] 21 ]]
22 params { 22 params {
23 start: const(Efl.Text.Cursor); [[Start of range.]] 23 start: const(Efl.Text_Cursor.Object); [[Start of range.]]
24 end: const(Efl.Text.Cursor); [[End of range.]] 24 end: const(Efl.Text_Cursor.Object); [[End of range.]]
25 format: string; [[Format string. Uses same format as $style in @Efl.Canvas.Textblock.style_apply.]] 25 format: string; [[Format string. Uses same format as $style in @Efl.Canvas.Textblock.style_apply.]]
26 } 26 }
27 } 27 }
@@ -30,8 +30,8 @@ abstract Efl.Text_Formatter extends Efl.Object {
30 [[Clear (remove) attributes in the specified range [$start, $end - 1]. 30 [[Clear (remove) attributes in the specified range [$start, $end - 1].
31 ]] 31 ]]
32 params { 32 params {
33 start: const(Efl.Text.Cursor); [[Start of range.]] 33 start: const(Efl.Text_Cursor.Object); [[Start of range.]]
34 end: const(Efl.Text.Cursor); [[End of range.]] 34 end: const(Efl.Text_Cursor.Object); [[End of range.]]
35 } 35 }
36 return: uint; [[Number of removed attributes.]] 36 return: uint; [[Number of removed attributes.]]
37 } 37 }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 445ce135dd..914a6cf998 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -66,7 +66,7 @@
66 66
67#include "evas_common_private.h" 67#include "evas_common_private.h"
68#include "evas_private.h" 68#include "evas_private.h"
69#include "efl_text_cursor.eo.h" 69#include "efl_text_cursor_object.eo.h"
70#include "Efl.h" 70#include "Efl.h"
71#include "efl_canvas_textblock_internal.h" 71#include "efl_canvas_textblock_internal.h"
72 72
@@ -8296,11 +8296,11 @@ _efl_canvas_textblock_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Te
8296 return o->default_format.default_style_str; 8296 return o->default_format.default_style_str;
8297} 8297}
8298 8298
8299EOLIAN static Efl_Text_Cursor * 8299EOLIAN static Efl_Text_Cursor_Object *
8300_efl_canvas_textblock_cursor_create(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED) 8300_efl_canvas_textblock_cursor_create(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED)
8301{ 8301{
8302 Eo* cursor = efl_text_cursor_create(obj); 8302 Eo* cursor = efl_text_cursor_object_create(obj);
8303 efl_text_cursor_text_object_set(cursor, obj, obj); 8303 efl_text_cursor_object_text_object_set(cursor, obj, obj);
8304 return cursor; 8304 return cursor;
8305} 8305}
8306 8306
@@ -8654,7 +8654,7 @@ static void _evas_textblock_cursor_object_changed(Efl_Text_Cursor_Handle *cur)
8654 Eo *cur_obj; 8654 Eo *cur_obj;
8655 8655
8656 EINA_LIST_FOREACH(cur->cur_objs, l, cur_obj) 8656 EINA_LIST_FOREACH(cur->cur_objs, l, cur_obj)
8657 efl_event_callback_call(cur_obj, EFL_TEXT_CURSOR_EVENT_CHANGED, NULL); 8657 efl_event_callback_call(cur_obj, EFL_TEXT_CURSOR_OBJECT_EVENT_CHANGED, NULL);
8658} 8658}
8659 8659
8660static void 8660static void
@@ -13210,11 +13210,11 @@ evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Handle *start, Evas_Text
13210EOLIAN static Eina_Bool 13210EOLIAN static Eina_Bool
13211_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED, 13211_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED,
13212 Efl_Canvas_Textblock_Data *pd EINA_UNUSED, 13212 Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
13213 Efl_Text_Cursor *start, Efl_Text_Cursor *end) 13213 Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end)
13214{ 13214{
13215 return evas_textblock_cursor_visible_range_get( 13215 return evas_textblock_cursor_visible_range_get(
13216 efl_text_cursor_handle_get(start), 13216 efl_text_cursor_object_handle_get(start),
13217 efl_text_cursor_handle_get(end) 13217 efl_text_cursor_object_handle_get(end)
13218 ); 13218 );
13219} 13219}
13220 13220
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 291695bf67..7dc662e097 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -44,7 +44,7 @@ pub_eo_files = [
44 'efl_canvas_group.eo', 44 'efl_canvas_group.eo',
45 'efl_gfx_mapping.eo', 45 'efl_gfx_mapping.eo',
46 'efl_canvas_event_grabber.eo', 46 'efl_canvas_event_grabber.eo',
47 'efl_text_cursor.eo', 47 'efl_text_cursor_object.eo',
48 'efl_canvas_textblock.eo', 48 'efl_canvas_textblock.eo',
49 'efl_text_formatter.eo', 49 'efl_text_formatter.eo',
50 'efl_canvas_object_animation.eo', 50 'efl_canvas_object_animation.eo',
@@ -187,7 +187,7 @@ evas_src += files([
187 'efl_canvas_vg_image.c', 187 'efl_canvas_vg_image.c',
188 'evas_filter_mixin.c', 188 'evas_filter_mixin.c',
189 'efl_canvas_object_animation.c', 189 'efl_canvas_object_animation.c',
190 'efl_text_cursor.c', 190 'efl_text_cursor_object.c',
191 'efl_text_formatter.c' 191 'efl_text_formatter.c'
192 ]) 192 ])
193 193
diff --git a/src/tests/elementary/efl_ui_test_text.c b/src/tests/elementary/efl_ui_test_text.c
index dd77472c33..d6c7a87e72 100644
--- a/src/tests/elementary/efl_ui_test_text.c
+++ b/src/tests/elementary/efl_ui_test_text.c
@@ -31,7 +31,7 @@ EFL_START_TEST(text_cnp)
31 efl_text_interactive_all_select(txt); 31 efl_text_interactive_all_select(txt);
32 efl_ui_textbox_selection_copy(txt); 32 efl_ui_textbox_selection_copy(txt);
33 efl_text_interactive_all_unselect(txt); 33 efl_text_interactive_all_unselect(txt);
34 efl_text_cursor_text_insert(efl_text_interactive_main_cursor_get(txt), "X"); 34 efl_text_cursor_object_text_insert(efl_text_interactive_main_cursor_get(txt), "X");
35 efl_ui_textbox_selection_paste(txt); 35 efl_ui_textbox_selection_paste(txt);
36 ecore_main_loop_iterate(); 36 ecore_main_loop_iterate();
37 ck_assert_int_eq(i_copy, 1); 37 ck_assert_int_eq(i_copy, 1);
@@ -78,13 +78,13 @@ EFL_START_TEST(text_all_select_all_unselect)
78 efl_event_callback_priority_add(txt, EFL_UI_SELECTION_EVENT_WM_SELECTION_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _stop_event_soon, NULL); 78 efl_event_callback_priority_add(txt, EFL_UI_SELECTION_EVENT_WM_SELECTION_CHANGED, EFL_CALLBACK_PRIORITY_BEFORE, _stop_event_soon, NULL);
79 efl_text_set(txt, "Hello"); 79 efl_text_set(txt, "Hello");
80 efl_text_interactive_all_select(txt); 80 efl_text_interactive_all_select(txt);
81 Efl_Text_Cursor *c1=NULL, *c2 =NULL; 81 Efl_Text_Cursor_Object *c1=NULL, *c2 =NULL;
82 efl_text_interactive_selection_cursors_get(txt, &c1, &c2); 82 efl_text_interactive_selection_cursors_get(txt, &c1, &c2);
83 ck_assert_ptr_ne(c1, NULL); 83 ck_assert_ptr_ne(c1, NULL);
84 ck_assert_ptr_ne(c2, NULL); 84 ck_assert_ptr_ne(c2, NULL);
85 fail_if(!efl_text_interactive_have_selection_get(txt)); 85 fail_if(!efl_text_interactive_have_selection_get(txt));
86 ck_assert_int_eq(efl_text_cursor_position_get(c1), 0); 86 ck_assert_int_eq(efl_text_cursor_object_position_get(c1), 0);
87 ck_assert_int_eq(efl_text_cursor_position_get(c2), 5); 87 ck_assert_int_eq(efl_text_cursor_object_position_get(c2), 5);
88 efl_text_interactive_all_unselect(txt); 88 efl_text_interactive_all_unselect(txt);
89 fail_if(efl_text_interactive_have_selection_get(txt)); 89 fail_if(efl_text_interactive_have_selection_get(txt));
90 ecore_main_loop_iterate(); 90 ecore_main_loop_iterate();
@@ -95,30 +95,30 @@ EFL_START_TEST(text_all_select_all_unselect)
95 Eo *sel1, *sel2; 95 Eo *sel1, *sel2;
96 i_selection = 0; 96 i_selection = 0;
97 efl_text_interactive_selection_cursors_get(txt, &sel1, &sel2); 97 efl_text_interactive_selection_cursors_get(txt, &sel1, &sel2);
98 efl_text_cursor_position_set(sel1, 1); 98 efl_text_cursor_object_position_set(sel1, 1);
99 efl_text_cursor_position_set(sel2, 2); 99 efl_text_cursor_object_position_set(sel2, 2);
100 ck_assert_int_eq(i_selection, 2); 100 ck_assert_int_eq(i_selection, 2);
101 efl_text_interactive_all_select(txt); 101 efl_text_interactive_all_select(txt);
102 ck_assert_int_eq(i_selection, 3); 102 ck_assert_int_eq(i_selection, 3);
103 ck_assert_int_eq(efl_text_cursor_position_get(sel1), 0); 103 ck_assert_int_eq(efl_text_cursor_object_position_get(sel1), 0);
104 ck_assert_int_eq(efl_text_cursor_position_get(sel2), 5); 104 ck_assert_int_eq(efl_text_cursor_object_position_get(sel2), 5);
105 105
106 Eo *cur1 = efl_ui_textbox_cursor_create(txt); 106 Eo *cur1 = efl_ui_textbox_cursor_create(txt);
107 Eo *cur2 = efl_ui_textbox_cursor_create(txt); 107 Eo *cur2 = efl_ui_textbox_cursor_create(txt);
108 efl_text_cursor_position_set(cur1, 1); 108 efl_text_cursor_object_position_set(cur1, 1);
109 efl_text_cursor_position_set(cur2, 2); 109 efl_text_cursor_object_position_set(cur2, 2);
110 efl_text_interactive_selection_cursors_set(txt, cur1, cur2); 110 efl_text_interactive_selection_cursors_set(txt, cur1, cur2);
111 ck_assert_int_eq(i_selection, 4); 111 ck_assert_int_eq(i_selection, 4);
112 efl_text_interactive_selection_cursors_get(txt, &sel1, &sel2); 112 efl_text_interactive_selection_cursors_get(txt, &sel1, &sel2);
113 ck_assert_int_eq(efl_text_cursor_position_get(sel1),1); 113 ck_assert_int_eq(efl_text_cursor_object_position_get(sel1),1);
114 ck_assert_int_eq(efl_text_cursor_position_get(sel2),2); 114 ck_assert_int_eq(efl_text_cursor_object_position_get(sel2),2);
115 115
116 116
117 /*Select part then select all*/ 117 /*Select part then select all*/
118 efl_text_interactive_all_unselect(txt); 118 efl_text_interactive_all_unselect(txt);
119 i_have_selection = 0, i_selection = 0; 119 i_have_selection = 0, i_selection = 0;
120 efl_text_cursor_position_set(cur1, 1); 120 efl_text_cursor_object_position_set(cur1, 1);
121 efl_text_cursor_position_set(cur2, 2); 121 efl_text_cursor_object_position_set(cur2, 2);
122 efl_text_interactive_selection_cursors_set(txt, cur1, cur2); 122 efl_text_interactive_selection_cursors_set(txt, cur1, cur2);
123 ck_assert_int_eq(i_selection, 1); 123 ck_assert_int_eq(i_selection, 1);
124 ck_assert_int_eq(i_have_selection, 1); 124 ck_assert_int_eq(i_have_selection, 1);
@@ -150,13 +150,13 @@ EFL_START_TEST(text_selection)
150 get_me_to_those_events(txt); 150 get_me_to_those_events(txt);
151 drag_object(txt, 2, 2, 295, 295, EINA_TRUE); 151 drag_object(txt, 2, 2, 295, 295, EINA_TRUE);
152 ecore_main_loop_iterate(); 152 ecore_main_loop_iterate();
153 Efl_Text_Cursor *c1=NULL, *c2 =NULL; 153 Efl_Text_Cursor_Object *c1=NULL, *c2 =NULL;
154 efl_text_interactive_selection_cursors_get(txt, &c1, &c2); 154 efl_text_interactive_selection_cursors_get(txt, &c1, &c2);
155 ck_assert_ptr_ne(c1, NULL); 155 ck_assert_ptr_ne(c1, NULL);
156 ck_assert_ptr_ne(c2, NULL); 156 ck_assert_ptr_ne(c2, NULL);
157 fail_if(!efl_text_interactive_have_selection_get(txt)); 157 fail_if(!efl_text_interactive_have_selection_get(txt));
158 ck_assert_int_eq(efl_text_cursor_position_get(c1), 0); 158 ck_assert_int_eq(efl_text_cursor_object_position_get(c1), 0);
159 ck_assert_int_eq(efl_text_cursor_position_get(c2), 5); 159 ck_assert_int_eq(efl_text_cursor_object_position_get(c2), 5);
160 efl_text_interactive_all_unselect(txt); 160 efl_text_interactive_all_unselect(txt);
161 fail_if(efl_text_interactive_have_selection_get(txt)); 161 fail_if(efl_text_interactive_have_selection_get(txt));
162 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE); 162 efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@@ -206,10 +206,10 @@ EFL_START_TEST(text_scroll_mode)
206 /*scroll mode is false by default*/ 206 /*scroll mode is false by default*/
207 fail_if(efl_ui_textbox_scrollable_get(txt)); 207 fail_if(efl_ui_textbox_scrollable_get(txt));
208 efl_ui_textbox_scrollable_set(txt, !efl_ui_textbox_scrollable_get(txt)); 208 efl_ui_textbox_scrollable_set(txt, !efl_ui_textbox_scrollable_get(txt));
209 efl_text_cursor_text_insert(cur, "World"); 209 efl_text_cursor_object_text_insert(cur, "World");
210 fail_if(!efl_ui_textbox_scrollable_get(txt)); 210 fail_if(!efl_ui_textbox_scrollable_get(txt));
211 efl_ui_textbox_scrollable_set(txt, !efl_ui_textbox_scrollable_get(txt)); 211 efl_ui_textbox_scrollable_set(txt, !efl_ui_textbox_scrollable_get(txt));
212 efl_text_cursor_text_insert(cur, "!!!"); 212 efl_text_cursor_object_text_insert(cur, "!!!");
213 213
214 ck_assert_str_eq(efl_text_get(txt),"HelloWorld!!!"); 214 ck_assert_str_eq(efl_text_get(txt),"HelloWorld!!!");
215 efl_del(txt); 215 efl_del(txt);
@@ -256,22 +256,22 @@ EFL_START_TEST(text_keys_handler)
256 Evas *e = evas_object_evas_get(txt); 256 Evas *e = evas_object_evas_get(txt);
257 efl_ui_focus_util_focus(txt); 257 efl_ui_focus_util_focus(txt);
258 258
259 efl_text_cursor_move(efl_text_interactive_main_cursor_get(txt), EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 259 efl_text_cursor_object_move(efl_text_interactive_main_cursor_get(txt), EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
260 evas_key_modifier_on(e, "Control"); 260 evas_key_modifier_on(e, "Control");
261 evas_event_feed_key_down(e, "BackSpace", "BackSpace", "\b", "\b", time(NULL), NULL); 261 evas_event_feed_key_down(e, "BackSpace", "BackSpace", "\b", "\b", time(NULL), NULL);
262 ecore_main_loop_iterate(); 262 ecore_main_loop_iterate();
263 ck_assert_str_eq(efl_text_get(txt),""); 263 ck_assert_str_eq(efl_text_get(txt),"");
264 ck_assert_int_eq(efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(txt)), 0); 264 ck_assert_int_eq(efl_text_cursor_object_position_get(efl_text_interactive_main_cursor_get(txt)), 0);
265 evas_event_feed_key_up(e, "BackSpace", "BackSpace", "\b", "\b", time(NULL), NULL); 265 evas_event_feed_key_up(e, "BackSpace", "BackSpace", "\b", "\b", time(NULL), NULL);
266 ecore_main_loop_iterate(); 266 ecore_main_loop_iterate();
267 267
268 efl_text_set(txt, "Hello"); 268 efl_text_set(txt, "Hello");
269 efl_text_cursor_position_set(efl_text_interactive_main_cursor_get(txt), 0); 269 efl_text_cursor_object_position_set(efl_text_interactive_main_cursor_get(txt), 0);
270 evas_key_modifier_on(e, "Control"); 270 evas_key_modifier_on(e, "Control");
271 evas_event_feed_key_down(e, "Delete", "Delete", "\177", "\177", time(NULL), NULL); 271 evas_event_feed_key_down(e, "Delete", "Delete", "\177", "\177", time(NULL), NULL);
272 ecore_main_loop_iterate(); 272 ecore_main_loop_iterate();
273 ck_assert_str_eq(efl_text_get(txt),""); 273 ck_assert_str_eq(efl_text_get(txt),"");
274 ck_assert_int_eq(efl_text_cursor_position_get(efl_text_interactive_main_cursor_get(txt)), 0); 274 ck_assert_int_eq(efl_text_cursor_object_position_get(efl_text_interactive_main_cursor_get(txt)), 0);
275 evas_event_feed_key_up(e, "Delete", "Delete", "\177", "\177", time(NULL), NULL); 275 evas_event_feed_key_up(e, "Delete", "Delete", "\177", "\177", time(NULL), NULL);
276 ecore_main_loop_iterate(); 276 ecore_main_loop_iterate();
277 277
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 79d69a6104..ef1596207f 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -38,7 +38,7 @@ static const char *style_buf =
38 Evas_Object *tb; \ 38 Evas_Object *tb; \
39 Evas_Textblock_Style *st; \ 39 Evas_Textblock_Style *st; \
40 Evas_Textblock_Cursor *cur; \ 40 Evas_Textblock_Cursor *cur; \
41 Efl_Text_Cursor *cur_obj; \ 41 Efl_Text_Cursor_Object *cur_obj; \
42 evas = EVAS_TEST_INIT_EVAS(); \ 42 evas = EVAS_TEST_INIT_EVAS(); \
43 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \ 43 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
44 tb = evas_object_textblock_add(evas); \ 44 tb = evas_object_textblock_add(evas); \
@@ -4351,7 +4351,7 @@ EFL_END_TEST;
4351EFL_START_TEST(evas_textblock_annotation) 4351EFL_START_TEST(evas_textblock_annotation)
4352{ 4352{
4353 START_TB_TEST(); 4353 START_TB_TEST();
4354 Efl_Text_Cursor *start, *end; 4354 Efl_Text_Cursor_Object *start, *end;
4355 4355
4356 start = efl_canvas_textblock_cursor_create(tb); 4356 start = efl_canvas_textblock_cursor_create(tb);
4357 end = efl_canvas_textblock_cursor_create(tb); 4357 end = efl_canvas_textblock_cursor_create(tb);
@@ -4367,18 +4367,18 @@ EFL_START_TEST(evas_textblock_annotation)
4367 4367
4368 /* Check some trivial cases */ 4368 /* Check some trivial cases */
4369 4369
4370 efl_text_cursor_position_set(start, 0); 4370 efl_text_cursor_object_position_set(start, 0);
4371 efl_text_cursor_position_set(end, 3); 4371 efl_text_cursor_object_position_set(end, 3);
4372 efl_text_formatter_attribute_insert(start, end, "font_size=80"); 4372 efl_text_formatter_attribute_insert(start, end, "font_size=80");
4373 efl_text_cursor_position_set(start, 1); 4373 efl_text_cursor_object_position_set(start, 1);
4374 efl_text_cursor_position_set(end, 2); 4374 efl_text_cursor_object_position_set(end, 2);
4375 efl_text_formatter_attribute_insert(start, end, "font=arial"); 4375 efl_text_formatter_attribute_insert(start, end, "font=arial");
4376 efl_text_cursor_position_set(start, 2); 4376 efl_text_cursor_object_position_set(start, 2);
4377 efl_text_cursor_position_set(end, 3); 4377 efl_text_cursor_object_position_set(end, 3);
4378 efl_text_formatter_attribute_insert(start, end, "color=#fff"); 4378 efl_text_formatter_attribute_insert(start, end, "color=#fff");
4379 4379
4380 efl_text_cursor_position_set(start, 0); 4380 efl_text_cursor_object_position_set(start, 0);
4381 efl_text_cursor_position_set(end, 3); 4381 efl_text_cursor_object_position_set(end, 3);
4382 unsigned int count = efl_text_formatter_attribute_clear(start, end); 4382 unsigned int count = efl_text_formatter_attribute_clear(start, end);
4383 fail_if(count != 3); 4383 fail_if(count != 3);
4384} 4384}
@@ -4391,7 +4391,7 @@ static const char *efl_style_buf =
4391 Evas *evas; \ 4391 Evas *evas; \
4392 Eo *txt; \ 4392 Eo *txt; \
4393 Efl_Text_Cursor_Handle *cur; \ 4393 Efl_Text_Cursor_Handle *cur; \
4394 Efl_Text_Cursor *cur_obj; \ 4394 Efl_Text_Cursor_Object *cur_obj; \
4395 evas = EVAS_TEST_INIT_EVAS(); \ 4395 evas = EVAS_TEST_INIT_EVAS(); \
4396 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \ 4396 evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
4397 txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \ 4397 txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \
@@ -4497,30 +4497,30 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4497 efl_text_set(txt, buf); 4497 efl_text_set(txt, buf);
4498 ck_assert_int_eq(strcmp(efl_text_get(txt), buf), 0); 4498 ck_assert_int_eq(strcmp(efl_text_get(txt), buf), 0);
4499 4499
4500 pos = efl_text_cursor_position_get(cur_obj); 4500 pos = efl_text_cursor_object_position_get(cur_obj);
4501 ck_assert_int_eq(pos, 0); 4501 ck_assert_int_eq(pos, 0);
4502 ck_assert(!efl_text_cursor_line_jump_by(cur_obj, -1)); 4502 ck_assert(!efl_text_cursor_object_line_jump_by(cur_obj, -1));
4503 pos = efl_text_cursor_position_get(cur_obj); 4503 pos = efl_text_cursor_object_position_get(cur_obj);
4504 ck_assert_int_eq(pos, 0); 4504 ck_assert_int_eq(pos, 0);
4505 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 1)); 4505 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 1));
4506 pos = efl_text_cursor_position_get(cur_obj); 4506 pos = efl_text_cursor_object_position_get(cur_obj);
4507 ck_assert_int_eq(pos, 10); 4507 ck_assert_int_eq(pos, 10);
4508 4508
4509 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4509 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4510 efl_text_cursor_position_set(cur_obj, 0); 4510 efl_text_cursor_object_position_set(cur_obj, 0);
4511 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 0); 4511 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 0);
4512 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 2)); 4512 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 2));
4513 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 24); 4513 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 24);
4514 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 2); 4514 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 2);
4515 ck_assert(efl_text_cursor_line_jump_by(cur_obj, -2)); 4515 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, -2));
4516 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4516 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4517 ck_assert_int_eq(efl_text_cursor_line_number_get(cur_obj), 0); 4517 ck_assert_int_eq(efl_text_cursor_object_line_number_get(cur_obj), 0);
4518 4518
4519 ck_assert(efl_text_cursor_line_jump_by(cur_obj, 2)); 4519 ck_assert(efl_text_cursor_object_line_jump_by(cur_obj, 2));
4520 efl_text_cursor_line_number_set(cur_obj, 2); 4520 efl_text_cursor_object_line_number_set(cur_obj, 2);
4521 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 24); 4521 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 24);
4522 efl_text_cursor_line_number_set(cur_obj, 0); 4522 efl_text_cursor_object_line_number_set(cur_obj, 0);
4523 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4523 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4524 4524
4525 Eo * cursor_temp = efl_duplicate(cur_obj); 4525 Eo * cursor_temp = efl_duplicate(cur_obj);
4526 ck_assert_ptr_ne(cursor_temp, NULL); 4526 ck_assert_ptr_ne(cursor_temp, NULL);
@@ -4528,172 +4528,172 @@ EFL_START_TEST(efl_canvas_textblock_cursor)
4528 cursor_temp = NULL; 4528 cursor_temp = NULL;
4529 4529
4530 Eo * cursor1 = efl_canvas_textblock_cursor_create(txt); 4530 Eo * cursor1 = efl_canvas_textblock_cursor_create(txt);
4531 efl_text_cursor_position_set(cursor1, 1); 4531 efl_text_cursor_object_position_set(cursor1, 1);
4532 pos = efl_text_cursor_position_get(cursor1); 4532 pos = efl_text_cursor_object_position_get(cursor1);
4533 ck_assert_int_eq(pos, 1); 4533 ck_assert_int_eq(pos, 1);
4534 4534
4535 efl_text_set(txt, ""); 4535 efl_text_set(txt, "");
4536 efl_text_set(txt, ""); 4536 efl_text_set(txt, "");
4537 efl_text_cursor_text_insert(cursor1, "aa"); 4537 efl_text_cursor_object_text_insert(cursor1, "aa");
4538 ck_assert_int_eq(changed_emit, 4); 4538 ck_assert_int_eq(changed_emit, 4);
4539 4539
4540 efl_text_markup_set(txt, "Hello<br/>Word"); 4540 efl_text_markup_set(txt, "Hello<br/>Word");
4541 efl_text_markup_set(txt, "Hello<br/>Word"); 4541 efl_text_markup_set(txt, "Hello<br/>Word");
4542 efl_text_cursor_markup_insert(cursor1, "aa"); 4542 efl_text_cursor_object_markup_insert(cursor1, "aa");
4543 ck_assert_int_eq(changed_emit, 6); 4543 ck_assert_int_eq(changed_emit, 6);
4544 4544
4545 efl_text_set(txt, ""); 4545 efl_text_set(txt, "");
4546 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4546 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4547 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4547 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS));
4548 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT)); 4548 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_NEXT));
4549 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS)); 4549 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CLUSTER_PREVIOUS));
4550 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START)); 4550 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_START));
4551 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END)); 4551 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_END));
4552 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START)); 4552 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START));
4553 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END)); 4553 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_END));
4554 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START)); 4554 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START));
4555 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END)); 4555 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END));
4556 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT)); 4556 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_NEXT));
4557 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS)); 4557 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_PARAGRAPH_PREVIOUS));
4558 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST)); 4558 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST));
4559 ck_assert(!efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST)); 4559 ck_assert(!efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_LAST));
4560 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 0); 4560 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 0);
4561 4561
4562 ck_assert_int_eq(changed_emit, 7); 4562 ck_assert_int_eq(changed_emit, 7);
4563 4563
4564 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment"); 4564 efl_text_markup_set(txt, "Hello World<ps/>This is EFL<br/>Enlightenment");
4565 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT)); 4565 ck_assert(efl_text_cursor_object_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_NEXT));
4566 ck_assert_int_eq(efl_text_cursor_position_get(cur_obj), 1); 4566 ck_assert_int_eq(efl_text_cursor_object_position_get(cur_obj), 1);
4567 ck_assert(efl_text_cursor_move(cur_obj, EFL_TEXT_CURSOR_MOVE_TYPE_CHARACTER_PREVIOUS)); 4567