Efl.Ui.Text: remove unwanted api

2 files changed, 58 insertions, 967 deletions

diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 2c60c4374c..5b7d06097d 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -233,6 +233,11 @@ static Eina_Bool _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event
 static Eina_Bool _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
 static Eina_Bool _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
 static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
+static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
+static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
+static void _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
+static void _efl_ui_text_anchor_hover_parent_set(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *parent);
+static const char* _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
 
 static Mod_Api *
 _module_find(Evas_Object *obj EINA_UNUSED)
@@ -460,69 +465,6 @@ _validate(Evas_Object *obj)
    eina_strbuf_free(buf);
 }
 
-static Elm_Entry_Markup_Filter *
-_filter_new(Elm_Entry_Filter_Cb func,
-            void *data)
-{
-   Elm_Entry_Markup_Filter *tf = ELM_NEW(Elm_Entry_Markup_Filter);
-
-   if (!tf) return NULL;
-
-   tf->func = func;
-   tf->orig_data = data;
-   if (func == elm_entry_filter_limit_size)
-     {
-        Elm_Entry_Filter_Limit_Size *lim = data, *lim2;
-
-        if (!data)
-          {
-             free(tf);
-
-             return NULL;
-          }
-
-        lim2 = malloc(sizeof(Elm_Entry_Filter_Limit_Size));
-        if (!lim2)
-          {
-             free(tf);
-
-             return NULL;
-          }
-        memcpy(lim2, lim, sizeof(Elm_Entry_Filter_Limit_Size));
-        tf->data = lim2;
-     }
-   else if (func == elm_entry_filter_accept_set)
-     {
-        Elm_Entry_Filter_Accept_Set *as = data, *as2;
-
-        if (!data)
-          {
-             free(tf);
-
-             return NULL;
-          }
-        as2 = malloc(sizeof(Elm_Entry_Filter_Accept_Set));
-        if (!as2)
-          {
-             free(tf);
-
-             return NULL;
-          }
-        if (as->accepted)
-          as2->accepted = eina_stringshare_add(as->accepted);
-        else
-          as2->accepted = NULL;
-        if (as->rejected)
-          as2->rejected = eina_stringshare_add(as->rejected);
-        else
-          as2->rejected = NULL;
-        tf->data = as2;
-     }
-   else
-     tf->data = data;
-   return tf;
-}
-
 static void
 _filter_free(Elm_Entry_Markup_Filter *tf)
 {
@@ -1370,7 +1312,7 @@ _return_key_enabled_check(Evas_Object *obj)
 
    if (!sd->auto_return_key) return;
 
-   if (efl_ui_text_is_empty(obj) == EINA_TRUE)
+   if (efl_canvas_text_is_empty_get(obj) == EINA_TRUE)
      return_key_disabled = EINA_TRUE;
 
    efl_ui_text_input_panel_return_key_disabled_set(obj, return_key_disabled);
@@ -1694,7 +1636,7 @@ _selection_clear(void *data, Elm_Sel_Type selection)
    if ((selection == ELM_SEL_TYPE_CLIPBOARD) ||
        (selection == ELM_SEL_TYPE_PRIMARY))
      {
-        efl_ui_text_select_none(data);
+        _efl_ui_text_select_none(data, sd);
      }
 }
 
