From 027991c597cf1395d13c075c2caa076fef6bdda5 Mon Sep 17 00:00:00 2001
From: Youngbok Shin <youngb.shin@samsung.com>
Date: Tue, 19 May 2015 14:21:47 +0900
Subject: [PATCH] entry: Fix elm_entry_entry_get to return utf8 plain text when
 password mode is enabled.

It was Tizen Only feature in Tizen 2.3.

Change-Id: If3a8b5da3d83e98a1c30eadb89928eb24b533f92
---
 src/lib/elm_entry.c        | 41 ++++++++++++++++++++++++++++++++++++++++-
 src/lib/elm_widget_entry.h |  3 +++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index f9d7bd3..485bcd5 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -718,7 +718,19 @@ _elm_entry_elm_widget_theme_apply(Eo *obj, Elm_Entry_Data *sd)
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
 
-   t = eina_stringshare_add(elm_object_text_get(obj));
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   elm_entry_imf_context_reset(obj);
+   if (sd->password)
+     {
+        char *tmp = elm_entry_utf8_to_markup(elm_object_text_get(obj));
+        t = eina_stringshare_add(tmp);
+        if (tmp) free(tmp);
+     }
+   else
+     {
+        t = eina_stringshare_add(elm_object_text_get(obj));
+     }
+   //
 
    elm_widget_theme_object_set
      (obj, sd->entry_edje, "entry", _elm_entry_theme_group_get(obj), style);
@@ -1857,6 +1869,9 @@ _entry_changed_handle(void *data,
 
    elm_layout_sizing_eval(data);
    ELM_SAFE_FREE(sd->text, eina_stringshare_del);
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   ELM_SAFE_FREE(sd->password_text, eina_stringshare_del);
+   //
    ELM_SAFE_FREE(sd->delay_write, ecore_timer_del);
    evas_event_thaw(evas_object_evas_get(data));
    evas_event_thaw_eval(evas_object_evas_get(data));
@@ -2590,6 +2605,9 @@ _text_append_idler(void *data)
 
    evas_event_freeze(evas_object_evas_get(obj));
    ELM_SAFE_FREE(sd->text, eina_stringshare_del);
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   ELM_SAFE_FREE(sd->password_text, eina_stringshare_del);
+   //
    sd->changed = EINA_TRUE;
 
    start = sd->append_text_position;
@@ -2866,6 +2884,9 @@ _elm_entry_elm_layout_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part, co
 
    evas_event_freeze(evas_object_evas_get(obj));
    ELM_SAFE_FREE(sd->text, eina_stringshare_del);
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   ELM_SAFE_FREE(sd->password_text, eina_stringshare_del);
+   //
    sd->changed = EINA_TRUE;
 
    /* Clear currently pending job if there is one */
@@ -2971,6 +2992,20 @@ proceed:
         eina_stringshare_replace(&sd->text, text);
      }
 
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   if (sd->password)
+     {
+        char *pw_text;
+        pw_text = elm_entry_markup_to_utf8(sd->text);
+        if (pw_text)
+          {
+             eina_stringshare_replace(&sd->password_text, pw_text);
+             free(pw_text);
+             return sd->password_text;
+          }
+     }
+   /////
+
    return sd->text;
 }
 
@@ -3589,6 +3624,10 @@ _elm_entry_evas_object_smart_del(Eo *obj, Elm_Entry_Data *sd)
    free(sd->input_panel_imdata);
    eina_stringshare_del(sd->anchor_hover.hover_style);
 
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   ELM_SAFE_FREE(sd->password_text, eina_stringshare_del);
+   //
+
    evas_event_thaw(evas_object_evas_get(obj));
    evas_event_thaw_eval(evas_object_evas_get(obj));
 
diff --git a/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h
index c29275b..3451455 100644
--- a/src/lib/elm_widget_entry.h
+++ b/src/lib/elm_widget_entry.h
@@ -50,6 +50,9 @@ struct _Elm_Entry_Data
    /* Only for clipboard */
    const char                           *cut_sel;
    const char                           *text;
+   // TIZEN_ONLY(20150519): when password mode is enabled, elm_object_text_get returns utf8 string.
+   const char                           *password_text;
+   //
    const char                           *file;
    Elm_Text_Format                       format;
    Evas_Coord                            last_w, ent_mw, ent_mh;
-- 
2.7.4