encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11: send keypress events before textinput events.

This commit is contained in:
Ryan C. Gordon 2015-05-01 01:20:28 -04:00
parent 0045e2e622
commit 589c46dd65
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/video/x11/SDL_x11events.c
View File

@ -755,19 +755,17 @@ X11_DispatchEvent(_THIS)
#else #else
XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL); XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
#endif #endif
#ifdef SDL_USE_IBUS #ifdef SDL_USE_IBUS
if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){ if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){
if(!(handled_by_ime = SDL_IBus_ProcessKeyEvent(keysym, keycode))){ handled_by_ime = SDL_IBus_ProcessKeyEvent(keysym, keycode);
#endif
if(*text){
SDL_SendKeyboardText(text);
}
#ifdef SDL_USE_IBUS
}
} }
#endif #endif
if (!handled_by_ime) { if (!handled_by_ime) {
SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]); SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
if(*text) {
SDL_SendKeyboardText(text);
}
} }
} }