[Patch: Remove maximum byte feature dependent code]

[edje_entry]: 1. Last character show password feature supported for mulitap/languages. 2. Remove maximum byte set callback code as this feature is supported by filters.

Change-Id: I47ed4553f5c830c5a22fda3cb0d286175b098ad0

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index fa9bf34..66f7e26 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -77,8 +77,6 @@ struct _Entry
 #endif
 
    Ecore_Timer *longpress_timer;
-   Edje_elm_function func;
-   void *data;
 };
 
 struct _Sel
@@ -1326,9 +1324,6 @@ _edje_entry_hide_visible_password(Edje_Real_Part *rp)
      }
    _edje_entry_real_part_configure(rp);
    _edje_emit(rp->edje, "entry,changed", rp->part->name);
-   /*remove the below 2 lines*/
-   if (en->func)
-      en->func(en->data, NULL);
 }
 
 static void
@@ -1461,9 +1456,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              else
                {
                 _backspace(en->cursor, rp->object, en);
-                 /* if inputting text is not allowed, dont allow text input */
-                if (en->func)
-                   en->func(en->data, NULL);
                }
           }
         _sel_clear(en->cursor, rp->object, en);
@@ -1491,9 +1483,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              else
                {
                 _delete(en->cursor, rp->object, en);
-                 /*count characters*/
-                if (en->func)
-                   en->func(en->data, NULL);
                }
           }
         _sel_clear(en->cursor, rp->object, en);
@@ -1648,12 +1637,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
      }
    else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      {
-        /* if inputting text is not allowed, dont allow text input */
-        if (en->func)
-          {
-             if (en->func(en->data, "<br>")) return;
-          }
-
         if (multiline)
           {
              if (en->have_selection)
@@ -1680,9 +1663,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              _caps_mode_check(en);
           }
         _edje_emit(ed, "entry,key,enter", rp->part->name);
-        /*count characters*/
-        if (en->func)
-           en->func(en->data, NULL);
      }
    else
      {
@@ -1698,26 +1678,15 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
              if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD_SHOW_LAST_CHARACTER)
                {
                    _edje_entry_hide_visible_password(en->rp);
-                   /*remove the below 3 lines*/
-                   if (en->func)
-                      if (en->func(en->data, (void *)ev->string))
-                         return;
                    _text_filter_format_prepend(en, en->cursor, "+ password=off");
                    _text_filter_markup_prepend(en, en->cursor, ev->string);
                    _text_filter_format_prepend(en, en->cursor, "- password");
                }
              else
                {
-                  /*remove the below 3 lines*/
-                  if (en->func)
-                     if (en->func(en->data, (void *)ev->string))
-                        return;
-
                   //evas_textblock_cursor_text_prepend(en->cursor, ev->string);
                   _text_filter_text_prepend(en, en->cursor, ev->string);
 
-                  /*count characters*/
-                  if (en->func) en->func(en->data, NULL);
 #if 0
 //             evas_textblock_cursor_text_prepend(en->cursor, ev->string);
              _text_filter_text_prepend(en, en->cursor, ev->string);
@@ -2864,11 +2833,6 @@ _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text)
 {
    Entry *en = rp->entry_data;
    if (!en) return;
-   /*if inputtin text is not allowed, dont allow text input*/
-   if (en->func)
-     {
-       if (en->func(en->data, (void *)text)) return;
-     }
 
    // prepend markup @ cursor pos
    if (en->have_selection)
@@ -2891,10 +2855,6 @@ _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text)
      }
 #endif
    _edje_entry_real_part_configure(rp);
-
-   /* count characters */
-   if (en->func)
-     en->func(en->data, NULL);
 }
 
 void
@@ -3125,17 +3085,6 @@ _edje_entry_select_allow_get(const Edje_Real_Part *rp)
 }
 
 void
