From: Enlightenment S. <no-...@en...> - 2011-07-26 12:04:33
|
Log: From: Jihoon Kim <jih...@sa...> Subject: Re: [E-devel] [Patch] Add XIM module for ecore_imf Patch to set the right window ID for IMF access from Edje Author: raster Date: 2011-07-26 05:04:27 -0700 (Tue, 26 Jul 2011) New Revision: 61756 Trac: http://trac.enlightenment.org/e/changeset/61756 Modified: trunk/edje/configure.ac trunk/edje/src/lib/edje_entry.c trunk/edje/src/lib/edje_private.h Modified: trunk/edje/configure.ac =================================================================== --- trunk/edje/configure.ac 2011-07-26 12:00:48 UTC (rev 61755) +++ trunk/edje/configure.ac 2011-07-26 12:04:27 UTC (rev 61756) @@ -266,6 +266,7 @@ eet >= 1.4.0 evas >= 1.0.999 ecore >= 1.0.0 + ecore-evas >= 1.0.0 ecore-file >= 1.0.0 embryo >= 1.0.0 ]) @@ -273,7 +274,7 @@ EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}" -requirement_edje="embryo >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_edje}" +requirement_edje="embryo >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_edje}" requirement_edje="${requirement_lua} ${requirement_edje}" have_ecore_imf="no" Modified: trunk/edje/src/lib/edje_entry.c =================================================================== --- trunk/edje/src/lib/edje_entry.c 2011-07-26 12:00:48 UTC (rev 61755) +++ trunk/edje/src/lib/edje_entry.c 2011-07-26 12:04:27 UTC (rev 61756) @@ -1960,7 +1960,7 @@ if (!en->imf_context) goto done; - ecore_imf_context_client_window_set(en->imf_context, rp->object); + ecore_imf_context_client_window_set(en->imf_context, ecore_evas_window_get(ecore_evas_ecore_evas_get(rp->edje->base.evas))); ecore_imf_context_client_canvas_set(en->imf_context, rp->edje->base.evas); ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context, @@ -2897,6 +2897,7 @@ if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON; ecore_imf_context_preedit_string_get(en->imf_context, &preedit_string, &cursor_pos); + if (!preedit_string) return ECORE_CALLBACK_PASS_ON; if (!strcmp(preedit_string, "")) preedit_end_state = EINA_TRUE; Modified: trunk/edje/src/lib/edje_private.h =================================================================== --- trunk/edje/src/lib/edje_private.h 2011-07-26 12:00:48 UTC (rev 61755) +++ trunk/edje/src/lib/edje_private.h 2011-07-26 12:04:27 UTC (rev 61756) @@ -52,6 +52,7 @@ #include <Eet.h> #include <Evas.h> #include <Ecore.h> +#include <Ecore_Evas.h> #include <Ecore_File.h> #ifdef HAVE_ECORE_IMF # include <Ecore_IMF.h> |