@@ -2384,9 +2326,11 @@ _entry_selection_start_signal_cb(void *data,
    const Eina_List *l;
    Evas_Object *entry;
 
+   EFL_UI_TEXT_DATA_GET(obj, sd);
+
    EINA_LIST_FOREACH(entries, l, entry)
      {
-        if (entry != data) efl_ui_text_select_none(entry);
+        if (entry != data) _efl_ui_text_select_none(entry, sd);
      }
    eo_event_callback_call
      (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL);
@@ -2400,7 +2344,8 @@ _entry_selection_all_signal_cb(void *data,
                                const char *emission EINA_UNUSED,
                                const char *source EINA_UNUSED)
 {
-   efl_ui_text_select_all(data);
+   EFL_UI_TEXT_DATA_GET(obj, sd);
+   _efl_ui_text_select_all(data, sd);
 }
 
 static void
@@ -2409,7 +2354,9 @@ _entry_selection_none_signal_cb(void *data,
                                 const char *emission EINA_UNUSED,
                                 const char *source EINA_UNUSED)
 {
-   efl_ui_text_select_none(data);
+   EFL_UI_TEXT_DATA_GET(obj, sd);
+
+   _efl_ui_text_select_none(data, sd);
 }
 
 static void
@@ -2633,7 +2580,8 @@ _anchor_hover_del_cb(void *data,
 static Eina_Bool
 _anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
 {
-   efl_ui_text_anchor_hover_end(data);
+   EFL_UI_TEXT_DATA_GET(data, sd);
+   _efl_ui_text_anchor_hover_end(data, sd);
 
    return EINA_TRUE;
 }
@@ -2892,84 +2840,6 @@ _item_get(void *data,
    return o;
 }
 
-static Eina_Bool
-_entry_has_new_line(const char *text)
-{
-   if (!text) return EINA_FALSE;
-
-   while (*text)
-     {
-        if (!strncmp(text, "<br", 3) || !strncmp(text, "<ps", 3))
-          {
-             if (text[4] == '>' || ((text[4] == '/') && (text[5] == '>')))
-               {
-                  return EINA_TRUE;
-               }
-          }
-        text++;
-     }
-
-   return EINA_FALSE;
-}
-
-static char *
-_entry_remove_new_line(const char *text)
-{
-   Eina_Strbuf *str;
-   char *new_text;
-
-   if (!_entry_has_new_line(text)) return NULL;
-
-   str = eina_strbuf_new();
-   eina_strbuf_append(str, text);
-   eina_strbuf_replace_all(str, "<br>", "");
-   eina_strbuf_replace_all(str, "<br/>", "");
-   eina_strbuf_replace_all(str, "<ps>", "");
-   eina_strbuf_replace_all(str, "<ps/>", "");
-   new_text = eina_strbuf_string_steal(str);
-   eina_strbuf_free(str);
-   return new_text;
-}
-
-static void
-_entry_new_line_filter_init(Evas_Object *obj)
-{
-#if 0
-   const char *text;
-   char *text2 = NULL;
-
-   if (efl_ui_text_is_empty(obj)) return;
-
-   text = efl_ui_text_entry_get(obj);
-   text2 = _entry_remove_new_line(text);
-   if (text2)
-     {
-        efl_ui_text_entry_set(obj, text2);
-        free(text2);
-     }
-#else
-   (void) obj;
-#endif
-}
-
-static void
-_entry_new_line_filter_cb(void *data EINA_UNUSED,
-                          Evas_Object *entry EINA_UNUSED,
-                          char **text)
-{
-   char *ret;
-
-   if (!*text) return;
-
-   ret = _entry_remove_new_line(*text);
-
-   if (ret)
-     {
-        free(*text);
-        *text = ret;
-     }
-}
-
 static void
 _markup_filter_cb(void *data,
                   Evas_Object *edje EINA_UNUSED,
@@ -4018,8 +3888,8 @@ _efl_ui_text_evas_object_smart_del(Eo *obj, Efl_Ui_Text_Data *sd)
    if (sd->scroll)
      elm_interface_scrollable_content_viewport_resize_cb_set(obj, NULL);
 
-   efl_ui_text_anchor_hover_end(obj);
-   efl_ui_text_anchor_hover_parent_set(obj, NULL);
+   _efl_ui_text_anchor_hover_end(obj, sd);
+   _efl_ui_text_anchor_hover_parent_set(obj, sd, NULL);
 
    evas_event_freeze(evas_object_evas_get(obj));
 
@@ -4174,65 +4044,6 @@ _efl_ui_text_eo_base_constructor(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 }
 
 EOLIAN static void
-_efl_ui_text_text_style_user_push(Eo *obj, Efl_Ui_Text_Data *sd, const char *style)
-{
-   edje_object_part_text_style_user_push(sd->entry_edje, "elm.text", style);
-   elm_obj_widget_theme_apply(obj);
-}
-
-EOLIAN static void
-_efl_ui_text_text_style_user_pop(Eo *obj, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_style_user_pop(sd->entry_edje, "elm.text");
-
-   elm_obj_widget_theme_apply(obj);
-}
-
-EOLIAN static const char*
-_efl_ui_text_text_style_user_peek(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_style_user_peek(sd->entry_edje, "elm.text");
-}
-
-EOLIAN static void
-_efl_ui_text_single_line_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool single_line)
-{
-   if (sd->single_line == single_line) return;
-
-   sd->single_line = single_line;
-   sd->line_wrap = ELM_WRAP_NONE;
-   if (efl_ui_text_cnp_mode_get(obj) == ELM_CNP_MODE_MARKUP)
-     efl_ui_text_cnp_mode_set(obj, ELM_CNP_MODE_NO_IMAGE);
-   if (sd->single_line)
-     {
-        _entry_new_line_filter_init(obj);
-        efl_ui_text_markup_filter_append(obj, _entry_new_line_filter_cb, NULL);
-     }
-   else
-     {
-        efl_ui_text_markup_filter_remove(obj, _entry_new_line_filter_cb, NULL);
-     }
-   elm_obj_widget_theme_apply(obj);
-
-   if (sd->scroll)
-     {
-        if (sd->single_line)
-           elm_interface_scrollable_policy_set(obj, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-        else
-          {
-             elm_interface_scrollable_policy_set(obj, sd->policy_h, sd->policy_v);
-          }
-        elm_layout_sizing_eval(obj);
-     }
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_single_line_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->single_line;
-}
-
-EOLIAN static void
 _efl_ui_text_password_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool password)
 {
    password = !!password;
@@ -4276,37 +4087,14 @@ _efl_ui_text_password_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
    return sd->password;
 }
 
-EOLIAN static void
-_efl_ui_text_entry_append(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *entry)
-{
-   if (!entry) entry = "";
-
-   sd->changed = EINA_TRUE;
-   _entry_text_append(obj, entry, EINA_FALSE);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_is_empty(const Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_cursor_copy
-               (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN, EDJE_CURSOR_USER);
-   edje_object_part_text_cursor_pos_set
-                              (sd->entry_edje, "elm.text", EDJE_CURSOR_USER, 1);
-   if (edje_object_part_text_cursor_pos_get
-                            (sd->entry_edje, "elm.text", EDJE_CURSOR_USER) == 1)
-     return EINA_FALSE;
-
-   return EINA_TRUE;
-}
-
-EOLIAN static Evas_Object*
+static Evas_Object*
 _efl_ui_text_textblock_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
    return (Evas_Object *)edje_object_part_object_get
         (sd->entry_edje, "elm.text");
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
 {
    edje_object_calc_force(sd->entry_edje);
@@ -4314,11 +4102,15 @@ _efl_ui_text_calc_force(Eo *obj, Efl_Ui_Text_Data *sd)
    elm_layout_sizing_eval(obj);
 }
 
-EOLIAN static const char*
+static const char*
 _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
+   Efl_Canvas_Text_Cursor *start_obj, *end_obj;
+
    if ((sd->password)) return NULL;
-   return edje_object_part_text_selection_get(sd->entry_edje, "elm.text");
+
+   efl_ui_text_interactive_selection_cursors_get(obj, &start_obj, &end_obj);
+   return efl_canvas_text_range_text_get(obj, start_obj, end_obj);
 }
 
 EOLIAN static void
@@ -4334,32 +4126,16 @@ _efl_ui_text_selection_handler_disabled_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Dat
    return sd->sel_handler_disabled;
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_entry_insert(Eo *obj, Efl_Ui_Text_Data *sd, const char *entry)
 {
-   edje_object_part_text_insert(sd->entry_edje, "elm.text", entry);
+   Efl_Canvas_Text_Cursor *cur_obj = efl_canvas_text_cursor_get(obj);
+   efl_canvas_text_cursor_text_insert(cur_obj, entry);
    sd->changed = EINA_TRUE;
    elm_layout_sizing_eval(obj);
 }
 
 EOLIAN static void
-_efl_ui_text_line_wrap_set(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Wrap_Type wrap)
-{
-   if (sd->line_wrap == wrap) return;
-   sd->last_w = -1;
-   sd->line_wrap = wrap;
-   if (wrap == ELM_WRAP_NONE)
-     ELM_SAFE_FREE(sd->deferred_recalc_job, ecore_job_del);
-   elm_obj_widget_theme_apply(obj);
-}
-
-EOLIAN static Elm_Wrap_Type
-_efl_ui_text_line_wrap_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->line_wrap;
-}
-
-EOLIAN static void
 _efl_ui_text_editable_set(Eo *obj, Efl_Ui_Text_Data *sd, Eina_Bool editable)
 {
    if (sd->editable == editable) return;
@@ -4388,7 +4164,7 @@ _efl_ui_text_editable_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
    return sd->editable;
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
    if ((sd->password)) return;
@@ -4410,7 +4186,7 @@ _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
    _hide_selection_handler(obj);
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
    if ((sd->password)) return;
@@ -4425,7 +4201,7 @@ _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
    edje_object_part_text_select_all(sd->entry_edje, "elm.text");
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_select_region_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, int start, int end)
 {
    if ((sd->password)) return;
@@ -4450,133 +4226,11 @@ _efl_ui_text_select_region_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, int st
 }
 
 EOLIAN static void
-_efl_ui_text_select_region_get(Eo *obj, Efl_Ui_Text_Data *sd, int *start, int *end)
-{
-   if (!efl_ui_text_selection_get(obj))
-     {
-        if (start) *start = -1;
-        if (end) *end = -1;
-        return;
-     }
-
-   if (start)
-     *start = edje_object_part_text_cursor_pos_get(sd->entry_edje, "elm.text", EDJE_CURSOR_SELECTION_BEGIN);
-   if (end)
-     *end = edje_object_part_text_cursor_pos_get(sd->entry_edje, "elm.text", EDJE_CURSOR_SELECTION_END);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_geometry_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
-{
-   edje_object_part_text_cursor_geometry_get
-     (sd->entry_edje, "elm.text", x, y, w, h);
-   return EINA_TRUE;
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_next(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_next
-        (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_prev(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_prev
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_up(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_up
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_down(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_down
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_begin_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_cursor_begin_set
-     (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_end_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_cursor_end_set
-     (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_line_begin_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_cursor_line_begin_set
-     (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_line_end_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_cursor_line_end_set
-     (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_selection_begin(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   edje_object_part_text_select_begin(sd->entry_edje, "elm.text");
-}
-
-EOLIAN static void
 _efl_ui_text_cursor_selection_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
    edje_object_part_text_select_extend(sd->entry_edje, "elm.text");
 }
 
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_is_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_is_format_get
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_cursor_is_visible_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_is_visible_format_get
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static char*
-_efl_ui_text_cursor_content_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_content_get
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
-EOLIAN static void
-_efl_ui_text_cursor_pos_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, int pos)
-{
-   edje_object_part_text_cursor_pos_set
-     (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN, pos);
-   edje_object_message_signal_process(sd->entry_edje);
-}
-
-EOLIAN static int
-_efl_ui_text_cursor_pos_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return edje_object_part_text_cursor_pos_get
-            (sd->entry_edje, "elm.text", EDJE_CURSOR_MAIN);
-}
-
 EOLIAN static void
 _efl_ui_text_selection_cut(Eo *obj, Efl_Ui_Text_Data *sd)
 {
@@ -4691,51 +4345,6 @@ _efl_ui_text_item_provider_remove(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm
      }
 }
 
-EOLIAN static void
-_efl_ui_text_markup_filter_append(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm_Entry_Filter_Cb func, void *data)
-{
-   Elm_Entry_Markup_Filter *tf;
-
-   EINA_SAFETY_ON_NULL_RETURN(func);
-
-   tf = _filter_new(func, data);
-   if (!tf) return;
-
-   sd->markup_filters = eina_list_append(sd->markup_filters, tf);
-}
-
-EOLIAN static void
-_efl_ui_text_markup_filter_prepend(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm_Entry_Filter_Cb func, void *data)
-{
-   Elm_Entry_Markup_Filter *tf;
-
-   EINA_SAFETY_ON_NULL_RETURN(func);
-
-   tf = _filter_new(func, data);
-   if (!tf) return;
-
-   sd->markup_filters = eina_list_prepend(sd->markup_filters, tf);
-}
-
-EOLIAN static void
-_efl_ui_text_markup_filter_remove(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm_Entry_Filter_Cb func, void *data)
-{
-   Eina_List *l;
-   Elm_Entry_Markup_Filter *tf;
-
-   EINA_SAFETY_ON_NULL_RETURN(func);
-
-   EINA_LIST_FOREACH(sd->markup_filters, l, tf)
-     {
-        if ((tf->func == func) && ((!data) || (tf->orig_data == data)))
-          {
-             sd->markup_filters = eina_list_remove_list(sd->markup_filters, l);
-             _filter_free(tf);
-             return;
-          }
-     }
-}
-
 #if 0
 static const char *
 _text_get(const Evas_Object *obj)
@@ -4744,12 +4353,6 @@ _text_get(const Evas_Object *obj)
 }
 #endif
 
-EOLIAN static void
-_efl_ui_text_file_text_format_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Elm_Text_Format format)
-{
-   sd->format = format;
-}
-
 EOLIAN static Eina_Bool
 _efl_ui_text_efl_file_file_set(Eo *obj, Efl_Ui_Text_Data *sd, const char *file, const char *group EINA_UNUSED)
 {
@@ -4768,27 +4371,6 @@ _efl_ui_text_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const
 }
 
 EOLIAN static void
-_efl_ui_text_file_save(Eo *obj, Efl_Ui_Text_Data *sd)
-{
-   ELM_SAFE_FREE(sd->delay_write, ecore_timer_del);
-   _save_do(obj);
-   sd->delay_write = ecore_timer_add(EFL_UI_TEXT_DELAY_WRITE_TIME,
-                                     _delay_write, obj);
-}
-
-EOLIAN static void
-_efl_ui_text_autosave_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool auto_save)
-{
-   sd->auto_save = !!auto_save;
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_autosave_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->auto_save;
-}
-
-EOLIAN static void
 _efl_ui_text_cnp_mode_set(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Cnp_Mode cnp_mode)
 {
    Elm_Sel_Format format = ELM_SEL_FORMAT_MARKUP;
@@ -4914,32 +4496,6 @@ _efl_ui_text_scrollable_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_text_icon_visible_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool setting)
-{
-   if (!elm_layout_content_get(obj, "elm.swallow.icon")) return;
-
-   if (setting)
-     elm_layout_signal_emit(obj, "elm,action,show,icon", "elm");
-   else
-     elm_layout_signal_emit(obj, "elm,action,hide,icon", "elm");
-
-   elm_layout_sizing_eval(obj);
-}
-
-EOLIAN static void
-_efl_ui_text_end_visible_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, Eina_Bool setting)
-{
-   if (!elm_layout_content_get(obj, "elm.swallow.end")) return;
-
-   if (setting)
-     elm_layout_signal_emit(obj, "elm,action,show,end", "elm");
-   else
-     elm_layout_signal_emit(obj, "elm,action,hide,end", "elm");
-
-   elm_layout_sizing_eval(obj);
-}
-
-EOLIAN static void
 _efl_ui_text_elm_interface_scrollable_policy_set(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Scroller_Policy h, Elm_Scroller_Policy v)
 {
    sd->policy_h = h;
@@ -5173,7 +4729,7 @@ _anchor_parent_del_cb(void *data,
    sd->anchor_hover.hover_parent = NULL;
 }
 
-EOLIAN static void
+static void
 _efl_ui_text_anchor_hover_parent_set(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object *parent)
 {
    if (sd->anchor_hover.hover_parent)
@@ -5187,25 +4743,7 @@ _efl_ui_text_anchor_hover_parent_set(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Object
        _anchor_parent_del_cb, obj);
 }
 
-EOLIAN static Evas_Object*
-_efl_ui_text_anchor_hover_parent_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->anchor_hover.hover_parent;
-}
-
-EOLIAN static void
-_efl_ui_text_anchor_hover_style_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, const char *style)
-{
-   eina_stringshare_replace(&sd->anchor_hover.hover_style, style);
-}
-
-EOLIAN static const char*
-_efl_ui_text_anchor_hover_style_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->anchor_hover.hover_style;
-}
-
-EOLIAN static void
+static void
 _efl_ui_text_anchor_hover_end(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
 {
    ELM_SAFE_FREE(sd->anchor_hover.hover, evas_object_del);
@@ -5243,21 +4781,6 @@ _efl_ui_text_elm_widget_focus_direction_manager_is(Eo *obj EINA_UNUSED, Efl_Ui_T
    return EINA_FALSE;
 }
 
-EOLIAN static void
-_efl_ui_text_select_allow_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd, Eina_Bool allow)
-{
-   if (sd->sel_allow == allow) return;
-   sd->sel_allow = allow;
-
-   edje_obj_part_text_select_allow_set(sd->entry_edje, "elm.text", allow);
-}
-
-EOLIAN static Eina_Bool
-_efl_ui_text_select_allow_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd)
-{
-   return sd->sel_allow;
-}
-
 static void
 _efl_ui_text_class_constructor(Eo_Class *klass)
 {
@@ -5323,7 +4846,7 @@ _efl_ui_text_elm_interface_atspi_text_string_get(Eo *obj, Efl_Ui_Text_Data *_pd
    Evas_Object *tblk;
    char *ret = NULL;
 
-   tblk = efl_ui_text_textblock_get(obj);
+   tblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!tblk) goto fail;
 
    cur = evas_object_textblock_cursor_new(tblk);
@@ -5408,7 +4931,7 @@ _efl_ui_text_elm_interface_atspi_text_text_get(Eo *obj, Efl_Ui_Text_Data *_pd EI
    Evas_Object *tblk;
    char *ret = NULL;
 
-   tblk = efl_ui_text_textblock_get(obj);
+   tblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!tblk) goto fail;
 
    cur = evas_object_textblock_cursor_new(tblk);
@@ -5444,20 +4967,20 @@ fail:
 EOLIAN static int
 _efl_ui_text_elm_interface_atspi_text_caret_offset_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
-   return efl_ui_text_cursor_pos_get(obj);
+   return efl_canvas_text_cursor_position_get(obj);
 }
 
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_caret_offset_set(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int offset)
 {
-   efl_ui_text_cursor_pos_set(obj, offset);
+   efl_canvas_text_cursor_position_set(obj, offset);
    return EINA_TRUE;
 }
 
 EOLIAN static int
 _efl_ui_text_elm_interface_atspi_text_selections_count_get(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED)
 {
-   return efl_ui_text_selection_get(obj) ? 1 : 0;
+   return _efl_ui_text_selection_get(obj, _pd) ? 1 : 0;
 }
 
 EOLIAN static void
@@ -5473,7 +4996,7 @@ _efl_ui_text_elm_interface_atspi_text_selection_set(Eo *obj, Efl_Ui_Text_Data *_
 {
    if (selection_number != 0) return EINA_FALSE;
 
-   efl_ui_text_select_region_set(obj, start_offset, end_offset);
+   _efl_ui_text_select_region_set(obj, _pd, start_offset, end_offset);
 
    return EINA_TRUE;
 }
@@ -5482,14 +5005,14 @@ EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_selection_remove(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int selection_number)
 {
    if (selection_number != 0) return EINA_FALSE;
-   efl_ui_text_select_none(obj);
+   _efl_ui_text_select_none(obj, pd);
    return EINA_TRUE;
 }
 
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_selection_add(Eo *obj, Efl_Ui_Text_Data *pd EINA_UNUSED, int start_offset, int end_offset)
 {
-   efl_ui_text_select_region_set(obj, start_offset, end_offset);
+   _efl_ui_text_select_region_set(obj, pd, start_offset, end_offset);
 
    return EINA_TRUE;
 }
@@ -5507,7 +5030,7 @@ _efl_ui_text_elm_interface_atspi_text_offset_at_point_get(Eo *obj, Efl_Ui_Text_D
    Evas_Textblock_Cursor *cur;
    int ret;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return -1;
 
    cur = evas_object_textblock_cursor_new(txtblk);
@@ -5541,7 +5064,7 @@ _efl_ui_text_elm_interface_atspi_text_character_extents_get(Eo *obj, Efl_Ui_Text
    Evas_Textblock_Cursor *cur;
    int ret;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return EINA_FALSE;
 
    cur = evas_object_textblock_cursor_new(txtblk);
@@ -5574,7 +5097,7 @@ _efl_ui_text_elm_interface_atspi_text_range_extents_get(Eo *obj, Efl_Ui_Text_Dat
    int ret;
    int x, xx, y, yy;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return EINA_FALSE;
 
    cur1 = evas_object_textblock_cursor_new(txtblk);
@@ -5653,7 +5176,7 @@ _efl_ui_text_elm_interface_atspi_text_attribute_get(Eo *obj, Efl_Ui_Text_Data *_
    Evas_Object_Textblock_Node_Format *format;
    Elm_Atspi_Text_Attribute *attr;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return EINA_FALSE;
 
    cur1 = evas_object_textblock_cursor_new(txtblk);
@@ -5701,7 +5224,7 @@ _efl_ui_text_elm_interface_atspi_text_attributes_get(Eo *obj, Efl_Ui_Text_Data *
    Evas_Object_Textblock_Node_Format *format;
    Elm_Atspi_Text_Attribute *attr;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return NULL;
 
    cur1 = evas_object_textblock_cursor_new(txtblk);
@@ -5742,7 +5265,7 @@ _efl_ui_text_elm_interface_atspi_text_default_attributes_get(Eo *obj EINA_UNUSED
    const Evas_Object_Textblock_Node_Format *format;
    Elm_Atspi_Text_Attribute *attr;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return NULL;
 
    format = evas_textblock_node_format_first_get(txtblk);
@@ -5776,8 +5299,9 @@ _efl_ui_text_elm_interface_atspi_text_editable_content_set(Eo *obj, Efl_Ui_Text_
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, const char *string, int position)
 {
-   efl_ui_text_cursor_pos_set(obj, position);
-   efl_ui_text_entry_insert(obj, string);
+   Efl_Canvas_Text_Cursor *cur_obj = efl_canvas_text_cursor_get(obj);
+   efl_canvas_text_cursor_position_set(cur_obj, position);
+   _efl_ui_text_entry_insert(obj, _pd, string);
 
    return EINA_TRUE;
 }
@@ -5785,7 +5309,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_insert(Eo *obj, Efl_Ui_Text_Data
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_copy(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int start, int end)
 {
-   efl_ui_text_select_region_set(obj, start, end);
+   _efl_ui_text_select_region_set(obj, _pd, start, end);
    efl_ui_text_selection_copy(obj);
 
    return EINA_TRUE;
@@ -5797,7 +5321,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
    Evas_Object *txtblk;
    Evas_Textblock_Cursor *cur1, *cur2;
 
-   txtblk = efl_ui_text_textblock_get(obj);
+   txtblk = _efl_ui_text_textblock_get(obj, _pd);
    if (!txtblk) return EINA_FALSE;
 
    cur1 = evas_object_textblock_cursor_new(txtblk);
@@ -5818,7 +5342,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
    evas_textblock_cursor_free(cur1);
    evas_textblock_cursor_free(cur2);
 
-   efl_ui_text_calc_force(obj);
+   _efl_ui_text_calc_force(obj, _pd);
 
    return EINA_TRUE;
 }
@@ -5826,7 +5350,8 @@ _efl_ui_text_elm_interface_atspi_text_editable_delete(Eo *obj, Efl_Ui_Text_Data
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int position)
 {
-   efl_ui_text_cursor_pos_set(obj, position);
+   Efl_Canvas_Text_Cursor *cur_obj = efl_canvas_text_cursor_get(obj);
+   efl_canvas_text_cursor_position_set(cur_obj, position);
    efl_ui_text_selection_paste(obj);
    return EINA_TRUE;
 }
@@ -5834,7 +5359,7 @@ _efl_ui_text_elm_interface_atspi_text_editable_paste(Eo *obj, Efl_Ui_Text_Data *
 EOLIAN static Eina_Bool
 _efl_ui_text_elm_interface_atspi_text_editable_cut(Eo *obj, Efl_Ui_Text_Data *_pd EINA_UNUSED, int start, int end)
 {
-   efl_ui_text_select_region_set(obj, start, end);
+   _efl_ui_text_select_region_set(obj, _pd, start, end);
    efl_ui_text_selection_cut(obj);
    return EINA_TRUE;
 }
@@ -5959,7 +5484,6 @@ _update_text_selection(Eo *obj, Eo *text_obj)
    efl_file_get(sd->entry_edje, &file, NULL);
 
    efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
-   efl_ui_text_interactive_selection_cursors_get(text_obj, &sel_start, &sel_end);
 
 #if 0
      {
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index be3f7eeb4b..6911abb2c4 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -80,24 +80,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             cnp_mode: Elm.Cnp_Mode; [[One of #Elm_Cnp_Mode: #ELM_CNP_MODE_MARKUP, #ELM_CNP_MODE_NO_IMAGE, #ELM_CNP_MODE_PLAINTEXT.]]
          }
       }
-      @property file_text_format {
-         [[Text format used to load and save the file, which could be plain text or markup text.
-
-           Default is $ELM_TEXT_FORMAT_PLAIN_UTF8, if you want to use
-           $ELM_TEXT_FORMAT_MARKUP_UTF8 then you need to set the text format
-           before calling @Efl.File.file.set.
-
-           You could also set it before a call to @.file_save
-           in order to save with the given format.
-         ]]
-
-         set {
-            [[Use it before calling @Efl.File.file.set or @.file_save.]]
-         }
-         values {
-            format: Elm.Text_Format(Elm.Text_Format.plain_utf8); [[ The file format ]]
-         }
-      }
       @property input_panel_language {
          set {
             [[Set the language mode of the input panel.
@@ -174,44 +156,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             if not, the entry is read-only and no user input is allowed.]]
          }
       }
-      @property anchor_hover_style {
-         set {
-            [[Set the style that the hover should use
-
-              When creating the popup hover, entry will request that it's
-              themed according to $style.
-
-              Setting style no $null means disabling automatic hover.
-            ]]
-         }
-         get {
-            [[Get the style that the hover should use.]]
-         }
-         values {
-            style: string @nullable; [[The style to use for the underlying hover.]]
-         }
-      }
-      @property single_line {
-         set {
-            [[Sets the entry to single line mode.
-
-              In single line mode, entries don't ever wrap when the text reaches the
-              edge, and instead they keep growing horizontally. Pressing the $Enter
-              key will generate an $"activate" event instead of adding a new line.
-
-              When $single_line is $false, line wrapping takes effect again
-              and pressing enter will break the text into a different line
-              without generating any events.
-            ]]
-         }
-         get {
-            [[Get whether the entry is set to be single line.]]
-         }
-         values {
-            single_line: bool; [[If true, the text in the entry
-            will be on a single line.]]
-         }
-      }
       @property password {
          set {
             [[Sets the entry to password mode.
@@ -239,36 +183,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             disabled, $false for enabled.]]
          }
       }
-      @property autosave {
-         set {
-            [[This sets the entry object to 'autosave' the loaded text file or not.]]
-         }
-         get {
-            [[This gets the entry object's 'autosave' status.]]
-         }
-         values {
-            auto_save: bool; [[Autosave the loaded file or not.]]
-         }
-      }
-      @property anchor_hover_parent {
-         set {
-            [[Set the parent of the hover popup
-
-              Sets the parent object to use by the hover created by the entry
-              when an anchor is clicked.
-            ]]
-         }
-         get {
-            [[Get the parent of the hover popup
-
-              Get the object used as parent for the hover created by the entry
-              widget. If no parent is set, the same entry object will be used.
-            ]]
-         }
-         values {
-            parent: Evas.Object @nullable; [[The object to use as parent for the hover.]]
-         }
-      }
       @property prediction_allow {
          set {
             [[Set whether the entry should allow to use the text prediction.]]
@@ -327,74 +241,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             enabled: bool; [[If true, the input panel is appeared when entry is clicked or has a focus.]]
          }
       }
-      @property line_wrap {
-         set {
-            [[Set the line wrap type to use on multi-line entries.
-
-              Sets the wrap type used by the entry to any of the specified in
-              Elm_Wrap_Type. This tells how the text will be implicitly cut into a new
-              line (without inserting a line break or paragraph separator) when it
-              reaches the far edge of the widget.
-
-              Note that this only makes sense for multi-line entries. A widget set
-              to be single line will never wrap.
-            ]]
-         }
-         get {
-            [[Get the wrap mode the entry was set to use.]]
-         }
-         values {
-            wrap: Elm.Wrap.Type; [[The wrap mode to use. See Elm_Wrap_Type for details on them.]]
-         }
-      }
-      @property cursor_pos {
-         set {
-            [[Sets the cursor position in the entry to the given value
-
-              The value in $pos is the index of the character position within the
-              contents of the string as returned by @.cursor_pos.get.
-            ]]
-         }
-         get {
-            [[Get the current position of the cursor in the entry.]]
-         }
-         values {
-            pos: int; [[The position of the cursor.]]
-         }
-      }
-      @property icon_visible {
-         set {
-            [[Sets the visibility of the left-side widget of the entry,
-              set by \@ref elm_object_part_content_set.]]
-         }
-         values {
-            setting: bool; [[$true if the object should be displayed,
-            $false if not.]]
-         }
-      }
-      @property cursor_line_end {
-         set {
-            [[This moves the cursor to the end of the current line.]]
-         }
-      }
-      @property select_region {
-         set {
-            [[This selects a region of text within the entry.
-
-              @since 1.9
-            ]]
-         }
-         get {
-            [[Get the current position of the selection cursors in the entry.
-
-              @since 1.18
-            ]]
-         }
-         values {
-            start: int; [[The starting position.]]
-            end: int; [[The end position.]]
-         }
-      }
       @property input_panel_return_key_autoenabled {
          set {
             [[Set whether the return key on the input panel is disabled automatically when entry has no text.
@@ -408,77 +254,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             enabled: bool; [[If $enabled is true, the return key is automatically disabled when the entry has no text.]]
          }
       }
-      @property end_visible {
-         set {
-            [[Sets the visibility of the end widget of the entry, set by
-              \@ref elm_object_part_content_set(ent, "end", content).]]
-         }
-         values {
-            setting: bool; [[true if the object should be displayed,
-            false if not.]]
-         }
-      }
-      @property cursor_begin {
-         set {
-            [[This moves the cursor to the beginning of the entry.]]
-         }
-      }
-      @property cursor_line_begin {
-         set {
-            [[This moves the cursor to the beginning of the current line.]]
-         }
-      }
-      @property cursor_end {
-         set {
-            [[This moves the cursor to the end of the entry.]]
-         }
-      }
-      @property textblock {
-         get {
-            [[
-              Returns the actual textblock object of the entry.
-
-              This function exposes the internal textblock object that actually
-              contains and draws the text. This should be used for low-level
-              manipulations that are otherwise not possible.
-
-              Changing the textblock directly from here will not notify edje/elm to
-              recalculate the textblock size automatically, so any modifications
-              done to the textblock returned by this function should be followed by
-              a call to \@ref elm_entry_calc_force.
-
-              The return value is marked as const as an additional warning.
-              One should not use the returned object with any of the generic evas
-              functions (geometry_get/resize/move and etc), but only with the textblock
-              functions; The former will either not work at all, or break the correct
-              functionality.
-
-              IMPORTANT: Many functions may change (i.e delete and create a new one)
-              the internal textblock object. Do NOT cache the returned object, and try
-              not to mix calls on this object with regular elm_entry calls (which may
-              change the internal textblock object). This applies to all cursors
-              returned from textblock calls, and all the other derivative values.
-            ]]
-            return: Evas.Object;
-         }
-      }
-      @property cursor_geometry {
-         get {
-            [[This function returns the geometry of the cursor.
-
-              It's useful if you want to draw something on the cursor (or where it is),
-              or for example in the case of scrolled entry where you want to show the
-              cursor.
-            ]]
-            return: bool;
-         }
-         values {
-            x: Evas.Coord; [[returned geometry.]]
-            y: Evas.Coord; [[returned geometry.]]
-            w: Evas.Coord; [[returned geometry.]]
-            h: Evas.Coord; [[returned geometry.]]
-         }
-      }
       @property imf_context {
          get {
             [[Returns the input method context of the entry.
@@ -491,73 +266,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             return: void_ptr;
          }
       }
-      @property cursor_is_format {
-         get {
-            [[Get whether a format node exists at the current cursor position.
-
-              A format node is anything that defines how the text is rendered. It can
-              be a visible format node, such as a line break or a paragraph separator,
-              or an invisible one, such as bold begin or end tag.
-              This function returns whether any format node exists at the current
-              cursor position.
-            ]]
-            return: bool;
-         }
-      }
-      @property cursor_content {
-         get {
-            [[Get the character pointed by the cursor at its current position.
-
-              This function returns a string with the utf8 character stored at the
-              current cursor position.
-              Only the text is returned, any format that may exist will not be part
-              of the return value. You must free the string when done with \@ref free.
-            ]]
-            return: own(char *) @warn_unused;
-         }
-      }
-      @property selection {
-         get {
-            [[Get any selected text within the entry.
-
-              If there's any selected text in the entry, this function returns it as
-              a string in markup format. $null is returned if no selection exists or
-              if an error occurred.
-
-              The returned value points to an internal string and should not be freed
-              or modified in any way. If the $entry object is deleted or its
-              contents are changed, the returned pointer should be considered invalid.
-            ]]
-            return: string;
-         }
-      }
-      @property cursor_is_visible_format {
-         get {
-            [[Get if the current cursor position holds a visible format node.]]
-            return: bool;
-         }
-      }
-      @property select_allow {
-         set {
-            [[Allow selection in the entry.]]
-         }
-         get {
-            [[Returns whether selection in the entry is allowed.]]
-         }
-         values {
-            allow: bool; [[If $allow is true, the text selection is allowed.]]
-         }
-      }
-      cursor_prev {
-         [[This moves the cursor one place to the left within the entry.]]
-         return: bool;
-      }
-      text_style_user_pop {
-         [[Remove the style in the top of user style stack.
-
-           @since 1.7
-         ]]
-      }
       item_provider_prepend {
          [[This prepends a custom item provider to the list for that entry
 
@@ -581,48 +289,9 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
            This will typically cause the Input Method Context to clear the preedit state.
          ]]
       }
-      calc_force {
-         [[Forces calculation of the entry size and text layouting.
-
-           This should be used after modifying the textblock object directly. See
-           @.textblock.get for more information.
-         ]]
-      }
-      anchor_hover_end {
-         [[Ends the hover popup in the entry
-
-           When an anchor is clicked, the entry widget will create a hover
-           object to use as a popup with user provided content. This function
-           terminates this popup, returning the entry to its normal state.
-         ]]
-      }
-      cursor_selection_begin {
-         [[This begins a selection within the entry as though
-           the user were holding down the mouse button to make a selection.]]
-      }
-      cursor_down {
-         [[This moves the cursor one line down within the entry.]]
-         return: bool;
-      }
-      file_save {
-         [[This function writes any changes made to the file set with
-           \@ref elm_entry_file_set.]]
-      }
       selection_copy {
          [[This executes a "copy" action on the selected text in the entry.]]
       }
-      text_style_user_push {
-         [[Push the style to the top of user style stack.
-           If there is styles in the user style stack, the properties in the top style
-           of user style stack will replace the properties in current theme.
-           The input style is specified in format tag='property=value' (i.e. DEFAULT='font=Sans font_size=60'hilight=' + font_weight=Bold').
-
-           @since 1.7
-         ]]
-         params {
-            @in style: string; [[The style user to push.]]
-         }
-      }
       item_provider_remove {
          [[This removes a custom item provider to the list for that entry
 
@@ -634,15 +303,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             @in data: void_ptr @optional; [[The data passed to $func.]]
          }
       }
-      text_style_user_peek @const {
-         [[Get the style on the top of user style stack.
-
-           See also @.text_style_user_push.
-
-           @since 1.7
-         ]]
-         return: string;
-      }
       context_menu_clear {
          [[This clears and frees the items in a entry's contextual (longpress)
            menu.
@@ -650,29 +310,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
            See also @.context_menu_item_add.
          ]]
       }
-      cursor_up {
-         [[This moves the cursor one line up within the entry.]]
-         return: bool;
-      }
-      entry_insert {
-         [[Inserts the given text into the entry at the current cursor position.
-
-           This inserts text at the cursor position as if it was typed
-           by the user (note that this also allows markup which a user
-           can't just "type" as it would be converted to escaped text, so this
-           call can be used to insert things like emoticon items or bold push/pop
-           tags, other font and color change tags etc.)
-
-           If any selection exists, it will be replaced by the inserted text.
-
-           The inserted text is subject to any filters set for the widget.
-
-           See also @.markup_filter_append.
-         ]]
-         params {
-            @in entry: string; [[The text to insert.]]
-         }
-      }
       input_panel_imdata_set {
          [[Set the input panel-specific data to deliver to the input panel.
 
@@ -695,13 +332,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
       selection_paste {
          [[This executes a "paste" action in the entry.]]
       }
-      cursor_next {
-         [[This moves the cursor one place to the right within the entry.]]
-         return: bool;
-      }
-      select_none {
-         [[This drops any existing text selection within the entry.]]
-      }
       input_panel_hide {
          [[Hide the input panel (virtual keyboard).
 
@@ -709,9 +339,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
            This API can be used in the case of manually controlling by using @.input_panel_enabled.set(en, $false)
          ]]
       }
-      select_all {
-         [[This selects all text within the entry.]]
-      }
       cursor_selection_end {
          [[This ends a selection within the entry as though
            the user had just released the mouse button while making a selection.]]
@@ -719,26 +346,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
       selection_cut {
          [[This executes a "cut" action on the selected text in the entry.]]
       }
-      is_empty @const {
-         [[Get whether the entry is empty.
-
-           Empty means no text at all. If there are any markup tags, like an item
-           tag for which no provider finds anything, and no text is displayed, this
-           function still returns $false.
-         ]]
-         return: bool(true);
-      }
-      markup_filter_remove {
-         [[Remove a markup filter from the list
-
-           Removes the given callback from the filter list. See
-           @.markup_filter_append for more information.
-         ]]
-         params {
-            @in func: Elm_Entry_Filter_Cb; [[The filter function to remove.]]
-            @in data: void_ptr @optional; [[The user data passed when adding the function.]]
-         }
-      }
       item_provider_append {
          [[This appends a custom item provider to the list for that entry
 
@@ -756,37 +363,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             @in data: void_ptr @optional; [[The data passed to $func.]]
          }
       }
-      markup_filter_append {
-         [[Append a markup filter function for text inserted in the entry
-
-           Append the given callback to the list. This functions will be called
-           whenever any text is inserted into the entry, with the text to be inserted
-           as a parameter. The type of given text is always markup.
-           The callback function is free to alter the text in any way it wants, but
-           it must remember to free the given pointer and update it.
-           If the new text is to be discarded, the function can free it and set its
-           text parameter to $null. This will also prevent any following filters from
-           being called.
-         ]]
-         params {
-            @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
-            @in data: void_ptr @optional; [[User data to pass to $func.]]
-         }
-      }
-      entry_append {
-         [[Appends $str to the text of the entry.
-
-           Adds the text in $str to the end of any text already present in the
-           widget.
-
-           The appended text is subject to any filters set for the widget.
-
-           See also @.markup_filter_append.
-         ]]
-         params {
-            @in str: string; [[The text to be appended.]]
-         }
-      }
       context_menu_item_add {
          [[This adds an item to the entry's contextual menu.
 
@@ -807,15 +383,6 @@ class Efl.Ui.Text (Elm.Layout, Elm.Interface_Scrollable, Evas.Clickable_Interfac
             @in data: const(void_ptr) @optional; [[The data to associate with the item for related functions.]]
          }
       }
-      markup_filter_prepend {
-         [[Prepend a markup filter function for text inserted in the entry
-
-           Prepend the given callback to the list.]]
-         params {
-            @in func: Elm_Entry_Filter_Cb; [[The function to use as text filter.]]
-            @in data: void_ptr @optional; [[User data to pass to $func.]]
-         }
-      }
    }
    implements {
       class.constructor;