From: Jihoon Kim Date: Mon, 28 Jun 2010 01:00:31 +0000 (+0900) Subject: [entry] remove the code to check IMF X-Git-Tag: beat-winset-test_0.1.1-40~236 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33abd2bb5830acbb0d39439b8be5baa69a25baba;p=framework%2Fuifw%2Felementary.git [entry] remove the code to check IMF --- diff --git a/configure.ac b/configure.ac index cb1a11c..608647f 100755 --- a/configure.ac +++ b/configure.ac @@ -171,6 +171,7 @@ PKG_CHECK_MODULES([ELEMENTARY], ecore >= 0.9.9 ecore-evas >= 0.9.9 ecore-file >= 0.9.9 + ecore-imf >= 0.9.9 edje >= 0.9.9 ] ) @@ -419,35 +420,6 @@ if test "x$want_elementary_ethumb" = "xyes" -a "x$have_elementary_ethumb" = "xno fi AC_SUBST(ELM_ETHUMB_DEF) -ELM_IMF_DEF="#undef" -have_elementary_imf="no" -want_elementary_imf="auto" -AC_ARG_ENABLE([imf], - [AC_HELP_STRING([--disable-imf], [disable imf support. @<:@default=detect@:>@])], - [want_elementary_imf=$enableval], []) - -if test "x$want_elementary_imf" != "xno"; then - PKG_CHECK_MODULES([ELEMENTARY_IMF], - [ - ecore-imf - ], - [ - AC_DEFINE(HAVE_ELEMENTARY_IMF, 1, [Input Method Framework support for Elementary]) - have_elementary_imf="yes" - ELM_IMF_DEF="#define" - requirement_elm="ecore-imf ${requirement_elm}" - ], - [have_elementary_imf="no"] - ) -else - have_elementary_imf="no" -fi -if test "x$want_elementary_imf" = "xyes" -a "x$have_elementary_imf" = "xno"; then - AC_MSG_ERROR([IMF support requested, but no ecore-imf found by pkg-config.]) -fi -AC_SUBST(ELM_IMF_DEF) - - ELM_ALLOCA_H_DEF="#undef" AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"]) AC_SUBST(ELM_ALLOCA_H_DEF) @@ -524,7 +496,6 @@ echo " EDBus..............: ${have_elementary_edbus}" echo " EFreet.............: ${have_elementary_efreet}" echo " EWeather...........: ${have_elementary_eweather}" echo " Ethumb.............: ${have_elementary_ethumb}" -echo " IMF................: ${have_elementary_imf}" echo echo " edje_cc..............: ${edje_cc}" echo diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index c7429e6..dedc546 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -782,11 +782,7 @@ extern "C" { EAPI void elm_entry_autocapitalization_set(Evas_Object *obj, Eina_Bool on); EAPI void elm_entry_autoenable_returnkey_set(Evas_Object *obj, Eina_Bool on); -#ifdef ELM_IMF - EAPI const Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj); -#else - EAPI void *elm_entry_imf_context_get(Evas_Object *obj); -#endif + EAPI Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj); EAPI void elm_entry_maximum_bytes_set(Evas_Object *obj, int max_no_of_bytes); /* smart callbacks called: diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 6b0dd6b..17e1209 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -17,8 +17,7 @@ AM_CPPFLAGS = \ @ELEMENTARY_WINCE_CFLAGS@ \ @ELEMENTARY_EDBUS_CFLAGS@ \ @ELEMENTARY_EFREET_CFLAGS@ \ -@ELEMENTARY_ETHUMB_CFLAGS@ \ -@ELEMENTARY_IMF_CFLAGS@ +@ELEMENTARY_ETHUMB_CFLAGS@ if ELEMENTARY_WINDOWS_BUILD AM_CPPFLAGS += -DELEMENTARY_BUILD @@ -142,5 +141,5 @@ els_icon.h libelementary_la_CFLAGS = -libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ @ELEMENTARY_IMF_LIBS@ +libelementary_la_LIBADD = @my_libs@ @dlopen_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ @ELEMENTARY_FB_LIBS@ @ELEMENTARY_SDL_LIBS@ @ELEMENTARY_WIN32_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_ETHUMB_LIBS@ libelementary_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c index 51725e4..7b520e4 100755 --- a/src/lib/elm_entry.c +++ b/src/lib/elm_entry.c @@ -367,23 +367,17 @@ _check_enable_returnkey(Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -#ifdef HAVE_ELEMENTARY_IMF Ecore_IMF_Context *ic = elm_entry_imf_context_get(obj); if (!ic) return; - if (!wd->autoreturnkey) - { - ecore_imf_context_ise_set_disable_key(ic, 1, ISE_KEY_ENTER, EINA_FALSE); - return; - } + if (!wd->autoreturnkey) return; - if (_entry_length_get(obj) == 0) { - ecore_imf_context_ise_set_disable_key(ic, 1, ISE_KEY_ENTER, EINA_TRUE); + if (_entry_length_get(obj) == 0) { + ecore_imf_context_ise_set_disable_key(ic, ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL, ECORE_IMF_INPUT_PANEL_KEY_ENTER, EINA_TRUE); } else { - ecore_imf_context_ise_set_disable_key(ic, 1, ISE_KEY_ENTER, EINA_FALSE); + ecore_imf_context_ise_set_disable_key(ic, ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL, ECORE_IMF_INPUT_PANEL_KEY_ENTER, EINA_FALSE); } -#endif } static void @@ -399,7 +393,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *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); + _check_enable_returnkey(obj); } else { @@ -2654,20 +2648,13 @@ elm_entry_utf8_to_markup(const char *s) return ss; } -#ifdef HAVE_ELEMENTARY_IMF -EAPI const Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj) +EAPI Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd || !wd->ent) return NULL; return edje_object_part_text_imf_context_get(wd->ent, "elm.text"); } -#else -EAPI const Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj) -{ - return NULL; -} -#endif EAPI void elm_entry_autoenable_returnkey_set(Evas_Object *obj, Eina_Bool on)