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

X11 keyboard input

This commit is contained in:
Vadim Lopatin 2015-12-01 15:35:24 +03:00
parent 041df58bec
commit 92805a16a7
1 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/dlangui/platforms/x11/x11app.d
View File

@ -598,11 +598,22 @@ class X11Window : DWindow {
// res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, keyCode, flags, cast(dstring)text)) || res; // res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, keyCode, flags, cast(dstring)text)) || res;
// } // }
if (res) { if (res) {
debug(DebugSDL) Log.d("Calling update() after key event"); debug(keys) Log.d("Calling update() after key event");
invalidate(); invalidate();
} }
return res; return res;
} }
bool processTextInput(dstring ds, uint flags) {
flags = convertKeyFlags(flags);
bool res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, 0, flags, ds));
if (res) {
debug(keys) Log.d("Calling update() after text event");
invalidate();
}
return res;
}
} }
class X11Platform : Platform { class X11Platform : Platform {
@ -659,6 +670,7 @@ class X11Platform : Platform {
Log.d("enterMessageLoop()"); Log.d("enterMessageLoop()");
/* look for events forever... */ /* look for events forever... */
bool finished = false; bool finished = false;
XComposeStatus compose;
while(!finished) { while(!finished) {
/* get the next event and stuff it into our event variable. /* get the next event and stuff it into our event variable.
Note: only events we set the mask for are detected! Note: only events we set the mask for are detected!
@ -682,15 +694,32 @@ class X11Platform : Platform {
} }
break; break;
case KeyPress: case KeyPress:
Log.d("X11: KeyRelease event"); Log.d("X11: KeyPress event");
X11Window w = findWindow(event.xkey.window); X11Window w = findWindow(event.xkey.window);
if (w) { if (w) {
char[100] buf; char[100] buf;
KeySym ks; KeySym ks;
XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, null); XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, &compose);
w.processKeyEvent(KeyAction.KeyDown, cast(uint)ks,
//event.xkey.keycode, string txt = fromStringz(buf.ptr).dup;
event.xkey.state); import std.utf;
dstring dtext;
try {
if (txt.length)
dtext = toUTF32(txt);
} catch (UTFException e) {
// ignore, invalid text
}
Log.d("X11: KeyPress event bytes=", txt.length, " text=", txt, " dtext=", dtext);
if (dtext.length) {
w.processTextInput(dtext, event.xkey.state);
} else {
w.processKeyEvent(KeyAction.KeyDown, cast(uint)ks,
//event.xkey.keycode,
event.xkey.state);
}
} else { } else {
Log.e("Window not found"); Log.e("Window not found");
} }
@ -712,7 +741,7 @@ class X11Platform : Platform {
if (w) { if (w) {
char[100] buf; char[100] buf;
KeySym ks; KeySym ks;
XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, null); XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, &compose);
w.processKeyEvent(KeyAction.KeyUp, cast(uint)ks, w.processKeyEvent(KeyAction.KeyUp, cast(uint)ks,
//event.xkey.keycode, //event.xkey.keycode,
event.xkey.state); event.xkey.state);