applied a change made by Uriel to dmenu (though I didn't applied everything)

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 3b9a24b..77a61b9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
+#include <sys/time.h>
 #include <X11/cursorfont.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
@@ -29,7 +31,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;
@@ -40,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
-{
+calcoffsets(void) {
        unsigned int tw, w;
 
        if(!curr)
@@ -69,25 +70,24 @@ calcoffsets()
 }
 
 static void
-drawmenu()
-{
+drawmenu(void) {
        Item *i;
 
        dc.x = 0;
        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 */
@@ -95,21 +95,20 @@ drawmenu()
                        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
-match(char *pattern)
-{
+match(char *pattern) {
        unsigned int plen;
        Item *i, *j;
 
@@ -121,19 +120,8 @@ match(char *pattern)
        nitem = 0;
 
        for(i = allitems; i; i=i->next)
-               if(!plen || !strncmp(pattern, i->text, plen)) {
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
-               }
-       for(i = allitems; i; i=i->next)
-               if(plen && strncmp(pattern, i->text, plen)
-                               && strstr(i->text, pattern)) {
+               if(plen ? !strncmp(pattern, i->text, plen) :
+                               strncmp(pattern, i->text, plen) && strstr(i->text, pattern)) {
                        if(!j)
                                item = i;
                        else
@@ -149,8 +137,7 @@ match(char *pattern)
 }
 
 static void
-kpress(XKeyEvent * e)
-{
+kpress(XKeyEvent * e) {
        char buf[32];
        int num, prev_nitem;
        unsigned int i, len;
@@ -210,20 +197,18 @@ kpress(XKeyEvent * e)
                }
                break;
        case XK_Return:
-               if(e->state & ShiftMask) {
-                       if(text)
-                               fprintf(stdout, "%s", text);
-               }
+               if((e->state & ShiftMask) && text)
+                       fprintf(stdout, "%s", text);
                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                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)) {
@@ -249,8 +234,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
-readstdin()
-{
+readstdin(void) {
        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
@@ -287,9 +271,11 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
        char *maxname;
+       fd_set rd;
+       struct timeval timeout;
+       Item *i;
        XEvent ev;
        XSetWindowAttributes wa;
 
@@ -306,17 +292,28 @@ main(int argc, char *argv[])
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
-       maxname = readstdin();
-
-       /* grab as early as possible, but after reading all items!!! */
+       /* Note, the select() construction allows to grab all keypresses as
+        * early as possible, to not loose them. But if there is no standard
+        * input supplied, we will make sure to exit after MAX_WAIT_STDIN
+        * seconds. This is convenience behavior for rapid typers.
+        */ 
        while(XGrabKeyboard(dpy, root, True, GrabModeAsync,
                         GrabModeAsync, CurrentTime) != GrabSuccess)
                usleep(1000);
 
+       timeout.tv_usec = 0;
+       timeout.tv_sec = STDIN_TIMEOUT;
+       FD_ZERO(&rd);
+       FD_SET(STDIN_FILENO, &rd);
+       if(select(ConnectionNumber(dpy) + 1, &rd, NULL, NULL, &timeout) < 1)
+               goto UninitializedEnd;
+       maxname = readstdin();
+
        /* 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;
@@ -325,7 +322,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,
@@ -336,6 +333,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);
@@ -349,8 +347,10 @@ main(int argc, char *argv[])
        XSync(dpy, False);
 
        /* main event loop */
-       while(!done && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev)) {
                switch (ev.type) {
+               default:        /* ignore all crap */
+                       break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;
@@ -358,15 +358,24 @@ main(int argc, char *argv[])
                        if(ev.xexpose.count == 0)
                                drawmenu();
                        break;
-               default:
-                       break;
                }
        }
 
-       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);
+UninitializedEnd:
+       XUngrabKeyboard(dpy, CurrentTime);
        XCloseDisplay(dpy);
 
        return ret;