updated version

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index f151819..51fa20f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -29,7 +29,7 @@ static int mx, my, mw, mh;
 static int ret = 0;
 static int nitem = 0;
 static unsigned int cmdw = 0;
-static Bool done = False;
+static Bool running = True;
 static Item *allitems = NULL;  /* first of all items */
 static Item *item = NULL;      /* first of pattern matching items */
 static Item *sel = NULL;
@@ -77,39 +77,38 @@ drawmenu()
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
-       drawtext(NULL, False, False);
+       drawtext(NULL, dc.norm);
 
        /* print command */
        if(cmdw && item)
                dc.w = cmdw;
-       drawtext(text[0] ? text : NULL, False, False);
+       drawtext(text[0] ? text : NULL, dc.norm);
        dc.x += cmdw;
 
        if(curr) {
                dc.w = SPACE;
-               drawtext((curr && curr->left) ? "<" : NULL, False, False);
+               drawtext((curr && curr->left) ? "<" : NULL, dc.norm);
                dc.x += dc.w;
 
                /* 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;
-                       drawtext(i->text, sel == i, sel == i);
+                       drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
                        dc.x += dc.w;
                }
 
                dc.x = mw - SPACE;
                dc.w = SPACE;
-               drawtext(next ? ">" : NULL, False, False);
+               drawtext(next ? ">" : NULL, dc.norm);
        }
        XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0);
        XFlush(dpy);
 }
 
 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))
@@ -222,20 +219,20 @@ kpress(XKeyEvent * e)
                else if(text)
                        fprintf(stdout, "%s", text);
                fflush(stdout);
-               done = True;
+               running = False;
                break;
        case XK_Escape:
                ret = 1;
-               done = True;
+               running = False;
                break;
        case XK_BackSpace:
                if((i = len)) {
                        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];
@@ -293,6 +290,7 @@ int
 main(int argc, char *argv[])
 {
        char *maxname;
+       Item *i;
        XEvent ev;
        XSetWindowAttributes wa;
 
@@ -309,7 +307,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,
@@ -317,9 +315,10 @@ main(int argc, char *argv[])
                usleep(1000);
 
        /* style */
-       dc.bg = getcolor(BGCOLOR);
-       dc.fg = getcolor(FGCOLOR);
-       dc.border = getcolor(BORDERCOLOR);
+       dc.sel[ColBG] = getcolor(SELBGCOLOR);
+       dc.sel[ColFG] = getcolor(SELFGCOLOR);
+       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
        setfont(FONT);
 
        wa.override_redirect = 1;
@@ -328,7 +327,7 @@ main(int argc, char *argv[])
 
        mx = my = 0;
        mw = DisplayWidth(dpy, screen);
-       mh = dc.font.height + 4;
+       mh = dc.font.height + 2;
 
        win = XCreateWindow(dpy, root, mx, my, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
@@ -339,6 +338,7 @@ main(int argc, char *argv[])
        /* pixmap */
        dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
 
        if(maxname)
                cmdw = textw(maxname);
@@ -346,13 +346,13 @@ main(int argc, char *argv[])
                cmdw = mw / 3;
 
        text[0] = 0;
-       input(text);
+       match(text);
        XMapRaised(dpy, win);
        drawmenu();
        XSync(dpy, False);
 
        /* main event loop */
-       while(!done && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {
                case KeyPress:
                        kpress(&ev.xkey);
@@ -367,6 +367,16 @@ main(int argc, char *argv[])
        }
 
        XUngrabKeyboard(dpy, CurrentTime);
+       while(allitems) {
+               i = allitems->next;
+               free(allitems->text);
+               free(allitems);
+               allitems = i;
+       }
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       else
+               XFreeFont(dpy, dc.font.xfont);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XDestroyWindow(dpy, win);