Handle IME input

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index eae5685..314256f 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -287,18 +287,42 @@ nextrune(int inc)
        return n;
 }
 
        return n;
 }
 

+static void
+movewordedge(int dir)
+{
+       if (dir < 0) { /* move cursor to the start of the word*/
+               while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+                       cursor = nextrune(-1);
+               while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+                       cursor = nextrune(-1);
+       } else { /* move cursor to the end of the word */
+               while (text[cursor] && strchr(worddelimiters, text[cursor]))
+                       cursor = nextrune(+1);
+               while (text[cursor] && !strchr(worddelimiters, text[cursor]))
+                       cursor = nextrune(+1);
+       }
+}
+

 static void
 keypress(XKeyEvent *ev)
 {
        char buf[32];
        int len;
 static void
 keypress(XKeyEvent *ev)
 {
        char buf[32];
        int len;

-       KeySym ksym = NoSymbol;
+       KeySym ksym;

        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);

-       if (status == XBufferOverflow)
+       switch (status) {
+       default: /* XLookupNone, XBufferOverflow */

                return;
                return;

-       if (ev->state & ControlMask)
+       case XLookupChars:
+               goto insert;
+       case XLookupKeySym:
+       case XLookupBoth:
+               break;
+       }
+
+       if (ev->state & ControlMask) {

                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;


@@ -334,6 +358,12 @@ keypress(XKeyEvent *ev)
                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          utf8, utf8, win, CurrentTime);
                        return;
                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          utf8, utf8, win, CurrentTime);
                        return;

+               case XK_Left:
+                       movewordedge(-1);
+                       goto draw;
+               case XK_Right:
+                       movewordedge(+1);
+                       goto draw;

                case XK_Return:
                case XK_KP_Enter:
                        break;
                case XK_Return:
                case XK_KP_Enter:
                        break;


@@ -343,8 +373,14 @@ keypress(XKeyEvent *ev)
                default:
                        return;
                }
                default:
                        return;
                }

-       else if (ev->state & Mod1Mask)
+       } else if (ev->state & Mod1Mask) {

                switch(ksym) {
                switch(ksym) {

+               case XK_b:
+                       movewordedge(-1);
+                       goto draw;
+               case XK_f:
+                       movewordedge(+1);
+                       goto draw;

                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                case XK_h: ksym = XK_Up;    break;
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                case XK_h: ksym = XK_Up;    break;


@@ -354,8 +390,11 @@ keypress(XKeyEvent *ev)
                default:
                        return;
                }
                default:
                        return;
                }

+       }
+

        switch(ksym) {
        default:
        switch(ksym) {
        default:

+insert:

                if (!iscntrl(*buf))
                        insert(buf, len);
                break;
                if (!iscntrl(*buf))
                        insert(buf, len);
                break;


@@ -455,6 +494,8 @@ keypress(XKeyEvent *ev)
                match();
                break;
        }
                match();
                break;
        }

+
+draw:

        drawmenu();
 }
 
        drawmenu();
 }
 


@@ -511,7 +552,7 @@ run(void)
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {
        XEvent ev;
 
        while (!XNextEvent(dpy, &ev)) {

-               if (XFilterEvent(&ev, win))
+               if (XFilterEvent(&ev, None))

                        continue;
                switch(ev.type) {
                case Expose:
                        continue;
                switch(ev.type) {
                case Expose:


@@ -541,7 +582,7 @@ run(void)
 static void
 setup(void)
 {
 static void
 setup(void)
 {

-       int x, y, i = 0;
+       int x, y, i, j;

        unsigned int du;
        XSetWindowAttributes swa;
        XIM xim;
        unsigned int du;
        XSetWindowAttributes swa;
        XIM xim;


@@ -551,9 +592,8 @@ setup(void)
 #ifdef XINERAMA
        XineramaScreenInfo *info;
        Window pw;
 #ifdef XINERAMA
        XineramaScreenInfo *info;
        Window pw;

-       int a, j, di, n, area = 0;
+       int a, di, n, area = 0;

 #endif
 #endif

-

        /* init appearance */
        for (j = 0; j < SchemeLast; j++)
                scheme[j] = drw_scm_create(drw, colors[j], 2);
        /* init appearance */
        for (j = 0; j < SchemeLast; j++)
                scheme[j] = drw_scm_create(drw, colors[j], 2);


@@ -566,6 +606,7 @@ setup(void)
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA

+       i = 0;

        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
                XGetInputFocus(dpy, &w, &di);
                if (mon >= 0 && mon < n)
        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
                XGetInputFocus(dpy, &w, &di);
                if (mon >= 0 && mon < n)


@@ -623,6 +664,7 @@ setup(void)
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);

+       XSetInputFocus(dpy, win, RevertToParent, CurrentTime);

        if (embed) {
                XSelectInput(dpy, parentwin, FocusChangeMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
        if (embed) {
                XSelectInput(dpy, parentwin, FocusChangeMask);
                if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {


@@ -688,6 +730,8 @@ main(int argc, char *argv[])
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
 
        if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);

+       if (!XSetLocaleModifiers(""))
+               fputs("warning: no locale modifiers support\n", stderr);

        if (!(dpy = XOpenDisplay(NULL)))
                die("cannot open display");
        screen = DefaultScreen(dpy);
        if (!(dpy = XOpenDisplay(NULL)))
                die("cannot open display");
        screen = DefaultScreen(dpy);