Merge branch 'master' into svn_merge
[framework/uifw/elementary.git] / src / lib / elm_entry.c
index b3ab5ec..e85f93a 100644 (file)
  * The file to load and save to is specified by elm_entry_file_set().
  *
  * Signals that you can add callbacks for are:
- * - "changed" - The text within the entry was changed
- * - "activated" - The entry has had editing finished and changes are to be committed (generally when enter key is pressed)
- * - "press" - The entry has been clicked
- * - "longpressed" - The entry has been clicked for a couple seconds
- * - "clicked" - The entry has been clicked
- * - "clicked,double" - The entry has been double clicked
- * - "focused" - The entry has received focus
- * - "unfocused" - The entry has lost focus
- * - "selection,paste" - A paste action has occurred
- * - "selection,copy" - A copy action has occurred
- * - "selection,cut" - A cut action has occurred
- * - "selection,start" - A selection has begun
- * - "selection,changed" - The selection has changed
- * - "selection,cleared" - The selection has been cleared
- * - "cursor,changed" - The cursor has changed
- * - "anchor,clicked" - The anchor has been clicked
+ *
+ * "changed" - The text within the entry was changed
+ * "activated" - The entry has had editing finished and changes are to be committed
+                 (generally when enter key is pressed)
+ * "press" - The entry has been clicked
+ * "longpressed" - The entry has been clicked for a couple seconds
+ * "clicked" - The entry has been clicked
+ * "clicked,double" - The entry has been double clicked
+ * "focused" - The entry has received focus
+ * "unfocused" - The entry has lost focus
+ * "selection,paste" - A paste action has occurred
+ * "selection,copy" - A copy action has occurred
+ * "selection,cut" - A cut action has occurred
+ * "selection,start" - A selection has begun
+ * "selection,changed" - The selection has changed
+ * "selection,cleared" - The selection has been cleared
+ * "cursor,changed" - The cursor has changed
+ * "anchor,clicked" - The anchor has been clicked
+ * "preedit,changed" - The preedit string has changed
  */
 
+/* Maximum chunk size to be inserted to the entry at once
+ * FIXME: This size is arbitrary, should probably choose a better size.
+ * Possibly also find a way to set it to a low value for weak computers,
+ * and to a big value for better computers. */
+#define _CHUNK_SIZE 10000
+
 typedef struct _Mod_Api Mod_Api;
 
 typedef struct _Widget_Data Widget_Data;
@@ -101,7 +110,7 @@ typedef struct _Elm_Entry_Text_Filter Elm_Entry_Text_Filter;
 
 struct _Widget_Data
 {
-   Evas_Object *ent;
+   Evas_Object *ent, *scroller, *end, *icon;
    Evas_Object *bg;
    Evas_Object *hoversel;
    Evas_Object *hover;
@@ -118,14 +127,18 @@ struct _Widget_Data
    Ecore_Event_Handler *sel_clear_handler;
    Ecore_Timer *longpress_timer;
    Ecore_Timer *delay_write;
+   /* for deferred appending */
+   Ecore_Idler *append_text_idler;
+   char *append_text_left;
+   int append_text_position;
+   int append_text_len;
    /* Only for clipboard */
    const char *cut_sel;
    const char *text;
    Evas_Coord wrap_w;
-   int ellipsis_threshold;
    const char *file;
    Elm_Text_Format format;
-   Evas_Coord lastw;
+   Evas_Coord lastw, entmw, entmh;
    Evas_Coord downx, downy;
    Evas_Coord cx, cy, cw, ch;
    Eina_List *items;
@@ -135,28 +148,29 @@ struct _Widget_Data
    Ecore_Job *matchlist_job;
    Ecore_Job *hovdeljob;
    Mod_Api *api; // module api if supplied
-   int max_no_of_bytes;
+   int cursor_pos;
+   Elm_Scroller_Policy policy_h, policy_v;
+   Elm_Wrap_Type linewrap;
    Eina_Bool changed : 1;
-   Eina_Bool linewrap : 1;
-   Eina_Bool char_linewrap : 1;
    Eina_Bool single_line : 1;
    Eina_Bool password : 1;
-   Eina_Bool show_last_character : 1;
    Eina_Bool editable : 1;
    Eina_Bool selection_asked : 1;
    Eina_Bool have_selection : 1;
    Eina_Bool selmode : 1;
    Eina_Bool deferred_cur : 1;
+   Eina_Bool cur_changed : 1;
    Eina_Bool disabled : 1;
    Eina_Bool double_clicked : 1;
    Eina_Bool long_pressed : 1;
    Eina_Bool context_menu : 1;
    Eina_Bool drag_selection_asked : 1;
    Eina_Bool bgcolor : 1;
-   Eina_Bool ellipsis : 1;
    Eina_Bool can_write : 1;
    Eina_Bool autosave : 1;
    Eina_Bool textonly : 1;
+   Eina_Bool usedown : 1;
+   Eina_Bool scroll : 1;
    Eina_Bool autoreturnkey : 1;
    Eina_Bool input_panel_enable : 1;
    Eina_Bool autocapital : 1;
@@ -190,13 +204,23 @@ struct _Elm_Entry_Text_Filter
    void *data;
 };
 
+typedef enum _Length_Unit
+{
+   LENGTH_UNIT_CHAR,
+   LENGTH_UNIT_BYTE,
+   LENGTH_UNIT_LAST
+} Length_Unit;
+
 static const char *widtype = NULL;
 // start for cbhm
 static Evas_Object *cnpwidgetdata = NULL;
 // end for cbhm
 
+#ifdef HAVE_ELEMENTARY_X
 static Eina_Bool _drag_drop_cb(void *data, Evas_Object *obj, Elm_Selection_Data *);
+#endif
 static void _del_hook(Evas_Object *obj);
+static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
 static void _theme_hook(Evas_Object *obj);
 static void _disable_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
@@ -215,18 +239,14 @@ static void _signal_entry_paste_request(void *data, Evas_Object *obj, const char
 static void _signal_entry_copy_notify(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _signal_entry_cut_notify(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _signal_cursor_changed(void *data, Evas_Object *obj, const char *emission, const char *source);
-static int _get_value_in_key_string(const char *oldstring, char *key, char **value);
+static void _add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit);
 static int _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag);
 static int _stringshare_key_value_replace(const char **srcstring, char *key, const char *value, int deleteflag);
-static int _is_width_over(Evas_Object *obj);
-static void _ellipsis_entry_to_width(Evas_Object *obj);
-static void _reverse_ellipsis_entry(Evas_Object *obj);
 static int _entry_length_get(Evas_Object *obj);
 static void _magnifier_create(void *data);
 static void _magnifier_show(void *data);
 static void _magnifier_hide(void *data);
 static void _magnifier_move(void *data);
-static void _long_pressed(void *data);
 
 static const char SIG_CHANGED[] = "changed";
 static const char SIG_ACTIVATED[] = "activated";
@@ -245,6 +265,7 @@ static const char SIG_SELECTION_CLEARED[] = "selection,cleared";
 static const char SIG_CURSOR_CHANGED[] = "cursor,changed";
 static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked";
 static const char SIG_MATCHLIST_CLICKED[] = "matchlist,clicked";
+static const char SIG_PREEDIT_CHANGED[] = "preedit,changed";
 static const Evas_Smart_Cb_Description _signals[] = {
   {SIG_CHANGED, ""},
   {SIG_ACTIVATED, ""},
@@ -262,13 +283,14 @@ static const Evas_Smart_Cb_Description _signals[] = {
   {SIG_SELECTION_CLEARED, ""},
   {SIG_CURSOR_CHANGED, ""},
   {SIG_ANCHOR_CLICKED, ""},
+  {SIG_PREEDIT_CHANGED, ""},
   {SIG_MATCHLIST_CLICKED, ""},
   {NULL, NULL}
 };
 
 typedef enum _Elm_Entry_Magnifier_Type
 {
-   _ENTRY_MAGNIFIER_FIXEDSIZE = 0, 
+   _ENTRY_MAGNIFIER_FIXEDSIZE = 0,
    _ENTRY_MAGNIFIER_FILLWIDTH,
    _ENTRY_MAGNIFIER_CIRCULAR,
 } Elm_Entry_Magnifier_Type;
@@ -295,16 +317,16 @@ _module(Evas_Object *obj __UNUSED__)
    m->api = malloc(sizeof(Mod_Api));
    if (!m->api) return NULL;
    ((Mod_Api *)(m->api)      )->obj_hook = // called on creation
-     _elm_module_symbol_get(m, "obj_hook");
+      _elm_module_symbol_get(m, "obj_hook");
    ((Mod_Api *)(m->api)      )->obj_unhook = // called on deletion
-     _elm_module_symbol_get(m, "obj_unhook");
+      _elm_module_symbol_get(m, "obj_unhook");
    ((Mod_Api *)(m->api)      )->obj_longpress = // called on long press menu
-     _elm_module_symbol_get(m, "obj_longpress");
+      _elm_module_symbol_get(m, "obj_longpress");
    ((Mod_Api *)(m->api)      )->obj_hidemenu = // called on hide menu
       _elm_module_symbol_get(m, "obj_hidemenu");
    ((Mod_Api *)(m->api)      )->obj_mouseup = // called on mouseup
       _elm_module_symbol_get(m, "obj_mouseup");
-   ok: // ok - return api
+ok: // ok - return api
    return m->api;
 }
 
@@ -330,11 +352,11 @@ _load_file(const char *file)
    FILE *f;
    size_t size;
    int alloc = 0, len = 0;
-   char *text = NULL, buf[PATH_MAX];
+   char *text = NULL, buf[16384 + 1];
 
    f = fopen(file, "rb");
    if (!f) return NULL;
-   while ((size = fread(buf, 1, sizeof(buf), f)))
+   while ((size = fread(buf, 1, sizeof(buf) - 1, f)))
      {
         char *tmp_text;
         buf[size] = 0;
@@ -436,13 +458,13 @@ _save(Evas_Object *obj)
    switch (wd->format)
      {
       case ELM_TEXT_FORMAT_PLAIN_UTF8:
-       _save_plain_utf8(wd->file, elm_entry_entry_get(obj));
-       break;
+         _save_plain_utf8(wd->file, elm_entry_entry_get(obj));
+         break;
       case ELM_TEXT_FORMAT_MARKUP_UTF8:
-       _save_markup_utf8(wd->file, elm_entry_entry_get(obj));
-       break;
+         _save_markup_utf8(wd->file, elm_entry_entry_get(obj));
+         break;
       default:
-       break;
+         break;
      }
 }
 
@@ -456,6 +478,82 @@ _delay_write(void *data)
    return ECORE_CALLBACK_CANCEL;
 }
 
+static Elm_Entry_Text_Filter *
+_filter_new(void (*func) (void *data, Evas_Object *entry, char **text), void *data)
+{
+   Elm_Entry_Text_Filter *tf = ELM_NEW(Elm_Entry_Text_Filter);
+   if (!tf) return NULL;
+
+   tf->func = func;
+   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_Text_Filter *tf)
+{
+   if (tf->func == elm_entry_filter_limit_size)
+     {
+        Elm_Entry_Filter_Limit_Size *lim = tf->data;
+        if (lim) free(lim);
+     }
+   else if (tf->func == elm_entry_filter_accept_set)
+     {
+        Elm_Entry_Filter_Accept_Set *as = tf->data;
+        if (as)
+          {
+             if (as->accepted) eina_stringshare_del(as->accepted);
+             if (as->rejected) eina_stringshare_del(as->rejected);
+             free(as);
+          }
+     }
+   free(tf);
+}
+
 static void
 _del_pre_hook(Evas_Object *obj)
 {
@@ -484,13 +582,22 @@ _del_hook(Evas_Object *obj)
 
    entries = eina_list_remove(entries, obj);
 #ifdef HAVE_ELEMENTARY_X
-   ecore_event_handler_del(wd->sel_notify_handler);
-   ecore_event_handler_del(wd->sel_clear_handler);
+   if (wd->sel_notify_handler)
+     ecore_event_handler_del(wd->sel_notify_handler);
+   if (wd->sel_clear_handler)
+     ecore_event_handler_del(wd->sel_clear_handler);
 #endif
    if (wd->cut_sel) eina_stringshare_del(wd->cut_sel);
    if (wd->text) eina_stringshare_del(wd->text);
    if (wd->bg) evas_object_del(wd->bg);
    if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
+   if (wd->append_text_idler)
+     {
+        ecore_idler_del(wd->append_text_idler);
+        free(wd->append_text_left);
+        wd->append_text_left = NULL;
+        wd->append_text_idler = NULL;
+     }
    if (wd->matchlist_job) ecore_job_del(wd->matchlist_job);
    if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer);
    if (wd->mgf_proxy) evas_object_del(wd->mgf_proxy);
@@ -510,29 +617,67 @@ _del_hook(Evas_Object *obj)
      }
    EINA_LIST_FREE(wd->text_filters, tf)
      {
-        free(tf);
+        _filter_free(tf);
      }
    free(wd);
 }
 
 static void
+_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   edje_object_mirrored_set(wd->ent, rtl);
+}
+
+static void
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    const char *t;
    Ecore_IMF_Context *ic;
+   _elm_widget_mirrored_reload(obj);
+   _mirrored_set(obj, elm_widget_mirrored_get(obj));
 
    t = eina_stringshare_add(elm_entry_entry_get(obj));
    _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
+   if (_elm_config->desktop_entry)
+     edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
    elm_entry_entry_set(obj, t);
    eina_stringshare_del(t);
    if (elm_widget_disabled_get(obj))
-      edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
+     edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
+   edje_object_part_text_input_panel_enabled_set(wd->ent, "elm.text", wd->input_panel_enable);
+   elm_entry_cursor_pos_set(obj, wd->cursor_pos);
+   if (elm_widget_focus_get(obj))
+     edje_object_signal_emit(wd->ent, "elm,action,focus", "elm");
    edje_object_message_signal_process(wd->ent);
    edje_object_scale_set(wd->ent, elm_widget_scale_get(obj) * _elm_config->scale);
-   edje_object_part_text_autocapitalization_set(wd->ent, "elm.text", wd->autocapital);
-   edje_object_part_text_autoperiod_set(wd->ent, "elm.text", wd->autoperiod);
-   edje_object_part_text_input_panel_enabled_set(wd->ent, "elm.text", wd->input_panel_enable);
+   elm_smart_scroller_mirrored_set(wd->scroller, elm_widget_mirrored_get(obj));
+   elm_smart_scroller_object_theme_set(obj, wd->scroller, "scroller", "entry",
+                                       elm_widget_style_get(obj));
+   if (wd->scroll)
+     {
+        const char *str;
+        Evas_Object *edj;
+
+        edj = elm_smart_scroller_edje_object_get(wd->scroller);
+        str = edje_object_data_get(edj, "focus_highlight");
+        if ((str) && (!strcmp(str, "on")))
+           elm_widget_highlight_in_theme_set(obj, EINA_TRUE);
+        else
+           elm_widget_highlight_in_theme_set(obj, EINA_FALSE);
+     }
+
+   if (wd->password)
+     {
+        edje_object_part_text_autoperiod_set(wd->ent, "elm.text", EINA_FALSE);
+        edje_object_part_text_autocapitalization_set(wd->ent, "elm.text", EINA_FALSE);
+     }
+   else
+     {
+        edje_object_part_text_autoperiod_set(wd->ent, "elm.text", wd->autoperiod);
+        edje_object_part_text_autocapitalization_set(wd->ent, "elm.text", wd->autocapital);
+     }
 
    ic = edje_object_part_text_imf_context_get(wd->ent, "elm.text");
    if (ic)
@@ -550,81 +695,182 @@ _disable_hook(Evas_Object *obj)
 
    if (elm_widget_disabled_get(obj))
      {
-       edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
-       wd->disabled = EINA_TRUE;
+        edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
+        wd->disabled = EINA_TRUE;
      }
    else
      {
-       edje_object_signal_emit(wd->ent, "elm,state,enabled", "elm");
-       wd->disabled = EINA_FALSE;
+        edje_object_signal_emit(wd->ent, "elm,state,enabled", "elm");
+        wd->disabled = EINA_FALSE;
+     }
+}
+
+static void
+_recalc_cursor_geometry(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   evas_object_smart_callback_call(obj, SIG_CURSOR_CHANGED, NULL);
+   if (!wd->deferred_recalc_job)
+     {
+        Evas_Coord cx, cy, cw, ch;
+        edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
+              &cx, &cy, &cw, &ch);
+        if (wd->cur_changed)
+          {
+             elm_widget_show_region_set(obj, cx, cy, cw, ch, EINA_FALSE);
+             wd->cur_changed = EINA_FALSE;
+          }
      }
