Ui interactive: Clean up internal functions.

1 files changed, 21 insertions, 22 deletions

diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 89264d53d8..c85e6d29e5 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -36,11 +36,11 @@ typedef struct _Efl_Ui_Internal_Text_Interactive_Data
 #endif
 } Efl_Ui_Internal_Text_Interactive_Data;
 
-static void _range_del_emit(Evas_Textblock_Cursor *cur, Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
+static void _sel_range_del_emit(Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
 static void _sel_init(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en);
 static void _sel_enable(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en);
 static void _sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en);
-static void _sel_clear(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en);
+static void _sel_clear(Evas_Object *o EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en);
 static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
 static void _entry_imf_cursor_info_set(Evas_Textblock_Cursor *cur, Efl_Ui_Internal_Text_Interactive_Data *en);
 static void _emit_sel_state(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text_Interactive_Data *en);
@@ -108,7 +108,6 @@ static void
 _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
 {
    Efl_Canvas_Text *obj = data;
-   Efl_Canvas_Text_Cursor *cur = efl_canvas_text_cursor_get(obj);
    Efl_Ui_Internal_Text_Interactive_Data *en = eo_data_scope_get(obj, MY_CLASS);
    char *commit_str = event_info;
 
@@ -117,8 +116,8 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
         if (strcmp(commit_str, ""))
           {
              /* delete selected characters */
-             _range_del_emit(cur, obj, en);
-             _sel_clear(cur, obj, en);
+             _sel_range_del_emit(obj, en);
+             _sel_clear(obj, en);
           }
      }
 
@@ -215,7 +214,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
      preedit_end_state = EINA_TRUE;
 
    if (en->have_selection && !preedit_end_state)
-     _range_del_emit(cur, obj, en);
+     _sel_range_del_emit(obj, en);
 
    /* delete preedit characters */
    _preedit_del(en);
@@ -388,7 +387,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
      }
    else
      {
-        _sel_clear(cur, obj, en);
+        _sel_clear(obj, en);
         evas_textblock_cursor_pos_set(cur, ev->start);
         _sel_enable(cur, obj, en);
         _sel_init(cur, obj, en);
@@ -601,7 +600,7 @@ _sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Efl_Ui_Internal_Text_In
 }
 
 static void
-_sel_clear(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en)
+_sel_clear(Evas_Object *o, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
    en->had_sel = EINA_FALSE;
    if (en->selection)
@@ -618,7 +617,7 @@ _sel_clear(Evas_Textblock_Cursor *c EINA_UNUSED, Evas_Object *o, Efl_Ui_Internal
 }
 
 static void
-_range_del_emit(Evas_Textblock_Cursor *cur, Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
+_sel_range_del_emit(Evas_Object *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
 {
    size_t start, end;
    char *tmp;
@@ -642,7 +641,7 @@ _range_del_emit(Evas_Textblock_Cursor *cur, Evas_Object *obj, Efl_Ui_Internal_Te
 
    evas_textblock_cursor_range_delete(en->sel_start, en->sel_end);
 noop:
-   _sel_clear(cur, obj, en);
+   _sel_clear(obj, en);
 }
 
 static void
@@ -715,7 +714,7 @@ _key_down_sel_pre(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor
                 evas_textblock_cursor_copy(en->sel_end, cur);
              else
                 evas_textblock_cursor_copy(en->sel_start, cur);
-             _sel_clear(cur, obj, en);
+             _sel_clear(obj, en);
           }
      }
 }
@@ -726,7 +725,7 @@ _key_down_sel_post(Efl_Ui_Internal_Text_Interactive *obj, Efl_Canvas_Text_Cursor
    if (en->select_allow)
      {
         if (shift) _sel_extend(cur, obj, en);
-        else _sel_clear(cur, obj, en);
+        else _sel_clear(obj, en);
      }
 }
 
@@ -851,7 +850,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 
              _sel_preextend(cur, obj, en);
 
-             _range_del_emit(cur, obj, en);
+             _sel_range_del_emit(obj, en);
           }
         else if ((alt) && (shift))
           {
@@ -861,7 +860,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
           {
              if (en->have_selection)
                {
-                  _range_del_emit(cur, obj, en);
+                  _sel_range_del_emit(obj, en);
                }
              else
                {
@@ -871,7 +870,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
                     }
                }
           }
-        _sel_clear(cur, obj, en);
+        _sel_clear(obj, en);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
    else if (!strcmp(ev->key, "Delete") ||
@@ -888,7 +887,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
 
              _sel_extend(cur, obj, en);
 
-             _range_del_emit(cur, obj, en);
+             _sel_range_del_emit(obj, en);
           }
         else if (shift)
           {
@@ -898,14 +897,14 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
           {
              if (en->have_selection)
                {
-                  _range_del_emit(cur, obj, en);
+                  _sel_range_del_emit(obj, en);
                }
              else
                {
                   _delete_emit(cur, en, old_cur_pos);
                }
           }
-        _sel_clear(cur, obj, en);
+        _sel_clear(obj, en);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
    else if ((!alt) &&
@@ -1037,7 +1036,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
              Efl_Ui_Text_Interactive_Change_Info info = {0};
              if (en->have_selection)
                {
-                  _range_del_emit(cur, obj, en);
+                  _sel_range_del_emit(obj, en);
                   info.merge = EINA_TRUE;
                }
              info.insert = EINA_TRUE;
@@ -1145,7 +1144,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
                {
                   en->have_selection = EINA_FALSE;
                   en->selecting = EINA_FALSE;
-                  _sel_clear(cur, obj, en);
+                  _sel_clear(obj, en);
                   tc = evas_object_textblock_cursor_new(obj);
                   evas_textblock_cursor_copy(cur, tc);
                   evas_textblock_cursor_line_char_first(cur);
@@ -1174,7 +1173,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
                {
                   en->have_selection = EINA_FALSE;
                   en->selecting = EINA_FALSE;
-                  _sel_clear(cur, obj, en);
+                  _sel_clear(obj, en);
                   tc = evas_object_textblock_cursor_new(obj);
                   evas_textblock_cursor_copy(cur, tc);
                   evas_textblock_cursor_word_start(cur);
@@ -1197,7 +1196,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
         else
           {
              en->selecting = EINA_TRUE;
-             _sel_clear(cur, obj, en);
+             _sel_clear(obj, en);
              _sel_init(cur, obj, en);
           }
      }