diff options
author | Connor Lane Smith <cls@lubutu.com> | 2011-10-17 01:18:57 +0100 |
---|---|---|
committer | Connor Lane Smith <cls@lubutu.com> | 2011-10-17 01:18:57 +0100 |
commit | 24565608cbf8572211a4a1b3fe7bbe1cf0c4fbbd (patch) | |
tree | 8d17e11bb5f49c27590948c9b76c12c61ac0f226 | |
parent | c8f0a3763843966ad480e22b18fe61ff54dc9a39 (diff) |
xim: check for corner cases
-rw-r--r-- | dmenu.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -230,11 +230,13 @@ insert(const char *str, ssize_t n) { | |||
230 | void | 230 | void |
231 | keypress(XKeyEvent *ev) { | 231 | keypress(XKeyEvent *ev) { |
232 | char buf[32]; | 232 | char buf[32]; |
233 | KeySym ksym; | ||
234 | int len; | 233 | int len; |
234 | KeySym ksym = NoSymbol; | ||
235 | Status status; | 235 | Status status; |
236 | 236 | ||
237 | len = XmbLookupString(xic, ev, buf, sizeof(buf), &ksym, &status); | 237 | len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); |
238 | if(status == XBufferOverflow) | ||
239 | return; | ||
238 | if(ev->state & ControlMask) { | 240 | if(ev->state & ControlMask) { |
239 | KeySym lower, upper; | 241 | KeySym lower, upper; |
240 | 242 | ||
@@ -549,10 +551,10 @@ setup(void) { | |||
549 | DefaultVisual(dc->dpy, screen), | 551 | DefaultVisual(dc->dpy, screen), |
550 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa); | 552 | CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa); |
551 | 553 | ||
552 | /* input methods */ | 554 | /* input methods */ |
553 | xim = XOpenIM(dc->dpy, NULL, NULL, NULL); | 555 | xim = XOpenIM(dc->dpy, NULL, NULL, NULL); |
554 | xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, | 556 | xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, |
555 | XNClientWindow, win, XNFocusWindow, win, NULL); | 557 | XNClientWindow, win, XNFocusWindow, win, NULL); |
556 | 558 | ||
557 | XMapRaised(dc->dpy, win); | 559 | XMapRaised(dc->dpy, win); |
558 | resizedc(dc, mw, mh); | 560 | resizedc(dc, mw, mh); |