+   else
+      wd->deferred_cur = EINA_TRUE;
 }
 
 static void
 _elm_win_recalc_job(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   Evas_Coord minw = -1, minh = -1, maxh = -1;
-   Evas_Coord resw, resh, minminw;
+   Evas_Coord minh = -1, resw = -1, minw = -1;
    if (!wd) return;
    wd->deferred_recalc_job = NULL;
-   evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh);
-   resh = 0;
-   edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, 0, 0);
-   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   minminw = minw;
+
+   evas_object_geometry_get(wd->ent, NULL, NULL, &resw, NULL);
    edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, resw, 0);
    elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   evas_object_size_hint_min_set(data, minminw, minh);
-   if (wd->single_line) maxh = minh;
-   evas_object_size_hint_max_set(data, -1, maxh);
+   wd->entmw = minw;
+   wd->entmh = minh;
+   /* This is a hack to workaround the way min size hints are treated.
+    * If the minimum width is smaller than the restricted width, it means
+    * the mininmum doesn't matter. */
+   if (minw <= resw)
+     {
+        Evas_Coord ominw = -1;
+        evas_object_size_hint_min_get(data, &ominw, NULL);
+        minw = ominw;
+     }
+   evas_object_size_hint_min_set(data, minw, minh);
+   if (wd->single_line)
+      evas_object_size_hint_max_set(data, -1, minh);
+   else
+      evas_object_size_hint_max_set(data, -1, -1);
+
    if (wd->deferred_cur)
-     elm_widget_show_region_set(data, wd->cx, wd->cy, wd->cw, wd->ch);
+     {
+        Evas_Coord cx, cy, cw, ch;
+        edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
+                                                  &cx, &cy, &cw, &ch);
+        if (wd->cur_changed)
+          {
+             elm_widget_show_region_set(data, cx, cy, cw, ch, EINA_FALSE);
+             wd->cur_changed = EINA_FALSE;
+          }
+     }
 }
 
 static void
 _sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
+   Evas_Coord minw = -1, minh = -1;
    Evas_Coord resw, resh;
    if (!wd) return;
-   if ((wd->linewrap) || (wd->char_linewrap))
+
+   evas_object_geometry_get(obj, NULL, NULL, &resw, &resh);
+   if (wd->linewrap)
      {
-       evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh);
-       if ((resw == wd->lastw) && (!wd->changed)) return;
-       wd->changed = EINA_FALSE;
-       wd->lastw = resw;
-       if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
-       wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
+        if ((resw == wd->lastw) && (!wd->changed)) return;
+        wd->changed = EINA_FALSE;
+        wd->lastw = resw;
+        if (wd->scroll)
+          {
+             Evas_Coord vw = 0, vh = 0, vmw = 0, vmh = 0, w = -1, h = -1;
+
+             evas_object_resize(wd->scroller, resw, resh);
+             edje_object_size_min_calc
+                (elm_smart_scroller_edje_object_get(wd->scroller),
+                    &vmw, &vmh);
+             elm_smart_scroller_child_viewport_size_get(wd->scroller, &vw, &vh);
+             edje_object_size_min_restricted_calc(wd->ent, &minw, &minh, vw, 0);
+             wd->entmw = minw;
+             wd->entmh = minh;
+             elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+
+             if ((minw > 0) && (vw < minw)) vw = minw;
+             if (minh > vh) vh = minh;
+
+             if (wd->single_line) h = vmh + minh;
+             else h = vmh;
+             evas_object_resize(wd->ent, vw, vh);
+             evas_object_size_hint_min_get(obj, &w, NULL);
+             evas_object_size_hint_min_set(obj, w, h);
+             if (wd->single_line)
+                evas_object_size_hint_max_set(obj, -1, h);
+             else
+                evas_object_size_hint_max_set(obj, -1, -1);
+          }
+        else
+          {
+             if (wd->deferred_recalc_job) ecore_job_del(wd->deferred_recalc_job);
+             wd->deferred_recalc_job = ecore_job_add(_elm_win_recalc_job, obj);
+          }
      }
    else
      {
-       evas_object_geometry_get(wd->ent, NULL, NULL, &resw, &resh);
-       edje_object_size_min_calc(wd->ent, &minw, &minh);
-        elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-       evas_object_size_hint_min_set(obj, minw, minh);
-        if (wd->single_line) maxh = minh;
-       evas_object_size_hint_max_set(obj, maxw, maxh);
-
-        if (wd->ellipsis && wd->single_line)
+        if (!wd->changed) return;
+        wd->changed = EINA_FALSE;
+        wd->lastw = resw;
+        if (wd->scroll)
+          {
+             Evas_Coord vw = 0, vh = 0, vmw = 0, vmh = 0, w = -1, h = -1;
+
+             edje_object_size_min_calc(wd->ent, &minw, &minh);
+             wd->entmw = minw;
+             wd->entmh = minh;
+             elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+
+             elm_smart_scroller_child_viewport_size_get(wd->scroller, &vw, &vh);
+
+             if ((minw > 0) && (vw < minw)) vw = minw;
+             if (minh > 0) vh = minh;
+
+             evas_object_resize(wd->ent, vw, vh);
+             edje_object_size_min_calc
+                (elm_smart_scroller_edje_object_get(wd->scroller),
+                    &vmw, &vmh);
+             if (wd->single_line) h = vmh + minh;
+             else h = vmh;
+             evas_object_size_hint_min_get(obj, &w, NULL);
+             evas_object_size_hint_min_set(obj, w, h);
+             if (wd->single_line)
+                evas_object_size_hint_max_set(obj, -1, h);
+             else
+                evas_object_size_hint_max_set(obj, -1, -1);
+          }
+        else
           {
-            if (_is_width_over(obj))
-              _ellipsis_entry_to_width(obj);
-                       else if (wd->ellipsis_threshold > 1 && _entry_length_get(obj) < wd->ellipsis_threshold)
-              _reverse_ellipsis_entry(obj);
+             edje_object_size_min_calc(wd->ent, &minw, &minh);
+             wd->entmw = minw;
+             wd->entmh = minh;
+             elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+             evas_object_size_hint_min_set(obj, minw, minh);
+             if (wd->single_line)
+                evas_object_size_hint_max_set(obj, -1, minh);
+             else
+                evas_object_size_hint_max_set(obj, -1, -1);
           }
      }
+
+   _recalc_cursor_geometry(obj);
 }
 
 static void
 _check_enable_returnkey(Evas_Object *obj)
 {
-    Widget_Data *wd = elm_widget_data_get(obj);
-    if (!wd) return;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
 
-    Ecore_IMF_Context *ic = elm_entry_imf_context_get(obj);
-    if (!ic) return;
+   Ecore_IMF_Context *ic = elm_entry_imf_context_get(obj);
+   if (!ic) return;
 
    if (!wd->autoreturnkey) return;
 
@@ -643,32 +889,31 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Object *top = elm_widget_top_get(obj);
-
    if (!wd) return;
    if (!wd->editable) return;
    if (elm_widget_focus_get(obj))
      {
         printf("[Elm_entry::Focused] obj : %p\n", obj);
         evas_object_focus_set(wd->ent, EINA_TRUE);
-       edje_object_signal_emit(wd->ent, "elm,action,focus", "elm");
-       if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
-       evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
-       _check_enable_returnkey(obj);
-       wd->mgf_type = _ENTRY_MAGNIFIER_FILLWIDTH;
-       _magnifier_create(obj);
+        edje_object_signal_emit(wd->ent, "elm,action,focus", "elm");
+        if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
+        evas_object_smart_callback_call(obj, SIG_FOCUSED, NULL);
+        _check_enable_returnkey(obj);
+        wd->mgf_type = _ENTRY_MAGNIFIER_FILLWIDTH;
+        _magnifier_create(obj);
      }
    else
      {
         printf("[Elm_entry::Unfocused] obj : %p\n", obj);
-       edje_object_signal_emit(wd->ent, "elm,action,unfocus", "elm");
-       evas_object_focus_set(wd->ent, EINA_FALSE);
-       if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
-       evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
-
-          if ((wd->api) && (wd->api->obj_hidemenu))
-          {
-                  wd->api->obj_hidemenu(obj);
-          }
+        edje_object_signal_emit(wd->ent, "elm,action,unfocus", "elm");
+        evas_object_focus_set(wd->ent, EINA_FALSE);
+        if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
+        evas_object_smart_callback_call(obj, SIG_UNFOCUSED, NULL);
+
+        if ((wd->api) && (wd->api->obj_hidemenu))
+          {
+             wd->api->obj_hidemenu(obj);
+          }
      }
 }
 
@@ -678,22 +923,31 @@ _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source)
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    edje_object_signal_emit(wd->ent, emission, source);
+   if (wd->scroller)
+      edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scroller),
+                              emission, source);
 }
 
 static void
-_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
+_signal_callback_add_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    edje_object_signal_callback_add(wd->ent, emission, source, func_cb, data);
+   if (wd->scroller)
+      edje_object_signal_callback_add(elm_smart_scroller_edje_object_get(wd->scroller),
+                                      emission, source, func_cb, data);
 }
 
 static void
-_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
+_signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    edje_object_signal_callback_del_full(wd->ent, emission, source, func_cb,
                                         data);
+   if (wd->scroller)
+      edje_object_signal_callback_del_full(elm_smart_scroller_edje_object_get(wd->scroller),
+                                           emission, source, func_cb, data);
 }
 
 static void
@@ -704,24 +958,54 @@ _on_focus_region_hook(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas
 }
 
 static void
+_focus_region_hook(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->scroll)
+      elm_smart_scroller_child_region_show(wd->scroller, x, y, w, h);
+}
+
+static void
+_show_region_hook(void *data, Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   Evas_Coord x, y, w, h;
+   if (!wd) return;
+   elm_widget_show_region_get(obj, &x, &y, &w, &h);
+   if (wd->scroll)
+     elm_smart_scroller_child_region_show(wd->scroller, x, y, w, h);
+}
+
+static void
 _hoversel_position(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord cx, cy, cw, ch, x, y, mw, mh;
    if (!wd) return;
+
+   cx = cy = 0;
+   cw = ch = 1;
    evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL);
-   edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
-                                            &cx, &cy, &cw, &ch);
+   if (wd->usedown)
+     {
+        cx = wd->downx - x;
+        cy = wd->downy - y;
+        cw = 1;
+        ch = 1;
+     }
+   else
+     edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
+                                               &cx, &cy, &cw, &ch);
    evas_object_size_hint_min_get(wd->hoversel, &mw, &mh);
    if (cw < mw)
      {
-       cx += (cw - mw) / 2;
-       cw = mw;
+        cx += (cw - mw) / 2;
+        cw = mw;
      }
    if (ch < mh)
      {
-       cy += (ch - mh) / 2;
-       ch = mh;
+        cy += (ch - mh) / 2;
+        ch = mh;
      }
    evas_object_move(wd->hoversel, x + cx, y + cy);
    evas_object_resize(wd->hoversel, cw, ch);
@@ -740,13 +1024,21 @@ _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
-   if ((wd->linewrap) || (wd->char_linewrap))
+
+   if (wd->linewrap)
      {
         _sizing_eval(data);
      }
+   else if (wd->scroll)
+     {
+        Evas_Coord vw = 0, vh = 0;
+
+        elm_smart_scroller_child_viewport_size_get(wd->scroller, &vw, &vh);
+        if (vw < wd->entmw) vw = wd->entmw;
+        if (vh < wd->entmh) vh = wd->entmh;
+        evas_object_resize(wd->ent, vw, vh);
+     }
    if (wd->hoversel) _hoversel_position(data);
-//   Evas_Coord ww, hh;
-//   evas_object_geometry_get(wd->ent, NULL, NULL, &ww, &hh);
 }
 
 static void
@@ -768,11 +1060,15 @@ _dismissed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
+   wd->usedown = 0;
    if (wd->hoversel) evas_object_hide(wd->hoversel);
    if (wd->selmode)
      {
-        if (!wd->password)
-          edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
+        if (!_elm_config->desktop_entry)
+          {
+             if (!wd->password)
+               edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
+          }
      }
    elm_widget_scroll_freeze_pop(data);
    if (wd->hovdeljob) ecore_job_del(wd->hovdeljob);
@@ -798,10 +1094,15 @@ _select(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    if (!wd) return;
    wd->selmode = EINA_TRUE;
    edje_object_part_text_select_none(wd->ent, "elm.text");
-   if (!wd->password)
-     edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
+   if (!_elm_config->desktop_entry)
+     {
+        if (!wd->password)
+          edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
+     }
    edje_object_signal_emit(wd->ent, "elm,state,select,on", "elm");
-   elm_object_scroll_freeze_pop(data);
+   if (!_elm_config->desktop_entry)
+      elm_object_scroll_freeze_pop(data);
+      //elm_widget_scroll_hold_push(data);
 }
 
 static void
@@ -813,8 +1114,12 @@ _paste(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    if (wd->sel_notify_handler)
      {
 #ifdef HAVE_ELEMENTARY_X
+        Elm_Sel_Format formats;
         wd->selection_asked = EINA_TRUE;
-        elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_FORMAT_MARKUP, data, NULL, NULL);
+        formats = ELM_SEL_FORMAT_MARKUP;
+        if (!wd->textonly)
+          formats |= ELM_SEL_FORMAT_IMAGE;
+        elm_selection_get(ELM_SEL_CLIPBOARD, formats, data, NULL, NULL);
 #endif
      }
 }
@@ -829,7 +1134,7 @@ _store_selection(Elm_Sel_Type seltype, Evas_Object *obj)
    sel = edje_object_part_text_selection_get(wd->ent, "elm.text");
    elm_selection_set(seltype, obj, ELM_SEL_FORMAT_MARKUP, sel);
    if (seltype == ELM_SEL_CLIPBOARD)
-          eina_stringshare_replace(&wd->cut_sel, sel);
+     eina_stringshare_replace(&wd->cut_sel, sel);
 }
 
 static void
