summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-12-10 17:39:59 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-12-10 17:39:59 +0900
commit621d2cdecf8f53526f1e8ca427bf815086768a28 (patch)
tree51a3564d46e311b7c688fdb16a58abd479acf290
parentf793939315b37a6a8332af0ec870a0af1b6ad434 (diff)
Efl.Canvas.Text rename into Efl.Canvas.Textblock
Summary: Efl.Canvas.Text renamed into **Efl.Canvas.Textblock** Efl.Canvas.Text_Factory renamed into **Efl.Canvas.Textblock_Factory** Reviewers: woohyun, segfaultxavi, zmike, bu5hm4n, YOhoho Reviewed By: segfaultxavi Subscribers: cedric, #committers, #reviewers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10808
-rw-r--r--NEWS2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/lib/edje/edje_textblock.c44
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c68
-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.eo6
-rw-r--r--src/lib/elementary/efl_ui_text.c24
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.c2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_emoticons.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_factory_fallback.c8
-rw-r--r--src/lib/elementary/efl_ui_text_factory_fallback.eo4
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.c2
-rw-r--r--src/lib/elementary/efl_ui_text_factory_images.eo4
-rw-r--r--src/lib/evas/Efl_Canvas.h4
-rw-r--r--src/lib/evas/Evas_Eo.h6
-rw-r--r--src/lib/evas/canvas/efl_canvas_text_eo.legacy.c72
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo (renamed from src/lib/evas/canvas/efl_canvas_text.eo)2
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c72
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h (renamed from src/lib/evas/canvas/efl_canvas_text_eo.legacy.h)36
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_factory.eo (renamed from src/lib/evas/canvas/efl_canvas_text_factory.eo)2
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock_internal.h (renamed from src/lib/evas/canvas/efl_canvas_text_internal.h)24
-rw-r--r--src/lib/evas/canvas/efl_text_attribute_factory.c4
-rw-r--r--src/lib/evas/canvas/efl_text_attribute_factory.eo4
-rw-r--r--src/lib/evas/canvas/efl_text_cursor.c4
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c600
-rw-r--r--src/lib/evas/canvas/evas_textblock_hyphenation.x4
-rw-r--r--src/lib/evas/canvas/evas_textblock_legacy.h12
-rw-r--r--src/lib/evas/canvas/meson.build6
-rw-r--r--src/tests/evas/evas_test_textblock.c102
31 files changed, 567 insertions, 567 deletions
diff --git a/NEWS b/NEWS
index 1906fe9..3cfa365 100644
--- a/NEWS
+++ b/NEWS
@@ -385,7 +385,7 @@ Features:
385 * eo: Add "destruct" event 385 * eo: Add "destruct" event
386 * efl-wl: move to xdg-shell vfinal 386 * efl-wl: move to xdg-shell vfinal
387 * wayland: add xdg-shell vfinal support for client-side 387 * wayland: add xdg-shell vfinal support for client-side
388 * Canvas image: add Efl.Canvas.Text.Factory + use in Ui.Text 388 * Canvas image: add Efl.Canvas.Textblock.Factory + use in Ui.Text
389 * efl-wl: add functionality for directly passing through xkb objects 389 * efl-wl: add functionality for directly passing through xkb objects
390 * ecore-x: add more info to Ecore_X_Event_Xkb event 390 * ecore-x: add more info to Ecore_X_Event_Xkb event
391 * ecore-x: add some useful xkb function wrappers 391 * ecore-x: add some useful xkb function wrappers
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 47e83d7..eee77af 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -491,7 +491,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
491 491
492 // Experimental textblock support 492 // Experimental textblock support
493 o = tb = evas_object_textblock_add(evas_object_evas_get(win)); 493 o = tb = evas_object_textblock_add(evas_object_evas_get(win));
494 efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); 494 efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL); 495 efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
496 Evas_Textblock_Style *st = evas_textblock_style_new(); 496 Evas_Textblock_Style *st = evas_textblock_style_new();
497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'"); 497 evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
diff --git a/src/lib/edje/edje_textblock.c b/src/lib/edje/edje_textblock.c
index 8b9d97e..76f3b2a 100644
--- a/src/lib/edje/edje_textblock.c
+++ b/src/lib/edje/edje_textblock.c
@@ -62,10 +62,10 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
62 if (!minx2) 62 if (!minx2)
63 { 63 {
64 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 64 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
65 size = efl_canvas_text_size_formatted_get(ep->object); 65 size = efl_canvas_textblock_size_formatted_get(ep->object);
66 } 66 }
67 else 67 else
68 size = efl_canvas_text_size_native_get(ep->object); 68 size = efl_canvas_textblock_size_native_get(ep->object);
69 evas_object_textblock_style_insets_get(ep->object, &ins_l, 69 evas_object_textblock_style_insets_get(ep->object, &ins_l,
70 &ins_r, &ins_t, &ins_b); 70 &ins_r, &ins_t, &ins_b);
71 mw = ins_l + size.w + ins_r; 71 mw = ins_l + size.w + ins_r;
@@ -88,10 +88,10 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
88 if (!maxx2) 88 if (!maxx2)
89 { 89 {
90 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); 90 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
91 size = efl_canvas_text_size_formatted_get(ep->object); 91 size = efl_canvas_textblock_size_formatted_get(ep->object);
92 } 92 }
93 else 93 else
94 size = efl_canvas_text_size_native_get(ep->object); 94 size = efl_canvas_textblock_size_native_get(ep->object);
95 evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r, 95 evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r,
96 &ins_t, &ins_b); 96 &ins_t, &ins_b);
97 mw = ins_l + size.w + ins_r; 97 mw = ins_l + size.w + ins_r;
@@ -180,7 +180,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
180 if (temp_w > 0) 180 if (temp_w > 0)
181 { 181 {
182 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 182 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
183 size = efl_canvas_text_size_formatted_get(ep->object); 183 size = efl_canvas_textblock_size_formatted_get(ep->object);
184 tw = size.w; 184 tw = size.w;
185 th = size.h; 185 th = size.h;
186 186
@@ -189,7 +189,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
189 } 189 }
190 else 190 else
191 { 191 {
192 size = efl_canvas_text_size_native_get(ep->object); 192 size = efl_canvas_textblock_size_native_get(ep->object);
193 th = size.h; 193 th = size.h;
194 194
195 th += ins_t + ins_b; 195 th += ins_t + ins_b;
@@ -221,7 +221,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
221 } 221 }
222 222
223 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 223 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
224 size = efl_canvas_text_size_formatted_get(ep->object); 224 size = efl_canvas_textblock_size_formatted_get(ep->object);
225 tw = size.w; 225 tw = size.w;
226 th = size.h; 226 th = size.h;
227 227
@@ -232,7 +232,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
232 * don't get meaningless height for multiline */ 232 * don't get meaningless height for multiline */
233 if (temp_w <= 0) 233 if (temp_w <= 0)
234 { 234 {
235 size = efl_canvas_text_size_native_get(ep->object); 235 size = efl_canvas_textblock_size_native_get(ep->object);
236 th = size.h; 236 th = size.h;
237 237
238 th += ins_t + ins_b; 238 th += ins_t + ins_b;
@@ -246,7 +246,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
246 * text.min: 1 X 246 * text.min: 1 X
247 * text.max: 0 X without max width. 247 * text.max: 0 X without max width.
248 * It is a singleline Textblock. */ 248 * It is a singleline Textblock. */
249 size = efl_canvas_text_size_native_get(ep->object); 249 size = efl_canvas_textblock_size_native_get(ep->object);
250 tw = size.w; 250 tw = size.w;
251 th = size.h; 251 th = size.h;
252 252
@@ -311,7 +311,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
311 if (temp_w > 0) 311 if (temp_w > 0)
312 { 312 {
313 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 313 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
314 size = efl_canvas_text_size_formatted_get(ep->object); 314 size = efl_canvas_textblock_size_formatted_get(ep->object);
315 tw = size.w; 315 tw = size.w;
316 th = size.h; 316 th = size.h;
317 317
@@ -320,7 +320,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
320 } 320 }
321 else 321 else
322 { 322 {
323 size = efl_canvas_text_size_native_get(ep->object); 323 size = efl_canvas_textblock_size_native_get(ep->object);
324 th = size.h; 324 th = size.h;
325 325
326 th += ins_t + ins_b; 326 th += ins_t + ins_b;
@@ -335,7 +335,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
335 /* text.min: 1 X 335 /* text.min: 1 X
336 * text.max: 1 X 336 * text.max: 1 X
337 * Singleline. */ 337 * Singleline. */
338 size = efl_canvas_text_size_native_get(ep->object); 338 size = efl_canvas_textblock_size_native_get(ep->object);
339 tw = size.w; 339 tw = size.w;
340 th = size.h; 340 th = size.h;
341 341
@@ -374,7 +374,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
374 * text.max: 1 1 */ 374 * text.max: 1 1 */
375 375
376 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 376 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
377 size = efl_canvas_text_size_formatted_get(ep->object); 377 size = efl_canvas_textblock_size_formatted_get(ep->object);
378 tw = size.w; 378 tw = size.w;
379 th = size.h; 379 th = size.h;
380 380
@@ -385,7 +385,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
385 * don't get meaningless height for multiline */ 385 * don't get meaningless height for multiline */
386 if (temp_w <= 0) 386 if (temp_w <= 0)
387 { 387 {
388 size = efl_canvas_text_size_native_get(ep->object); 388 size = efl_canvas_textblock_size_native_get(ep->object);
389 th = size.h; 389 th = size.h;
390 390
391 th += ins_t + ins_b; 391 th += ins_t + ins_b;
@@ -404,7 +404,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
404 404
405 temp_h = efl_gfx_entity_size_get(ep->object).h; 405 temp_h = efl_gfx_entity_size_get(ep->object).h;
406 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); 406 efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
407 size = efl_canvas_text_size_formatted_get(ep->object); 407 size = efl_canvas_textblock_size_formatted_get(ep->object);
408 tw = size.w; 408 tw = size.w;
409 th = size.h; 409 th = size.h;
410 410
@@ -415,7 +415,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
415 * don't get meaningless height for multiline */ 415 * don't get meaningless height for multiline */
416 if (temp_w <= 0) 416 if (temp_w <= 0)
417 { 417 {
418 size = efl_canvas_text_size_native_get(ep->object); 418 size = efl_canvas_textblock_size_native_get(ep->object);
419 th = size.h; 419 th = size.h;
420 420
421 th += ins_t + ins_b; 421 th += ins_t + ins_b;
@@ -545,7 +545,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
545 545
546 if (ep->part->scale) base_s = TO_DOUBLE(sc); 546 if (ep->part->scale) base_s = TO_DOUBLE(sc);
547 efl_gfx_entity_scale_set(ep->object, base_s); 547 efl_gfx_entity_scale_set(ep->object, base_s);
548 size = efl_canvas_text_size_native_get(ep->object); 548 size = efl_canvas_textblock_size_native_get(ep->object);
549 549
550 orig_s = base_s; 550 orig_s = base_s;
551 /* Now make it bigger so calculations will be more accurate 551 /* Now make it bigger so calculations will be more accurate
@@ -554,7 +554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
554 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 554 orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
555 orig_s * TO_INT(params->eval.w) / size.w); 555 orig_s * TO_INT(params->eval.w) / size.w);
556 efl_gfx_entity_scale_set(ep->object, orig_s); 556 efl_gfx_entity_scale_set(ep->object, orig_s);
557 size = efl_canvas_text_size_native_get(ep->object); 557 size = efl_canvas_textblock_size_native_get(ep->object);
558 } 558 }
559 if (chosen_desc->text.fit_x) 559 if (chosen_desc->text.fit_x)
560 { 560 {
@@ -563,7 +563,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
563 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, 563 s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
564 orig_s * TO_INT(params->eval.w) / size.w); 564 orig_s * TO_INT(params->eval.w) / size.w);
565 efl_gfx_entity_scale_set(ep->object, s); 565 efl_gfx_entity_scale_set(ep->object, s);
566 efl_canvas_text_size_native_get(ep->object); 566 efl_canvas_textblock_size_native_get(ep->object);
567 } 567 }
568 } 568 }
569 if (chosen_desc->text.fit_y) 569 if (chosen_desc->text.fit_y)
@@ -580,7 +580,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
580 } 580 }
581 581
582 efl_gfx_entity_scale_set(ep->object, s); 582 efl_gfx_entity_scale_set(ep->object, s);
583 efl_canvas_text_size_native_get(ep->object); 583 efl_canvas_textblock_size_native_get(ep->object);
584 } 584 }
585 } 585 }
586 586
@@ -589,7 +589,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
589 { 589 {
590 int i = 5; /* Tries before we give up. */ 590 int i = 5; /* Tries before we give up. */
591 Eina_Size2D size; 591 Eina_Size2D size;
592 size = efl_canvas_text_size_native_get(ep->object); 592 size = efl_canvas_textblock_size_native_get(ep->object);
593 593
594 /* If we are still too big, try reducing the size to 594 /* If we are still too big, try reducing the size to
595 * 95% each try. */ 595 * 95% each try. */
@@ -605,7 +605,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
605 s = tmp_s; 605 s = tmp_s;
606 606
607 efl_gfx_entity_scale_set(ep->object, s); 607 efl_gfx_entity_scale_set(ep->object, s);
608 size = efl_canvas_text_size_native_get(ep->object); 608 size = efl_canvas_textblock_size_native_get(ep->object);
609 i--; 609 i--;
610 } 610 }
611 } 611 }
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 0a35d2f..017f2a8 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -4,7 +4,7 @@
4 4
5#include "elm_priv.h" 5#include "elm_priv.h"
6#include "efl_ui_internal_text_interactive.h" 6#include "efl_ui_internal_text_interactive.h"
7#include "efl_canvas_text_internal.h" 7#include "efl_canvas_textblock_internal.h"
8 8
9#define MY_CLASS EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS 9#define MY_CLASS EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS
10 10
@@ -52,25 +52,25 @@ static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, E
52static void _entry_imf_cursor_info_set(Efl_Ui_Internal_Text_Interactive_Data *en); 52static void _entry_imf_cursor_info_set(Efl_Ui_Internal_Text_Interactive_Data *en);
53 53
54static void 54static void
55_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 55_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
56 Efl_Text_Cursor *c, const char *text); 56 Efl_Text_Cursor *c, const char *text);
57 57
58static Efl_Text_Change_Info * 58static Efl_Text_Change_Info *
59_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 59_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
60 Efl_Text_Cursor *c, 60 Efl_Text_Cursor *c,
61 const char *text, 61 const char *text,
62 const char *fmtpre, const char *fmtpost, 62 const char *fmtpre, const char *fmtpost,
63 Eina_Bool clearsel, Eina_Bool changeinfo); 63 Eina_Bool clearsel, Eina_Bool changeinfo);
64 64
65static Efl_Text_Change_Info * 65static Efl_Text_Change_Info *
66_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 66_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
67 Efl_Text_Cursor *c, 67 Efl_Text_Cursor *c,
68 char *text, 68 char *text,
69 const char *fmtpre, const char *fmtpost, 69 const char *fmtpre, const char *fmtpost,
70 Eina_Bool clearsel, Eina_Bool changeinfo); 70 Eina_Bool clearsel, Eina_Bool changeinfo);
71 71
72static Efl_Text_Change_Info * 72static Efl_Text_Change_Info *
73_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 73_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
74 Efl_Text_Cursor *c, 74 Efl_Text_Cursor *c,
75 const char *text, 75 const char *text,
76 const char *fmtpre, const char *fmtpost, 76 const char *fmtpre, const char *fmtpost,
@@ -109,7 +109,7 @@ _preedit_del(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
109static Eina_Bool 109static Eina_Bool
110_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) 110_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
111{ 111{
112 Efl_Canvas_Text *obj = data; 112 Efl_Canvas_Textblock *obj = data;
113 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 113 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
114 const char *str; 114 const char *str;
115 115
@@ -144,7 +144,7 @@ _return_key_update(Evas_Object *obj)
144 144
145 if (sd->input_panel_return_key_state != EFL_INPUT_TEXT_PANEL_RETURN_KEY_STATE_AUTO) return; 145 if (sd->input_panel_return_key_state != EFL_INPUT_TEXT_PANEL_RETURN_KEY_STATE_AUTO) return;
146 146
147 if (efl_canvas_text_is_empty_get(obj) == EINA_TRUE) 147 if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE)
148 return_key_disabled = EINA_TRUE; 148 return_key_disabled = EINA_TRUE;
149 149
150 if (sd->imf_context) 150 if (sd->imf_context)
@@ -180,7 +180,7 @@ _entry_hide_visible_password(Eo *obj)
180static void 180static void
181_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 181_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
182{ 182{
183 Efl_Canvas_Text *obj = data; 183 Efl_Canvas_Textblock *obj = data;
184 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 184 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
185 char *commit_str = event_info; 185 char *commit_str = event_info;
186 Efl_Text_Change_Info *info = NULL; 186 Efl_Text_Change_Info *info = NULL;
@@ -231,7 +231,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
231} 231}
232 232
233static Efl_Text_Change_Info * 233static Efl_Text_Change_Info *
234_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 234_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
235 Efl_Text_Cursor *c, 235 Efl_Text_Cursor *c,
236 char *text, 236 char *text,
237 const char *fmtpre, const char *fmtpost, 237 const char *fmtpre, const char *fmtpost,
@@ -284,7 +284,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_
284} 284}
285 285
286static Efl_Text_Change_Info * 286static Efl_Text_Change_Info *
287_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 287_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
288 Efl_Text_Cursor *c, 288 Efl_Text_Cursor *c,
289 const char *text, 289 const char *text,
290 const char *fmtpre, const char *fmtpost, 290 const char *fmtpre, const char *fmtpost,
@@ -313,7 +313,7 @@ _text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti
313} 313}
314 314
315static Efl_Text_Change_Info * 315static Efl_Text_Change_Info *
316_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 316_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
317 Efl_Text_Cursor *c, 317 Efl_Text_Cursor *c,
318 const char *text, 318 const char *text,
319 const char *fmtpre, const char *fmtpost, 319 const char *fmtpre, const char *fmtpost,
@@ -342,7 +342,7 @@ _text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive
342} 342}
343 343
344static void 344static void
345_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, 345_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
346 Efl_Text_Cursor *c, const char *text) 346 Efl_Text_Cursor *c, const char *text)
347{ 347{
348 EINA_SAFETY_ON_NULL_RETURN(text); 348 EINA_SAFETY_ON_NULL_RETURN(text);
@@ -416,7 +416,7 @@ _text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti
416static void 416static void
417_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) 417_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
418{ 418{
419 Efl_Canvas_Text *obj = data; 419 Efl_Canvas_Textblock *obj = data;
420 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 420 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
421 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 421 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
422 Efl_Text_Change_Info *info = NULL; 422 Efl_Text_Change_Info *info = NULL;
@@ -518,12 +518,12 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
518 { 518 {
519 /* set preedit start cursor */ 519 /* set preedit start cursor */
520 if (!en->preedit_start) 520 if (!en->preedit_start)
521 en->preedit_start = efl_canvas_text_cursor_create(obj); 521 en->preedit_start = efl_canvas_textblock_cursor_create(obj);
522 efl_text_cursor_copy(cur, en->preedit_start); 522 efl_text_cursor_copy(cur, en->preedit_start);
523 523
524 /* set preedit end cursor */ 524 /* set preedit end cursor */
525 if (!en->preedit_end) 525 if (!en->preedit_end)
526 en->preedit_end = efl_canvas_text_cursor_create(obj); 526 en->preedit_end = efl_canvas_textblock_cursor_create(obj);
527 efl_text_cursor_copy(cur, en->preedit_end); 527 efl_text_cursor_copy(cur, en->preedit_end);
528 528
529 preedit_end_pos = efl_text_cursor_position_get(cur); 529 preedit_end_pos = efl_text_cursor_position_get(cur);
@@ -561,7 +561,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
561static void 561static void
562_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 562_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
563{ 563{
564 Efl_Canvas_Text *obj = data; 564 Efl_Canvas_Textblock *obj = data;
565 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 565 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
566 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 566 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
567 Ecore_IMF_Event_Delete_Surrounding *ev = event_info; 567 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
@@ -573,10 +573,10 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
573 573
574 cursor_pos = efl_text_cursor_position_get(cur); 574 cursor_pos = efl_text_cursor_position_get(cur);
575 575
576 del_start = efl_canvas_text_cursor_create(obj); 576 del_start = efl_canvas_textblock_cursor_create(obj);
577 efl_text_cursor_position_set(del_start, cursor_pos + ev->offset); 577 efl_text_cursor_position_set(del_start, cursor_pos + ev->offset);
578 578
579 del_end = efl_canvas_text_cursor_create(obj); 579 del_end = efl_canvas_textblock_cursor_create(obj);
580 efl_text_cursor_position_set(del_end, cursor_pos + ev->offset + ev->n_chars); 580 efl_text_cursor_position_set(del_end, cursor_pos + ev->offset + ev->n_chars);
581 581
582 start = efl_text_cursor_position_get(del_start); 582 start = efl_text_cursor_position_get(del_start);
@@ -605,7 +605,7 @@ end:
605static void 605static void
606_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) 606_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
607{ 607{
608 Efl_Canvas_Text *obj = data; 608 Efl_Canvas_Textblock *obj = data;
609 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); 609 Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
610 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 610 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
611 Ecore_IMF_Event_Selection *ev = event_info; 611 Ecore_IMF_Event_Selection *ev = event_info;
@@ -628,7 +628,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
628static Eina_Bool 628static Eina_Bool
629_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text) 629_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
630{ 630{
631 Efl_Canvas_Text *obj = data; 631 Efl_Canvas_Textblock *obj = data;
632 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 632 Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
633 const char *selection_text = NULL; 633 const char *selection_text = NULL;
634 634
@@ -1106,7 +1106,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1106 { 1106 {
1107 if (multiline) 1107 if (multiline)
1108 { 1108 {
1109 if (shift || efl_canvas_text_newline_as_paragraph_separator_get(obj)) 1109 if (shift || efl_canvas_textblock_newline_as_paragraph_separator_get(obj))
1110 { 1110 {
1111 string = "\n"; 1111 string = "\n";
1112 } 1112 }
@@ -1193,7 +1193,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1193 if (control && !en->have_selection) 1193 if (control && !en->have_selection)
1194 { 1194 {
1195 // del to start of previous word 1195 // del to start of previous word
1196 Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj); 1196 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
1197 1197
1198 efl_text_cursor_copy(tc, cur); 1198 efl_text_cursor_copy(tc, cur);
1199 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV); 1199 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV);
@@ -1228,7 +1228,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
1228 if (control) 1228 if (control)
1229 { 1229 {
1230 // del to end of next word 1230 // del to end of next word
1231 Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj); 1231 Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
1232 1232
1233 efl_text_cursor_copy(tc, cur); 1233 efl_text_cursor_copy(tc, cur);
1234 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); 1234 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
@@ -1466,20 +1466,20 @@ end:
1466} 1466}
1467 1467
1468static void 1468static void
1469_cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) 1469_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
1470{ 1470{
1471 Evas_Coord cx, cy; 1471 Evas_Coord cx, cy;
1472 Evas_Coord x, y, lh = 0, cly = 0; 1472 Evas_Coord x, y, lh = 0, cly = 0;
1473 Efl_Text_Cursor *line_cur; 1473 Efl_Text_Cursor *line_cur;
1474 Efl_Text_Cursor *tc; 1474 Efl_Text_Cursor *tc;
1475 1475
1476 tc = efl_canvas_text_cursor_create(obj); 1476 tc = efl_canvas_textblock_cursor_create(obj);
1477 efl_text_cursor_copy(cur, tc); 1477 efl_text_cursor_copy(cur, tc);
1478 evas_object_geometry_get(obj, &x, &y, NULL, NULL); 1478 evas_object_geometry_get(obj, &x, &y, NULL, NULL);
1479 cx = canvasx - x; 1479 cx = canvasx - x;
1480 cy = canvasy - y; 1480 cy = canvasy - y;
1481 1481
1482 line_cur = efl_canvas_text_cursor_create(obj); 1482 line_cur = efl_canvas_textblock_cursor_create(obj);
1483 efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); 1483 efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
1484 evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, &lh); 1484 evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, &lh);
1485 /* Consider a threshold of half the line height */ 1485 /* Consider a threshold of half the line height */
@@ -1538,7 +1538,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1538 { 1538 {
1539 if (shift) 1539 if (shift)
1540 { 1540 {
1541 tc = efl_canvas_text_cursor_create(obj); 1541 tc = efl_canvas_textblock_cursor_create(obj);
1542 efl_text_cursor_copy(cur, tc); 1542 efl_text_cursor_copy(cur, tc);
1543 if (efl_text_cursor_compare(cur, en->sel_start) < 0) 1543 if (efl_text_cursor_compare(cur, en->sel_start) < 0)
1544 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1544 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
@@ -1551,7 +1551,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1551 en->have_selection = EINA_FALSE; 1551 en->have_selection = EINA_FALSE;
1552 en->selecting = EINA_FALSE; 1552 en->selecting = EINA_FALSE;
1553 _sel_clear(obj, en); 1553 _sel_clear(obj, en);
1554 tc = efl_canvas_text_cursor_create(obj); 1554 tc = efl_canvas_textblock_cursor_create(obj);
1555 efl_text_cursor_copy(cur, tc); 1555 efl_text_cursor_copy(cur, tc);
1556 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); 1556 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
1557 _sel_init(cur, obj, en); 1557 _sel_init(cur, obj, en);
@@ -1564,7 +1564,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1564 { 1564 {
1565 if (shift) 1565 if (shift)
1566 { 1566 {
1567 tc = efl_canvas_text_cursor_create(obj); 1567 tc = efl_canvas_textblock_cursor_create(obj);
1568 efl_text_cursor_copy(cur, tc); 1568 efl_text_cursor_copy(cur, tc);
1569 if (efl_text_cursor_compare(cur, en->sel_start) < 0) 1569 if (efl_text_cursor_compare(cur, en->sel_start) < 0)
1570 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1570 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
@@ -1580,7 +1580,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
1580 en->have_selection = EINA_FALSE; 1580 en->have_selection = EINA_FALSE;
1581 en->selecting = EINA_FALSE; 1581 en->selecting = EINA_FALSE;
1582 _sel_clear(obj, en); 1582 _sel_clear(obj, en);
1583 tc = efl_canvas_text_cursor_create(obj); 1583 tc = efl_canvas_textblock_cursor_create(obj);
1584 efl_text_cursor_copy(cur, tc); 1584 efl_text_cursor_copy(cur, tc);
1585 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); 1585 efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
1586 _sel_init(cur, obj, en); 1586 _sel_init(cur, obj, en);
@@ -1679,7 +1679,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
1679 1679
1680 if (en->selecting) 1680 if (en->selecting)
1681 { 1681 {
1682 tc = efl_canvas_text_cursor_create(obj); 1682 tc = efl_canvas_textblock_cursor_create(obj);
1683 efl_text_cursor_copy(cur, tc); 1683 efl_text_cursor_copy(cur, tc);
1684 evas_object_geometry_get(obj, &x, &y, &w, &h); 1684 evas_object_geometry_get(obj, &x, &y, &w, &h);
1685 cx = ev->cur.canvas.x - x; 1685 cx = ev->cur.canvas.x - x;
@@ -1733,9 +1733,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
1733 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, NULL); 1733 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, NULL);
1734 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, NULL); 1734 evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, NULL);
1735 1735
1736 en->main_cursor = efl_canvas_text_cursor_create(obj); 1736 en->main_cursor = efl_canvas_textblock_cursor_create(obj);
1737 en->sel_start = efl_canvas_text_cursor_create(obj); 1737 en->sel_start = efl_canvas_textblock_cursor_create(obj);
1738 en->sel_end = efl_canvas_text_cursor_create(obj); 1738 en->sel_end = efl_canvas_textblock_cursor_create(obj);
1739 1739
1740 efl_event_callback_add(efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_EVENT_CHANGED, 1740 efl_event_callback_add(efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_EVENT_CHANGED,
1741 _sel_cursor_changed, obj); 1741 _sel_cursor_changed, obj);
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index 8c8a4cd..44e871c 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.Text implements Efl.Text_Interactive, Efl.Input_Text 1class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text
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 f5e366d..3387759 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.c
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.c
@@ -36,7 +36,7 @@
36 36
37typedef struct _Efl_Ui_Internal_Text_Scroller_Data 37typedef struct _Efl_Ui_Internal_Text_Scroller_Data
38{ 38{
39 Efl_Canvas_Text *text_obj; 39 Efl_Canvas_Textblock *text_obj;
40 Efl_Ui_Table *text_table; 40 Efl_Ui_Table *text_table;
41 Eo *smanager; 41 Eo *smanager;
42 42
@@ -101,7 +101,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj,
101 efl_event_freeze(sd->text_obj); 101 efl_event_freeze(sd->text_obj);
102 efl_gfx_entity_size_set(sd->text_table, view.size); 102 efl_gfx_entity_size_set(sd->text_table, view.size);
103 efl_gfx_entity_size_set(sd->text_obj, view.size); 103 efl_gfx_entity_size_set(sd->text_obj, view.size);
104 fsz = efl_canvas_text_size_formatted_get(sd->text_obj); 104 fsz = efl_canvas_textblock_size_formatted_get(sd->text_obj);
105 efl_gfx_entity_size_set(sd->text_table, sz); 105 efl_gfx_entity_size_set(sd->text_table, sz);
106 efl_gfx_entity_size_set(sd->text_obj, sz); 106 efl_gfx_entity_size_set(sd->text_obj, sz);
107 efl_event_thaw(sd->text_obj); 107 efl_event_thaw(sd->text_obj);
@@ -152,7 +152,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj,
152EOLIAN static void 152EOLIAN static void
153_efl_ui_internal_text_scroller_initialize(Eo *obj, 153_efl_ui_internal_text_scroller_initialize(Eo *obj,
154 Efl_Ui_Internal_Text_Scroller_Data *sd, 154 Efl_Ui_Internal_Text_Scroller_Data *sd,
155 Efl_Canvas_Text *text_obj, 155 Efl_Canvas_Textblock *text_obj,
156 Efl_Ui_Table *text_table) 156 Efl_Ui_Table *text_table)
157{ 157{
158 if (efl_finalized_get(obj)) 158 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 3108000..b616674 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -10,7 +10,7 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
10 [[Internal-usage text scroller class. 10 [[Internal-usage text scroller class.
11 11
12 This class is a special scroller that evaluates its size based on the 12 This class is a special scroller that evaluates its size based on the
13 @Efl.Canvas.Text object it holds. On initialization the object is meant 13 @Efl.Canvas.Textblock object it holds. On initialization the object is meant
14 to be passed along a container (so that other objects such as 14 to be passed along a container (so that other objects such as
15 a "guide hint" text object are store in such container. 15 a "guide hint" text object are store in such container.
16 ]] 16 ]]
@@ -32,11 +32,11 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
32 } 32 }
33 } 33 }
34 initialize { 34 initialize {
35 [[The Efl.Canvas.Text content of this scroller. 35 [[The Efl.Canvas.Textblock content of this scroller.
36 This should be called upon constructing the object. 36 This should be called upon constructing the object.
37 ]] 37 ]]
38 params { 38 params {
39 text_obj: Efl.Canvas.Text; [[The text object to query]] 39 text_obj: Efl.Canvas.Textblock; [[The text object to query]]
40 text_table: Efl.Ui.Table; [[The table container of 40 text_table: Efl.Ui.Table; [[The table container of
41 the $text_obj]] 41 the $text_obj]]
42 } 42 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index e716f25..c65d590 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -18,7 +18,7 @@
18#include "elm_hoversel_eo.h" 18#include "elm_hoversel_eo.h"
19#include "efl_ui_text_part.eo.h" 19#include "efl_ui_text_part.eo.h"
20#include "elm_part_helper.h" 20#include "elm_part_helper.h"
21#include "efl_canvas_text_internal.h" 21#include "efl_canvas_textblock_internal.h"
22 22
23typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data; 23typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data;
24typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle; 24typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle;
@@ -65,8 +65,8 @@ struct _Efl_Ui_Text_Data
65 int gen; 65 int gen;
66 Eina_List *sel; 66 Eina_List *sel;
67 Eina_List *items; /** context menu item list */ 67 Eina_List *items; /** context menu item list */
68 Efl_Canvas_Text_Factory *item_factory; 68 Efl_Canvas_Textblock_Factory *item_factory;
69 Efl_Canvas_Text_Factory *item_fallback_factory; 69 Efl_Canvas_Textblock_Factory *item_fallback_factory;
70 Eina_List *markup_filters; 70 Eina_List *markup_filters;
71 Ecore_Job *hov_deljob; 71 Ecore_Job *hov_deljob;
72 Mod_Api *api; // module api if supplied 72 Mod_Api *api; // module api if supplied
@@ -851,9 +851,9 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
851 efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0)); 851 efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0));
852 /* ignore current object size for single-line since we always need to know the actual size */ 852 /* ignore current object size for single-line since we always need to know the actual size */
853 if (!efl_text_multiline_get(obj)) 853 if (!efl_text_multiline_get(obj))
854 min = efl_canvas_text_size_native_get(sd->text_obj); 854 min = efl_canvas_textblock_size_native_get(sd->text_obj);
855 else 855 else
856 min = efl_canvas_text_size_formatted_get(sd->text_obj); 856 min = efl_canvas_textblock_size_formatted_get(sd->text_obj);
857 efl_gfx_entity_size_set(sd->text_obj, text_sz); 857 efl_gfx_entity_size_set(sd->text_obj, text_sz);
858 efl_event_thaw(sd->text_obj); 858 efl_event_thaw(sd->text_obj);
859 min.w += edmin.w; 859 min.w += edmin.w;
@@ -1485,11 +1485,11 @@ _item_get(void *data, const char *item)
1485 { 1485 {
1486 if (sd->item_factory) 1486 if (sd->item_factory)
1487 { 1487 {
1488 o = efl_canvas_text_factory_create(sd->item_factory, data, item); 1488 o = efl_canvas_textblock_factory_create(sd->item_factory, data, item);
1489 } 1489 }
1490 else if (sd->item_fallback_factory) 1490 else if (sd->item_fallback_factory)
1491 { 1491 {
1492 o = efl_canvas_text_factory_create(sd->item_fallback_factory, 1492 o = efl_canvas_textblock_factory_create(sd->item_fallback_factory,
1493 data, item); 1493 data, item);
1494 } 1494 }
1495 } 1495 }
@@ -1967,7 +1967,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
1967 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_UNDO_REQUEST, obj); 1967 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_UNDO_REQUEST, obj);
1968 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_PREEDIT_CHANGED, obj); 1968 efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_PREEDIT_CHANGED, obj);
1969 sd->text_obj = text_obj; 1969 sd->text_obj = text_obj;
1970 sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj); 1970 sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj);
1971 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj); 1971 sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
1972 efl_composite_attach(obj, text_obj); 1972 efl_composite_attach(obj, text_obj);
1973 1973
@@ -2028,7 +2028,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
2028 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL); 2028 (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
2029 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, 2029 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
2030 _efl_ui_text_changed_user_cb, obj); 2030 _efl_ui_text_changed_user_cb, obj);
2031 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, 2031 efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED,
2032 _efl_ui_text_changed_cb, obj); 2032 _efl_ui_text_changed_cb, obj);
2033 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED, 2033 efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED,
2034 _efl_ui_text_selection_start_clear_cb, obj); 2034 _efl_ui_text_selection_start_clear_cb, obj);
@@ -3337,8 +3337,8 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
3337 3337
3338 sd->gen++; 3338 sd->gen++;
3339 3339
3340 start = efl_canvas_text_cursor_create(sd->text_obj); 3340 start = efl_canvas_textblock_cursor_create(sd->text_obj);
3341 end = efl_canvas_text_cursor_create(sd->text_obj); 3341 end = efl_canvas_textblock_cursor_create(sd->text_obj);
3342 3342
3343 /* Retrieve all annotations in the text. */ 3343 /* Retrieve all annotations in the text. */
3344 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST); 3344 efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
@@ -3645,7 +3645,7 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED,
3645 3645
3646static void 3646static void
3647_efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, 3647_efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd,
3648 Efl_Canvas_Text_Factory *item_factory) 3648 Efl_Canvas_Textblock_Factory *item_factory)
3649{ 3649{
3650 if (pd->item_factory) efl_unref(pd->item_factory); 3650 if (pd->item_factory) efl_unref(pd->item_factory);
3651 pd->item_factory = efl_ref(item_factory); 3651 pd->item_factory = efl_ref(item_factory);
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 785fe34..935c7f5 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -61,7 +61,7 @@ class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickabl
61 "emoticon/happy" or "href=file://image.jpg" etc. 61 "emoticon/happy" or "href=file://image.jpg" etc.
62 ]] 62 ]]
63 values { 63 values {
64 item_factory: Efl.Canvas.Text_Factory; [[Factory to create items]] 64 item_factory: Efl.Canvas.Textblock_Factory; [[Factory to create items]]
65 } 65 }
66 } 66 }
67 cursor_add { 67 cursor_add {
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.c b/src/lib/elementary/efl_ui_text_factory_emoticons.c
index f66c99d..6d61fe3 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.c
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.c
@@ -15,7 +15,7 @@ struct _Efl_Ui_Text_Factory_Emoticons_Data
15}; 15};
16 16
17EOLIAN static Efl_Canvas_Object 17EOLIAN static Efl_Canvas_Object
18*_efl_ui_text_factory_emoticons_efl_canvas_text_factory_create( 18*_efl_ui_text_factory_emoticons_efl_canvas_textblock_factory_create(
19 Eo *obj EINA_UNUSED, 19 Eo *obj EINA_UNUSED,
20 Efl_Ui_Text_Factory_Emoticons_Data *pd EINA_UNUSED, 20 Efl_Ui_Text_Factory_Emoticons_Data *pd EINA_UNUSED,
21 Efl_Canvas_Object *object, 21 Efl_Canvas_Object *object,
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.eo b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
index 903f449..9265cc5 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.eo
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
@@ -1,8 +1,8 @@
1class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Text_Factory 1class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Textblock_Factory
2{ 2{
3 [[Factory that creates emoticons from the current theme given a key. 3 [[Factory that creates emoticons from the current theme given a key.
4 ]] 4 ]]
5 implements { 5 implements {
6 Efl.Canvas.Text_Factory.create; 6 Efl.Canvas.Textblock_Factory.create;
7 } 7 }
8} 8}
diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.c b/src/lib/elementary/efl_ui_text_factory_fallback.c
index 3568ba9..048b8ae 100644
--- a/src/lib/elementary/efl_ui_text_factory_fallback.c
+++ b/src/lib/elementary/efl_ui_text_factory_fallback.c
@@ -12,7 +12,7 @@ typedef struct _Efl_Ui_Text_Factory_Fallback_Data Efl_Ui_Text_Factory_Fallback_D
12 12
13struct _Efl_Ui_Text_Factory_Fallback_Data 13struct _Efl_Ui_Text_Factory_Fallback_Data
14{ 14{
15 Efl_Canvas_Text_Factory *emoticon_factory, *image_factory; 15 Efl_Canvas_Textblock_Factory *emoticon_factory, *image_factory;
16}; 16};
17 17
18EOLIAN static Eo * 18EOLIAN static Eo *
@@ -34,7 +34,7 @@ _efl_ui_text_factory_fallback_efl_object_destructor(Eo *obj,
34 34
35 35
36EOLIAN static Efl_Canvas_Object 36EOLIAN static Efl_Canvas_Object
37*_efl_ui_text_factory_fallback_efl_canvas_text_factory_create( 37*_efl_ui_text_factory_fallback_efl_canvas_textblock_factory_create(
38 Eo *obj EINA_UNUSED, 38 Eo *obj EINA_UNUSED,
39 Efl_Ui_Text_Factory_Fallback_Data *pd EINA_UNUSED, 39 Efl_Ui_Text_Factory_Fallback_Data *pd EINA_UNUSED,
40 Efl_Canvas_Object *object, 40 Efl_Canvas_Object *object,
@@ -48,11 +48,11 @@ EOLIAN static Efl_Canvas_Object
48 if (key && !strncmp(key, "file://", 7)) 48 if (key && !strncmp(key, "file://", 7))
49 { 49 {
50 const char *fname = key + 7; 50 const char *fname = key + 7;
51 o = efl_canvas_text_factory_create(pd->image_factory, object, fname); 51 o = efl_canvas_textblock_factory_create(pd->image_factory, object, fname);
52 } 52 }
53 else 53 else
54 { 54 {
55 o = efl_canvas_text_factory_create(pd->emoticon_factory, object, key); 55 o = efl_canvas_textblock_factory_create(pd->emoticon_factory, object, key);
56 } 56 }
57 return o; 57 return o;
58} 58}
diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.eo b/src/lib/elementary/efl_ui_text_factory_fallback.eo
index f41352b..1af3293 100644
--- a/src/lib/elementary/efl_ui_text_factory_fallback.eo
+++ b/src/lib/elementary/efl_ui_text_factory_fallback.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Text_Factory 1class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Textblock_Factory
2{ 2{
3 [[Internal factory for fallback cases. 3 [[Internal factory for fallback cases.
4 4
@@ -10,6 +10,6 @@ class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canva
10 implements { 10 implements {
11 Efl.Object.constructor; 11 Efl.Object.constructor;
12 Efl.Object.destructor; 12 Efl.Object.destructor;
13 Efl.Canvas.Text_Factory.create; 13 Efl.Canvas.Textblock_Factory.create;
14 } 14 }
15} 15}
diff --git a/src/lib/elementary/efl_ui_text_factory_images.c b/src/lib/elementary/efl_ui_text_factory_images.c
index 38529e4..55b8978 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.c
+++ b/src/lib/elementary/efl_ui_text_factory_images.c
@@ -49,7 +49,7 @@ _efl_ui_text_factory_images_efl_object_destructor(Eo *obj,
49} 49}
50 50
51EOLIAN static Efl_Canvas_Object * 51EOLIAN static Efl_Canvas_Object *
52_efl_ui_text_factory_images_efl_canvas_text_factory_create(Eo *obj EINA_UNUSED, 52_efl_ui_text_factory_images_efl_canvas_textblock_factory_create(Eo *obj EINA_UNUSED,
53 Efl_Ui_Text_Factory_Images_Data *pd EINA_UNUSED, 53 Efl_Ui_Text_Factory_Images_Data *pd EINA_UNUSED,
54 Efl_Canvas_Object *object, 54 Efl_Canvas_Object *object,
55 const char *key) 55 const char *key)
diff --git a/src/lib/elementary/efl_ui_text_factory_images.eo b/src/lib/elementary/efl_ui_text_factory_images.eo
index eecc69c..42ddf13 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.eo
+++ b/src/lib/elementary/efl_ui_text_factory_images.eo
@@ -1,4 +1,4 @@
1class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Text_Factory 1class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Textblock_Factory
2{ 2{
3 [[Factory that creates images given key string 3 [[Factory that creates images given key string
4 4
@@ -62,6 +62,6 @@ class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.
62 implements { 62 implements {
63 Efl.Object.constructor; 63 Efl.Object.constructor;
64 Efl.Object.destructor; 64 Efl.Object.destructor;
65 Efl.Canvas.Text_Factory.create; 65 Efl.Canvas.Textblock_Factory.create;
66 } 66 }
67} 67}
diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index ed30047..53bc52c 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -85,8 +85,8 @@ extern "C" {
85#include <canvas/efl_canvas_snapshot.eo.h> 85#include <canvas/efl_canvas_snapshot.eo.h>
86#include <canvas/efl_text_cursor.eo.h> 86#include <canvas/efl_text_cursor.eo.h>
87#include <canvas/efl_text_attribute_factory.eo.h> 87#include <canvas/efl_text_attribute_factory.eo.h>
88#include <canvas/efl_canvas_text.eo.h> 88#include <canvas/efl_canvas_textblock.eo.h>
89#include <canvas/efl_canvas_text_factory.eo.h> 89#include <canvas/efl_canvas_textblock_factory.eo.h>
90#include <canvas/efl_canvas_vg_node.eo.h> 90#include <canvas/efl_canvas_vg_node.eo.h>
91#include <canvas/efl_canvas_vg_container.eo.h> 91#include <canvas/efl_canvas_vg_container.eo.h>
92#include <canvas/efl_canvas_vg_gradient.eo.h> 92#include <canvas/efl_canvas_vg_gradient.eo.h>
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 9d873d5..4d42740 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -143,14 +143,14 @@ struct _Efl_Canvas_Object_Animation_Event
143 */ 143 */
144 144
145/** 145/**
146 * @ingroup Efl_Canvas_Text 146 * @ingroup Efl_Canvas_Textblock
147 * 147 *
148 * @{ 148 * @{
149 */ 149 */
150#include "canvas/efl_text_cursor.eo.h" 150#include "canvas/efl_text_cursor.eo.h"
151#include "canvas/efl_text_attribute_factory.eo.h" 151#include "canvas/efl_text_attribute_factory.eo.h"
152#include "canvas/efl_canvas_text.eo.h" 152#include "canvas/efl_canvas_textblock.eo.h"
153#include "canvas/efl_canvas_text_factory.eo.h" 153#include "canvas/efl_canvas_textblock_factory.eo.h"
154/** 154/**
155 * @} 155 * @}
156 */ 156 */
diff --git a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_text_eo.legacy.c
deleted file mode 100644
index f2ee487..0000000
--- a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.c
+++ /dev/null
@@ -1,72 +0,0 @@
1
2EAPI Eina_Bool
3evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end)
4{
5 return evas_textblock_cursor_visible_range_get(start, end);
6}
7
8EAPI void
9evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *l, int *r, int *t, int *b)
10{
11 efl_canvas_text_style_insets_get(obj, l, r, t, b);
12}
13
14EAPI void
15evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim)
16{
17 efl_canvas_text_bidi_delimiters_set(obj, delim);
18}
19
20EAPI const char *
21evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj)
22{
23 return efl_canvas_text_bidi_delimiters_get(obj);
24}
25
26EAPI void
27evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode)
28{
29 efl_canvas_text_newline_as_paragraph_separator_set(obj, mode);
30}
31
32EAPI Eina_Bool
33evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj)
34{
35 return efl_canvas_text_newline_as_paragraph_separator_get(obj);
36}
37
38EAPI void
39evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *w, int *h)
40{
41 Eina_Size2D size;
42 size = efl_canvas_text_size_formatted_get(obj);
43 if (w) *w = size.w;
44 if (h) *h = size.h;
45}
46
47EAPI void
48evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *w, int *h)
49{
50 Eina_Size2D size;
51 size = efl_canvas_text_size_native_get(obj);
52 if (w) *w = size.w;
53 if (h) *h = size.h;
54}
55
56EAPI Eina_Bool
57evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs)
58{
59 return efl_canvas_text_obstacle_add(obj, eo_obs);
60}
61
62EAPI Eina_Bool
63evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs)
64{
65 return efl_canvas_text_obstacle_del(obj, eo_obs);
66}
67
68EAPI void
69evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj)
70{
71 efl_canvas_text_obstacles_update(obj);
72}
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index 25153c2..5d38ecf 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -1,6 +1,6 @@
1import efl_text_types; 1import efl_text_types;
2 2
3class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text, 3class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
4 Efl.Canvas.Filter.Internal, Efl.Text_Font, 4 Efl.Canvas.Filter.Internal, Efl.Text_Font,
5 Efl.Text_Style, Efl.Text_Format, 5 Efl.Text_Style, Efl.Text_Format,
6 Efl.Text_Markup, Efl.Ui.I18n 6 Efl.Text_Markup, Efl.Ui.I18n
diff --git a/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
new file mode 100644
index 0000000..26c9341
--- /dev/null
+++ b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c
@@ -0,0 +1,72 @@
1
2EAPI Eina_Bool
3evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end)
4{
5 return evas_textblock_cursor_visible_range_get(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_newline_as_paragraph_separator_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_newline_as_paragraph_separator_get(obj);
36}
37
38EAPI void
39evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
40{
41 Eina_Size2D size;
42 size = efl_canvas_textblock_size_formatted_get(obj);
43 if (w) *w = size.w;
44 if (h) *h = size.h;
45}
46
47EAPI void
48evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
49{
50 Eina_Size2D size;
51 size = efl_canvas_textblock_size_native_get(obj);
52 if (w) *w = size.w;
53 if (h) *h = size.h;
54}
55
56EAPI Eina_Bool
57evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
58{
59 return efl_canvas_textblock_obstacle_add(obj, eo_obs);
60}
61
62EAPI Eina_Bool
63evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
64{
65 return efl_canvas_textblock_obstacle_del(obj, eo_obs);
66}
67
68EAPI void
69evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj)
70{
71 efl_canvas_textblock_obstacles_update(obj);
72}
diff --git a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h
index e527595..6b33674 100644
--- a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.h
+++ b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h
@@ -1,15 +1,15 @@
1#ifndef _EFL_CANVAS_TEXT_EO_LEGACY_H_ 1#ifndef _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
2#define _EFL_CANVAS_TEXT_EO_LEGACY_H_ 2#define _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
3 3
4#ifndef _EFL_CANVAS_TEXT_EO_CLASS_TYPE 4#ifndef _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
5#define _EFL_CANVAS_TEXT_EO_CLASS_TYPE 5#define _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
6 6
7typedef Eo Efl_Canvas_Text; 7typedef Eo Efl_Canvas_Textblock;
8 8
9#endif 9#endif
10 10
11#ifndef _EFL_CANVAS_TEXT_EO_TYPES 11#ifndef _EFL_CANVAS_TEXTBLOCK_EO_TYPES
12#define _EFL_CANVAS_TEXT_EO_TYPES 12#define _EFL_CANVAS_TEXTBLOCK_EO_TYPES
13 13
14 14
15#endif 15#endif
@@ -32,7 +32,7 @@ typedef Eo Efl_Canvas_Text;
32 * 32 *
33 * @ingroup Evas_Object_Textblock_Group 33 * @ingroup Evas_Object_Textblock_Group
34 */ 34 */
35EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end); 35EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end);
36 36
37/** 37/**
38 * @brief Gets the left, right, top and bottom insets of the text. 38 * @brief Gets the left, right, top and bottom insets of the text.
@@ -49,7 +49,7 @@ EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj, Efl
49 * 49 *
50 * @ingroup Evas_Object_Textblock_Group 50 * @ingroup Evas_Object_Textblock_Group
51 */ 51 */
52EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *left, int *right, int *top, int *bottom); 52EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom);
53 53
54/** 54/**
55 * @brief BiDi delimiters are used for in-paragraph separation of bidi 55 * @brief BiDi delimiters are used for in-paragraph separation of bidi
@@ -64,7 +64,7 @@ EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int
64 * 64 *
65 * @ingroup Evas_Object_Textblock_Group 65 * @ingroup Evas_Object_Textblock_Group
66 */ 66 */
67EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim); 67EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim);
68 68
69/** 69/**
70 * @brief BiDi delimiters are used for in-paragraph separation of bidi 70 * @brief BiDi delimiters are used for in-paragraph separation of bidi
@@ -79,7 +79,7 @@ EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const
79 * 79 *
80 * @ingroup Evas_Object_Textblock_Group 80 * @ingroup Evas_Object_Textblock_Group
81 */ 81 */
82EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj); 82EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj);
83 83
84/** 84/**
85 * @brief When @c true, newline character will behave as a paragraph separator. 85 * @brief When @c true, newline character will behave as a paragraph separator.
@@ -91,7 +91,7 @@ EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text
91 * 91 *
92 * @ingroup Evas_Object_Textblock_Group 92 * @ingroup Evas_Object_Textblock_Group
93 */ 93 */
94EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode); 94EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode);
95 95
96/** 96/**
97 * @brief When @c true, newline character will behave as a paragraph separator. 97 * @brief When @c true, newline character will behave as a paragraph separator.
@@ -104,7 +104,7 @@ EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bo
104 * 104 *
105 * @ingroup Evas_Object_Textblock_Group 105 * @ingroup Evas_Object_Textblock_Group
106 */ 106 */
107EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj); 107EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj);
108 108
109 109
110 110
@@ -133,7 +133,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *o
133 * 133 *
134 * @ingroup Evas_Object_Textblock_Group 134 * @ingroup Evas_Object_Textblock_Group
135 */ 135 */
136EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *width, int *height); 136EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
137 137
138/** 138/**
139 * @brief The native width and height. 139 * @brief The native width and height.
@@ -161,7 +161,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, i
161 * 161 *
162 * @ingroup Evas_Object_Textblock_Group 162 * @ingroup Evas_Object_Textblock_Group
163 */ 163 */
164EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *width, int *height); 164EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
165 165
166 166
167 167
@@ -183,7 +183,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int
183 * 183 *
184 * @ingroup Evas_Object_Textblock_Group 184 * @ingroup Evas_Object_Textblock_Group
185 */ 185 */
186EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs); 186EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
187 187
188/** 188/**
189 * @brief Removes @c eo_obs from observation during text layout. 189 * @brief Removes @c eo_obs from observation during text layout.
@@ -197,7 +197,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canv
197 * 197 *
198 * @ingroup Evas_Object_Textblock_Group 198 * @ingroup Evas_Object_Textblock_Group
199 */ 199 */
200EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs); 200EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
201 201
202/** 202/**
203 * @brief Triggers for relayout due to obstacles' state change. 203 * @brief Triggers for relayout due to obstacles' state change.
@@ -216,7 +216,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canv
216 * 216 *
217 * @ingroup Evas_Object_Textblock_Group 217 * @ingroup Evas_Object_Textblock_Group
218 */ 218 */
219EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj); 219EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj);
220 220
221 221
222#endif 222#endif
diff --git a/src/lib/evas/canvas/efl_canvas_text_factory.eo b/src/lib/evas/canvas/efl_canvas_textblock_factory.eo
index 13d593e..527c8f0 100644
--- a/src/lib/evas/canvas/efl_canvas_text_factory.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock_factory.eo
@@ -1,4 +1,4 @@
1interface @beta Efl.Canvas.Text_Factory 1interface @beta Efl.Canvas.Textblock_Factory
2{ 2{
3 [[Object factory that creates Efl.Canvas.Object objects. 3 [[Object factory that creates Efl.Canvas.Object objects.
4 4
diff --git a/src/lib/evas/canvas/efl_canvas_text_internal.h b/src/lib/evas/canvas/efl_canvas_textblock_internal.h
index 9871008..a4f03fc 100644
--- a/src/lib/evas/canvas/efl_canvas_text_internal.h
+++ b/src/lib/evas/canvas/efl_canvas_textblock_internal.h
@@ -1,5 +1,5 @@
1#ifndef _EFL_CANVAS_TEXT_INTERNAL_H 1#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
2#define _EFL_CANVAS_TEXT_INTERNAL_H 2#define _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
3 3
4#include <Evas.h> 4#include <Evas.h>
5 5
@@ -11,10 +11,10 @@
11/* private struct for textblock object internal data */ 11/* private struct for textblock object internal data */
12/** 12/**
13 * @internal 13 * @internal
14 * @typedef Efl_Canvas_Text_Data 14 * @typedef Efl_Canvas_Textblock_Data
15 * The actual textblock object. 15 * The actual textblock object.
16 */ 16 */
17typedef struct _Evas_Object_Textblock Efl_Canvas_Text_Data; 17typedef struct _Evas_Object_Textblock Efl_Canvas_Textblock_Data;
18/** 18/**
19 * @internal 19 * @internal
20 * @typedef Evas_Object_Style_Tag 20 * @typedef Evas_Object_Style_Tag
@@ -89,22 +89,22 @@ typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Itera
89typedef struct _Efl_Text_Attribute_Handle_Iterator Efl_Text_Attribute_Handle_Iterator; 89typedef struct _Efl_Text_Attribute_Handle_Iterator Efl_Text_Attribute_Handle_Iterator;
90/** 90/**
91 * @internal 91 * @internal
92 * @typedef Efl_Canvas_Text_Filter 92 * @typedef Efl_Canvas_Textblock_Filter
93 * A structure holding gfx filter information for a text item 93 * A structure holding gfx filter information for a text item
94 */ 94 */
95typedef struct _Efl_Canvas_Text_Filter Efl_Canvas_Text_Filter; 95typedef struct _Efl_Canvas_Textblock_Filter Efl_Canvas_Textblock_Filter;
96/** 96/**
97 * @internal 97 * @internal
98 * @typedef Efl_Canvas_Text_Filter_Post_Render 98 * @typedef Efl_Canvas_Textblock_Filter_Post_Render
99 * Post-render data for async rendering of gfx filters 99 * Post-render data for async rendering of gfx filters
100 */ 100 */
101typedef struct _Efl_Canvas_Text_Filter_Post_Render Efl_Canvas_Text_Filter_Post_Render; 101typedef struct _Efl_Canvas_Textblock_Filter_Post_Render Efl_Canvas_Textblock_Filter_Post_Render;
102/** 102/**
103 * @internal 103 * @internal
104 * @typedef Efl_Canvas_Text_Filter_Program 104 * @typedef Efl_Canvas_Textblock_Filter_Program
105 * Filter name - code database 105 * Filter name - code database
106 */ 106 */
107typedef struct _Efl_Canvas_Text_Filter_Program Efl_Canvas_Text_Filter_Program; 107typedef struct _Efl_Canvas_Textblock_Filter_Program Efl_Canvas_Textblock_Filter_Program;
108/** 108/**
109 * @internal 109 * @internal
110 * @typedef Text_Item_Filter 110 * @typedef Text_Item_Filter
@@ -235,7 +235,7 @@ _evas_textblock_annotations_set(Evas_Object *eo_obj,
235 const char *format, Eina_Bool is_item); 235 const char *format, Eina_Bool is_item);
236 236
237void 237void
238_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Text_Data *o, 238_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o,
239 Efl_Text_Attribute_Handle *an, Eina_Bool remove_nodes, Eina_Bool invalidate); 239 Efl_Text_Attribute_Handle *an, Eina_Bool remove_nodes, Eina_Bool invalidate);
240 240
241void 241void
@@ -312,4 +312,4 @@ EAPI Efl_Text_Cursor_Handle *efl_text_cursor_handle_get(const Eo *obj);
312#undef EAPI 312#undef EAPI
313#define EAPI 313#define EAPI
314 314
315#endif//#ifndef _EFL_CANVAS_TEXT_INTERNAL_H 315#endif//#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
diff --git a/src/lib/evas/canvas/efl_text_attribute_factory.c b/src/lib/evas/canvas/efl_text_attribute_factory.c
index 2e01ee8..72e8b2a 100644
--- a/src/lib/evas/canvas/efl_text_attribute_factory.c
+++ b/src/lib/evas/canvas/efl_text_attribute_factory.c
@@ -1,7 +1,7 @@
1//#define EFL_BETA_API_SUPPORT 1//#define EFL_BETA_API_SUPPORT
2#include "evas_common_private.h" 2#include "evas_common_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4#include "efl_canvas_text_internal.h" 4#include "efl_canvas_textblock_internal.h"
5#include "efl_text_cursor.eo.h" 5#include "efl_text_cursor.eo.h"
6 6
7#define MY_CLASS EFL_TEXT_ATTRIBUTE_FACTORY_CLASS 7#define MY_CLASS EFL_TEXT_ATTRIBUTE_FACTORY_CLASS
@@ -23,7 +23,7 @@ _efl_text_attribute_factory_attribute_insert(const Efl_Text_Cursor *start, const
23 23
24 _evas_textblock_annotations_insert(eo_obj, efl_text_cursor_handle_get(start), efl_text_cursor_handle_get(end), format, 24 _evas_textblock_annotations_insert(eo_obj, efl_text_cursor_handle_get(start), efl_text_cursor_handle_get(end), format,
25 EINA_FALSE); 25 EINA_FALSE);
26 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); 26 efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
27} 27}
28 28
29EOLIAN static unsigned int 29EOLIAN static unsigned int
diff --git a/src/lib/evas/canvas/efl_text_attribute_factory.eo b/src/lib/evas/canvas/efl_text_attribute_factory.eo
index 6ff08c3..4c4ac95 100644
--- a/src/lib/evas/canvas/efl_text_attribute_factory.eo
+++ b/src/lib/evas/canvas/efl_text_attribute_factory.eo
@@ -6,7 +6,7 @@ abstract @beta Efl.Text.Attribute.Factory extends Efl.Object {
6 6
7 Attributes can be assigned to character ranges, selected using two @Efl.Text.Cursor instances. 7 Attributes can be assigned to character ranges, selected using two @Efl.Text.Cursor instances.
8 Cursor instances are already bound to a text object so there's no need to provide it to this class. 8 Cursor instances are already bound to a text object so there's no need to provide it to this class.
9 Style is specified using format strings as described in @Efl.Canvas.Text.style_apply. 9 Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply.
10 10
11 There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods.]] 11 There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods.]]
12 methods { 12 methods {
@@ -15,7 +15,7 @@ abstract @beta Efl.Text.Attribute.Factory extends Efl.Object {
15 15
16 The $format will be applied to the given range. 16 The $format will be applied to the given range.
17 The passed cursors must belong to same textObject, else insertion will be ignored. 17 The passed cursors must belong to same textObject, else insertion will be ignored.
18 Passed format parameter uses same format as style in @Efl.Canvas.Text.style_apply. 18 Passed format parameter uses same format as style in @Efl.Canvas.Textblock.style_apply.
19 ]] 19 ]]
20 params { 20 params {
21 start: const(Efl.Text.Cursor); [[Start of range.]] 21 start: const(Efl.Text.Cursor); [[Start of range.]]
diff --git a/src/lib/evas/canvas/efl_text_cursor.c b/src/lib/evas/canvas/efl_text_cursor.c
index 11ab175..9a8a477 100644
--- a/src/lib/evas/canvas/efl_text_cursor.c
+++ b/src/lib/evas/canvas/efl_text_cursor.c
@@ -1,6 +1,6 @@
1#include "evas_common_private.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "efl_canvas_text_internal.h" 3#include "efl_canvas_textblock_internal.h"
4 4
5#define MY_CLASS EFL_TEXT_CURSOR_CLASS 5#define MY_CLASS EFL_TEXT_CURSOR_CLASS
6#define MY_CLASS_NAME "Efl.Text.Cursor" 6#define MY_CLASS_NAME "Efl.Text.Cursor"
@@ -434,7 +434,7 @@ void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_o
434{ 434{
435 Efl_Text_Cursor_Data *pd = efl_data_scope_get(cursor, MY_CLASS); 435 Efl_Text_Cursor_Data *pd = efl_data_scope_get(cursor, MY_CLASS);
436 Efl_Text_Cursor_Handle *handle = NULL; 436 Efl_Text_Cursor_Handle *handle = NULL;
437 if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXT_CLASS)) 437 if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXTBLOCK_CLASS))
438 { 438 {
439 pd->text_obj = text_obj; 439 pd->text_obj = text_obj;
440 handle = evas_object_textblock_cursor_new(canvas_text_obj); 440 handle = evas_object_textblock_cursor_new(canvas_text_obj);
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 06c5596..c09418d 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -68,12 +68,12 @@
68#include "evas_private.h" 68#include "evas_private.h"
69#include "efl_text_cursor.eo.h" 69#include "efl_text_cursor.eo.h"
70#include "Efl.h" 70#include "Efl.h"
71#include "efl_canvas_text_internal.h" 71#include "efl_canvas_textblock_internal.h"
72 72
73//#define LYDBG(f, args...) printf(f, ##args) 73//#define LYDBG(f, args...) printf(f, ##args)
74#define LYDBG(f, args...) 74#define LYDBG(f, args...)
75 75
76#define MY_CLASS EFL_CANVAS_TEXT_CLASS 76#define MY_CLASS EFL_CANVAS_TEXTBLOCK_CLASS
77 77
78#define MY_CLASS_NAME "Efl Canvas Text" 78#define MY_CLASS_NAME "Efl Canvas Text"
79 79
@@ -323,7 +323,7 @@ struct _Evas_Object_Textblock_Format_Item
323struct _Text_Item_Filter 323struct _Text_Item_Filter
324{ 324{
325 EINA_INLIST; /**< list on the tb object */ 325 EINA_INLIST; /**< list on the tb object */
326 Efl_Canvas_Text_Data *textblock; 326 Efl_Canvas_Textblock_Data *textblock;
327 Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */ 327 Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */
328 Evas_Filter_Context *ctx; /**< running context for the filter */ 328 Evas_Filter_Context *ctx; /**< running context for the filter */
329 Evas_Public_Data *evas; /**< evas instance */ 329 Evas_Public_Data *evas; /**< evas instance */
@@ -331,7 +331,7 @@ struct _Text_Item_Filter
331 Eina_Bool do_async; /**< do_async flag when running the filter */ 331 Eina_Bool do_async; /**< do_async flag when running the filter */
332}; 332};
333 333
334struct _Efl_Canvas_Text_Filter 334struct _Efl_Canvas_Textblock_Filter
335{ 335{
336 Eina_Stringshare *name; 336 Eina_Stringshare *name;
337 Evas_Object *eo_obj; 337 Evas_Object *eo_obj;
@@ -342,13 +342,13 @@ struct _Efl_Canvas_Text_Filter
342 Eina_Bool redraw; 342 Eina_Bool redraw;
343}; 343};
344 344
345struct _Efl_Canvas_Text_Filter_Post_Render 345struct _Efl_Canvas_Textblock_Filter_Post_Render
346{ 346{
347 Evas_Filter_Context *ctx; 347 Evas_Filter_Context *ctx;
348 Eina_Bool success; 348 Eina_Bool success;
349}; 349};
350 350
351struct _Efl_Canvas_Text_Filter_Program 351struct _Efl_Canvas_Textblock_Filter_Program
352{ 352{
353 EINA_INLIST; 353 EINA_INLIST;
354 Eina_Stringshare *name; 354 Eina_Stringshare *name;
@@ -378,7 +378,7 @@ struct _Evas_Object_Textblock_Format
378 struct { 378 struct {
379 int l, r; 379 int l, r;
380 } margin; /**< Left and right margin width. */ 380 } margin; /**< Left and right margin width. */
381 Efl_Canvas_Text_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */ 381 Efl_Canvas_Textblock_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */
382 int ref; /**< Value of the ref. */ 382 int ref; /**< Value of the ref. */
383 int tabstops; /**< Value of the size of the tab character. */ 383 int tabstops; /**< Value of the size of the tab character. */
384 int linesize; /**< Value of the size of the line of the text. */ 384 int linesize; /**< Value of the size of the line of the text. */
@@ -404,7 +404,7 @@ struct _Evas_Object_Textblock_Format
404 Evas_Textblock_Align_Auto halign_auto : 2; /**< Auto horizontal align mode */ 404 Evas_Textblock_Align_Auto halign_auto : 2; /**< Auto horizontal align mode */
405}; 405};
406 406
407struct _Efl_Canvas_Text_Style 407struct _Efl_Canvas_Textblock_Style
408{ 408{
409 const char *style_text; 409 const char *style_text;
410 const char *default_tag; 410 const char *default_tag;
@@ -490,7 +490,7 @@ struct _Evas_Object_Textblock
490 Eina_Bool valid : 1; 490 Eina_Bool valid : 1;
491 } formatted, native; 491 } formatted, native;
492 struct { 492 struct {
493 Efl_Canvas_Text_Filter_Program *programs; 493 Efl_Canvas_Textblock_Filter_Program *programs;
494 Evas_Filter_Data_Binding *data_bindings; 494 Evas_Filter_Data_Binding *data_bindings;
495 Eina_Hash *sources; 495 Eina_Hash *sources;
496 Text_Item_Filter *text_items; // inlist 496 Text_Item_Filter *text_items; // inlist
@@ -552,7 +552,7 @@ static int evas_object_textblock_was_opaque(Evas_Object *eo_obj,
552static void evas_object_textblock_coords_recalc(Evas_Object *eo_obj, 552static void evas_object_textblock_coords_recalc(Evas_Object *eo_obj,
553 Evas_Object_Protected_Data *obj, 553 Evas_Object_Protected_Data *obj,
554 void *type_private_data); 554 void *type_private_data);
555static void _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Text_Data *o); 555static void _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o);
556 556
557static const Evas_Object_Func object_func = 557static const Evas_Object_Func object_func =
558{ 558{
@@ -582,28 +582,28 @@ static const Evas_Object_Func object_func =
582 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 582 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
583 return; \ 583 return; \
584 MAGIC_CHECK_END(); \ 584 MAGIC_CHECK_END(); \
585 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 585 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
586 586
587#define TB_HEAD_RETURN(x) \ 587#define TB_HEAD_RETURN(x) \
588 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ 588 MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \
589 return (x); \ 589 return (x); \
590 MAGIC_CHECK_END(); 590 MAGIC_CHECK_END();
591static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Handle *cur); 591static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Handle *cur);
592static void _evas_textblock_node_text_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *n); 592static void _evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n);
593static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Handle *cur); 593static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Handle *cur);
594static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt); 594static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt);
595static void _evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment); 595static void _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment);
596static void _evas_textblock_node_format_free(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n); 596static void _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n);
597static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n); 597static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n);
598static void _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj); 598static void _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj);
599static void _evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o); 599static void _evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o);
600static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset); 600static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset);
601static void _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node); 601static 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);
602 602
603static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Handle *cur); 603static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Handle *cur);
604static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Format *fmt); 604static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Format *fmt);
605static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Format *fmt); 605static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt);
606static const char *_textblock_format_node_from_style_tag(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len); 606static 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);
607#ifdef HAVE_HYPHEN 607#ifdef HAVE_HYPHEN
608/* Hyphenation */ 608/* Hyphenation */
609#include "evas_textblock_hyphenation.x" 609#include "evas_textblock_hyphenation.x"
@@ -791,7 +791,7 @@ _style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len)
791static void 791static void
792_nodes_clear(const Evas_Object *eo_obj) 792_nodes_clear(const Evas_Object *eo_obj)
793{ 793{
794 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 794 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
795 795
796 /* First, clear all annotations that may have spawned format nodes. */ 796 /* First, clear all annotations that may have spawned format nodes. */
797 _evas_textblock_annotations_clear(eo_obj); 797 _evas_textblock_annotations_clear(eo_obj);
@@ -861,7 +861,7 @@ _image_safe_unref(Evas_Public_Data *e, void *image, Eina_Bool async)
861 */ 861 */
862static void 862static void
863_item_free(Evas_Public_Data *evas, 863_item_free(Evas_Public_Data *evas,
864 Efl_Canvas_Text_Data *o, 864 Efl_Canvas_Textblock_Data *o,
865 Evas_Object_Protected_Data *evas_o, 865 Evas_Object_Protected_Data *evas_o,
866 Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it) 866 Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it)
867{ 867{
@@ -1433,7 +1433,7 @@ _style_string_split(const char *str, char* part1, char* part2)
1433#define FORMAT_SHADOW_SET(evas, efl) {fmt->style = evas; if (set_default) _FMT_INFO(effect) = efl;} 1433#define FORMAT_SHADOW_SET(evas, efl) {fmt->style = evas; if (set_default) _FMT_INFO(effect) = efl;}
1434 1434
1435void 1435void
1436_format_shadow_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Text_Data *o) 1436_format_shadow_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Textblock_Data *o)
1437{ 1437{
1438 if (!strcmp(str, "shadow")) 1438 if (!strcmp(str, "shadow"))
1439 FORMAT_SHADOW_SET(EVAS_TEXT_STYLE_SHADOW, EFL_TEXT_STYLE_EFFECT_TYPE_SHADOW) 1439 FORMAT_SHADOW_SET(EVAS_TEXT_STYLE_SHADOW, EFL_TEXT_STYLE_EFFECT_TYPE_SHADOW)
@@ -1460,7 +1460,7 @@ _format_shadow_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_d
1460#define FORMAT_SHADOW_DIRECTION_SET(direction) {EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_##direction); if (set_default) _FMT_INFO(shadow_direction) = EFL_TEXT_STYLE_SHADOW_DIRECTION_##direction;} 1460#define FORMAT_SHADOW_DIRECTION_SET(direction) {EVAS_TEXT_STYLE_SHADOW_DIRECTION_SET(fmt->style, EVAS_TEXT_STYLE_SHADOW_DIRECTION_##direction); if (set_default) _FMT_INFO(shadow_direction) = EFL_TEXT_STYLE_SHADOW_DIRECTION_##direction;}
1461 1461
1462void 1462void
1463_format_shadow_direction_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Text_Data *o) 1463_format_shadow_direction_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Textblock_Data *o)
1464{ 1464{
1465 if (!strcmp(str, "bottom_right")) 1465 if (!strcmp(str, "bottom_right"))
1466 FORMAT_SHADOW_DIRECTION_SET(BOTTOM_RIGHT) 1466 FORMAT_SHADOW_DIRECTION_SET(BOTTOM_RIGHT)
@@ -2222,7 +2222,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2222 } 2222 }
2223 else if (cmd == text_valignstr) 2223 else if (cmd == text_valignstr)
2224 { 2224 {
2225 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2225 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2226 char *endptr = NULL; 2226 char *endptr = NULL;
2227 double val = strtod(param, &endptr); 2227 double val = strtod(param, &endptr);
2228 o->valign = val; 2228 o->valign = val;
@@ -2650,7 +2650,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2650 fmt->ellipsis = -1.0; 2650 fmt->ellipsis = -1.0;
2651 else 2651 else
2652 { 2652 {
2653 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2653 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2654 o->have_ellipsis = 1; 2654 o->have_ellipsis = 1;
2655 } 2655 }
2656 } 2656 }
@@ -2677,7 +2677,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2677 } 2677 }
2678 else if (cmd == replacement_charstr) 2678 else if (cmd == replacement_charstr)
2679 { 2679 {
2680 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2680 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2681 eina_stringshare_replace(&o->repch, param); 2681 eina_stringshare_replace(&o->repch, param);
2682 } 2682 }
2683 else if (cmd == underline_dash_widthstr) 2683 else if (cmd == underline_dash_widthstr)
@@ -2738,7 +2738,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch
2738 * @endcode 2738 * @endcode
2739 */ 2739 */
2740 if (!fmt->gfx_filter) 2740 if (!fmt->gfx_filter)
2741 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); 2741 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter));
2742 eina_stringshare_replace(&fmt->gfx_filter->name, param); 2742 eina_stringshare_replace(&fmt->gfx_filter->name, param);
2743 } 2743 }
2744} 2744}
@@ -2758,7 +2758,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt,
2758{ 2758{
2759 EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE); 2759 EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE);
2760 2760
2761 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 2761 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
2762 int len = _format_clean_param(param); 2762 int len = _format_clean_param(param);
2763 Eina_Bool changed = EINA_FALSE; 2763 Eina_Bool changed = EINA_FALSE;
2764 const char * font_prefix = "font_"; 2764 const char * font_prefix = "font_";
@@ -2870,7 +2870,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt,
2870 else if (cmd == gfx_filterstr) 2870 else if (cmd == gfx_filterstr)
2871 { 2871 {
2872 if (!fmt->gfx_filter) 2872 if (!fmt->gfx_filter)
2873 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); 2873 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter));
2874 eina_stringshare_replace(&fmt->gfx_filter->name, param); 2874 eina_stringshare_replace(&fmt->gfx_filter->name, param);
2875 eina_stringshare_replace(&(_FMT_INFO(gfx_filter_name)), param); 2875 eina_stringshare_replace(&(_FMT_INFO(gfx_filter_name)), param);
2876 } 2876 }
@@ -3191,7 +3191,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char
3191 3191
3192 if (is_default_format == EINA_TRUE && changed) 3192 if (is_default_format == EINA_TRUE && changed)
3193 { 3193 {
3194 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 3194 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
3195 _canvas_text_format_changed(eo_obj, o); 3195 _canvas_text_format_changed(eo_obj, o);
3196 } 3196 }
3197 3197
@@ -3215,7 +3215,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char
3215static char * 3215static char *
3216_format_string_get(const Eo *eo_obj, Evas_Object_Textblock_Format *fmt) 3216_format_string_get(const Eo *eo_obj, Evas_Object_Textblock_Format *fmt)
3217{ 3217{
3218 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 3218 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
3219 Eina_Strbuf *format_buffer = eina_strbuf_new(); 3219 Eina_Strbuf *format_buffer = eina_strbuf_new();
3220 3220
3221 //format info 3221 //format info
@@ -3539,7 +3539,7 @@ typedef struct _Ctxt Ctxt;
3539struct _Ctxt 3539struct _Ctxt
3540{ 3540{
3541 Evas_Object *obj; 3541 Evas_Object *obj;
3542 Efl_Canvas_Text_Data *o; 3542 Efl_Canvas_Textblock_Data *o;
3543 Evas_Object_Protected_Data *evas_o; 3543 Evas_Object_Protected_Data *evas_o;
3544 Evas_Public_Data *evas; 3544 Evas_Public_Data *evas;
3545 3545
@@ -3755,7 +3755,7 @@ _layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt)
3755} 3755}
3756 3756
3757static inline Evas_Object_Textblock_Paragraph * 3757static inline Evas_Object_Textblock_Paragraph *
3758_layout_find_paragraph_by_y(Efl_Canvas_Text_Data *o, Evas_Coord y) 3758_layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y)
3759{ 3759{
3760 Evas_Object_Textblock_Paragraph *start, *par; 3760 Evas_Object_Textblock_Paragraph *start, *par;
3761 int i; 3761 int i;
@@ -3781,7 +3781,7 @@ _layout_find_paragraph_by_y(Efl_Canvas_Text_Data *o, Evas_Coord y)
3781} 3781}
3782 3782
3783static inline Evas_Object_Textblock_Paragraph * 3783static inline Evas_Object_Textblock_Paragraph *
3784_layout_find_paragraph_by_line_no(Efl_Canvas_Text_Data *o, int line_no) 3784_layout_find_paragraph_by_line_no(Efl_Canvas_Textblock_Data *o, int line_no)
3785{ 3785{
3786 Evas_Object_Textblock_Paragraph *start, *par; 3786 Evas_Object_Textblock_Paragraph *start, *par;
3787 int i; 3787 int i;
@@ -3862,7 +3862,7 @@ _layout_paragraph_new(Ctxt *c, Evas_Object_Textblock_Node_Text *n,
3862 * @param par The paragraph to update 3862 * @param par The paragraph to update
3863 */ 3863 */
3864static inline void 3864static inline void
3865_layout_update_bidi_props(const Efl_Canvas_Text_Data *o, 3865_layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o,
3866 Evas_Object_Textblock_Paragraph *par) 3866 Evas_Object_Textblock_Paragraph *par)
3867{ 3867{
3868 if (par->text_node) 3868 if (par->text_node)
@@ -3912,7 +3912,7 @@ _layout_update_bidi_props(const Efl_Canvas_Text_Data *o,
3912 */ 3912 */
3913static void 3913static void
3914_paragraph_clear(Evas_Public_Data *evas, 3914_paragraph_clear(Evas_Public_Data *evas,
3915 Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, 3915 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
3916 Evas_Object_Textblock_Paragraph *par) 3916 Evas_Object_Textblock_Paragraph *par)
3917{ 3917{
3918 while (par->lines) 3918 while (par->lines)
@@ -3949,7 +3949,7 @@ _paragraph_clear(Evas_Public_Data *evas,
3949 */ 3949 */
3950static void 3950static void
3951_paragraph_free(Evas_Public_Data *evas, 3951_paragraph_free(Evas_Public_Data *evas,
3952 Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, 3952 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
3953 Evas_Object_Textblock_Paragraph *par) 3953 Evas_Object_Textblock_Paragraph *par)
3954{ 3954{
3955 _paragraph_clear(evas, o, obj, par); 3955 _paragraph_clear(evas, o, obj, par);
@@ -4002,7 +4002,7 @@ _paragraphs_clear(Ctxt *c)
4002 */ 4002 */
4003static void 4003static void
4004_paragraphs_free(Evas_Public_Data *evas, 4004_paragraphs_free(Evas_Public_Data *evas,
4005 Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, 4005 Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj,
4006 Evas_Object_Textblock_Paragraph *pars) 4006 Evas_Object_Textblock_Paragraph *pars)
4007{ 4007{
4008 o->num_paragraphs = 0; 4008 o->num_paragraphs = 0;
@@ -4029,7 +4029,7 @@ static Evas_Object_Textblock_Format *
4029_layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, 4029_layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
4030 Evas_Object_Textblock_Node_Format *fnode) 4030 Evas_Object_Textblock_Node_Format *fnode)
4031{ 4031{
4032 Efl_Canvas_Text_Data *o = c->o; 4032 Efl_Canvas_Textblock_Data *o = c->o;
4033 4033
4034 if (fmt) 4034 if (fmt)
4035 { 4035 {
@@ -4078,7 +4078,7 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt,
4078 { 4078 {
4079 if (!fmt->gfx_filter) 4079 if (!fmt->gfx_filter)
4080 { 4080 {
4081 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); 4081 fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter));
4082 eina_stringshare_replace(&fmt->gfx_filter->name, 4082 eina_stringshare_replace(&fmt->gfx_filter->name,
4083 _FMT_INFO(gfx_filter_name)); 4083 _FMT_INFO(gfx_filter_name));
4084 } 4084 }
@@ -5250,10 +5250,10 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt)
5250 evas_font_free(of); 5250 evas_font_free(of);
5251} 5251}
5252 5252
5253static Efl_Canvas_Text_Filter_Program * 5253static Efl_Canvas_Textblock_Filter_Program *
5254_filter_program_find(Efl_Canvas_Text_Data *o, const char *name) 5254_filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name)
5255{ 5255{
5256 Efl_Canvas_Text_Filter_Program *prg; 5256 Efl_Canvas_Textblock_Filter_Program *prg;
5257 5257
5258 if (!name) return NULL; 5258 if (!name) return NULL;
5259 EINA_INLIST_FOREACH(o->gfx_filter.programs, prg) 5259 EINA_INLIST_FOREACH(o->gfx_filter.programs, prg)
@@ -5266,10 +5266,10 @@ _filter_program_find(Efl_Canvas_Text_Data *o, const char *name)
5266} 5266}
5267 5267
5268static Evas_Filter_Program * 5268static Evas_Filter_Program *
5269_format_filter_program_get(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Format *fmt) 5269_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt)
5270{ 5270{
5271 Efl_Canvas_Text_Filter_Program *program; 5271 Efl_Canvas_Textblock_Filter_Program *program;
5272 Efl_Canvas_Text_Filter *filter; 5272 Efl_Canvas_Textblock_Filter *filter;
5273 Evas_Filter_Program *pgm; 5273 Evas_Filter_Program *pgm;
5274 5274
5275 filter = fmt->gfx_filter; 5275 filter = fmt->gfx_filter;
@@ -6071,7 +6071,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i)
6071 6071
6072/* Don't do much for the meanwhile. */ 6072/* Don't do much for the meanwhile. */
6073static inline void 6073static inline void
6074_layout_paragraph_render(Efl_Canvas_Text_Data *o, 6074_layout_paragraph_render(Efl_Canvas_Textblock_Data *o,
6075 Evas_Object_Textblock_Paragraph *par) 6075 Evas_Object_Textblock_Paragraph *par)
6076{ 6076{
6077 if (par->rendered) 6077 if (par->rendered)
@@ -6923,7 +6923,7 @@ _layout_pre(Ctxt *c)
6923{ 6923{
6924 int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b; 6924 int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b;
6925 Evas_Object *eo_obj = c->obj; 6925 Evas_Object *eo_obj = c->obj;
6926 Efl_Canvas_Text_Data *o = c->o; 6926 Efl_Canvas_Textblock_Data *o = c->o;
6927 6927
6928 style_pad_l = &c->style_pad.l; 6928 style_pad_l = &c->style_pad.l;
6929 style_pad_r = &c->style_pad.r; 6929 style_pad_r = &c->style_pad.r;
@@ -7291,7 +7291,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
7291 LYDBG("ZZ: ... layout #2\n"); 7291 LYDBG("ZZ: ... layout #2\n");
7292 c->o->content_changed = 0; 7292 c->o->content_changed = 0;
7293 _layout(c->obj, c->w, c->h, w_ret, h_ret); 7293 _layout(c->obj, c->w, c->h, w_ret, h_ret);
7294 efl_event_callback_call(c->obj, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, NULL); 7294 efl_event_callback_call(c->obj, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, NULL);
7295 7295
7296 c->o->obstacle_changed = EINA_FALSE; 7296 c->o->obstacle_changed = EINA_FALSE;
7297 } 7297 }
@@ -7300,7 +7300,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret)
7300static Eina_Bool 7300static Eina_Bool
7301_layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h) 7301_layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h)
7302{ 7302{
7303 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7303 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7304 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7304 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7305 Evas *eo_e; 7305 Evas *eo_e;
7306 /* setup context */ 7306 /* setup context */
@@ -7423,7 +7423,7 @@ static void
7423_relayout(const Evas_Object *eo_obj) 7423_relayout(const Evas_Object *eo_obj)
7424{ 7424{
7425 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7425 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7426 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7426 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7427 _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, 7427 _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h,
7428 &o->formatted.w, &o->formatted.h); 7428 &o->formatted.w, &o->formatted.h);
7429 o->formatted.valid = 1; 7429 o->formatted.valid = 1;
@@ -7455,7 +7455,7 @@ _relayout(const Evas_Object *eo_obj)
7455 * Check if the object needs a relayout, and if so, execute it. 7455 * Check if the object needs a relayout, and if so, execute it.
7456 */ 7456 */
7457static Eina_Bool 7457static Eina_Bool
7458_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Text_Data *o) 7458_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o)
7459{ 7459{
7460 ASYNC_BLOCK; 7460 ASYNC_BLOCK;
7461 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7461 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -7476,7 +7476,7 @@ _relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Text_Data *o)
7476void 7476void
7477_evas_textblock_relayout_if_needed(Evas_Object *eo_obj) 7477_evas_textblock_relayout_if_needed(Evas_Object *eo_obj)
7478{ 7478{
7479 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7479 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7480 _relayout_if_needed(eo_obj, o); 7480 _relayout_if_needed(eo_obj, o);
7481} 7481}
7482 7482
@@ -7496,7 +7496,7 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex
7496{ 7496{
7497 Evas_Object_Textblock_Paragraph *found_par; 7497 Evas_Object_Textblock_Paragraph *found_par;
7498 Evas_Object_Textblock_Line *ln; 7498 Evas_Object_Textblock_Line *ln;
7499 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7499 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7500 7500
7501 _relayout_if_needed(eo_obj, o); 7501 _relayout_if_needed(eo_obj, o);
7502 7502
@@ -7553,7 +7553,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
7553{ 7553{
7554 Evas_Object_Textblock_Paragraph *par; 7554 Evas_Object_Textblock_Paragraph *par;
7555 Evas_Object_Textblock_Line *ln; 7555 Evas_Object_Textblock_Line *ln;
7556 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7556 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7557 7557
7558 par = _layout_find_paragraph_by_line_no(o, line); 7558 par = _layout_find_paragraph_by_line_no(o, line);
7559 if (par) 7559 if (par)
@@ -7570,7 +7570,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line)
7570EAPI Evas_Object * 7570EAPI Evas_Object *
7571evas_object_textblock_add(Evas *e) 7571evas_object_textblock_add(Evas *e)
7572{ 7572{
7573 Efl_Canvas_Text_Data *o; 7573 Efl_Canvas_Textblock_Data *o;
7574 MAGIC_CHECK(e, Evas, MAGIC_EVAS); 7574 MAGIC_CHECK(e, Evas, MAGIC_EVAS);
7575 return NULL; 7575 return NULL;
7576 MAGIC_CHECK_END(); 7576 MAGIC_CHECK_END();
@@ -7585,10 +7585,10 @@ evas_object_textblock_add(Evas *e)
7585} 7585}
7586 7586
7587EOLIAN static Eo * 7587EOLIAN static Eo *
7588_efl_canvas_text_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) 7588_efl_canvas_textblock_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *class_data EINA_UNUSED)
7589{ 7589{
7590 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7590 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7591 Efl_Canvas_Text_Data *o; 7591 Efl_Canvas_Textblock_Data *o;
7592 7592
7593 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); 7593 eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
7594 7594
@@ -7651,11 +7651,11 @@ evas_textblock_style_free(Evas_Textblock_Style *ts)
7651} 7651}
7652 7652
7653static void 7653static void
7654_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Text_Data *o) 7654_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Textblock_Data *o)
7655{ 7655{
7656 if (!o) 7656 if (!o)
7657 { 7657 {
7658 ERR("The given address Efl_Canvas_Text_Data is NULL"); 7658 ERR("The given address Efl_Canvas_Textblock_Data is NULL");
7659 return; 7659 return;
7660 } 7660 }
7661 7661
@@ -7812,7 +7812,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
7812 7812
7813 EINA_LIST_FOREACH(ts->objects, l, eo_obj) 7813 EINA_LIST_FOREACH(ts->objects, l, eo_obj)
7814 { 7814 {
7815 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7815 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7816 _evas_textblock_update_format_nodes_from_style_tag(o); 7816 _evas_textblock_update_format_nodes_from_style_tag(o);
7817 _evas_textblock_invalidate_all(o); 7817 _evas_textblock_invalidate_all(o);
7818 _evas_textblock_changed(o, eo_obj); 7818 _evas_textblock_changed(o, eo_obj);
@@ -7827,7 +7827,7 @@ evas_textblock_style_get(const Evas_Textblock_Style *ts)
7827} 7827}
7828 7828
7829static const char * 7829static const char *
7830_textblock_format_node_from_style_tag(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len) 7830_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len)
7831{ 7831{
7832 Eina_List *itr; 7832 Eina_List *itr;
7833 const char *match = NULL; 7833 const char *match = NULL;
@@ -7954,7 +7954,7 @@ evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts)
7954} 7954}
7955 7955
7956static Evas_Textblock_Style * 7956static Evas_Textblock_Style *
7957_style_by_key_find(Efl_Canvas_Text_Data *o, const char *key) 7957_style_by_key_find(Efl_Canvas_Textblock_Data *o, const char *key)
7958{ 7958{
7959 Eina_List *itr; 7959 Eina_List *itr;
7960 User_Style_Entry *us; 7960 User_Style_Entry *us;
@@ -7972,7 +7972,7 @@ _style_by_key_find(Efl_Canvas_Text_Data *o, const char *key)
7972} 7972}
7973 7973
7974EOLIAN static void 7974EOLIAN static void
7975_efl_canvas_text_style_apply(Eo *eo_obj, Efl_Canvas_Text_Data *o, const char *style) 7975_efl_canvas_textblock_style_apply(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, const char *style)
7976{ 7976{
7977 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7977 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7978 evas_object_async_block(obj); 7978 evas_object_async_block(obj);
@@ -7985,12 +7985,12 @@ evas_object_textblock_style_get(const Eo *eo_obj)
7985 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 7985 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
7986 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 7986 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
7987 evas_object_async_block(obj); 7987 evas_object_async_block(obj);
7988 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 7988 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
7989 return o->style; 7989 return o->style;
7990} 7990}
7991 7991
7992EOLIAN static const char * 7992EOLIAN static const char *
7993_efl_canvas_text_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) 7993_efl_canvas_textblock_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
7994{ 7994{
7995 if (o->default_format.default_style_str) 7995 if (o->default_format.default_style_str)
7996 free(o->default_format.default_style_str); 7996 free(o->default_format.default_style_str);
@@ -8000,13 +8000,13 @@ _efl_canvas_text_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Da
8000} 8000}
8001 8001
8002EOLIAN static void 8002EOLIAN static void
8003_efl_canvas_text_cursor_add(Eo *obj, Efl_Canvas_Text_Data *pd EINA_UNUSED, Efl_Text_Cursor *cursor) 8003_efl_canvas_textblock_cursor_add(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Text_Cursor *cursor)
8004{ 8004{
8005 efl_text_cursor_text_object_set(cursor, obj, obj); 8005 efl_text_cursor_text_object_set(cursor, obj, obj);
8006} 8006}
8007 8007
8008EOLIAN static Efl_Text_Cursor * 8008EOLIAN static Efl_Text_Cursor *
8009_efl_canvas_text_cursor_create(Eo *obj, Efl_Canvas_Text_Data *pd EINA_UNUSED) 8009_efl_canvas_textblock_cursor_create(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED)
8010{ 8010{
8011 Eo* cursor = efl_add(EFL_TEXT_CURSOR_CLASS, obj); 8011 Eo* cursor = efl_add(EFL_TEXT_CURSOR_CLASS, obj);
8012 efl_text_cursor_text_object_set(cursor, obj, obj); 8012 efl_text_cursor_text_object_set(cursor, obj, obj);
@@ -8030,7 +8030,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj)
8030 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 8030 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
8031 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8031 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
8032 evas_object_async_block(obj); 8032 evas_object_async_block(obj);
8033 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8033 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8034 Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER); 8034 Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER);
8035 8035
8036 return ts; 8036 return ts;
@@ -8046,10 +8046,10 @@ evas_object_textblock_style_user_pop(Eo *eo_obj)
8046} 8046}
8047 8047
8048EAPI void 8048EAPI void
8049evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch) 8049evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char *ch)
8050{ 8050{
8051 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 8051 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
8052 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8052 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8053 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8053 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
8054 evas_object_async_block(obj); 8054 evas_object_async_block(obj);
8055 if (o->repch) eina_stringshare_del(o->repch); 8055 if (o->repch) eina_stringshare_del(o->repch);
@@ -8061,7 +8061,7 @@ evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch)
8061 8061
8062 8062
8063EOLIAN static void 8063EOLIAN static void
8064_efl_canvas_text_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Eina_Bool mode) 8064_efl_canvas_textblock_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, Eina_Bool mode)
8065{ 8065{
8066 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8066 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
8067 evas_object_async_block(obj); 8067 evas_object_async_block(obj);
@@ -8074,22 +8074,22 @@ _efl_canvas_text_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_
8074} 8074}
8075 8075
8076EOLIAN static Eina_Bool 8076EOLIAN static Eina_Bool
8077_efl_canvas_text_newline_as_paragraph_separator_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) 8077_efl_canvas_textblock_newline_as_paragraph_separator_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
8078{ 8078{
8079 return o->legacy_newline; 8079 return o->legacy_newline;
8080} 8080}
8081 8081
8082EOLIAN static Eina_Bool 8082EOLIAN static Eina_Bool
8083_efl_canvas_text_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) 8083_efl_canvas_textblock_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
8084{ 8084{
8085 return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0); 8085 return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0);
8086} 8086}
8087 8087
8088EAPI void 8088EAPI void
8089evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align) 8089evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align)
8090{ 8090{
8091 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 8091 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
8092 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8092 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8093 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8093 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
8094 evas_object_async_block(obj); 8094 evas_object_async_block(obj);
8095 if (align < 0.0) align = 0.0; 8095 if (align < 0.0) align = 0.0;
@@ -8100,15 +8100,15 @@ evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align)
8100} 8100}
8101 8101
8102EAPI double 8102EAPI double
8103evas_object_textblock_valign_get(const Efl_Canvas_Text *obj) 8103evas_object_textblock_valign_get(const Efl_Canvas_Textblock *obj)
8104{ 8104{
8105 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); 8105 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0);
8106 Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS); 8106 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS);
8107 return o->valign; 8107 return o->valign;
8108} 8108}
8109 8109
8110EOLIAN static void 8110EOLIAN static void
8111_efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *delim) 8111_efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *delim)
8112{ 8112{
8113 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8113 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
8114 evas_object_async_block(obj); 8114 evas_object_async_block(obj);
@@ -8116,16 +8116,16 @@ _efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Dat
8116} 8116}
8117 8117
8118EOLIAN static const char* 8118EOLIAN static const char*
8119_efl_canvas_text_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) 8119_efl_canvas_textblock_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
8120{ 8120{
8121 return o->bidi_delimiters; 8121 return o->bidi_delimiters;
8122} 8122}
8123 8123
8124EAPI const char * 8124EAPI const char *
8125evas_object_textblock_replace_char_get(const Efl_Canvas_Text *obj) 8125evas_object_textblock_replace_char_get(const Efl_Canvas_Textblock *obj)
8126{ 8126{
8127 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); 8127 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
8128 Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS); 8128 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS);
8129 return o->repch; 8129 return o->repch;
8130} 8130}
8131 8131
@@ -8399,7 +8399,7 @@ _prepend_escaped_char(Efl_Text_Cursor_Handle *cur_obj, const char *s,
8399 8399
8400 8400
8401static void 8401static void
8402_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, 8402_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
8403 const char *text) 8403 const char *text)
8404{ 8404{
8405 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 8405 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@@ -8454,17 +8454,17 @@ EAPI void
8454evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) 8454evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text)
8455{ 8455{
8456 EINA_SAFETY_ON_NULL_RETURN(eo_obj); 8456 EINA_SAFETY_ON_NULL_RETURN(eo_obj);
8457 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8457 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8458 _evas_object_textblock_text_markup_set(eo_obj, o, text); 8458 _evas_object_textblock_text_markup_set(eo_obj, o, text);
8459} 8459}
8460 8460
8461EOLIAN void 8461EOLIAN void
8462_efl_canvas_text_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, 8462_efl_canvas_textblock_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
8463 const char *text) 8463 const char *text)
8464{ 8464{
8465 ASYNC_BLOCK; 8465 ASYNC_BLOCK;
8466 _evas_object_textblock_text_markup_set(eo_obj, o, text); 8466 _evas_object_textblock_text_markup_set(eo_obj, o, text);
8467 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); 8467 efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
8468} 8468}
8469 8469
8470static void 8470static void
@@ -8705,7 +8705,7 @@ _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text)
8705 free(base); 8705 free(base);
8706} 8706}
8707static const char* 8707static const char*
8708_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) 8708_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
8709{ 8709{
8710 Evas_Object_Textblock_Node_Text *n; 8710 Evas_Object_Textblock_Node_Text *n;
8711 Eina_Strbuf *txt = NULL; 8711 Eina_Strbuf *txt = NULL;
@@ -8766,7 +8766,7 @@ _evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o
8766 free(text_base); 8766 free(text_base);
8767 } 8767 }
8768 8768
8769 (((Efl_Canvas_Text_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt)); 8769 (((Efl_Canvas_Textblock_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt));
8770 eina_strbuf_free(txt); 8770 eina_strbuf_free(txt);
8771 markup = (o->markup_text); 8771 markup = (o->markup_text);
8772 8772
@@ -8777,12 +8777,12 @@ EAPI const char*
8777evas_object_textblock_text_markup_get(Eo *eo_obj) 8777evas_object_textblock_text_markup_get(Eo *eo_obj)
8778{ 8778{
8779 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 8779 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
8780 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 8780 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
8781 return _evas_object_textblock_text_markup_get(eo_obj, o); 8781 return _evas_object_textblock_text_markup_get(eo_obj, o);
8782} 8782}
8783 8783
8784EOLIAN const char* 8784EOLIAN const char*
8785_efl_canvas_text_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) 8785_efl_canvas_textblock_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
8786{ 8786{
8787 return _evas_object_textblock_text_markup_get(eo_obj, o); 8787 return _evas_object_textblock_text_markup_get(eo_obj, o);
8788} 8788}
@@ -8994,7 +8994,7 @@ _layout_obstacles_update(Ctxt *c)
8994} 8994}
8995 8995
8996static Evas_Textblock_Obstacle * 8996static Evas_Textblock_Obstacle *
8997_obstacle_find(Efl_Canvas_Text_Data *o, Eo *eo_obs) 8997_obstacle_find(Efl_Canvas_Textblock_Data *o, Eo *eo_obs)
8998{ 8998{
8999 Evas_Textblock_Obstacle *obs; 8999 Evas_Textblock_Obstacle *obs;
9000 Eina_List *i; 9000 Eina_List *i;
@@ -9011,7 +9011,7 @@ void
9011_obstacle_del_cb(void *data, const Efl_Event *event) 9011_obstacle_del_cb(void *data, const Efl_Event *event)
9012{ 9012{
9013 Eo *eo_obj = data; 9013 Eo *eo_obj = data;
9014 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9014 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9015 Eina_List *i; 9015 Eina_List *i;
9016 Evas_Textblock_Obstacle *obs; 9016 Evas_Textblock_Obstacle *obs;
9017 9017
@@ -9040,7 +9040,7 @@ _obstacle_free(Eo *eo_obj, Evas_Textblock_Obstacle *obs)
9040} 9040}
9041 9041
9042static void 9042static void
9043_obstacles_free(Eo *eo_obj, Efl_Canvas_Text_Data *o) 9043_obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
9044{ 9044{
9045 Evas_Textblock_Obstacle *obs; 9045 Evas_Textblock_Obstacle *obs;
9046 9046
@@ -9051,8 +9051,8 @@ _obstacles_free(Eo *eo_obj, Efl_Canvas_Text_Data *o)
9051} 9051}
9052 9052
9053EOLIAN static Eina_Bool 9053EOLIAN static Eina_Bool
9054_efl_canvas_text_obstacle_add(Eo *eo_obj, 9054_efl_canvas_textblock_obstacle_add(Eo *eo_obj,
9055 Efl_Canvas_Text_Data *o, Eo *eo_obs) 9055 Efl_Canvas_Textblock_Data *o, Eo *eo_obs)
9056{ 9056{
9057 Evas_Textblock_Obstacle *obs; 9057 Evas_Textblock_Obstacle *obs;
9058 9058
@@ -9075,7 +9075,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj,
9075} 9075}
9076 9076
9077EOLIAN static Eina_Bool 9077EOLIAN static Eina_Bool
9078_efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *o, 9078_efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o,
9079 Eo *eo_obs EINA_UNUSED) 9079 Eo *eo_obs EINA_UNUSED)
9080{ 9080{
9081 Evas_Textblock_Obstacle *obs; 9081 Evas_Textblock_Obstacle *obs;
@@ -9100,7 +9100,7 @@ _efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *o,
9100} 9100}
9101 9101
9102EOLIAN static void 9102EOLIAN static void
9103_efl_canvas_text_obstacles_update(Eo *eo_obj, Efl_Canvas_Text_Data *obj) 9103_efl_canvas_textblock_obstacles_update(Eo *eo_obj, Efl_Canvas_Textblock_Data *obj)
9104{ 9104{
9105 _evas_textblock_changed(obj, eo_obj); 9105 _evas_textblock_changed(obj, eo_obj);
9106 obj->obstacle_changed = EINA_TRUE; 9106 obj->obstacle_changed = EINA_TRUE;
@@ -9186,7 +9186,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti)
9186 * @param to merge into to. 9186 * @param to merge into to.
9187 */ 9187 */
9188static void 9188static void
9189_evas_textblock_nodes_merge(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *to) 9189_evas_textblock_nodes_merge(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *to)
9190{ 9190{
9191 Evas_Object_Textblock_Node_Format *itr; 9191 Evas_Object_Textblock_Node_Format *itr;
9192 Evas_Object_Textblock_Node_Format *pnode; 9192 Evas_Object_Textblock_Node_Format *pnode;
@@ -9254,7 +9254,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Handle *cur)
9254 9254
9255 len = eina_ustrbuf_length_get(cur->node->unicode); 9255 len = eina_ustrbuf_length_get(cur->node->unicode);
9256 9256
9257 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9257 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9258 nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next); 9258 nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next);
9259 _evas_textblock_nodes_merge(o, cur->node); 9259 _evas_textblock_nodes_merge(o, cur->node);
9260 _evas_textblock_cursors_update_offset(cur, nnode, 0, len); 9260 _evas_textblock_cursors_update_offset(cur, nnode, 0, len);
@@ -9448,7 +9448,7 @@ _evas_textblock_cursor_init(Efl_Text_Cursor_Handle *cur, const Evas_Object *tb)
9448 cur->obj = (Eo *) tb; 9448 cur->obj = (Eo *) tb;
9449 cur->cur_objs = NULL; 9449 cur->cur_objs = NULL;
9450 cur->ref_count = 1; 9450 cur->ref_count = 1;
9451 Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); 9451 Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS);
9452 if (!o) return; 9452 if (!o) return;
9453 9453
9454 cur->node = o->text_nodes; 9454 cur->node = o->text_nodes;
@@ -9464,7 +9464,7 @@ evas_object_textblock_cursor_new(const Evas_Object *eo_obj)
9464 if (!obj) return NULL; 9464 if (!obj) return NULL;
9465 evas_object_async_block(obj); 9465 evas_object_async_block(obj);
9466 9466
9467 Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(eo_obj, MY_CLASS); 9467 Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(eo_obj, MY_CLASS);
9468 if (!o) return NULL; 9468 if (!o) return NULL;
9469 9469
9470 cur = calloc(1, sizeof(Efl_Text_Cursor_Handle)); 9470 cur = calloc(1, sizeof(Efl_Text_Cursor_Handle));
@@ -9479,7 +9479,7 @@ EAPI void
9479evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) 9479evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
9480{ 9480{
9481 if (!cur) return; 9481 if (!cur) return;
9482 Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); 9482 Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS);
9483 if (!o) return; 9483 if (!o) return;
9484 if (cur == o->cursor) return; 9484 if (cur == o->cursor) return;
9485 o->cursors = eina_list_remove(o->cursors, cur); 9485 o->cursors = eina_list_remove(o->cursors, cur);
@@ -9491,7 +9491,7 @@ evas_textblock_cursor_ref(Efl_Text_Cursor_Handle *cur, Eo * cur_obj)
9491{ 9491{
9492 if (!cur) return NULL; 9492 if (!cur) return NULL;
9493 /* Does not work with TextBlock Main Cursor*/ 9493 /* Does not work with TextBlock Main Cursor*/
9494 Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); 9494 Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS);
9495 if (!o) return NULL; 9495 if (!o) return NULL;
9496 9496
9497 if (cur == o->cursor) return NULL; 9497 if (cur == o->cursor) return NULL;
@@ -9507,7 +9507,7 @@ evas_textblock_cursor_unref(Efl_Text_Cursor_Handle *cursor, Eo * cur_obj)
9507{ 9507{
9508 if (!cursor) return; 9508 if (!cursor) return;
9509 /* Does not work with TextBlock Main Cursor*/ 9509 /* Does not work with TextBlock Main Cursor*/
9510 Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cursor->obj, MY_CLASS); 9510 Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cursor->obj, MY_CLASS);
9511 if (!o) return; 9511 if (!o) return;
9512 9512
9513 if (cursor == o->cursor) return; 9513 if (cursor == o->cursor) return;
@@ -9543,7 +9543,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor)
9543 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9543 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9544 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9544 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9545 evas_object_async_block(obj); 9545 evas_object_async_block(obj);
9546 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9546 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9547 if (!strcmp(anchor, "a")) 9547 if (!strcmp(anchor, "a"))
9548 return o->anchors_a; 9548 return o->anchors_a;
9549 else if (!strcmp(anchor, "item")) 9549 else if (!strcmp(anchor, "item"))
@@ -9557,7 +9557,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj)
9557 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9557 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9558 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9558 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9559 evas_object_async_block(obj); 9559 evas_object_async_block(obj);
9560 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9560 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9561 return o->format_nodes; 9561 return o->format_nodes;
9562} 9562}
9563 9563
@@ -9567,7 +9567,7 @@ evas_textblock_node_format_last_get(Evas_Object *eo_obj)
9567 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); 9567 EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL);
9568 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9568 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9569 evas_object_async_block(obj); 9569 evas_object_async_block(obj);
9570 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9570 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9571 return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL; 9571 return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL;
9572} 9572}
9573 9573
@@ -9599,7 +9599,7 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo
9599 9599
9600 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 9600 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
9601 evas_object_async_block(obj); 9601 evas_object_async_block(obj);
9602 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 9602 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
9603 do 9603 do
9604 { 9604 {
9605 const char *fstr = fmt->orig_format; 9605 const char *fstr = fmt->orig_format;
@@ -9701,7 +9701,7 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Handle *cur)
9701 if (!cur) return; 9701 if (!cur) return;
9702 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 9702 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
9703 evas_object_async_block(obj); 9703 evas_object_async_block(obj);
9704 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9704 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9705 cur->node = o->text_nodes; 9705 cur->node = o->text_nodes;
9706 cur->pos = 0; 9706 cur->pos = 0;
9707 _evas_textblock_cursor_object_changed(cur); 9707 _evas_textblock_cursor_object_changed(cur);
@@ -9715,7 +9715,7 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Handle *cur)
9715 if (!cur) return; 9715 if (!cur) return;
9716 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 9716 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
9717 evas_object_async_block(obj); 9717 evas_object_async_block(obj);
9718 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 9718 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
9719 node = o->text_nodes; 9719 node = o->text_nodes;
9720 if (node) 9720 if (node)
9721 { 9721 {
@@ -10029,7 +10029,7 @@ static size_t
10029_evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc, Eina_Bool *is_single_glyph) 10029_evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc, Eina_Bool *is_single_glyph)
10030{ 10030{
10031 Evas_Object_Textblock_Paragraph *par; 10031 Evas_Object_Textblock_Paragraph *par;
10032 Efl_Canvas_Text_Data *o; 10032 Efl_Canvas_Textblock_Data *o;
10033 size_t cur_pos = cur->pos; 10033 size_t cur_pos = cur->pos;
10034 size_t ret = cur->pos; 10034 size_t ret = cur->pos;
10035 10035
@@ -10321,7 +10321,7 @@ evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Handle *cur)
10321static void 10321static void
10322_cursor_line_first_char_get(Evas_Object_Textblock_Line *ln, 10322_cursor_line_first_char_get(Evas_Object_Textblock_Line *ln,
10323 Efl_Text_Cursor_Handle *cur, 10323 Efl_Text_Cursor_Handle *cur,
10324 Efl_Canvas_Text_Data *o) 10324 Efl_Canvas_Textblock_Data *o)
10325{ 10325{
10326 if (ln->items) 10326 if (ln->items)
10327 { 10327 {
@@ -10356,7 +10356,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Handle *cur)
10356 10356
10357 evas_object_async_block(obj); 10357 evas_object_async_block(obj);
10358 TB_NULL_CHECK(cur->node); 10358 TB_NULL_CHECK(cur->node);
10359 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10359 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10360 10360
10361 _relayout_if_needed(cur->obj, o); 10361 _relayout_if_needed(cur->obj, o);
10362 10362
@@ -10380,7 +10380,7 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Handle *cur)
10380 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10380 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10381 evas_object_async_block(obj); 10381 evas_object_async_block(obj);
10382 TB_NULL_CHECK(cur->node); 10382 TB_NULL_CHECK(cur->node);
10383 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10383 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10384 10384
10385 _relayout_if_needed(cur->obj, o); 10385 _relayout_if_needed(cur->obj, o);
10386 10386
@@ -10520,7 +10520,7 @@ _evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Handle *cur, Evas_Obj
10520 * @param fmt the current format. 10520 * @param fmt the current format.
10521 */ 10521 */
10522static void 10522static void
10523_evas_textblock_node_format_remove_matching(Efl_Canvas_Text_Data *o, 10523_evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o,
10524 Evas_Object_Textblock_Node_Format *fmt) 10524 Evas_Object_Textblock_Node_Format *fmt)
10525{ 10525{
10526 Evas_Object_Textblock_Node_Text *tnode; 10526 Evas_Object_Textblock_Node_Text *tnode;
@@ -10609,7 +10609,7 @@ _evas_textblock_node_format_remove_matching(Efl_Canvas_Text_Data *o,
10609 * @param offset the offset to add (may be negative). 10609 * @param offset the offset to add (may be negative).
10610 */ 10610 */
10611static void 10611static void
10612_evas_textblock_node_format_adjust_offset(Efl_Canvas_Text_Data *o, 10612_evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o,
10613 Evas_Object_Textblock_Node_Text *tnode, 10613 Evas_Object_Textblock_Node_Text *tnode,
10614 Evas_Object_Textblock_Node_Format *fmt, int offset) 10614 Evas_Object_Textblock_Node_Format *fmt, int offset)
10615{ 10615{
@@ -10636,7 +10636,7 @@ _evas_textblock_node_format_adjust_offset(Efl_Canvas_Text_Data *o,
10636 * @param n the fromat node to remove 10636 * @param n the fromat node to remove
10637 */ 10637 */
10638static void 10638static void
10639_evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment) 10639_evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment)
10640{ 10640{
10641 /* Update the text nodes about the change */ 10641 /* Update the text nodes about the change */
10642 { 10642 {
@@ -10681,7 +10681,7 @@ _evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textbloc
10681void 10681void
10682_evas_textblock_annotations_node_format_remove(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Format *n, int visual_adjustment) 10682_evas_textblock_annotations_node_format_remove(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Format *n, int visual_adjustment)
10683{ 10683{
10684 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 10684 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
10685 _evas_textblock_node_format_remove(o, n, visual_adjustment); 10685 _evas_textblock_node_format_remove(o, n, visual_adjustment);
10686} 10686}
10687 10687
@@ -10698,7 +10698,7 @@ _evas_textblock_annotations_node_format_remove(Evas_Object *eo_obj, Evas_Object_
10698 * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise. 10698 * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise.
10699 */ 10699 */
10700static Eina_Bool 10700static Eina_Bool
10701_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Text_Data *o, 10701_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Textblock_Data *o,
10702 Evas_Object_Textblock_Node_Text *n, size_t start, int end) 10702 Evas_Object_Textblock_Node_Text *n, size_t start, int end)
10703{ 10703{
10704 Evas_Object_Textblock_Node_Format *last_node, *itr; 10704 Evas_Object_Textblock_Node_Format *last_node, *itr;
@@ -10826,7 +10826,7 @@ _evas_textblock_node_text_get_first_format_between(
10826 * @param n the node to remove. 10826 * @param n the node to remove.
10827 */ 10827 */
10828static void 10828static void
10829_evas_textblock_node_text_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *n) 10829_evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n)
10830{ 10830{
10831 _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1); 10831 _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1);
10832 10832
@@ -10875,7 +10875,7 @@ evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Handle *cur)
10875 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10875 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10876 evas_object_async_block(obj); 10876 evas_object_async_block(obj);
10877 TB_NULL_CHECK(cur->node, 0); 10877 TB_NULL_CHECK(cur->node, 0);
10878 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10878 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10879 n = o->text_nodes; 10879 n = o->text_nodes;
10880 while (n != cur->node) 10880 while (n != cur->node)
10881 { 10881 {
@@ -10893,7 +10893,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Handle *cur, int _pos)
10893 if (!cur) return; 10893 if (!cur) return;
10894 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10894 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10895 evas_object_async_block(obj); 10895 evas_object_async_block(obj);
10896 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10896 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10897 10897
10898 10898
10899 if (_pos < 0) 10899 if (_pos < 0)
@@ -10942,7 +10942,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
10942 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 10942 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
10943 evas_object_async_block(obj); 10943 evas_object_async_block(obj);
10944 10944
10945 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10945 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10946 10946
10947 _relayout_if_needed(cur->obj, o); 10947 _relayout_if_needed(cur->obj, o);
10948 10948
@@ -10959,7 +10959,7 @@ evas_textblock_cursor_line_jump_by(Efl_Text_Cursor_Handle *cur, int by)
10959{ 10959{
10960 if (!cur) return; 10960 if (!cur) return;
10961 10961
10962 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 10962 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
10963 ASYNC_BLOCK; 10963 ASYNC_BLOCK;
10964 int ln; 10964 int ln;
10965 Evas_Coord cx, cw; 10965 Evas_Coord cx, cw;
@@ -11134,7 +11134,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Handle *cur,
11134 Evas_Object_Textblock_Node_Text *n; 11134 Evas_Object_Textblock_Node_Text *n;
11135 11135
11136 if (!cur) return; 11136 if (!cur) return;
11137 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11137 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11138 11138
11139 n = _evas_textblock_node_text_new(); 11139 n = _evas_textblock_node_text_new();
11140 o->text_nodes = _NODE_TEXT(eina_inlist_append_relative( 11140 o->text_nodes = _NODE_TEXT(eina_inlist_append_relative(
@@ -11211,7 +11211,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Handle *cur,
11211 * @param new_node the new node to set. 11211 * @param new_node the new node to set.
11212 */ 11212 */
11213static void 11213static void
11214_evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o, 11214_evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o,
11215 const Evas_Object_Textblock_Node_Text *n, 11215 const Evas_Object_Textblock_Node_Text *n,
11216 Evas_Object_Textblock_Node_Text *new_node) 11216 Evas_Object_Textblock_Node_Text *new_node)
11217{ 11217{
@@ -11237,7 +11237,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o,
11237} 11237}
11238 11238
11239static inline void 11239static inline void
11240_cursor_update_offset(Efl_Text_Cursor_Handle *cur, Efl_Canvas_Text_Data *o, 11240_cursor_update_offset(Efl_Text_Cursor_Handle *cur, Efl_Canvas_Textblock_Data *o,
11241 const Evas_Object_Textblock_Node_Text *n, size_t start, int offset) 11241 const Evas_Object_Textblock_Node_Text *n, size_t start, int offset)
11242{ 11242{
11243 if ((n == cur->node) && 11243 if ((n == cur->node) &&
@@ -11277,7 +11277,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur,
11277{ 11277{
11278 Eina_List *l; 11278 Eina_List *l;
11279 Efl_Text_Cursor_Handle *ocur; 11279 Efl_Text_Cursor_Handle *ocur;
11280 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11280 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11281 11281
11282 ocur = o->cursor; 11282 ocur = o->cursor;
11283 if (cur != ocur) 11283 if (cur != ocur)
@@ -11302,7 +11302,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur,
11302 * @param obj the evas object. 11302 * @param obj the evas object.
11303 */ 11303 */
11304static void 11304static void
11305_evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj) 11305_evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj)
11306{ 11306{
11307 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 11307 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
11308 Eina_List *l; 11308 Eina_List *l;
@@ -11328,7 +11328,7 @@ _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj)
11328} 11328}
11329 11329
11330static void 11330static void
11331_evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o) 11331_evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o)
11332{ 11332{
11333 Evas_Object_Textblock_Node_Text *n; 11333 Evas_Object_Textblock_Node_Text *n;
11334 11334
@@ -11351,7 +11351,7 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Handle *cur, const char *_tex
11351 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11351 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11352 evas_object_async_block(obj); 11352 evas_object_async_block(obj);
11353 text = eina_unicode_utf8_to_unicode(_text, &len); 11353 text = eina_unicode_utf8_to_unicode(_text, &len);
11354 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11354 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11355 11355
11356 n = cur->node; 11356 n = cur->node;
11357 if (n) 11357 if (n)
@@ -11453,7 +11453,7 @@ evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Handle *cur, const char *_tex
11453 * @param n the format node to free 11453 * @param n the format node to free
11454 */ 11454 */
11455static void 11455static void
11456_evas_textblock_node_format_free(Efl_Canvas_Text_Data *o, 11456_evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o,
11457 Evas_Object_Textblock_Node_Format *n) 11457 Evas_Object_Textblock_Node_Format *n)
11458{ 11458{
11459 if (!n) return; 11459 if (!n) return;
@@ -11475,7 +11475,7 @@ _evas_textblock_node_format_free(Efl_Canvas_Text_Data *o,
11475 * @return Returns the new format node 11475 * @return Returns the new format node
11476 */ 11476 */
11477static Evas_Object_Textblock_Node_Format * 11477static Evas_Object_Textblock_Node_Format *
11478_evas_textblock_node_format_new(Efl_Canvas_Text_Data *o, const char *_format, 11478_evas_textblock_node_format_new(Efl_Canvas_Textblock_Data *o, const char *_format,
11479 Eina_Bool is_item) 11479 Eina_Bool is_item)
11480{ 11480{
11481 Evas_Object_Textblock_Node_Format *n; 11481 Evas_Object_Textblock_Node_Format *n;
@@ -11624,7 +11624,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Handle *cur,
11624 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11624 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11625 evas_object_async_block(obj); 11625 evas_object_async_block(obj);
11626 if ((!format) || (format[0] == 0)) return EINA_FALSE; 11626 if ((!format) || (format[0] == 0)) return EINA_FALSE;
11627 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11627 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11628 /* We should always have at least one text node */ 11628 /* We should always have at least one text node */
11629 if (!o->text_nodes) 11629 if (!o->text_nodes)
11630 { 11630 {
@@ -11795,7 +11795,7 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Handle *cur)
11795 if (!cur || !cur->node) return; 11795 if (!cur || !cur->node) return;
11796 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 11796 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
11797 evas_object_async_block(obj); 11797 evas_object_async_block(obj);
11798 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 11798 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
11799 n = cur->node; 11799 n = cur->node;
11800 11800
11801 text = eina_ustrbuf_string_get(n->unicode); 11801 text = eina_ustrbuf_string_get(n->unicode);
@@ -11877,7 +11877,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor
11877 if (cur1->obj != cur2->obj) return; 11877 if (cur1->obj != cur2->obj) return;
11878 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); 11878 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
11879 evas_object_async_block(obj); 11879 evas_object_async_block(obj);
11880 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); 11880 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
11881 if (evas_textblock_cursor_compare(cur1, cur2) > 0) 11881 if (evas_textblock_cursor_compare(cur1, cur2) > 0)
11882 { 11882 {
11883 Efl_Text_Cursor_Handle *tc; 11883 Efl_Text_Cursor_Handle *tc;
@@ -11968,7 +11968,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor
11968 evas_textblock_cursor_copy(cur1, o->cursor); 11968 evas_textblock_cursor_copy(cur1, o->cursor);
11969 11969
11970 _evas_textblock_changed(o, cur1->obj); 11970 _evas_textblock_changed(o, cur1->obj);
11971 efl_event_callback_call(cur1->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); 11971 efl_event_callback_call(cur1->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
11972} 11972}
11973 11973
11974EAPI char * 11974EAPI char *
@@ -12417,7 +12417,7 @@ EAPI Eina_Bool
12417evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype) 12417evas_textblock_cursor_geometry_bidi_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch, Evas_Coord *cx2, Evas_Coord *cy2, Evas_Coord *cw2, Evas_Coord *ch2, Evas_Textblock_Cursor_Type ctype)
12418{ 12418{
12419 if (!cur) return EINA_FALSE; 12419 if (!cur) return EINA_FALSE;
12420 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12420 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12421 ASYNC_BLOCK; 12421 ASYNC_BLOCK;
12422 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12422 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12423 12423
@@ -12605,7 +12605,7 @@ evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord
12605 if (!cur) return -1; 12605 if (!cur) return -1;
12606 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12606 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12607 evas_object_async_block(obj); 12607 evas_object_async_block(obj);
12608 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12608 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12609 12609
12610 _relayout_if_needed(cur->obj, o); 12610 _relayout_if_needed(cur->obj, o);
12611 12611
@@ -12684,7 +12684,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat
12684 Eina_Bool previous_format; 12684 Eina_Bool previous_format;
12685 12685
12686 if (!cur) return -1; 12686 if (!cur) return -1;
12687 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12687 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12688 12688
12689 _relayout_if_needed(cur->obj, o); 12689 _relayout_if_needed(cur->obj, o);
12690 12690
@@ -12818,7 +12818,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
12818 if (!cur) return -1; 12818 if (!cur) return -1;
12819 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12819 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12820 evas_object_async_block(obj); 12820 evas_object_async_block(obj);
12821 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12821 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12822 12822
12823 _relayout_if_needed(cur->obj, o); 12823 _relayout_if_needed(cur->obj, o);
12824 12824
@@ -12863,8 +12863,8 @@ evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Handle *start, Evas_Text
12863} 12863}
12864 12864
12865EOLIAN static Eina_Bool 12865EOLIAN static Eina_Bool
12866_efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED, 12866_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED,
12867 Efl_Canvas_Text_Data *pd EINA_UNUSED, 12867 Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
12868 Efl_Text_Cursor *start, Efl_Text_Cursor *end) 12868 Efl_Text_Cursor *start, Efl_Text_Cursor *end)
12869{ 12869{
12870 return evas_textblock_cursor_visible_range_get( 12870 return evas_textblock_cursor_visible_range_get(
@@ -12885,7 +12885,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_
12885 12885
12886 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 12886 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
12887 evas_object_async_block(obj); 12887 evas_object_async_block(obj);
12888 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 12888 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
12889 12889
12890 _relayout_if_needed(cur->obj, o); 12890 _relayout_if_needed(cur->obj, o);
12891 12891
@@ -13088,7 +13088,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
13088 if (!cur) return -1; 13088 if (!cur) return -1;
13089 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 13089 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
13090 evas_object_async_block(obj); 13090 evas_object_async_block(obj);
13091 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 13091 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
13092 13092
13093 _relayout_if_needed(cur->obj, o); 13093 _relayout_if_needed(cur->obj, o);
13094 13094
@@ -13517,7 +13517,7 @@ evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Handle *cu
13517 if (cur1->obj != cur2->obj) return NULL; 13517 if (cur1->obj != cur2->obj) return NULL;
13518 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); 13518 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS);
13519 evas_object_async_block(obj); 13519 evas_object_async_block(obj);
13520 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); 13520 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS);
13521 _relayout_if_needed(cur1->obj, o); 13521 _relayout_if_needed(cur1->obj, o);
13522 13522
13523 if (evas_textblock_cursor_compare(cur1, cur2) > 0) 13523 if (evas_textblock_cursor_compare(cur1, cur2) > 0)
@@ -13610,8 +13610,8 @@ evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Handle *cu
13610} 13610}
13611 13611
13612static Eina_List * 13612static Eina_List *
13613_efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, 13613_efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
13614 Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Handle *cur1, const 13614 Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Handle *cur1, const
13615 Evas_Textblock_Cursor *cur2) 13615 Evas_Textblock_Cursor *cur2)
13616{ 13616{
13617 Evas_Object_Textblock_Line *ln1, *ln2; 13617 Evas_Object_Textblock_Line *ln1, *ln2;
@@ -13689,13 +13689,13 @@ _efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED,
13689EAPI Eina_List * 13689EAPI Eina_List *
13690evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2_obj) 13690evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2_obj)
13691{ 13691{
13692 Efl_Canvas_Text_Data *o; 13692 Efl_Canvas_Textblock_Data *o;
13693 13693
13694 if (!cur1) return NULL; 13694 if (!cur1) return NULL;
13695 13695
13696 o = efl_data_scope_get(cur1->obj, MY_CLASS); 13696 o = efl_data_scope_get(cur1->obj, MY_CLASS);
13697 13697
13698 return _efl_canvas_text_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj); 13698 return _efl_canvas_textblock_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj);
13699} 13699}
13700 13700
13701static Eina_Bool 13701static Eina_Bool
@@ -13709,7 +13709,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Handle *cu
13709 if (!cur) return EINA_FALSE; 13709 if (!cur) return EINA_FALSE;
13710 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); 13710 Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS);
13711 evas_object_async_block(obj); 13711 evas_object_async_block(obj);
13712 Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); 13712 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS);
13713 13713
13714 _relayout_if_needed(cur->obj, o); 13714 _relayout_if_needed(cur->obj, o);
13715 13715
@@ -13762,7 +13762,7 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_
13762 Evas_Object_Textblock_Line *ln; 13762 Evas_Object_Textblock_Line *ln;
13763 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13763 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13764 evas_object_async_block(obj); 13764 evas_object_async_block(obj);
13765 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 13765 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
13766 13766
13767 _relayout_if_needed((Evas_Object *)eo_obj, o); 13767 _relayout_if_needed((Evas_Object *)eo_obj, o);
13768 13768
@@ -13788,7 +13788,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj)
13788 eo_e = evas_object_evas_get(eo_obj); 13788 eo_e = evas_object_evas_get(eo_obj);
13789 evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 13789 evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
13790 evas_object_async_block(obj); 13790 evas_object_async_block(obj);
13791 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 13791 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
13792 if (o->paragraphs) 13792 if (o->paragraphs)
13793 { 13793 {
13794 _paragraphs_free(evas, o, obj, o->paragraphs); 13794 _paragraphs_free(evas, o, obj, o->paragraphs);
@@ -13823,7 +13823,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj)
13823} 13823}
13824 13824
13825EOLIAN static Eina_Size2D 13825EOLIAN static Eina_Size2D
13826_efl_canvas_text_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) 13826_efl_canvas_textblock_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
13827{ 13827{
13828 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 13828 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
13829 evas_object_async_block(obj); 13829 evas_object_async_block(obj);
@@ -13978,7 +13978,7 @@ loop_advance:
13978/* FIXME: doc */ 13978/* FIXME: doc */
13979static void 13979static void
13980_size_native_calc_paragraph_size(const Evas_Object *eo_obj, 13980_size_native_calc_paragraph_size(const Evas_Object *eo_obj,
13981 const Efl_Canvas_Text_Data *o, 13981 const Efl_Canvas_Textblock_Data *o,
13982 Evas_Object_Textblock_Paragraph *par, 13982 Evas_Object_Textblock_Paragraph *par,
13983 Textblock_Position *position, 13983 Textblock_Position *position,
13984 Evas_Coord *_w, Evas_Coord *_h) 13984 Evas_Coord *_w, Evas_Coord *_h)
@@ -14069,7 +14069,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj,
14069} 14069}
14070 14070
14071EOLIAN static Eina_Size2D 14071EOLIAN static Eina_Size2D
14072_efl_canvas_text_size_native_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) 14072_efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o)
14073{ 14073{
14074 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14074 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14075 evas_object_async_block(obj); 14075 evas_object_async_block(obj);
@@ -14107,7 +14107,7 @@ _efl_canvas_text_size_native_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o)
14107} 14107}
14108 14108
14109EOLIAN static void 14109EOLIAN static void
14110_efl_canvas_text_style_insets_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b) 14110_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)
14111{ 14111{
14112 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14112 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14113 evas_object_async_block(obj); 14113 evas_object_async_block(obj);
@@ -14120,7 +14120,7 @@ _efl_canvas_text_style_insets_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o, Eva
14120} 14120}
14121 14121
14122EOLIAN static void 14122EOLIAN static void
14123_efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root) 14123_efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Dbg_Info *root)
14124{ 14124{
14125 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); 14125 efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root);
14126 if (!root) return; 14126 if (!root) return;
@@ -14144,7 +14144,7 @@ _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EIN
14144 14144
14145 { 14145 {
14146 Eina_Size2D size; 14146 Eina_Size2D size;
14147 size = efl_canvas_text_size_formatted_get(eo_obj); 14147 size = efl_canvas_textblock_size_formatted_get(eo_obj);
14148 node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size"); 14148 node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size");
14149 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w); 14149 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w);
14150 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, size.h); 14150 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, size.h);
@@ -14152,7 +14152,7 @@ _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EIN
14152 14152
14153 { 14153 {
14154 Eina_Size2D size; 14154 Eina_Size2D size;
14155 size = efl_canvas_text_size_native_get(eo_obj); 14155 size = efl_canvas_textblock_size_native_get(eo_obj);
14156 node = EFL_DBG_INFO_LIST_APPEND(group, "Native size"); 14156 node = EFL_DBG_INFO_LIST_APPEND(group, "Native size");
14157 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w); 14157 EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w);
14158 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, size.h); 14158 EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, size.h);
@@ -14164,7 +14164,7 @@ static void
14164evas_object_textblock_init(Evas_Object *eo_obj) 14164evas_object_textblock_init(Evas_Object *eo_obj)
14165{ 14165{
14166 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14166 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14167 Efl_Canvas_Text_Data *o; 14167 Efl_Canvas_Textblock_Data *o;
14168 static Eina_Bool linebreak_init = EINA_FALSE; 14168 static Eina_Bool linebreak_init = EINA_FALSE;
14169 14169
14170 if (!linebreak_init) 14170 if (!linebreak_init)
@@ -14187,7 +14187,7 @@ evas_object_textblock_init(Evas_Object *eo_obj)
14187} 14187}
14188 14188
14189EOLIAN static void 14189EOLIAN static void
14190_efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) 14190_efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
14191{ 14191{
14192 evas_object_textblock_free(eo_obj); 14192 evas_object_textblock_free(eo_obj);
14193 efl_destructor(efl_super(eo_obj, MY_CLASS)); 14193 efl_destructor(efl_super(eo_obj, MY_CLASS));
@@ -14196,9 +14196,9 @@ _efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_
14196static void 14196static void
14197evas_object_textblock_free(Evas_Object *eo_obj) 14197evas_object_textblock_free(Evas_Object *eo_obj)
14198{ 14198{
14199 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 14199 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
14200 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 14200 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
14201 Efl_Canvas_Text_Filter_Program *prg; 14201 Efl_Canvas_Textblock_Filter_Program *prg;
14202 Evas_Filter_Data_Binding *db; 14202 Evas_Filter_Data_Binding *db;
14203 User_Style_Entry *use; 14203 User_Style_Entry *use;
14204 14204
@@ -14320,7 +14320,7 @@ _filter_sync_end(Evas_Filter_Context *ctx, Eina_Bool success)
14320static void 14320static void
14321_filter_post_render_cb(void *data) 14321_filter_post_render_cb(void *data)
14322{ 14322{
14323 Efl_Canvas_Text_Filter_Post_Render *post_data = data; 14323 Efl_Canvas_Textblock_Filter_Post_Render *post_data = data;
14324 14324
14325 _filter_sync_end(post_data->ctx, post_data->success); 14325 _filter_sync_end(post_data->ctx, post_data->success);
14326 free(post_data); 14326 free(post_data);
@@ -14329,7 +14329,7 @@ _filter_post_render_cb(void *data)
14329static void 14329static void
14330_filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) 14330_filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success)
14331{ 14331{
14332 Efl_Canvas_Text_Filter_Post_Render *post_data; 14332 Efl_Canvas_Textblock_Filter_Post_Render *post_data;
14333 Evas_Public_Data *evas = data; 14333 Evas_Public_Data *evas = data;
14334 14334
14335 if (!evas_filter_context_async_get(ctx)) 14335 if (!evas_filter_context_async_get(ctx))
@@ -14365,7 +14365,7 @@ _filter_relative_bounding_box_get(const Text_Item_Filter *tif)
14365} 14365}
14366 14366
14367static void 14367static void
14368_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Text_Data *o) 14368_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Textblock_Data *o)
14369{ 14369{
14370 Text_Item_Filter *tif; 14370 Text_Item_Filter *tif;
14371 Eina_Inlist *il; 14371 Eina_Inlist *il;
@@ -14408,7 +14408,7 @@ static inline Evas_Coord_Point
14408_filter_target_position_calc(Evas_Object_Protected_Data *obj, 14408_filter_target_position_calc(Evas_Object_Protected_Data *obj,
14409 Evas_Object_Textblock_Text_Item *ti, int x, int y) 14409 Evas_Object_Textblock_Text_Item *ti, int x, int y)
14410{ 14410{
14411 Efl_Canvas_Text_Filter *filter = ti->parent.format->gfx_filter; 14411 Efl_Canvas_Textblock_Filter *filter = ti->parent.format->gfx_filter;
14412 Evas_Object_Textblock_Line *ln = ti->parent.ln; 14412 Evas_Object_Textblock_Line *ln = ti->parent.ln;
14413 Evas_Coord_Point pt; 14413 Evas_Coord_Point pt;
14414 14414
@@ -14427,7 +14427,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
14427 Evas_Object_Textblock_Paragraph *par, *start = NULL; 14427 Evas_Object_Textblock_Paragraph *par, *start = NULL;
14428 Evas_Object_Textblock_Item *itr; 14428 Evas_Object_Textblock_Item *itr;
14429 Evas_Object_Textblock_Line *ln, *cur_ln = NULL; 14429 Evas_Object_Textblock_Line *ln, *cur_ln = NULL;
14430 Efl_Canvas_Text_Data *o = type_private_data; 14430 Efl_Canvas_Textblock_Data *o = type_private_data;
14431 ASYNC_BLOCK; 14431 ASYNC_BLOCK;
14432 14432
14433 Eina_List *shadows = NULL; 14433 Eina_List *shadows = NULL;
@@ -14732,7 +14732,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
14732 { 14732 {
14733 Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT; 14733 Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT;
14734 Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr); 14734 Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr);
14735 Efl_Canvas_Text_Filter *filter; 14735 Efl_Canvas_Textblock_Filter *filter;
14736 Evas_Filter_Program *pgm; 14736 Evas_Filter_Program *pgm;
14737 Evas_Filter_Context *ctx; 14737 Evas_Filter_Context *ctx;
14738 Evas_Coord_Point target; 14738 Evas_Coord_Point target;
@@ -15129,13 +15129,13 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
15129} 15129}
15130 15130
15131EOLIAN static void 15131EOLIAN static void
15132_efl_canvas_text_efl_canvas_filter_internal_filter_state_prepare( 15132_efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare(
15133 Eo *eo_obj, Efl_Canvas_Text_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data) 15133 Eo *eo_obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data)
15134{ 15134{
15135 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15135 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15136 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXT_CLASS); 15136 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXTBLOCK_CLASS);
15137 Evas_Object_Textblock_Text_Item *ti = data; 15137 Evas_Object_Textblock_Text_Item *ti = data;
15138 Efl_Canvas_Text_Filter_Program *program; 15138 Efl_Canvas_Textblock_Filter_Program *program;
15139 Evas_Filter_Padding pad = {}; 15139 Evas_Filter_Padding pad = {};
15140 15140
15141#define STATE_COLOR(dst, src) dst.r = src.r; dst.g = src.g; dst.b = src.b; dst.a = src.a 15141#define STATE_COLOR(dst, src) dst.r = src.r; dst.g = src.g; dst.b = src.b; dst.a = src.a
@@ -15154,8 +15154,8 @@ _efl_canvas_text_efl_canvas_filter_internal_filter_state_prepare(
15154} 15154}
15155 15155
15156EOLIAN static Eina_Bool 15156EOLIAN static Eina_Bool
15157_efl_canvas_text_efl_canvas_filter_internal_filter_input_render( 15157_efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render(
15158 Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED, void *filter, 15158 Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, void *filter,
15159 void *engine, void *output, void *drawctx, void *data, 15159 void *engine, void *output, void *drawctx, void *data,
15160 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, 15160 int l, int r EINA_UNUSED, int t, int b EINA_UNUSED,
15161 int x, int y, Eina_Bool do_async) 15161 int x, int y, Eina_Bool do_async)
@@ -15171,17 +15171,17 @@ _efl_canvas_text_efl_canvas_filter_internal_filter_input_render(
15171} 15171}
15172 15172
15173EOLIAN static void 15173EOLIAN static void
15174_efl_canvas_text_efl_canvas_filter_internal_filter_dirty( 15174_efl_canvas_textblock_efl_canvas_filter_internal_filter_dirty(
15175 Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED) 15175 Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED)
15176{ 15176{
15177 WRN("Filter marked as dirty. NOT IMPLEMENTED!"); 15177 WRN("Filter marked as dirty. NOT IMPLEMENTED!");
15178} 15178}
15179 15179
15180EOLIAN static void 15180EOLIAN static void
15181_efl_canvas_text_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *code, const char *name) 15181_efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *code, const char *name)
15182{ 15182{
15183 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15183 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15184 Efl_Canvas_Text_Filter_Program *prg; 15184 Efl_Canvas_Textblock_Filter_Program *prg;
15185 15185
15186 prg = _filter_program_find(pd, name); 15186 prg = _filter_program_find(pd, name);
15187 if (prg) 15187 if (prg)
@@ -15192,7 +15192,7 @@ _efl_canvas_text_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Text_D
15192 { 15192 {
15193 prg = calloc(1, sizeof(*prg)); 15193 prg = calloc(1, sizeof(*prg));
15194 prg->name = eina_stringshare_add(name); 15194 prg->name = eina_stringshare_add(name);
15195 pd->gfx_filter.programs = (Efl_Canvas_Text_Filter_Program *) 15195 pd->gfx_filter.programs = (Efl_Canvas_Textblock_Filter_Program *)
15196 eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg)); 15196 eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg));
15197 } 15197 }
15198 eina_stringshare_replace(&prg->code, code); 15198 eina_stringshare_replace(&prg->code, code);
@@ -15205,7 +15205,7 @@ _efl_canvas_text_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Text_D
15205} 15205}
15206 15206
15207EOLIAN static void 15207EOLIAN static void
15208_efl_canvas_text_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED, 15208_efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED,
15209 const char **code EINA_UNUSED, const char **name EINA_UNUSED) 15209 const char **code EINA_UNUSED, const char **name EINA_UNUSED)
15210{ 15210{
15211 // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME 15211 // FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
@@ -15213,7 +15213,7 @@ _efl_canvas_text_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Ef
15213} 15213}
15214 15214
15215static Evas_Filter_Data_Binding * 15215static Evas_Filter_Data_Binding *
15216_filter_data_binding_find(Efl_Canvas_Text_Data *pd, const char *name) 15216_filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name)
15217{ 15217{
15218 Evas_Filter_Data_Binding *db; 15218 Evas_Filter_Data_Binding *db;
15219 15219
@@ -15226,9 +15226,9 @@ _filter_data_binding_find(Efl_Canvas_Text_Data *pd, const char *name)
15226} 15226}
15227 15227
15228EOLIAN static void 15228EOLIAN static void
15229_efl_canvas_text_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Text_Data *pd, const char *name, const char *value, Eina_Bool execute) 15229_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)
15230{ 15230{
15231 Efl_Canvas_Text_Filter_Program *prg; 15231 Efl_Canvas_Textblock_Filter_Program *prg;
15232 Evas_Filter_Data_Binding *db; 15232 Evas_Filter_Data_Binding *db;
15233 15233
15234 if (!name) return; 15234 if (!name) return;
@@ -15274,7 +15274,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Text_Data *p
15274} 15274}
15275 15275
15276EOLIAN static void 15276EOLIAN static void
15277_efl_canvas_text_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name, const char **value, Eina_Bool *execute) 15277_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)
15278{ 15278{
15279 Evas_Filter_Data_Binding *db; 15279 Evas_Filter_Data_Binding *db;
15280 15280
@@ -15291,7 +15291,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_C
15291} 15291}
15292 15292
15293EOLIAN static void 15293EOLIAN static void
15294_efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *name, Efl_Gfx_Entity *eo_source) 15294_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)
15295{ 15295{
15296 Evas_Object_Protected_Data *obj, *source; 15296 Evas_Object_Protected_Data *obj, *source;
15297 Evas_Filter_Proxy_Binding *pb; 15297 Evas_Filter_Proxy_Binding *pb;
@@ -15345,7 +15345,7 @@ _efl_canvas_text_efl_gfx_filter_filter_source_set(Eo *eo_obj, Efl_Canvas_Text_Da
15345} 15345}
15346 15346
15347EOLIAN static Efl_Gfx_Entity * 15347EOLIAN static Efl_Gfx_Entity *
15348_efl_canvas_text_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name) 15348_efl_canvas_textblock_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name)
15349{ 15349{
15350 return eina_hash_find(pd->gfx_filter.sources, name); 15350 return eina_hash_find(pd->gfx_filter.sources, name);
15351} 15351}
@@ -15355,7 +15355,7 @@ evas_object_textblock_coords_recalc(Evas_Object *eo_obj,
15355 Evas_Object_Protected_Data *obj, 15355 Evas_Object_Protected_Data *obj,
15356 void *type_private_data) 15356 void *type_private_data)
15357{ 15357{
15358 Efl_Canvas_Text_Data *o = type_private_data; 15358 Efl_Canvas_Textblock_Data *o = type_private_data;
15359 15359
15360#ifdef BIDI_SUPPORT 15360#ifdef BIDI_SUPPORT
15361 if (o->inherit_paragraph_direction) 15361 if (o->inherit_paragraph_direction)
@@ -15414,7 +15414,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj,
15414 Evas_Object_Protected_Data *obj, 15414 Evas_Object_Protected_Data *obj,
15415 void *type_private_data) 15415 void *type_private_data)
15416{ 15416{
15417 Efl_Canvas_Text_Data *o = type_private_data; 15417 Efl_Canvas_Textblock_Data *o = type_private_data;
15418 ASYNC_BLOCK; 15418 ASYNC_BLOCK;
15419 15419
15420 int is_v, was_v; 15420 int is_v, was_v;
@@ -15539,13 +15539,13 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
15539 Evas_Object_Protected_Data *obj, 15539 Evas_Object_Protected_Data *obj,
15540 void *type_private_data) 15540 void *type_private_data)
15541{ 15541{
15542 Efl_Canvas_Text_Data *o = type_private_data; 15542 Efl_Canvas_Textblock_Data *o = type_private_data;
15543 ASYNC_BLOCK; 15543 ASYNC_BLOCK;
15544 15544
15545 /* this moves the current data to the previous state parts of the object */ 15545 /* this moves the current data to the previous state parts of the object */
15546 /* in whatever way is safest for the object. also if we don't need object */ 15546 /* in whatever way is safest for the object. also if we don't need object */
15547 /* data anymore we can free it if the object deems this is a good idea */ 15547 /* data anymore we can free it if the object deems this is a good idea */
15548/* o = (Efl_Canvas_Text_Data *)(obj->object_data); */ 15548/* o = (Efl_Canvas_Textblock_Data *)(obj->object_data); */
15549 /* remove those pesky changes */ 15549 /* remove those pesky changes */
15550 evas_object_clip_changes_clean(obj); 15550 evas_object_clip_changes_clean(obj);
15551 /* move cur to prev safely for object data */ 15551 /* move cur to prev safely for object data */
@@ -15557,7 +15557,7 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
15557 15557
15558static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj) 15558static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj)
15559{ 15559{
15560 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 15560 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
15561 if (!o) return NULL; 15561 if (!o) return NULL;
15562 return o->engine_data; 15562 return o->engine_data;
15563} 15563}
@@ -15583,8 +15583,8 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
15583} 15583}
15584 15584
15585EOLIAN static void 15585EOLIAN static void
15586_efl_canvas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj, 15586_efl_canvas_textblock_efl_gfx_entity_scale_set(Evas_Object *eo_obj,
15587 Efl_Canvas_Text_Data *o, 15587 Efl_Canvas_Textblock_Data *o,
15588 double scale) 15588 double scale)
15589{ 15589{
15590 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return; 15590 if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return;
@@ -15600,7 +15600,7 @@ void
15600_evas_object_textblock_rehint(Evas_Object *eo_obj) 15600_evas_object_textblock_rehint(Evas_Object *eo_obj)
15601{ 15601{
15602 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 15602 Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
15603 Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); 15603 Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
15604 Evas_Object_Textblock_Paragraph *par; 15604 Evas_Object_Textblock_Paragraph *par;
15605 Evas_Object_Textblock_Line *ln; 15605 Evas_Object_Textblock_Line *ln;
15606