readded border colors, this sucks least

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index f151819..3b9a24b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -92,7 +92,6 @@ drawmenu()
 
                /* determine maximum items */
                for(i = curr; i != next; i=i->right) {
-                       dc.border = False;
                        dc.w = textw(i->text);
                        if(dc.w > mw / 3)
                                dc.w = mw / 3;
@@ -109,7 +108,7 @@ drawmenu()
 }
 
 static void
-input(char *pattern)
+match(char *pattern)
 {
        unsigned int plen;
        Item *i, *j;
@@ -173,18 +172,16 @@ kpress(XKeyEvent * e)
                        return;
                        break;
                case XK_h:
+               case XK_H:
                        ksym = XK_BackSpace;
                        break;
-               case XK_U:
                case XK_u:
+               case XK_U:
                        text[0] = 0;
-                       input(text);
+                       match(text);
                        drawmenu();
                        return;
                        break;
-               case XK_bracketleft:
-                       ksym = XK_Escape;
-                       break;
                }
        }
        switch(ksym) {
@@ -201,7 +198,7 @@ kpress(XKeyEvent * e)
                if(!sel)
                        return;
                strncpy(text, sel->text, sizeof(text));
-               input(text);
+               match(text);
                break;
        case XK_Right:
                if(!(sel && sel->right))
@@ -233,9 +230,9 @@ kpress(XKeyEvent * e)
                        prev_nitem = nitem;
                        do {
                                text[--i] = 0;
-                               input(text);
+                               match(text);
                        } while(i && nitem && prev_nitem == nitem);
-                       input(text);
+                       match(text);
                }
                break;
        default:
@@ -245,14 +242,14 @@ kpress(XKeyEvent * e)
                                strncat(text, buf, sizeof(text));
                        else
                                strncpy(text, buf, sizeof(text));
-                       input(text);
+                       match(text);
                }
        }
        drawmenu();
 }
 
 static char *
-readinput()
+readstdin()
 {
        static char *maxname = NULL;
        char *p, buf[1024];
@@ -309,7 +306,7 @@ main(int argc, char *argv[])
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
-       maxname = readinput();
+       maxname = readstdin();
 
        /* grab as early as possible, but after reading all items!!! */
        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
@@ -346,7 +343,7 @@ main(int argc, char *argv[])
                cmdw = mw / 3;
 
        text[0] = 0;
-       input(text);
+       match(text);
        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);