Add edje_object_part_text_imf_context_get API.

This API can be used to get the input method context in entry.

Change-Id: Ie4dbb23854a7b3ba3a36279d97c63365127f2b93
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@68385 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 24dc6ec..25e9e80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -355,3 +355,12 @@
           edje_object_part_text_input_panel_imdata_set/get
           edje_object_part_text_input_panel_return_key_type_set/get
           edje_object_part_text_input_panel_return_key_disabled_set/get
+
+2012-02-20  WooHyun Jung
+
+        * Change API names from edje_object_markup_filter_callback_{add,del,del_full}.
+        to edje_object_text_markup_filter_callback_{add,del,del_full}.
+
+2012-02-24  Jihoon Kim
+
+       * add edje_object_part_text_imf_context_get for getting Ecore_IMF_Context handle in edje text object

diff --git a/src/lib/Edje.h b/src/lib/Edje.h
index 5c69843..a10341d 100644 (file)
--- a/src/lib/Edje.h
+++ b/src/lib/Edje.h
@@ -2874,6 +2874,20 @@ EAPI int              edje_object_part_text_cursor_pos_get              (const E
 EAPI void             edje_object_part_text_imf_context_reset           (const Evas_Object *obj, const char *part);
 
 /**
+ * @brief Get the input method context in entry.
+ *
+ * If ecore_imf was not available when edje was compiled, this function returns NULL
+ * otherwise, the returned pointer is an Ecore_IMF *
+ *
+ * @param obj A valid Evas_Object handle
+ * @param part The part name
+ *
+ * @return The input method context (Ecore_IMF_Context *) in entry 
+ * @since 1.2.0
+ */
+EAPI void              *edje_object_part_text_imf_context_get           (const Evas_Object *obj, const char *part);
+
+/**
  * @brief Retrieves the current position of the selection
  *
  * @param obj A valid Evas_Object handle
@@ -2889,22 +2903,8 @@ EAPI void             edje_object_part_text_imf_context_reset           (const E
 EAPI Eina_Bool        edje_object_part_text_selection_geometry_get     (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 
 /**
- * @brief Get the input method context in entry.
- *
- * @param obj A valid Evas_Object handle
- * @param part The part name
- *
- * @return The input method context in entry
- */
-#ifdef HAVE_ECORE_IMF
-EAPI Ecore_IMF_Context *edje_object_part_text_imf_context_get (const Evas_Object *obj, const char *part);
-#else
-EAPI void              *edje_object_part_text_imf_context_get (const Evas_Object *obj, const char *part);
-#endif
-
-/**
  * @brief Set the layout of the input panel.
- * 
+ *
  * The layout of the input panel or virtual keyboard can make it easier or
  * harder to enter content. This allows you to hint what kind of input you
  * are expecting to enter and thus have the input panel automatically

diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c
index 608e07c..dfc9e49 100644 (file)
--- a/src/lib/edje_entry.c
+++ b/src/lib/edje_entry.c
@@ -3197,22 +3197,18 @@ _edje_entry_select_abort(Edje_Real_Part *rp)
      }
 }
 
-#ifdef HAVE_ECORE_IMF
-Ecore_IMF_Context *
+void *
 _edje_entry_imf_context_get(Edje_Real_Part *rp)
 {
    Entry *en = rp->entry_data;
    if (!en) return NULL;
 
+#ifdef HAVE_ECORE_IMF
    return en->imf_context;
-}
 #else
-void *
-_edje_entry_imf_context_get(Edje_Real_Part *rp)
-{
    return NULL;
-}
 #endif
+}
 
 void
 _edje_entry_autocapital_type_set(Edje_Real_Part *rp, Edje_Text_Autocapital_Type autocapital_type)

diff --git a/src/lib/edje_private.h b/src/lib/edje_private.h
index 3855767..cc4b5f1 100644 (file)
--- a/src/lib/edje_private.h
+++ b/src/lib/edje_private.h
@@ -1924,9 +1924,7 @@ void _edje_entry_select_allow_set(Edje_Real_Part *rp, Eina_Bool allow);
 Eina_Bool _edje_entry_select_allow_get(const Edje_Real_Part *rp);
 void _edje_entry_select_abort(Edje_Real_Part *rp);
 void _edje_entry_viewport_object_set(Edje_Real_Part *rp, Evas_Object *obj);
-#ifdef HAVE_ECORE_IMF
-Ecore_IMF_Context *_edje_entry_imf_context_get(Edje_Real_Part *rp);
-#endif
+void *_edje_entry_imf_context_get(Edje_Real_Part *rp);
 Eina_Bool _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur);
 Eina_Bool _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur);
 Eina_Bool _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur);

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index c45f1a1..2ef74d4 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -1583,8 +1583,7 @@ edje_object_part_text_select_extend(const Evas_Object *obj, const char *part)
      _edje_entry_select_extend(rp);
 }
 
-#ifdef HAVE_ECORE_IMF
-EAPI Ecore_IMF_Context *
+EAPI void *
 edje_object_part_text_imf_context_get(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
@@ -1601,7 +1600,6 @@ edje_object_part_text_imf_context_get(const Evas_Object *obj, const char *part)
    else
      return NULL;
 }
-#endif
 
 /**
  * @brief Advances the cursor to the next cursor position.