@@ -839,9 +1144,11 @@ _cut(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
    /* Store it */
    wd->selmode = EINA_FALSE;
-   edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+   if (!_elm_config->desktop_entry)
+     edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
    edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
-   elm_widget_scroll_hold_pop(data);
+   if (!_elm_config->desktop_entry)
+     elm_widget_scroll_hold_pop(data);
    _store_selection(ELM_SEL_CLIPBOARD, data);
    edje_object_part_text_insert(wd->ent, "elm.text", "");
    edje_object_part_text_select_none(wd->ent, "elm.text");
@@ -852,12 +1159,15 @@ _copy(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
-   //wd->selmode = EINA_FALSE;
-   //edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
-   //edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
-   elm_widget_scroll_hold_pop(data);
+   wd->selmode = EINA_FALSE;
+   if (!_elm_config->desktop_entry)
+     {
+        edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+        edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
+        elm_widget_scroll_hold_pop(data);
+     }
    _store_selection(ELM_SEL_CLIPBOARD, data);
-   //edje_object_part_text_select_none(wd->ent, "elm.text");
+   //   edje_object_part_text_select_none(wd->ent, "elm.text");
 }
 
 static void
@@ -866,9 +1176,11 @@ _cancel(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    Widget_Data *wd = elm_widget_data_get(data);
    if (!wd) return;
    wd->selmode = EINA_FALSE;
-   edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+   if (!_elm_config->desktop_entry)
+     edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
    edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
-   elm_widget_scroll_hold_pop(data);
+   if (!_elm_config->desktop_entry)
+     elm_widget_scroll_hold_pop(data);
    edje_object_part_text_select_none(wd->ent, "elm.text");
 }
 
@@ -879,13 +1191,15 @@ _clipboard_menu(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    if (!wd) return;
 
    // start for cbhm
+#ifdef HAVE_ELEMENTARY_X
    ecore_x_selection_secondary_set(elm_win_xwindow_get(obj), "",1);
+#endif
    cnpwidgetdata = data;
    elm_cbhm_helper_init(obj);
    if (elm_entry_cnp_textonly_get(obj))
-          elm_cbhm_send_raw_data("show0");
+     elm_cbhm_send_raw_data("show0");
    else
-          elm_cbhm_send_raw_data("show1");
+     elm_cbhm_send_raw_data("show1");
    // end for cbhm
 }
 
@@ -901,7 +1215,7 @@ _cnpinit(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 
 
 static void
-_item_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+_item_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Entry_Context_Menu_Item *it = data;
    Evas_Object *obj2 = it->obj;
@@ -909,50 +1223,50 @@ _item_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 }
 
 static void
-_long_pressed(void *data)
+_menu_press(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
+   Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Object *top;
    const Eina_List *l;
    const Elm_Entry_Context_Menu_Item *it;
    if (!wd) return;
    if ((wd->api) && (wd->api->obj_longpress))
      {
-        wd->api->obj_longpress(data);
+        wd->api->obj_longpress(obj);
      }
    else if (wd->context_menu)
      {
         const char *context_menu_orientation;
 
         if (wd->hoversel) evas_object_del(wd->hoversel);
-        else elm_widget_scroll_freeze_push(data);
-        wd->hoversel = elm_hoversel_add(data);
+        else elm_widget_scroll_freeze_push(obj);
+        wd->hoversel = elm_hoversel_add(obj);
         context_menu_orientation = edje_object_data_get
-          (wd->ent, "context_menu_orientation");
+           (wd->ent, "context_menu_orientation");
         if ((context_menu_orientation) &&
             (!strcmp(context_menu_orientation, "horizontal")))
           elm_hoversel_horizontal_set(wd->hoversel, EINA_TRUE);
         elm_object_style_set(wd->hoversel, "entry");
-        elm_widget_sub_object_add(data, wd->hoversel);
-        elm_hoversel_label_set(wd->hoversel, "Text");
-        top = elm_widget_top_get(data);
+        elm_widget_sub_object_add(obj, wd->hoversel);
+        elm_object_text_set(wd->hoversel, "Text");
+        top = elm_widget_top_get(obj);
         if (top) elm_hoversel_hover_parent_set(wd->hoversel, top);
-        evas_object_smart_callback_add(wd->hoversel, "dismissed", _dismissed, data);
+        evas_object_smart_callback_add(wd->hoversel, "dismissed", _dismissed, obj);
         if (!wd->selmode)
           {
              if (!wd->password)
-               elm_hoversel_item_add(wd->hoversel, "Select", NULL, ELM_ICON_NONE,
-                                     _select, data);
+               elm_hoversel_item_add(wd->hoversel, E_("Select"), NULL, ELM_ICON_NONE,
+                                     _select, obj);
              if (1) // need way to detect if someone has a selection
                {
                   if (wd->editable)
-                    elm_hoversel_item_add(wd->hoversel, "Paste", NULL, ELM_ICON_NONE,
-                                          _paste, data);
+                    elm_hoversel_item_add(wd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,
+                                          _paste, obj);
                }
        // start for cbhm
              if ((!wd->password) && (wd->editable))
-               elm_hoversel_item_add(wd->hoversel, "More", NULL, ELM_ICON_NONE,
-                                     _clipboard_menu, data);
+               elm_hoversel_item_add(wd->hoversel, E_("More"), NULL, ELM_ICON_NONE,
+                                     _clipboard_menu, obj);
        // end for cbhm
           }
         else
@@ -961,18 +1275,18 @@ _long_pressed(void *data)
                {
                   if (wd->have_selection)
                     {
-                       elm_hoversel_item_add(wd->hoversel, "Copy", NULL, ELM_ICON_NONE,
-                                             _copy, data);
+                       elm_hoversel_item_add(wd->hoversel, E_("Copy"), NULL, ELM_ICON_NONE,
+                                             _copy, obj);
                        if (wd->editable)
-                         elm_hoversel_item_add(wd->hoversel, "Cut", NULL, ELM_ICON_NONE,
-                                               _cut, data);
+                         elm_hoversel_item_add(wd->hoversel, E_("Cut"), NULL, ELM_ICON_NONE,
+                                               _cut, obj);
                     }
-                  elm_hoversel_item_add(wd->hoversel, "Cancel", NULL, ELM_ICON_NONE,
-                                        _cancel, data);
+                  elm_hoversel_item_add(wd->hoversel, E_("Cancel"), NULL, ELM_ICON_NONE,
+                                        _cancel, obj);
        // start for cbhm
                   if (wd->editable)
-                    elm_hoversel_item_add(wd->hoversel, "More", NULL, ELM_ICON_NONE,
-                                          _clipboard_menu, data);
+                    elm_hoversel_item_add(wd->hoversel, E_("More"), NULL, ELM_ICON_NONE,
+                                          _clipboard_menu, obj);
        // end for cbhm
                }
           }
@@ -983,15 +1297,16 @@ _long_pressed(void *data)
           }
         if (wd->hoversel)
           {
-             _hoversel_position(data);
+             _hoversel_position(obj);
              evas_object_show(wd->hoversel);
              elm_hoversel_hover_begin(wd->hoversel);
           }
-        edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
-        edje_object_part_text_select_abort(wd->ent, "elm.text");
+        if (!_elm_config->desktop_entry)
+          {
+             edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+             edje_object_part_text_select_abort(wd->ent, "elm.text");
+          }
      }
-
-   evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
 }
 
 static void
@@ -1002,6 +1317,9 @@ _magnifier_hide(void *data)
 
    evas_object_hide(wd->mgf_bg);
    evas_object_hide(wd->mgf_clip);
+
+   if (wd->scroll)
+     elm_smart_scroller_freeze_set(wd->scroller, EINA_FALSE);
 }
 
 static void
@@ -1023,21 +1341,30 @@ _magnifier_move(void *data)
    Evas_Coord x, y, w, h, fs;
    Evas_Coord cx, cy, cw, ch, ox, oy;
 
-   evas_object_geometry_get(data, &x, &y, &w, &h);
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
 
+   if (wd->scroll)
+     {
+        evas_object_geometry_get(wd->scroller, &x, &y, &w, &h);
+        elm_smart_scroller_child_pos_get(wd->scroller, &ox, &oy);
+        cx -= ox;
+        cy -= oy;
+     }
+   else
+     evas_object_geometry_get(data, &x, &y, &w, &h);
+
    ox = oy = 0;
    fs = elm_finger_size_get();
 
    if ((cy + y) - wd->mgf_height - fs < 0)
-       oy = -1 * ((cy + y) - wd->mgf_height - fs);
+     oy = -1 * ((cy + y) - wd->mgf_height - fs);
 
    if (wd->mgf_type == _ENTRY_MAGNIFIER_FIXEDSIZE)
-       evas_object_move(wd->mgf_bg, (cx + x + cw/2) + ox, (cy + y) - wd->mgf_height - fs + oy);
+     evas_object_move(wd->mgf_bg, (cx + x + cw/2) + ox, (cy + y) - wd->mgf_height - fs + oy);
    else if (wd->mgf_type == _ENTRY_MAGNIFIER_FILLWIDTH)
-       evas_object_move(wd->mgf_bg, x, (cy + y) - wd->mgf_height - fs + oy);
+     evas_object_move(wd->mgf_bg, x, (cy + y) - wd->mgf_height - fs + oy);
    else
-       return;
+     return;
 
    evas_object_move(wd->mgf_proxy, (1 - wd->mgf_scale) * cx + x + ox, (1 - wd->mgf_scale) * cy + y - wd->mgf_height/2 - ch/2 - fs + oy);
 }
@@ -1053,24 +1380,28 @@ _magnifier_create(void *data)
 
    if (wd->mgf_proxy)
      {
-       evas_object_image_source_unset(wd->mgf_proxy);
-       evas_object_color_set(wd->mgf_proxy, 255, 255, 255, 0);
-       evas_object_hide(wd->mgf_proxy);
-       evas_object_clip_unset(wd->mgf_proxy);
-       evas_object_del(wd->mgf_proxy);
+        evas_object_image_source_unset(wd->mgf_proxy);
+        evas_object_color_set(wd->mgf_proxy, 255, 255, 255, 0);
+        evas_object_hide(wd->mgf_proxy);
+        evas_object_clip_unset(wd->mgf_proxy);
+        evas_object_del(wd->mgf_proxy);
      }
    if (wd->mgf_bg) evas_object_del(wd->mgf_bg);
    if (wd->mgf_clip) evas_object_del(wd->mgf_clip);
 
-   evas_object_geometry_get(data, &x, &y, &w, &h);
+   if (wd->scroll)
+     evas_object_geometry_get(wd->scroller, &x, &y, &w, &h);
+   else
+     evas_object_geometry_get(data, &x, &y, &w, &h);
+
    wd->mgf_bg = edje_object_add(evas_object_evas_get(data));
 
    if (wd->mgf_type == _ENTRY_MAGNIFIER_FIXEDSIZE)
-       _elm_theme_object_set(data, wd->mgf_bg, "entry", "magnifier", "fixed-size");
+     _elm_theme_object_set(data, wd->mgf_bg, "entry", "magnifier", "fixed-size");
    else if (wd->mgf_type == _ENTRY_MAGNIFIER_FILLWIDTH)
-       _elm_theme_object_set(data, wd->mgf_bg, "entry", "magnifier", "fill-width");
+     _elm_theme_object_set(data, wd->mgf_bg, "entry", "magnifier", "fill-width");
    else
-       return;
+     return;
 
    wd->mgf_clip = evas_object_rectangle_add(evas_object_evas_get(data));
    evas_object_color_set(wd->mgf_clip, 255, 255, 255, 255);
@@ -1082,10 +1413,19 @@ _magnifier_create(void *data)
    if (key_data) wd->mgf_scale = atof(key_data);
 
    if (wd->mgf_type == _ENTRY_MAGNIFIER_FILLWIDTH)
-       evas_object_resize(wd->mgf_bg, w, wd->mgf_height);
+     evas_object_resize(wd->mgf_bg, w, wd->mgf_height);
 
-   wd->mgf_proxy = evas_object_image_add(evas_object_evas_get(data));
-   evas_object_image_source_set(wd->mgf_proxy, data);
+   if (wd->scroll)
+     {
+        elm_smart_scroller_freeze_set(wd->scroller, EINA_TRUE);
+        wd->mgf_proxy = evas_object_image_add(evas_object_evas_get(wd->scroller));
+        evas_object_image_source_set(wd->mgf_proxy, wd->scroller);
+     }
+   else
+     {
+        wd->mgf_proxy = evas_object_image_add(evas_object_evas_get(data));
+        evas_object_image_source_set(wd->mgf_proxy, data);
+     }
    evas_object_resize(wd->mgf_proxy, w * wd->mgf_scale, h * wd->mgf_scale);
    evas_object_image_fill_set(wd->mgf_proxy, 0, 0, w * wd->mgf_scale, h * wd->mgf_scale);
    evas_object_color_set(wd->mgf_proxy, 255, 255, 255, 255);
@@ -1119,6 +1459,7 @@ _long_press(void *data)
    elm_object_scroll_freeze_push(data);
 
    wd->longpress_timer = NULL;
+   evas_object_smart_callback_call(data, SIG_LONGPRESSED, NULL);
    return ECORE_CALLBACK_CANCEL;
 }
 
@@ -1128,15 +1469,16 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Event_Mouse_Down *ev = event_info;
    if (!wd) return;
+   if (wd->disabled) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
-   if (ev->button != 1) return;
-   //   if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
-   if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer);
-   wd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data);
    wd->downx = ev->canvas.x;
    wd->downy = ev->canvas.y;
-
    wd->long_pressed = EINA_FALSE;
+   if (ev->button == 1)
+     {
+        if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer);
+        wd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, data);
+     }
 }
 
 static void
@@ -1145,27 +1487,36 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Event_Mouse_Up *ev = event_info;
    if (!wd) return;
-   if (ev->button != 1) return;
-
-   if (!wd->double_clicked)
+   if (wd->disabled) return;
+   if (ev->button == 1)
      {
-        if ((wd->api) && (wd->api->obj_mouseup))
+        if (!wd->double_clicked)
           {
-             wd->api->obj_mouseup(data);
+             if ((wd->api) && (wd->api->obj_mouseup))
+               {
+                  wd->api->obj_mouseup(data);
+               }
           }
-     }
-   if (wd->longpress_timer)
-     {
-       ecore_timer_del(wd->longpress_timer);
-       wd->longpress_timer = NULL;
-     }
 
-   _magnifier_hide(data);
-   elm_object_scroll_freeze_pop(data);
+        if (wd->longpress_timer)
+          {
+             ecore_timer_del(wd->longpress_timer);
+             wd->longpress_timer = NULL;
+          }
+
+        _magnifier_hide(data);
+        elm_object_scroll_freeze_pop(data);
+
+        if (wd->long_pressed)
+          {
+             _menu_press(data);
+          }
 
-   if (wd->long_pressed)
+     }
+   else if (ev->button == 3)
      {
-        _long_pressed(data);
+        wd->usedown = 1;
+        _menu_press(data);
      }
 }
 
@@ -1175,56 +1526,58 @@ _mouse_move(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Event_Mouse_Move *ev = event_info;
    if (!wd) return;
+   if (wd->disabled) return;
    if (!wd->selmode)
      {
-       if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
-         {
-            if (wd->longpress_timer)
-              {
-                 ecore_timer_del(wd->longpress_timer);
-                 wd->longpress_timer = NULL;
-              }
-         }
-       else if (wd->longpress_timer)
-         {
-            Evas_Coord dx, dy;
-
-            dx = wd->downx - ev->cur.canvas.x;
-            dx *= dx;
-            dy = wd->downy - ev->cur.canvas.y;
-            dy *= dy;
-            if ((dx + dy) >
-                ((_elm_config->finger_size / 2) *
-                 (_elm_config->finger_size / 2)))
-              {
-                 ecore_timer_del(wd->longpress_timer);
-                 wd->longpress_timer = NULL;
-              }
-         }
+        if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
+          {
+             if (wd->longpress_timer)
+               {
+                  ecore_timer_del(wd->longpress_timer);
+                  wd->longpress_timer = NULL;
+               }
+          }
+        else if (wd->longpress_timer)
+          {
+             Evas_Coord dx, dy;
+
+             dx = wd->downx - ev->cur.canvas.x;
+             dx *= dx;
+             dy = wd->downy - ev->cur.canvas.y;
+             dy *= dy;
+             if ((dx + dy) >
+                 ((_elm_config->finger_size / 2) *
+                  (_elm_config->finger_size / 2)))
+               {
+                  ecore_timer_del(wd->longpress_timer);
+                  wd->longpress_timer = NULL;
+               }
+          }
      }
    else if (wd->longpress_timer)
      {
-       Evas_Coord dx, dy;
-
-       dx = wd->downx - ev->cur.canvas.x;
-       dx *= dx;
-       dy = wd->downy - ev->cur.canvas.y;
-       dy *= dy;
-       if ((dx + dy) >
-           ((_elm_config->finger_size / 2) *
-            (_elm_config->finger_size / 2)))
-         {
-            ecore_timer_del(wd->longpress_timer);
-            wd->longpress_timer = NULL;
-         }
+        Evas_Coord dx, dy;
+
+        dx = wd->downx - ev->cur.canvas.x;
+        dx *= dx;
+        dy = wd->downy - ev->cur.canvas.y;
+        dy *= dy;
+        if ((dx + dy) >
+            ((_elm_config->finger_size / 2) *
+             (_elm_config->finger_size / 2)))
+          {
+             ecore_timer_del(wd->longpress_timer);
+             wd->longpress_timer = NULL;
+          }
      }
 
-   if (ev->buttons != 1) return;
-
-   if (wd->long_pressed)
+   if (ev->buttons == 1)
      {
-       _magnifier_show(data);
-       _magnifier_move(data);
+        if (wd->long_pressed)
+          {
+             _magnifier_show(data);
+             _magnifier_move(data);
+          }
      }
 }
 
