atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] corect the intut of the keyboard in utf8

Browse Source
This commit is contained in:
Edouard DUPIN 2013-09-29 13:55:46 +02:00
parent b7dc1089ee
commit a1e89a83a1
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sources/ewol/renderer/X11/Context.cpp
View File

@ -111,6 +111,8 @@ class X11Interface : public ewol::eContext
Atom m_delAtom; Atom m_delAtom;
Display* m_display; Display* m_display;
Window m_WindowHandle; Window m_WindowHandle;
XIM m_xim;
XIC m_xic;
int32_t m_originX; int32_t m_originX;
int32_t m_originY; int32_t m_originY;
int32_t m_cursorEventX; int32_t m_cursorEventX;
@ -653,8 +655,9 @@ class X11Interface : public ewol::eContext
event.xkey.state = event.xkey.state & 0xFFFFFFFB; event.xkey.state = event.xkey.state & 0xFFFFFFFB;
} }
KeySym keysym; KeySym keysym;
XComposeStatus status; Status status = 0;
int count = XLookupString(&event.xkey, buf, 10, &keysym, &status); //int count = Xutf8LookupString(m_xic, (XKeyPressedEvent*)&event, buf, 10, &keysym, &status);
int count = Xutf8LookupString(m_xic, &event.xkey, buf, 10, &keysym, &status);
// retreave real keystate // retreave real keystate
event.xkey.state = keyStateSave; event.xkey.state = keyStateSave;
buf[count] = '\0'; buf[count] = '\0';
@ -665,8 +668,8 @@ class X11Interface : public ewol::eContext
} }
if (count>0) { if (count>0) {
// transform it in unicode // transform it in unicode
uniChar_t tmpChar = 0; etk::UniChar tmpChar = 0;
unicode::convertIsoToUnicode(unicode::EDN_CHARSET_ISO_8859_15, buf[0], tmpChar); tmpChar.SetUtf8(buf);
//EWOL_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << unicodeValue); //EWOL_INFO("event Key : " << event.xkey.keycode << " char=\"" << buf << "\"'len=" << strlen(buf) << " unicode=" << unicodeValue);
OS_SetKeyboard(m_guiKeyBoardMode, tmpChar, (event.type==KeyPress), thisIsAReapeateKey); OS_SetKeyboard(m_guiKeyBoardMode, tmpChar, (event.type==KeyPress), thisIsAReapeateKey);
if (true==thisIsAReapeateKey) { if (true==thisIsAReapeateKey) {
@ -1009,6 +1012,33 @@ class X11Interface : public ewol::eContext
XMapWindow(m_display, m_WindowHandle); XMapWindow(m_display, m_WindowHandle);
//XIfEvent(m_display, &event, WaitForMapNotify, (char*)&m_WindowHandle); //XIfEvent(m_display, &event, WaitForMapNotify, (char*)&m_WindowHandle);
m_xim = XOpenIM(m_display, NULL, NULL, NULL);
if (m_xim == NULL) {
EWOL_ERROR("Could not open input method");
return false;
}
XIMStyles *styles=NULL;
// XIMStyle xim_requested_style;
char* failed_arg = XGetIMValues(m_xim, XNQueryInputStyle, &styles, NULL);
if (failed_arg != NULL) {
EWOL_ERROR("XIM Can't get styles");
return false;
}
for (int32_t iii=0; iii<styles->count_styles; ++iii) {
EWOL_INFO("style " << styles->supported_styles[iii]);
}
m_xic = XCreateIC(m_xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, XNClientWindow, m_WindowHandle, NULL);
if (m_xic == NULL) {
EWOL_ERROR("Could not open IC");
return false;
}
XSetICFocus(m_xic);
// Set the kill atom so we get a message when the user tries to close the window // Set the kill atom so we get a message when the user tries to close the window
if ((m_delAtom = XInternAtom(m_display, "WM_DELETE_WINDOW", 0)) != None) { if ((m_delAtom = XInternAtom(m_display, "WM_DELETE_WINDOW", 0)) != None) {
XSetWMProtocols(m_display, m_WindowHandle, &m_delAtom, 1); XSetWMProtocols(m_display, m_WindowHandle, &m_delAtom, 1);