Chewing_Bever
/
st
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

x: check we still have an XIC context before accessing it

dev
Quentin Rameau 2020-02-02 17:38:36 +01:00 committed by Hiltjo Posthuma
parent 2cb539142b
commit cd785755f2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x.c
View File

@ -1061,6 +1061,7 @@ void
ximdestroy(XIM xim, XPointer client, XPointer call) ximdestroy(XIM xim, XPointer client, XPointer call)
{ {
xw.ime.xim = NULL; xw.ime.xim = NULL;
xw.ime.xic = NULL;
XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL, XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
ximinstantiate, NULL); ximinstantiate, NULL);
XFree(xw.ime.spotlist); XFree(xw.ime.spotlist);
@ -1692,12 +1693,14 @@ focus(XEvent *ev)
return; return;
if (ev->type == FocusIn) { if (ev->type == FocusIn) {
if (xw.ime.xic)
XSetICFocus(xw.ime.xic); XSetICFocus(xw.ime.xic);
win.mode |= MODE_FOCUSED; win.mode |= MODE_FOCUSED;
xseturgency(0); xseturgency(0);
if (IS_SET(MODE_FOCUS)) if (IS_SET(MODE_FOCUS))
ttywrite("\033[I", 3, 0); ttywrite("\033[I", 3, 0);
} else { } else {
if (xw.ime.xic)
XUnsetICFocus(xw.ime.xic); XUnsetICFocus(xw.ime.xic);
win.mode &= ~MODE_FOCUSED; win.mode &= ~MODE_FOCUSED;
if (IS_SET(MODE_FOCUS)) if (IS_SET(MODE_FOCUS))