@@ -1235,43 +1588,54 @@ _getbase(Evas_Object *obj)
    if (!wd) return "base";
    if (wd->editable)
      {
-        if (wd->password)
+        if (wd->password) return "base-password";
+        else
           {
-             if (wd->show_last_character) return "custom-password";
-             else return "base-password";
+             if (wd->single_line) return "base-single";
+             else
+               {
+                  switch (wd->linewrap)
+                    {
+                     case ELM_WRAP_CHAR:
+                        return "base-charwrap";
+                     case ELM_WRAP_WORD:
+                        return "base";
+                     case ELM_WRAP_MIXED:
+                        return "base-mixedwrap";
+                     case ELM_WRAP_NONE:
+                     default:
+                        return "base-nowrap";
+                    }
+               }
           }
-       else
-         {
-            if (wd->single_line) return "base-single";
-            else
-              {
-                 if (wd->linewrap) return "base";
-                  else if (wd->char_linewrap) return "base-charwrap";
-                 else  return "base-nowrap";
-              }
-         }
      }
    else
      {
-        if (wd->password)
+        if (wd->password) return "base-password";
+        else
           {
-             if (wd->show_last_character) return "custom-password";
-             else return "base-password";
+             if (wd->single_line) return "base-single-noedit";
+             else
+               {
+                  switch (wd->linewrap)
+                    {
+                     case ELM_WRAP_CHAR:
+                        return "base-noedit-charwrap";
+                     case ELM_WRAP_WORD:
+                        return "base-noedit";
+                     case ELM_WRAP_MIXED:
+                        return "base-noedit-mixedwrap";
+                     case ELM_WRAP_NONE:
+                     default:
+                        return "base-nowrap-noedit";
+                    }
+               }
           }
-       else
-         {
-            if (wd->single_line) return "base-single-noedit";
-            else
-              {
-                 if (wd->linewrap) return "base-noedit";
-                  else if (wd->char_linewrap) return "base-noedit-charwrap";
-                 else  return "base-nowrap-noedit";
-              }
-         }
      }
    return "base";
 }
 
+
 static int
 _entry_length_get(Evas_Object *obj)
 {
@@ -1313,7 +1677,7 @@ _matchlist_show(void *data)
      }
    text = elm_entry_entry_get(data);
    if (text == NULL)
-      return;
+     return;
    textlen = strlen(text);
 
    if (textlen < wd->matchlist_threshold)
@@ -1330,21 +1694,26 @@ _matchlist_show(void *data)
         EINA_LIST_FOREACH(wd->match_list, l, str_list)
           {
              if (wd->matchlist_case_sensitive)
-                str_result = strstr(str_list, text);
+               str_result = strstr(str_list, text);
              else
-                str_result = strcasestr(str_list, text);
+               str_result = strcasestr(str_list, text);
 
              if (str_result)
                {
                   str_mkup = malloc(strlen(str_list) + 16);
+                  if (str_mkup == NULL) return;
 
                   textlen = strlen(str_list) - strlen(str_result);
                   str_front = malloc(textlen + 1);
+                  if (str_front == NULL) return;
+
                   memset(str_front, 0, textlen + 1);
                   strncpy(str_front, str_list, textlen);
 
                   textlen = strlen(text);
                   str_mid = malloc(textlen + 1);
+                  if (str_mid == NULL) return;
+
                   memset(str_mid, 0, textlen + 1);
                   strncpy(str_mid, str_list + strlen(str_front), textlen);
 
@@ -1361,7 +1730,7 @@ _matchlist_show(void *data)
           }
      }
    else
-      return;
+     return;
 
    if (textfound)
      {
@@ -1376,7 +1745,7 @@ static void _matchlist_list_clicked( void *data, Evas_Object *obj, void *event_i
    Elm_List_Item *it = (Elm_List_Item *) elm_list_selected_item_get(obj);
    Widget_Data *wd = elm_widget_data_get(data);
    if ((it == NULL) || (wd == NULL))
-      return;
+     return;
 
    const char *text = elm_list_item_label_get(it);
    evas_object_smart_callback_call((Evas_Object *)data, "selected", (void *)text);
@@ -1388,7 +1757,7 @@ static void _matchlist_list_clicked( void *data, Evas_Object *obj, void *event_i
              elm_entry_cursor_end_set(data);
              wd->matchlist_list_clicked = EINA_TRUE;
 
-                        evas_object_smart_callback_call(data, SIG_MATCHLIST_CLICKED, elm_entry_markup_to_utf8(text));
+             evas_object_smart_callback_call(data, SIG_MATCHLIST_CLICKED, elm_entry_markup_to_utf8(text));
           }
      }
    elm_widget_focus_set(data, EINA_TRUE);
@@ -1401,64 +1770,78 @@ elm_entry_matchlist_set(Evas_Object *obj, Eina_List *match_list, Eina_Bool case_
    if (!wd) return;
 
    if (match_list)
-   {
-          Evas_Coord max_w = 9999, max_h = 9999;
-          const char* key_data = NULL;
-
-          wd->matchlist_threshold = 1;
-          wd->hover = elm_hover_add(elm_widget_parent_get(obj));
-          elm_hover_parent_set(wd->hover, elm_widget_parent_get(obj));
-          elm_hover_target_set(wd->hover, obj);
-          elm_object_style_set(wd->hover, "matchlist");
-
-          wd->layout = elm_layout_add(wd->hover);
-          elm_layout_theme_set(wd->layout, "entry", "matchlist", "default");
-          wd->list = elm_list_add(wd->layout);
-          evas_object_size_hint_weight_set(wd->list, EVAS_HINT_EXPAND, 0.0);
-          evas_object_size_hint_align_set(wd->list, EVAS_HINT_FILL, EVAS_HINT_FILL);
-          elm_list_mode_set(wd->list, ELM_LIST_EXPAND);
-          elm_object_style_set(wd->list, "matchlist");
-
-          key_data = edje_object_data_get(elm_layout_edje_get(wd->layout), "max_width");
-          if (key_data) max_w = atoi(key_data);
-          key_data = edje_object_data_get(elm_layout_edje_get(wd->layout), "max_height");
-          if (key_data) max_h = atoi(key_data);
-
-          elm_list_go(wd->list);
-          evas_object_size_hint_max_set(wd->list, max_w, max_h);
-          evas_object_smart_callback_add(wd->list, "selected", _matchlist_list_clicked, obj);
-          elm_layout_content_set(wd->layout, "elm.swallow.content", wd->list);
-          elm_hover_content_set(wd->hover, "bottom", wd->layout);
-
-          wd->match_list = match_list;
-   }
+     {
+        Evas_Coord max_w = 9999, max_h = 9999;
+        const char* key_data = NULL;
+
+        wd->matchlist_threshold = 1;
+        wd->hover = elm_hover_add(elm_widget_parent_get(obj));
+        elm_hover_parent_set(wd->hover, elm_widget_parent_get(obj));
+        elm_hover_target_set(wd->hover, obj);
+        elm_object_style_set(wd->hover, "matchlist");
+
+        wd->layout = elm_layout_add(wd->hover);
+        elm_layout_theme_set(wd->layout, "entry", "matchlist", "default");
+        wd->list = elm_list_add(wd->layout);
+        evas_object_size_hint_weight_set(wd->list, EVAS_HINT_EXPAND, 0.0);
+        evas_object_size_hint_align_set(wd->list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+        elm_list_mode_set(wd->list, ELM_LIST_EXPAND);
+        elm_object_style_set(wd->list, "matchlist");
+
+        key_data = edje_object_data_get(elm_layout_edje_get(wd->layout), "max_width");
+        if (key_data) max_w = atoi(key_data);
+        key_data = edje_object_data_get(elm_layout_edje_get(wd->layout), "max_height");
+        if (key_data) max_h = atoi(key_data);
+
+        elm_list_go(wd->list);
+        evas_object_size_hint_max_set(wd->list, max_w, max_h);
+        evas_object_smart_callback_add(wd->list, "selected", _matchlist_list_clicked, obj);
+        elm_layout_content_set(wd->layout, "elm.swallow.content", wd->list);
+        elm_hover_content_set(wd->hover, "bottom", wd->layout);
+
+        wd->match_list = match_list;
+     }
    else
-   {
-          if (wd->hover)
-                  evas_object_del(wd->hover);
+     {
+        if (wd->hover)
+          evas_object_del(wd->hover);
 
-          wd->match_list = NULL;
-   }
+        wd->match_list = NULL;
+     }
 
    wd->matchlist_case_sensitive = case_sensitive;
 }
 
-
 static void
-_signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_entry_changed_common_handling(void *data, const char *event)
 {
    Widget_Data *wd = elm_widget_data_get(data);
+   Evas_Coord minw, minh;
    if (!wd) return;
    wd->changed = EINA_TRUE;
+   /* Reset the size hints which are no more relevant.
+    * Keep the height, this is a hack, but doesn't really matter
+    * cause we'll re-eval in a moment. */
+   if (wd->scroll)
+     {
+        evas_object_size_hint_min_get(data, &minw, &minh);
+        evas_object_size_hint_min_set(data, minw, minh);
+     }
+   else
+     {
+        evas_object_size_hint_min_get(data, NULL, &minh);
+        evas_object_size_hint_min_set(data, -1, minh);
+     }
+
    _sizing_eval(data);
    if (wd->text) eina_stringshare_del(wd->text);
    wd->text = NULL;
    _check_enable_returnkey(data);
-   evas_object_smart_callback_call(data, SIG_CHANGED, NULL);
+   evas_object_smart_callback_call(data, event, NULL);
    if (wd->delay_write)
      {
-       ecore_timer_del(wd->delay_write);
-       wd->delay_write = NULL;
+        ecore_timer_del(wd->delay_write);
+        wd->delay_write = NULL;
      }
 
    if ((wd->single_line) && (wd->match_list))
@@ -1471,14 +1854,27 @@ _signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emiss
 }
 
 static void
-_signal_handler_move_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_signal_entry_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
-   elm_object_scroll_freeze_push(data);
+   _entry_changed_common_handling(data, SIG_CHANGED);
+}
 
-   if ((wd->api) && (wd->api->obj_hidemenu))
-     {
-        wd->api->obj_hidemenu(data);
+static void
+_signal_preedit_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   _entry_changed_common_handling(data, SIG_PREEDIT_CHANGED);
+}
+
+
+static void
+_signal_handler_move_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   elm_object_scroll_freeze_push(data);
+
+   if ((wd->api) && (wd->api->obj_hidemenu))
+     {
+        wd->api->obj_hidemenu(data);
      }
 
    _magnifier_create(data);
@@ -1495,22 +1891,22 @@ _signal_handler_move_end(void *data, Evas_Object *obj __UNUSED__, const char *em
    if (wd->have_selection)
      {
         _magnifier_hide(data);
-        _long_pressed(data);
+        _menu_press(data);
      }
 }
 
 static void
 _signal_handler_moving(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-       _magnifier_move(data);
-       _magnifier_show(data);
+   _magnifier_move(data);
+   _magnifier_show(data);
 }
 
 static void
 _signal_selection_end(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    _magnifier_hide(data);
-   _long_pressed(data);
+   _menu_press(data);
 }
 
 static void
@@ -1522,7 +1918,7 @@ _signal_selection_start(void *data, Evas_Object *obj __UNUSED__, const char *emi
    if (!wd) return;
    EINA_LIST_FOREACH(entries, l, entry)
      {
-       if (entry != data) elm_entry_select_none(entry);
+        if (entry != data) elm_entry_select_none(entry);
      }
    wd->have_selection = EINA_TRUE;
    wd->selmode = EINA_TRUE;
@@ -1530,12 +1926,12 @@ _signal_selection_start(void *data, Evas_Object *obj __UNUSED__, const char *emi
 #ifdef HAVE_ELEMENTARY_X
    if (wd->sel_notify_handler)
      {
-       const char *txt = elm_entry_selection_get(data);
-       Evas_Object *top;
+        const char *txt = elm_entry_selection_get(data);
+        Evas_Object *top;
 
-       top = elm_widget_top_get(data);
-       if ((top) && (elm_win_xwindow_get(top)))
-            elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP, txt);
+        top = elm_widget_top_get(data);
+        if ((top) && (elm_win_xwindow_get(top)))
+          elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP, txt);
      }
 #endif
 }
@@ -1549,7 +1945,7 @@ _signal_magnifier_changed(void *data, Evas_Object *obj __UNUSED__, const char *e
 
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
    if (!wd->deferred_recalc_job)
-      elm_widget_show_region_set(data, cx, cy, cw, ch);
+      elm_widget_show_region_set(data, cx, cy, cw, ch, EINA_FALSE);
    else
      {
         wd->deferred_cur = EINA_TRUE;
@@ -1574,7 +1970,7 @@ _signal_selection_changed(void *data, Evas_Object *obj __UNUSED__, const char *e
 
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
    if (!wd->deferred_recalc_job)
-      elm_widget_show_region_set(data, cx, cy, cw, ch + elm_finger_size_get());
+      elm_widget_show_region_set(data, cx, cy, cw, ch + elm_finger_size_get(), EINA_FALSE);
    else
      {
         wd->deferred_cur = EINA_TRUE;
@@ -1596,35 +1992,35 @@ _signal_selection_cleared(void *data, Evas_Object *obj __UNUSED__, const char *e
    evas_object_smart_callback_call(data, SIG_SELECTION_CLEARED, NULL);
    if (wd->sel_notify_handler)
      {
-       if (wd->cut_sel)
-         {
+        if (wd->cut_sel)
+          {
 #ifdef HAVE_ELEMENTARY_X
-            Evas_Object *top;
+             Evas_Object *top;
 
-            top = elm_widget_top_get(data);
-            if ((top) && (elm_win_xwindow_get(top)))
-                elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP,
-                                      wd->cut_sel);
+             top = elm_widget_top_get(data);
+             if ((top) && (elm_win_xwindow_get(top)))
+               elm_selection_set(ELM_SEL_PRIMARY, data, ELM_SEL_FORMAT_MARKUP,
+                                 wd->cut_sel);
 #endif
-            eina_stringshare_del(wd->cut_sel);
-            wd->cut_sel = NULL;
-         }
-       else
-         {
+             eina_stringshare_del(wd->cut_sel);
+             wd->cut_sel = NULL;
+          }
+        else
+          {
 #ifdef HAVE_ELEMENTARY_X
-            Evas_Object *top;
+             Evas_Object *top;
 
-            top = elm_widget_top_get(data);
-            if ((top) && (elm_win_xwindow_get(top)))
-               elm_selection_clear(ELM_SEL_PRIMARY, data);
+             top = elm_widget_top_get(data);
+             if ((top) && (elm_win_xwindow_get(top)))
+               elm_selection_clear(ELM_SEL_PRIMARY, data);
 #endif
-         }
+          }
      }
 
    if ((wd->api) && (wd->api->obj_hidemenu))
-   {
-          wd->api->obj_hidemenu(data);
-   }
+     {
+        wd->api->obj_hidemenu(data);
+     }
 }
 
 static void
@@ -1636,15 +2032,15 @@ _signal_entry_paste_request(void *data, Evas_Object *obj __UNUSED__, const char
    if (wd->sel_notify_handler)
      {
 #ifdef HAVE_ELEMENTARY_X
-       Evas_Object *top;
+        Evas_Object *top;
 
-       top = elm_widget_top_get(data);
-       if ((top) && (elm_win_xwindow_get(top)))
-         {
+        top = elm_widget_top_get(data);
+        if ((top) && (elm_win_xwindow_get(top)))
+          {
              wd->selection_asked = EINA_TRUE;
              elm_selection_get(ELM_SEL_CLIPBOARD, ELM_SEL_FORMAT_MARKUP, data,
                                NULL, NULL);
-         }
+          }
 #endif
      }
 }
@@ -1656,7 +2052,7 @@ _signal_entry_copy_notify(void *data, Evas_Object *obj __UNUSED__, const char *e
    if (!wd) return;
    evas_object_smart_callback_call(data, SIG_SELECTION_COPY, NULL);
    elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
-                       elm_entry_selection_get(data));
+                     elm_entry_selection_get(data));
 }
 
 static void
@@ -1666,7 +2062,7 @@ _signal_entry_cut_notify(void *data, Evas_Object *obj __UNUSED__, const char *em
    if (!wd) return;
    evas_object_smart_callback_call(data, SIG_SELECTION_CUT, NULL);
    elm_selection_set(ELM_SEL_CLIPBOARD, obj, ELM_SEL_FORMAT_MARKUP,
-                       elm_entry_selection_get(data));
+                     elm_entry_selection_get(data));
    edje_object_part_text_insert(wd->ent, "elm.text", "");
    wd->changed = EINA_TRUE;
    _sizing_eval(data);
@@ -1676,21 +2072,10 @@ static void
 _signal_cursor_changed(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   Evas_Coord cx, cy, cw, ch;
    if (!wd) return;
-   evas_object_smart_callback_call(data, SIG_CURSOR_CHANGED, NULL);
-   edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text",
-                                             &cx, &cy, &cw, &ch);
-   if (!wd->deferred_recalc_job)
-     elm_widget_show_region_set(data, cx, cy, cw, ch);
-   else
-     {
-       wd->deferred_cur = EINA_TRUE;
-       wd->cx = cx;
-       wd->cy = cy;
-       wd->cw = cw;
-       wd->ch = ch;
-     }
+   wd->cursor_pos = edje_object_part_text_cursor_pos_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
+   wd->cur_changed = EINA_TRUE;
+   _recalc_cursor_geometry(data);
 }
 
 static void
