compose key patch. thx federico luna.
This commit is contained in:
parent
6faedce53a
commit
3470e3af23
14
st.c
14
st.c
|
@ -107,6 +107,8 @@ typedef struct {
|
||||||
Colormap cmap;
|
Colormap cmap;
|
||||||
Window win;
|
Window win;
|
||||||
Pixmap buf;
|
Pixmap buf;
|
||||||
|
XIM xim;
|
||||||
|
XIC xic;
|
||||||
int scr;
|
int scr;
|
||||||
int w; /* window width */
|
int w; /* window width */
|
||||||
int h; /* window height */
|
int h; /* window height */
|
||||||
|
@ -1228,6 +1230,13 @@ xinit(void) {
|
||||||
| CWColormap,
|
| CWColormap,
|
||||||
&attrs);
|
&attrs);
|
||||||
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
|
xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
|
||||||
|
|
||||||
|
|
||||||
|
/* input methods */
|
||||||
|
xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
|
||||||
|
xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
|
||||||
|
| XIMStatusNothing, XNClientWindow, xw.win,
|
||||||
|
XNFocusWindow, xw.win, NULL);
|
||||||
/* gc */
|
/* gc */
|
||||||
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
|
dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
|
||||||
|
|
||||||
|
@ -1411,10 +1420,11 @@ kpress(XEvent *ev) {
|
||||||
int len;
|
int len;
|
||||||
int meta;
|
int meta;
|
||||||
int shift;
|
int shift;
|
||||||
|
Status status;
|
||||||
|
|
||||||
meta = e->state & Mod1Mask;
|
meta = e->state & Mod1Mask;
|
||||||
shift = e->state & ShiftMask;
|
shift = e->state & ShiftMask;
|
||||||
len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
|
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
|
||||||
|
|
||||||
if((customkey = kmap(ksym)))
|
if((customkey = kmap(ksym)))
|
||||||
ttywrite(customkey, strlen(customkey));
|
ttywrite(customkey, strlen(customkey));
|
||||||
|
@ -1484,6 +1494,8 @@ run(void) {
|
||||||
}
|
}
|
||||||
while(XPending(xw.dis)) {
|
while(XPending(xw.dis)) {
|
||||||
XNextEvent(xw.dis, &ev);
|
XNextEvent(xw.dis, &ev);
|
||||||
|
if (XFilterEvent(&ev, xw.win))
|
||||||
|
continue;
|
||||||
if(handler[ev.type])
|
if(handler[ev.type])
|
||||||
(handler[ev.type])(&ev);
|
(handler[ev.type])(&ev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user