merge xim -> default

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6d1cdf0..671095e 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -41,7 +41,6 @@ static void usage(void);
 static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int inputw, promptw;
-static int lines = 0;
 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
@@ -49,6 +48,7 @@ static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *selbgcolor  = "#0066ff";
 static const char *selfgcolor  = "#ffffff";
+static unsigned int lines = 0;
 static unsigned long normcol[ColLast];
 static unsigned long selcol[ColLast];
 static Atom utf8;
@@ -230,11 +230,13 @@ insert(const char *str, ssize_t n) {
 void
 keypress(XKeyEvent *ev) {
        char buf[32];
-       KeySym ksym;
        int len;
+       KeySym ksym = NoSymbol;
        Status status;
 
-       len = XmbLookupString(xic, ev, buf, sizeof(buf), &ksym, &status);
+       len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+       if(status == XBufferOverflow)
+               return;
        if(ev->state & ControlMask) {
                KeySym lower, upper;
 
@@ -549,10 +551,10 @@ setup(void) {
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
 
-        /* input methods */
+       /* input methods */
        xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
        xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-                                       XNClientWindow, win, XNFocusWindow, win, NULL);
+                       XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dc->dpy, win);
        resizedc(dc, mw, mh);