fix typo

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6ed025d..68fc9ff 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -19,8 +19,7 @@
 typedef struct Item Item;
 struct Item {
        char *text;
-       Item *next;          /* traverses all items */
-       Item *left, *right;  /* traverses matching items */
+       Item *left, *right;
 };
 
 static void appenditem(Item *item, Item **list, Item **last);
@@ -36,9 +35,8 @@ static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
-static void usage(void);
 
-static char text[BUFSIZ];
+static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 static int inputw = 0;
 static int lines = 0;
@@ -65,6 +63,7 @@ static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 int
 main(int argc, char *argv[]) {
+       Bool fast = False;
        int i;
 
        progname = "dmenu";
@@ -76,10 +75,12 @@ main(int argc, char *argv[]) {
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
+               else if(!strcmp(argv[i], "-f"))
+                       fast = True;
                else if(!strcmp(argv[i], "-i"))
                        fstrncmp = strncasecmp;
                else if(i == argc-1)
-                       usage();
+                       goto usage;
                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        lines = atoi(argv[++i]);
@@ -98,15 +99,27 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf"))
                        selfgcolor = argv[++i];
                else
-                       usage();
+                       goto usage;
 
        dc = initdc();
        initfont(dc, font);
-       readstdin();
-       setup();
+
+       if(fast) {
+               setup();
+               readstdin();
+       }
+       else {
+               readstdin();
+               setup();
+       }
+       match();
        run();
+       return EXIT_FAILURE;
 
-       return EXIT_FAILURE;  /* should not reach */
+usage:
+       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       return EXIT_FAILURE;
 }
 
 void
@@ -223,7 +236,7 @@ keypress(XKeyEvent *ev) {
 
        len = strlen(text);
        XLookupString(ev, buf, sizeof buf, &ksym, NULL);
-       if(ev->state & ControlMask) {
+       if(ev->state & ControlMask)
                switch(tolower(ksym)) {
                default:
                        return;
@@ -277,7 +290,6 @@ keypress(XKeyEvent *ev) {
                        XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
                        return;
                }
-       }
        switch(ksym) {
        default:
                if(!iscntrl(*buf))
@@ -341,7 +353,6 @@ keypress(XKeyEvent *ev) {
        case XK_Return:
        case XK_KP_Enter:
                fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
-               fflush(stdout);
                exit(EXIT_SUCCESS);
        case XK_Right:
                if(cursor < len) {
@@ -374,7 +385,7 @@ match(void) {
 
        len = strlen(text);
        matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(item = items; item; item = item->next)
+       for(item = items; item && item->text; item++)
                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))
@@ -403,7 +414,7 @@ match(void) {
                else
                        matches = lsubstr;
        }
-       curr = prev = next = sel = matches;
+       curr = sel = matches;
        calcoffsets();
 }
 
@@ -433,17 +444,17 @@ paste(void) {
 void
 readstdin(void) {
        char buf[sizeof text], *p;
-       Item *item, **end;
+       size_t i, size = 0;
 
-       for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+       for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
+               if(i+1 == size / sizeof *items || !items)
+                       if(!(items = realloc(items, (size += BUFSIZ))))
+                               eprintf("cannot realloc %u bytes:", size);
                if((p = strchr(buf, '\n')))
                        *p = '\0';
-               if(!(item = malloc(sizeof *item)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *item);
-               if(!(item->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-               item->next = item->left = item->right = NULL;
-               inputw = MAX(inputw, textw(dc, item->text));
+               if(!(items[i].text = strdup(buf)))
+                       eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+               inputw = MAX(inputw, textw(dc, items[i].text));
        }
 }
 
@@ -500,7 +511,7 @@ setup(void) {
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
-               for(i = 0; i < n; i++)
+               for(i = 0; i < n-1; i++)
                        if((monitor == info[i].screen_number)
                        || (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
                                break;
@@ -530,13 +541,4 @@ setup(void) {
        inputw = MIN(inputw, mw/3);
        promptw = prompt ? textw(dc, prompt) : 0;
        XMapRaised(dc->dpy, win);
-       text[0] = '\0';
-       match();
-}
-
-void
-usage(void) {
-       fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
-             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
-       exit(EXIT_FAILURE);
 }