summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2019-09-04 11:10:57 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-09-04 11:10:57 +0900
commit6cb887a8bafb8ff225020575679bbbd7abb29305 (patch)
treeee0a1e310ef6f40ad3494a624b90393f291852b4
parente3b2d3e62a909ae4110e2a0983aa7f90ae1b0cb1 (diff)
evas_textblock_legacy: change the name of efl_canvas_textblockdevs/woohyun/remove_canvas_text
-rw-r--r--src/bin/elementary/test_efl_ui_text.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/lib/edje/edje_textblock.c40
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c26
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.eo2
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.c6
-rw-r--r--src/lib/elementary/efl_ui_internal_text_scroller.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.c24
-rw-r--r--src/lib/evas/Evas_Eo.h4
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c66
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c752
-rw-r--r--src/lib/evas/canvas/evas_textblock_hyphenation.x4
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy.eo (renamed from src/lib/evas/canvas/efl_canvas_textblock.eo)2
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy.h12
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy_eo.c66
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy_eo.h (renamed from src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h)36
-rw-r--r--src/lib/evas/canvas/meson.build4
-rw-r--r--src/tests/evas/evas_test_textblock.c60
19 files changed, 556 insertions, 556 deletions
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index d8c98da07a..a72e34d80d 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -103,7 +103,7 @@ _on_bt3_clicked(void *data, const Efl_Event *event EINA_UNUSED)
103 Eo *en = data; 103 Eo *en = data;
104 104
105 efl_text_interactive_selection_cursors_get(data, &sel_start, &sel_end); 105 efl_text_interactive_selection_cursors_get(data, &sel_start, &sel_end);
106 const char *s = efl_canvas_textblock_range_text_get(data, sel_start, sel_end); 106 const char *s = evas_textblock_legacy_range_text_get(data, sel_start, sel_end);
107 107
108 printf("SELECTION REGION: %d - %d\n", 108 printf("SELECTION REGION: %d - %d\n",
109 efl_text_cursor_position_get(en, sel_start), 109 efl_text_cursor_position_get(en, sel_start),
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index cca2f4d9c6..0c81516775 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -492,7 +492,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
492 492
493 // Experimental textblock support 493 // Experimental textblock support
494 o = tb = evas_object_textblock_add(evas_object_evas_get(win)); 494 o = tb = evas_object_textblock_add(evas_object_evas_get(win));
495 efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); 495 efl_event_callback_add(o, EVAS_TEXTBLOCK_LEGACY_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
496 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL); 496 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
497 Evas_Textblock_Style *st = evas_textblock_style_new(); 497 Evas_Textblock_Style *st = evas_textblock_style_new();
498 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); 498 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 2d051dcb08..a8f2319525 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -818,7 +818,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
818 efl_text_set(efl_added, "Clicking the image will play/pause animation."), 818 efl_text_set(efl_added, "Clicking the image will play/pause animation."),
819 efl_text_interactive_editable_set(efl_added, EINA_FALSE), 819 efl_text_interactive_editable_set(efl_added, EINA_FALSE),
820 efl_gfx_hint_weight_set(efl_added, 1, 0), 820 efl_gfx_hint_weight_set(efl_added, 1, 0),
821 efl_canvas_textblock_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"), 821 evas_textblock_legacy_style_set(efl_added, NULL, "DEFAULT='align=center font=Sans font_size=10 color=#fff wrap=word'"),
822 efl_pack(bx, efl_added) 822 efl_pack(bx, efl_added)
823 ); 823 );
824 824
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index 84b4f84808..9ed9e153b3 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -61,7 +61,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
61 if (!minx2) 61 if (!minx2)
62 { 62 {
63 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 63 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
64 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 64 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
65 } 65 }
66 else 66 else
67 evas_object_textblock_size_native_get(ep->object, &tw, &th); 67 evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -87,7 +87,7 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
87 if (!maxx2) 87 if (!maxx2)
88 { 88 {
89 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 89 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
90 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 90 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
91 } 91 }
92 else 92 else
93 evas_object_textblock_size_native_get(ep->object, &tw, &th); 93 evas_object_textblock_size_native_get(ep->object, &tw, &th);
@@ -178,14 +178,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
178 if (temp_w > 0) 178 if (temp_w > 0)
179 { 179 {
180 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 180 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
181 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 181 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
182 182
183 tw += ins_l + ins_r; 183 tw += ins_l + ins_r;
184 th += ins_t + ins_b; 184 th += ins_t + ins_b;
185 } 185 }
186 else 186 else
187 { 187 {
188 efl_canvas_textblock_size_native_get(ep->object, NULL, &th); 188 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
189 189
190 th += ins_t + ins_b; 190 th += ins_t + ins_b;
191 } 191 }
@@ -216,7 +216,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
216 } 216 }
217 217
218 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 218 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
219 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 219 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
220 220
221 tw += ins_l + ins_r; 221 tw += ins_l + ins_r;
222 th += ins_t + ins_b; 222 th += ins_t + ins_b;
@@ -225,7 +225,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
225 * don't get meaningless height for multiline */ 225 * don't get meaningless height for multiline */
226 if (temp_w <= 0) 226 if (temp_w <= 0)
227 { 227 {
228 efl_canvas_textblock_size_native_get(ep->object, NULL, &th); 228 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
229 229
230 th += ins_t + ins_b; 230 th += ins_t + ins_b;
231 } 231 }
@@ -238,7 +238,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
238 * text.min: 1 X 238 * text.min: 1 X
239 * text.max: 0 X without max width. 239 * text.max: 0 X without max width.
240 * It is a singleline Textblock. */ 240 * It is a singleline Textblock. */
241 efl_canvas_textblock_size_native_get(ep->object, &tw, &th); 241 evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
242 242
243 tw += ins_l + ins_r; 243 tw += ins_l + ins_r;
244 th += ins_t + ins_b; 244 th += ins_t + ins_b;
@@ -301,14 +301,14 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
301 if (temp_w > 0) 301 if (temp_w > 0)
302 { 302 {
303 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 303 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
304 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 304 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
305 305
306 tw += ins_l + ins_r; 306 tw += ins_l + ins_r;
307 th += ins_t + ins_b; 307 th += ins_t + ins_b;
308 } 308 }
309 else 309 else
310 { 310 {
311 efl_canvas_textblock_size_native_get(ep->object, NULL, &th); 311 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
312 312
313 th += ins_t + ins_b; 313 th += ins_t + ins_b;
314 } 314 }
@@ -322,7 +322,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
322 /* text.min: 1 X 322 /* text.min: 1 X
323 * text.max: 1 X 323 * text.max: 1 X
324 * Singleline. */ 324 * Singleline. */
325 efl_canvas_textblock_size_native_get(ep->object, &tw, &th); 325 evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
326 326
327 tw += ins_l + ins_r; 327 tw += ins_l + ins_r;
328 th += ins_t + ins_b; 328 th += ins_t + ins_b;
@@ -359,7 +359,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
359 * text.max: 1 1 */ 359 * text.max: 1 1 */
360 360
361 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 361 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
362 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 362 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
363 363
364 tw += ins_l + ins_r; 364 tw += ins_l + ins_r;
365 th += ins_t + ins_b; 365 th += ins_t + ins_b;
@@ -368,7 +368,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
368 * don't get meaningless height for multiline */ 368 * don't get meaningless height for multiline */
369 if (temp_w <= 0) 369 if (temp_w <= 0)
370 { 370 {
371 efl_canvas_textblock_size_native_get(ep->object, NULL, &th); 371 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
372 372
373 th += ins_t + ins_b; 373 th += ins_t + ins_b;
374 } 374 }
@@ -386,7 +386,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
386 386
387 temp_h = efl_gfx_entity_size_get(ep->object).h; 387 temp_h = efl_gfx_entity_size_get(ep->object).h;
388 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 388 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
389 efl_canvas_textblock_size_formatted_get(ep->object, &tw, &th); 389 evas_textblock_legacy_size_formatted_get(ep->object, &tw, &th);
390 390
391 tw += ins_l + ins_r; 391 tw += ins_l + ins_r;
392 th += ins_t + ins_b; 392 th += ins_t + ins_b;
@@ -395,7 +395,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
395 * don't get meaningless height for multiline */ 395 * don't get meaningless height for multiline */
396 if (temp_w <= 0) 396 if (temp_w <= 0)
397 { 397 {
398 efl_canvas_textblock_size_native_get(ep->object, NULL, &th); 398 evas_textblock_legacy_size_native_get(ep->object, NULL, &th);
399 399
400 th += ins_t + ins_b; 400 th += ins_t + ins_b;
401 } 401 }
@@ -509,7 +509,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
509 509
510 if (ep->part->scale) base_s = TO_DOUBLE(sc); 510 if (ep->part->scale) base_s = TO_DOUBLE(sc);
511 efl_gfx_entity_scale_set(ep->object, base_s); 511 efl_gfx_entity_scale_set(ep->object, base_s);
512 efl_canvas_textblock_size_native_get(ep->object, &tw, &th); 512 evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
513 513
514 orig_s = base_s; 514 orig_s = base_s;
515 /* Now make it bigger so calculations will be more accurate 515 /* Now make it bigger so calculations will be more accurate
@@ -518,7 +518,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
518 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 518 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
519 orig_s * TO_INT(params->eval.w) / tw); 519 orig_s * TO_INT(params->eval.w) / tw);
520 efl_gfx_entity_scale_set(ep->object, orig_s); 520 efl_gfx_entity_scale_set(ep->object, orig_s);
521 efl_canvas_textblock_size_native_get(ep->object, &tw, &th); 521 evas_textblock_legacy_size_native_get(ep->object, &tw, &th);
522 } 522 }
523 if (chosen_desc->text.fit_x) 523 if (chosen_desc->text.fit_x)
524 { 524 {
@@ -527,7 +527,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
527 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 527 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
528 orig_s * TO_INT(params->eval.w) / tw); 528 orig_s * TO_INT(params->eval.w) / tw);
529 efl_gfx_entity_scale_set(ep->object, s); 529 efl_gfx_entity_scale_set(ep->object, s);
530 efl_canvas_textblock_size_native_get(ep->object, NULL, NULL); 530 evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
531 } 531 }
532 } 532 }
533 if (chosen_desc->text.fit_y) 533 if (chosen_desc->text.fit_y)
@@ -544,7 +544,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
544 } 544 }
545 545
546 efl_gfx_entity_scale_set(ep->object, s); 546 efl_gfx_entity_scale_set(ep->object, s);
547 efl_canvas_textblock_size_native_get(ep->object, NULL, NULL); 547 evas_textblock_legacy_size_native_get(ep->object, NULL, NULL);
548 } 548 }
549 } 549 }
550 550
@@ -553,7 +553,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
553 { 553 {
554 int i = 5; /* Tries before we give up. */ 554 int i = 5; /* Tries before we give up. */
555 Evas_Coord fw, fh; 555 Evas_Coord fw, fh;
556 efl_canvas_textblock_size_native_get(ep->object, &fw, &fh); 556 evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
557 557
558 /* If we are still too big, try reducing the size to 558 /* If we are still too big, try reducing the size to
559 * 95% each try. */ 559 * 95% each try. */
@@ -569,7 +569,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
569 s = tmp_s; 569 s = tmp_s;
570 570
571 efl_gfx_entity_scale_set(ep->object, s); 571 efl_gfx_entity_scale_set(ep->object, s);
572 efl_canvas_textblock_size_native_get(ep->object, &fw, &fh); 572 evas_textblock_legacy_size_native_get(ep->object, &fw, &fh);
573 i--; 573 i--;
574 } 574 }
575 } 575 }
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index a1c9bd4bd3..9ddf2332be 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -74,7 +74,7 @@ _preedit_del(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
74static Eina_Bool 74static Eina_Bool
75_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) 75_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
76{ 76{
77 Efl_Canvas_Textblock *obj = data; 77 Evas_Textblock_Legacy *obj = data;
78 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 78 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
79 const char *str; 79 const char *str;
80 80
@@ -103,7 +103,7 @@ _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSE
103static void 103static void
104_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 104_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
105{ 105{
106 Efl_Canvas_Textblock *obj = data; 106 Evas_Textblock_Legacy *obj = data;
107 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 107 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
108 char *commit_str = event_info; 108 char *commit_str = event_info;
109 109
@@ -176,7 +176,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
176static void 176static void
177_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) 177_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
178{ 178{
179 Efl_Canvas_Textblock *obj = data; 179 Evas_Textblock_Legacy *obj = data;
180 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 180 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
181 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 181 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
182 int cursor_pos; 182 int cursor_pos;
@@ -329,7 +329,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
329static void 329static void
330_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 330_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
331{ 331{
332 Efl_Canvas_Textblock *obj = data; 332 Evas_Textblock_Legacy *obj = data;
333 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 333 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
334 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 334 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
335 Ecore_IMF_Event_Delete_Surrounding *ev = event_info; 335 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
@@ -351,7 +351,7 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
351 end = evas_textblock_cursor_pos_get(del_end); 351 end = evas_textblock_cursor_pos_get(del_end);
352 if (start == end) goto end; 352 if (start == end) goto end;
353 353
354 tmp = efl_canvas_textblock_range_text_get(obj, del_start, del_end); 354 tmp = evas_textblock_legacy_range_text_get(obj, del_start, del_end);
355 355
356 info.insert = EINA_FALSE; 356 info.insert = EINA_FALSE;
357 info.position = start; 357 info.position = start;
@@ -373,7 +373,7 @@ end:
373static void 373static void
374_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 374_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
375{ 375{
376 Efl_Canvas_Textblock *obj = data; 376 Evas_Textblock_Legacy *obj = data;
377 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 377 Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
378 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 378 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
379 Ecore_IMF_Event_Selection *ev = event_info; 379 Ecore_IMF_Event_Selection *ev = event_info;
@@ -396,7 +396,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
396static Eina_Bool 396static Eina_Bool
397_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text) 397_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
398{ 398{
399 Efl_Canvas_Textblock *obj = data; 399 Evas_Textblock_Legacy *obj = data;
400 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 400 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
401 const char *selection_text = NULL; 401 const char *selection_text = NULL;
402 402
@@ -500,7 +500,7 @@ static const char *
500_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en) 500_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
501{ 501{
502 if ((!en->selection) && (en->have_selection)) 502 if ((!en->selection) && (en->have_selection))
503 en->selection = efl_canvas_textblock_range_text_get(obj, en->sel_start, en->sel_end); 503 en->selection = evas_textblock_legacy_range_text_get(obj, en->sel_start, en->sel_end);
504 return en->selection; 504 return en->selection;
505} 505}
506 506
@@ -601,7 +601,7 @@ _range_del_emit(Evas_Object *obj, Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_
601 info.position = start; 601 info.position = start;
602 info.length = end - start; 602 info.length = end - start;
603 603
604 tmp = efl_canvas_textblock_range_text_get(obj, cur1, cur2); 604 tmp = evas_textblock_legacy_range_text_get(obj, cur1, cur2);
605 info.content = tmp; 605 info.content = tmp;
606 606
607 evas_textblock_cursor_range_delete(cur1, cur2); 607 evas_textblock_cursor_range_delete(cur1, cur2);
@@ -752,7 +752,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
752 { 752 {
753 if (multiline) 753 if (multiline)
754 { 754 {
755 if (shift || efl_canvas_textblock_legacy_newline_get(obj)) 755 if (shift || evas_textblock_legacy_newline_get(obj))
756 { 756 {
757 string = "\n"; 757 string = "\n";
758 } 758 }
@@ -1070,7 +1070,7 @@ end:
1070} 1070}
1071 1071
1072static void 1072static void
1073_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) 1073_cursor_char_coord_set(Evas_Textblock_Legacy *obj, Efl_Text_Cursor_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
1074{ 1074{
1075 Evas_Coord cx, cy; 1075 Evas_Coord cx, cy;
1076 Evas_Coord x, y, lh = 0, cly = 0; 1076 Evas_Coord x, y, lh = 0, cly = 0;
@@ -1337,9 +1337,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
1337 en->sel_start = evas_object_textblock_cursor_new(obj); 1337 en->sel_start = evas_object_textblock_cursor_new(obj);
1338 en->sel_end = evas_object_textblock_cursor_new(obj); 1338 en->sel_end = evas_object_textblock_cursor_new(obj);
1339 1339
1340 efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, 1340 efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
1341 _sel_cursor_changed, obj); 1341 _sel_cursor_changed, obj);
1342 efl_event_callback_add(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, 1342 efl_event_callback_add(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
1343 _sel_cursor_changed, obj); 1343 _sel_cursor_changed, obj);
1344 1344
1345 en->input_panel_enable = EINA_TRUE; 1345 en->input_panel_enable = EINA_TRUE;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index 1126cb81bf..d107c089bf 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive 1class @beta Efl.Ui.Internal.Text.Interactive extends Evas.Textblock.Legacy implements Efl.Text_Interactive
2{ 2{
3 [[An internal object in charge of the interactive aspect of the text widget. 3 [[An internal object in charge of the interactive aspect of the text widget.
4 4
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c
index 455adb5ac2..b1870a3466 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -28,7 +28,7 @@
28 28
29typedef struct _Efl_Ui_Internal_Text_Scroller_Data 29typedef struct _Efl_Ui_Internal_Text_Scroller_Data
30{ 30{
31 Efl_Canvas_Textblock *text_obj; 31 Evas_Textblock_Legacy *text_obj;
32 Efl_Ui_Table *text_table; 32 Efl_Ui_Table *text_table;
33 Eo *smanager; 33 Eo *smanager;
34 34
@@ -93,7 +93,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj,
93 efl_event_freeze(sd->text_obj); 93 efl_event_freeze(sd->text_obj);
94 efl_gfx_entity_size_set(sd->text_table, view.size); 94 efl_gfx_entity_size_set(sd->text_table, view.size);
95 efl_gfx_entity_size_set(sd->text_obj, view.size); 95 efl_gfx_entity_size_set(sd->text_obj, view.size);
96 efl_canvas_textblock_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h); 96 evas_textblock_legacy_size_formatted_get(sd->text_obj, &fsz.w, &fsz.h);
97 efl_gfx_entity_size_set(sd->text_table, sz); 97 efl_gfx_entity_size_set(sd->text_table, sz);
98 efl_gfx_entity_size_set(sd->text_obj, sz); 98 efl_gfx_entity_size_set(sd->text_obj, sz);
99 efl_event_thaw(sd->text_obj); 99 efl_event_thaw(sd->text_obj);
@@ -144,7 +144,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj,
144EOLIAN static void 144EOLIAN static void
145_efl_ui_internal_text_scroller_initialize(Eo *obj, 145_efl_ui_internal_text_scroller_initialize(Eo *obj,
146 Efl_Ui_Internal_Text_Scroller_Data *sd, 146 Efl_Ui_Internal_Text_Scroller_Data *sd,
147 Efl_Canvas_Textblock *text_obj, 147 Evas_Textblock_Legacy *text_obj,
148 Efl_Ui_Table *text_table) 148 Efl_Ui_Table *text_table)
149{ 149{
150 if (efl_finalized_get(obj)) 150 if (efl_finalized_get(obj))
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.eo b/src/lib/elementary/efl_ui_internal_text_scroller.eo
index 4b55bdfb15..d7ae9bf2fe 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -38,7 +38,7 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
38 This should be called upon constructing the object. 38 This should be called upon constructing the object.
39 ]] 39 ]]
40 params { 40 params {
41 text_obj: Efl.Canvas.Textblock; [[The text object to query]] 41 text_obj: Evas.Textblock.Legacy; [[The text object to query]]
42 text_table: Efl.Ui.Table; [[The table container of 42 text_table: Efl.Ui.Table; [[The table container of
43 the $text_obj]] 43 the $text_obj]]
44 } 44 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 9bd5e635bd..b00ce7f440 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -610,7 +610,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj,
610 efl_text_interactive_selection_cursors_get(obj, &start, &end); 610 efl_text_interactive_selection_cursors_get(obj, &start, &end);
611 if (!efl_text_cursor_equal(obj, start, end)) 611 if (!efl_text_cursor_equal(obj, start, end))
612 { 612 {
613 efl_canvas_textblock_range_delete(obj, start, end); 613 evas_textblock_legacy_range_delete(obj, start, end);
614 } 614 }
615 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); 615 cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN);
616 info.insert = EINA_TRUE; 616 info.insert = EINA_TRUE;
@@ -917,9 +917,9 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
917 efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0)); 917 efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0));
918 /* ignore current object size for single-line since we always need to know the actual size */ 918 /* ignore current object size for single-line since we always need to know the actual size */
919 if (sd->single_line) 919 if (sd->single_line)
920 efl_canvas_textblock_size_native_get(sd->text_obj, &min.w, &min.h); 920 evas_textblock_legacy_size_native_get(sd->text_obj, &min.w, &min.h);
921 else 921 else
922 efl_canvas_textblock_size_formatted_get(sd->text_obj, &min.w, &min.h); 922 evas_textblock_legacy_size_formatted_get(sd->text_obj, &min.w, &min.h);
923 efl_gfx_entity_size_set(sd->text_obj, text_sz); 923 efl_gfx_entity_size_set(sd->text_obj, text_sz);
924 efl_event_thaw(sd->text_obj); 924 efl_event_thaw(sd->text_obj);
925 min.w += edmin.w; 925 min.w += edmin.w;
@@ -937,7 +937,7 @@ _return_key_enabled_check(Evas_Object *obj)
937 937
938 if (!sd->auto_return_key) return; 938 if (!sd->auto_return_key) return;
939 939
940 if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE) 940 if (evas_textblock_legacy_is_empty_get(obj) == EINA_TRUE)
941 return_key_disabled = EINA_TRUE; 941 return_key_disabled = EINA_TRUE;
942 942
943 efl_ui_text_input_panel_return_key_disabled_set(obj, return_key_disabled); 943 efl_ui_text_input_panel_return_key_disabled_set(obj, return_key_disabled);
@@ -1243,7 +1243,7 @@ _cut_cb(Eo *obj)
1243 1243
1244 _selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj); 1244 _selection_store(EFL_UI_SELECTION_TYPE_CLIPBOARD, obj);
1245 efl_text_interactive_selection_cursors_get(obj, &start, &end); 1245 efl_text_interactive_selection_cursors_get(obj, &start, &end);
1246 efl_canvas_textblock_range_delete(obj, start, end); 1246 evas_textblock_legacy_range_delete(obj, start, end);
1247 _efl_ui_text_select_none(obj, sd); 1247 _efl_ui_text_select_none(obj, sd);
1248} 1248}
1249 1249
@@ -2126,7 +2126,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
2126 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj); 2126 efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED, obj);
2127 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj); 2127 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, obj);
2128 sd->text_obj = text_obj; 2128 sd->text_obj = text_obj;
2129 sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj); 2129 sd->text_guide_obj = efl_add(EVAS_TEXTBLOCK_LEGACY_CLASS, obj);
2130 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj); 2130 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
2131 efl_composite_attach(obj, text_obj); 2131 efl_composite_attach(obj, text_obj);
2132 2132
@@ -2190,11 +2190,11 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2190 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL); 2190 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
2191 efl_event_callback_add(sd->text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, 2191 efl_event_callback_add(sd->text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER,
2192 _efl_ui_text_changed_user_cb, obj); 2192 _efl_ui_text_changed_user_cb, obj);
2193 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, 2193 efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED,
2194 _efl_ui_text_changed_cb, obj); 2194 _efl_ui_text_changed_cb, obj);
2195 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED, 2195 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_TEXT_SELECTION_CHANGED,
2196 _efl_ui_text_selection_changed_cb, obj); 2196 _efl_ui_text_selection_changed_cb, obj);
2197 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, 2197 efl_event_callback_add(sd->text_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED,
2198 _efl_ui_text_cursor_changed_cb, obj); 2198 _efl_ui_text_cursor_changed_cb, obj);
2199 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED, 2199 efl_event_callback_add(sd->text_obj, EFL_GFX_ENTITY_EVENT_POSITION_CHANGED,
2200 _text_position_changed_cb, obj); 2200 _text_position_changed_cb, obj);
@@ -2357,7 +2357,7 @@ _efl_ui_text_selection_get(const Eo *obj, Efl_Ui_Text_Data *sd)
2357 if ((sd->password)) return NULL; 2357 if ((sd->password)) return NULL;
2358 2358
2359 efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj); 2359 efl_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
2360 return efl_canvas_textblock_range_text_get(obj, start_obj, end_obj); 2360 return evas_textblock_legacy_range_text_get(obj, start_obj, end_obj);
2361} 2361}
2362 2362
2363EOLIAN static void 2363EOLIAN static void
@@ -3535,7 +3535,7 @@ _update_text_selection(Eo *obj, Eo *text_obj)
3535 3535
3536 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); 3536 efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
3537 3537
3538 range = efl_canvas_textblock_range_simple_geometry_get(text_obj, 3538 range = evas_textblock_legacy_range_simple_geometry_get(text_obj,
3539 sel_start, sel_end); 3539 sel_start, sel_end);
3540 3540
3541 l = sd->sel; 3541 l = sd->sel;
@@ -3765,7 +3765,7 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
3765 efl_text_annotation_positions_get(obj, anc->annotation, 3765 efl_text_annotation_positions_get(obj, anc->annotation,
3766 start, end); 3766 start, end);
3767 3767
3768 range = efl_canvas_textblock_range_geometry_get(obj, start, end); 3768 range = evas_textblock_legacy_range_geometry_get(obj, start, end);
3769 count = eina_list_count(eina_iterator_container_get(range)); 3769 count = eina_list_count(eina_iterator_container_get(range));
3770 3770
3771 // Add additional rectangles if needed 3771 // Add additional rectangles if needed
@@ -3979,7 +3979,7 @@ _efl_ui_text_selection_changed_cb(void *data, const Efl_Event *event EINA_UNUSED
3979 3979
3980 efl_text_interactive_selection_cursors_get(obj, &start, &end); 3980 efl_text_interactive_selection_cursors_get(obj, &start, &end);
3981 3981
3982 text = efl_canvas_textblock_range_text_get(obj, start, end); 3982 text = evas_textblock_legacy_range_text_get(obj, start, end);
3983 if (!text || (text[0] == '\0')) 3983 if (!text || (text[0] == '\0'))
3984 { 3984 {
3985 _edje_signal_emit(sd, "selection,cleared", "efl.text"); 3985 _edje_signal_emit(sd, "selection,cleared", "efl.text");
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index cdec492829..79b62bfaba 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -150,12 +150,12 @@ struct _Efl_Canvas_Object_Animation_Event
150 */ 150 */
151 151
152/** 152/**
153 * @ingroup Efl_Canvas_Textblock 153 * @ingroup Evas_Textblock_Legacy
154 * 154 *
155 * @{ 155 * @{
156 */ 156 */
157//#include "canvas/efl_canvas_text_cursor.eo.h" 157//#include "canvas/efl_canvas_text_cursor.eo.h"
158#include "canvas/efl_canvas_textblock.eo.h" 158#include "canvas/evas_textblock_legacy.eo.h"
159#include "canvas/efl_canvas_text_factory.eo.h" 159#include "canvas/efl_canvas_text_factory.eo.h"
160/** 160/**
161 * @} 161 * @}
diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
deleted file mode 100644
index 5ee2f8fd24..0000000000
--- a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
+++ /dev/null
@@ -1,66 +0,0 @@
1
2EAPI Eina_Bool
3evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
4{
5 return efl_canvas_textblock_visible_range_get(obj, start, end);
6}
7
8EAPI void
9evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b)
10{
11 efl_canvas_textblock_style_insets_get(obj, l, r, t, b);
12}
13
14EAPI void
15evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim)
16{
17 efl_canvas_textblock_bidi_delimiters_set(obj, delim);
18}
19
20EAPI const char *
21evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj)
22{
23 return efl_canvas_textblock_bidi_delimiters_get(obj);
24}
25
26EAPI void
27evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode)
28{
29 efl_canvas_textblock_legacy_newline_set(obj, mode);
30}
31
32EAPI Eina_Bool
33evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj)
34{
35 return efl_canvas_textblock_legacy_newline_get(obj);
36}
37
38EAPI void
39evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
40{
41 efl_canvas_textblock_size_formatted_get(obj, w, h);
42}
43
44EAPI void
45evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
46{
47 efl_canvas_textblock_size_native_get(obj, w, h);
48}
49
50EAPI Eina_Bool
51evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
52{
53 return efl_canvas_textblock_obstacle_add(obj, eo_obs);
54}
55
56EAPI Eina_Bool
57evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
58{
59 return efl_canvas_textblock_obstacle_del(obj, eo_obs);
60}
61
62EAPI void
63evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj)
64{
65 efl_canvas_textblock_obstacles_update(obj);
66}
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 2adfeef39c..2f1b08f50c 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -70,9 +70,9 @@
70//#define LYDBG(f, args...) printf(f, ##args) 70//#define LYDBG(f, args...) printf(f, ##args)
71#define LYDBG(f, args...) 71#define LYDBG(f, args...)
72 72
73#define MY_CLASS EFL_CANVAS_TEXTBLOCK_CLASS 73#define MY_CLASS EVAS_TEXTBLOCK_LEGACY_CLASS
74 74
75#define MY_CLASS_NAME "Efl Canvas Textblock" 75#define MY_CLASS_NAME "Evas Textblock Legacy"
76 76
77#include "linebreak.h" 77#include "linebreak.h"
78#include "wordbreak.h" 78#include "wordbreak.h"
@@ -143,10 +143,10 @@ static const char o_type[] = "textblock";
143/* private struct for textblock object internal data */ 143/* private struct for textblock object internal data */
144/** 144/**
145 * @internal 145 * @internal
146 * @typedef Efl_Canvas_Textblock_Data 146 * @typedef Evas_Textblock_Legacy_Data
147 * The actual textblock object. 147 * The actual textblock object.
148 */ 148 */
149typedef struct _Evas_Object_Textblock Efl_Canvas_Textblock_Data; 149typedef struct _Evas_Object_Textblock Evas_Textblock_Legacy_Data;
150/** 150/**
151 * @internal 151 * @internal
152 * @typedef Evas_Object_Style_Tag 152 * @typedef Evas_Object_Style_Tag
@@ -221,22 +221,22 @@ typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Itera
221typedef struct _Efl_Text_Annotate_Annotation_Iterator Efl_Text_Annotate_Annotation_Iterator; 221typedef struct _Efl_Text_Annotate_Annotation_Iterator Efl_Text_Annotate_Annotation_Iterator;
222/** 222/**
223 * @internal 223 * @internal
224 * @typedef Efl_Canvas_Textblock_Filter 224 * @typedef Evas_Textblock_Legacy_Filter
225 * A structure holding gfx filter information for a text item 225 * A structure holding gfx filter information for a text item
226 */ 226 */
227typedef struct _Efl_Canvas_Textblock_Filter Efl_Canvas_Textblock_Filter; 227typedef struct _Evas_Textblock_Legacy_Filter Evas_Textblock_Legacy_Filter;
228/** 228/**
229 * @internal 229 * @internal
230 * @typedef Efl_Canvas_Textblock_Filter_Post_Render 230 * @typedef Evas_Textblock_Legacy_Filter_Post_Render
231 * Post-render data for async rendering of gfx filters 231 * Post-render data for async rendering of gfx filters
232 */ 232 */
233typedef struct _Efl_Canvas_Textblock_Filter_Post_Render Efl_Canvas_Textblock_Filter_Post_Render; 233typedef struct _Evas_Textblock_Legacy_Filter_Post_Render Evas_Textblock_Legacy_Filter_Post_Render;
234/** 234/**
235 * @internal 235 * @internal
236 * @typedef Efl_Canvas_Textblock_Filter_Program 236 * @typedef Evas_Textblock_Legacy_Filter_Program
237 * Filter name - code database 237 * Filter name - code database
238 */ 238 */
239typedef struct _Efl_Canvas_Textblock_Filter_Program Efl_Canvas_Textblock_Filter_Program; 239typedef struct _Evas_Textblock_Legacy_Filter_Program Evas_Textblock_Legacy_Filter_Program;
240/** 240/**
241 * @internal 241 * @internal
242 * @typedef Text_Item_Filter 242 * @typedef Text_Item_Filter
@@ -468,7 +468,7 @@ struct _Evas_Object_Textblock_Format_Item
468struct _Text_Item_Filter 468struct _Text_Item_Filter
469{ 469{
470 EINA_INLIST; /**< list on the tb object */ 470 EINA_INLIST; /**< list on the tb object */
471 Efl_Canvas_Textblock_Data *textblock; 471 Evas_Textblock_Legacy_Data *textblock;
472 Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */ 472 Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */
473 Evas_Filter_Context *ctx; /**< running context for the filter */ 473 Evas_Filter_Context *ctx; /**< running context for the filter */
474 Evas_Public_Data *evas; /**< evas instance */ 474 Evas_Public_Data *evas; /**< evas instance */
@@ -476,7 +476,7 @@ struct _Text_Item_Filter
476 Eina_Bool do_async; /**< do_async flag when running the filter */ 476 Eina_Bool do_async; /**< do_async flag when running the filter */
477}; 477};
478 478
479struct _Efl_Canvas_Textblock_Filter 479struct _Evas_Textblock_Legacy_Filter
480{ 480{
481 Eina_Stringshare *name; 481 Eina_Stringshare *name;
482 Evas_Object *eo_obj; 482 Evas_Object *eo_obj;
@@ -487,13 +487,13 @@ struct _Efl_Canvas_Textblock_Filter
487 Eina_Bool redraw; 487 Eina_Bool redraw;
488}; 488};
489 489
490struct _Efl_Canvas_Textblock_Filter_Post_Render 490struct _Evas_Textblock_Legacy_Filter_Post_Render
491{ 491{
492 Evas_Filter_Context *ctx; 492 Evas_Filter_Context *ctx;
493 Eina_Bool success; 493 Eina_Bool success;
494}; 494};
495 495
496struct _Efl_Canvas_Textblock_Filter_Program 496struct _Evas_Textblock_Legacy_Filter_Program
497{ 497{
498 EINA_INLIST; 498 EINA_INLIST;
499 Eina_Stringshare *name; 499 Eina_Stringshare *name;
@@ -523,7 +523,7 @@ struct _Evas_Object_Textblock_Format
523 struct { 523 struct {
524 int l, r; 524 int l, r;
525 } margin; /**< Left and right margin width. */ 525 } margin; /**< Left and right margin width. */
526 Efl_Canvas_Textblock_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */ 526 Evas_Textblock_Legacy_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */
527 int ref; /**< Value of the ref. */ 527 int ref; /**< Value of the ref. */
528 int tabstops; /**< Value of the size of the tab character. */ 528 int tabstops; /**< Value of the size of the tab character. */
529 int linesize; /**< Value of the size of the line of the text. */ 529 int linesize; /**< Value of the size of the line of the text. */
@@ -549,7 +549,7 @@ struct _Evas_Object_Textblock_Format
549 Evas_Textblock_Align_Auto halign_auto : 2; /**< Auto horizontal align mode */ 549 Evas_Textblock_Align_Auto halign_auto : 2; /**< Auto horizontal align mode */
550}; 550};
551 551
552struct _Efl_Canvas_Textblock_Style 552struct _Evas_Textblock_Legacy_Style
553{ 553{
554 const char *style_text; 554 const char *style_text;
555 const char *default_tag; 555 const char *default_tag;
@@ -650,7 +650,7 @@ struct _Evas_Object_Textblock
650 Eina_Bool valid : 1; 650 Eina_Bool valid : 1;
651 } formatted, native; 651 } formatted, native;
652 struct { 652 struct {
653 Efl_Canvas_Textblock_Filter_Program *programs; 653 Evas_Textblock_Legacy_Filter_Program *programs;
654 Evas_Filter_Data_Binding *data_bindings; 654 Evas_Filter_Data_Binding *data_bindings;
655 Eina_Hash *sources; 655 Eina_Hash *sources;
656 Text_Item_Filter *text_items; // inlist 656 Text_Item_Filter *text_items; // inlist
@@ -741,37 +741,37 @@ static const Evas_Object_Func object_func =
741 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 741 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
742 return; \ 742 return; \
743 MAGIC_CHECK_END(); \ 743 MAGIC_CHECK_END(); \
744 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 744 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
745 745
746#define TB_HEAD_RETURN(x) \ 746#define TB_HEAD_RETURN(x) \
747 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 747 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
748 return (x); \ 748 return (x); \
749 MAGIC_CHECK_END(); 749 MAGIC_CHECK_END();
750static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor *cur); 750static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Cursor *cur);
751static void _evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n); 751static void _evas_textblock_node_text_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *n);
752static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cursor *cur); 752static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Cursor *cur);
753static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt); 753static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt);
754static void _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment); 754static void _evas_textblock_node_format_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
755static void _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n); 755static void _evas_textblock_node_format_free(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n);
756static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n); 756static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n);
757static void _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj); 757static void _evas_textblock_changed(Evas_Textblock_Legacy_Data *o, Evas_Object *eo_obj);
758static void _evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o); 758static void _evas_textblock_invalidate_all(Evas_Textblock_Legacy_Data *o);
759static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset); 759static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset);
760static void _evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node); 760static void _evas_textblock_cursors_set_node(Evas_Textblock_Legacy_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node);
761static void _evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o); 761static void _evas_textblock_annotations_clear(Evas_Textblock_Legacy_Data *o);
762static void _evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes); 762static void _evas_textblock_annotation_remove(Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes);
763 763
764static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor *cur); 764static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Cursor *cur);
765static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt); 765static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Cursor *cur, const Evas_Object_Textblock_Node_Format *fmt);
766static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb); 766static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb);
767static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt); 767static Evas_Filter_Program *_format_filter_program_get(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Format *fmt);
768static const char *_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len); 768static const char *_textblock_format_node_from_style_tag(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len);
769#ifdef HAVE_HYPHEN 769#ifdef HAVE_HYPHEN
770/* Hyphenation */ 770/* Hyphenation */
771#include "evas_textblock_hyphenation.x" 771#include "evas_textblock_hyphenation.x"
772#endif 772#endif
773 773
774static int _efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *text); 774static int _evas_textblock_legacy_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *text);
775static Eina_Bool _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur, const char *format, Evas_Object_Textblock_Node_Format **_fnode, Eina_Bool is_item); 775static Eina_Bool _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur, const char *format, Evas_Object_Textblock_Node_Format **_fnode, Eina_Bool is_item);
776EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur); 776EAPI Eina_Bool evas_textblock_cursor_eol_get(const Evas_Textblock_Cursor *cur);
777static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb); 777static void _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb);
@@ -955,7 +955,7 @@ _style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len)
955static void 955static void
956_nodes_clear(const Evas_Object *eo_obj) 956_nodes_clear(const Evas_Object *eo_obj)
957{ 957{
958 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 958 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
959 959
960 /* First, clear all annotations that may have spawned format nodes. */ 960 /* First, clear all annotations that may have spawned format nodes. */
961 _evas_textblock_annotations_clear(o); 961 _evas_textblock_annotations_clear(o);
@@ -1025,7 +1025,7 @@ _image_safe_unref(Evas_Public_Data *e, void *image, Eina_Bool async)
1025 */ 1025 */
1026static void 1026static void
1027_item_free(Evas_Public_Data *evas, 1027_item_free(Evas_Public_Data *evas,
1028 Efl_Canvas_Textblock_Data *o, 1028 Evas_Textblock_Legacy_Data *o,
1029 Evas_Object_Protected_Data *evas_o, 1029 Evas_Object_Protected_Data *evas_o,
1030 Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it) 1030 Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it)
1031{ 1031{
@@ -2305,7 +2305,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2305 } 2305 }
2306 else if (cmd == text_valignstr) 2306 else if (cmd == text_valignstr)
2307 { 2307 {
2308 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2308 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2309 char *endptr = NULL; 2309 char *endptr = NULL;
2310 double val = strtod(param, &endptr); 2310 double val = strtod(param, &endptr);
2311 o->valign = val; 2311 o->valign = val;
@@ -2775,7 +2775,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2775 fmt->ellipsis = -1.0; 2775 fmt->ellipsis = -1.0;
2776 else 2776 else
2777 { 2777 {
2778 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2778 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2779 o->have_ellipsis = 1; 2779 o->have_ellipsis = 1;
2780 } 2780 }
2781 } 2781 }
@@ -2802,7 +2802,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2802 } 2802 }
2803 else if (cmd == replacement_charstr) 2803 else if (cmd == replacement_charstr)
2804 { 2804 {
2805 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2805 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2806 eina_stringshare_replace(&o->repch, param); 2806 eina_stringshare_replace(&o->repch, param);
2807 } 2807 }
2808 else if (cmd == underline_dash_widthstr) 2808 else if (cmd == underline_dash_widthstr)
@@ -2863,7 +2863,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2863 * @endcode 2863 * @endcode
2864 */ 2864 */
2865 if (!fmt->gfx_filter) 2865 if (!fmt->gfx_filter)
2866 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter)); 2866 fmt->gfx_filter = calloc(1, sizeof(Evas_Textblock_Legacy_Filter));
2867 eina_stringshare_replace(&fmt->gfx_filter->name, param); 2867 eina_stringshare_replace(&fmt->gfx_filter->name, param);
2868 } 2868 }
2869} 2869}
@@ -3187,7 +3187,7 @@ typedef struct _Ctxt Ctxt;
3187struct _Ctxt 3187struct _Ctxt
3188{ 3188{
3189 Evas_Object *obj; 3189 Evas_Object *obj;
3190 Efl_Canvas_Textblock_Data *o; 3190 Evas_Textblock_Legacy_Data *o;
3191 Evas_Object_Protected_Data *evas_o; 3191 Evas_Object_Protected_Data *evas_o;
3192 Evas_Public_Data *evas; 3192 Evas_Public_Data *evas;
3193 3193
@@ -3403,7 +3403,7 @@ _layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt)
3403} 3403}
3404 3404
3405static inline Evas_Object_Textblock_Paragraph * 3405static inline Evas_Object_Textblock_Paragraph *
3406_layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y) 3406_layout_find_paragraph_by_y(Evas_Textblock_Legacy_Data *o, Evas_Coord y)
3407{ 3407{
3408 Evas_Object_Textblock_Paragraph *start, *par; 3408 Evas_Object_Textblock_Paragraph *start, *par;
3409 int i; 3409 int i;
@@ -3429,7 +3429,7 @@ _layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y)
3429} 3429}
3430 3430
3431static inline Evas_Object_Textblock_Paragraph * 3431static inline Evas_Object_Textblock_Paragraph *
3432_layout_find_paragraph_by_line_no(Efl_Canvas_Textblock_Data *o, int line_no) 3432_layout_find_paragraph_by_line_no(Evas_Textblock_Legacy_Data *o, int line_no)
3433{ 3433{
3434 Evas_Object_Textblock_Paragraph *start, *par; 3434 Evas_Object_Textblock_Paragraph *start, *par;
3435 int i; 3435 int i;
@@ -3510,7 +3510,7 @@ _layout_paragraph_new(Ctxt *c, Evas_Object_Textblock_Node_Text *n,
3510 * @param par The paragraph to update 3510 * @param par The paragraph to update
3511 */ 3511 */
3512static inline void 3512static inline void
3513_layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o, 3513_layout_update_bidi_props(const Evas_Textblock_Legacy_Data *o,
3514 Evas_Object_Textblock_Paragraph *par) 3514 Evas_Object_Textblock_Paragraph *par)
3515{ 3515{
3516 if (par->text_node) 3516 if (par->text_node)
@@ -3560,7 +3560,7 @@ _layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o,
3560 */ 3560 */
3561static void 3561static void
3562_paragraph_clear(Evas_Public_Data *evas, 3562_paragraph_clear(Evas_Public_Data *evas,
3563 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, 3563 Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
3564 Evas_Object_Textblock_Paragraph *par) 3564 Evas_Object_Textblock_Paragraph *par)
3565{ 3565{
3566 while (par->lines) 3566 while (par->lines)
@@ -3597,7 +3597,7 @@ _paragraph_clear(Evas_Public_Data *evas,
3597 */ 3597 */
3598static void 3598static void
3599_paragraph_free(Evas_Public_Data *evas, 3599_paragraph_free(Evas_Public_Data *evas,
3600 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, 3600 Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
3601 Evas_Object_Textblock_Paragraph *par) 3601 Evas_Object_Textblock_Paragraph *par)
3602{ 3602{
3603 _paragraph_clear(evas, o, obj, par); 3603 _paragraph_clear(evas, o, obj, par);
@@ -3650,7 +3650,7 @@ _paragraphs_clear(Ctxt *c)
3650 */ 3650 */
3651static void 3651static void
3652_paragraphs_free(Evas_Public_Data *evas, 3652_paragraphs_free(Evas_Public_Data *evas,
3653 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, 3653 Evas_Textblock_Legacy_Data *o, Evas_Object_Protected_Data *obj,
3654 Evas_Object_Textblock_Paragraph *pars) 3654 Evas_Object_Textblock_Paragraph *pars)
3655{ 3655{
3656 o->num_paragraphs = 0; 3656 o->num_paragraphs = 0;
@@ -3677,7 +3677,7 @@ static Evas_Object_Textblock_Format *
3677_layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, 3677_layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
3678 Evas_Object_Textblock_Node_Format *fnode) 3678 Evas_Object_Textblock_Node_Format *fnode)
3679{ 3679{
3680 Efl_Canvas_Textblock_Data *o = c->o; 3680 Evas_Textblock_Legacy_Data *o = c->o;
3681 3681
3682 if (fmt) 3682 if (fmt)
3683 { 3683 {
@@ -3726,7 +3726,7 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
3726 { 3726 {
3727 if (!fmt->gfx_filter) 3727 if (!fmt->gfx_filter)
3728 { 3728 {
3729 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter)); 3729 fmt->gfx_filter = calloc(1, sizeof(Evas_Textblock_Legacy_Filter));
3730 eina_stringshare_replace(&fmt->gfx_filter->name, 3730 eina_stringshare_replace(&fmt->gfx_filter->name,
3731 _FMT_INFO(gfx_filter_name)); 3731 _FMT_INFO(gfx_filter_name));
3732 } 3732 }
@@ -4898,10 +4898,10 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
4898 evas_font_free(of); 4898 evas_font_free(of);
4899} 4899}
4900 4900
4901static Efl_Canvas_Textblock_Filter_Program * 4901static Evas_Textblock_Legacy_Filter_Program *
4902_filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name) 4902_filter_program_find(Evas_Textblock_Legacy_Data *o, const char *name)
4903{ 4903{
4904 Efl_Canvas_Textblock_Filter_Program *prg; 4904 Evas_Textblock_Legacy_Filter_Program *prg;
4905 4905
4906 if (!name) return NULL; 4906 if (!name) return NULL;
4907 EINA_INLIST_FOREACH(o->gfx_filter.programs, prg) 4907 EINA_INLIST_FOREACH(o->gfx_filter.programs, prg)
@@ -4914,10 +4914,10 @@ _filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name)
4914} 4914}
4915 4915
4916static Evas_Filter_Program * 4916static Evas_Filter_Program *
4917_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt) 4917_format_filter_program_get(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Format *fmt)
4918{ 4918{
4919 Efl_Canvas_Textblock_Filter_Program *program; 4919 Evas_Textblock_Legacy_Filter_Program *program;
4920 Efl_Canvas_Textblock_Filter *filter; 4920 Evas_Textblock_Legacy_Filter *filter;
4921 Evas_Filter_Program *pgm; 4921 Evas_Filter_Program *pgm;
4922 4922
4923 filter = fmt->gfx_filter; 4923 filter = fmt->gfx_filter;
@@ -5719,7 +5719,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
5719 5719
5720/* Don't do much for the meanwhile. */ 5720/* Don't do much for the meanwhile. */
5721static inline void 5721static inline void
5722_layout_paragraph_render(Efl_Canvas_Textblock_Data *o, 5722_layout_paragraph_render(Evas_Textblock_Legacy_Data *o,
5723 Evas_Object_Textblock_Paragraph *par) 5723 Evas_Object_Textblock_Paragraph *par)
5724{ 5724{
5725 if (par->rendered) 5725 if (par->rendered)
@@ -6571,7 +6571,7 @@ _layout_pre(Ctxt *c)
6571{ 6571{
6572 int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b; 6572 int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b;
6573 Evas_Object *eo_obj = c->obj; 6573 Evas_Object *eo_obj = c->obj;
6574 Efl_Canvas_Textblock_Data *o = c->o; 6574 Evas_Textblock_Legacy_Data *o = c->o;
6575 6575
6576 style_pad_l = &c->style_pad.l; 6576 style_pad_l = &c->style_pad.l;
6577 style_pad_r = &c->style_pad.r; 6577 style_pad_r = &c->style_pad.r;
@@ -6939,7 +6939,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
6939 LYDBG("ZZ: ... layout #2\n"); 6939 LYDBG("ZZ: ... layout #2\n");
6940 c->o->content_changed = 0; 6940 c->o->content_changed = 0;
6941 _layout(c->obj, c->w, c->h, w_ret, h_ret); 6941 _layout(c->obj, c->w, c->h, w_ret, h_ret);
6942 efl_event_callback_call(c->obj, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, NULL); 6942 efl_event_callback_call(c->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_STYLE_INSETS_CHANGED, NULL);
6943 6943
6944 c->o->obstacle_changed = EINA_FALSE; 6944 c->o->obstacle_changed = EINA_FALSE;
6945 } 6945 }
@@ -6948,7 +6948,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
6948static Eina_Bool 6948static Eina_Bool
6949_layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h) 6949_layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h)
6950{ 6950{
6951 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 6951 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
6952 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 6952 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
6953 Evas *eo_e; 6953 Evas *eo_e;
6954 /* setup context */ 6954 /* setup context */
@@ -7071,7 +7071,7 @@ static void
7071_relayout(const Evas_Object *eo_obj) 7071_relayout(const Evas_Object *eo_obj)
7072{ 7072{
7073 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7073 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7074 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7074 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7075 _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, 7075 _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
7076 &o->formatted.w, &o->formatted.h); 7076 &o->formatted.w, &o->formatted.h);
7077 o->formatted.valid = 1; 7077 o->formatted.valid = 1;
@@ -7103,7 +7103,7 @@ _relayout(const Evas_Object *eo_obj)
7103 * Check if the object needs a relayout, and if so, execute it. 7103 * Check if the object needs a relayout, and if so, execute it.
7104 */ 7104 */
7105static Eina_Bool 7105static Eina_Bool
7106_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o) 7106_relayout_if_needed(const Evas_Object *eo_obj, Evas_Textblock_Legacy_Data *o)
7107{ 7107{
7108 ASYNC_BLOCK; 7108 ASYNC_BLOCK;
7109 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7109 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -7137,7 +7137,7 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex
7137{ 7137{
7138 Evas_Object_Textblock_Paragraph *found_par; 7138 Evas_Object_Textblock_Paragraph *found_par;
7139 Evas_Object_Textblock_Line *ln; 7139 Evas_Object_Textblock_Line *ln;
7140 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7140 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7141 7141
7142 _relayout_if_needed(eo_obj, o); 7142 _relayout_if_needed(eo_obj, o);
7143 7143
@@ -7194,7 +7194,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
7194{ 7194{
7195 Evas_Object_Textblock_Paragraph *par; 7195 Evas_Object_Textblock_Paragraph *par;
7196 Evas_Object_Textblock_Line *ln; 7196 Evas_Object_Textblock_Line *ln;
7197 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7197 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7198 7198
7199 par = _layout_find_paragraph_by_line_no(o, line); 7199 par = _layout_find_paragraph_by_line_no(o, line);
7200 if (par) 7200 if (par)
@@ -7211,7 +7211,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
7211EAPI Evas_Object * 7211EAPI Evas_Object *
7212evas_object_textblock_add(Evas *e) 7212evas_object_textblock_add(Evas *e)
7213{ 7213{
7214 Efl_Canvas_Textblock_Data *o; 7214 Evas_Textblock_Legacy_Data *o;
7215 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 7215 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
7216 return NULL; 7216 return NULL;
7217 MAGIC_CHECK_END(); 7217 MAGIC_CHECK_END();
@@ -7225,10 +7225,10 @@ evas_object_textblock_add(Evas *e)
7225} 7225}
7226 7226
7227EOLIAN static Eo * 7227EOLIAN static Eo *
7228_efl_canvas_textblock_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *class_data EINA_UNUSED) 7228_evas_textblock_legacy_efl_object_constructor(Eo *eo_obj, Evas_Textblock_Legacy_Data *class_data EINA_UNUSED)
7229{ 7229{
7230 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7230 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7231 Efl_Canvas_Textblock_Data *o; 7231 Evas_Textblock_Legacy_Data *o;
7232 7232
7233 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 7233 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
7234 7234
@@ -7291,11 +7291,11 @@ evas_textblock_style_free(Evas_Textblock_Style *ts)
7291} 7291}
7292 7292
7293static void 7293static void
7294_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Textblock_Data *o) 7294_evas_textblock_update_format_nodes_from_style_tag(Evas_Textblock_Legacy_Data *o)
7295{ 7295{
7296 if (!o) 7296 if (!o)
7297 { 7297 {
7298 ERR("The given address Efl_Canvas_Textblock_Data is NULL"); 7298 ERR("The given address Evas_Textblock_Legacy_Data is NULL");
7299 return; 7299 return;
7300 } 7300 }
7301 7301
@@ -7452,7 +7452,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
7452 7452
7453 EINA_LIST_FOREACH(ts->objects, l, eo_obj) 7453 EINA_LIST_FOREACH(ts->objects, l, eo_obj)
7454 { 7454 {
7455 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7455 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7456 _evas_textblock_update_format_nodes_from_style_tag(o); 7456 _evas_textblock_update_format_nodes_from_style_tag(o);
7457 _evas_textblock_invalidate_all(o); 7457 _evas_textblock_invalidate_all(o);
7458 _evas_textblock_changed(o, eo_obj); 7458 _evas_textblock_changed(o, eo_obj);
@@ -7467,7 +7467,7 @@ evas_textblock_style_get(const Evas_Textblock_Style *ts)
7467} 7467}
7468 7468
7469static const char * 7469static const char *
7470_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len) 7470_textblock_format_node_from_style_tag(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len)
7471{ 7471{
7472 Eina_List *itr; 7472 Eina_List *itr;
7473 const char *match = NULL; 7473 const char *match = NULL;
@@ -7594,7 +7594,7 @@ evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts)
7594} 7594}
7595 7595
7596static Evas_Textblock_Style * 7596static Evas_Textblock_Style *
7597_style_by_key_find(Efl_Canvas_Textblock_Data *o, const char *key) 7597_style_by_key_find(Evas_Textblock_Legacy_Data *o, const char *key)
7598{ 7598{
7599 Eina_List *itr; 7599 Eina_List *itr;
7600 User_Style_Entry *us; 7600 User_Style_Entry *us;
@@ -7635,7 +7635,7 @@ _style_fetch(const char *style)
7635} 7635}
7636 7636
7637EOLIAN static void 7637EOLIAN static void
7638_efl_canvas_textblock_style_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *key, const char *style) 7638_evas_textblock_legacy_style_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *key, const char *style)
7639{ 7639{
7640 // FIXME: Make key value behaviour. 7640 // FIXME: Make key value behaviour.
7641 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7641 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -7654,12 +7654,12 @@ evas_object_textblock_style_get(const Eo *eo_obj)
7654 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 7654 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
7655 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7655 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7656 evas_object_async_block(obj); 7656 evas_object_async_block(obj);
7657 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7657 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7658 return o->style; 7658 return o->style;
7659} 7659}
7660 7660
7661EOLIAN static const char * 7661EOLIAN static const char *
7662_efl_canvas_textblock_style_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, const char *key) 7662_evas_textblock_legacy_style_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, const char *key)
7663{ 7663{
7664 Evas_Textblock_Style *ts = _style_by_key_find(o, key); 7664 Evas_Textblock_Style *ts = _style_by_key_find(o, key);
7665 7665
@@ -7683,7 +7683,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj)
7683 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 7683 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
7684 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7684 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7685 evas_object_async_block(obj); 7685 evas_object_async_block(obj);
7686 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7686 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7687 Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER); 7687 Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER);
7688 7688
7689 return ts; 7689 return ts;
@@ -7699,10 +7699,10 @@ evas_object_textblock_style_user_pop(Eo *eo_obj)
7699} 7699}
7700 7700
7701EAPI void 7701EAPI void
7702evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char *ch) 7702evas_object_textblock_replace_char_set(Evas_Textblock_Legacy *eo_obj, const char *ch)
7703{ 7703{
7704 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 7704 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
7705 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7705 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7706 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7706 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7707 evas_object_async_block(obj); 7707 evas_object_async_block(obj);
7708 if (o->repch) eina_stringshare_del(o->repch); 7708 if (o->repch) eina_stringshare_del(o->repch);
@@ -7714,7 +7714,7 @@ evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char
7714 7714
7715 7715
7716EOLIAN static void 7716EOLIAN static void
7717_efl_canvas_textblock_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, Eina_Bool mode) 7717_evas_textblock_legacy_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, Eina_Bool mode)
7718{ 7718{
7719 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7719 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7720 evas_object_async_block(obj); 7720 evas_object_async_block(obj);
@@ -7727,22 +7727,22 @@ _efl_canvas_textblock_legacy_newline_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text
7727} 7727}
7728 7728
7729EOLIAN static Eina_Bool 7729EOLIAN static Eina_Bool
7730_efl_canvas_textblock_legacy_newline_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 7730_evas_textblock_legacy_legacy_newline_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
7731{ 7731{
7732 return o->legacy_newline; 7732 return o->legacy_newline;
7733} 7733}
7734 7734
7735EOLIAN static Eina_Bool 7735EOLIAN static Eina_Bool
7736_efl_canvas_textblock_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 7736_evas_textblock_legacy_is_empty_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
7737{ 7737{
7738 return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0); 7738 return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0);
7739} 7739}
7740 7740
7741EAPI void 7741EAPI void
7742evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align) 7742evas_object_textblock_valign_set(Evas_Textblock_Legacy *eo_obj, double align)
7743{ 7743{
7744 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 7744 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
7745 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7745 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7746 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7746 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7747 evas_object_async_block(obj); 7747 evas_object_async_block(obj);
7748 if (align < 0.0) align = 0.0; 7748 if (align < 0.0) align = 0.0;
@@ -7753,15 +7753,15 @@ evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align)
7753} 7753}
7754 7754
7755EAPI double 7755EAPI double
7756evas_object_textblock_valign_get(const Efl_Canvas_Textblock *obj) 7756evas_object_textblock_valign_get(const Evas_Textblock_Legacy *obj)
7757{ 7757{
7758 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); 7758 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
7759 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); 7759 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(obj, MY_CLASS);
7760 return o->valign; 7760 return o->valign;
7761} 7761}
7762 7762
7763EOLIAN static void 7763EOLIAN static void
7764_efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, const char *delim) 7764_evas_textblock_legacy_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o, const char *delim)
7765{ 7765{
7766 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7766 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7767 evas_object_async_block(obj); 7767 evas_object_async_block(obj);
@@ -7769,16 +7769,16 @@ _efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Tex
7769} 7769}
7770 7770
7771EOLIAN static const char* 7771EOLIAN static const char*
7772_efl_canvas_textblock_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 7772_evas_textblock_legacy_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o)
7773{ 7773{
7774 return o->bidi_delimiters; 7774 return o->bidi_delimiters;
7775} 7775}
7776 7776
7777EAPI const char * 7777EAPI const char *
7778evas_object_textblock_replace_char_get(const Efl_Canvas_Textblock *obj) 7778evas_object_textblock_replace_char_get(const Evas_Textblock_Legacy *obj)
7779{ 7779{
7780 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); 7780 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
7781 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); 7781 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(obj, MY_CLASS);
7782 return o->repch; 7782 return o->repch;
7783} 7783}
7784 7784
@@ -8013,7 +8013,7 @@ _cursor_emit_if_changed(Efl_Text_Cursor_Cursor *cur)
8013 if (cur->changed) 8013 if (cur->changed)
8014 { 8014 {
8015 cur->changed = EINA_FALSE; 8015 cur->changed = EINA_FALSE;
8016 efl_event_callback_legacy_call(cur->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 8016 efl_event_callback_legacy_call(cur->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
8017 } 8017 }
8018} 8018}
8019 8019
@@ -8040,7 +8040,7 @@ _prepend_escaped_char(Efl_Text_Cursor_Cursor *cur_obj, const char *s,
8040 8040
8041 8041
8042static void 8042static void
8043_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 8043_evas_object_textblock_text_markup_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
8044 const char *text) 8044 const char *text)
8045{ 8045{
8046 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8046 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -8086,7 +8086,7 @@ _evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
8086 8086
8087 } 8087 }
8088 efl_event_thaw(eo_obj); 8088 efl_event_thaw(eo_obj);
8089 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 8089 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
8090 8090
8091 o->markup_text = text; 8091 o->markup_text = text;
8092} 8092}
@@ -8095,17 +8095,17 @@ EAPI void
8095evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) 8095evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
8096{ 8096{
8097 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 8097 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
8098 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8098 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8099 _evas_object_textblock_text_markup_set(eo_obj, o, text); 8099 _evas_object_textblock_text_markup_set(eo_obj, o, text);
8100} 8100}
8101 8101
8102EOLIAN void 8102EOLIAN void
8103_efl_canvas_textblock_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 8103_evas_textblock_legacy_efl_text_markup_markup_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
8104 const char *text) 8104 const char *text)
8105{ 8105{
8106 ASYNC_BLOCK; 8106 ASYNC_BLOCK;
8107 _evas_object_textblock_text_markup_set(eo_obj, o, text); 8107 _evas_object_textblock_text_markup_set(eo_obj, o, text);
8108 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 8108 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
8109} 8109}
8110 8110
8111static void 8111static void
@@ -8264,13 +8264,13 @@ evas_object_textblock_text_markup_prepend(Efl_Text_Cursor_Cursor *cur, const cha
8264} 8264}
8265 8265
8266EOLIAN static void 8266EOLIAN static void
8267_efl_canvas_textblock_efl_text_markup_interactive_cursor_markup_insert(Eo *eo_obj, 8267_evas_textblock_legacy_efl_text_markup_interactive_cursor_markup_insert(Eo *eo_obj,
8268 Efl_Canvas_Textblock_Data *o EINA_UNUSED, 8268 Evas_Textblock_Legacy_Data *o EINA_UNUSED,
8269 Efl_Text_Cursor_Cursor *cur, const char *markup) 8269 Efl_Text_Cursor_Cursor *cur, const char *markup)
8270{ 8270{
8271 ASYNC_BLOCK; 8271 ASYNC_BLOCK;
8272 _evas_object_textblock_text_markup_prepend(eo_obj, cur, markup); 8272 _evas_object_textblock_text_markup_prepend(eo_obj, cur, markup);
8273 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 8273 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
8274} 8274}
8275 8275
8276/** 8276/**
@@ -8355,7 +8355,7 @@ _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text)
8355 free(base); 8355 free(base);
8356} 8356}
8357static const char* 8357static const char*
8358_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) 8358_evas_object_textblock_text_markup_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
8359{ 8359{
8360 Evas_Object_Textblock_Node_Text *n; 8360 Evas_Object_Textblock_Node_Text *n;
8361 Eina_Strbuf *txt = NULL; 8361 Eina_Strbuf *txt = NULL;
@@ -8416,7 +8416,7 @@ _evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Da
8416 free(text_base); 8416 free(text_base);
8417 } 8417 }
8418 8418
8419 (((Efl_Canvas_Textblock_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt)); 8419 (((Evas_Textblock_Legacy_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt));
8420 eina_strbuf_free(txt); 8420 eina_strbuf_free(txt);
8421 markup = (o->markup_text); 8421 markup = (o->markup_text);
8422 8422
@@ -8427,12 +8427,12 @@ EAPI const char*
8427evas_object_textblock_text_markup_get(Eo *eo_obj) 8427evas_object_textblock_text_markup_get(Eo *eo_obj)
8428{ 8428{
8429 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 8429 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
8430 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8430 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8431 return _evas_object_textblock_text_markup_get(eo_obj, o); 8431 return _evas_object_textblock_text_markup_get(eo_obj, o);
8432} 8432}
8433 8433
8434EOLIAN const char* 8434EOLIAN const char*
8435_efl_canvas_textblock_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) 8435_evas_textblock_legacy_efl_text_markup_markup_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
8436{ 8436{
8437 return _evas_object_textblock_text_markup_get(eo_obj, o); 8437 return _evas_object_textblock_text_markup_get(eo_obj, o);
8438} 8438}
@@ -8644,7 +8644,7 @@ _layout_obstacles_update(Ctxt *c)
8644} 8644}
8645 8645
8646static Evas_Textblock_Obstacle * 8646static Evas_Textblock_Obstacle *
8647_obstacle_find(Efl_Canvas_Textblock_Data *o, Eo *eo_obs) 8647_obstacle_find(Evas_Textblock_Legacy_Data *o, Eo *eo_obs)
8648{ 8648{
8649 Evas_Textblock_Obstacle *obs; 8649 Evas_Textblock_Obstacle *obs;
8650 Eina_List *i; 8650 Eina_List *i;
@@ -8661,7 +8661,7 @@ void
8661_obstacle_del_cb(void *data, const Efl_Event *event) 8661_obstacle_del_cb(void *data, const Efl_Event *event)
8662{ 8662{
8663 Eo *eo_obj = data; 8663 Eo *eo_obj = data;
8664 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8664 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8665 Eina_List *i; 8665 Eina_List *i;
8666 Evas_Textblock_Obstacle *obs; 8666 Evas_Textblock_Obstacle *obs;
8667 8667
@@ -8690,7 +8690,7 @@ _obstacle_free(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
8690} 8690}
8691 8691
8692static void 8692static void
8693_obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o) 8693_obstacles_free(Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
8694{ 8694{
8695 Evas_Textblock_Obstacle *obs; 8695 Evas_Textblock_Obstacle *obs;
8696 8696
@@ -8701,8 +8701,8 @@ _obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
8701} 8701}
8702 8702
8703EOLIAN static Eina_Bool 8703EOLIAN static Eina_Bool
8704_efl_canvas_textblock_obstacle_add(Eo *eo_obj, 8704_evas_textblock_legacy_obstacle_add(Eo *eo_obj,
8705 Efl_Canvas_Textblock_Data *o, Eo *eo_obs) 8705 Evas_Textblock_Legacy_Data *o, Eo *eo_obs)
8706{ 8706{
8707 Evas_Textblock_Obstacle *obs; 8707 Evas_Textblock_Obstacle *obs;
8708 8708
@@ -8725,7 +8725,7 @@ _efl_canvas_textblock_obstacle_add(Eo *eo_obj,
8725} 8725}
8726 8726
8727EOLIAN static Eina_Bool 8727EOLIAN static Eina_Bool
8728_efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 8728_evas_textblock_legacy_obstacle_del(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
8729 Eo *eo_obs EINA_UNUSED) 8729 Eo *eo_obs EINA_UNUSED)
8730{ 8730{
8731 Evas_Textblock_Obstacle *obs; 8731 Evas_Textblock_Obstacle *obs;
@@ -8750,7 +8750,7 @@ _efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
8750} 8750}
8751 8751
8752EOLIAN static void 8752EOLIAN static void
8753_efl_canvas_textblock_obstacles_update(Eo *eo_obj, Efl_Canvas_Textblock_Data *obj) 8753_evas_textblock_legacy_obstacles_update(Eo *eo_obj, Evas_Textblock_Legacy_Data *obj)
8754{ 8754{
8755 _evas_textblock_changed(obj, eo_obj); 8755 _evas_textblock_changed(obj, eo_obj);
8756 obj->obstacle_changed = EINA_TRUE; 8756 obj->obstacle_changed = EINA_TRUE;
@@ -8836,7 +8836,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti)
8836 * @param to merge into to. 8836 * @param to merge into to.
8837 */ 8837 */
8838static void 8838static void
8839_evas_textblock_nodes_merge(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *to) 8839_evas_textblock_nodes_merge(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *to)
8840{ 8840{
8841 Evas_Object_Textblock_Node_Format *itr; 8841 Evas_Object_Textblock_Node_Format *itr;
8842 Evas_Object_Textblock_Node_Format *pnode; 8842 Evas_Object_Textblock_Node_Format *pnode;
@@ -8904,7 +8904,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Cursor *cur)
8904 8904
8905 len = eina_ustrbuf_length_get(cur->node->unicode); 8905 len = eina_ustrbuf_length_get(cur->node->unicode);
8906 8906
8907 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 8907 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
8908 nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next); 8908 nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
8909 _evas_textblock_nodes_merge(o, cur->node); 8909 _evas_textblock_nodes_merge(o, cur->node);
8910 _evas_textblock_cursors_update_offset(cur, nnode, 0, len); 8910 _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
@@ -9096,7 +9096,7 @@ _evas_textblock_cursor_init(Efl_Text_Cursor_Cursor *cur, const Evas_Object *tb)
9096{ 9096{
9097 cur->obj = (Eo *) tb; 9097 cur->obj = (Eo *) tb;
9098 9098
9099 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9099 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9100 cur->node = o->text_nodes; 9100 cur->node = o->text_nodes;
9101 cur->pos = 0; 9101 cur->pos = 0;
9102} 9102}
@@ -9112,7 +9112,7 @@ EAPI void
9112evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) 9112evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
9113{ 9113{
9114 if (!cur) return; 9114 if (!cur) return;
9115 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9115 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9116 if (cur == o->cursor) return; 9116 if (cur == o->cursor) return;
9117 o->cursors = eina_list_remove(o->cursors, cur); 9117 o->cursors = eina_list_remove(o->cursors, cur);
9118 free(cur); 9118 free(cur);
@@ -9140,7 +9140,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor)
9140 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9140 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9141 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9141 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9142 evas_object_async_block(obj); 9142 evas_object_async_block(obj);
9143 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9143 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9144 if (!strcmp(anchor, "a")) 9144 if (!strcmp(anchor, "a"))
9145 return o->anchors_a; 9145 return o->anchors_a;
9146 else if (!strcmp(anchor, "item")) 9146 else if (!strcmp(anchor, "item"))
@@ -9154,7 +9154,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj)
9154 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9154 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9155 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9155 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9156 evas_object_async_block(obj); 9156 evas_object_async_block(obj);
9157 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9157 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9158 return o->format_nodes; 9158 return o->format_nodes;
9159} 9159}
9160 9160
@@ -9164,7 +9164,7 @@ evas_textblock_node_format_last_get(Evas_Object *eo_obj)
9164 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9164 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9165 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9165 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9166 evas_object_async_block(obj); 9166 evas_object_async_block(obj);
9167 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9167 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9168 return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL; 9168 return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL;
9169} 9169}
9170 9170
@@ -9196,7 +9196,7 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo
9196 9196
9197 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9197 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9198 evas_object_async_block(obj); 9198 evas_object_async_block(obj);
9199 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9199 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9200 do 9200 do
9201 { 9201 {
9202 const char *fstr = fmt->orig_format; 9202 const char *fstr = fmt->orig_format;
@@ -9298,17 +9298,17 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Cursor *cur)
9298 if (!cur) return; 9298 if (!cur) return;
9299 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 9299 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
9300 evas_object_async_block(obj); 9300 evas_object_async_block(obj);
9301 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9301 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9302 cur->node = o->text_nodes; 9302 cur->node = o->text_nodes;
9303 cur->pos = 0; 9303 cur->pos = 0;
9304} 9304}
9305 9305
9306EOLIAN static void 9306EOLIAN static void
9307_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9307_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9308{ 9308{
9309 ASYNC_BLOCK; 9309 ASYNC_BLOCK;
9310 evas_textblock_cursor_paragraph_first(cur); 9310 evas_textblock_cursor_paragraph_first(cur);
9311 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9311 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9312} 9312}
9313 9313
9314EAPI void 9314EAPI void
@@ -9319,7 +9319,7 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor *cur)
9319 if (!cur) return; 9319 if (!cur) return;
9320 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 9320 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
9321 evas_object_async_block(obj); 9321 evas_object_async_block(obj);
9322 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9322 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9323 node = o->text_nodes; 9323 node = o->text_nodes;
9324 if (node) 9324 if (node)
9325 { 9325 {
@@ -9336,11 +9336,11 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Cursor *cur)
9336} 9336}
9337 9337
9338EOLIAN static void 9338EOLIAN static void
9339_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9339_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9340{ 9340{
9341 ASYNC_BLOCK; 9341 ASYNC_BLOCK;
9342 evas_textblock_cursor_paragraph_last(cur); 9342 evas_textblock_cursor_paragraph_last(cur);
9343 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9343 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9344} 9344}
9345 9345
9346static Eina_Bool 9346static Eina_Bool
@@ -9375,11 +9375,11 @@ evas_textblock_cursor_paragraph_next(Efl_Text_Cursor_Cursor *cur)
9375} 9375}
9376 9376
9377EOLIAN static void 9377EOLIAN static void
9378_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_next(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Evas_Textblock_Cursor *cur) 9378_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_next(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Evas_Textblock_Cursor *cur)
9379{ 9379{
9380 ASYNC_BLOCK; 9380 ASYNC_BLOCK;
9381 evas_textblock_cursor_paragraph_next(cur); 9381 evas_textblock_cursor_paragraph_next(cur);
9382 efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9382 efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9383} 9383}
9384 9384
9385static Eina_Bool 9385static Eina_Bool
@@ -9419,12 +9419,12 @@ evas_textblock_cursor_paragraph_prev(Efl_Text_Cursor_Cursor *cur)
9419} 9419}
9420 9420
9421EOLIAN static void 9421EOLIAN static void
9422_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_prev(Eo *obj EINA_UNUSED, 9422_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_prev(Eo *obj EINA_UNUSED,
9423 Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9423 Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9424{ 9424{
9425 ASYNC_BLOCK; 9425 ASYNC_BLOCK;
9426 _evas_textblock_cursor_paragraph_prev(cur); 9426 _evas_textblock_cursor_paragraph_prev(cur);
9427 efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9427 efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9428} 9428}
9429 9429
9430EAPI void 9430EAPI void
@@ -9575,11 +9575,11 @@ evas_textblock_cursor_word_start(Efl_Text_Cursor_Cursor *cur)
9575} 9575}
9576 9576
9577EOLIAN static void 9577EOLIAN static void
9578_efl_canvas_textblock_efl_text_cursor_cursor_word_start(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED) 9578_evas_textblock_legacy_efl_text_cursor_cursor_word_start(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
9579{ 9579{
9580 ASYNC_BLOCK; 9580 ASYNC_BLOCK;
9581 evas_textblock_cursor_word_start(cur); 9581 evas_textblock_cursor_word_start(cur);
9582 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9582 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9583} 9583}
9584 9584
9585EAPI Eina_Bool 9585EAPI Eina_Bool
@@ -9637,11 +9637,11 @@ evas_textblock_cursor_word_end(Efl_Text_Cursor_Cursor *cur)
9637} 9637}
9638 9638
9639EOLIAN static void 9639EOLIAN static void
9640_efl_canvas_textblock_efl_text_cursor_cursor_word_end(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED) 9640_evas_textblock_legacy_efl_text_cursor_cursor_word_end(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED)
9641{ 9641{
9642 ASYNC_BLOCK; 9642 ASYNC_BLOCK;
9643 evas_textblock_cursor_word_end(cur); 9643 evas_textblock_cursor_word_end(cur);
9644 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9644 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9645} 9645}
9646 9646
9647static char * 9647static char *
@@ -9665,7 +9665,7 @@ static size_t
9665_evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc) 9665_evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc)
9666{ 9666{
9667 Evas_Object_Textblock_Paragraph *par; 9667 Evas_Object_Textblock_Paragraph *par;
9668 Efl_Canvas_Textblock_Data *o; 9668 Evas_Textblock_Legacy_Data *o;
9669 size_t cur_pos = cur->pos; 9669 size_t cur_pos = cur->pos;
9670 size_t ret = cur->pos; 9670 size_t ret = cur->pos;
9671 9671
@@ -9823,11 +9823,11 @@ evas_textblock_cursor_char_next(Efl_Text_Cursor_Cursor *cur)
9823} 9823}
9824 9824
9825EOLIAN static void 9825EOLIAN static void
9826_efl_canvas_textblock_efl_text_cursor_cursor_char_next(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9826_evas_textblock_legacy_efl_text_cursor_cursor_char_next(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9827{ 9827{
9828 ASYNC_BLOCK; 9828 ASYNC_BLOCK;
9829 if (_evas_textblock_cursor_next(cur, EINA_FALSE)) 9829 if (_evas_textblock_cursor_next(cur, EINA_FALSE))
9830 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9830 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9831} 9831}
9832 9832
9833EAPI Eina_Bool 9833EAPI Eina_Bool
@@ -9837,11 +9837,11 @@ evas_textblock_cursor_char_prev(Efl_Text_Cursor_Cursor *cur)
9837} 9837}
9838 9838
9839EOLIAN static void 9839EOLIAN static void
9840_efl_canvas_textblock_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9840_evas_textblock_legacy_efl_text_cursor_cursor_char_prev(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9841{ 9841{
9842 ASYNC_BLOCK; 9842 ASYNC_BLOCK;
9843 if (_evas_textblock_cursor_prev(cur, EINA_FALSE)) 9843 if (_evas_textblock_cursor_prev(cur, EINA_FALSE))
9844 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9844 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9845} 9845}
9846 9846
9847EAPI Eina_Bool 9847EAPI Eina_Bool
@@ -9851,11 +9851,11 @@ evas_textblock_cursor_cluster_next(Efl_Text_Cursor_Cursor *cur)
9851} 9851}
9852 9852
9853EOLIAN static void 9853EOLIAN static void
9854_efl_canvas_textblock_efl_text_cursor_cursor_cluster_next(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9854_evas_textblock_legacy_efl_text_cursor_cursor_cluster_next(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9855{ 9855{
9856 ASYNC_BLOCK; 9856 ASYNC_BLOCK;
9857 if (_evas_textblock_cursor_next(cur, EINA_TRUE)) 9857 if (_evas_textblock_cursor_next(cur, EINA_TRUE))
9858 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9858 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9859} 9859}
9860 9860
9861EAPI Eina_Bool 9861EAPI Eina_Bool
@@ -9865,11 +9865,11 @@ evas_textblock_cursor_cluster_prev(Efl_Text_Cursor_Cursor *cur)
9865} 9865}
9866 9866
9867EOLIAN static void 9867EOLIAN static void
9868_efl_canvas_textblock_efl_text_cursor_cursor_cluster_prev(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9868_evas_textblock_legacy_efl_text_cursor_cursor_cluster_prev(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9869{ 9869{
9870 ASYNC_BLOCK; 9870 ASYNC_BLOCK;
9871 if (_evas_textblock_cursor_prev(cur, EINA_TRUE)) 9871 if (_evas_textblock_cursor_prev(cur, EINA_TRUE))
9872 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9872 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9873} 9873}
9874 9874
9875EAPI void 9875EAPI void
@@ -9882,11 +9882,11 @@ evas_textblock_cursor_paragraph_char_first(Efl_Text_Cursor_Cursor *cur)
9882} 9882}
9883 9883
9884EOLIAN static void 9884EOLIAN static void
9885_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9885_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_char_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9886{ 9886{
9887 ASYNC_BLOCK; 9887 ASYNC_BLOCK;
9888 evas_textblock_cursor_paragraph_char_first(cur); 9888 evas_textblock_cursor_paragraph_char_first(cur);
9889 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9889 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9890} 9890}
9891 9891
9892EAPI void 9892EAPI void
@@ -9911,17 +9911,17 @@ evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Cursor *cur)
9911} 9911}
9912 9912
9913EOLIAN static void 9913EOLIAN static void
9914_efl_canvas_textblock_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 9914_evas_textblock_legacy_efl_text_cursor_cursor_paragraph_char_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
9915{ 9915{
9916 ASYNC_BLOCK; 9916 ASYNC_BLOCK;
9917 evas_textblock_cursor_paragraph_char_last(cur); 9917 evas_textblock_cursor_paragraph_char_last(cur);
9918 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 9918 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
9919} 9919}
9920 9920
9921static void 9921static void
9922_cursor_line_first_char_get(Evas_Object_Textblock_Line *ln, 9922_cursor_line_first_char_get(Evas_Object_Textblock_Line *ln,
9923 Efl_Text_Cursor_Cursor *cur, 9923 Efl_Text_Cursor_Cursor *cur,
9924 Efl_Canvas_Textblock_Data *o) 9924 Evas_Textblock_Legacy_Data *o)
9925{ 9925{
9926 if (ln->items) 9926 if (ln->items)
9927 { 9927 {
@@ -9956,7 +9956,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Cursor *cur)
9956 9956
9957 evas_object_async_block(obj); 9957 evas_object_async_block(obj);
9958 TB_NULL_CHECK(cur->node); 9958 TB_NULL_CHECK(cur->node);
9959 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9959 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9960 9960
9961 _relayout_if_needed(cur->obj, o); 9961 _relayout_if_needed(cur->obj, o);
9962 9962
@@ -9978,7 +9978,7 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor *cur)
9978 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 9978 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
9979 evas_object_async_block(obj); 9979 evas_object_async_block(obj);
9980 TB_NULL_CHECK(cur->node); 9980 TB_NULL_CHECK(cur->node);
9981 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9981 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9982 9982
9983 _relayout_if_needed(cur->obj, o); 9983 _relayout_if_needed(cur->obj, o);
9984 9984
@@ -10017,19 +10017,19 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Cursor *cur)
10017} 10017}
10018 10018
10019EOLIAN static void 10019EOLIAN static void
10020_efl_canvas_textblock_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 10020_evas_textblock_legacy_efl_text_cursor_cursor_line_char_last(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
10021{ 10021{
10022 ASYNC_BLOCK; 10022 ASYNC_BLOCK;
10023 evas_textblock_cursor_line_char_last(cur); 10023 evas_textblock_cursor_line_char_last(cur);
10024 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 10024 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
10025} 10025}
10026 10026
10027EOLIAN static void 10027EOLIAN static void
10028_efl_canvas_textblock_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 10028_evas_textblock_legacy_efl_text_cursor_cursor_line_char_first(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
10029{ 10029{
10030 ASYNC_BLOCK; 10030 ASYNC_BLOCK;
10031 evas_textblock_cursor_line_char_first(cur); 10031 evas_textblock_cursor_line_char_first(cur);
10032 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 10032 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
10033} 10033}
10034 10034
10035/** 10035/**
@@ -10133,7 +10133,7 @@ _evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Cursor *cur, Evas_Obj
10133 * @param fmt the current format. 10133 * @param fmt the current format.
10134 */ 10134 */
10135static void 10135static void
10136_evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o, 10136_evas_textblock_node_format_remove_matching(Evas_Textblock_Legacy_Data *o,
10137 Evas_Object_Textblock_Node_Format *fmt) 10137 Evas_Object_Textblock_Node_Format *fmt)
10138{ 10138{
10139 Evas_Object_Textblock_Node_Text *tnode; 10139 Evas_Object_Textblock_Node_Text *tnode;
@@ -10222,7 +10222,7 @@ _evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o,
10222 * @param offset the offset to add (may be negative). 10222 * @param offset the offset to add (may be negative).
10223 */ 10223 */
10224static void 10224static void
10225_evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o, 10225_evas_textblock_node_format_adjust_offset(Evas_Textblock_Legacy_Data *o,
10226 Evas_Object_Textblock_Node_Text *tnode, 10226 Evas_Object_Textblock_Node_Text *tnode,
10227 Evas_Object_Textblock_Node_Format *fmt, int offset) 10227 Evas_Object_Textblock_Node_Format *fmt, int offset)
10228{ 10228{
@@ -10249,7 +10249,7 @@ _evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o,
10249 * @param n the fromat node to remove 10249 * @param n the fromat node to remove
10250 */ 10250 */
10251static void 10251static void
10252_evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment) 10252_evas_textblock_node_format_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment)
10253{ 10253{
10254 /* Update the text nodes about the change */ 10254 /* Update the text nodes about the change */
10255 { 10255 {
@@ -10304,7 +10304,7 @@ _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Tex
10304 * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise. 10304 * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise.
10305 */ 10305 */
10306static Eina_Bool 10306static Eina_Bool
10307_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Textblock_Data *o, 10307_evas_textblock_node_text_adjust_offsets_to_start(Evas_Textblock_Legacy_Data *o,
10308 Evas_Object_Textblock_Node_Text *n, size_t start, int end) 10308 Evas_Object_Textblock_Node_Text *n, size_t start, int end)
10309{ 10309{
10310 Evas_Object_Textblock_Node_Format *last_node, *itr; 10310 Evas_Object_Textblock_Node_Format *last_node, *itr;
@@ -10432,7 +10432,7 @@ _evas_textblock_node_text_get_first_format_between(
10432 * @param n the node to remove. 10432 * @param n the node to remove.
10433 */ 10433 */
10434static void 10434static void
10435_evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n) 10435_evas_textblock_node_text_remove(Evas_Textblock_Legacy_Data *o, Evas_Object_Textblock_Node_Text *n)
10436{ 10436{
10437 _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1); 10437 _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1);
10438 10438
@@ -10472,7 +10472,7 @@ _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt
10472} 10472}
10473 10473
10474EOLIAN static int 10474EOLIAN static int
10475_efl_canvas_textblock_efl_text_cursor_cursor_position_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 10475_evas_textblock_legacy_efl_text_cursor_cursor_position_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
10476{ 10476{
10477 ASYNC_BLOCK; 10477 ASYNC_BLOCK;
10478 Evas_Object_Textblock_Node_Text *n; 10478 Evas_Object_Textblock_Node_Text *n;
@@ -10508,7 +10508,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor *cur, int _pos)
10508 if (!cur) return; 10508 if (!cur) return;
10509 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10509 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10510 evas_object_async_block(obj); 10510 evas_object_async_block(obj);
10511 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10511 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10512 10512
10513 10513
10514 if (_pos < 0) 10514 if (_pos < 0)
@@ -10547,11 +10547,11 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Cursor *cur, int _pos)
10547} 10547}
10548 10548
10549EOLIAN static void 10549EOLIAN static void
10550_efl_canvas_textblock_efl_text_cursor_cursor_position_set(Eo *cur_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int _pos) 10550_evas_textblock_legacy_efl_text_cursor_cursor_position_set(Eo *cur_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, int _pos)
10551{ 10551{
10552 ASYNC_BLOCK; 10552 ASYNC_BLOCK;
10553 evas_textblock_cursor_pos_set(cur, _pos); 10553 evas_textblock_cursor_pos_set(cur, _pos);
10554 efl_event_callback_legacy_call(cur_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 10554 efl_event_callback_legacy_call(cur_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
10555} 10555}
10556 10556
10557EAPI Eina_Bool 10557EAPI Eina_Bool
@@ -10563,7 +10563,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
10563 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10563 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10564 evas_object_async_block(obj); 10564 evas_object_async_block(obj);
10565 10565
10566 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10566 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10567 10567
10568 _relayout_if_needed(cur->obj, o); 10568 _relayout_if_needed(cur->obj, o);
10569 10569
@@ -10576,7 +10576,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
10576} 10576}
10577 10577
10578EOLIAN static void 10578EOLIAN static void
10579_efl_canvas_textblock_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, int by) 10579_evas_textblock_legacy_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, int by)
10580{ 10580{
10581 ASYNC_BLOCK; 10581 ASYNC_BLOCK;
10582 int ln; 10582 int ln;
@@ -10634,7 +10634,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_line_jump_by(Eo *eo_obj EINA_UNUSED
10634 if ((pnode != cur->node) || (ppos != cur->pos)) 10634 if ((pnode != cur->node) || (ppos != cur->pos))
10635 { 10635 {
10636 efl_event_callback_legacy_call(eo_obj, 10636 efl_event_callback_legacy_call(eo_obj,
10637 EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 10637 EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
10638 } 10638 }
10639} 10639}
10640 10640
@@ -10668,7 +10668,7 @@ evas_textblock_cursor_compare(const Efl_Text_Cursor_Cursor *cur1,
10668} 10668}
10669 10669
10670EOLIAN static int 10670EOLIAN static int
10671_efl_canvas_textblock_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 10671_evas_textblock_legacy_efl_text_cursor_cursor_compare(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
10672 const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *cur2) 10672 const Efl_Text_Cursor_Cursor *cur1, const Efl_Text_Cursor_Cursor *cur2)
10673{ 10673{
10674 ASYNC_BLOCK; 10674 ASYNC_BLOCK;
@@ -10686,7 +10686,7 @@ evas_textblock_cursor_equal(const Evas_Textblock_Cursor *cur1,
10686} 10686}
10687 10687
10688EOLIAN static Eina_Bool 10688EOLIAN static Eina_Bool
10689_efl_canvas_textblock_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, const Efl_Text_Cursor_Cursor *cur2) 10689_evas_textblock_legacy_efl_text_cursor_cursor_equal(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, const Efl_Text_Cursor_Cursor *cur2)
10690{ 10690{
10691 ASYNC_BLOCK; 10691 ASYNC_BLOCK;
10692 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 10692 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -10719,14 +10719,14 @@ _evas_textblock_cursor_copy(Evas_Textblock_Cursor *dst, const Efl_Text_Cursor_Cu
10719} 10719}
10720 10720
10721EOLIAN static void 10721EOLIAN static void
10722_efl_canvas_textblock_efl_text_cursor_cursor_copy(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 10722_evas_textblock_legacy_efl_text_cursor_cursor_copy(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
10723 Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src) 10723 Efl_Text_Cursor_Cursor *dst, const Efl_Text_Cursor_Cursor *src)
10724{ 10724{
10725 ASYNC_BLOCK; 10725 ASYNC_BLOCK;
10726 if (!efl_text_cursor_equal(obj, dst, src)) 10726 if (!efl_text_cursor_equal(obj, dst, src))
10727 { 10727 {
10728 _evas_textblock_cursor_copy(dst, src); 10728 _evas_textblock_cursor_copy(dst, src);
10729 efl_event_callback_legacy_call(obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 10729 efl_event_callback_legacy_call(obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
10730 } 10730 }
10731} 10731}
10732 10732
@@ -10788,7 +10788,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor *cur,
10788 Evas_Object_Textblock_Node_Text *n; 10788 Evas_Object_Textblock_Node_Text *n;
10789 10789
10790 if (!cur) return; 10790 if (!cur) return;
10791 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10791 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10792 10792
10793 n = _evas_textblock_node_text_new(); 10793 n = _evas_textblock_node_text_new();
10794 o->text_nodes = _NODE_TEXT(eina_inlist_append_relative( 10794 o->text_nodes = _NODE_TEXT(eina_inlist_append_relative(
@@ -10865,7 +10865,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Cursor *cur,
10865 * @param new_node the new node to set. 10865 * @param new_node the new node to set.
10866 */ 10866 */
10867static void 10867static void
10868_evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o, 10868_evas_textblock_cursors_set_node(Evas_Textblock_Legacy_Data *o,
10869 const Evas_Object_Textblock_Node_Text *n, 10869 const Evas_Object_Textblock_Node_Text *n,
10870 Evas_Object_Textblock_Node_Text *new_node) 10870 Evas_Object_Textblock_Node_Text *new_node)
10871{ 10871{
@@ -10891,7 +10891,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o,
10891} 10891}
10892 10892
10893static inline void 10893static inline void
10894_cursor_update_offset(Efl_Text_Cursor_Cursor *cur, Efl_Canvas_Textblock_Data *o, 10894_cursor_update_offset(Efl_Text_Cursor_Cursor *cur, Evas_Textblock_Legacy_Data *o,
10895 const Evas_Object_Textblock_Node_Text *n, size_t start, int offset) 10895 const Evas_Object_Textblock_Node_Text *n, size_t start, int offset)
10896{ 10896{
10897 if ((n == cur->node) && 10897 if ((n == cur->node) &&
@@ -10931,7 +10931,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur,
10931{ 10931{
10932 Eina_List *l; 10932 Eina_List *l;
10933 Efl_Text_Cursor_Cursor *ocur; 10933 Efl_Text_Cursor_Cursor *ocur;
10934 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10934 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10935 10935
10936 ocur = o->cursor; 10936 ocur = o->cursor;
10937 if (cur != ocur) 10937 if (cur != ocur)
@@ -10956,7 +10956,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Cursor *cur,
10956 * @param obj the evas object. 10956 * @param obj the evas object.
10957 */ 10957 */
10958static void 10958static void
10959_evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj) 10959_evas_textblock_changed(Evas_Textblock_Legacy_Data *o, Evas_Object *eo_obj)
10960{ 10960{
10961 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 10961 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
10962 Eina_List *l; 10962 Eina_List *l;
@@ -10982,7 +10982,7 @@ _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj)
10982} 10982}
10983 10983
10984static void 10984static void
10985_evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o) 10985_evas_textblock_invalidate_all(Evas_Textblock_Legacy_Data *o)
10986{ 10986{
10987 Evas_Object_Textblock_Node_Text *n; 10987 Evas_Object_Textblock_Node_Text *n;
10988 10988
@@ -11005,7 +11005,7 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, const char *_tex
11005 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11005 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11006 evas_object_async_block(obj); 11006 evas_object_async_block(obj);
11007 text = eina_unicode_utf8_to_unicode(_text, &len); 11007 text = eina_unicode_utf8_to_unicode(_text, &len);
11008 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11008 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11009 11009
11010 n = cur->node; 11010 n = cur->node;
11011 if (n) 11011 if (n)
@@ -11098,14 +11098,14 @@ evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Cursor *cur, const char *_tex
11098} 11098}
11099 11099
11100EOLIAN static int 11100EOLIAN static int
11101_efl_canvas_textblock_efl_text_cursor_cursor_text_insert(Eo *eo_obj, 11101_evas_textblock_legacy_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
11102 Efl_Canvas_Textblock_Data *o, 11102 Evas_Textblock_Legacy_Data *o,
11103 Efl_Text_Cursor_Cursor *cur, const char *_text) 11103 Efl_Text_Cursor_Cursor *cur, const char *_text)
11104{ 11104{
11105 ASYNC_BLOCK; 11105 ASYNC_BLOCK;
11106 int len = _efl_canvas_textblock_cursor_text_append(cur, _text); 11106 int len = _evas_textblock_legacy_cursor_text_append(cur, _text);
11107 _evas_textblock_changed(o, eo_obj); 11107 _evas_textblock_changed(o, eo_obj);
11108 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 11108 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
11109 return len; 11109 return len;
11110} 11110}
11111 11111
@@ -11117,7 +11117,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_text_insert(Eo *eo_obj,
11117 * @param n the format node to free 11117 * @param n the format node to free
11118 */ 11118 */
11119static void 11119static void
11120_evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, 11120_evas_textblock_node_format_free(Evas_Textblock_Legacy_Data *o,
11121 Evas_Object_Textblock_Node_Format *n) 11121 Evas_Object_Textblock_Node_Format *n)
11122{ 11122{
11123 if (!n) return; 11123 if (!n) return;
@@ -11139,7 +11139,7 @@ _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o,
11139 * @return Returns the new format node 11139 * @return Returns the new format node
11140 */ 11140 */
11141static Evas_Object_Textblock_Node_Format * 11141static Evas_Object_Textblock_Node_Format *
11142_evas_textblock_node_format_new(Efl_Canvas_Textblock_Data *o, const char *_format, 11142_evas_textblock_node_format_new(Evas_Textblock_Legacy_Data *o, const char *_format,
11143 Eina_Bool is_item) 11143 Eina_Bool is_item)
11144{ 11144{
11145 Evas_Object_Textblock_Node_Format *n; 11145 Evas_Object_Textblock_Node_Format *n;
@@ -11288,7 +11288,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Cursor *cur,
11288 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11288 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11289 evas_object_async_block(obj); 11289 evas_object_async_block(obj);
11290 if ((!format) || (format[0] == 0)) return EINA_FALSE; 11290 if ((!format) || (format[0] == 0)) return EINA_FALSE;
11291 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11291 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11292 /* We should always have at least one text node */ 11292 /* We should always have at least one text node */
11293 if (!o->text_nodes) 11293 if (!o->text_nodes)
11294 { 11294 {
@@ -11459,7 +11459,7 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor *cur)
11459 if (!cur || !cur->node) return; 11459 if (!cur || !cur->node) return;
11460 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11460 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11461 evas_object_async_block(obj); 11461 evas_object_async_block(obj);
11462 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11462 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11463 n = cur->node; 11463 n = cur->node;
11464 11464
11465 text = eina_ustrbuf_string_get(n->unicode); 11465 text = eina_ustrbuf_string_get(n->unicode);
@@ -11528,22 +11528,22 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Cursor *cur)
11528} 11528}
11529 11529
11530EOLIAN static void 11530EOLIAN static void
11531_efl_canvas_textblock_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 11531_evas_textblock_legacy_efl_text_cursor_cursor_char_delete(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
11532{ 11532{
11533 ASYNC_BLOCK; 11533 ASYNC_BLOCK;
11534 evas_textblock_cursor_char_delete(cur); 11534 evas_textblock_cursor_char_delete(cur);
11535 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 11535 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
11536} 11536}
11537 11537
11538EAPI void 11538EAPI void
11539evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2) 11539evas_textblock_cursor_range_delete(Efl_Text_Cursor_Cursor *cur1, Efl_Text_Cursor_Cursor *cur2)
11540{ 11540{
11541 if (!cur1) return; 11541 if (!cur1) return;
11542 efl_canvas_textblock_range_delete(cur1->obj, cur1, cur2); 11542 evas_textblock_legacy_range_delete(cur1->obj, cur1, cur2);
11543} 11543}
11544 11544
11545EOLIAN static void 11545EOLIAN static void
11546_efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, 11546_evas_textblock_legacy_range_delete(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
11547 Efl_Text_Cursor_Cursor *cur1, Evas_Textblock_Cursor *cur2) 11547 Efl_Text_Cursor_Cursor *cur1, Evas_Textblock_Cursor *cur2)
11548{ 11548{
11549 Evas_Object_Textblock_Node_Format *fnode = NULL; 11549 Evas_Object_Textblock_Node_Format *fnode = NULL;
@@ -11555,7 +11555,7 @@ _efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_
11555 if (cur1->obj != cur2->obj) return; 11555 if (cur1->obj != cur2->obj) return;
11556 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); 11556 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
11557 evas_object_async_block(obj); 11557 evas_object_async_block(obj);
11558 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); 11558 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
11559 if (evas_textblock_cursor_compare(cur1, cur2) > 0) 11559 if (evas_textblock_cursor_compare(cur1, cur2) > 0)
11560 { 11560 {
11561 Efl_Text_Cursor_Cursor *tc; 11561 Efl_Text_Cursor_Cursor *tc;
@@ -11646,11 +11646,11 @@ _efl_canvas_textblock_range_delete(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_
11646 evas_textblock_cursor_copy(cur1, o->cursor); 11646 evas_textblock_cursor_copy(cur1, o->cursor);
11647 11647
11648 _evas_textblock_changed(o, cur1->obj); 11648 _evas_textblock_changed(o, cur1->obj);
11649 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 11649 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
11650} 11650}
11651 11651
11652EOLIAN static Eina_Unicode 11652EOLIAN static Eina_Unicode
11653_efl_canvas_textblock_efl_text_cursor_cursor_content_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 11653_evas_textblock_legacy_efl_text_cursor_cursor_content_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
11654 const Efl_Text_Cursor_Cursor *cur) 11654 const Efl_Text_Cursor_Cursor *cur)
11655{ 11655{
11656 ASYNC_BLOCK; 11656 ASYNC_BLOCK;
@@ -11800,8 +11800,8 @@ _evas_textblock_cursor_range_text_markup_get(const Efl_Text_Cursor_Cursor *cur1,
11800} 11800}
11801 11801
11802EOLIAN char * 11802EOLIAN char *
11803_efl_canvas_textblock_efl_text_markup_interactive_markup_range_get(const Eo *eo_obj, 11803_evas_textblock_legacy_efl_text_markup_interactive_markup_range_get(const Eo *eo_obj,
11804 Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *start, 11804 Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *start,
11805 Efl_Text_Cursor_Cursor *end) 11805 Efl_Text_Cursor_Cursor *end)
11806{ 11806{
11807 if (!start || !start->node) return NULL; 11807 if (!start || !start->node) return NULL;
@@ -11965,8 +11965,8 @@ evas_textblock_cursor_range_text_get(const Efl_Text_Cursor_Cursor *cur1, const E
11965} 11965}
11966 11966
11967EOLIAN static char * 11967EOLIAN static char *
11968_efl_canvas_textblock_range_text_get(const Eo *eo_obj EINA_UNUSED, 11968_evas_textblock_legacy_range_text_get(const Eo *eo_obj EINA_UNUSED,
11969 Efl_Canvas_Textblock_Data *pd EINA_UNUSED, 11969 Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
11970 const Efl_Text_Cursor_Cursor *cur1, 11970 const Efl_Text_Cursor_Cursor *cur1,
11971 const Evas_Textblock_Cursor *cur2) 11971 const Evas_Textblock_Cursor *cur2)
11972{ 11972{
@@ -12130,7 +12130,7 @@ evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Cursor *cur, Evas_
12130} 12130}
12131 12131
12132EOLIAN static Eina_Bool 12132EOLIAN static Eina_Bool
12133_efl_canvas_textblock_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2) 12133_evas_textblock_legacy_efl_text_cursor_cursor_geometry_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const Efl_Text_Cursor_Cursor *cur, Efl_Text_Cursor_Type ctype, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2)
12134{ 12134{
12135 ASYNC_BLOCK; 12135 ASYNC_BLOCK;
12136 if (!cur) return EINA_FALSE; 12136 if (!cur) return EINA_FALSE;
@@ -12321,7 +12321,7 @@ evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Cursor *cur, Evas_Coord
12321 if (!cur) return -1; 12321 if (!cur) return -1;
12322 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12322 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12323 evas_object_async_block(obj); 12323 evas_object_async_block(obj);
12324 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12324 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12325 12325
12326 _relayout_if_needed(cur->obj, o); 12326 _relayout_if_needed(cur->obj, o);
12327 12327
@@ -12400,7 +12400,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
12400 Eina_Bool previous_format; 12400 Eina_Bool previous_format;
12401 12401
12402 if (!cur) return -1; 12402 if (!cur) return -1;
12403 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12403 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12404 12404
12405 _relayout_if_needed(cur->obj, o); 12405 _relayout_if_needed(cur->obj, o);
12406 12406
@@ -12534,7 +12534,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
12534 if (!cur) return -1; 12534 if (!cur) return -1;
12535 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12535 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12536 evas_object_async_block(obj); 12536 evas_object_async_block(obj);
12537 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12537 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12538 12538
12539 _relayout_if_needed(cur->obj, o); 12539 _relayout_if_needed(cur->obj, o);
12540 12540
@@ -12561,12 +12561,12 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
12561EAPI Eina_Bool 12561EAPI Eina_Bool
12562evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end) 12562evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
12563{ 12563{
12564 return efl_canvas_textblock_visible_range_get(start->obj, start, end); 12564 return evas_textblock_legacy_visible_range_get(start->obj, start, end);
12565} 12565}
12566 12566
12567EOLIAN static Eina_Bool 12567EOLIAN static Eina_Bool
12568_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED, 12568_evas_textblock_legacy_visible_range_get(Eo *eo_obj EINA_UNUSED,
12569 Efl_Canvas_Textblock_Data *pd EINA_UNUSED, 12569 Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
12570 Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end) 12570 Efl_Text_Cursor_Cursor *start, Evas_Textblock_Cursor *end)
12571{ 12571{
12572 Evas *eo_e; 12572 Evas *eo_e;
@@ -12597,7 +12597,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_
12597 12597
12598 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12598 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12599 evas_object_async_block(obj); 12599 evas_object_async_block(obj);
12600 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12600 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12601 12601
12602 _relayout_if_needed(cur->obj, o); 12602 _relayout_if_needed(cur->obj, o);
12603 12603
@@ -12774,7 +12774,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_
12774end: 12774end:
12775 if (ret) 12775 if (ret)
12776 { 12776 {
12777 efl_event_callback_legacy_call(cur->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CURSOR_CHANGED, NULL); 12777 efl_event_callback_legacy_call(cur->obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CURSOR_CHANGED, NULL);
12778 } 12778 }
12779 return ret; 12779 return ret;
12780} 12780}
@@ -12792,7 +12792,7 @@ evas_textblock_cursor_cluster_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord
12792} 12792}
12793 12793
12794EOLIAN static void 12794EOLIAN static void
12795_efl_canvas_textblock_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, 12795_evas_textblock_legacy_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
12796 Evas_Coord x, Evas_Coord y) 12796 Evas_Coord x, Evas_Coord y)
12797{ 12797{
12798 ASYNC_BLOCK; 12798 ASYNC_BLOCK;
@@ -12800,7 +12800,7 @@ _efl_canvas_textblock_efl_text_cursor_cursor_coord_set(Eo *eo_obj EINA_UNUSED, E
12800} 12800}
12801 12801
12802EOLIAN static void 12802EOLIAN static void
12803_efl_canvas_textblock_efl_text_cursor_cursor_cluster_coord_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED, 12803_evas_textblock_legacy_efl_text_cursor_cursor_cluster_coord_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur EINA_UNUSED,
12804 Evas_Coord x, Evas_Coord y) 12804 Evas_Coord x, Evas_Coord y)
12805{ 12805{
12806 ASYNC_BLOCK; 12806 ASYNC_BLOCK;
@@ -12816,7 +12816,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
12816 if (!cur) return -1; 12816 if (!cur) return -1;
12817 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12817 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12818 evas_object_async_block(obj); 12818 evas_object_async_block(obj);
12819 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12819 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12820 12820
12821 _relayout_if_needed(cur->obj, o); 12821 _relayout_if_needed(cur->obj, o);
12822 12822
@@ -13235,12 +13235,12 @@ EAPI Eina_Iterator *
13235evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2) 13235evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
13236{ 13236{
13237 if (!cur1) return NULL; 13237 if (!cur1) return NULL;
13238 return efl_canvas_textblock_range_simple_geometry_get(cur1->obj, cur1, cur2); 13238 return evas_textblock_legacy_range_simple_geometry_get(cur1->obj, cur1, cur2);
13239} 13239}
13240 13240
13241EOLIAN static Eina_Iterator * 13241EOLIAN static Eina_Iterator *
13242_efl_canvas_textblock_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED, 13242_evas_textblock_legacy_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
13243 Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const 13243 Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
13244 Evas_Textblock_Cursor *cur2) 13244 Evas_Textblock_Cursor *cur2)
13245{ 13245{
13246 Evas_Object_Textblock_Line *ln1, *ln2; 13246 Evas_Object_Textblock_Line *ln1, *ln2;
@@ -13346,8 +13346,8 @@ _efl_canvas_textblock_range_simple_geometry_get(Eo *eo_obj EINA_UNUSED,
13346} 13346}
13347 13347
13348static Eina_List * 13348static Eina_List *
13349_efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, 13349_evas_textblock_legacy_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
13350 Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const 13350 Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
13351 Evas_Textblock_Cursor *cur2) 13351 Evas_Textblock_Cursor *cur2)
13352{ 13352{
13353 Evas_Object_Textblock_Line *ln1, *ln2; 13353 Evas_Object_Textblock_Line *ln1, *ln2;
@@ -13425,21 +13425,21 @@ _efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
13425EAPI Eina_List * 13425EAPI Eina_List *
13426evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2_obj) 13426evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Cursor *cur1, const Evas_Textblock_Cursor *cur2_obj)
13427{ 13427{
13428 Efl_Canvas_Textblock_Data *o; 13428 Evas_Textblock_Legacy_Data *o;
13429 13429
13430 if (!cur1) return NULL; 13430 if (!cur1) return NULL;
13431 13431
13432 o = efl_data_scope_get(cur1->obj, MY_CLASS); 13432 o = efl_data_scope_get(cur1->obj, MY_CLASS);
13433 13433
13434 return _efl_canvas_textblock_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj); 13434 return _evas_textblock_legacy_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj);
13435} 13435}
13436 13436
13437EOLIAN static Eina_Iterator * 13437EOLIAN static Eina_Iterator *
13438_efl_canvas_textblock_range_geometry_get(Eo *eo_obj EINA_UNUSED, 13438_evas_textblock_legacy_range_geometry_get(Eo *eo_obj EINA_UNUSED,
13439 Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Cursor *cur1, const 13439 Evas_Textblock_Legacy_Data *o, const Efl_Text_Cursor_Cursor *cur1, const
13440 Evas_Textblock_Cursor *cur2) 13440 Evas_Textblock_Cursor *cur2)
13441{ 13441{
13442 Eina_List *rects = _efl_canvas_textblock_range_geometry_list_get(eo_obj, 13442 Eina_List *rects = _evas_textblock_legacy_range_geometry_list_get(eo_obj,
13443 o, cur1, cur2); 13443 o, cur1, cur2);
13444 return _evas_textblock_selection_iterator_new(rects); 13444 return _evas_textblock_selection_iterator_new(rects);
13445} 13445}
@@ -13455,7 +13455,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Cursor *cu
13455 if (!cur) return EINA_FALSE; 13455 if (!cur) return EINA_FALSE;
13456 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 13456 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
13457 evas_object_async_block(obj); 13457 evas_object_async_block(obj);
13458 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 13458 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
13459 13459
13460 _relayout_if_needed(cur->obj, o); 13460 _relayout_if_needed(cur->obj, o);
13461 13461
@@ -13508,7 +13508,7 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_
13508 Evas_Object_Textblock_Line *ln; 13508 Evas_Object_Textblock_Line *ln;
13509 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13509 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13510 evas_object_async_block(obj); 13510 evas_object_async_block(obj);
13511 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 13511 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
13512 13512
13513 _relayout_if_needed((Evas_Object *)eo_obj, o); 13513 _relayout_if_needed((Evas_Object *)eo_obj, o);
13514 13514
@@ -13534,7 +13534,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj)
13534 eo_e = evas_object_evas_get(eo_obj); 13534 eo_e = evas_object_evas_get(eo_obj);
13535 evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 13535 evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
13536 evas_object_async_block(obj); 13536 evas_object_async_block(obj);
13537 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 13537 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
13538 if (o->paragraphs) 13538 if (o->paragraphs)
13539 { 13539 {
13540 _paragraphs_free(evas, o, obj, o->paragraphs); 13540 _paragraphs_free(evas, o, obj, o->paragraphs);
@@ -13569,7 +13569,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj)
13569} 13569}
13570 13570
13571EOLIAN static void 13571EOLIAN static void
13572_efl_canvas_textblock_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *w, Evas_Coord *h) 13572_evas_textblock_legacy_size_formatted_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *w, Evas_Coord *h)
13573{ 13573{
13574 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13574 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13575 evas_object_async_block(obj); 13575 evas_object_async_block(obj);
@@ -13721,7 +13721,7 @@ loop_advance:
13721/* FIXME: doc */ 13721/* FIXME: doc */
13722static void 13722static void
13723_size_native_calc_paragraph_size(const Evas_Object *eo_obj, 13723_size_native_calc_paragraph_size(const Evas_Object *eo_obj,
13724 const Efl_Canvas_Textblock_Data *o, 13724 const Evas_Textblock_Legacy_Data *o,
13725 Evas_Object_Textblock_Paragraph *par, 13725 Evas_Object_Textblock_Paragraph *par,
13726 Textblock_Position *position, 13726 Textblock_Position *position,
13727 Evas_Coord *_w, Evas_Coord *_h) 13727 Evas_Coord *_w, Evas_Coord *_h)
@@ -13812,7 +13812,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
13812} 13812}
13813 13813
13814EOLIAN static void 13814EOLIAN static void
13815_efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *w, Evas_Coord *h) 13815_evas_textblock_legacy_size_native_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *w, Evas_Coord *h)
13816{ 13816{
13817 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13817 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13818 evas_object_async_block(obj); 13818 evas_object_async_block(obj);
@@ -13846,7 +13846,7 @@ _efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Dat
13846} 13846}
13847 13847
13848EOLIAN static void 13848EOLIAN static void
13849_efl_canvas_textblock_style_insets_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) 13849_evas_textblock_legacy_style_insets_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
13850{ 13850{
13851 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13851 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13852 evas_object_async_block(obj); 13852 evas_object_async_block(obj);
@@ -13859,7 +13859,7 @@ _efl_canvas_textblock_style_insets_get(const Eo *eo_obj, Efl_Canvas_Textblock_Da
13859} 13859}
13860 13860
13861EOLIAN static void 13861EOLIAN static void
13862_efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Dbg_Info *root) 13862_evas_textblock_legacy_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
13863{ 13863{
13864 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 13864 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
13865 if (!root) return; 13865 if (!root) return;
@@ -13883,7 +13883,7 @@ _efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_D
13883 13883
13884 { 13884 {
13885 int w, h; 13885 int w, h;
13886 efl_canvas_textblock_size_formatted_get(eo_obj, &w, &h); 13886 evas_textblock_legacy_size_formatted_get(eo_obj, &w, &h);
13887 node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size"); 13887 node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size");
13888 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); 13888 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
13889 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); 13889 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -13891,7 +13891,7 @@ _efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_D
13891 13891
13892 { 13892 {
13893 int w, h; 13893 int w, h;
13894 efl_canvas_textblock_size_native_get(eo_obj, &w, &h); 13894 evas_textblock_legacy_size_native_get(eo_obj, &w, &h);
13895 node = EFL_DBG_INFO_LIST_APPEND(group, "Native size"); 13895 node = EFL_DBG_INFO_LIST_APPEND(group, "Native size");
13896 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w); 13896 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
13897 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h); 13897 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);
@@ -13903,7 +13903,7 @@ static void
13903evas_object_textblock_init(Evas_Object *eo_obj) 13903evas_object_textblock_init(Evas_Object *eo_obj)
13904{ 13904{
13905 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13905 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13906 Efl_Canvas_Textblock_Data *o; 13906 Evas_Textblock_Legacy_Data *o;
13907 static Eina_Bool linebreak_init = EINA_FALSE; 13907 static Eina_Bool linebreak_init = EINA_FALSE;
13908 13908
13909 if (!linebreak_init) 13909 if (!linebreak_init)
@@ -13926,7 +13926,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
13926} 13926}
13927 13927
13928EOLIAN static void 13928EOLIAN static void
13929_efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 13929_evas_textblock_legacy_efl_object_destructor(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
13930{ 13930{
13931 evas_object_textblock_free(eo_obj); 13931 evas_object_textblock_free(eo_obj);
13932 efl_destructor(efl_super(eo_obj, MY_CLASS)); 13932 efl_destructor(efl_super(eo_obj, MY_CLASS));
@@ -13935,9 +13935,9 @@ _efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Dat
13935static void 13935static void
13936evas_object_textblock_free(Evas_Object *eo_obj) 13936evas_object_textblock_free(Evas_Object *eo_obj)
13937{ 13937{
13938 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 13938 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
13939 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13939 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13940 Efl_Canvas_Textblock_Filter_Program *prg; 13940 Evas_Textblock_Legacy_Filter_Program *prg;
13941 Evas_Filter_Data_Binding *db; 13941 Evas_Filter_Data_Binding *db;
13942 User_Style_Entry *use; 13942 User_Style_Entry *use;
13943 13943
@@ -14056,7 +14056,7 @@ _filter_sync_end(Evas_Filter_Context *ctx, Eina_Bool success)
14056static void 14056static void
14057_filter_post_render_cb(void *data) 14057_filter_post_render_cb(void *data)
14058{ 14058{
14059 Efl_Canvas_Textblock_Filter_Post_Render *post_data = data; 14059 Evas_Textblock_Legacy_Filter_Post_Render *post_data = data;
14060 14060
14061 _filter_sync_end(post_data->ctx, post_data->success); 14061 _filter_sync_end(post_data->ctx, post_data->success);
14062 free(post_data); 14062 free(post_data);
@@ -14065,7 +14065,7 @@ _filter_post_render_cb(void *data)
14065static void 14065static void
14066_filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) 14066_filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
14067{ 14067{
14068 Efl_Canvas_Textblock_Filter_Post_Render *post_data; 14068 Evas_Textblock_Legacy_Filter_Post_Render *post_data;
14069 Evas_Public_Data *evas = data; 14069 Evas_Public_Data *evas = data;
14070 14070
14071 if (!evas_filter_context_async_get(ctx)) 14071 if (!evas_filter_context_async_get(ctx))
@@ -14101,7 +14101,7 @@ _filter_relative_bounding_box_get(const Text_Item_Filter *tif)
14101} 14101}
14102 14102
14103static void 14103static void
14104_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Textblock_Data *o) 14104_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Evas_Textblock_Legacy_Data *o)
14105{ 14105{
14106 Text_Item_Filter *tif; 14106 Text_Item_Filter *tif;
14107 Eina_Inlist *il; 14107 Eina_Inlist *il;
@@ -14144,7 +14144,7 @@ static inline Evas_Coord_Point
14144_filter_target_position_calc(Evas_Object_Protected_Data *obj, 14144_filter_target_position_calc(Evas_Object_Protected_Data *obj,
14145 Evas_Object_Textblock_Text_Item *ti, int x, int y) 14145 Evas_Object_Textblock_Text_Item *ti, int x, int y)
14146{ 14146{
14147 Efl_Canvas_Textblock_Filter *filter = ti->parent.format->gfx_filter; 14147 Evas_Textblock_Legacy_Filter *filter = ti->parent.format->gfx_filter;
14148 Evas_Object_Textblock_Line *ln = ti->parent.ln; 14148 Evas_Object_Textblock_Line *ln = ti->parent.ln;
14149 Evas_Coord_Point pt; 14149 Evas_Coord_Point pt;
14150 14150
@@ -14163,7 +14163,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
14163 Evas_Object_Textblock_Paragraph *par, *start = NULL; 14163 Evas_Object_Textblock_Paragraph *par, *start = NULL;
14164 Evas_Object_Textblock_Item *itr; 14164 Evas_Object_Textblock_Item *itr;
14165 Evas_Object_Textblock_Line *ln, *cur_ln = NULL; 14165 Evas_Object_Textblock_Line *ln, *cur_ln = NULL;
14166 Efl_Canvas_Textblock_Data *o = type_private_data; 14166 Evas_Textblock_Legacy_Data *o = type_private_data;
14167 ASYNC_BLOCK; 14167 ASYNC_BLOCK;
14168 14168
14169 Eina_List *shadows = NULL; 14169 Eina_List *shadows = NULL;
@@ -14468,7 +14468,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
14468 { 14468 {
14469 Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT; 14469 Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT;
14470 Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr); 14470 Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr);
14471 Efl_Canvas_Textblock_Filter *filter; 14471 Evas_Textblock_Legacy_Filter *filter;
14472 Evas_Filter_Program *pgm; 14472 Evas_Filter_Program *pgm;
14473 Evas_Filter_Context *ctx; 14473 Evas_Filter_Context *ctx;
14474 Evas_Coord_Point target; 14474 Evas_Coord_Point target;
@@ -14865,13 +14865,13 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
14865} 14865}
14866 14866
14867EOLIAN static void 14867EOLIAN static void
14868_efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare( 14868_evas_textblock_legacy_efl_canvas_filter_internal_filter_state_prepare(
14869 Eo *eo_obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data) 14869 Eo *eo_obj, Evas_Textblock_Legacy_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data)
14870{ 14870{
14871 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14871 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14872 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXTBLOCK_CLASS); 14872 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, EVAS_TEXTBLOCK_LEGACY_CLASS);
14873 Evas_Object_Textblock_Text_Item *ti = data; 14873 Evas_Object_Textblock_Text_Item *ti = data;
14874 Efl_Canvas_Textblock_Filter_Program *program; 14874 Evas_Textblock_Legacy_Filter_Program *program;
14875 Evas_Filter_Padding pad = {}; 14875 Evas_Filter_Padding pad = {};
14876 14876
14877#define STATE_COLOR(dst, src) dst.r = src.r; dst.g = src.g; dst.b = src.b; dst.a = src.a 14877#define STATE_COLOR(dst, src) dst.r = src.r; dst.g = src.g; dst.b = src.b; dst.a = src.a
@@ -14890,8 +14890,8 @@ _efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare(
14890} 14890}
14891 14891
14892EOLIAN static Eina_Bool 14892EOLIAN static Eina_Bool
14893_efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render( 14893_evas_textblock_legacy_efl_canvas_filter_internal_filter_input_render(
14894 Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, void *filter, 14894 Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED, void *filter,
14895 void *engine, void *output, void *drawctx, void *data, 14895 void *engine, void *output, void *drawctx, void *data,
14896 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, 14896 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
14897 int x, int y, Eina_Bool do_async) 14897 int x, int y, Eina_Bool do_async)
@@ -14907,17 +14907,17 @@ _efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render(
14907} 14907}
14908 14908
14909EOLIAN static void 14909EOLIAN static void
14910_efl_canvas_textblock_efl_canvas_filter_internal_filter_dirty( 14910_evas_textblock_legacy_efl_canvas_filter_internal_filter_dirty(
14911 Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED) 14911 Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED)
14912{ 14912{
14913 WRN("Filter marked as dirty. NOT IMPLEMENTED!"); 14913 WRN("Filter marked as dirty. NOT IMPLEMENTED!");
14914} 14914}
14915 14915
14916EOLIAN static void 14916EOLIAN static void
14917_efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *code, const char *name) 14917_evas_textblock_legacy_efl_gfx_filter_filter_program_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *pd, const char *code, const char *name)
14918{ 14918{
14919 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14919 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14920 Efl_Canvas_Textblock_Filter_Program *prg; 14920 Evas_Textblock_Legacy_Filter_Program *prg;
14921 14921
14922 prg = _filter_program_find(pd, name); 14922 prg = _filter_program_find(pd, name);
14923 if (prg) 14923 if (prg)
@@ -14928,7 +14928,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_T
14928 { 14928 {
14929 prg = calloc(1, sizeof(*prg)); 14929 prg = calloc(1, sizeof(*prg));
14930 prg->name = eina_stringshare_add(name); 14930 prg->name = eina_stringshare_add(name);
14931 pd->gfx_filter.programs = (Efl_Canvas_Textblock_Filter_Program *) 14931 pd->gfx_filter.programs = (Evas_Textblock_Legacy_Filter_Program *)
14932 eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg)); 14932 eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg));
14933 } 14933 }
14934 eina_stringshare_replace(&prg->code, code); 14934 eina_stringshare_replace(&prg->code, code);
@@ -14941,7 +14941,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_T
14941} 14941}
14942 14942
14943EOLIAN static void 14943EOLIAN static void
14944_efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, 14944_evas_textblock_legacy_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd EINA_UNUSED,
14945 const char **code EINA_UNUSED, const char **name EINA_UNUSED) 14945 const char **code EINA_UNUSED, const char **name EINA_UNUSED)
14946{ 14946{
14947 // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME 14947 // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
@@ -14949,7 +14949,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSE
14949} 14949}
14950 14950
14951static Evas_Filter_Data_Binding * 14951static Evas_Filter_Data_Binding *
14952_filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name) 14952_filter_data_binding_find(Evas_Textblock_Legacy_Data *pd, const char *name)
14953{ 14953{
14954 Evas_Filter_Data_Binding *db; 14954 Evas_Filter_Data_Binding *db;
14955 14955
@@ -14962,9 +14962,9 @@ _filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name)
14962} 14962}
14963 14963
14964EOLIAN static void 14964EOLIAN static void
14965_efl_canvas_textblock_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Textblock_Data *pd, const char *name, const char *value, Eina_Bool execute) 14965_evas_textblock_legacy_efl_gfx_filter_filter_data_set(Eo *obj, Evas_Textblock_Legacy_Data *pd, const char *name, const char *value, Eina_Bool execute)
14966{ 14966{
14967 Efl_Canvas_Textblock_Filter_Program *prg; 14967 Evas_Textblock_Legacy_Filter_Program *prg;
14968 Evas_Filter_Data_Binding *db; 14968 Evas_Filter_Data_Binding *db;
14969 14969
14970 if (!name) return; 14970 if (!name) return;
@@ -15010,7 +15010,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Textblo
15010} 15010}
15011 15011
15012EOLIAN static void 15012EOLIAN static void
15013_efl_canvas_textblock_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name, const char **value, Eina_Bool *execute) 15013_evas_textblock_legacy_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd, const char *name, const char **value, Eina_Bool *execute)
15014{ 15014{
15015 Evas_Filter_Data_Binding *db; 15015 Evas_Filter_Data_Binding *db;
15016 15016
@@ -15027,7 +15027,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED,
15027} 15027}
15028 15028
15029EOLIAN static void 15029EOLIAN static void
15030_efl_canvas_textblock_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *name, Efl_Gfx_Entity *eo_source) 15030_evas_textblock_legacy_efl_gfx_filter_filter_source_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *pd, const char *name, Efl_Gfx_Entity *eo_source)
15031{ 15031{
15032 Evas_Object_Protected_Data *obj, *source; 15032 Evas_Object_Protected_Data *obj, *source;
15033 Evas_Filter_Proxy_Binding *pb; 15033 Evas_Filter_Proxy_Binding *pb;
@@ -15081,7 +15081,7 @@ _efl_canvas_textblock_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Te
15081} 15081}
15082 15082
15083EOLIAN static Efl_Gfx_Entity * 15083EOLIAN static Efl_Gfx_Entity *
15084_efl_canvas_textblock_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name) 15084_evas_textblock_legacy_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *pd, const char *name)
15085{ 15085{
15086 return eina_hash_find(pd->gfx_filter.sources, name); 15086 return eina_hash_find(pd->gfx_filter.sources, name);
15087} 15087}
@@ -15091,7 +15091,7 @@ evas_object_textblock_coords_recalc(Evas_Object *eo_obj,
15091 Evas_Object_Protected_Data *obj, 15091 Evas_Object_Protected_Data *obj,
15092 void *type_private_data) 15092 void *type_private_data)
15093{ 15093{
15094 Efl_Canvas_Textblock_Data *o = type_private_data; 15094 Evas_Textblock_Legacy_Data *o = type_private_data;
15095 15095
15096#ifdef BIDI_SUPPORT 15096#ifdef BIDI_SUPPORT
15097 if (o->inherit_paragraph_direction) 15097 if (o->inherit_paragraph_direction)
@@ -15150,7 +15150,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj,
15150 Evas_Object_Protected_Data *obj, 15150 Evas_Object_Protected_Data *obj,
15151 void *type_private_data) 15151 void *type_private_data)
15152{ 15152{
15153 Efl_Canvas_Textblock_Data *o = type_private_data; 15153 Evas_Textblock_Legacy_Data *o = type_private_data;
15154 ASYNC_BLOCK; 15154 ASYNC_BLOCK;
15155 15155
15156 int is_v, was_v; 15156 int is_v, was_v;
@@ -15275,13 +15275,13 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
15275 Evas_Object_Protected_Data *obj, 15275 Evas_Object_Protected_Data *obj,
15276 void *type_private_data) 15276 void *type_private_data)
15277{ 15277{
15278 Efl_Canvas_Textblock_Data *o = type_private_data; 15278 Evas_Textblock_Legacy_Data *o = type_private_data;
15279 ASYNC_BLOCK; 15279 ASYNC_BLOCK;
15280 15280
15281 /* this moves the current data to the previous state parts of the object */ 15281 /* this moves the current data to the previous state parts of the object */
15282 /* in whatever way is safest for the object. also if we don't need object */ 15282 /* in whatever way is safest for the object. also if we don't need object */
15283 /* data anymore we can free it if the object deems this is a good idea */ 15283 /* data anymore we can free it if the object deems this is a good idea */
15284/* o = (Efl_Canvas_Textblock_Data *)(obj->object_data); */ 15284/* o = (Evas_Textblock_Legacy_Data *)(obj->object_data); */
15285 /* remove those pesky changes */ 15285 /* remove those pesky changes */
15286 evas_object_clip_changes_clean(obj); 15286 evas_object_clip_changes_clean(obj);
15287 /* move cur to prev safely for object data */ 15287 /* move cur to prev safely for object data */
@@ -15293,7 +15293,7 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
15293 15293
15294static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj) 15294static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
15295{ 15295{
15296 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 15296 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
15297 if (!o) return NULL; 15297 if (!o) return NULL;
15298 return o->engine_data; 15298 return o->engine_data;
15299} 15299}
@@ -15319,8 +15319,8 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
15319} 15319}
15320 15320
15321EOLIAN static void 15321EOLIAN static void
15322_efl_canvas_textblock_efl_gfx_entity_scale_set(Evas_Object *eo_obj, 15322_evas_textblock_legacy_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
15323 Efl_Canvas_Textblock_Data *o, 15323 Evas_Textblock_Legacy_Data *o,
15324 double scale) 15324 double scale)
15325{ 15325{
15326 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return; 15326 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
@@ -15336,7 +15336,7 @@ void
15336_evas_object_textblock_rehint(Evas_Object *eo_obj) 15336_evas_object_textblock_rehint(Evas_Object *eo_obj)
15337{ 15337{
15338 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15338 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15339 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 15339 Evas_Textblock_Legacy_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
15340 Evas_Object_Textblock_Paragraph *par; 15340 Evas_Object_Textblock_Paragraph *par;
15341 Evas_Object_Textblock_Line *ln; 15341 Evas_Object_Textblock_Line *ln;
15342 15342
@@ -15365,8 +15365,8 @@ _evas_object_textblock_rehint(Evas_Object *eo_obj)
15365} 15365}
15366 15366
15367EOLIAN static void 15367EOLIAN static void
15368_efl_canvas_textblock_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, 15368_evas_textblock_legacy_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
15369 Efl_Canvas_Textblock_Data *o, 15369 Evas_Textblock_Legacy_Data *o,
15370 Efl_Text_Bidirectional_Type dir) 15370 Efl_Text_Bidirectional_Type dir)
15371{ 15371{
15372#ifdef BIDI_SUPPORT 15372#ifdef BIDI_SUPPORT
@@ -15408,8 +15408,8 @@ _efl_canvas_textblock_efl_canvas_object_paragraph_direction_set(Eo *eo_obj,
15408} 15408}
15409 15409
15410EOLIAN static Efl_Text_Bidirectional_Type 15410EOLIAN static Efl_Text_Bidirectional_Type
15411_efl_canvas_textblock_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, 15411_evas_textblock_legacy_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED,
15412 Efl_Canvas_Textblock_Data *o) 15412 Evas_Textblock_Legacy_Data *o)
15413{ 15413{
15414 return (Efl_Text_Bidirectional_Type)o->paragraph_direction; 15414 return (Efl_Text_Bidirectional_Type)o->paragraph_direction;
15415} 15415}
@@ -15430,7 +15430,7 @@ _prepend_text_run2(Efl_Text_Cursor_Cursor *cur, const char *s, const char *p)
15430} 15430}
15431 15431
15432static int 15432static int
15433_efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur, 15433_evas_textblock_legacy_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
15434 const char *text) 15434 const char *text)
15435{ 15435{
15436 if (!text) return 0; 15436 if (!text) return 0;
@@ -15478,17 +15478,17 @@ _efl_canvas_textblock_cursor_text_append(Efl_Text_Cursor_Cursor *cur,
15478} 15478}
15479 15479
15480EOLIAN static void 15480EOLIAN static void
15481_efl_canvas_textblock_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 15481_evas_textblock_legacy_efl_text_text_set(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
15482 const char *text) 15482 const char *text)
15483{ 15483{
15484 ASYNC_BLOCK; 15484 ASYNC_BLOCK;
15485 evas_object_textblock_text_markup_set(eo_obj, ""); 15485 evas_object_textblock_text_markup_set(eo_obj, "");
15486 efl_text_cursor_text_insert(eo_obj, o->cursor, text); 15486 efl_text_cursor_text_insert(eo_obj, o->cursor, text);
15487 //efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 15487 //efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
15488} 15488}
15489 15489
15490static char * 15490static char *
15491_canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 15491_canvas_text_get_all(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED)
15492{ 15492{
15493 Efl_Text_Cursor_Cursor start, end; 15493 Efl_Text_Cursor_Cursor start, end;
15494 15494
@@ -15502,7 +15502,7 @@ _canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
15502} 15502}
15503 15503
15504EOLIAN static const char * 15504EOLIAN static const char *
15505_efl_canvas_textblock_efl_text_text_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) 15505_evas_textblock_legacy_efl_text_text_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
15506{ 15506{
15507 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15507 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15508 evas_object_async_block(obj); 15508 evas_object_async_block(obj);
@@ -15586,7 +15586,7 @@ _textblock_cursor_pos_at_fnode_set(const Eo *eo_obj EINA_UNUSED,
15586} 15586}
15587 15587
15588static Eina_Bool 15588static Eina_Bool
15589_textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, 15589_textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o,
15590 Efl_Text_Annotate_Annotation *an, 15590 Efl_Text_Annotate_Annotation *an,
15591 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end, 15591 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
15592 const char *format, Eina_Bool is_item) 15592 const char *format, Eina_Bool is_item)
@@ -15626,7 +15626,7 @@ _textblock_annotation_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o,
15626} 15626}
15627 15627
15628EOLIAN static const char * 15628EOLIAN static const char *
15629_efl_canvas_textblock_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 15629_evas_textblock_legacy_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
15630 Efl_Text_Annotate_Annotation *annotation) 15630 Efl_Text_Annotate_Annotation *annotation)
15631{ 15631{
15632 if (!annotation || (annotation->obj != eo_obj)) 15632 if (!annotation || (annotation->obj != eo_obj))
@@ -15639,8 +15639,8 @@ _efl_canvas_textblock_efl_text_annotate_annotation_get(const Eo *eo_obj EINA_UNU
15639} 15639}
15640 15640
15641EOLIAN static Eina_Bool 15641EOLIAN static Eina_Bool
15642_efl_canvas_textblock_efl_text_annotate_annotation_set(Eo *eo_obj, 15642_evas_textblock_legacy_efl_text_annotate_annotation_set(Eo *eo_obj,
15643 Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *annotation, 15643 Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *annotation,
15644 const char *format) 15644 const char *format)
15645{ 15645{
15646 ASYNC_BLOCK; 15646 ASYNC_BLOCK;
@@ -15676,7 +15676,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_set(Eo *eo_obj,
15676} 15676}
15677 15677
15678static void 15678static void
15679_evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o, 15679_evas_textblock_annotation_remove(Evas_Textblock_Legacy_Data *o,
15680 Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes) 15680 Efl_Text_Annotate_Annotation *an, Eina_Bool remove_nodes)
15681{ 15681{
15682 if (remove_nodes) 15682 if (remove_nodes)
@@ -15700,7 +15700,7 @@ _evas_textblock_annotation_remove(Efl_Canvas_Textblock_Data *o,
15700} 15700}
15701 15701
15702static void 15702static void
15703_evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o) 15703_evas_textblock_annotations_clear(Evas_Textblock_Legacy_Data *o)
15704{ 15704{
15705 Efl_Text_Annotate_Annotation *an; 15705 Efl_Text_Annotate_Annotation *an;
15706 15706
@@ -15711,8 +15711,8 @@ _evas_textblock_annotations_clear(Efl_Canvas_Textblock_Data *o)
15711} 15711}
15712 15712
15713EOLIAN static Eina_Bool 15713EOLIAN static Eina_Bool
15714_efl_canvas_textblock_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED, 15714_evas_textblock_legacy_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
15715 Efl_Canvas_Textblock_Data *o, Efl_Text_Annotate_Annotation *annotation) 15715 Evas_Textblock_Legacy_Data *o, Efl_Text_Annotate_Annotation *annotation)
15716{ 15716{
15717 ASYNC_BLOCK; 15717 ASYNC_BLOCK;
15718 if (!annotation || (annotation->obj != eo_obj)) 15718 if (!annotation || (annotation->obj != eo_obj))
@@ -15736,7 +15736,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_del(Eo *eo_obj EINA_UNUSED,
15736} 15736}
15737 15737
15738static Efl_Text_Annotate_Annotation * 15738static Efl_Text_Annotate_Annotation *
15739_textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 15739_textblock_annotation_insert(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
15740 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end, 15740 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
15741 const char *format, Eina_Bool is_item) 15741 const char *format, Eina_Bool is_item)
15742{ 15742{
@@ -15801,7 +15801,7 @@ _textblock_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
15801} 15801}
15802 15802
15803EOLIAN static Efl_Text_Annotate_Annotation * 15803EOLIAN static Efl_Text_Annotate_Annotation *
15804_efl_canvas_textblock_efl_text_annotate_annotation_insert(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, 15804_evas_textblock_legacy_efl_text_annotate_annotation_insert(Eo *eo_obj, Evas_Textblock_Legacy_Data *o,
15805 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end, 15805 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end,
15806 const char *format) 15806 const char *format)
15807{ 15807{
@@ -15810,12 +15810,12 @@ _efl_canvas_textblock_efl_text_annotate_annotation_insert(Eo *eo_obj, Efl_Canvas
15810 15810
15811 ret = _textblock_annotation_insert(eo_obj, o, start, end, format, 15811 ret = _textblock_annotation_insert(eo_obj, o, start, end, format,
15812 EINA_FALSE); 15812 EINA_FALSE);
15813 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 15813 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
15814 return ret; 15814 return ret;
15815} 15815}
15816 15816
15817EOLIAN static Eina_Iterator * 15817EOLIAN static Eina_Iterator *
15818_efl_canvas_textblock_efl_text_annotate_range_annotations_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 15818_evas_textblock_legacy_efl_text_annotate_range_annotations_get(const Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
15819 const Evas_Textblock_Cursor *start, const Evas_Textblock_Cursor *end) 15819 const Evas_Textblock_Cursor *start, const Evas_Textblock_Cursor *end)
15820{ 15820{
15821 Eina_List *lst = NULL; 15821 Eina_List *lst = NULL;
@@ -15841,8 +15841,8 @@ _efl_canvas_textblock_efl_text_annotate_range_annotations_get(const Eo *eo_obj,
15841} 15841}
15842 15842
15843EOLIAN static Efl_Text_Annotate_Annotation * 15843EOLIAN static Efl_Text_Annotate_Annotation *
15844_efl_canvas_textblock_efl_text_annotate_cursor_item_insert(Eo *eo_obj, 15844_evas_textblock_legacy_efl_text_annotate_cursor_item_insert(Eo *eo_obj,
15845 Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur, 15845 Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur,
15846 const char *item, const char *format) 15846 const char *item, const char *format)
15847{ 15847{
15848 Eina_Strbuf *buf = eina_strbuf_new(); 15848 Eina_Strbuf *buf = eina_strbuf_new();
@@ -15853,13 +15853,13 @@ _efl_canvas_textblock_efl_text_annotate_cursor_item_insert(Eo *eo_obj,
15853 _textblock_annotation_insert(cur->obj, o, cur, cur, 15853 _textblock_annotation_insert(cur->obj, o, cur, cur,
15854 eina_strbuf_string_get(buf), EINA_TRUE); 15854 eina_strbuf_string_get(buf), EINA_TRUE);
15855 eina_strbuf_free(buf); 15855 eina_strbuf_free(buf);
15856 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 15856 efl_event_callback_legacy_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
15857 return ret; 15857 return ret;
15858} 15858}
15859 15859
15860EOLIAN static Efl_Text_Annotate_Annotation * 15860EOLIAN static Efl_Text_Annotate_Annotation *
15861_efl_canvas_textblock_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_obj EINA_UNUSED, 15861_evas_textblock_legacy_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_obj EINA_UNUSED,
15862 Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur) 15862 Evas_Textblock_Legacy_Data *o EINA_UNUSED, Efl_Text_Cursor_Cursor *cur)
15863{ 15863{
15864 Eina_Iterator *it; 15864 Eina_Iterator *it;
15865 Efl_Text_Annotate_Annotation *data, *ret = NULL; 15865 Efl_Text_Annotate_Annotation *data, *ret = NULL;
@@ -15879,8 +15879,8 @@ _efl_canvas_textblock_efl_text_annotate_cursor_item_annotation_get(const Eo *eo_
15879} 15879}
15880 15880
15881EOLIAN static Eina_Bool 15881EOLIAN static Eina_Bool
15882_efl_canvas_textblock_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSED, 15882_evas_textblock_legacy_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSED,
15883 Efl_Canvas_Textblock_Data *o EINA_UNUSED, 15883 Evas_Textblock_Legacy_Data *o EINA_UNUSED,
15884 Efl_Text_Annotate_Annotation *annotation) 15884 Efl_Text_Annotate_Annotation *annotation)
15885{ 15885{
15886 if (!annotation || (annotation->obj != eo_obj)) 15886 if (!annotation || (annotation->obj != eo_obj))
@@ -15893,7 +15893,7 @@ _efl_canvas_textblock_efl_text_annotate_annotation_is_item(Eo *eo_obj EINA_UNUSE
15893} 15893}
15894 15894
15895EOLIAN static Eina_Bool 15895EOLIAN static Eina_Bool
15896_efl_canvas_textblock_efl_text_annotate_item_geometry_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, 15896_evas_textblock_legacy_efl_text_annotate_item_geometry_get(Eo *eo_obj, Evas_Textblock_Legacy_Data *o EINA_UNUSED,
15897 const Efl_Text_Annotate_Annotation *an, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch) 15897 const Efl_Text_Annotate_Annotation *an, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
15898{ 15898{
15899 Efl_Text_Cursor_Cursor cur; 15899 Efl_Text_Cursor_Cursor cur;
@@ -15908,8 +15908,8 @@ _efl_canvas_textblock_efl_text_annotate_item_geometry_get(Eo *eo_obj, Efl_Canvas
15908} 15908}
15909 15909
15910EOLIAN static void 15910EOLIAN static void
15911_efl_canvas_textblock_efl_text_annotate_annotation_positions_get(Eo *eo_obj, 15911_evas_textblock_legacy_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
15912 Efl_Canvas_Textblock_Data *o EINA_UNUSED, 15912 Evas_Textblock_Legacy_Data *o EINA_UNUSED,
15913 const Efl_Text_Annotate_Annotation *annotation, 15913 const Efl_Text_Annotate_Annotation *annotation,
15914 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end) 15914 Efl_Text_Cursor_Cursor *start, Efl_Text_Cursor_Cursor *end)
15915{ 15915{
@@ -15918,18 +15918,18 @@ _efl_canvas_textblock_efl_text_annotate_annotation_positions_get(Eo *eo_obj,
15918} 15918}
15919 15919
15920static void 15920static void
15921_canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o) 15921_canvas_text_format_changed(Eo *eo_obj, Evas_Textblock_Legacy_Data *o)
15922{ 15922{
15923 o->format_changed = EINA_TRUE; 15923 o->format_changed = EINA_TRUE;
15924 _evas_textblock_invalidate_all(o); 15924 _evas_textblock_invalidate_all(o);
15925 _evas_textblock_changed(o, eo_obj); 15925 _evas_textblock_changed(o, eo_obj);
15926 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); 15926 efl_event_callback_call(eo_obj, EVAS_TEXTBLOCK_LEGACY_EVENT_CHANGED, NULL);
15927} 15927}
15928 15928
15929/* Efl.Text.Font interface implementation */ 15929/* Efl.Text.Font interface implementation */
15930 15930
15931static void 15931static void
15932_efl_canvas_textblock_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font EINA_UNUSED, int size EINA_UNUSED) 15932_evas_textblock_legacy_efl_text_font_font_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font EINA_UNUSED, int size EINA_UNUSED)
15933{ 15933{
15934 ASYNC_BLOCK; 15934 ASYNC_BLOCK;
15935 Eina_Bool changed = EINA_FALSE; 15935 Eina_Bool changed = EINA_FALSE;
@@ -15965,14 +15965,14 @@ _efl_canvas_textblock_efl_text_font_font_set(Eo *obj EINA_UNUSED, Efl_Canvas_Tex
15965} 15965}
15966 15966
15967static void 15967static void
15968_efl_canvas_textblock_efl_text_font_font_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char **font EINA_UNUSED, int *size EINA_UNUSED) 15968_evas_textblock_legacy_efl_text_font_font_get(const Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char **font EINA_UNUSED, int *size EINA_UNUSED)
15969{ 15969{
15970 if (font) *font = o->default_format.info.font; 15970 if (font) *font = o->default_format.info.font;
15971 if (size) *size = o->default_format.info.size; 15971 if (size) *size = o->default_format.info.size;
15972} 15972}
15973 15973
15974static void 15974static void
15975_efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED) 15975_evas_textblock_legacy_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Evas_Textblock_Legacy_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED)
15976{ 15976{
15977