forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL2: text input is working

This commit is contained in:
Vadim Lopatin 2014-04-29 23:27:20 +04:00
parent 27c74e7837
commit 078d5832d3
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -392,11 +392,22 @@ version(USE_SDL) {
res |= KeyFlag.LShift; res |= KeyFlag.LShift;
if (flags & KMOD_LALT) if (flags & KMOD_LALT)
res |= KeyFlag.LAlt; res |= KeyFlag.LAlt;
return 0; return res;
} }
bool processTextInput(const char * s) {
string str = fromStringz(s);
dstring ds = toUTF32(str);
uint flags = convertKeyFlags(SDL_GetModState());
bool res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, 0, flags, ds));
if (res) {
Log.d("Calling update() after text event");
invalidate();
}
return res;
}
bool processKeyEvent(KeyAction action, uint keyCode, uint flags) { bool processKeyEvent(KeyAction action, uint keyCode, uint flags) {
Log.d("processKeyEvent ", action, " x11 key=", keyCode, " x11 flags=", flags); Log.d("processKeyEvent ", action, " SDL key=", keyCode, " SDL flags=", flags);
keyCode = convertKeyCode(keyCode); keyCode = convertKeyCode(keyCode);
flags = convertKeyFlags(flags); flags = convertKeyFlags(flags);
Log.d("processKeyEvent ", action, " converted key=", keyCode, " converted flags=", flags); Log.d("processKeyEvent ", action, " converted key=", keyCode, " converted flags=", flags);
@ -546,6 +557,7 @@ version(USE_SDL) {
SDLWindow w = getWindow(event.key.windowID); SDLWindow w = getWindow(event.key.windowID);
if (w) { if (w) {
w.processKeyEvent(KeyAction.KeyDown, event.key.keysym.sym, event.key.keysym.mod); w.processKeyEvent(KeyAction.KeyDown, event.key.keysym.sym, event.key.keysym.mod);
SDL_StartTextInput();
} }
break; break;
case SDL_KEYUP: case SDL_KEYUP:
@ -555,8 +567,14 @@ version(USE_SDL) {
} }
break; break;
case SDL_TEXTEDITING: case SDL_TEXTEDITING:
Log.d("SDL_TEXTEDITING");
break; break;
case SDL_TEXTINPUT: case SDL_TEXTINPUT:
Log.d("SDL_TEXTINPUT");
SDLWindow w = getWindow(event.text.windowID);
if (w) {
w.processTextInput(event.text.text.ptr);
}
break; break;
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
SDLWindow w = getWindow(event.motion.windowID); SDLWindow w = getWindow(event.motion.windowID);