add xim support - dmenu - Dmenu fork with xft fonts.
 (HTM) git clone git://r-36.net/dmenu
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit c8f0a3763843966ad480e22b18fe61ff54dc9a39
 (DIR) parent 1cf386446458d9b12f6bdca9e34a340c10f79c26
 (HTM) Author: Troels Henriksen <athas@sigkill.dk>
       Date:   Sun, 16 Oct 2011 17:21:33 +0100
       
       add xim support
       Diffstat:
         M dmenu.c                             |      18 +++++++++++++++---
       
       1 file changed, 15 insertions(+), 3 deletions(-)
       ---
 (DIR) diff --git a/dmenu.c b/dmenu.c
       @@ -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;
       @@ -230,8 +231,10 @@ void
        keypress(XKeyEvent *ev) {
                char buf[32];
                KeySym ksym;
       +        int len;
       +        Status status;
        
       -        XLookupString(ev, buf, sizeof buf, &ksym, NULL);
       +        len = XmbLookupString(xic, ev, buf, sizeof(buf), &ksym, &status);
                if(ev->state & ControlMask) {
                        KeySym lower, upper;
        
       @@ -273,7 +276,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')
       @@ -461,7 +464,9 @@ 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)
       @@ -479,6 +484,7 @@ run(void) {
                                        XRaiseWindow(dc->dpy, win);
                                break;
                        }
       +        }
        }
        
        void
       @@ -486,6 +492,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;
       @@ -542,6 +549,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();