@@ -1701,7 +2086,14 @@ _signal_anchor_down(void *data, Evas_Object *obj __UNUSED__, const char *emissio
 }
 
 static void
-_signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
+_signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd) return;
+}
+
+static void
+_signal_anchor_clicked(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Elm_Entry_Anchor_Info ei;
@@ -1710,47 +2102,47 @@ _signal_anchor_up(void *data, Evas_Object *obj __UNUSED__, const char *emission,
    p = strrchr(emission, ',');
    if (p)
      {
-       const Eina_List *geoms;
-
-       n = p + 1;
-       p2 = p -1;
-       while (p2 >= emission)
-         {
-            if (*p2 == ',') break;
-            p2--;
-         }
-       p2++;
-       buf2 = alloca(5 + p - p2);
-       strncpy(buf2, p2, p - p2);
-       buf2[p - p2] = 0;
-       ei.name = n;
-       ei.button = atoi(buf2);
-       ei.x = ei.y = ei.w = ei.h = 0;
-       geoms =
-          edje_object_part_text_anchor_geometry_get(wd->ent, "elm.text", ei.name);
-       if (geoms)
-         {
-            Evas_Textblock_Rectangle *r;
-            const Eina_List *l;
-            Evas_Coord px, py, x, y;
-
-            evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL);
-            evas_pointer_output_xy_get(evas_object_evas_get(wd->ent), &px, &py);
-            EINA_LIST_FOREACH(geoms, l, r)
-              {
-                 if (((r->x + x) <= px) && ((r->y + y) <= py) &&
-                     ((r->x + x + r->w) > px) && ((r->y + y + r->h) > py))
-                   {
-                      ei.x = r->x + x;
-                      ei.y = r->y + y;
-                      ei.w = r->w;
-                      ei.h = r->h;
-                      break;
-                   }
-              }
-         }
-       if (!wd->disabled)
-         evas_object_smart_callback_call(data, SIG_ANCHOR_CLICKED, &ei);
+        const Eina_List *geoms;
+
+        n = p + 1;
+        p2 = p -1;
+        while (p2 >= emission)
+          {
+             if (*p2 == ',') break;
+             p2--;
+          }
+        p2++;
+        buf2 = alloca(5 + p - p2);
+        strncpy(buf2, p2, p - p2);
+        buf2[p - p2] = 0;
+        ei.name = n;
+        ei.button = atoi(buf2);
+        ei.x = ei.y = ei.w = ei.h = 0;
+        geoms =
+           edje_object_part_text_anchor_geometry_get(wd->ent, "elm.text", ei.name);
+        if (geoms)
+          {
+             Evas_Textblock_Rectangle *r;
+             const Eina_List *l;
+             Evas_Coord px, py, x, y;
+
+             evas_object_geometry_get(wd->ent, &x, &y, NULL, NULL);
+             evas_pointer_canvas_xy_get(evas_object_evas_get(wd->ent), &px, &py);
+             EINA_LIST_FOREACH(geoms, l, r)
+               {
+                  if (((r->x + x) <= px) && ((r->y + y) <= py) &&
+                      ((r->x + x + r->w) > px) && ((r->y + y + r->h) > py))
+                    {
+                       ei.x = r->x + x;
+                       ei.y = r->y + y;
+                       ei.w = r->w;
+                       ei.h = r->h;
+                       break;
+                    }
+               }
+          }
+        if (!wd->disabled)
+          evas_object_smart_callback_call(data, SIG_ANCHOR_CLICKED, &ei);
      }
 }
 
@@ -1822,58 +2214,58 @@ _event_selection_notify(void *data, int type __UNUSED__, void *event)
    Ecore_X_Event_Selection_Notify *ev = event;
    if (!wd) return ECORE_CALLBACK_PASS_ON;
    if ((!wd->selection_asked) && (!wd->drag_selection_asked))
-      return ECORE_CALLBACK_PASS_ON;
+     return ECORE_CALLBACK_PASS_ON;
 
    if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
        (ev->selection == ECORE_X_SELECTION_PRIMARY))
      {
-       Ecore_X_Selection_Data_Text *text_data;
-
-       text_data = ev->data;
-       if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT)
-         {
-            if (text_data->text)
-              {
-                 char *txt = _elm_util_text_to_mkup(text_data->text);
-
-                 if (txt)
-                   {
-                      elm_entry_entry_insert(data, txt);
-                      free(txt);
-                   }
-              }
-         }
-       wd->selection_asked = EINA_FALSE;
+        Ecore_X_Selection_Data_Text *text_data;
+
+        text_data = ev->data;
+        if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT)
+          {
+             if (text_data->text)
+               {
+                  char *txt = _elm_util_text_to_mkup(text_data->text);
+
+                  if (txt)
+                    {
+                       elm_entry_entry_insert(data, txt);
+                       free(txt);
+                    }
+               }
+          }
+        wd->selection_asked = EINA_FALSE;
      }
    else if (ev->selection == ECORE_X_SELECTION_XDND)
      {
-       Ecore_X_Selection_Data_Text *text_data;
-
-       text_data = ev->data;
-       if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT)
-         {
-            if (text_data->text)
-              {
-                 char *txt = _elm_util_text_to_mkup(text_data->text);
-
-                 if (txt)
-                   {
-                     /* Massive FIXME: this should be at the drag point */
-                      elm_entry_entry_insert(data, txt);
-                      free(txt);
-                   }
-              }
-         }
-       wd->drag_selection_asked = EINA_FALSE;
+        Ecore_X_Selection_Data_Text *text_data;
+
+        text_data = ev->data;
+        if (text_data->data.content == ECORE_X_SELECTION_CONTENT_TEXT)
+          {
+             if (text_data->text)
+               {
+                  char *txt = _elm_util_text_to_mkup(text_data->text);
+
+                  if (txt)
+                    {
+                       /* Massive FIXME: this should be at the drag point */
+                       elm_entry_entry_insert(data, txt);
+                       free(txt);
+                    }
+               }
+          }
+        wd->drag_selection_asked = EINA_FALSE;
 
         ecore_x_dnd_send_finished();
-     }
 
+     }
    return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
-_event_selection_clear(void *data, int type __UNUSED__, void *event)
+_event_selection_clear(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
 /*
    Widget_Data *wd = elm_widget_data_get(data);
@@ -1883,9 +2275,9 @@ _event_selection_clear(void *data, int type __UNUSED__, void *event)
    if ((ev->selection == ECORE_X_SELECTION_CLIPBOARD) ||
        (ev->selection == ECORE_X_SELECTION_PRIMARY))
      {
-       elm_entry_select_none(data);
+        elm_entry_select_none(data);
      }
-   return 1;*/
+   return 1; */
 
    // start for cbhm
    Evas_Object *top = elm_widget_top_get(data);
@@ -1908,7 +2300,6 @@ _event_selection_clear(void *data, int type __UNUSED__, void *event)
    return ECORE_CALLBACK_PASS_ON;
 }
 
-
 static Eina_Bool
 _drag_drop_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Selection_Data *drop)
 {
@@ -1916,14 +2307,13 @@ _drag_drop_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Selection_Data *drop)
    Eina_Bool rv;
 
    wd = elm_widget_data_get(obj);
-
    if (!wd) return EINA_FALSE;
    printf("Inserting at (%d,%d) %s\n",drop->x,drop->y,(char*)drop->data);
 
    edje_object_part_text_cursor_copy(wd->ent, "elm.text",
                                      EDJE_CURSOR_MAIN,/*->*/EDJE_CURSOR_USER);
    rv = edje_object_part_text_cursor_coord_set(wd->ent,"elm.text",
-                                          EDJE_CURSOR_MAIN,drop->x,drop->y);
+                                               EDJE_CURSOR_MAIN,drop->x,drop->y);
    if (!rv) printf("Warning: Failed to position cursor: paste anyway\n");
    elm_entry_entry_insert(obj, drop->data);
    edje_object_part_text_cursor_copy(wd->ent, "elm.text",
@@ -1971,70 +2361,6 @@ _get_item(void *data, Evas_Object *edje __UNUSED__, const char *part __UNUSED__,
 }
 
 static int
-_get_value_in_key_string(const char *oldstring, char *key, char **value)
-{
-   char *curlocater, *starttag, *endtag;
-   int firstindex = 0, foundflag = -1;
-
-   curlocater = strstr(oldstring, key);
-   if (curlocater)
-     {
-        starttag = curlocater;
-        endtag = curlocater + strlen(key);
-        if (endtag == NULL || *endtag != '=')
-          {
-            foundflag = 0;
-            return -1;
-          }
-
-        firstindex = abs(oldstring - curlocater);
-        firstindex += strlen(key)+1; // strlen("key") + strlen("=")
-        *value = (char*)(oldstring + firstindex);
-
-        while (oldstring != starttag)
-          {
-            if (*starttag == '>')
-              {
-                foundflag = 0;
-                break;
-              }
-            if (*starttag == '<')
-              break;
-            else
-              starttag--;
-            if (starttag == NULL) break;
-          }
-
-        while (NULL != endtag)
-          {
-            if (*endtag == '<')
-              {
-                foundflag = 0;
-                break;
-              }
-            if (*endtag == '>')
-              break;
-            else
-              endtag++;
-            if (endtag == NULL) break;
-          }
-
-        if (foundflag != 0 && *starttag == '<' && *endtag == '>')
-          foundflag = 1;
-        else
-          foundflag = 0;
-     }
-   else
-     {
-       foundflag = 0;
-     }
-
-   if (foundflag == 1) return 0;
-
-   return -1;
-}
-
-static int
 _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag)
 {
    const char *srcstring = NULL;
@@ -2143,268 +2469,211 @@ _stringshare_key_value_replace(const char **srcstring, char *key, const char *va
    return 0;
 }
 
-static int
-_is_width_over(Evas_Object *obj)
+static void
+_text_filter(void *data, Evas_Object *edje __UNUSED__, const char *part __UNUSED__, Edje_Text_Filter_Type type, char **text)
 {
-   Evas_Coord x, y, w, h;
-   Evas_Coord vx, vy, vw, vh;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   if (!wd) return 0;
-
-   edje_object_part_geometry_get(wd->ent,"elm.text",&x,&y,&w,&h);
-
-   evas_object_geometry_get (obj, &vx,&vy,&vw,&vh);
-
-   if (x >= 0 && y >= 0)
-          return 0;
+   Widget_Data *wd = elm_widget_data_get(data);
+   Eina_List *l;
+   Elm_Entry_Text_Filter *tf;
 
-   if (4 < wd->wrap_w && w > wd->wrap_w)
-          return 1;
+   if (type == EDJE_TEXT_FILTER_FORMAT)
+     return;
 
-   return 0;
+   EINA_LIST_FOREACH(wd->text_filters, l, tf)
+     {
+        tf->func(tf->data, data, text);
+        if (!*text)
+          break;
+     }
 }
 
-static void
-_reverse_ellipsis_entry(Evas_Object *obj)
+/* This function is used to insert text by chunks in jobs */
+static Eina_Bool
+_text_append_idler(void *data)
 {
+   int start;
+   char backup;
+   Evas_Object *obj = (Evas_Object *) data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   int cur_fontsize = 0;
-   Eina_Strbuf *fontbuf = NULL, *txtbuf = NULL;
-   char *kvalue = NULL;
-   const char *minfont, *deffont, *maxfont;
-   const char *ellipsis_string = "...";
-   int minfontsize, maxfontsize, minshowcount;
-
-   minshowcount = strlen(ellipsis_string) + 1;
-   minfont = edje_object_data_get(wd->ent, "min_font_size");
-   if (minfont) minfontsize = atoi(minfont);
-   else minfontsize = 1;
-   maxfont = edje_object_data_get(wd->ent, "max_font_size");
-   if (maxfont) maxfontsize = atoi(maxfont);
-   else maxfontsize = 1;
-   deffont = edje_object_data_get(wd->ent, "default_font_size");
-   if (deffont) cur_fontsize = atoi(deffont);
-   else cur_fontsize = 1;
-   if (minfontsize == maxfontsize || cur_fontsize == 1) return; // theme is not ready for ellipsis
-   if (strlen(edje_object_part_text_get(wd->ent, "elm.text")) <= 0) return;
-
-   if (_get_value_in_key_string(edje_object_part_text_get(wd->ent, "elm.text"), "font_size", &kvalue) == 0)
-     {
-       if (kvalue != NULL) cur_fontsize = atoi(kvalue);
-     }
-
-   txtbuf = eina_strbuf_new();
-   eina_strbuf_append(txtbuf, edje_object_part_text_get(wd->ent, "elm.text"));
+   if (wd->text) eina_stringshare_del(wd->text);
+   wd->text = NULL;
+   wd->changed = EINA_TRUE;
 
-   if (cur_fontsize >= atoi(deffont))
+   start = wd->append_text_position;
+   if(start + _CHUNK_SIZE < wd->append_text_len)
      {
-       if (txtbuf) eina_strbuf_free(txtbuf);
-       return;
+        wd->append_text_position = (start + _CHUNK_SIZE);
+        /* Go to the start of the nearest codepoint, because we don't want
+         * to cut it in the middle */
+        eina_unicode_utf8_get_prev(wd->append_text_left,
+              &wd->append_text_position);
      }
-
-   if (_is_width_over(obj) != 1)
+   else
      {
-       int rev_fontsize = cur_fontsize;
-
-       do {
-           rev_fontsize++;
-           if (rev_fontsize > atoi(deffont))
-             break;
-
-           if (fontbuf != NULL)
-             {
-               eina_strbuf_free(fontbuf);
-               fontbuf = NULL;
-             }
-           fontbuf = eina_strbuf_new();
-           eina_strbuf_append_printf(fontbuf, "%d", rev_fontsize);
-           _strbuf_key_value_replace(txtbuf, "font_size", eina_strbuf_string_get(fontbuf), 0);
-           edje_object_part_text_set(wd->ent, "elm.text", eina_strbuf_string_get(txtbuf));
-
-           eina_strbuf_free(fontbuf);
-           fontbuf = NULL;
-         } while (_is_width_over(obj) != 1);
+        wd->append_text_position = wd->append_text_len;
+     }
 
-       while (_is_width_over(obj))
-         {
-           rev_fontsize--;
-           if (rev_fontsize < atoi(deffont))
-             break;
+   backup = wd->append_text_left[wd->append_text_position];
+   wd->append_text_left[wd->append_text_position] = '\0';
 
-           if (fontbuf != NULL)
-             {
-               eina_strbuf_free(fontbuf);
-               fontbuf = NULL;
-             }
-           fontbuf = eina_strbuf_new();
-           eina_strbuf_append_printf(fontbuf, "%d", rev_fontsize);
-           _strbuf_key_value_replace(txtbuf, "font_size", eina_strbuf_string_get(fontbuf), 0);
-           edje_object_part_text_set(wd->ent, "elm.text", eina_strbuf_string_get(txtbuf));
-           eina_strbuf_free(fontbuf);
-           fontbuf = NULL;
-         }
-     }
+   edje_object_part_text_append(wd->ent, "elm.text",
+         wd->append_text_left + start);
 
-   if (txtbuf) eina_strbuf_free(txtbuf);
-   wd->changed = 1;
-   _sizing_eval(obj);
-}
+   wd->append_text_left[wd->append_text_position] = backup;
 
