merge xim -> default

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 9d479f9..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;
@@ -58,6 +58,7 @@ static Item *items = NULL;
 static Item *matches, *matchend;
 static Item *prev, *curr, *next, *sel;
 static Window win;
+static XIC xic;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
@@ -229,9 +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;
 
-       XLookupString(ev, buf, sizeof buf, &ksym, NULL);
+       len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+       if(status == XBufferOverflow)
+               return;
        if(ev->state & ControlMask) {
                KeySym lower, upper;
 
@@ -273,7 +278,7 @@ keypress(XKeyEvent *ev) {
        switch(ksym) {
        default:
                if(!iscntrl(*buf))
-                       insert(buf, strlen(buf));
+                       insert(buf, len);
                break;
        case XK_Delete:
                if(text[cursor] == '\0')
@@ -454,13 +459,16 @@ readstdin(void) {
        if(items)
                items[i].text = NULL;
        inputw = maxstr ? textw(dc, maxstr) : 0;
+       lines = MIN(lines, i);
 }
 
 void
 run(void) {
        XEvent ev;
 
-       while(!XNextEvent(dc->dpy, &ev))
+       while(!XNextEvent(dc->dpy, &ev)) {
+               if(XFilterEvent(&ev, win))
+                       continue;
                switch(ev.type) {
                case Expose:
                        if(ev.xexpose.count == 0)
@@ -478,6 +486,7 @@ run(void) {
                                XRaiseWindow(dc->dpy, win);
                        break;
                }
+       }
 }
 
 void
@@ -485,6 +494,7 @@ setup(void) {
        int x, y, screen = DefaultScreen(dc->dpy);
        Window root = RootWindow(dc->dpy, screen);
        XSetWindowAttributes swa;
+       XIM xim;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
@@ -509,8 +519,8 @@ setup(void) {
                XWindowAttributes wa;
 
                XGetInputFocus(dc->dpy, &w, &di);
-               if(w != root && XGetWindowAttributes(dc->dpy, w, &wa))
-                       XTranslateCoordinates(dc->dpy, root, root, wa.x, wa.y, &x, &y, &dw);
+               if(w != root && w != PointerRoot && w != None && XGetWindowAttributes(dc->dpy, w, &wa))
+                       XTranslateCoordinates(dc->dpy, w, root, wa.x, wa.y, &x, &y, &dw);
                else
                        XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                for(i = 0; i < n-1; i++)
@@ -541,6 +551,11 @@ setup(void) {
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &swa);
 
+       /* input methods */
+       xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
+       xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                       XNClientWindow, win, XNFocusWindow, win, NULL);
+
        XMapRaised(dc->dpy, win);
        resizedc(dc, mw, mh);
        drawmenu();