-_edje_entry_textinput_callback_set(Edje_Real_Part * rp, Edje_elm_function func,
-                                  void *data)
-{
-   Entry *en = rp->entry_data;
-   if (!en) return;
-
-   en->func = func;
-   en->data = data;
-}
-
-void
 _edje_entry_select_abort(Edje_Real_Part *rp)
 {
    Entry *en = rp->entry_data;
@@ -3651,12 +3600,6 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
    if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD_SHOW_LAST_CHARACTER)
      {
         _edje_entry_hide_visible_password(en->rp);
-        /* if inputtin text is not allowed, dont allow text input */
-        if (en->func)
-          {
-             if (en->func(en->data, (void *)ev->str)) return ECORE_CALLBACK_PASS_ON;
-          }
-
         _text_filter_format_prepend(en, tc, "+ password=off");
         _text_filter_markup_prepend(en, tc, ev->str);
         _text_filter_format_prepend(en, tc, "- password");
@@ -3664,18 +3607,8 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
    else
      {
         if (!strcmp(ev->str, " ")) _autoperiod_insert(en, tc);
-
-       /* if inputtin text is not allowed, dont allow text input */
-        if (en->func)
-          {
-             if (en->func(en->data, ev->str)) return ECORE_CALLBACK_PASS_ON;
-          }
-
         //evas_textblock_cursor_text_prepend(en->cursor, ev->str);
         _text_filter_text_prepend(en, tc, ev->str);
-
-        /*count characters*/
-        if (en->func) en->func(en->data, NULL);
 #if 0
        //yy
 //       evas_textblock_cursor_text_prepend(en->cursor, ev->str);
@@ -3736,16 +3669,6 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
    if (!strcmp(preedit_string, ""))
      preedit_end_state = EINA_TRUE;
 
-   /*if inputtin text is not allowed, dont allow text input*/
-   if ((en->func) && !en->have_preedit)
-     {
-        if (en->func(en->data, preedit_string))
-          {
-             free(preedit_string);
-             return ECORE_CALLBACK_PASS_ON;
-          }
-     }
-
    if (en->have_selection && !preedit_end_state)
      {
         /* delete selected characters */
@@ -3816,10 +3739,6 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
         evas_textblock_cursor_pos_set(en->cursor, preedit_start_pos + cursor_pos);
      }
 
-   /* count characters*/
-   if (en->func)
-      en->func(en->data, NULL);
-
    _curs_update_from_curs(en->cursor, rp->object, en);
    _anchors_get(en->cursor, rp->object, en);
    _edje_emit(rp->edje, "entry,changed", rp->part->name);

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 0e7c26b..d86cfd2 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -970,7 +970,6 @@ struct _Edje_Signals_Sources_Patterns
 };
 
 typedef struct _Edje_Signals_Sources_Patterns Edje_Signals_Sources_Patterns;
-typedef Eina_Bool(*Edje_elm_function) (void *data, void *input_data);
 struct _Edje
 {
    Evas_Object_Smart_Clipped_Data base;

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 7571868..124032f 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -1426,27 +1426,6 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
    return _edje_object_part_text_raw_set(obj, rp, part, text);
 }
 
-/**Sets the callback function which would be called before and after inserting text in to entry.
- * @param obj A valid Evas Object handle
- * @param part The part name
- * @param func The Call Back function
- * @param dara data to be passed along with callback function.
- */
-EAPI void
-edje_object_part_textinput_callback_set(const Evas_Object *obj, const char *part, Edje_elm_function func, void *data)
-{
-   Edje *ed;
-   Edje_Real_Part *rp;
-
-   ed = _edje_fetch(obj);
-   if ((!ed) || (!part)) return;
-   rp = _edje_real_part_recursive_get(ed, (char *)part);
-   if (!rp) return;
-   if (rp->part->entry_mode > EDJE_ENTRY_EDIT_MODE_NONE)
-     _edje_entry_textinput_callback_set(rp, func,data);
-}
-
-
 /**
  * @brief Return the text of the object part.
  *