From 621d2cdecf8f53526f1e8ca427bf815086768a28 Mon Sep 17 00:00:00 2001 From: Ali Alzyod Date: Tue, 10 Dec 2019 17:39:59 +0900 Subject: [PATCH] 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 --- NEWS | 2 +- src/bin/elementary/test_gfx_filters.c | 2 +- src/lib/edje/edje_textblock.c | 44 +- .../efl_ui_internal_text_interactive.c | 68 +- .../efl_ui_internal_text_interactive.eo | 2 +- .../efl_ui_internal_text_scroller.c | 6 +- .../efl_ui_internal_text_scroller.eo | 6 +- src/lib/elementary/efl_ui_text.c | 24 +- src/lib/elementary/efl_ui_text.eo | 2 +- .../efl_ui_text_factory_emoticons.c | 2 +- .../efl_ui_text_factory_emoticons.eo | 4 +- .../elementary/efl_ui_text_factory_fallback.c | 8 +- .../efl_ui_text_factory_fallback.eo | 4 +- .../elementary/efl_ui_text_factory_images.c | 2 +- .../elementary/efl_ui_text_factory_images.eo | 4 +- src/lib/evas/Efl_Canvas.h | 4 +- src/lib/evas/Evas_Eo.h | 6 +- .../evas/canvas/efl_canvas_text_eo.legacy.c | 72 --- ...canvas_text.eo => efl_canvas_textblock.eo} | 2 +- .../canvas/efl_canvas_textblock_eo.legacy.c | 72 +++ ...acy.h => efl_canvas_textblock_eo.legacy.h} | 36 +- ...ory.eo => efl_canvas_textblock_factory.eo} | 2 +- ...rnal.h => efl_canvas_textblock_internal.h} | 24 +- .../evas/canvas/efl_text_attribute_factory.c | 4 +- .../evas/canvas/efl_text_attribute_factory.eo | 4 +- src/lib/evas/canvas/efl_text_cursor.c | 4 +- src/lib/evas/canvas/evas_object_textblock.c | 600 +++++++++--------- .../evas/canvas/evas_textblock_hyphenation.x | 4 +- src/lib/evas/canvas/evas_textblock_legacy.h | 12 +- src/lib/evas/canvas/meson.build | 6 +- src/tests/evas/evas_test_textblock.c | 102 +-- 31 files changed, 567 insertions(+), 567 deletions(-) delete mode 100644 src/lib/evas/canvas/efl_canvas_text_eo.legacy.c rename src/lib/evas/canvas/{efl_canvas_text.eo => efl_canvas_textblock.eo} (99%) create mode 100644 src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c rename src/lib/evas/canvas/{efl_canvas_text_eo.legacy.h => efl_canvas_textblock_eo.legacy.h} (89%) rename src/lib/evas/canvas/{efl_canvas_text_factory.eo => efl_canvas_textblock_factory.eo} (94%) rename src/lib/evas/canvas/{efl_canvas_text_internal.h => efl_canvas_textblock_internal.h} (94%) diff --git a/NEWS b/NEWS index 1906fe9bed..3cfa365650 100644 --- a/NEWS +++ b/NEWS @@ -385,7 +385,7 @@ Features: * eo: Add "destruct" event * efl-wl: move to xdg-shell vfinal * wayland: add xdg-shell vfinal support for client-side - * Canvas image: add Efl.Canvas.Text.Factory + use in Ui.Text + * Canvas image: add Efl.Canvas.Textblock.Factory + use in Ui.Text * efl-wl: add functionality for directly passing through xkb objects * ecore-x: add more info to Ecore_X_Event_Xkb event * 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 47e83d7707..eee77afdad 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 // Experimental textblock support o = tb = evas_object_textblock_add(evas_object_evas_get(win)); - efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); + efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL); efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL); Evas_Textblock_Style *st = evas_textblock_style_new(); 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 8b9d97ebe1..76f3b2a8a3 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, if (!minx2) { efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); } else - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r, &ins_t, &ins_b); mw = ins_l + size.w + ins_r; @@ -88,10 +88,10 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep, if (!maxx2) { efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h))); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); } else - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r, &ins_t, &ins_b); mw = ins_l + size.w + ins_r; @@ -180,7 +180,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, if (temp_w > 0) { efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); tw = size.w; th = size.h; @@ -189,7 +189,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, } else { - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); th = size.h; th += ins_t + ins_b; @@ -221,7 +221,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, } efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); tw = size.w; th = size.h; @@ -232,7 +232,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * don't get meaningless height for multiline */ if (temp_w <= 0) { - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); th = size.h; th += ins_t + ins_b; @@ -246,7 +246,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * text.min: 1 X * text.max: 0 X without max width. * It is a singleline Textblock. */ - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); tw = size.w; th = size.h; @@ -311,7 +311,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, if (temp_w > 0) { efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); tw = size.w; th = size.h; @@ -320,7 +320,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, } else { - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); th = size.h; th += ins_t + ins_b; @@ -335,7 +335,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, /* text.min: 1 X * text.max: 1 X * Singleline. */ - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); tw = size.w; th = size.h; @@ -374,7 +374,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * text.max: 1 1 */ efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); tw = size.w; th = size.h; @@ -385,7 +385,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * don't get meaningless height for multiline */ if (temp_w <= 0) { - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); th = size.h; th += ins_t + ins_b; @@ -404,7 +404,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, temp_h = efl_gfx_entity_size_get(ep->object).h; efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h)); - size = efl_canvas_text_size_formatted_get(ep->object); + size = efl_canvas_textblock_size_formatted_get(ep->object); tw = size.w; th = size.h; @@ -415,7 +415,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep, * don't get meaningless height for multiline */ if (temp_w <= 0) { - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); th = size.h; th += ins_t + ins_b; @@ -545,7 +545,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, if (ep->part->scale) base_s = TO_DOUBLE(sc); efl_gfx_entity_scale_set(ep->object, base_s); - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); orig_s = base_s; /* Now make it bigger so calculations will be more accurate @@ -554,7 +554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / size.w); efl_gfx_entity_scale_set(ep->object, orig_s); - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); } if (chosen_desc->text.fit_x) { @@ -563,7 +563,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, orig_s * TO_INT(params->eval.w) / size.w); efl_gfx_entity_scale_set(ep->object, s); - efl_canvas_text_size_native_get(ep->object); + efl_canvas_textblock_size_native_get(ep->object); } } if (chosen_desc->text.fit_y) @@ -580,7 +580,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, } efl_gfx_entity_scale_set(ep->object, s); - efl_canvas_text_size_native_get(ep->object); + efl_canvas_textblock_size_native_get(ep->object); } } @@ -589,7 +589,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, { int i = 5; /* Tries before we give up. */ Eina_Size2D size; - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); /* If we are still too big, try reducing the size to * 95% each try. */ @@ -605,7 +605,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc, s = tmp_s; efl_gfx_entity_scale_set(ep->object, s); - size = efl_canvas_text_size_native_get(ep->object); + size = efl_canvas_textblock_size_native_get(ep->object); i--; } } diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index 0a35d2f795..017f2a884b 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 @@ #include "elm_priv.h" #include "efl_ui_internal_text_interactive.h" -#include "efl_canvas_text_internal.h" +#include "efl_canvas_textblock_internal.h" #define MY_CLASS EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS @@ -52,25 +52,25 @@ static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, E static void _entry_imf_cursor_info_set(Efl_Ui_Internal_Text_Interactive_Data *en); static void -_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text); static Efl_Text_Change_Info * -_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text, const char *fmtpre, const char *fmtpost, Eina_Bool clearsel, Eina_Bool changeinfo); static Efl_Text_Change_Info * -_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, char *text, const char *fmtpre, const char *fmtpost, Eina_Bool clearsel, Eina_Bool changeinfo); static Efl_Text_Change_Info * -_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text, const char *fmtpre, const char *fmtpost, @@ -109,7 +109,7 @@ _preedit_del(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en) static Eina_Bool _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); const char *str; @@ -144,7 +144,7 @@ _return_key_update(Evas_Object *obj) if (sd->input_panel_return_key_state != EFL_INPUT_TEXT_PANEL_RETURN_KEY_STATE_AUTO) return; - if (efl_canvas_text_is_empty_get(obj) == EINA_TRUE) + if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE) return_key_disabled = EINA_TRUE; if (sd->imf_context) @@ -180,7 +180,7 @@ _entry_hide_visible_password(Eo *obj) static void _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); char *commit_str = event_info; Efl_Text_Change_Info *info = NULL; @@ -231,7 +231,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void } static Efl_Text_Change_Info * -_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, char *text, const char *fmtpre, const char *fmtpost, @@ -284,7 +284,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_ } static Efl_Text_Change_Info * -_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text, const char *fmtpre, const char *fmtpost, @@ -313,7 +313,7 @@ _text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti } static Efl_Text_Change_Info * -_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text, const char *fmtpre, const char *fmtpost, @@ -342,7 +342,7 @@ _text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive } static void -_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en, +_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Text_Cursor *c, const char *text) { EINA_SAFETY_ON_NULL_RETURN(text); @@ -416,7 +416,7 @@ _text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti static void _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Efl_Text_Change_Info *info = NULL; @@ -518,12 +518,12 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS { /* set preedit start cursor */ if (!en->preedit_start) - en->preedit_start = efl_canvas_text_cursor_create(obj); + en->preedit_start = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, en->preedit_start); /* set preedit end cursor */ if (!en->preedit_end) - en->preedit_end = efl_canvas_text_cursor_create(obj); + en->preedit_end = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, en->preedit_end); 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 static void _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 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 cursor_pos = efl_text_cursor_position_get(cur); - del_start = efl_canvas_text_cursor_create(obj); + del_start = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_position_set(del_start, cursor_pos + ev->offset); - del_end = efl_canvas_text_cursor_create(obj); + del_end = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_position_set(del_end, cursor_pos + ev->offset + ev->n_chars); start = efl_text_cursor_position_get(del_start); @@ -605,7 +605,7 @@ end: static void _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); 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 static Eina_Bool _entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text) { - Efl_Canvas_Text *obj = data; + Efl_Canvas_Textblock *obj = data; Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); const char *selection_text = NULL; @@ -1106,7 +1106,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void { if (multiline) { - if (shift || efl_canvas_text_newline_as_paragraph_separator_get(obj)) + if (shift || efl_canvas_textblock_newline_as_paragraph_separator_get(obj)) { string = "\n"; } @@ -1193,7 +1193,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void if (control && !en->have_selection) { // del to start of previous word - Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj); + Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(tc, cur); 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 if (control) { // del to end of next word - Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj); + Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(tc, cur); efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END); @@ -1466,20 +1466,20 @@ end: } static void -_cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) +_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy) { Evas_Coord cx, cy; Evas_Coord x, y, lh = 0, cly = 0; Efl_Text_Cursor *line_cur; Efl_Text_Cursor *tc; - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); evas_object_geometry_get(obj, &x, &y, NULL, NULL); cx = canvasx - x; cy = canvasy - y; - line_cur = efl_canvas_text_cursor_create(obj); + line_cur = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST); evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, &lh); /* 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 { if (shift) { - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); if (efl_text_cursor_compare(cur, en->sel_start) < 0) 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 en->have_selection = EINA_FALSE; en->selecting = EINA_FALSE; _sel_clear(obj, en); - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START); _sel_init(cur, obj, en); @@ -1564,7 +1564,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN { if (shift) { - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); if (efl_text_cursor_compare(cur, en->sel_start) < 0) 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 en->have_selection = EINA_FALSE; en->selecting = EINA_FALSE; _sel_clear(obj, en); - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START); _sel_init(cur, obj, en); @@ -1679,7 +1679,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo if (en->selecting) { - tc = efl_canvas_text_cursor_create(obj); + tc = efl_canvas_textblock_cursor_create(obj); efl_text_cursor_copy(cur, tc); evas_object_geometry_get(obj, &x, &y, &w, &h); cx = ev->cur.canvas.x - x; @@ -1733,9 +1733,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, NULL); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, NULL); - en->main_cursor = efl_canvas_text_cursor_create(obj); - en->sel_start = efl_canvas_text_cursor_create(obj); - en->sel_end = efl_canvas_text_cursor_create(obj); + en->main_cursor = efl_canvas_textblock_cursor_create(obj); + en->sel_start = efl_canvas_textblock_cursor_create(obj); + en->sel_end = efl_canvas_textblock_cursor_create(obj); efl_event_callback_add(efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_EVENT_CHANGED, _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 8c8a4cd1f1..44e871cb9b 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 @@ -class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Text implements Efl.Text_Interactive, Efl.Input_Text +class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text { [[An internal object in charge of the interactive aspect of the text widget. diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.c b/src/lib/elementary/efl_ui_internal_text_scroller.c index f5e366deb0..3387759e38 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 @@ typedef struct _Efl_Ui_Internal_Text_Scroller_Data { - Efl_Canvas_Text *text_obj; + Efl_Canvas_Textblock *text_obj; Efl_Ui_Table *text_table; Eo *smanager; @@ -101,7 +101,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj, efl_event_freeze(sd->text_obj); efl_gfx_entity_size_set(sd->text_table, view.size); efl_gfx_entity_size_set(sd->text_obj, view.size); - fsz = efl_canvas_text_size_formatted_get(sd->text_obj); + fsz = efl_canvas_textblock_size_formatted_get(sd->text_obj); efl_gfx_entity_size_set(sd->text_table, sz); efl_gfx_entity_size_set(sd->text_obj, sz); efl_event_thaw(sd->text_obj); @@ -152,7 +152,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj, EOLIAN static void _efl_ui_internal_text_scroller_initialize(Eo *obj, Efl_Ui_Internal_Text_Scroller_Data *sd, - Efl_Canvas_Text *text_obj, + Efl_Canvas_Textblock *text_obj, Efl_Ui_Table *text_table) { 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 3108000d83..b616674944 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 [[Internal-usage text scroller class. This class is a special scroller that evaluates its size based on the - @Efl.Canvas.Text object it holds. On initialization the object is meant + @Efl.Canvas.Textblock object it holds. On initialization the object is meant to be passed along a container (so that other objects such as a "guide hint" text object are store in such container. ]] @@ -32,11 +32,11 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller } } initialize { - [[The Efl.Canvas.Text content of this scroller. + [[The Efl.Canvas.Textblock content of this scroller. This should be called upon constructing the object. ]] params { - text_obj: Efl.Canvas.Text; [[The text object to query]] + text_obj: Efl.Canvas.Textblock; [[The text object to query]] text_table: Efl.Ui.Table; [[The table container of the $text_obj]] } diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index e716f25aac..c65d59017d 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -18,7 +18,7 @@ #include "elm_hoversel_eo.h" #include "efl_ui_text_part.eo.h" #include "elm_part_helper.h" -#include "efl_canvas_text_internal.h" +#include "efl_canvas_textblock_internal.h" typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data; typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle; @@ -65,8 +65,8 @@ struct _Efl_Ui_Text_Data int gen; Eina_List *sel; Eina_List *items; /** context menu item list */ - Efl_Canvas_Text_Factory *item_factory; - Efl_Canvas_Text_Factory *item_fallback_factory; + Efl_Canvas_Textblock_Factory *item_factory; + Efl_Canvas_Textblock_Factory *item_fallback_factory; Eina_List *markup_filters; Ecore_Job *hov_deljob; 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) efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0)); /* ignore current object size for single-line since we always need to know the actual size */ if (!efl_text_multiline_get(obj)) - min = efl_canvas_text_size_native_get(sd->text_obj); + min = efl_canvas_textblock_size_native_get(sd->text_obj); else - min = efl_canvas_text_size_formatted_get(sd->text_obj); + min = efl_canvas_textblock_size_formatted_get(sd->text_obj); efl_gfx_entity_size_set(sd->text_obj, text_sz); efl_event_thaw(sd->text_obj); min.w += edmin.w; @@ -1485,11 +1485,11 @@ _item_get(void *data, const char *item) { if (sd->item_factory) { - o = efl_canvas_text_factory_create(sd->item_factory, data, item); + o = efl_canvas_textblock_factory_create(sd->item_factory, data, item); } else if (sd->item_fallback_factory) { - o = efl_canvas_text_factory_create(sd->item_fallback_factory, + o = efl_canvas_textblock_factory_create(sd->item_fallback_factory, data, item); } } @@ -1967,7 +1967,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd) efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_UNDO_REQUEST, obj); efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_PREEDIT_CHANGED, obj); sd->text_obj = text_obj; - sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj); + sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj); sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj); efl_composite_attach(obj, text_obj); @@ -2028,7 +2028,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj, (sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL); efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, _efl_ui_text_changed_user_cb, obj); - efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, + efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, _efl_ui_text_changed_cb, obj); efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED, _efl_ui_text_selection_start_clear_cb, obj); @@ -3337,8 +3337,8 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd) sd->gen++; - start = efl_canvas_text_cursor_create(sd->text_obj); - end = efl_canvas_text_cursor_create(sd->text_obj); + start = efl_canvas_textblock_cursor_create(sd->text_obj); + end = efl_canvas_textblock_cursor_create(sd->text_obj); /* Retrieve all annotations in the text. */ 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, static void _efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd, - Efl_Canvas_Text_Factory *item_factory) + Efl_Canvas_Textblock_Factory *item_factory) { if (pd->item_factory) efl_unref(pd->item_factory); 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 785fe34294..935c7f57d1 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 "emoticon/happy" or "href=file://image.jpg" etc. ]] values { - item_factory: Efl.Canvas.Text_Factory; [[Factory to create items]] + item_factory: Efl.Canvas.Textblock_Factory; [[Factory to create items]] } } 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 f66c99dd2f..6d61fe37c8 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 }; EOLIAN static Efl_Canvas_Object -*_efl_ui_text_factory_emoticons_efl_canvas_text_factory_create( +*_efl_ui_text_factory_emoticons_efl_canvas_textblock_factory_create( Eo *obj EINA_UNUSED, Efl_Ui_Text_Factory_Emoticons_Data *pd EINA_UNUSED, 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 903f449d6b..9265cc5931 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 @@ -class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Text_Factory +class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Textblock_Factory { [[Factory that creates emoticons from the current theme given a key. ]] implements { - Efl.Canvas.Text_Factory.create; + Efl.Canvas.Textblock_Factory.create; } } diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.c b/src/lib/elementary/efl_ui_text_factory_fallback.c index 3568ba917f..048b8aea08 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 struct _Efl_Ui_Text_Factory_Fallback_Data { - Efl_Canvas_Text_Factory *emoticon_factory, *image_factory; + Efl_Canvas_Textblock_Factory *emoticon_factory, *image_factory; }; EOLIAN static Eo * @@ -34,7 +34,7 @@ _efl_ui_text_factory_fallback_efl_object_destructor(Eo *obj, EOLIAN static Efl_Canvas_Object -*_efl_ui_text_factory_fallback_efl_canvas_text_factory_create( +*_efl_ui_text_factory_fallback_efl_canvas_textblock_factory_create( Eo *obj EINA_UNUSED, Efl_Ui_Text_Factory_Fallback_Data *pd EINA_UNUSED, Efl_Canvas_Object *object, @@ -48,11 +48,11 @@ EOLIAN static Efl_Canvas_Object if (key && !strncmp(key, "file://", 7)) { const char *fname = key + 7; - o = efl_canvas_text_factory_create(pd->image_factory, object, fname); + o = efl_canvas_textblock_factory_create(pd->image_factory, object, fname); } else { - o = efl_canvas_text_factory_create(pd->emoticon_factory, object, key); + o = efl_canvas_textblock_factory_create(pd->emoticon_factory, object, key); } return o; } diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.eo b/src/lib/elementary/efl_ui_text_factory_fallback.eo index f41352bee8..1af32930a6 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 @@ -class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Text_Factory +class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Textblock_Factory { [[Internal factory for fallback cases. @@ -10,6 +10,6 @@ class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canva implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Canvas.Text_Factory.create; + Efl.Canvas.Textblock_Factory.create; } } diff --git a/src/lib/elementary/efl_ui_text_factory_images.c b/src/lib/elementary/efl_ui_text_factory_images.c index 38529e43a9..55b8978534 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, } EOLIAN static Efl_Canvas_Object * -_efl_ui_text_factory_images_efl_canvas_text_factory_create(Eo *obj EINA_UNUSED, +_efl_ui_text_factory_images_efl_canvas_textblock_factory_create(Eo *obj EINA_UNUSED, Efl_Ui_Text_Factory_Images_Data *pd EINA_UNUSED, Efl_Canvas_Object *object, 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 eecc69cb91..42ddf1398a 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 @@ -class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Text_Factory +class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Textblock_Factory { [[Factory that creates images given key string @@ -62,6 +62,6 @@ class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas. implements { Efl.Object.constructor; Efl.Object.destructor; - Efl.Canvas.Text_Factory.create; + Efl.Canvas.Textblock_Factory.create; } } diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h index ed300478e0..53bc52cfb1 100644 --- a/src/lib/evas/Efl_Canvas.h +++ b/src/lib/evas/Efl_Canvas.h @@ -85,8 +85,8 @@ extern "C" { #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 9d873d565d..4d42740252 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 */ /** - * @ingroup Efl_Canvas_Text + * @ingroup Efl_Canvas_Textblock * * @{ */ #include "canvas/efl_text_cursor.eo.h" #include "canvas/efl_text_attribute_factory.eo.h" -#include "canvas/efl_canvas_text.eo.h" -#include "canvas/efl_canvas_text_factory.eo.h" +#include "canvas/efl_canvas_textblock.eo.h" +#include "canvas/efl_canvas_textblock_factory.eo.h" /** * @} */ 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 f2ee487218..0000000000 --- a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.c +++ /dev/null @@ -1,72 +0,0 @@ - -EAPI Eina_Bool -evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end) -{ - return evas_textblock_cursor_visible_range_get(start, end); -} - -EAPI void -evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *l, int *r, int *t, int *b) -{ - efl_canvas_text_style_insets_get(obj, l, r, t, b); -} - -EAPI void -evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim) -{ - efl_canvas_text_bidi_delimiters_set(obj, delim); -} - -EAPI const char * -evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj) -{ - return efl_canvas_text_bidi_delimiters_get(obj); -} - -EAPI void -evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode) -{ - efl_canvas_text_newline_as_paragraph_separator_set(obj, mode); -} - -EAPI Eina_Bool -evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj) -{ - return efl_canvas_text_newline_as_paragraph_separator_get(obj); -} - -EAPI void -evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *w, int *h) -{ - Eina_Size2D size; - size = efl_canvas_text_size_formatted_get(obj); - if (w) *w = size.w; - if (h) *h = size.h; -} - -EAPI void -evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *w, int *h) -{ - Eina_Size2D size; - size = efl_canvas_text_size_native_get(obj); - if (w) *w = size.w; - if (h) *h = size.h; -} - -EAPI Eina_Bool -evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs) -{ - return efl_canvas_text_obstacle_add(obj, eo_obs); -} - -EAPI Eina_Bool -evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs) -{ - return efl_canvas_text_obstacle_del(obj, eo_obs); -} - -EAPI void -evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj) -{ - efl_canvas_text_obstacles_update(obj); -} diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo similarity index 99% rename from src/lib/evas/canvas/efl_canvas_text.eo rename to src/lib/evas/canvas/efl_canvas_textblock.eo index 25153c2bdd..5d38ecfe6c 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_textblock.eo @@ -1,6 +1,6 @@ import efl_text_types; -class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text, +class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text, Efl.Canvas.Filter.Internal, Efl.Text_Font, Efl.Text_Style, Efl.Text_Format, 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 0000000000..26c9341695 --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.c @@ -0,0 +1,72 @@ + +EAPI Eina_Bool +evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end) +{ + return evas_textblock_cursor_visible_range_get(start, end); +} + +EAPI void +evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b) +{ + efl_canvas_textblock_style_insets_get(obj, l, r, t, b); +} + +EAPI void +evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim) +{ + efl_canvas_textblock_bidi_delimiters_set(obj, delim); +} + +EAPI const char * +evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj) +{ + return efl_canvas_textblock_bidi_delimiters_get(obj); +} + +EAPI void +evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode) +{ + efl_canvas_textblock_newline_as_paragraph_separator_set(obj, mode); +} + +EAPI Eina_Bool +evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj) +{ + return efl_canvas_textblock_newline_as_paragraph_separator_get(obj); +} + +EAPI void +evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h) +{ + Eina_Size2D size; + size = efl_canvas_textblock_size_formatted_get(obj); + if (w) *w = size.w; + if (h) *h = size.h; +} + +EAPI void +evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h) +{ + Eina_Size2D size; + size = efl_canvas_textblock_size_native_get(obj); + if (w) *w = size.w; + if (h) *h = size.h; +} + +EAPI Eina_Bool +evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs) +{ + return efl_canvas_textblock_obstacle_add(obj, eo_obs); +} + +EAPI Eina_Bool +evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs) +{ + return efl_canvas_textblock_obstacle_del(obj, eo_obs); +} + +EAPI void +evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj) +{ + efl_canvas_textblock_obstacles_update(obj); +} diff --git a/src/lib/evas/canvas/efl_canvas_text_eo.legacy.h b/src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h similarity index 89% rename from src/lib/evas/canvas/efl_canvas_text_eo.legacy.h rename to src/lib/evas/canvas/efl_canvas_textblock_eo.legacy.h index e527595a71..6b33674194 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 @@ -#ifndef _EFL_CANVAS_TEXT_EO_LEGACY_H_ -#define _EFL_CANVAS_TEXT_EO_LEGACY_H_ +#ifndef _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_ +#define _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_ -#ifndef _EFL_CANVAS_TEXT_EO_CLASS_TYPE -#define _EFL_CANVAS_TEXT_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE +#define _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Text; +typedef Eo Efl_Canvas_Textblock; #endif -#ifndef _EFL_CANVAS_TEXT_EO_TYPES -#define _EFL_CANVAS_TEXT_EO_TYPES +#ifndef _EFL_CANVAS_TEXTBLOCK_EO_TYPES +#define _EFL_CANVAS_TEXTBLOCK_EO_TYPES #endif @@ -32,7 +32,7 @@ typedef Eo Efl_Canvas_Text; * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end); +EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *left, int *right, int *top, int *bottom); +EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim); +EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj); +EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode); +EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj); +EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj); @@ -133,7 +133,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *o * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *width, int *height); +EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height); /** * @brief The native width and height. @@ -161,7 +161,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, i * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *width, int *height); +EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height); @@ -183,7 +183,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs); +EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs); +EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs); /** * @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 * * @ingroup Evas_Object_Textblock_Group */ -EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj); +EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj); #endif diff --git a/src/lib/evas/canvas/efl_canvas_text_factory.eo b/src/lib/evas/canvas/efl_canvas_textblock_factory.eo similarity index 94% rename from src/lib/evas/canvas/efl_canvas_text_factory.eo rename to src/lib/evas/canvas/efl_canvas_textblock_factory.eo index 13d593ea0e..527c8f0a07 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 @@ -interface @beta Efl.Canvas.Text_Factory +interface @beta Efl.Canvas.Textblock_Factory { [[Object factory that creates Efl.Canvas.Object objects. diff --git a/src/lib/evas/canvas/efl_canvas_text_internal.h b/src/lib/evas/canvas/efl_canvas_textblock_internal.h similarity index 94% rename from src/lib/evas/canvas/efl_canvas_text_internal.h rename to src/lib/evas/canvas/efl_canvas_textblock_internal.h index 9871008d5a..a4f03fcef8 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 @@ -#ifndef _EFL_CANVAS_TEXT_INTERNAL_H -#define _EFL_CANVAS_TEXT_INTERNAL_H +#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H +#define _EFL_CANVAS_TEXTBLOCK_INTERNAL_H #include @@ -11,10 +11,10 @@ /* private struct for textblock object internal data */ /** * @internal - * @typedef Efl_Canvas_Text_Data + * @typedef Efl_Canvas_Textblock_Data * The actual textblock object. */ -typedef struct _Evas_Object_Textblock Efl_Canvas_Text_Data; +typedef struct _Evas_Object_Textblock Efl_Canvas_Textblock_Data; /** * @internal * @typedef Evas_Object_Style_Tag @@ -89,22 +89,22 @@ typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Itera typedef struct _Efl_Text_Attribute_Handle_Iterator Efl_Text_Attribute_Handle_Iterator; /** * @internal - * @typedef Efl_Canvas_Text_Filter + * @typedef Efl_Canvas_Textblock_Filter * A structure holding gfx filter information for a text item */ -typedef struct _Efl_Canvas_Text_Filter Efl_Canvas_Text_Filter; +typedef struct _Efl_Canvas_Textblock_Filter Efl_Canvas_Textblock_Filter; /** * @internal - * @typedef Efl_Canvas_Text_Filter_Post_Render + * @typedef Efl_Canvas_Textblock_Filter_Post_Render * Post-render data for async rendering of gfx filters */ -typedef struct _Efl_Canvas_Text_Filter_Post_Render Efl_Canvas_Text_Filter_Post_Render; +typedef struct _Efl_Canvas_Textblock_Filter_Post_Render Efl_Canvas_Textblock_Filter_Post_Render; /** * @internal - * @typedef Efl_Canvas_Text_Filter_Program + * @typedef Efl_Canvas_Textblock_Filter_Program * Filter name - code database */ -typedef struct _Efl_Canvas_Text_Filter_Program Efl_Canvas_Text_Filter_Program; +typedef struct _Efl_Canvas_Textblock_Filter_Program Efl_Canvas_Textblock_Filter_Program; /** * @internal * @typedef Text_Item_Filter @@ -235,7 +235,7 @@ _evas_textblock_annotations_set(Evas_Object *eo_obj, const char *format, Eina_Bool is_item); void -_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Text_Data *o, +_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Attribute_Handle *an, Eina_Bool remove_nodes, Eina_Bool invalidate); void @@ -312,4 +312,4 @@ EAPI Efl_Text_Cursor_Handle *efl_text_cursor_handle_get(const Eo *obj); #undef EAPI #define EAPI -#endif//#ifndef _EFL_CANVAS_TEXT_INTERNAL_H +#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 2e01ee8cae..72e8b2a395 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 @@ //#define EFL_BETA_API_SUPPORT #include "evas_common_private.h" #include "evas_private.h" -#include "efl_canvas_text_internal.h" +#include "efl_canvas_textblock_internal.h" #include "efl_text_cursor.eo.h" #define MY_CLASS EFL_TEXT_ATTRIBUTE_FACTORY_CLASS @@ -23,7 +23,7 @@ _efl_text_attribute_factory_attribute_insert(const Efl_Text_Cursor *start, const _evas_textblock_annotations_insert(eo_obj, efl_text_cursor_handle_get(start), efl_text_cursor_handle_get(end), format, EINA_FALSE); - efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } EOLIAN 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 6ff08c3b71..4c4ac956b6 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 { Attributes can be assigned to character ranges, selected using two @Efl.Text.Cursor instances. Cursor instances are already bound to a text object so there's no need to provide it to this class. - Style is specified using format strings as described in @Efl.Canvas.Text.style_apply. + Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply. There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods.]] methods { @@ -15,7 +15,7 @@ abstract @beta Efl.Text.Attribute.Factory extends Efl.Object { The $format will be applied to the given range. The passed cursors must belong to same textObject, else insertion will be ignored. - Passed format parameter uses same format as style in @Efl.Canvas.Text.style_apply. + Passed format parameter uses same format as style in @Efl.Canvas.Textblock.style_apply. ]] params { 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 11ab175d59..9a8a4777a8 100644 --- a/src/lib/evas/canvas/efl_text_cursor.c +++ b/src/lib/evas/canvas/efl_text_cursor.c @@ -1,6 +1,6 @@ #include "evas_common_private.h" #include "evas_private.h" -#include "efl_canvas_text_internal.h" +#include "efl_canvas_textblock_internal.h" #define MY_CLASS EFL_TEXT_CURSOR_CLASS #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 { Efl_Text_Cursor_Data *pd = efl_data_scope_get(cursor, MY_CLASS); Efl_Text_Cursor_Handle *handle = NULL; - if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXT_CLASS)) + if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXTBLOCK_CLASS)) { pd->text_obj = text_obj; 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 06c559688d..c09418d4be 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -68,12 +68,12 @@ #include "evas_private.h" #include "efl_text_cursor.eo.h" #include "Efl.h" -#include "efl_canvas_text_internal.h" +#include "efl_canvas_textblock_internal.h" //#define LYDBG(f, args...) printf(f, ##args) #define LYDBG(f, args...) -#define MY_CLASS EFL_CANVAS_TEXT_CLASS +#define MY_CLASS EFL_CANVAS_TEXTBLOCK_CLASS #define MY_CLASS_NAME "Efl Canvas Text" @@ -323,7 +323,7 @@ struct _Evas_Object_Textblock_Format_Item struct _Text_Item_Filter { EINA_INLIST; /**< list on the tb object */ - Efl_Canvas_Text_Data *textblock; + Efl_Canvas_Textblock_Data *textblock; Evas_Object_Textblock_Text_Item *ti; /**< associated text item. if null, it was deleted */ Evas_Filter_Context *ctx; /**< running context for the filter */ Evas_Public_Data *evas; /**< evas instance */ @@ -331,7 +331,7 @@ struct _Text_Item_Filter Eina_Bool do_async; /**< do_async flag when running the filter */ }; -struct _Efl_Canvas_Text_Filter +struct _Efl_Canvas_Textblock_Filter { Eina_Stringshare *name; Evas_Object *eo_obj; @@ -342,13 +342,13 @@ struct _Efl_Canvas_Text_Filter Eina_Bool redraw; }; -struct _Efl_Canvas_Text_Filter_Post_Render +struct _Efl_Canvas_Textblock_Filter_Post_Render { Evas_Filter_Context *ctx; Eina_Bool success; }; -struct _Efl_Canvas_Text_Filter_Program +struct _Efl_Canvas_Textblock_Filter_Program { EINA_INLIST; Eina_Stringshare *name; @@ -378,7 +378,7 @@ struct _Evas_Object_Textblock_Format struct { int l, r; } margin; /**< Left and right margin width. */ - Efl_Canvas_Text_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */ + Efl_Canvas_Textblock_Filter *gfx_filter; /**< Gfx Filter to apply to the children text items */ int ref; /**< Value of the ref. */ int tabstops; /**< Value of the size of the tab character. */ int linesize; /**< Value of the size of the line of the text. */ @@ -404,7 +404,7 @@ struct _Evas_Object_Textblock_Format Evas_Textblock_Align_Auto halign_auto : 2; /**< Auto horizontal align mode */ }; -struct _Efl_Canvas_Text_Style +struct _Efl_Canvas_Textblock_Style { const char *style_text; const char *default_tag; @@ -490,7 +490,7 @@ struct _Evas_Object_Textblock Eina_Bool valid : 1; } formatted, native; struct { - Efl_Canvas_Text_Filter_Program *programs; + Efl_Canvas_Textblock_Filter_Program *programs; Evas_Filter_Data_Binding *data_bindings; Eina_Hash *sources; Text_Item_Filter *text_items; // inlist @@ -552,7 +552,7 @@ static int evas_object_textblock_was_opaque(Evas_Object *eo_obj, static void evas_object_textblock_coords_recalc(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data); -static void _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Text_Data *o); +static void _canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o); static const Evas_Object_Func object_func = { @@ -582,28 +582,28 @@ static const Evas_Object_Func object_func = MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ return; \ MAGIC_CHECK_END(); \ - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); #define TB_HEAD_RETURN(x) \ MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); \ return (x); \ MAGIC_CHECK_END(); static Eina_Bool _evas_textblock_cursor_is_at_the_end(const Efl_Text_Cursor_Handle *cur); -static void _evas_textblock_node_text_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *n); +static void _evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n); static Evas_Object_Textblock_Node_Format *_evas_textblock_cursor_node_format_before_or_at_pos_get(const Efl_Text_Cursor_Handle *cur); static size_t _evas_textblock_node_format_pos_get(const Evas_Object_Textblock_Node_Format *fmt); -static void _evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment); -static void _evas_textblock_node_format_free(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n); +static void _evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment); +static void _evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n); static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n); -static void _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj); -static void _evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o); +static void _evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj); +static void _evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o); static void _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset); -static 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); +static 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); static Eina_Bool _evas_textblock_cursor_format_is_visible_get(const Efl_Text_Cursor_Handle *cur); static void _evas_textblock_cursor_at_format_set(Efl_Text_Cursor_Handle *cur, const Evas_Object_Textblock_Node_Format *fmt); -static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Format *fmt); -static 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); +static Evas_Filter_Program *_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt); +static 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); #ifdef HAVE_HYPHEN /* Hyphenation */ #include "evas_textblock_hyphenation.x" @@ -791,7 +791,7 @@ _style_match_tag(const Evas_Textblock_Style *ts, const char *s, size_t tag_len) static void _nodes_clear(const Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); /* First, clear all annotations that may have spawned format nodes. */ _evas_textblock_annotations_clear(eo_obj); @@ -861,7 +861,7 @@ _image_safe_unref(Evas_Public_Data *e, void *image, Eina_Bool async) */ static void _item_free(Evas_Public_Data *evas, - Efl_Canvas_Text_Data *o, + Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *evas_o, Evas_Object_Textblock_Line *ln, Evas_Object_Textblock_Item *it) { @@ -1433,7 +1433,7 @@ _style_string_split(const char *str, char* part1, char* part2) #define FORMAT_SHADOW_SET(evas, efl) {fmt->style = evas; if (set_default) _FMT_INFO(effect) = efl;} void -_format_shadow_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Text_Data *o) +_format_shadow_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Textblock_Data *o) { if (!strcmp(str, "shadow")) 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 #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;} void -_format_shadow_direction_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Text_Data *o) +_format_shadow_direction_set(Evas_Object_Textblock_Format *fmt, char *str, Eina_Bool set_default, Efl_Canvas_Textblock_Data *o) { if (!strcmp(str, "bottom_right")) FORMAT_SHADOW_DIRECTION_SET(BOTTOM_RIGHT) @@ -2222,7 +2222,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch } else if (cmd == text_valignstr) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); char *endptr = NULL; double val = strtod(param, &endptr); o->valign = val; @@ -2650,7 +2650,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch fmt->ellipsis = -1.0; else { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); o->have_ellipsis = 1; } } @@ -2677,7 +2677,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch } else if (cmd == replacement_charstr) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); eina_stringshare_replace(&o->repch, param); } else if (cmd == underline_dash_widthstr) @@ -2738,7 +2738,7 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch * @endcode */ if (!fmt->gfx_filter) - fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); + fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter)); eina_stringshare_replace(&fmt->gfx_filter->name, param); } } @@ -2758,7 +2758,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, { EINA_SAFETY_ON_NULL_RETURN_VAL(param, EINA_FALSE); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); int len = _format_clean_param(param); Eina_Bool changed = EINA_FALSE; const char * font_prefix = "font_"; @@ -2870,7 +2870,7 @@ _default_format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, else if (cmd == gfx_filterstr) { if (!fmt->gfx_filter) - fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); + fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter)); eina_stringshare_replace(&fmt->gfx_filter->name, param); eina_stringshare_replace(&(_FMT_INFO(gfx_filter_name)), param); } @@ -3191,7 +3191,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char if (is_default_format == EINA_TRUE && changed) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _canvas_text_format_changed(eo_obj, o); } @@ -3215,7 +3215,7 @@ _format_fill(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const char static char * _format_string_get(const Eo *eo_obj, Evas_Object_Textblock_Format *fmt) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Eina_Strbuf *format_buffer = eina_strbuf_new(); //format info @@ -3539,7 +3539,7 @@ typedef struct _Ctxt Ctxt; struct _Ctxt { Evas_Object *obj; - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; Evas_Object_Protected_Data *evas_o; Evas_Public_Data *evas; @@ -3755,7 +3755,7 @@ _layout_line_new(Ctxt *c, Evas_Object_Textblock_Format *fmt) } static inline Evas_Object_Textblock_Paragraph * -_layout_find_paragraph_by_y(Efl_Canvas_Text_Data *o, Evas_Coord y) +_layout_find_paragraph_by_y(Efl_Canvas_Textblock_Data *o, Evas_Coord y) { Evas_Object_Textblock_Paragraph *start, *par; int i; @@ -3781,7 +3781,7 @@ _layout_find_paragraph_by_y(Efl_Canvas_Text_Data *o, Evas_Coord y) } static inline Evas_Object_Textblock_Paragraph * -_layout_find_paragraph_by_line_no(Efl_Canvas_Text_Data *o, int line_no) +_layout_find_paragraph_by_line_no(Efl_Canvas_Textblock_Data *o, int line_no) { Evas_Object_Textblock_Paragraph *start, *par; int i; @@ -3862,7 +3862,7 @@ _layout_paragraph_new(Ctxt *c, Evas_Object_Textblock_Node_Text *n, * @param par The paragraph to update */ static inline void -_layout_update_bidi_props(const Efl_Canvas_Text_Data *o, +_layout_update_bidi_props(const Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Paragraph *par) { if (par->text_node) @@ -3912,7 +3912,7 @@ _layout_update_bidi_props(const Efl_Canvas_Text_Data *o, */ static void _paragraph_clear(Evas_Public_Data *evas, - Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, + Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, Evas_Object_Textblock_Paragraph *par) { while (par->lines) @@ -3949,7 +3949,7 @@ _paragraph_clear(Evas_Public_Data *evas, */ static void _paragraph_free(Evas_Public_Data *evas, - Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, + Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, Evas_Object_Textblock_Paragraph *par) { _paragraph_clear(evas, o, obj, par); @@ -4002,7 +4002,7 @@ _paragraphs_clear(Ctxt *c) */ static void _paragraphs_free(Evas_Public_Data *evas, - Efl_Canvas_Text_Data *o, Evas_Object_Protected_Data *obj, + Efl_Canvas_Textblock_Data *o, Evas_Object_Protected_Data *obj, Evas_Object_Textblock_Paragraph *pars) { o->num_paragraphs = 0; @@ -4029,7 +4029,7 @@ static Evas_Object_Textblock_Format * _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, Evas_Object_Textblock_Node_Format *fnode) { - Efl_Canvas_Text_Data *o = c->o; + Efl_Canvas_Textblock_Data *o = c->o; if (fmt) { @@ -4078,7 +4078,7 @@ _layout_format_push(Ctxt *c, Evas_Object_Textblock_Format *fmt, { if (!fmt->gfx_filter) { - fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Text_Filter)); + fmt->gfx_filter = calloc(1, sizeof(Efl_Canvas_Textblock_Filter)); eina_stringshare_replace(&fmt->gfx_filter->name, _FMT_INFO(gfx_filter_name)); } @@ -5250,10 +5250,10 @@ _format_finalize(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt) evas_font_free(of); } -static Efl_Canvas_Text_Filter_Program * -_filter_program_find(Efl_Canvas_Text_Data *o, const char *name) +static Efl_Canvas_Textblock_Filter_Program * +_filter_program_find(Efl_Canvas_Textblock_Data *o, const char *name) { - Efl_Canvas_Text_Filter_Program *prg; + Efl_Canvas_Textblock_Filter_Program *prg; if (!name) return NULL; EINA_INLIST_FOREACH(o->gfx_filter.programs, prg) @@ -5266,10 +5266,10 @@ _filter_program_find(Efl_Canvas_Text_Data *o, const char *name) } static Evas_Filter_Program * -_format_filter_program_get(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Format *fmt) +_format_filter_program_get(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Format *fmt) { - Efl_Canvas_Text_Filter_Program *program; - Efl_Canvas_Text_Filter *filter; + Efl_Canvas_Textblock_Filter_Program *program; + Efl_Canvas_Textblock_Filter *filter; Evas_Filter_Program *pgm; filter = fmt->gfx_filter; @@ -6071,7 +6071,7 @@ _layout_handle_ellipsis(Ctxt *c, Evas_Object_Textblock_Item *it, Eina_List *i) /* Don't do much for the meanwhile. */ static inline void -_layout_paragraph_render(Efl_Canvas_Text_Data *o, +_layout_paragraph_render(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Paragraph *par) { if (par->rendered) @@ -6923,7 +6923,7 @@ _layout_pre(Ctxt *c) { int *style_pad_l, *style_pad_r, *style_pad_t, *style_pad_b; Evas_Object *eo_obj = c->obj; - Efl_Canvas_Text_Data *o = c->o; + Efl_Canvas_Textblock_Data *o = c->o; style_pad_l = &c->style_pad.l; style_pad_r = &c->style_pad.r; @@ -7291,7 +7291,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret) LYDBG("ZZ: ... layout #2\n"); c->o->content_changed = 0; _layout(c->obj, c->w, c->h, w_ret, h_ret); - efl_event_callback_call(c->obj, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, NULL); + efl_event_callback_call(c->obj, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, NULL); c->o->obstacle_changed = EINA_FALSE; } @@ -7300,7 +7300,7 @@ _layout_done(Ctxt *c, Evas_Coord *w_ret, Evas_Coord *h_ret) static Eina_Bool _layout_setup(Ctxt *c, const Eo *eo_obj, Evas_Coord w, Evas_Coord h) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Evas *eo_e; /* setup context */ @@ -7423,7 +7423,7 @@ static void _relayout(const Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _layout(eo_obj, obj->cur->geometry.w, obj->cur->geometry.h, &o->formatted.w, &o->formatted.h); o->formatted.valid = 1; @@ -7455,7 +7455,7 @@ _relayout(const Evas_Object *eo_obj) * Check if the object needs a relayout, and if so, execute it. */ static Eina_Bool -_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Text_Data *o) +_relayout_if_needed(const Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o) { ASYNC_BLOCK; 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) void _evas_textblock_relayout_if_needed(Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _relayout_if_needed(eo_obj, o); } @@ -7496,7 +7496,7 @@ _find_layout_item_line_match(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Tex { Evas_Object_Textblock_Paragraph *found_par; Evas_Object_Textblock_Line *ln; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _relayout_if_needed(eo_obj, o); @@ -7553,7 +7553,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line) { Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Line *ln; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); par = _layout_find_paragraph_by_line_no(o, line); if (par) @@ -7570,7 +7570,7 @@ _find_layout_line_num(const Evas_Object *eo_obj, int line) EAPI Evas_Object * evas_object_textblock_add(Evas *e) { - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; MAGIC_CHECK(e, Evas, MAGIC_EVAS); return NULL; MAGIC_CHECK_END(); @@ -7585,10 +7585,10 @@ evas_object_textblock_add(Evas *e) } EOLIAN static Eo * -_efl_canvas_text_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Text_Data *class_data EINA_UNUSED) +_efl_canvas_textblock_efl_object_constructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *class_data EINA_UNUSED) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); @@ -7651,11 +7651,11 @@ evas_textblock_style_free(Evas_Textblock_Style *ts) } static void -_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Text_Data *o) +_evas_textblock_update_format_nodes_from_style_tag(Efl_Canvas_Textblock_Data *o) { if (!o) { - ERR("The given address Efl_Canvas_Text_Data is NULL"); + ERR("The given address Efl_Canvas_Textblock_Data is NULL"); return; } @@ -7812,7 +7812,7 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text) EINA_LIST_FOREACH(ts->objects, l, eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _evas_textblock_update_format_nodes_from_style_tag(o); _evas_textblock_invalidate_all(o); _evas_textblock_changed(o, eo_obj); @@ -7827,7 +7827,7 @@ evas_textblock_style_get(const Evas_Textblock_Style *ts) } static 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) +_textblock_format_node_from_style_tag(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fnode, const char *format, size_t format_len) { Eina_List *itr; const char *match = NULL; @@ -7954,7 +7954,7 @@ evas_object_textblock_style_set(Eo *eo_obj, const Evas_Textblock_Style *ts) } static Evas_Textblock_Style * -_style_by_key_find(Efl_Canvas_Text_Data *o, const char *key) +_style_by_key_find(Efl_Canvas_Textblock_Data *o, const char *key) { Eina_List *itr; User_Style_Entry *us; @@ -7972,7 +7972,7 @@ _style_by_key_find(Efl_Canvas_Text_Data *o, const char *key) } EOLIAN static void -_efl_canvas_text_style_apply(Eo *eo_obj, Efl_Canvas_Text_Data *o, const char *style) +_efl_canvas_textblock_style_apply(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, const char *style) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -7985,12 +7985,12 @@ evas_object_textblock_style_get(const Eo *eo_obj) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return o->style; } EOLIAN static const char * -_efl_canvas_text_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_all_styles_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { if (o->default_format.default_style_str) 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 } EOLIAN static void -_efl_canvas_text_cursor_add(Eo *obj, Efl_Canvas_Text_Data *pd EINA_UNUSED, Efl_Text_Cursor *cursor) +_efl_canvas_textblock_cursor_add(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Text_Cursor *cursor) { efl_text_cursor_text_object_set(cursor, obj, obj); } EOLIAN static Efl_Text_Cursor * -_efl_canvas_text_cursor_create(Eo *obj, Efl_Canvas_Text_Data *pd EINA_UNUSED) +_efl_canvas_textblock_cursor_create(Eo *obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED) { Eo* cursor = efl_add(EFL_TEXT_CURSOR_CLASS, obj); efl_text_cursor_text_object_set(cursor, obj, obj); @@ -8030,7 +8030,7 @@ evas_object_textblock_style_user_peek(const Eo *eo_obj) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Textblock_Style *ts = _style_by_key_find(o, _STYLE_USER); return ts; @@ -8046,10 +8046,10 @@ evas_object_textblock_style_user_pop(Eo *eo_obj) } EAPI void -evas_object_textblock_replace_char_set(Efl_Canvas_Text *eo_obj, const char *ch) +evas_object_textblock_replace_char_set(Efl_Canvas_Textblock *eo_obj, const char *ch) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); 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) EOLIAN static void -_efl_canvas_text_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Eina_Bool mode) +_efl_canvas_textblock_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, Eina_Bool mode) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -8074,22 +8074,22 @@ _efl_canvas_text_newline_as_paragraph_separator_set(Eo *eo_obj EINA_UNUSED, Efl_ } EOLIAN static Eina_Bool -_efl_canvas_text_newline_as_paragraph_separator_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_newline_as_paragraph_separator_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return o->legacy_newline; } EOLIAN static Eina_Bool -_efl_canvas_text_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_is_empty_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return !o->text_nodes || (eina_ustrbuf_length_get(o->text_nodes->unicode) == 0); } EAPI void -evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align) +evas_object_textblock_valign_set(Efl_Canvas_Textblock *eo_obj, double align) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if (align < 0.0) align = 0.0; @@ -8100,15 +8100,15 @@ evas_object_textblock_valign_set(Efl_Canvas_Text *eo_obj, double align) } EAPI double -evas_object_textblock_valign_get(const Efl_Canvas_Text *obj) +evas_object_textblock_valign_get(const Efl_Canvas_Textblock *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, 0.0); - Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); return o->valign; } EOLIAN static void -_efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *delim) +_efl_canvas_textblock_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *delim) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -8116,16 +8116,16 @@ _efl_canvas_text_bidi_delimiters_set(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Dat } EOLIAN static const char* -_efl_canvas_text_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_bidi_delimiters_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return o->bidi_delimiters; } EAPI const char * -evas_object_textblock_replace_char_get(const Efl_Canvas_Text *obj) +evas_object_textblock_replace_char_get(const Efl_Canvas_Textblock *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - Efl_Canvas_Text_Data *o = efl_data_scope_get(obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(obj, MY_CLASS); return o->repch; } @@ -8399,7 +8399,7 @@ _prepend_escaped_char(Efl_Text_Cursor_Handle *cur_obj, const char *s, static void -_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, +_evas_object_textblock_text_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, const char *text) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); @@ -8454,17 +8454,17 @@ EAPI void evas_object_textblock_text_markup_set(Eo *eo_obj, const char *text) { EINA_SAFETY_ON_NULL_RETURN(eo_obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _evas_object_textblock_text_markup_set(eo_obj, o, text); } EOLIAN void -_efl_canvas_text_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_text_markup_markup_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, const char *text) { ASYNC_BLOCK; _evas_object_textblock_text_markup_set(eo_obj, o, text); - efl_event_callback_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } static void @@ -8705,7 +8705,7 @@ _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text) free(base); } static const char* -_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) +_evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { Evas_Object_Textblock_Node_Text *n; Eina_Strbuf *txt = NULL; @@ -8766,7 +8766,7 @@ _evas_object_textblock_text_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o free(text_base); } - (((Efl_Canvas_Text_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt)); + (((Efl_Canvas_Textblock_Data *)o)->markup_text) = eina_stringshare_add(eina_strbuf_string_get(txt)); eina_strbuf_free(txt); markup = (o->markup_text); @@ -8777,12 +8777,12 @@ EAPI const char* evas_object_textblock_text_markup_get(Eo *eo_obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return _evas_object_textblock_text_markup_get(eo_obj, o); } EOLIAN const char* -_efl_canvas_text_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_markup_markup_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { return _evas_object_textblock_text_markup_get(eo_obj, o); } @@ -8994,7 +8994,7 @@ _layout_obstacles_update(Ctxt *c) } static Evas_Textblock_Obstacle * -_obstacle_find(Efl_Canvas_Text_Data *o, Eo *eo_obs) +_obstacle_find(Efl_Canvas_Textblock_Data *o, Eo *eo_obs) { Evas_Textblock_Obstacle *obs; Eina_List *i; @@ -9011,7 +9011,7 @@ void _obstacle_del_cb(void *data, const Efl_Event *event) { Eo *eo_obj = data; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Eina_List *i; Evas_Textblock_Obstacle *obs; @@ -9040,7 +9040,7 @@ _obstacle_free(Eo *eo_obj, Evas_Textblock_Obstacle *obs) } static void -_obstacles_free(Eo *eo_obj, Efl_Canvas_Text_Data *o) +_obstacles_free(Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { Evas_Textblock_Obstacle *obs; @@ -9051,8 +9051,8 @@ _obstacles_free(Eo *eo_obj, Efl_Canvas_Text_Data *o) } EOLIAN static Eina_Bool -_efl_canvas_text_obstacle_add(Eo *eo_obj, - Efl_Canvas_Text_Data *o, Eo *eo_obs) +_efl_canvas_textblock_obstacle_add(Eo *eo_obj, + Efl_Canvas_Textblock_Data *o, Eo *eo_obs) { Evas_Textblock_Obstacle *obs; @@ -9075,7 +9075,7 @@ _efl_canvas_text_obstacle_add(Eo *eo_obj, } EOLIAN static Eina_Bool -_efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_obstacle_del(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Eo *eo_obs EINA_UNUSED) { Evas_Textblock_Obstacle *obs; @@ -9100,7 +9100,7 @@ _efl_canvas_text_obstacle_del(Eo *eo_obj, Efl_Canvas_Text_Data *o, } EOLIAN static void -_efl_canvas_text_obstacles_update(Eo *eo_obj, Efl_Canvas_Text_Data *obj) +_efl_canvas_textblock_obstacles_update(Eo *eo_obj, Efl_Canvas_Textblock_Data *obj) { _evas_textblock_changed(obj, eo_obj); obj->obstacle_changed = EINA_TRUE; @@ -9186,7 +9186,7 @@ _layout_hyphen_item_new(Ctxt *c, const Evas_Object_Textblock_Text_Item *cur_ti) * @param to merge into to. */ static void -_evas_textblock_nodes_merge(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *to) +_evas_textblock_nodes_merge(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *to) { Evas_Object_Textblock_Node_Format *itr; Evas_Object_Textblock_Node_Format *pnode; @@ -9254,7 +9254,7 @@ _evas_textblock_cursor_nodes_merge(Efl_Text_Cursor_Handle *cur) len = eina_ustrbuf_length_get(cur->node->unicode); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); nnode = _NODE_TEXT(EINA_INLIST_GET(cur->node)->next); _evas_textblock_nodes_merge(o, cur->node); _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) cur->obj = (Eo *) tb; cur->cur_objs = NULL; cur->ref_count = 1; - Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); if (!o) return; cur->node = o->text_nodes; @@ -9464,7 +9464,7 @@ evas_object_textblock_cursor_new(const Evas_Object *eo_obj) if (!obj) return NULL; evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(eo_obj, MY_CLASS); if (!o) return NULL; cur = calloc(1, sizeof(Efl_Text_Cursor_Handle)); @@ -9479,7 +9479,7 @@ EAPI void evas_textblock_cursor_free(Evas_Textblock_Cursor *cur) { if (!cur) return; - Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); if (!o) return; if (cur == o->cursor) return; o->cursors = eina_list_remove(o->cursors, cur); @@ -9491,7 +9491,7 @@ evas_textblock_cursor_ref(Efl_Text_Cursor_Handle *cur, Eo * cur_obj) { if (!cur) return NULL; /* Does not work with TextBlock Main Cursor*/ - Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cur->obj, MY_CLASS); if (!o) return NULL; if (cur == o->cursor) return NULL; @@ -9507,7 +9507,7 @@ evas_textblock_cursor_unref(Efl_Text_Cursor_Handle *cursor, Eo * cur_obj) { if (!cursor) return; /* Does not work with TextBlock Main Cursor*/ - Efl_Canvas_Text_Data *o = efl_data_scope_safe_get(cursor->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_safe_get(cursor->obj, MY_CLASS); if (!o) return; if (cursor == o->cursor) return; @@ -9543,7 +9543,7 @@ evas_textblock_node_format_list_get(const Eo *eo_obj, const char *anchor) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!strcmp(anchor, "a")) return o->anchors_a; else if (!strcmp(anchor, "item")) @@ -9557,7 +9557,7 @@ evas_textblock_node_format_first_get(Evas_Object *eo_obj) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return o->format_nodes; } @@ -9567,7 +9567,7 @@ evas_textblock_node_format_last_get(Evas_Object *eo_obj) EINA_SAFETY_ON_NULL_RETURN_VAL(eo_obj, NULL); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return o->format_nodes ? _NODE_FORMAT(EINA_INLIST_GET(o->format_nodes)->last) : NULL; } @@ -9599,7 +9599,7 @@ evas_textblock_node_format_remove_pair(Eo *eo_obj, Evas_Object_Textblock_Node_Fo Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); do { const char *fstr = fmt->orig_format; @@ -9701,7 +9701,7 @@ evas_textblock_cursor_paragraph_first(Efl_Text_Cursor_Handle *cur) if (!cur) return; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); cur->node = o->text_nodes; cur->pos = 0; _evas_textblock_cursor_object_changed(cur); @@ -9715,7 +9715,7 @@ evas_textblock_cursor_paragraph_last(Efl_Text_Cursor_Handle *cur) if (!cur) return; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); node = o->text_nodes; if (node) { @@ -10029,7 +10029,7 @@ static size_t _evas_textblock_cursor_cluster_pos_get(Evas_Textblock_Cursor *cur, Eina_Bool inc, Eina_Bool *is_single_glyph) { Evas_Object_Textblock_Paragraph *par; - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; size_t cur_pos = cur->pos; size_t ret = cur->pos; @@ -10321,7 +10321,7 @@ evas_textblock_cursor_paragraph_char_last(Efl_Text_Cursor_Handle *cur) static void _cursor_line_first_char_get(Evas_Object_Textblock_Line *ln, Efl_Text_Cursor_Handle *cur, - Efl_Canvas_Text_Data *o) + Efl_Canvas_Textblock_Data *o) { if (ln->items) { @@ -10356,7 +10356,7 @@ evas_textblock_cursor_line_char_first(Efl_Text_Cursor_Handle *cur) evas_object_async_block(obj); TB_NULL_CHECK(cur->node); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -10380,7 +10380,7 @@ evas_textblock_cursor_line_char_last(Efl_Text_Cursor_Handle *cur) Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -10520,7 +10520,7 @@ _evas_textblock_cursor_node_text_at_format(Efl_Text_Cursor_Handle *cur, Evas_Obj * @param fmt the current format. */ static void -_evas_textblock_node_format_remove_matching(Efl_Canvas_Text_Data *o, +_evas_textblock_node_format_remove_matching(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *fmt) { Evas_Object_Textblock_Node_Text *tnode; @@ -10609,7 +10609,7 @@ _evas_textblock_node_format_remove_matching(Efl_Canvas_Text_Data *o, * @param offset the offset to add (may be negative). */ static void -_evas_textblock_node_format_adjust_offset(Efl_Canvas_Text_Data *o, +_evas_textblock_node_format_adjust_offset(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *tnode, Evas_Object_Textblock_Node_Format *fmt, int offset) { @@ -10636,7 +10636,7 @@ _evas_textblock_node_format_adjust_offset(Efl_Canvas_Text_Data *o, * @param n the fromat node to remove */ static void -_evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment) +_evas_textblock_node_format_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n, int visible_adjustment) { /* Update the text nodes about the change */ { @@ -10681,7 +10681,7 @@ _evas_textblock_node_format_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textbloc void _evas_textblock_annotations_node_format_remove(Evas_Object *eo_obj, Evas_Object_Textblock_Node_Format *n, int visual_adjustment) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _evas_textblock_node_format_remove(o, n, visual_adjustment); } @@ -10698,7 +10698,7 @@ _evas_textblock_annotations_node_format_remove(Evas_Object *eo_obj, Evas_Object_ * @returns @c EINA_TRUE if removed a PS, @c EINA_FALSE otherwise. */ static Eina_Bool -_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Text_Data *o, +_evas_textblock_node_text_adjust_offsets_to_start(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n, size_t start, int end) { Evas_Object_Textblock_Node_Format *last_node, *itr; @@ -10826,7 +10826,7 @@ _evas_textblock_node_text_get_first_format_between( * @param n the node to remove. */ static void -_evas_textblock_node_text_remove(Efl_Canvas_Text_Data *o, Evas_Object_Textblock_Node_Text *n) +_evas_textblock_node_text_remove(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Text *n) { _evas_textblock_node_text_adjust_offsets_to_start(o, n, 0, -1); @@ -10875,7 +10875,7 @@ evas_textblock_cursor_pos_get(const Efl_Text_Cursor_Handle *cur) Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); TB_NULL_CHECK(cur->node, 0); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); n = o->text_nodes; while (n != cur->node) { @@ -10893,7 +10893,7 @@ evas_textblock_cursor_pos_set(Efl_Text_Cursor_Handle *cur, int _pos) if (!cur) return; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); if (_pos < 0) @@ -10942,7 +10942,7 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line) Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -10959,7 +10959,7 @@ evas_textblock_cursor_line_jump_by(Efl_Text_Cursor_Handle *cur, int by) { if (!cur) return; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); ASYNC_BLOCK; int ln; Evas_Coord cx, cw; @@ -11134,7 +11134,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Handle *cur, Evas_Object_Textblock_Node_Text *n; if (!cur) return; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); n = _evas_textblock_node_text_new(); o->text_nodes = _NODE_TEXT(eina_inlist_append_relative( @@ -11211,7 +11211,7 @@ _evas_textblock_cursor_break_paragraph(Efl_Text_Cursor_Handle *cur, * @param new_node the new node to set. */ static void -_evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o, +_evas_textblock_cursors_set_node(Efl_Canvas_Textblock_Data *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node) { @@ -11237,7 +11237,7 @@ _evas_textblock_cursors_set_node(Efl_Canvas_Text_Data *o, } static inline void -_cursor_update_offset(Efl_Text_Cursor_Handle *cur, Efl_Canvas_Text_Data *o, +_cursor_update_offset(Efl_Text_Cursor_Handle *cur, Efl_Canvas_Textblock_Data *o, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset) { if ((n == cur->node) && @@ -11277,7 +11277,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur, { Eina_List *l; Efl_Text_Cursor_Handle *ocur; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); ocur = o->cursor; if (cur != ocur) @@ -11302,7 +11302,7 @@ _evas_textblock_cursors_update_offset(const Efl_Text_Cursor_Handle *cur, * @param obj the evas object. */ static void -_evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj) +_evas_textblock_changed(Efl_Canvas_Textblock_Data *o, Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); Eina_List *l; @@ -11328,7 +11328,7 @@ _evas_textblock_changed(Efl_Canvas_Text_Data *o, Evas_Object *eo_obj) } static void -_evas_textblock_invalidate_all(Efl_Canvas_Text_Data *o) +_evas_textblock_invalidate_all(Efl_Canvas_Textblock_Data *o) { Evas_Object_Textblock_Node_Text *n; @@ -11351,7 +11351,7 @@ _evas_textblock_cursor_text_append(Efl_Text_Cursor_Handle *cur, const char *_tex Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); text = eina_unicode_utf8_to_unicode(_text, &len); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); n = cur->node; if (n) @@ -11453,7 +11453,7 @@ evas_textblock_cursor_text_prepend(Efl_Text_Cursor_Handle *cur, const char *_tex * @param n the format node to free */ static void -_evas_textblock_node_format_free(Efl_Canvas_Text_Data *o, +_evas_textblock_node_format_free(Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Node_Format *n) { if (!n) return; @@ -11475,7 +11475,7 @@ _evas_textblock_node_format_free(Efl_Canvas_Text_Data *o, * @return Returns the new format node */ static Evas_Object_Textblock_Node_Format * -_evas_textblock_node_format_new(Efl_Canvas_Text_Data *o, const char *_format, +_evas_textblock_node_format_new(Efl_Canvas_Textblock_Data *o, const char *_format, Eina_Bool is_item) { Evas_Object_Textblock_Node_Format *n; @@ -11624,7 +11624,7 @@ _evas_textblock_cursor_format_append(Efl_Text_Cursor_Handle *cur, Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); if ((!format) || (format[0] == 0)) return EINA_FALSE; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); /* We should always have at least one text node */ if (!o->text_nodes) { @@ -11795,7 +11795,7 @@ evas_textblock_cursor_char_delete(Efl_Text_Cursor_Handle *cur) if (!cur || !cur->node) return; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); n = cur->node; text = eina_ustrbuf_string_get(n->unicode); @@ -11877,7 +11877,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor if (cur1->obj != cur2->obj) return; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); if (evas_textblock_cursor_compare(cur1, cur2) > 0) { Efl_Text_Cursor_Handle *tc; @@ -11968,7 +11968,7 @@ evas_textblock_cursor_range_delete(Efl_Text_Cursor_Handle *cur1, Efl_Text_Cursor evas_textblock_cursor_copy(cur1, o->cursor); _evas_textblock_changed(o, cur1->obj); - efl_event_callback_call(cur1->obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_call(cur1->obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } EAPI char * @@ -12417,7 +12417,7 @@ EAPI Eina_Bool evas_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) { if (!cur) return EINA_FALSE; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); ASYNC_BLOCK; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); @@ -12605,7 +12605,7 @@ evas_textblock_cursor_geometry_get(const Efl_Text_Cursor_Handle *cur, Evas_Coord if (!cur) return -1; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -12684,7 +12684,7 @@ _evas_textblock_cursor_char_pen_geometry_common_get(int (*query_func) (void *dat Eina_Bool previous_format; if (!cur) return -1; - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -12818,7 +12818,7 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C if (!cur) return -1; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -12863,8 +12863,8 @@ evas_textblock_cursor_visible_range_get(Efl_Text_Cursor_Handle *start, Evas_Text } EOLIAN static Eina_Bool -_efl_canvas_text_visible_range_get(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Text_Data *pd EINA_UNUSED, +_efl_canvas_textblock_visible_range_get(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Text_Cursor *start, Efl_Text_Cursor *end) { return evas_textblock_cursor_visible_range_get( @@ -12885,7 +12885,7 @@ _evas_textblock_cursor_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_ Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -13088,7 +13088,7 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y) if (!cur) return -1; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -13517,7 +13517,7 @@ evas_textblock_cursor_range_simple_geometry_get(const Efl_Text_Cursor_Handle *cu if (cur1->obj != cur2->obj) return NULL; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur1->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur1->obj, MY_CLASS); _relayout_if_needed(cur1->obj, o); 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 } static Eina_List * -_efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Text_Data *o, const Efl_Text_Cursor_Handle *cur1, const +_efl_canvas_textblock_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Textblock_Data *o, const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2) { Evas_Object_Textblock_Line *ln1, *ln2; @@ -13689,13 +13689,13 @@ _efl_canvas_text_range_geometry_list_get(Eo *eo_obj EINA_UNUSED, EAPI Eina_List * evas_textblock_cursor_range_geometry_get(const Efl_Text_Cursor_Handle *cur1, const Evas_Textblock_Cursor *cur2_obj) { - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; if (!cur1) return NULL; o = efl_data_scope_get(cur1->obj, MY_CLASS); - return _efl_canvas_text_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj); + return _efl_canvas_textblock_range_geometry_list_get(cur1->obj, o, cur1, cur2_obj); } static Eina_Bool @@ -13709,7 +13709,7 @@ _evas_textblock_cursor_format_item_geometry_get(const Efl_Text_Cursor_Handle *cu if (!cur) return EINA_FALSE; Evas_Object_Protected_Data *obj = efl_data_scope_get(cur->obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(cur->obj, MY_CLASS); _relayout_if_needed(cur->obj, o); @@ -13762,7 +13762,7 @@ evas_object_textblock_line_number_geometry_get(const Eo *eo_obj, int line, Evas_ Evas_Object_Textblock_Line *ln; Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); _relayout_if_needed((Evas_Object *)eo_obj, o); @@ -13788,7 +13788,7 @@ _evas_object_textblock_clear(Evas_Object *eo_obj) eo_e = evas_object_evas_get(eo_obj); evas = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); evas_object_async_block(obj); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (o->paragraphs) { _paragraphs_free(evas, o, obj, o->paragraphs); @@ -13823,7 +13823,7 @@ evas_object_textblock_clear(Evas_Object *eo_obj) } EOLIAN static Eina_Size2D -_efl_canvas_text_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_size_formatted_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -13978,7 +13978,7 @@ loop_advance: /* FIXME: doc */ static void _size_native_calc_paragraph_size(const Evas_Object *eo_obj, - const Efl_Canvas_Text_Data *o, + const Efl_Canvas_Textblock_Data *o, Evas_Object_Textblock_Paragraph *par, Textblock_Position *position, Evas_Coord *_w, Evas_Coord *_h) @@ -14069,7 +14069,7 @@ _size_native_calc_paragraph_size(const Evas_Object *eo_obj, } EOLIAN static Eina_Size2D -_efl_canvas_text_size_native_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_size_native_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -14107,7 +14107,7 @@ _efl_canvas_text_size_native_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) } EOLIAN static void -_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) +_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) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); 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 } EOLIAN static void -_efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Dbg_Info *root) +_efl_canvas_textblock_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Dbg_Info *root) { efl_dbg_info_get(efl_super(eo_obj, MY_CLASS), root); if (!root) return; @@ -14144,7 +14144,7 @@ _efl_canvas_text_efl_object_dbg_info_get(Eo *eo_obj, Efl_Canvas_Text_Data *o EIN { Eina_Size2D size; - size = efl_canvas_text_size_formatted_get(eo_obj); + size = efl_canvas_textblock_size_formatted_get(eo_obj); node = EFL_DBG_INFO_LIST_APPEND(group, "Formatted size"); EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w); 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 { Eina_Size2D size; - size = efl_canvas_text_size_native_get(eo_obj); + size = efl_canvas_textblock_size_native_get(eo_obj); node = EFL_DBG_INFO_LIST_APPEND(group, "Native size"); EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, size.w); EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, size.h); @@ -14164,7 +14164,7 @@ static void evas_object_textblock_init(Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Data *o; + Efl_Canvas_Textblock_Data *o; static Eina_Bool linebreak_init = EINA_FALSE; if (!linebreak_init) @@ -14187,7 +14187,7 @@ evas_object_textblock_init(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_text_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_object_destructor(Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { evas_object_textblock_free(eo_obj); 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_ static void evas_object_textblock_free(Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Filter_Program *prg; + Efl_Canvas_Textblock_Filter_Program *prg; Evas_Filter_Data_Binding *db; User_Style_Entry *use; @@ -14320,7 +14320,7 @@ _filter_sync_end(Evas_Filter_Context *ctx, Eina_Bool success) static void _filter_post_render_cb(void *data) { - Efl_Canvas_Text_Filter_Post_Render *post_data = data; + Efl_Canvas_Textblock_Filter_Post_Render *post_data = data; _filter_sync_end(post_data->ctx, post_data->success); free(post_data); @@ -14329,7 +14329,7 @@ _filter_post_render_cb(void *data) static void _filter_cb(Evas_Filter_Context *ctx, void *data, Eina_Bool success) { - Efl_Canvas_Text_Filter_Post_Render *post_data; + Efl_Canvas_Textblock_Filter_Post_Render *post_data; Evas_Public_Data *evas = data; if (!evas_filter_context_async_get(ctx)) @@ -14365,7 +14365,7 @@ _filter_relative_bounding_box_get(const Text_Item_Filter *tif) } static void -_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Text_Data *o) +_filter_output_cache_prune(Evas_Object_Protected_Data *obj, Efl_Canvas_Textblock_Data *o) { Text_Item_Filter *tif; Eina_Inlist *il; @@ -14408,7 +14408,7 @@ static inline Evas_Coord_Point _filter_target_position_calc(Evas_Object_Protected_Data *obj, Evas_Object_Textblock_Text_Item *ti, int x, int y) { - Efl_Canvas_Text_Filter *filter = ti->parent.format->gfx_filter; + Efl_Canvas_Textblock_Filter *filter = ti->parent.format->gfx_filter; Evas_Object_Textblock_Line *ln = ti->parent.ln; Evas_Coord_Point pt; @@ -14427,7 +14427,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Textblock_Paragraph *par, *start = NULL; Evas_Object_Textblock_Item *itr; Evas_Object_Textblock_Line *ln, *cur_ln = NULL; - Efl_Canvas_Text_Data *o = type_private_data; + Efl_Canvas_Textblock_Data *o = type_private_data; ASYNC_BLOCK; Eina_List *shadows = NULL; @@ -14732,7 +14732,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED, { Efl_Canvas_Filter_State state = EFL_CANVAS_FILTER_STATE_DEFAULT; Evas_Object_Textblock_Text_Item *ti = _ITEM_TEXT(itr); - Efl_Canvas_Text_Filter *filter; + Efl_Canvas_Textblock_Filter *filter; Evas_Filter_Program *pgm; Evas_Filter_Context *ctx; Evas_Coord_Point target; @@ -15129,13 +15129,13 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_text_efl_canvas_filter_internal_filter_state_prepare( - Eo *eo_obj, Efl_Canvas_Text_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data) +_efl_canvas_textblock_efl_canvas_filter_internal_filter_state_prepare( + Eo *eo_obj, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, Efl_Canvas_Filter_State *state, void *data) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXT_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, EFL_CANVAS_TEXTBLOCK_CLASS); Evas_Object_Textblock_Text_Item *ti = data; - Efl_Canvas_Text_Filter_Program *program; + Efl_Canvas_Textblock_Filter_Program *program; Evas_Filter_Padding pad = {}; #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( } EOLIAN static Eina_Bool -_efl_canvas_text_efl_canvas_filter_internal_filter_input_render( - Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED, void *filter, +_efl_canvas_textblock_efl_canvas_filter_internal_filter_input_render( + Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, void *filter, void *engine, void *output, void *drawctx, void *data, int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, int x, int y, Eina_Bool do_async) @@ -15171,17 +15171,17 @@ _efl_canvas_text_efl_canvas_filter_internal_filter_input_render( } EOLIAN static void -_efl_canvas_text_efl_canvas_filter_internal_filter_dirty( - Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED) +_efl_canvas_textblock_efl_canvas_filter_internal_filter_dirty( + Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED) { WRN("Filter marked as dirty. NOT IMPLEMENTED!"); } EOLIAN static void -_efl_canvas_text_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Text_Data *pd, const char *code, const char *name) +_efl_canvas_textblock_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *pd, const char *code, const char *name) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Filter_Program *prg; + Efl_Canvas_Textblock_Filter_Program *prg; prg = _filter_program_find(pd, name); if (prg) @@ -15192,7 +15192,7 @@ _efl_canvas_text_efl_gfx_filter_filter_program_set(Eo *eo_obj, Efl_Canvas_Text_D { prg = calloc(1, sizeof(*prg)); prg->name = eina_stringshare_add(name); - pd->gfx_filter.programs = (Efl_Canvas_Text_Filter_Program *) + pd->gfx_filter.programs = (Efl_Canvas_Textblock_Filter_Program *) eina_inlist_append(EINA_INLIST_GET(pd->gfx_filter.programs), EINA_INLIST_GET(prg)); } 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 } EOLIAN static void -_efl_canvas_text_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd EINA_UNUSED, +_efl_canvas_textblock_efl_gfx_filter_filter_program_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd EINA_UNUSED, const char **code EINA_UNUSED, const char **name EINA_UNUSED) { // 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 } static Evas_Filter_Data_Binding * -_filter_data_binding_find(Efl_Canvas_Text_Data *pd, const char *name) +_filter_data_binding_find(Efl_Canvas_Textblock_Data *pd, const char *name) { Evas_Filter_Data_Binding *db; @@ -15226,9 +15226,9 @@ _filter_data_binding_find(Efl_Canvas_Text_Data *pd, const char *name) } EOLIAN static void -_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) +_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) { - Efl_Canvas_Text_Filter_Program *prg; + Efl_Canvas_Textblock_Filter_Program *prg; Evas_Filter_Data_Binding *db; if (!name) return; @@ -15274,7 +15274,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_set(Eo *obj, Efl_Canvas_Text_Data *p } EOLIAN static void -_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) +_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) { Evas_Filter_Data_Binding *db; @@ -15291,7 +15291,7 @@ _efl_canvas_text_efl_gfx_filter_filter_data_get(const Eo *obj EINA_UNUSED, Efl_C } EOLIAN static void -_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) +_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) { Evas_Object_Protected_Data *obj, *source; 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 } EOLIAN static Efl_Gfx_Entity * -_efl_canvas_text_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *pd, const char *name) +_efl_canvas_textblock_efl_gfx_filter_filter_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *pd, const char *name) { return eina_hash_find(pd->gfx_filter.sources, name); } @@ -15355,7 +15355,7 @@ evas_object_textblock_coords_recalc(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data) { - Efl_Canvas_Text_Data *o = type_private_data; + Efl_Canvas_Textblock_Data *o = type_private_data; #ifdef BIDI_SUPPORT if (o->inherit_paragraph_direction) @@ -15414,7 +15414,7 @@ evas_object_textblock_render_pre(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, void *type_private_data) { - Efl_Canvas_Text_Data *o = type_private_data; + Efl_Canvas_Textblock_Data *o = type_private_data; ASYNC_BLOCK; int is_v, was_v; @@ -15539,13 +15539,13 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj, void *type_private_data) { - Efl_Canvas_Text_Data *o = type_private_data; + Efl_Canvas_Textblock_Data *o = type_private_data; ASYNC_BLOCK; /* this moves the current data to the previous state parts of the object */ /* in whatever way is safest for the object. also if we don't need object */ /* data anymore we can free it if the object deems this is a good idea */ -/* o = (Efl_Canvas_Text_Data *)(obj->object_data); */ +/* o = (Efl_Canvas_Textblock_Data *)(obj->object_data); */ /* remove those pesky changes */ evas_object_clip_changes_clean(obj); /* move cur to prev safely for object data */ @@ -15557,7 +15557,7 @@ evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED, static void *evas_object_textblock_engine_data_get(Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!o) return NULL; return o->engine_data; } @@ -15583,8 +15583,8 @@ evas_object_textblock_was_opaque(Evas_Object *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_text_efl_gfx_entity_scale_set(Evas_Object *eo_obj, - Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_gfx_entity_scale_set(Evas_Object *eo_obj, + Efl_Canvas_Textblock_Data *o, double scale) { if (EINA_DBL_EQ(efl_gfx_entity_scale_get(eo_obj), scale)) return; @@ -15600,7 +15600,7 @@ void _evas_object_textblock_rehint(Evas_Object *eo_obj) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Line *ln; @@ -15629,8 +15629,8 @@ _evas_object_textblock_rehint(Evas_Object *eo_obj) } EOLIAN static void -_efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, - Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, + Efl_Canvas_Textblock_Data *o, Efl_Text_Bidirectional_Type dir) { #ifdef BIDI_SUPPORT @@ -15672,14 +15672,14 @@ _efl_canvas_text_efl_canvas_object_paragraph_direction_set(Eo *eo_obj, } EOLIAN static Efl_Text_Bidirectional_Type -_efl_canvas_text_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_canvas_object_paragraph_direction_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Textblock_Data *o) { return (Efl_Text_Bidirectional_Type)o->paragraph_direction; } EOLIAN static void -_efl_canvas_text_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, const char *text) { ASYNC_BLOCK; @@ -15688,12 +15688,12 @@ _efl_canvas_text_efl_text_text_set(Eo *eo_obj, Efl_Canvas_Text_Data *o, if (eo_obj) { _evas_textblock_changed(o, eo_obj); - efl_event_callback_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } } static char * -_canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) +_canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { Efl_Text_Cursor_Handle start, end; @@ -15707,7 +15707,7 @@ _canvas_text_get_all(const Eo *eo_obj, Efl_Canvas_Text_Data *o EINA_UNUSED) } EOLIAN static const char * -_efl_canvas_text_efl_text_text_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_text_get(const Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS); evas_object_async_block(obj); @@ -15719,7 +15719,7 @@ _efl_canvas_text_efl_text_text_get(const Eo *eo_obj, Efl_Canvas_Text_Data *o) void evas_textblock_async_block(Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); ASYNC_BLOCK; } @@ -15804,7 +15804,7 @@ _evas_textblock_annotations_set(Eo *eo_obj, int len; char *buf; Evas_Textblock_Node_Format *fnode; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (an->is_item) { @@ -15839,12 +15839,12 @@ _evas_textblock_annotations_set(Eo *eo_obj, Eina_Inlist * _evas_textblock_annotations_get(Eo *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return (Eina_Inlist*)o->annotations; } void -_evas_textblock_annotation_remove(Eo *eo_obj, Efl_Canvas_Text_Data *o, +_evas_textblock_annotation_remove(Eo *eo_obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Attribute_Handle *an, Eina_Bool remove_nodes, Eina_Bool invalidate) { if (!o) @@ -15887,7 +15887,7 @@ void _evas_textblock_annotations_clear(const Eo *eo_obj) { Efl_Text_Attribute_Handle *an; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); EINA_INLIST_FREE(o->annotations, an) { @@ -15903,7 +15903,7 @@ _evas_textblock_annotations_insert(Eo *eo_obj, Efl_Text_Cursor_Handle *start, Ef Eina_Strbuf *buf; Eina_Bool first = EINA_TRUE; const char *item; - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!format || (format[0] == '\0') || evas_textblock_cursor_compare(start, end) > 0) @@ -15961,18 +15961,18 @@ _evas_textblock_annotations_insert(Eo *eo_obj, Efl_Text_Cursor_Handle *start, Ef } static void -_canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Text_Data *o) +_canvas_text_format_changed(Eo *eo_obj, Efl_Canvas_Textblock_Data *o) { o->format_changed = EINA_TRUE; _evas_textblock_invalidate_all(o); _evas_textblock_changed(o, eo_obj); - efl_event_callback_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL); + efl_event_callback_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL); } /* Efl.Text.Font interface implementation */ static void -_efl_canvas_text_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font) +_efl_canvas_textblock_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font) { ASYNC_BLOCK; Eina_Bool changed = EINA_FALSE; @@ -16004,13 +16004,13 @@ _efl_canvas_text_efl_text_font_font_family_set(Eo *obj EINA_UNUSED, Efl_Canvas_T } static const char * -_efl_canvas_text_efl_text_font_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_font_font_family_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return o->default_format.info.font; } static void -_efl_canvas_text_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o, int size) +_efl_canvas_textblock_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o, int size) { ASYNC_BLOCK; EINA_SAFETY_ON_FALSE_RETURN(size > 0); @@ -16022,13 +16022,13 @@ _efl_canvas_text_efl_text_font_font_size_set(Eo *obj EINA_UNUSED, Efl_Canvas_Tex } static Efl_Font_Size -_efl_canvas_text_efl_text_font_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_font_font_size_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return o->default_format.info.size; } static void -_efl_canvas_text_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_source EINA_UNUSED) { Eina_Stringshare *nfont_source; if (o->default_format.info.font_source != font_source) @@ -16049,13 +16049,13 @@ _efl_canvas_text_efl_text_font_font_source_set(Eo *obj EINA_UNUSED, Efl_Canvas_T } static const char* -_efl_canvas_text_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_source_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_source); } static void -_efl_canvas_text_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_fallbacks EINA_UNUSED) { Eina_Stringshare *nfont_fallbacks; if (o->default_format.info.font_fallbacks != font_fallbacks) @@ -16076,13 +16076,13 @@ _efl_canvas_text_efl_text_font_font_fallbacks_set(Eo *obj EINA_UNUSED, Efl_Canva } static const char* -_efl_canvas_text_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_fallbacks_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_fallbacks); } static void -_efl_canvas_text_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *font_lang EINA_UNUSED) { Eina_Stringshare *nfont_lang; if (o->default_format.info.font_lang != font_lang) @@ -16103,13 +16103,13 @@ _efl_canvas_text_efl_text_font_font_lang_set(Eo *obj EINA_UNUSED, Efl_Canvas_Tex } static const char* -_efl_canvas_text_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_lang_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_lang); } static void -_efl_canvas_text_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Weight font_weight EINA_UNUSED) { if (_FMT_INFO(font_weight) == font_weight) return; _FMT_INFO(font_weight) = font_weight; @@ -16117,13 +16117,13 @@ _efl_canvas_text_efl_text_font_font_weight_set(Eo *obj EINA_UNUSED, Efl_Canvas_T } static Efl_Text_Font_Weight -_efl_canvas_text_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_weight_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_weight); } static void -_efl_canvas_text_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Slant font_slant EINA_UNUSED) { ASYNC_BLOCK; if (_FMT_INFO(font_slant) == font_slant) return; @@ -16132,13 +16132,13 @@ _efl_canvas_text_efl_text_font_font_slant_set(Eo *obj EINA_UNUSED, Efl_Canvas_Te } static Efl_Text_Font_Slant -_efl_canvas_text_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_slant_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_slant); } static void -_efl_canvas_text_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Font_Width font_width EINA_UNUSED) { ASYNC_BLOCK; if (_FMT_INFO(font_width) == font_width) return; @@ -16147,13 +16147,13 @@ _efl_canvas_text_efl_text_font_font_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Te } static Efl_Text_Font_Width -_efl_canvas_text_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_font_font_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(font_width); } EOLIAN static void -_efl_canvas_text_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Text_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) +_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Font_Bitmap_Scalable bitmap_scalable) { if (_FMT_INFO(bitmap_scalable) == bitmap_scalable) return; _FMT_INFO(bitmap_scalable) = bitmap_scalable; @@ -16161,7 +16161,7 @@ _efl_canvas_text_efl_text_font_font_bitmap_scalable_set(Eo *obj, Efl_Canvas_Text } EOLIAN static Efl_Text_Font_Bitmap_Scalable -_efl_canvas_text_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { return _FMT_INFO(bitmap_scalable); } @@ -16202,40 +16202,40 @@ _efl_canvas_text_efl_text_font_font_bitmap_scalable_get(const Eo *obj EINA_UNUSE if (changed) _canvas_text_format_changed(obj, o); static void -_efl_canvas_text_efl_text_style_normal_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_normal_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(normal); } static void -_efl_canvas_text_efl_text_style_normal_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_normal_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(normal); } static void -_efl_canvas_text_efl_text_style_backing_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Backing_Type type EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_backing_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Backing_Type type EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(backing, type); } static Efl_Text_Style_Backing_Type -_efl_canvas_text_efl_text_style_backing_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_backing_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(backing); } static void -_efl_canvas_text_efl_text_style_backing_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_backing_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(backing); } static void -_efl_canvas_text_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_backing_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(backing); } @@ -16253,7 +16253,7 @@ static struct }; static void -_efl_canvas_text_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Underline_Type type EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(underline, _style_underline_map[type].underline_single); @@ -16263,111 +16263,111 @@ _efl_canvas_text_efl_text_style_underline_type_set(Eo *obj EINA_UNUSED, Efl_Canv } static Efl_Text_Style_Underline_Type -_efl_canvas_text_efl_text_style_underline_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(underline); } static void -_efl_canvas_text_efl_text_style_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(underline); } static void -_efl_canvas_text_efl_text_style_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(underline); } static void -_efl_canvas_text_efl_text_style_underline_height_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double height EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_height_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double height EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(underline_height, height); } static double -_efl_canvas_text_efl_text_style_underline_height_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_height_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(underline_height); } static void -_efl_canvas_text_efl_text_style_underline_dashed_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(underline_dash); } static void -_efl_canvas_text_efl_text_style_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(underline_dash); } static void -_efl_canvas_text_efl_text_style_underline_dashed_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, int width EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_width_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int width EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(underline_dash_width, width); } static int -_efl_canvas_text_efl_text_style_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_width_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(underline_dash_width); } static void -_efl_canvas_text_efl_text_style_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, int gap EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_gap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int gap EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(underline_dash_gap, gap); } static int -_efl_canvas_text_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline_dashed_gap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(underline_dash_width); } static void -_efl_canvas_text_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(underline2); } static void -_efl_canvas_text_efl_text_style_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_underline2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(underline2); } static void -_efl_canvas_text_efl_text_style_strikethrough_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_strikethrough_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Strikethrough_Type type EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(strikethrough, type); } static Efl_Text_Style_Strikethrough_Type -_efl_canvas_text_efl_text_style_strikethrough_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_strikethrough_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(strikethrough); } static void -_efl_canvas_text_efl_text_style_strikethrough_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_strikethrough_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(strikethrough); } static void -_efl_canvas_text_efl_text_style_strikethrough_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_strikethrough_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(strikethrough); } @@ -16435,7 +16435,7 @@ _get_dir_from_map(Efl_Text_Style_Shadow_Direction dir) } static void -_efl_canvas_text_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Effect_Type type EINA_UNUSED) { ASYNC_BLOCK; _FMT_INFO_SET_START(effect, type); @@ -16447,26 +16447,26 @@ _efl_canvas_text_efl_text_style_effect_type_set(Eo *obj EINA_UNUSED, Efl_Canvas_ } static Efl_Text_Style_Effect_Type -_efl_canvas_text_efl_text_style_effect_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_effect_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(effect); } static void -_efl_canvas_text_efl_text_style_outline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_outline_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(outline); } static void -_efl_canvas_text_efl_text_style_outline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_outline_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(outline); } static void -_efl_canvas_text_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Style_Shadow_Direction type EINA_UNUSED) { ASYNC_BLOCK; _FMT_INFO_SET_START(shadow_direction, type); @@ -16476,52 +16476,52 @@ _efl_canvas_text_efl_text_style_shadow_direction_set(Eo *obj EINA_UNUSED, Efl_Ca } static Efl_Text_Style_Shadow_Direction -_efl_canvas_text_efl_text_style_shadow_direction_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_shadow_direction_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(shadow_direction); } static void -_efl_canvas_text_efl_text_style_shadow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_shadow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(shadow); } static void -_efl_canvas_text_efl_text_style_shadow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_shadow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(shadow); } static void -_efl_canvas_text_efl_text_style_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_glow_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(glow); } static void -_efl_canvas_text_efl_text_style_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_glow_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(glow); } static void -_efl_canvas_text_efl_text_style_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_glow2_color_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char r EINA_UNUSED, unsigned char g EINA_UNUSED, unsigned char b EINA_UNUSED, unsigned char a EINA_UNUSED) { ASYNC_BLOCK; _FMT_COLOR_SET(glow2); } static void -_efl_canvas_text_efl_text_style_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_glow2_color_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, unsigned char *r EINA_UNUSED, unsigned char *g EINA_UNUSED, unsigned char *b EINA_UNUSED, unsigned char *a EINA_UNUSED) { _FMT_COLOR_RET(glow2); } static void -_efl_canvas_text_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, +_efl_canvas_textblock_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *gfx_filter_name) { ASYNC_BLOCK; @@ -16545,26 +16545,26 @@ _efl_canvas_text_efl_text_style_gfx_filter_set(Eo *obj EINA_UNUSED, Efl_Canvas_T } static const char * -_efl_canvas_text_efl_text_style_gfx_filter_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_style_gfx_filter_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(gfx_filter)?_FMT(gfx_filter->name):NULL; } static void -_efl_canvas_text_efl_text_format_ellipsis_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_ellipsis_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(ellipsis, value); } static double -_efl_canvas_text_efl_text_format_ellipsis_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_ellipsis_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(ellipsis); } static void -_efl_canvas_text_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED) { ASYNC_BLOCK; _FMT_INFO_SET_START(wrap, wrap); @@ -16576,13 +16576,13 @@ _efl_canvas_text_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_D } static Efl_Text_Format_Wrap -_efl_canvas_text_efl_text_format_wrap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_wrap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT_INFO(wrap); } static void -_efl_canvas_text_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED) { ASYNC_BLOCK; if (o->multiline == enabled) return; @@ -16591,13 +16591,13 @@ _efl_canvas_text_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_T } static Eina_Bool -_efl_canvas_text_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return o->multiline; } static void -_efl_canvas_text_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Text_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) +_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) { ASYNC_BLOCK; if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE) @@ -16619,7 +16619,7 @@ _efl_canvas_text_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Can } static Efl_Text_Format_Horizontal_Alignment_Auto_Type -_efl_canvas_text_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { Efl_Text_Format_Horizontal_Alignment_Auto_Type ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE; @@ -16640,7 +16640,7 @@ _efl_canvas_text_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EI } static void -_efl_canvas_text_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o, double value) { ASYNC_BLOCK; @@ -16650,13 +16650,13 @@ _efl_canvas_text_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Text_D } static double -_efl_canvas_text_efl_text_format_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(halign); } static void -_efl_canvas_text_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Text_Data *o, +_efl_canvas_textblock_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o, double value) { ASYNC_BLOCK; @@ -16668,13 +16668,13 @@ _efl_canvas_text_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Text_Dat } static double -_efl_canvas_text_efl_text_format_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return o->valign; } static void -_efl_canvas_text_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) { ASYNC_BLOCK; double linerelgap = _FMT(linerelgap); @@ -16693,13 +16693,13 @@ _efl_canvas_text_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Tex } static double -_efl_canvas_text_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_linegap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(linegap); } static void -_efl_canvas_text_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, double value EINA_UNUSED) { ASYNC_BLOCK; double linegap = _FMT(linegap); @@ -16717,39 +16717,39 @@ _efl_canvas_text_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_ } static double -_efl_canvas_text_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_linerelgap_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(linerelgap); } static void -_efl_canvas_text_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, int value EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, int value EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(tabstops, value); } static int -_efl_canvas_text_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_tabstops_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(tabstops); } static void -_efl_canvas_text_efl_text_format_password_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_password_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED) { ASYNC_BLOCK; _FMT_SET(password, enabled); } static Eina_Bool -_efl_canvas_text_efl_text_format_password_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_password_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return _FMT(password); } static void -_efl_canvas_text_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *repch EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED, const char *repch EINA_UNUSED) { ASYNC_BLOCK; Eina_Stringshare *nrepch; @@ -16771,7 +16771,7 @@ _efl_canvas_text_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_C } static const char * -_efl_canvas_text_efl_text_format_replacement_char_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED) +_efl_canvas_textblock_efl_text_format_replacement_char_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) { return o->repch; } @@ -16785,7 +16785,7 @@ _efl_canvas_text_efl_text_format_replacement_char_get(const Eo *obj EINA_UNUSED, EAPI Eina_Bool _evas_textblock_check_item_node_link(Evas_Object *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); Evas_Object_Textblock_Paragraph *par; Evas_Object_Textblock_Line *ln; Evas_Object_Textblock_Item *it; @@ -16882,14 +16882,14 @@ ppar(Evas_Object_Textblock_Paragraph *par) #endif -#define EFL_CANVAS_TEXT_EXTRA_OPS \ - EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_text_efl_object_dbg_info_get) +#define EFL_CANVAS_TEXTBLOCK_EXTRA_OPS \ + EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_textblock_efl_object_dbg_info_get) EAPI Efl_Text_Cursor_Handle * evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED) { TB_HEAD_RETURN(NULL); - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); return o->cursor; } @@ -16930,7 +16930,7 @@ _text_layout_async_done(void *todo, Ecore_Thread *thread EINA_UNUSED) Text_Promise_Ctx *td = todo; Ctxt *c = td->c; Eo *obj = c->obj; - Efl_Canvas_Text_Data *o = c->o; + Efl_Canvas_Textblock_Data *o = c->o; Evas_Coord w_ret, h_ret; _layout_done(c, &w_ret, &h_ret); @@ -16967,7 +16967,7 @@ _text_layout_async_done(void *todo, Ecore_Thread *thread EINA_UNUSED) o->layout_jobs--; if (o->layout_jobs > 0) { - efl_canvas_text_async_layout(obj); + efl_canvas_textblock_async_layout(obj); } } @@ -16983,7 +16983,7 @@ _future_scheduler_get(void) } EOLIAN static Eina_Future * -_efl_canvas_text_async_layout(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) +_efl_canvas_textblock_async_layout(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) { Ctxt *c; Eina_Promise *p; @@ -17027,6 +17027,6 @@ _efl_canvas_text_async_layout(Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o) return f; } -#include "canvas/efl_canvas_text.eo.c" -#include "canvas/efl_canvas_text_eo.legacy.c" -#include "canvas/efl_canvas_text_factory.eo.c" // interface +#include "canvas/efl_canvas_textblock.eo.c" +#include "canvas/efl_canvas_textblock_eo.legacy.c" +#include "canvas/efl_canvas_textblock_factory.eo.c" // interface diff --git a/src/lib/evas/canvas/evas_textblock_hyphenation.x b/src/lib/evas/canvas/evas_textblock_hyphenation.x index a12a9d6b51..e434568abb 100644 --- a/src/lib/evas/canvas/evas_textblock_hyphenation.x +++ b/src/lib/evas/canvas/evas_textblock_hyphenation.x @@ -17,7 +17,7 @@ static size_t _hyphen_clients = 0; static void _dicts_hyphen_init(Eo *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!o->hyphenating) { @@ -98,7 +98,7 @@ _dicts_hyphen_free(void) static inline void _dicts_hyphen_detach(Eo *eo_obj) { - Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); + Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS); if (!o->hyphenating) return; o->hyphenating = EINA_FALSE; diff --git a/src/lib/evas/canvas/evas_textblock_legacy.h b/src/lib/evas/canvas/evas_textblock_legacy.h index 83f688d1fd..f3299112e1 100644 --- a/src/lib/evas/canvas/evas_textblock_legacy.h +++ b/src/lib/evas/canvas/evas_textblock_legacy.h @@ -138,7 +138,7 @@ typedef Eo Evas_Textblock; * @see evas_textblock_style_set() */ -typedef struct _Efl_Canvas_Text_Style Evas_Textblock_Style; +typedef struct _Efl_Canvas_Textblock_Style Evas_Textblock_Style; /** * @typedef Evas_Textblock_Cursor @@ -921,7 +921,7 @@ EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const ch * * @param[in] ch The charset name. * - * @ingroup Efl_Canvas_Text + * @ingroup Efl_Canvas_Textblock */ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch); @@ -930,7 +930,7 @@ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *c * * @return The charset name. * - * @ingroup Efl_Canvas_Text + * @ingroup Efl_Canvas_Textblock */ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj); @@ -945,7 +945,7 @@ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj); * * @since 1.1 * - * @ingroup Efl_Canvas_Text + * @ingroup Efl_Canvas_Textblock */ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align); @@ -960,7 +960,7 @@ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align); * * @since 1.1 * - * @ingroup Efl_Canvas_Text + * @ingroup Efl_Canvas_Textblock */ EAPI double evas_object_textblock_valign_get(const Evas_Object *obj); @@ -1056,7 +1056,7 @@ EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur); * @ingroup Evas_Textblock */ EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj); -#include "canvas/efl_canvas_text_eo.legacy.h" +#include "canvas/efl_canvas_textblock_eo.legacy.h" /** * @} */ diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build index 07dd725b28..92ed277f87 100644 --- a/src/lib/evas/canvas/meson.build +++ b/src/lib/evas/canvas/meson.build @@ -39,7 +39,7 @@ pub_eo_files = [ 'efl_canvas_animation_group.eo', 'efl_canvas_animation_group_parallel.eo', 'efl_canvas_animation_group_sequential.eo', - 'efl_canvas_text_factory.eo', + 'efl_canvas_textblock_factory.eo', 'efl_canvas_rectangle.eo', 'efl_canvas_object.eo', 'efl_gfx_vg_value_provider.eo', @@ -55,7 +55,7 @@ pub_eo_files = [ 'efl_gfx_mapping.eo', 'efl_canvas_event_grabber.eo', 'efl_text_cursor.eo', - 'efl_canvas_text.eo', + 'efl_canvas_textblock.eo', 'efl_text_attribute_factory.eo', 'efl_canvas_object_animation.eo', ] @@ -106,7 +106,7 @@ evas_legacy_h = files([ 'efl_canvas_event_grabber_eo.legacy.h', 'efl_canvas_group_eo.legacy.h', 'efl_canvas_object_eo.legacy.h', - 'efl_canvas_text_eo.legacy.h', + 'efl_canvas_textblock_eo.legacy.h', 'efl_canvas_vg_container_eo.legacy.h', 'efl_canvas_vg_node_eo.legacy.h', 'efl_canvas_vg_object_eo.legacy.h', diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 4c33a8fd43..786be4a3f0 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -49,7 +49,7 @@ static const char *style_buf = fail_if(strcmp(style_buf, evas_textblock_style_get(st))); \ evas_object_textblock_style_set(tb, st); \ cur = evas_object_textblock_cursor_new(tb); \ - cur_obj =efl_canvas_text_cursor_create(tb);\ + cur_obj =efl_canvas_textblock_cursor_create(tb);\ (void) cur_obj;\ (void) cur;\ do \ @@ -4319,8 +4319,8 @@ EFL_START_TEST(evas_textblock_annotation) START_TB_TEST(); Efl_Text_Cursor *start, *end; - start = efl_canvas_text_cursor_create(tb); - end = efl_canvas_text_cursor_create(tb); + start = efl_canvas_textblock_cursor_create(tb); + end = efl_canvas_textblock_cursor_create(tb); const char *buf = "This text will check annotation." @@ -4353,19 +4353,19 @@ EFL_END_TEST; static const char *efl_style_buf = "" TEST_FONT " font_size=10 color=#000 text_class=entry"; -#define START_EFL_CANVAS_TEXT_TEST() \ +#define START_EFL_CANVAS_TEXTBLOCK_TEST() \ Evas *evas; \ Eo *txt; \ Efl_Text_Cursor_Handle *cur; \ Efl_Text_Cursor *cur_obj; \ evas = EVAS_TEST_INIT_EVAS(); \ evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \ - txt = efl_add(EFL_CANVAS_TEXT_CLASS, evas); \ + txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \ fail_if(!txt); \ - efl_canvas_text_newline_as_paragraph_separator_set(txt, EINA_FALSE); \ - efl_canvas_text_style_apply(txt, efl_style_buf); \ - fail_if(!efl_canvas_text_all_styles_get(txt)); \ - cur_obj = efl_canvas_text_cursor_create(txt);\ + efl_canvas_textblock_newline_as_paragraph_separator_set(txt, EINA_FALSE); \ + efl_canvas_textblock_style_apply(txt, efl_style_buf); \ + fail_if(!efl_canvas_textblock_all_styles_get(txt)); \ + cur_obj = efl_canvas_textblock_cursor_create(txt);\ cur = evas_object_textblock_cursor_new(txt); \ fail_if(!cur); \ do \ @@ -4373,7 +4373,7 @@ do \ } \ while (0) -#define END_EFL_CANVAS_TEXT_TEST() \ +#define END_EFL_CANVAS_TEXTBLOCK_TEST() \ do \ { \ efl_del(cur_obj); \ @@ -4383,11 +4383,11 @@ do \ } \ while (0) -EFL_START_TEST(efl_canvas_text_simple) +EFL_START_TEST(efl_canvas_textblock_simple) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); - /* It is simple test for Efl_Canvas_Text. + /* It is simple test for Efl_Canvas_Textblock. * The main object is "txt". */ const char *buf = "This is a
test."; efl_text_set(txt, buf); @@ -4403,7 +4403,7 @@ EFL_START_TEST(efl_canvas_text_simple) password = efl_text_password_get(txt); fail_if(password); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST @@ -4421,7 +4421,7 @@ EFL_START_TEST(efl_text) * Russian 't' in the beginnning to create additional item.*/ /*01234 5 6789012345678 19 01234 */ efl_text_set(tb, "тest \u202bנסיוןabcנסיון\u202c bang"); - size = efl_canvas_text_size_native_get(tb); + size = efl_canvas_textblock_size_native_get(tb); nw = size.w; nh = size.h; @@ -4445,9 +4445,9 @@ EFL_START_TEST(efl_text) } EFL_END_TEST -EFL_START_TEST(efl_canvas_text_cursor) +EFL_START_TEST(efl_canvas_textblock_cursor) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); int pos; const char *buf = "abcdefghij"; @@ -4469,24 +4469,24 @@ EFL_START_TEST(efl_canvas_text_cursor) pos = efl_text_cursor_position_get(cursor1); ck_assert_int_eq(pos, -1); - efl_canvas_text_cursor_add(txt, cursor1); + efl_canvas_textblock_cursor_add(txt, cursor1); efl_text_cursor_position_set(cursor1, 1); pos = efl_text_cursor_position_get(cursor1); ck_assert_int_eq(pos, 1); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST -EFL_START_TEST(efl_canvas_text_markup) +EFL_START_TEST(efl_canvas_textblock_markup) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); Efl_Text_Cursor *start, *end; char *res; - start = efl_canvas_text_cursor_create(txt); - end = efl_canvas_text_cursor_create(txt); + start = efl_canvas_textblock_cursor_create(txt); + end = efl_canvas_textblock_cursor_create(txt); efl_text_set(txt, "\n\n\n"); @@ -4503,13 +4503,13 @@ EFL_START_TEST(efl_canvas_text_markup) ck_assert_str_eq(res, "bc
"); free(res); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST -EFL_START_TEST(efl_canvas_text_markup_invalid_escape) +EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); char * text1 = "Hello"; char * text2 = "Hello&123"; @@ -4517,22 +4517,22 @@ EFL_START_TEST(efl_canvas_text_markup_invalid_escape) Eina_Size2D fw1, fw2, fw3; efl_text_markup_set(txt,text1); - fw1 = efl_canvas_text_size_native_get(txt); + fw1 = efl_canvas_textblock_size_native_get(txt); efl_text_markup_set(txt,text2); - fw2 = efl_canvas_text_size_native_get(txt); + fw2 = efl_canvas_textblock_size_native_get(txt); fail_if(fw2.w <= fw1.w); efl_text_markup_set(txt,text3); - fw3 = efl_canvas_text_size_native_get(txt); + fw3 = efl_canvas_textblock_size_native_get(txt); fail_if(fw3.w <= fw2.w); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST EFL_START_TEST(efl_text_font) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); efl_text_set(txt, "\n\n\n"); @@ -4562,13 +4562,13 @@ EFL_START_TEST(efl_text_font) fail_if(30 != font_size); fail_if(strcmp(font,"arial")); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST -EFL_START_TEST(efl_canvas_text_style) +EFL_START_TEST(efl_canvas_textblock_style) { - START_EFL_CANVAS_TEXT_TEST(); + START_EFL_CANVAS_TEXTBLOCK_TEST(); unsigned char r, g, b, a; const char *style; @@ -4578,9 +4578,9 @@ EFL_START_TEST(efl_canvas_text_style) efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE); efl_text_tabstops_set(txt, 20); - efl_canvas_text_style_apply(txt, "color=#90E135"); + efl_canvas_textblock_style_apply(txt, "color=#90E135"); - style = efl_canvas_text_all_styles_get(txt); + style = efl_canvas_textblock_all_styles_get(txt); // from efl_style_buf fail_if(!strstr(style, "font=DejaVuSans,UnDotum,malayalam")); @@ -4593,41 +4593,41 @@ EFL_START_TEST(efl_canvas_text_style) fail_if(!strstr(style, "color=rgba(144,225,53,255)")); fail_if(!strstr(style, "password=off")); efl_text_password_set(txt, EINA_TRUE); - style = efl_canvas_text_all_styles_get(txt); + style = efl_canvas_textblock_all_styles_get(txt); fail_if(!strstr(style, "password=on")); - efl_canvas_text_style_apply(txt, "font_width=ultracondensed"); + efl_canvas_textblock_style_apply(txt, "font_width=ultracondensed"); ck_assert_int_eq(efl_text_font_width_get(txt), EFL_TEXT_FONT_WIDTH_ULTRACONDENSED); - efl_canvas_text_style_apply(txt, "wrap=none"); + efl_canvas_textblock_style_apply(txt, "wrap=none"); ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_NONE); - efl_canvas_text_style_apply(txt, "backing=on"); + efl_canvas_textblock_style_apply(txt, "backing=on"); ck_assert_int_eq(efl_text_backing_type_get(txt), EFL_TEXT_STYLE_BACKING_TYPE_ENABLED); - efl_canvas_text_style_apply(txt, "style=far_soft_shadow"); + efl_canvas_textblock_style_apply(txt, "style=far_soft_shadow"); ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SOFT_SHADOW); - efl_canvas_text_style_apply(txt, "style=glow,top_right"); + efl_canvas_textblock_style_apply(txt, "style=glow,top_right"); ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_GLOW); ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT); - efl_canvas_text_style_apply(txt, "style=far_shadow,top"); + efl_canvas_textblock_style_apply(txt, "style=far_shadow,top"); ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SHADOW); ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_TOP); - efl_canvas_text_style_apply(txt, "style=soft_outline,top,bottom"); + efl_canvas_textblock_style_apply(txt, "style=soft_outline,top,bottom"); ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_SOFT_OUTLINE); ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM); - efl_canvas_text_style_apply(txt, "color=#EF596C"); + efl_canvas_textblock_style_apply(txt, "color=#EF596C"); efl_text_normal_color_get(txt, &r, &g, &b, &a); ck_assert_int_eq(r, 0xEF); ck_assert_int_eq(g, 0x59); ck_assert_int_eq(b, 0x6C); ck_assert_int_eq(a, 0xFF); - END_EFL_CANVAS_TEXT_TEST(); + END_EFL_CANVAS_TEXTBLOCK_TEST(); } EFL_END_TEST @@ -4659,12 +4659,12 @@ void evas_test_textblock(TCase *tc) #endif tcase_add_test(tc, evas_textblock_text_iface); tcase_add_test(tc, evas_textblock_annotation); - tcase_add_test(tc, efl_canvas_text_simple); + tcase_add_test(tc, efl_canvas_textblock_simple); tcase_add_test(tc, efl_text); - tcase_add_test(tc, efl_canvas_text_cursor); - tcase_add_test(tc, efl_canvas_text_markup); - tcase_add_test(tc, efl_canvas_text_markup_invalid_escape); + tcase_add_test(tc, efl_canvas_textblock_cursor); + tcase_add_test(tc, efl_canvas_textblock_markup); + tcase_add_test(tc, efl_canvas_textblock_markup_invalid_escape); tcase_add_test(tc, efl_text_font); - tcase_add_test(tc, efl_canvas_text_style); + tcase_add_test(tc, efl_canvas_textblock_style); }