From ef5853b6d5196e44ae43a9a6561e5cc7b1daa7a0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 5 Mar 2019 17:00:37 -0500 Subject: [PATCH] efl_text_cursor: remove all legacy usage from eo files this takes the current generated output from eolian for legacy code in evas and adds it to the tree, then removes legacy references from the corresponding eo files. in the case where the entire eo file was for a legacy object, that eo file has been removed from the tree ref T7724 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8119 --- src/bin/elementary/test_efl_ui_text.c | 6 ++-- src/lib/edje/edje_legacy.c | 2 +- src/lib/efl/interfaces/efl_text_cursor.eo | 33 ++----------------- .../efl_ui_internal_text_interactive.c | 18 +++++----- src/lib/elementary/efl_ui_text.c | 28 ++++++++-------- src/lib/evas/canvas/evas_object_textblock.c | 4 +-- 6 files changed, 31 insertions(+), 60 deletions(-) diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c index d7aa2a44e4..f8863b1201 100644 --- a/src/bin/elementary/test_efl_ui_text.c +++ b/src/bin/elementary/test_efl_ui_text.c @@ -251,7 +251,7 @@ _on_factory_bt_image_clicked(void *data, const Efl_Event *event EINA_UNUSED) image_idx = (image_idx + 1) % IMAGES_SZ; efl_text_cursor_item_insert(en, - efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN), images[image_idx], "size=32x32"); printf("Inserted image: key = %s\n", images[image_idx]); } @@ -260,7 +260,7 @@ static void _on_factory_bt_emoticon_clicked(void *data, const Efl_Event *event EINA_UNUSED) { Evas_Object *en = data; - efl_text_cursor_item_insert(en, efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_item_insert(en, efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN), "emoticon/evil-laugh", "size=32x32"); } @@ -353,7 +353,7 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_text_font_set(en, "Sans", 14); efl_text_normal_color_set(en, 255, 255, 255, 255); - main_cur = efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN); + main_cur = efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_TYPE_MAIN); cur = efl_text_cursor_new(en); efl_text_cursor_position_set(en, cur, 2); diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c index 5906ff1969..edcc185a33 100644 --- a/src/lib/edje/edje_legacy.c +++ b/src/lib/edje/edje_legacy.c @@ -428,7 +428,7 @@ EAPI void edje_object_part_text_cursor_geometry_get(const Edje_Object *obj, const char * part, int *x, int *y, int *w, int *h) { efl_text_cursor_geometry_get(efl_part(obj, part), - efl_text_cursor_get(efl_part(obj, part), EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_get(efl_part(obj, part), EFL_TEXT_CURSOR_GET_TYPE_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, x, y, w, h, NULL, NULL, NULL, NULL ); diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo index 855c49f207..1f8b4ed59b 100644 --- a/src/lib/efl/interfaces/efl_text_cursor.eo +++ b/src/lib/efl/interfaces/efl_text_cursor.eo @@ -3,7 +3,6 @@ import efl_text_types; enum Efl.Text_Cursor_Get_Type { [[All available cursor states]] - legacy: efl_text_cursor_get; default = 0, [[Main cursor state (alias to "main")]] main, [[Main cursor state]] selection_begin, [[Selection begin cursor state]] @@ -17,7 +16,6 @@ enum Efl.Text_Cursor_Get_Type { enum Efl.Text_Cursor_Type { [[Text cursor types]] - legacy: efl_text_cursor_type; before, [[Cursor type before]] under [[Cursor type under]] } @@ -35,7 +33,6 @@ interface @beta Efl.Text_Cursor { @since 1.18 ]] get { - legacy: null; return: ptr(Efl.Text_Cursor_Cursor); [[Text cursor object]] } keys { @@ -44,8 +41,8 @@ interface @beta Efl.Text_Cursor { } @property cursor_position { [[Cursor position]] - set { legacy: null; } - get { legacy: null; } + set { } + get { } values { position: int; [[Cursor position]] } @@ -56,7 +53,6 @@ interface @beta Efl.Text_Cursor { @property cursor_content { [[The content of the cursor (the character under the cursor)]] get { - legacy: null; } values { content: Eina.Unicode; [[The unicode codepoint of the character]] @@ -75,7 +71,6 @@ interface @beta Efl.Text_Cursor { In this case $true is returned and $cx2, $cy2, $cw2, $ch2 are set. ]] get { - legacy: null; return: bool; [[ $true if split cursor, $false otherwise.]] } keys { @@ -95,19 +90,16 @@ interface @beta Efl.Text_Cursor { } cursor_new { [[Create new cursor]] - legacy: null; return: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } cursor_free { [[Free existing cursor]] - legacy: null; params { cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_equal { [[Check if two cursors are equal]] - legacy: null; params { @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]] @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]] @@ -116,7 +108,6 @@ interface @beta Efl.Text_Cursor { } cursor_compare { [[Compare two cursors]] - legacy: null; params { @cref cur1: Efl.Text_Cursor_Cursor; [[Cursor 1 object]] @cref cur2: Efl.Text_Cursor_Cursor; [[Cursor 2 object]] @@ -125,7 +116,6 @@ interface @beta Efl.Text_Cursor { } cursor_copy { [[Copy existing cursor]] - legacy: null; params { /* @out */ dst: ptr(Efl.Text_Cursor_Cursor); [[Destination cursor]] @cref src: Efl.Text_Cursor_Cursor; [[Source cursor]] @@ -133,105 +123,90 @@ interface @beta Efl.Text_Cursor { } cursor_char_next { [[Advances to the next character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_char_prev { [[Advances to the previous character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_cluster_next { [[Advances to the next grapheme cluster]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_cluster_prev { [[Advances to the previous grapheme cluster]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_char_first { [[Advances to the first character in this paragraph]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_char_last { [[Advances to the last character in this paragraph]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_word_start { [[Advance to current word start]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_word_end { [[Advance to current word end]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_line_char_first { [[Advance to current line first character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_line_char_last { [[Advance to current line last character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_first { [[Advance to current paragraph first character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_last { [[Advance to current paragraph last character]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_next { [[Advances to the start of the next text node]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_paragraph_prev { [[Advances to the end of the previous text node]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } } cursor_line_jump_by { [[Jump the cursor by the given number of lines]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] by: int; [[Number of lines]] @@ -239,7 +214,6 @@ interface @beta Efl.Text_Cursor { } cursor_coord_set { [[Set cursor coordinates]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] @in x: int; [[X coord to set by.]] @@ -250,7 +224,6 @@ interface @beta Efl.Text_Cursor { [[Set cursor coordinates according to grapheme clusters. It does not allow to put a cursor to the middle of a grapheme cluster. ]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] @in x: int; [[X coord to set by.]] @@ -261,7 +234,6 @@ interface @beta Efl.Text_Cursor { [[Adds text to the current cursor position and set the cursor to *after* the start of the text just added. ]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] @in text: string; [[Text to append (UTF-8 format).]] @@ -270,7 +242,6 @@ interface @beta Efl.Text_Cursor { } cursor_char_delete { [[Deletes a single character from position pointed by given cursor.]] - legacy: null; params { /* @inout */ cur: ptr(Efl.Text_Cursor_Cursor); [[Cursor object]] } diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c index 70571a94e5..eaada5c2a4 100644 --- a/src/lib/elementary/efl_ui_internal_text_interactive.c +++ b/src/lib/elementary/efl_ui_internal_text_interactive.c @@ -75,7 +75,7 @@ static Eina_Bool _entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos) { Efl_Canvas_Text *obj = data; - Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); const char *str; if (text) @@ -177,7 +177,7 @@ 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_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); int cursor_pos; int preedit_start_pos, preedit_end_pos; @@ -330,7 +330,7 @@ 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_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Ecore_IMF_Event_Delete_Surrounding *ev = event_info; Evas_Textblock_Cursor *del_start, *del_end; @@ -374,7 +374,7 @@ 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_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); Ecore_IMF_Event_Selection *ev = event_info; @@ -465,7 +465,7 @@ _focus_in_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void if (!en->imf_context) return; - cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); ecore_imf_context_focus_in(en->imf_context); _entry_imf_cursor_info_set(obj, cur, en); #endif @@ -727,7 +727,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void /* FIXME: Maybe allow selctions to happen even when not editable. */ if (!en->editable) return; - cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); old_cur_pos = evas_textblock_cursor_pos_get(cur); if (old_cur_pos < 0) return; @@ -1112,7 +1112,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN Evas_Coord cx, cy; Evas_Event_Mouse_Down *ev = event_info; Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); - Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Evas_Textblock_Cursor *tc = NULL; Eina_Bool dosel = EINA_FALSE; Eina_Bool shift; @@ -1223,7 +1223,7 @@ _mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void { Evas_Coord cx, cy; Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); - Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Evas_Event_Mouse_Up *ev = event_info; if ((!ev) || (ev->button != 1)) return; @@ -1264,7 +1264,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo { Evas_Coord cx, cy; Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS); - Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); Evas_Event_Mouse_Move *ev = event_info; Evas_Coord x, y, w, h; Evas_Textblock_Cursor *tc; diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c index 1a50a7494d..eb18a80233 100644 --- a/src/lib/elementary/efl_ui_text.c +++ b/src/lib/elementary/efl_ui_text.c @@ -611,7 +611,7 @@ _selection_data_cb(void *data EINA_UNUSED, Eo *obj, { efl_canvas_text_range_delete(obj, start, end); } - cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + cur = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); info.insert = EINA_TRUE; info.position = efl_text_cursor_position_get(obj, cur); info.length = len; @@ -834,7 +834,7 @@ _cursor_geometry_recalc(Evas_Object *obj) x = y = w = h = 0; Efl_Text_Cursor_Cursor *main_cur = - efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); efl_text_cursor_geometry_get(obj, main_cur, EFL_TEXT_CURSOR_TYPE_BEFORE, @@ -995,7 +995,7 @@ _efl_ui_text_efl_ui_widget_interest_region_get(const Eo *obj EINA_UNUSED, Efl_Ui Eina_Rect r = {}; efl_text_cursor_geometry_get(obj, - efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, &r.x, &r.y, &r.w, &r.h, NULL, NULL, NULL, NULL); @@ -1705,7 +1705,7 @@ _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler) pos = efl_gfx_entity_position_get(sd->text_obj); efl_text_cursor_geometry_get(obj, - efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, &cx, &cy, &cw, &ch, NULL, NULL, NULL, NULL); @@ -1743,7 +1743,7 @@ _start_handler_mouse_down_cb(void *data, /* Get the cursors */ efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); - main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN); + main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); start_pos = efl_text_cursor_position_get(text_obj, sel_start); end_pos = efl_text_cursor_position_get(text_obj, sel_end); @@ -1802,7 +1802,7 @@ _start_handler_mouse_move_cb(void *data, /* Set the main cursor. */ efl_text_cursor_position_set(sd->text_obj, - efl_text_cursor_get(sd->text_obj, EFL_TEXT_CURSOR_GET_MAIN), pos); + efl_text_cursor_get(sd->text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), pos); ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); sd->long_pressed = EINA_FALSE; @@ -1825,7 +1825,7 @@ _end_handler_mouse_down_cb(void *data, Eo *text_obj = sd->text_obj; efl_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end); - main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN); + main_cur = efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); start_pos = efl_text_cursor_position_get(text_obj, sel_start); end_pos = efl_text_cursor_position_get(text_obj, sel_end); @@ -1883,7 +1883,7 @@ _end_handler_mouse_move_cb(void *data, efl_text_cursor_coord_set(sd->text_obj, sd->sel_handler_cursor, cx, cy); pos = efl_text_cursor_position_get(sd->text_obj, sd->sel_handler_cursor); /* Set the main cursor. */ - efl_text_cursor_position_set(sd->text_obj, efl_text_cursor_get(data, EFL_TEXT_CURSOR_GET_MAIN), pos); + efl_text_cursor_position_set(sd->text_obj, efl_text_cursor_get(data, EFL_TEXT_CURSOR_GET_TYPE_MAIN), pos); ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); sd->long_pressed = EINA_FALSE; } @@ -2384,7 +2384,7 @@ _efl_ui_text_selection_handler_disabled_get(const Eo *obj EINA_UNUSED, Efl_Ui_Te static void _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry) { - Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); efl_text_cursor_text_insert(obj, cur_obj, entry); sd->text_changed = EINA_TRUE; elm_layout_sizing_eval(obj); @@ -2987,13 +2987,13 @@ fail: EOLIAN static int _efl_ui_text_efl_access_text_caret_offset_get(const Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED) { - return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN)); + return efl_text_cursor_position_get(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN)); } EOLIAN static Eina_Bool _efl_ui_text_efl_access_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset) { - efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN), offset); + efl_text_cursor_position_set(obj, efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), offset); return EINA_TRUE; } @@ -3300,7 +3300,7 @@ _efl_ui_text_efl_access_editable_text_text_content_set(Eo *obj, Efl_Ui_Text_Data EOLIAN static Eina_Bool _efl_ui_text_efl_access_editable_text_insert(Eo *obj, Efl_Ui_Text_Data *pd, const char *string, int position) { - Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); efl_text_cursor_position_set(obj, cur_obj, position); _efl_ui_text_entry_insert(obj, pd, string); @@ -3350,7 +3350,7 @@ _efl_ui_text_efl_access_editable_text_delete(Eo *obj, Efl_Ui_Text_Data *pd, int EOLIAN static Eina_Bool _efl_ui_text_efl_access_editable_text_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position) { - Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_MAIN); + Efl_Text_Cursor_Cursor *cur_obj = efl_text_cursor_get(obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); efl_text_cursor_position_set(obj, cur_obj, position); efl_ui_text_selection_paste(obj); return EINA_TRUE; @@ -3471,7 +3471,7 @@ _update_text_cursors(Eo *obj) xx = yy = ww = hh = -1; off =_decoration_calc_offset(sd); bidi_cursor = efl_text_cursor_geometry_get(obj, - efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_MAIN), + efl_text_cursor_get(text_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN), EFL_TEXT_CURSOR_TYPE_BEFORE, &xx, &yy, &ww, &hh, &xx2, &yy2, NULL, NULL); if (ww < 1) ww = 1; diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 34ebbe9b64..db5d94672b 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -16456,7 +16456,7 @@ ppar(Evas_Object_Textblock_Paragraph *par) EOLIAN static Efl_Text_Cursor_Cursor * _efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, Efl_Canvas_Text_Data *o, Efl_Text_Cursor_Get_Type get_type) { - if (get_type > EFL_TEXT_CURSOR_GET_MAIN) + if (get_type > EFL_TEXT_CURSOR_GET_TYPE_MAIN) { ERR("Unsupported cursor types other than main!"); } @@ -16466,7 +16466,7 @@ _efl_canvas_text_efl_text_cursor_text_cursor_get(const Eo *eo_obj EINA_UNUSED, E EAPI Efl_Text_Cursor_Cursor * evas_object_textblock_cursor_get(const Evas_Object *eo_obj EINA_UNUSED) { - return efl_text_cursor_get(eo_obj, EFL_TEXT_CURSOR_GET_MAIN); + return efl_text_cursor_get(eo_obj, EFL_TEXT_CURSOR_GET_TYPE_MAIN); } EOLIAN static Efl_Text_Cursor_Cursor *