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

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

This commit is contained in:
bakkeby 2020-03-24 15:37:28 +01:00
parent e22dab0391
commit 2e2d10eca6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x.c
View File

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