forked from enlightenment/efl
From: Jihoon Kim <jihoon48.kim@samsung.com>
Subject: Re: [E-devel] [Patch] Add XIM module for ecore_imf Patch to set the right window ID for IMF access from Edje SVN revision: 61756
This commit is contained in:
parent
c8383a2b87
commit
94cf5e7829
|
@ -266,6 +266,7 @@ PKG_CHECK_MODULES([EDJE],
|
||||||
eet >= 1.4.0
|
eet >= 1.4.0
|
||||||
evas >= 1.0.999
|
evas >= 1.0.999
|
||||||
ecore >= 1.0.0
|
ecore >= 1.0.0
|
||||||
|
ecore-evas >= 1.0.0
|
||||||
ecore-file >= 1.0.0
|
ecore-file >= 1.0.0
|
||||||
embryo >= 1.0.0
|
embryo >= 1.0.0
|
||||||
])
|
])
|
||||||
|
@ -273,7 +274,7 @@ PKG_CHECK_MODULES([EDJE],
|
||||||
EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
|
EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
|
||||||
EDJE_CFLAGS="${EDJE_CFLAGS} ${LUA_CFLAGS}"
|
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}"
|
requirement_edje="${requirement_lua} ${requirement_edje}"
|
||||||
|
|
||||||
have_ecore_imf="no"
|
have_ecore_imf="no"
|
||||||
|
|
|
@ -1960,7 +1960,7 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
|
||||||
|
|
||||||
if (!en->imf_context) goto done;
|
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_client_canvas_set(en->imf_context, rp->edje->base.evas);
|
||||||
|
|
||||||
ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context,
|
ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context,
|
||||||
|
@ -2897,6 +2897,7 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
|
||||||
if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON;
|
if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
ecore_imf_context_preedit_string_get(en->imf_context, &preedit_string, &cursor_pos);
|
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, ""))
|
if (!strcmp(preedit_string, ""))
|
||||||
preedit_end_state = EINA_TRUE;
|
preedit_end_state = EINA_TRUE;
|
||||||
|
|
|
@ -52,6 +52,7 @@ void *alloca (size_t);
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
|
#include <Ecore_Evas.h>
|
||||||
#include <Ecore_File.h>
|
#include <Ecore_File.h>
|
||||||
#ifdef HAVE_ECORE_IMF
|
#ifdef HAVE_ECORE_IMF
|
||||||
# include <Ecore_IMF.h>
|
# include <Ecore_IMF.h>
|
||||||
|
|
Loading…
Reference in New Issue