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

[st.git] / x.c

diff --git a/x.c b/x.c
index 60eeee1..b488617 100644 (file)
--- a/x.c
+++ b/x.c
@@ -97,6 +97,8 @@ typedef struct {
        struct {
                XIM xim;
                XIC xic;
        struct {
                XIM xim;
                XIC xic;

+               XPoint spot;
+               XVaNestedList spotlist;

        } ime;
        Draw draw;
        Visual *vis;
        } ime;
        Draw draw;
        Visual *vis;


@@ -1042,6 +1044,9 @@ ximopen(Display *dpy)
                           XNClientWindow, xw.win, XNFocusWindow, xw.win, NULL);
        if (xw.xic == NULL)
                die("XCreateIC failed. Could not obtain input method.\n");
                           XNClientWindow, xw.win, XNFocusWindow, xw.win, NULL);
        if (xw.xic == NULL)
                die("XCreateIC failed. Could not obtain input method.\n");

+
+       xw.ime.spotlist = XVaCreateNestedList(0, XNSpotLocation, &xw.ime.spot,
+                                             NULL);

 }
 
 void
 }
 
 void


@@ -1056,8 +1061,10 @@ void
 ximdestroy(XIM xim, XPointer client, XPointer call)
 {
        xw.ime.xim = NULL;
 ximdestroy(XIM xim, XPointer client, XPointer call)
 {
        xw.ime.xim = NULL;

+       xw.ime.xic = NULL;

        XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
                                        ximinstantiate, NULL);
        XRegisterIMInstantiateCallback(xw.dpy, NULL, NULL, NULL,
                                        ximinstantiate, NULL);

+       XFree(xw.ime.spotlist);

 }
 
 void
 }
 
 void


@@ -1603,11 +1610,13 @@ xfinishdraw(void)
 void
 xximspot(int x, int y)
 {
 void
 xximspot(int x, int y)
 {

-       XPoint spot = { borderpx + x * win.cw, borderpx + (y + 1) * win.ch };
-       XVaNestedList attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
+       if (xw.ime.xic == NULL)
+               return;
+
+       xw.ime.spot.x = borderpx + x * win.cw;
+       xw.ime.spot.y = borderpx + (y + 1) * win.ch;

 
 

-       XSetICValues(xw.xic, XNPreeditAttributes, attr, NULL);
-       XFree(attr);
+       XSetICValues(xw.ime.xic, XNPreeditAttributes, xw.ime.spotlist, NULL);

 }
 
 void
 }
 
 void


@@ -1684,13 +1693,15 @@ focus(XEvent *ev)
                return;
 
        if (ev->type == FocusIn) {
                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 {
                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);
                win.mode &= ~MODE_FOCUSED;
                if (IS_SET(MODE_FOCUS))
                        ttywrite("\033[O", 3, 0);