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

X11 backend - input method support

This commit is contained in:
Vadim Lopatin 2015-12-01 16:58:26 +03:00
parent 92805a16a7
commit 5b9b130143
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ pragma(lib, "X11");
private __gshared Display * x11display; private __gshared Display * x11display;
private __gshared int x11screen; private __gshared int x11screen;
private __gshared XIM xim;
alias XWindow = x11.Xlib.Window; alias XWindow = x11.Xlib.Window;
alias DWindow = dlangui.platforms.common.platform.Window; alias DWindow = dlangui.platforms.common.platform.Window;
@ -68,6 +69,7 @@ class X11Window : DWindow {
protected dstring _caption; protected dstring _caption;
protected XWindow _win; protected XWindow _win;
protected GC _gc; protected GC _gc;
private __gshared XIC xic;
this(X11Platform platform, dstring caption, DWindow parent, uint flags, uint width = 0, uint height = 0) { this(X11Platform platform, dstring caption, DWindow parent, uint flags, uint width = 0, uint height = 0) {
_platform = platform; _platform = platform;
@ -135,7 +137,7 @@ class X11Window : DWindow {
*/ */
XSelectInput(x11display, _win, KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | XSelectInput(x11display, _win, KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | ExposureMask | VisibilityChangeMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | ExposureMask | VisibilityChangeMask |
FocusChangeMask); FocusChangeMask | KeymapStateMask);
/* create the Graphics Context */ /* create the Graphics Context */
_gc = createGC(x11display, _win); _gc = createGC(x11display, _win);
@ -699,8 +701,27 @@ 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, &compose); Status s;
if (!w.xic) {
w.xic = XCreateIC(xim,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, w._win, 0);
if (!w.xic) {
Log.e("Cannot create input context");
}
}
if (!w.xic)
XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, &compose);
else {
Xutf8LookupString(w.xic, &event.xkey, buf.ptr, cast(int)buf.length - 1, &ks, &s);
if (s != XLookupChars && s != XLookupBoth)
XLookupString(&event.xkey, buf.ptr, buf.length - 1, &ks, &compose);
}
foreach(ref ch; buf) {
if (ch == 255 || ch < 32 || ch == 127)
ch = 0;
}
string txt = fromStringz(buf.ptr).dup; string txt = fromStringz(buf.ptr).dup;
import std.utf; import std.utf;
dstring dtext; dstring dtext;
@ -900,8 +921,10 @@ extern(C) int DLANGUImain(string[] args)
} }
x11screen = DefaultScreen(x11display); x11screen = DefaultScreen(x11display);
xim = XOpenIM(x11display, null, null, null);
if (!xim) {
Log.e("Cannot open input method");
}
Log.d("X11 display=", x11display, " screen=", x11screen); Log.d("X11 display=", x11display, " screen=", x11screen);