enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

Ugly. But apparently Solaris does not have the Xutf8* functions 

SVN revision: 38443
This commit is contained in:
Iván Briano 2009-01-03 21:53:42 +00:00
parent 9ea4273925
commit b00f77795f
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
View File

@ -217,17 +217,29 @@ _ecore_x_event_handle_key_press(XEvent *xevent)
if (_ecore_x_ic)
{
Status mbstatus;
#ifdef X_HAVE_UTF8_STRING
val = Xutf8LookupString(_ecore_x_ic, (XKeyEvent *)xevent, buf, buflen - 1, &sym, &mbstatus);
#else
val = XmbLookupString(_ecore_x_ic, (XKeyEvent *)xevent, buf, buflen - 1, &sym, &mbstatus);
#endif
if (mbstatus == XBufferOverflow)
{
buflen = val + 1;
buf = realloc(buf, buflen);
#ifdef X_HAVE_UTF8_STRING
val = Xutf8LookupString(_ecore_x_ic, (XKeyEvent *)xevent, buf, buflen - 1, &sym, &mbstatus);
#else
val = XmbLookupString(_ecore_x_ic, (XKeyEvent *)xevent, buf, buflen - 1, &sym, &mbstatus);
#endif
}
if (val > 0)
{
buf[val] = 0;
#ifdef X_HAVE_UTF8_STRING
e->key_compose = strdup(buf);
#else
e->key_compose = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", buf);
#endif
}
}
else
@ -739,7 +751,7 @@ _ecore_x_event_handle_focus_in(XEvent *xevent)
{
char *str;
XSetICValues(_ecore_x_ic, XNFocusWindow, xevent->xfocus.window, NULL);
if ((str = Xutf8ResetIC(_ecore_x_ic)))
if ((str = Xmb8ResetIC(_ecore_x_ic)))
XFree(str);
XSetICFocus(_ecore_x_ic);
}