-static void
-_ellipsis_entry_to_width(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   int cur_fontsize = 0, len, jumpcount;
-   Eina_Strbuf *fontbuf = NULL, *txtbuf = NULL;
-   char *kvalue = NULL;
-   const char *minfont, *deffont, *maxfont;
-   const char *ellipsis_string = "...";
-   int minfontsize, maxfontsize, minshowcount;
-   int i, tagend, cur_len;
-   char *cur_str;
-
-   minshowcount = strlen(ellipsis_string) + 1;
-   minfont = edje_object_data_get(wd->ent, "min_font_size");
-   if (minfont) minfontsize = atoi(minfont);
-   else minfontsize = 1;
-   maxfont = edje_object_data_get(wd->ent, "max_font_size");
-   if (maxfont) maxfontsize = atoi(maxfont);
-   else maxfontsize = 1;
-   deffont = edje_object_data_get(wd->ent, "default_font_size");
-   if (deffont) cur_fontsize = atoi(deffont);
-   else cur_fontsize = 1;
-   if (minfontsize == maxfontsize || cur_fontsize == 1) return; // theme is not ready for ellipsis
-   if (strlen(edje_object_part_text_get(wd->ent, "elm.text")) <= 0) return;
-
-   if (_get_value_in_key_string(edje_object_part_text_get(wd->ent, "elm.text"), "font_size", &kvalue) == 0)
+   /* If there's still more to go, renew the idler, else, cleanup */
+   if (wd->append_text_position < wd->append_text_len)
      {
-       if (kvalue != NULL) cur_fontsize = atoi(kvalue);
+        return ECORE_CALLBACK_RENEW;
      }
-
-   txtbuf = eina_strbuf_new();
-   eina_strbuf_append(txtbuf, edje_object_part_text_get(wd->ent, "elm.text"));
-
-   while (_is_width_over(obj))
+   else
      {
-       if (wd->ellipsis_threshold == 0)
-         wd->ellipsis_threshold = _entry_length_get(obj);
-       if (cur_fontsize > minfontsize)
-         {
-           cur_fontsize--;
-           if (fontbuf != NULL)
-             {
-               eina_strbuf_free(fontbuf);
-               fontbuf = NULL;
-             }
-           fontbuf = eina_strbuf_new();
-           eina_strbuf_append_printf(fontbuf, "%d", cur_fontsize);
-           _strbuf_key_value_replace(txtbuf, "font_size", eina_strbuf_string_get(fontbuf), 0);
-           edje_object_part_text_set(wd->ent, "elm.text", eina_strbuf_string_get(txtbuf));
-           eina_strbuf_free(fontbuf);
-           fontbuf = NULL;
-                  edje_object_part_text_cursor_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
-         }
-       else
-         {
-           len = _entry_length_get(obj);
-           cur_str = (char*)edje_object_part_text_get(wd->ent, "elm.text");
-           cur_len = strlen(cur_str);
-           tagend = 0;
-           for (i = 0; i < len; i++)
-             {
-               if(cur_str[i] == '>' && cur_str[i+1] != '\0' &&
-                  cur_str[i+1] != '<')
-                 {
-                   tagend = i;
-                   break;
-                 }
-             }
-           jumpcount = 0;
-           while (jumpcount < len-strlen(ellipsis_string))
-             {
-               cur_str = (char*)edje_object_part_text_get(wd->ent, "elm.text");
-
-               if (txtbuf != NULL)
-                 {
-                   eina_strbuf_free(txtbuf);
-                   txtbuf = NULL;
-                 }
-               txtbuf = eina_strbuf_new();
-               eina_strbuf_append_n(txtbuf, cur_str, tagend+1);
-               eina_strbuf_append(txtbuf, ellipsis_string);
-               eina_strbuf_append(txtbuf, cur_str+tagend+jumpcount+1);
-               edje_object_part_text_set(wd->ent, "elm.text", eina_strbuf_string_get(txtbuf));
-               edje_object_part_text_cursor_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
-
-               if (_is_width_over(obj))
-                 jumpcount++;
-               else
-                 break;
-             }
-         }
+        free(wd->append_text_left);
+        wd->append_text_left = NULL;
+        wd->append_text_idler = NULL;
+        return ECORE_CALLBACK_CANCEL;
      }
-
-   if (txtbuf) eina_strbuf_free(txtbuf);
-   wd->changed = 1;
-   _sizing_eval(obj);
 }
 
-static Eina_Bool *_textinput_control_function(void *data,void *input_data)
+static void
+_add_chars_till_limit(Evas_Object *obj, char **text, int can_add, Length_Unit unit)
 {
-   /* calculate character count */
-   Evas_Object *entry = (Evas_Object *)data;
-   Widget_Data *wd = elm_widget_data_get((Evas_Object *)data);
-   char buf[10]="\0";
-   size_t byte_len;
-   size_t insert_text_len=0;
-   char *text = (char*)edje_object_part_text_get(wd->ent, "elm.text");
-   char *insert_text;
-   size_t remain_bytes;
-   if (text != NULL)
+   int i = 0, unit_size;
+   int current_len = strlen(*text);
+   char *new_text = *text;
+   if (unit >= LENGTH_UNIT_LAST) return;
+   while (*new_text)
      {
-        byte_len = strlen(text); /* no of bytes */
-        remain_bytes = wd->max_no_of_bytes - byte_len;
-        sprintf(buf,"%d",remain_bytes);
-        //edje_object_part_text_set(wd->ent, "elm_entry_remain_byte_count", buf);
-        if (input_data)
+        if (*new_text == '<')
           {
-             insert_text =  (char *)input_data;
-             insert_text_len = strlen(insert_text);
-             if (remain_bytes < insert_text_len)
+             while (*new_text != '>')
                {
-                  evas_object_smart_callback_call(entry, "maxlength,reached", NULL);
-                  return EINA_TRUE;
+                  new_text++;
+                  if (!*new_text) break;
                }
-             if (byte_len >= wd->max_no_of_bytes)
+             new_text++;
+          }
+        else
+          {
+             int index = 0;
+             if (*new_text == '&')
+               {
+                  while (*(new_text + index) != ';')
+                    {
+                       index++;
+                       if (!*(new_text + index)) break;
+                    }
+               }
+             char *markup;
+             index = evas_string_char_next_get(new_text, index, NULL);
+             markup = malloc(index + 1);
+             strncpy(markup, new_text, index);
+             markup[index] = 0;
+             if (unit == LENGTH_UNIT_BYTE)
+               unit_size = strlen(elm_entry_markup_to_utf8(markup));
+             else if (unit == LENGTH_UNIT_CHAR)
+               unit_size = evas_string_char_len_get(elm_entry_markup_to_utf8(markup));
+             if (markup)
+               {
+                  free(markup);
+                  markup = NULL;
+               }
+             if (can_add < unit_size)
+               {
+                  if (!i)
+                    {
+                       evas_object_smart_callback_call(obj, "maxlength,reached", NULL);
+                       free(*text);
+                       *text = NULL;
+                       return;
+                    }
+                  can_add = 0;
+                  strncpy(new_text, new_text + index, current_len - ((new_text + index) - *text));
+                  current_len -= index;
+                  (*text)[current_len] = 0;
+               }
+             else
                {
-                  evas_object_smart_callback_call(entry, "maxlength,reached", NULL);
-                  return EINA_TRUE;
+                  new_text += index;
+                  can_add -= unit_size;
                }
+             i++;
           }
      }
-   return EINA_FALSE;
+   evas_object_smart_callback_call(obj, "maxlength,reached", NULL);
 }
 
-
 static void
-_text_filter(void *data, Evas_Object *edje __UNUSED__, const char *part __UNUSED__, Edje_Text_Filter_Type type, char **text)
+_elm_entry_text_set(Evas_Object *obj, const char *item, const char *entry)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
-   Eina_List *l;
-   Elm_Entry_Text_Filter *tf;
+   int len = 0;
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   if (item && strcmp(item, "default")) return;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (!entry) entry = "";
+   if (wd->text) eina_stringshare_del(wd->text);
+   wd->text = NULL;
+   wd->changed = EINA_TRUE;
 
-   if (type == EDJE_TEXT_FILTER_FORMAT)
-     return;
+   /* Clear currently pending job if there is one */
+   if (wd->append_text_idler)
+     {
+        ecore_idler_del(wd->append_text_idler);
+        free(wd->append_text_left);
+        wd->append_text_left = NULL;
+        wd->append_text_idler = NULL;
+     }
 
-   EINA_LIST_FOREACH(wd->text_filters, l, tf)
+   len = strlen(entry);
+   /* Split to ~_CHUNK_SIZE chunks */
+   if (len > _CHUNK_SIZE)
      {
-        tf->func(tf->data, data, text);
-        if (!*text)
-           break;
+        wd->append_text_left = (char *) malloc(len + 1);
+     }
+
+   /* If we decided to use the idler */
+   if (wd->append_text_left)
+     {
+        /* Need to clear the entry first */
+        edje_object_part_text_set(wd->ent, "elm.text", "");
+        memcpy(wd->append_text_left, entry, len + 1);
+        wd->append_text_position = 0;
+        wd->append_text_len = len;
+        wd->append_text_idler = ecore_idler_add(_text_append_idler, obj);
+     }
+   else
+     {
+        edje_object_part_text_set(wd->ent, "elm.text", entry);
      }
 }
 
+static const char *
+_elm_entry_text_get(const Evas_Object *obj, const char *item)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (item && strcmp(item, "default")) return NULL;
+   const char *text;
+   if (!wd) return NULL;
+   if (wd->text)
+     {
+        if (wd->password)
+          return elm_entry_markup_to_utf8(wd->text);
+        else
+          return wd->text;
+     }
+   text = edje_object_part_text_get(wd->ent, "elm.text");
+   if (!text)
+     {
+        ERR("text=NULL for edje %p, part 'elm.text'", wd->ent);
+        return NULL;
+     }
+   eina_stringshare_replace(&wd->text, text);
+   if (wd->password) return elm_entry_markup_to_utf8(wd->text);
+   return wd->text;
+}
+
 /**
  * This adds an entry to @p parent object.
  *
@@ -2420,15 +2689,8 @@ elm_entry_add(Evas_Object *parent)
    Evas *e;
    Widget_Data *wd;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
+   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 
-   wd = ELM_NEW(Widget_Data);
-   e = evas_object_evas_get(parent);
-   if (!e) return NULL;
-   wd->bgcolor = EINA_FALSE;
-   wd->bg = evas_object_rectangle_add(e);
-   evas_object_color_set(wd->bg, 0, 0, 0, 0);
-   obj = elm_widget_add(e);
    ELM_SET_WIDTYPE(widtype, "entry");
    elm_widget_type_set(obj, "entry");
    elm_widget_sub_object_add(parent, obj);
@@ -2439,16 +2701,27 @@ elm_entry_add(Evas_Object *parent)
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_disable_hook_set(obj, _disable_hook);
    elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
+   elm_widget_focus_region_hook_set(obj, _focus_region_hook);
    elm_widget_on_focus_region_hook_set(obj, _on_focus_region_hook);
    elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
    elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
    elm_object_cursor_set(obj, ELM_CURSOR_XTERM);
    elm_widget_can_focus_set(obj, EINA_TRUE);
    elm_widget_highlight_ignore_set(obj, EINA_TRUE);
-
-   wd->linewrap     = EINA_TRUE;
-   wd->ellipsis     = EINA_FALSE;
-   wd->char_linewrap= EINA_FALSE;
+   elm_widget_text_set_hook_set(obj, _elm_entry_text_set);
+   elm_widget_text_get_hook_set(obj, _elm_entry_text_get);
+
+   wd->scroller = elm_smart_scroller_add(e);
+   elm_widget_sub_object_add(obj, wd->scroller);
+   elm_smart_scroller_widget_set(wd->scroller, obj);
+   elm_smart_scroller_object_theme_set(obj, wd->scroller, "scroller", "entry",
+                                       elm_widget_style_get(obj));
+   evas_object_size_hint_weight_set(wd->scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(wd->scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
+   elm_smart_scroller_propagate_events_set(wd->scroller, EINA_TRUE);
+
+   wd->linewrap     = ELM_WRAP_WORD;
    wd->editable     = EINA_TRUE;
    wd->disabled     = EINA_FALSE;
    wd->context_menu = EINA_TRUE;
@@ -2456,23 +2729,24 @@ elm_entry_add(Evas_Object *parent)
    wd->textonly     = EINA_FALSE;
    wd->autoperiod   = EINA_TRUE;
 
-   wd->ellipsis_threshold = 0;
-
    wd->ent = edje_object_add(e);
+   elm_widget_sub_object_add(obj, wd->ent);
    edje_object_item_provider_set(wd->ent, _get_item, obj);
    edje_object_text_insert_filter_callback_add(wd->ent,"elm.text", _text_filter, obj);
    evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOVE, _move, obj);
-   evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_RESIZE, _resize, obj);
    evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_DOWN,
                                   _mouse_down, obj);
    evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_UP,
                                   _mouse_up, obj);
    evas_object_event_callback_add(wd->ent, EVAS_CALLBACK_MOUSE_MOVE,
                                   _mouse_move, obj);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);
 
    _elm_theme_object_set(obj, wd->ent, "entry", "base", "default");
    edje_object_signal_callback_add(wd->ent, "entry,changed", "elm.text",
                                    _signal_entry_changed, obj);
+   edje_object_signal_callback_add(wd->ent, "preedit,changed", "elm.text",
+                                   _signal_preedit_changed, obj);
    edje_object_signal_callback_add(wd->ent, "handler,move,start", "elm.text",
                                    _signal_handler_move_start, obj);
    edje_object_signal_callback_add(wd->ent, "handler,move,end", "elm.text",
@@ -2501,6 +2775,8 @@ elm_entry_add(Evas_Object *parent)
                                    _signal_anchor_down, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,up,*", "elm.text",
                                    _signal_anchor_up, obj);
+   edje_object_signal_callback_add(wd->ent, "anchor,mouse,clicked,*", "elm.text",
+                                   _signal_anchor_clicked, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,move,*", "elm.text",
                                    _signal_anchor_move, obj);
    edje_object_signal_callback_add(wd->ent, "anchor,mouse,in,*", "elm.text",
@@ -2516,6 +2792,8 @@ elm_entry_add(Evas_Object *parent)
    edje_object_signal_callback_add(wd->ent, "mouse,down,1,double", "elm.text",
                                    _signal_mouse_double, obj);
    edje_object_part_text_set(wd->ent, "elm.text", "");
+   if (_elm_config->desktop_entry)
+     edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
    elm_widget_resize_object_set(obj, wd->ent);
    _sizing_eval(obj);
 
@@ -2525,15 +2803,16 @@ elm_entry_add(Evas_Object *parent)
    top = elm_widget_top_get(obj);
    if ((top) && (elm_win_xwindow_get(top)))
      {
-       wd->sel_notify_handler =
-         ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
-                                 _event_selection_notify, obj);
-       wd->sel_clear_handler =
-         ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR,
-                                 _event_selection_clear, obj);
+        wd->sel_notify_handler =
+           ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
+                                   _event_selection_notify, obj);
+        wd->sel_clear_handler =
+           ecore_event_handler_add(ECORE_X_EVENT_SELECTION_CLEAR,
+                                   _event_selection_clear, obj);
      }
 
-   elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP,_drag_drop_cb, NULL);
+   elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE,
+                       _drag_drop_cb, NULL);
 #endif
 
    entries = eina_list_prepend(entries, obj);
@@ -2543,6 +2822,7 @@ elm_entry_add(Evas_Object *parent)
    // if found - hook in
    if ((wd->api) && (wd->api->obj_hook)) wd->api->obj_hook(obj);
 
+   _mirrored_set(obj, elm_widget_mirrored_get(obj));
    // TODO: convert Elementary to subclassing of Evas_Smart_Class
    // TODO: and save some bytes, making descriptions per-class and not instance!
    evas_object_smart_callbacks_descriptions_set(obj, _signals);
@@ -2587,27 +2867,36 @@ elm_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   const char *t;
-   Ecore_IMF_Context *ic;
    if (!wd) return;
    if (wd->single_line == single_line) return;
    wd->single_line = single_line;
-   wd->linewrap = EINA_FALSE;
-   wd->char_linewrap = EINA_FALSE;
+   wd->linewrap = ELM_WRAP_NONE;
    elm_entry_cnp_textonly_set(obj, EINA_TRUE);
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
-   _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
-   elm_entry_entry_set(obj, t);
-   edje_object_part_text_autocapitalization_set(wd->ent, "elm.text", wd->autocapital);
-   edje_object_part_text_autoperiod_set(wd->ent, "elm.text", wd->autoperiod);
-   ic = elm_entry_imf_context_get(obj);
-   if (ic)
+   _theme_hook(obj);
+   if (wd->scroller)
      {
-       ecore_imf_context_input_panel_layout_set(ic, wd->input_panel_layout);
+        if (wd->single_line)
+          {
+             elm_smart_scroller_policy_set(wd->scroller,
+                                           ELM_SMART_SCROLLER_POLICY_OFF,
+                                           ELM_SMART_SCROLLER_POLICY_OFF);
+             elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
+          }
+        else
+          {
+             const Elm_Scroller_Policy map[3] =
+               {
+                  ELM_SMART_SCROLLER_POLICY_AUTO,
+                  ELM_SMART_SCROLLER_POLICY_ON,
+                  ELM_SMART_SCROLLER_POLICY_OFF
+               };
+             elm_smart_scroller_policy_set(wd->scroller,
+                                           map[wd->policy_h],
+                                           map[wd->policy_v]);
+             elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
+          }
+        _sizing_eval(obj);
      }
-
-   eina_stringshare_del(t);
-   _sizing_eval(obj);
 }
 
 /**
@@ -2643,38 +2932,14 @@ elm_entry_password_set(Evas_Object *obj, Eina_Bool password)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   Ecore_IMF_Context *ic;
-   const char *t;
    if (!wd) return;
    if (wd->password == password) return;
    wd->password = password;
    wd->single_line = EINA_TRUE;
-   wd->linewrap = EINA_FALSE;
-   wd->char_linewrap = EINA_FALSE;
-   if (_elm_config->password_show_last_character)
-     wd->show_last_character = EINA_TRUE;
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
-   _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
-   elm_entry_entry_set(obj, t);
-
-   if (password)
-     {
-        if (wd->autoperiod)
-           elm_entry_autoperiod_set(obj, EINA_FALSE);
-
-        if (wd->autocapital)
-           elm_entry_autocapitalization_set(obj, EINA_FALSE);
-     }
-
-   ic = elm_entry_imf_context_get(obj);
-   if (ic)
-      ecore_imf_context_input_panel_layout_set(ic, wd->input_panel_layout);
-
-   eina_stringshare_del(t);
-   _sizing_eval(obj);
+   wd->linewrap = ELM_WRAP_NONE;
+   _theme_hook(obj);
 }
 
-
 /**
  * This returns whether password mode is enabled.
  * See also elm_entry_password_set().
@@ -2705,24 +2970,46 @@ elm_entry_password_get(const Evas_Object *obj)
 EAPI void
 elm_entry_entry_set(Evas_Object *obj, const char *entry)
 {
+   _elm_entry_text_set(obj, NULL, entry);
+}
+
+/**
+ * This appends @p entry to the text of the entry.
+ *
+ * @param obj The entry object
+ * @param entry The text to be displayed
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_entry_append(Evas_Object *obj, const char *entry)
+{
+   int len = 0;
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    if (!entry) entry = "";
-   if(wd->max_no_of_bytes)
+   wd->changed = EINA_TRUE;
+
+   len = strlen(entry);
+   if (wd->append_text_left)
+     {
+        char *tmpbuf;
+        tmpbuf = realloc(wd->append_text_left, wd->append_text_len + len + 1);
+        if (!tmpbuf)
+          {
+             /* Do something */
+             return;
+          }
+        wd->append_text_left = tmpbuf;
+        memcpy(wd->append_text_left + wd->append_text_len, entry, len + 1);
+        wd->append_text_len += len;
+     }
+   else
      {
-       int len = strlen(entry);
-       if(len > wd->max_no_of_bytes)
-       {
-         ERR("[ERROR]the length of the text set is more than max no of bytes, text cannot be set");
-         return;
-       }
+        /* FIXME: Add chunked appending here (like in entry_set) */
+        edje_object_part_text_append(wd->ent, "elm.text", entry);
      }
