changed Backspace/C-w behavior (now it only removes a single character)

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 3ac1c91..b733feb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -108,8 +108,15 @@ drawmenu(void) {
        XFlush(dpy);
 }
 
+static void
+grabkeyboard(void) {
+       while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
+                        GrabModeAsync, CurrentTime) != GrabSuccess)
+               usleep(1000);
+}
+
 static unsigned long
-getcolor(const char *colstr) {
+initcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
@@ -282,12 +289,8 @@ kpress(XKeyEvent * e) {
                }
                break;
        case XK_BackSpace:
-               if((i = len)) {
-                       prev_nitem = nitem;
-                       do {
-                               text[--i] = 0;
-                               match(text);
-                       } while(i && nitem && prev_nitem == nitem);
+               if(len) {
+                       text[--len] = 0;
                        match(text);
                }
                break;
@@ -418,10 +421,6 @@ main(int argc, char *argv[]) {
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
 
-       if(isatty(STDIN_FILENO)) {
-               fputs("error: dmenu can't run in an interactive shell\n", stdout);
-               usage();
-       }
        /* command line args */
        for(i = 1; i < argc; i++)
                if(!strncmp(argv[i], "-b", 3)) {
@@ -455,10 +454,14 @@ main(int argc, char *argv[]) {
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
-       while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
-                        GrabModeAsync, CurrentTime) != GrabSuccess)
-               usleep(1000);
-       maxname = readstdin();
+       if(isatty(STDIN_FILENO)) {
+               maxname = readstdin();
+               grabkeyboard();
+       }
+       else { /* prevent keypress loss */
+               grabkeyboard();
+               maxname = readstdin();
+       }
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
        for (i = 0; i < 8; i++) {
@@ -470,10 +473,10 @@ main(int argc, char *argv[]) {
        }
        XFreeModifiermap(modmap);
        /* style */
-       dc.norm[ColBG] = getcolor(normbg);
-       dc.norm[ColFG] = getcolor(normfg);
-       dc.sel[ColBG] = getcolor(selbg);
-       dc.sel[ColFG] = getcolor(selfg);
+       dc.norm[ColBG] = initcolor(normbg);
+       dc.norm[ColFG] = initcolor(normfg);
+       dc.sel[ColBG] = initcolor(selbg);
+       dc.sel[ColFG] = initcolor(selfg);
        initfont(font);
        /* menu window */
        wa.override_redirect = 1;