instant ^E

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index d8ef88f..b6f1ef2 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -19,8 +19,7 @@
 typedef struct Item Item;
 struct Item {
        char *text;
 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);
 };
 
 static void appenditem(Item *item, Item **list, Item **last);


@@ -56,14 +55,15 @@ static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;

-static Item *matches, *sel;
-static Item *prev, *curr, *next;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;

 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 int
 main(int argc, char *argv[]) {
 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 int
 main(int argc, char *argv[]) {

+       Bool fast = False;

        int i;
 
        progname = "dmenu";
        int i;
 
        progname = "dmenu";


@@ -75,6 +75,8 @@ main(int argc, char *argv[]) {
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                }
                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)
                else if(!strcmp(argv[i], "-i"))
                        fstrncmp = strncasecmp;
                else if(i == argc-1)


@@ -101,13 +103,21 @@ main(int argc, char *argv[]) {
 
        dc = initdc();
        initfont(dc, font);
 
        dc = initdc();
        initfont(dc, font);

-       readstdin();
-       setup();
+
+       if(fast) {
+               setup();
+               readstdin();
+       }
+       else {
+               readstdin();
+               setup();
+       }
+       match();

        run();
        return EXIT_FAILURE;
 
 usage:
        run();
        return EXIT_FAILURE;
 
 usage:

-       fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+       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;
 }
              "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
        return EXIT_FAILURE;
 }


@@ -298,12 +308,15 @@ keypress(XKeyEvent *ev) {
                        cursor = len;
                        break;
                }
                        cursor = len;
                        break;
                }

-               while(next) {
-                       sel = curr = next;
+               if(next) {
+                       curr = matchend;

                        calcoffsets();
                        calcoffsets();

+                       curr = prev;
+                       calcoffsets();
+                       while(next && (curr = curr->right))
+                               calcoffsets();

                }
                }

-               while(sel && sel->right)
-                       sel = sel->right;
+               sel = matchend;

                break;
        case XK_Escape:
                exit(EXIT_FAILURE);
                break;
        case XK_Escape:
                exit(EXIT_FAILURE);


@@ -371,11 +384,11 @@ keypress(XKeyEvent *ev) {
 void
 match(void) {
        size_t len;
 void
 match(void) {
        size_t len;

-       Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+       Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;

 
        len = strlen(text);
 
        len = strlen(text);

-       matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(item = items; item; item = item->next)
+       matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
+       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))
                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))


@@ -385,24 +398,25 @@ match(void) {
 
        if(lexact) {
                matches = lexact;
 
        if(lexact) {
                matches = lexact;

-               itemend = exactend;
+               matchend = exactend;

        }
        if(lprefix) {
        }
        if(lprefix) {

-               if(itemend) {
-                       itemend->right = lprefix;
-                       lprefix->left = itemend;
+               if(matchend) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;

                }
                else
                        matches = lprefix;
                }
                else
                        matches = lprefix;

-               itemend = prefixend;
+               matchend = prefixend;

        }
        if(lsubstr) {
        }
        if(lsubstr) {

-               if(itemend) {
-                       itemend->right = lsubstr;
-                       lsubstr->left = itemend;
+               if(matchend) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;

                }
                else
                        matches = lsubstr;
                }
                else
                        matches = lsubstr;

+               matchend = substrend;

        }
        curr = sel = matches;
        calcoffsets();
        }
        curr = sel = matches;
        calcoffsets();


@@ -434,16 +448,17 @@ paste(void) {
 void
 readstdin(void) {
        char buf[sizeof text], *p;
 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((p = strchr(buf, '\n')))
                        *p = '\0';

-               if(!(item = calloc(1, sizeof *item)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *item);
-               if(!(item->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-               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 +515,7 @@ setup(void) {
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                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;
                        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,5 +545,4 @@ setup(void) {
        inputw = MIN(inputw, mw/3);
        promptw = prompt ? textw(dc, prompt) : 0;
        XMapRaised(dc->dpy, win);
        inputw = MIN(inputw, mw/3);
        promptw = prompt ? textw(dc, prompt) : 0;
        XMapRaised(dc->dpy, win);

-       match();

 }
 }