-   edje_object_part_text_set(wd->ent, "elm.text", entry);
-   if (wd->text) eina_stringshare_del(wd->text);
-   wd->text = NULL;
-   wd->changed = EINA_TRUE;
-   _sizing_eval(obj);
 }
 
 /**
@@ -2737,27 +3024,9 @@ elm_entry_entry_set(Evas_Object *obj, const char *entry)
 EAPI const char *
 elm_entry_entry_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   const char *text;
-   if (!wd) return NULL;
-
-   if ((wd->text)&&(wd->password))
-   return elm_entry_markup_to_utf8(wd->text);
-
-   if (wd->text) return wd->text;
-   text = edje_object_part_text_get(wd->ent, "elm.text");
-   if (!text)
-     {
-       ERR("text=NULL for edje %p, part 'elm.text'", wd->ent);
-       return NULL;
-     }
-   eina_stringshare_replace(&wd->text, text);
-   if(wd->password)return elm_entry_markup_to_utf8(wd->text);
-   return wd->text;
+   return _elm_entry_text_get(obj, NULL);
 }
 
-
 /**
  * This returns EINA_TRUE if the entry is empty/there was an error
  * and EINA_FALSE if it is not empty.
@@ -2775,7 +3044,7 @@ elm_entry_is_empty(const Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_TRUE;
    Widget_Data *wd = elm_widget_data_get(obj);
    const Evas_Object *tb;
-   Evas_Textblock_Cursor *cur;
+   //Evas_Textblock_Cursor *cur;
    Eina_Bool ret;
    if (!wd) return EINA_TRUE;
 
@@ -2786,8 +3055,8 @@ elm_entry_is_empty(const Evas_Object *obj)
     * otherwise it is. */
    tb = edje_object_part_object_get(wd->ent, "elm.text");
    cur = evas_object_textblock_cursor_new((Evas_Object *) tb); /* This is
-      actually, ok for the time being, thsese hackish stuff will be removed
-      once evas 1.0 is out*/
+                                                                  actually, ok for the time being, thsese hackish stuff will be removed
+                                                                  once evas 1.0 is out*/
    evas_textblock_cursor_pos_set(cur, 0);
    ret = evas_textblock_cursor_char_next(cur);
    evas_textblock_cursor_free(cur);
@@ -2822,8 +3091,8 @@ elm_entry_selection_get(const Evas_Object *obj)
 
 /**
  * This inserts text in @p entry where the current cursor position.
- * 
- * This inserts text at the cursor position is as if it was typed 
+ *
+ * This inserts text at the cursor position is as if it was typed
  * by the user (note 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
@@ -2842,8 +3111,10 @@ elm_entry_entry_insert(Evas_Object *obj, const char *entry)
    if (!wd) return;
    edje_object_part_text_insert(wd->ent, "elm.text", entry);
    // start for cbhm
+#ifdef HAVE_ELEMENTARY_X
    if (cnpwidgetdata == obj)
       ecore_x_selection_secondary_set(elm_win_xwindow_get(obj), "",1);
+#endif
    // end for cbhm
    wd->changed = EINA_TRUE;
    _sizing_eval(obj);
@@ -2853,7 +3124,6 @@ elm_entry_entry_insert(Evas_Object *obj, const char *entry)
  * This enables word line wrapping in the entry object.  It is the opposite
  * of elm_entry_single_line_set().  Additionally, setting this disables
  * character line wrapping.
- * See also elm_entry_line_char_wrap_set().
  *
  * @param obj The entry object
  * @param wrap If true, the entry will be wrapped once it reaches the end
@@ -2863,21 +3133,15 @@ elm_entry_entry_insert(Evas_Object *obj, const char *entry)
  * @ingroup Entry
  */
 EAPI void
-elm_entry_line_wrap_set(Evas_Object *obj, Eina_Bool wrap)
+elm_entry_line_wrap_set(Evas_Object *obj, Elm_Wrap_Type wrap)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   const char *t;
    if (!wd) return;
    if (wd->linewrap == wrap) return;
+   wd->lastw = -1;
    wd->linewrap = wrap;
-   if(wd->linewrap)
-       wd->char_linewrap = EINA_FALSE;
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
-   _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
-   elm_entry_entry_set(obj, t);
-   eina_stringshare_del(t);
-   _sizing_eval(obj);
+   _theme_hook(obj);
 }
 
 /**
@@ -2911,33 +3175,21 @@ elm_entry_wrap_width_get(const Evas_Object *obj)
 }
 
 /**
- * This enables character line wrapping in the entry object.  It is the opposite
- * of elm_entry_single_line_set().  Additionally, setting this disables
- * word line wrapping.
+ * Get the wrapping behavior of the entry.
  * See also elm_entry_line_wrap_set().
  *
  * @param obj The entry object
- * @param wrap If true, the entry will be wrapped once it reaches the end
- * of the object. Wrapping will occur immediately upon reaching the end of the object.
+ * @return Wrap type
  *
  * @ingroup Entry
  */
-EAPI void
-elm_entry_line_char_wrap_set(Evas_Object *obj, Eina_Bool wrap)
+EAPI Elm_Wrap_Type
+elm_entry_line_wrap_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   const char *t;
-   if (!wd) return;
-   if (wd->char_linewrap == wrap) return;
-   wd->char_linewrap = wrap;
-   if(wd->char_linewrap)
-       wd->linewrap = EINA_FALSE;
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
-   _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
-   elm_entry_entry_set(obj, t);
-   eina_stringshare_del(t);
-   _sizing_eval(obj);
+   if (!wd) return EINA_FALSE;
+   return wd->linewrap;
 }
 
 /**
@@ -2954,21 +3206,16 @@ elm_entry_editable_set(Evas_Object *obj, Eina_Bool editable)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
-   const char *t;
    if (!wd) return;
    if (wd->editable == editable) return;
    wd->editable = editable;
-   t = eina_stringshare_add(elm_entry_entry_get(obj));
-   _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
-   elm_entry_entry_set(obj, t);
-   eina_stringshare_del(t);
-   _sizing_eval(obj);
+   _theme_hook(obj);
 
 #ifdef HAVE_ELEMENTARY_X
    if (editable)
-      elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, _drag_drop_cb, NULL);
+     elm_drop_target_add(obj, ELM_SEL_FORMAT_MARKUP, _drag_drop_cb, NULL);
    else
-      elm_drop_target_del(obj);
+     elm_drop_target_del(obj);
 #endif
 }
 
@@ -3006,9 +3253,10 @@ elm_entry_select_none(Evas_Object *obj)
    if (!wd) return;
    if (wd->selmode)
      {
-       wd->selmode = EINA_FALSE;
-       edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
-       edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
+        wd->selmode = EINA_FALSE;
+        if (!_elm_config->desktop_entry)
+          edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+        edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
      }
    wd->have_selection = EINA_FALSE;
    edje_object_part_text_select_none(wd->ent, "elm.text");
@@ -3029,9 +3277,10 @@ elm_entry_select_all(Evas_Object *obj)
    if (!wd) return;
    if (wd->selmode)
      {
-       wd->selmode = EINA_FALSE;
-       edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
-       edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
+        wd->selmode = EINA_FALSE;
+        if (!_elm_config->desktop_entry)
+          edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_FALSE);
+        edje_object_signal_emit(wd->ent, "elm,state,select,off", "elm");
      }
    wd->have_selection = EINA_TRUE;
    edje_object_part_text_select_all(wd->ent, "elm.text");
@@ -3160,7 +3409,13 @@ elm_entry_cursor_end_set(Evas_Object *obj)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   int x, y, w, h;
    edje_object_part_text_cursor_end_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
+   if (wd->scroll)
+     {
+        elm_widget_show_region_get(wd->ent, &x, &y, &w, &h);
+        elm_smart_scroller_child_region_show(wd->scroller, x, y, w, h);
+     }
 }
 
 /**
@@ -3281,6 +3536,41 @@ elm_entry_cursor_content_get(const Evas_Object *obj)
 }
 
 /**
+ * Sets the cursor position in the entry to the given value
+ *
+ * @param obj The entry object
+ * @param pos The position of the cursor
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_cursor_pos_set(Evas_Object *obj, int pos)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   edje_object_part_text_cursor_pos_set(wd->ent, "elm.text", EDJE_CURSOR_MAIN, pos);
+   edje_object_message_signal_process(wd->ent);
+}
+
+/**
+ * Retrieves the current position of the cursor in the entry
+ *
+ * @param obj The entry object
+ * @return The cursor position
+ *
+ * @ingroup Entry
+ */
+EAPI int
+elm_entry_cursor_pos_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) 0;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return 0;
+   return edje_object_part_text_cursor_pos_get(wd->ent, "elm.text", EDJE_CURSOR_MAIN);
+}
+
+/**
  * This executes a "cut" action on the selected text in the entry.
  *
  * @param obj The entry object
@@ -3425,7 +3715,7 @@ elm_entry_context_menu_disabled_get(const Evas_Object *obj)
  * and object to do this), then this object is used to replace that item. If
  * not the next provider is called until one provides an item object, or the
  * default provider in entry does.
- * 
+ *
  * @param obj The entry object
  * @param func The function called to provide the item object
  * @param data The data passed to @p func
@@ -3451,7 +3741,7 @@ elm_entry_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *dat
  *
  * This prepends the given callback. See elm_entry_item_provider_append() for
  * more information
- * 
+ *
  * @param obj The entry object
  * @param func The function called to provide the item object
  * @param data The data passed to @p func
@@ -3477,7 +3767,7 @@ elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *da
  *
  * This removes the given callback. See elm_entry_item_provider_append() for
  * more information
- * 
+ *
  * @param obj The entry object
  * @param func The function called to provide the item object
  * @param data The data passed to @p func
@@ -3495,7 +3785,7 @@ elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *dat
    EINA_SAFETY_ON_NULL_RETURN(func);
    EINA_LIST_FOREACH(wd->item_providers, l, ip)
      {
-        if ((ip->func == func) && (ip->data == data))
+        if ((ip->func == func) && ((!data) || (ip->data == data)))
           {
              wd->item_providers = eina_list_remove_list(wd->item_providers, l);
              free(ip);
@@ -3532,10 +3822,9 @@ elm_entry_text_filter_append(Evas_Object *obj, void (*func) (void *data, Evas_Ob
 
    EINA_SAFETY_ON_NULL_RETURN(func);
 
-   tf = ELM_NEW(Elm_Entry_Text_Filter);
+   tf = _filter_new(func, data);
    if (!tf) return;
-   tf->func = func;
-   tf->data = data;
+
    wd->text_filters = eina_list_append(wd->text_filters, tf);
 }
 
@@ -3562,10 +3851,9 @@ elm_entry_text_filter_prepend(Evas_Object *obj, void (*func) (void *data, Evas_O
 
    EINA_SAFETY_ON_NULL_RETURN(func);
 
-   tf = ELM_NEW(Elm_Entry_Text_Filter);
+   tf = _filter_new(func, data);
    if (!tf) return;
-   tf->func = func;
-   tf->data = data;
+
    wd->text_filters = eina_list_prepend(wd->text_filters, tf);
 }
 
@@ -3595,10 +3883,10 @@ elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Ob
 
    EINA_LIST_FOREACH(wd->text_filters, l, tf)
      {
-        if ((tf->func == func) && (tf->data == data))
+        if ((tf->func == func) && ((!data) || (tf->data == data)))
           {
              wd->text_filters = eina_list_remove_list(wd->text_filters, l);
-             free(tf);
+             _filter_free(tf);
              return;
           }
      }
@@ -3606,9 +3894,11 @@ elm_entry_text_filter_remove(Evas_Object *obj, void (*func) (void *data, Evas_Ob
 
 /**
  * This converts a markup (HTML-like) string into UTF-8.
+ * Returning string is obtained with malloc.
+ * After use the returned string, it should be freed.
  *
  * @param s The string (in markup) to be converted
- * @return The converted string (in UTF-8)
+ * @return The converted string (in UTF-8). It should be freed.
  *
  * @ingroup Entry
  */
@@ -3622,9 +3912,11 @@ elm_entry_markup_to_utf8(const char *s)
 
 /**
  * This converts a UTF-8 string into markup (HTML-like).
+ * Returning string is obtained with malloc.
+ * After use the returned string, it should be freed.
  *
  * @param s The string (in UTF-8) to be converted
- * @return The converted string (in markup)
+ * @return The converted string (in markup). It should be freed.
  *
  * @ingroup Entry
  */
@@ -3688,13 +3980,13 @@ elm_entry_autocapitalization_set(Evas_Object *obj, Eina_Bool autocap)
    if (!wd) return;
 
    if (wd->password)
-       wd->autocapital = EINA_FALSE;
+     wd->autocapital = EINA_FALSE;
    else
-       wd->autocapital = autocap;
+     wd->autocapital = autocap;
 
    if (wd->input_panel_layout == ELM_INPUT_PANEL_LAYOUT_URL ||
        wd->input_panel_layout == ELM_INPUT_PANEL_LAYOUT_EMAIL)
-       wd->autocapital = EINA_FALSE;
+     wd->autocapital = EINA_FALSE;
 
    edje_object_part_text_autocapitalization_set(wd->ent, "elm.text", wd->autocapital);
 }
@@ -3715,13 +4007,13 @@ elm_entry_autoperiod_set(Evas_Object *obj, Eina_Bool autoperiod)
    if (!wd) return;
 
    if (wd->password)
-       wd->autoperiod = EINA_FALSE;
+     wd->autoperiod = EINA_FALSE;
    else
-       wd->autoperiod = autoperiod;
+     wd->autoperiod = autoperiod;
 
    if (wd->input_panel_layout == ELM_INPUT_PANEL_LAYOUT_URL ||
        wd->input_panel_layout == ELM_INPUT_PANEL_LAYOUT_EMAIL)
-       wd->autoperiod = EINA_FALSE;
+     wd->autoperiod = EINA_FALSE;
 
    edje_object_part_text_autoperiod_set(wd->ent, "elm.text", wd->autoperiod);
 }
@@ -3851,24 +4143,6 @@ elm_entry_background_color_set(Evas_Object *obj, unsigned int r, unsigned int g,
 }
 
 /**
- * Set the ellipsis behavior of the entry
- *
- * @param obj The entry object
- * @param ellipsis To ellipsis text or not
- * @ingroup Entry
- */
-EAPI void
-elm_entry_ellipsis_set(Evas_Object *obj, Eina_Bool ellipsis)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (wd->ellipsis == ellipsis) return;
-   wd->ellipsis = ellipsis;
-   wd->changed = 1;
-   _sizing_eval(obj);
-}
-
-/**
  * Filter inserted text based on user defined character and byte limits
  *
  * Add this filter to an entry to limit the characters that it will accept
@@ -3906,17 +4180,14 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
     * scrolled_entry */
    widget_type = elm_widget_type_get(entry);
    if (!strcmp(widget_type, "entry"))
-      text_get = elm_entry_entry_get;
-   else if (!strcmp(widget_type, "scrolled_entry"))
-      text_get = elm_scrolled_entry_entry_get;
+     text_get = elm_entry_entry_get;
    else /* huh? */
-      return;
+     return;
 
    current = elm_entry_markup_to_utf8(text_get(entry));
 
    if (lim->max_char_count > 0)
      {
-        int cut;
         len = evas_string_char_len_get(current);
         if (len >= lim->max_char_count)
           {
@@ -3926,17 +4197,11 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
              *text = NULL;
              return;
           }
-        newlen = evas_string_char_len_get(*text);
-        cut = strlen(*text);
-        while ((len + newlen) > lim->max_char_count)
-          {
-             cut = evas_string_char_prev_get(*text, cut, NULL);
-             newlen--;
-          }
-        (*text)[cut] = 0;
+        newlen = evas_string_char_len_get(elm_entry_markup_to_utf8(*text));
+        if ((len + newlen) > lim->max_char_count)
+          _add_chars_till_limit(entry, text, (lim->max_char_count - len), LENGTH_UNIT_CHAR);
      }
-
-   if (lim->max_byte_count > 0)
+   else if (lim->max_byte_count > 0)
      {
         len = strlen(current);
         if (len >= lim->max_byte_count)
@@ -3947,19 +4212,9 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
              *text = NULL;
              return;
           }
-        newlen = strlen(*text);
-        while ((len + newlen) > lim->max_byte_count)
-          {
-             int p = evas_string_char_prev_get(*text, newlen, NULL);
-             newlen -= (newlen - p);
-          }
-        if (newlen)
-           (*text)[newlen] = 0;
-        else
-          {
-             free(*text);
-             *text = NULL;
-          }
+        newlen = strlen(elm_entry_markup_to_utf8(*text));
+        if ((len + newlen) > lim->max_byte_count)
+          _add_chars_till_limit(entry, text, (lim->max_byte_count - len), LENGTH_UNIT_BYTE);
      }
    free(current);
 }
@@ -3986,7 +4241,7 @@ elm_entry_filter_accept_set(void *data, Evas_Object *entry __UNUSED__, char **te
    EINA_SAFETY_ON_NULL_RETURN(text);
 
    if ((!as->accepted) && (!as->rejected))
-      return;
+     return;
 
    if (as->accepted)
      {
@@ -4021,7 +4276,7 @@ elm_entry_filter_accept_set(void *data, Evas_Object *entry __UNUSED__, char **te
              int size = read_idx - last_read_idx;
              const char *src = (*text) + last_read_idx;
              if (src != insert)
-                memcpy(insert, *text + last_read_idx, size);
+               memcpy(insert, *text + last_read_idx, size);
              insert += size;
           }
         last_read_idx = read_idx;
@@ -4049,8 +4304,8 @@ elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format)
    if (!wd) return;
    if (wd->delay_write)
      {
-       ecore_timer_del(wd->delay_write);
-       wd->delay_write = NULL;
+        ecore_timer_del(wd->delay_write);
+        wd->delay_write = NULL;
      }
    if (wd->autosave) _save(obj);
    eina_stringshare_replace(&wd->file, file);
@@ -4093,8 +4348,8 @@ elm_entry_file_save(Evas_Object *obj)
    if (!wd) return;
    if (wd->delay_write)
      {
-       ecore_timer_del(wd->delay_write);
-       wd->delay_write = NULL;
+        ecore_timer_del(wd->delay_write);
+        wd->delay_write = NULL;
      }
    _save(obj);
    wd->delay_write = ecore_timer_add(2.0, _delay_write, obj);
@@ -4143,7 +4398,7 @@ elm_entry_autosave_get(const Evas_Object *obj)
  * Note this only changes the behaviour of text.
  *
  * @param obj The entry object
- * @param pmode paste mode - 0 is text only, 1 is text+image+other.
+ * @param textonly paste mode - EINA_TRUE is text only, EINA_FALSE is text+image+other.
  *
  * @ingroup Entry
  */
@@ -4157,6 +4412,10 @@ elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly)
    textonly = !!textonly;
    if (wd->textonly == textonly) return;
    wd->textonly = !!textonly;
+   if (!textonly) format |= ELM_SEL_FORMAT_IMAGE;
+#ifdef HAVE_ELEMENTARY_X
+   elm_drop_target_add(obj, format, _drag_drop_cb, NULL);
+#endif
 }
 
 /**
@@ -4170,7 +4429,7 @@ elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly)
  * @ingroup Entry
  */
 EAPI Eina_Bool
-elm_entry_cnp_textonly_get(Evas_Object *obj)
+elm_entry_cnp_textonly_get(const Evas_Object *obj)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -4179,6 +4438,362 @@ elm_entry_cnp_textonly_get(Evas_Object *obj)
 }
 
 /**
+ * Enable or disable scrolling in entry
+ *
+ * Normally the entry is not scrollable unless you enable it with this call.
+ *
+ * @param obj The entry object
+ * @param scroll EINA_TRUE if it is to be scrollable, EINA_FALSE otherwise
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scroll)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   scroll = !!scroll;
+   if (wd->scroll == scroll) return;
+   wd->scroll = scroll;
+   if (wd->scroll)
+     {
+        elm_widget_sub_object_del(obj, wd->scroller);
+        elm_widget_resize_object_set(obj, wd->scroller);
+        elm_widget_sub_object_add(obj, wd->ent);
+        elm_smart_scroller_child_set(wd->scroller, wd->ent);
+        evas_object_show(wd->scroller);
+        elm_widget_on_show_region_hook_set(obj, _show_region_hook, obj);
+        if (wd->single_line)
+          {
+             elm_smart_scroller_policy_set(wd->scroller,
+                                           ELM_SMART_SCROLLER_POLICY_OFF,
+                                           ELM_SMART_SCROLLER_POLICY_OFF);
+             elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
+          }
+        else
+          {
+             const Elm_Scroller_Policy map[3] =
+               {
+                  ELM_SMART_SCROLLER_POLICY_AUTO,
+                  ELM_SMART_SCROLLER_POLICY_ON,
+                  ELM_SMART_SCROLLER_POLICY_OFF
+               };
+             elm_smart_scroller_policy_set(wd->scroller,
+                                           map[wd->policy_h],
+                                           map[wd->policy_v]);
+             elm_smart_scroller_bounce_allow_set(wd->scroller, EINA_FALSE, EINA_FALSE);
+          }
+     }
+   else
+     {
+        elm_smart_scroller_child_set(wd->scroller, NULL);
+        elm_widget_sub_object_del(obj, wd->ent);
+        elm_widget_resize_object_set(obj, wd->ent);
+        evas_object_smart_member_add(wd->scroller, obj);
+        elm_widget_sub_object_add(obj, wd->scroller);
+        evas_object_hide(wd->scroller);
+        elm_widget_on_show_region_hook_set(obj, NULL, NULL);
+     }
+   wd->lastw = -1;
+   _theme_hook(obj);
+}
+
+/**
+ * Get the scrollable state of the entry
+ *
+ * Normally the entry is not scrollable. This gets the scrollable state
+ * of the entry. See elm_entry_scrollable_set() for more information.
+ *
+ * @param obj The entry object
+ * @return The scrollable state
+ *
+ * @ingroup Entry
+ */
+EAPI Eina_Bool
+elm_entry_scrollable_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return EINA_FALSE;
+   return wd->scroll;
+}
+
+/**
+ * This sets a widget to be displayed to the left of a scrolled entry.
+ *
+ * @param obj The scrolled entry object
+ * @param icon The widget to display on the left side of the scrolled
+ * entry.
+ *
+ * @note A previously set widget will be destroyed.
+ * @note If the object being set does not have minimum size hints set,
+ * it won't get properly displayed.
+ *
+ * @ingroup Entry
+ * @see elm_entry_end_set
+ */
+EAPI void
+elm_entry_icon_set(Evas_Object *obj, Evas_Object *icon)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *edje;
+   if (!wd) return;
+   EINA_SAFETY_ON_NULL_RETURN(icon);
+   if (wd->icon == icon) return;
+   if (wd->icon) evas_object_del(wd->icon);
+   wd->icon = icon;
+   edje = elm_smart_scroller_edje_object_get(wd->scroller);
+   if (!edje) return;
+   edje_object_part_swallow(edje, "elm.swallow.icon", wd->icon);
+   edje_object_signal_emit(edje, "elm,action,show,icon", "elm");
+   _sizing_eval(obj);
+}
+
+/**
+ * Gets the leftmost widget of the scrolled entry. This object is
+ * owned by the scrolled entry and should not be modified.
+ *
+ * @param obj The scrolled entry object
+ * @return the left widget inside the scroller
+ *
+ * @ingroup Entry
+ */
+EAPI Evas_Object *
+elm_entry_icon_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->icon;
+}
+
+/**
+ * Unset the leftmost widget of the scrolled entry, unparenting and
+ * returning it.
+ *
+ * @param obj The scrolled entry object
+ * @return the previously set icon sub-object of this entry, on
+ * success.
+ *
+ * @see elm_entry_icon_set()
+ *
+ * @ingroup Entry
+ */
+EAPI Evas_Object *
+elm_entry_icon_unset(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *ret = NULL;
+   if (!wd) return NULL;
+   if (wd->icon)
+     {
+        Evas_Object *edje = elm_smart_scroller_edje_object_get(wd->scroller);
+        if (!edje) return NULL;
+        ret = wd->icon;
+        edje_object_part_unswallow(edje, wd->icon);
+        edje_object_signal_emit(edje, "elm,action,hide,icon", "elm");
+        wd->icon = NULL;
+        _sizing_eval(obj);
+     }
+   return ret;
+}
+
+/**
+ * Sets the visibility of the left-side widget of the scrolled entry,
+ * set by @elm_entry_icon_set().
+ *
+ * @param obj The scrolled entry object
+ * @param setting EINA_TRUE if the object should be displayed,
+ * EINA_FALSE if not.
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if ((!wd) || (!wd->icon)) return;
+   if (setting)
+      evas_object_hide(wd->icon);
+   else
+      evas_object_show(wd->icon);
+   _sizing_eval(obj);
+}
+
+/**
+ * This sets a widget to be displayed to the end of a scrolled entry.
+ *
+ * @param obj The scrolled entry object
+ * @param end The widget to display on the right side of the scrolled
+ * entry.
+ *
+ * @note A previously set widget will be destroyed.
+ * @note If the object being set does not have minimum size hints set,
+ * it won't get properly displayed.
+ *
+ * @ingroup Entry
+ * @see elm_entry_icon_set
+ */
+EAPI void
+elm_entry_end_set(Evas_Object *obj, Evas_Object *end)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *edje;
+   if (!wd) return;
+   EINA_SAFETY_ON_NULL_RETURN(end);
+   if (wd->end == end) return;
+   if (wd->end) evas_object_del(wd->end);
+   wd->end = end;
+   edje = elm_smart_scroller_edje_object_get(wd->scroller);
+   if (!edje) return;
+   edje_object_part_swallow(edje, "elm.swallow.end", wd->end);
+   edje_object_signal_emit(edje, "elm,action,show,end", "elm");
+   _sizing_eval(obj);
+}
+
+/**
+ * Gets the endmost widget of the scrolled entry. This object is owned
+ * by the scrolled entry and should not be modified.
+ *
+ * @param obj The scrolled entry object
+ * @return the right widget inside the scroller
+ *
+ * @ingroup Entry
+ */
+EAPI Evas_Object *
+elm_entry_end_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return NULL;
+   return wd->end;
+}
+
+/**
+ * Unset the endmost widget of the scrolled entry, unparenting and
+ * returning it.
+ *
+ * @param obj The scrolled entry object
+ * @return the previously set icon sub-object of this entry, on
+ * success.
+ *
+ * @see elm_entry_icon_set()
+ *
+ * @ingroup Entry
+ */
+EAPI Evas_Object *
+elm_entry_end_unset(Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *ret = NULL;
+   if (!wd) return NULL;
+   if (wd->end)
+     {
+        Evas_Object *edje = elm_smart_scroller_edje_object_get(wd->scroller);
+        if (!edje) return NULL;
+        ret = wd->end;
+        edje_object_part_unswallow(edje, wd->end);
+        edje_object_signal_emit(edje, "elm,action,hide,end", "elm");
+        wd->end = NULL;
+        _sizing_eval(obj);
+     }
+   return ret;
+}
+
+/**
+ * Sets the visibility of the end widget of the scrolled entry, set by
+ * @elm_entry_end_set().
+ *
+ * @param obj The scrolled entry object
+ * @param setting EINA_TRUE if the object should be displayed,
+ * EINA_FALSE if not.
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if ((!wd) || (!wd->end)) return;
+   if (setting)
+      evas_object_hide(wd->end);
+   else
+      evas_object_show(wd->end);
+   _sizing_eval(obj);
+}
+
+/**
+ * This sets the scrolled entry's scrollbar policy (ie. enabling/disabling them).
+ *
+ * @param obj The scrolled entry object
+ * @param h The horizontal scrollbar policy to apply
+ * @param v The vertical scrollbar policy to apply
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   const Elm_Scroller_Policy map[3] =
+     {
+        ELM_SMART_SCROLLER_POLICY_AUTO,
+        ELM_SMART_SCROLLER_POLICY_ON,
+        ELM_SMART_SCROLLER_POLICY_OFF
+     };
+   if (!wd) return;
+   wd->policy_h = h;
+   wd->policy_v = v;
+   elm_smart_scroller_policy_set(wd->scroller,
+                                 map[wd->policy_h],
+                                 map[wd->policy_v]);
+}
+
+/**
+ * This enables/disables bouncing within the entry.
+ *
+ * @param obj The scrolled entry object
+ * @param h The horizontal bounce state
+ * @param v The vertical bounce state
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_bounce_allow_set(wd->scroller, h_bounce, v_bounce);
+}
+
+/**
+ * Get the bounce mode
+ *
+ * @param obj The Entry object
+ * @param h_bounce Allow bounce horizontally
+ * @param v_bounce Allow bounce vertically
+ *
+ * @ingroup Entry
+ */
+EAPI void
+elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_bounce_allow_get(wd->scroller, h_bounce, v_bounce);
+}
+
+/**
  * This sets the attribute to show the input panel automatically.
  *
  * @param obj The entry object
@@ -4238,3 +4853,9 @@ elm_entry_magnifier_type_set(Evas_Object *obj, int type)
    wd->mgf_type = type;
    _magnifier_create(obj);
 }
+
+EINA_DEPRECATED EAPI void
+elm_entry_line_char_wrap_set(Evas_Object *obj, Eina_Bool wrap)
+{
+   if (wrap) elm_entry_line_wrap_set(obj, ELM_WRAP_CHAR);
+}