match first

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index a24dfe3..d0ed966 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);


@@ -36,11 +35,10 @@ static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(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 bh, mw, mh;

-static int inputw = 0;
+static int inputw;

 static int lines = 0;
 static int monitor = -1;
 static int promptw;
 static int lines = 0;
 static int monitor = -1;
 static int promptw;


@@ -57,29 +55,31 @@ 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 Window root, win;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;

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

+       Bool fast = False;

        int i;
 
        int i;
 

-       progname = "dmenu";

        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {
        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {

-                       fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
+                       fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout);

                        exit(EXIT_SUCCESS);
                }
                else if(!strcmp(argv[i], "-b"))
                        topbar = False;
                        exit(EXIT_SUCCESS);
                }
                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(!strcmp(argv[i], "-i"))
                        fstrncmp = strncasecmp;

-               else if(i == argc-1)
-                       usage();
+               else if(i+1 == argc)
+                       goto usage;

                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        lines = atoi(argv[++i]);
                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        lines = atoi(argv[++i]);


@@ -98,15 +98,27 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf"))
                        selfgcolor = argv[++i];
                else
                else if(!strcmp(argv[i], "-sf"))
                        selfgcolor = argv[++i];
                else

-                       usage();
+                       goto usage;

 
        dc = initdc();
        initfont(dc, font);
 
        dc = initdc();
        initfont(dc, font);

-       readstdin();
+
+       if(fast) {
+               grabkeyboard();
+               readstdin();
+       }
+       else {
+               readstdin();
+               grabkeyboard();
+       }

        setup();
        run();
        setup();
        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
 }
 
 void


@@ -197,7 +209,8 @@ grabkeyboard(void) {
        int i;
 
        for(i = 0; i < 1000; i++) {
        int i;
 
        for(i = 0; i < 1000; i++) {

-               if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+               if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                usleep(1000);
        }
                        return;
                usleep(1000);
        }


@@ -208,9 +221,9 @@ void
 insert(const char *s, ssize_t n) {
        if(strlen(text) + n > sizeof text - 1)
                return;
 insert(const char *s, ssize_t n) {
        if(strlen(text) + n > sizeof text - 1)
                return;

-       memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+       memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));

        if(n > 0)
        if(n > 0)

-               memcpy(text + cursor, s, n);
+               memcpy(&text[cursor], s, n);

        cursor += n;
        match();
 }
        cursor += n;
        match();
 }


@@ -223,7 +236,7 @@ keypress(XKeyEvent *ev) {
 
        len = strlen(text);
        XLookupString(ev, buf, sizeof buf, &ksym, NULL);
 
        len = strlen(text);
        XLookupString(ev, buf, sizeof buf, &ksym, NULL);

-       if(ev->state & ControlMask) {
+       if(ev->state & ControlMask)

                switch(tolower(ksym)) {
                default:
                        return;
                switch(tolower(ksym)) {
                default:
                        return;


@@ -277,7 +290,6 @@ keypress(XKeyEvent *ev) {
                        XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
                        return;
                }
                        XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
                        return;
                }

-       }

        switch(ksym) {
        default:
                if(!iscntrl(*buf))
        switch(ksym) {
        default:
                if(!iscntrl(*buf))


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

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

                        calcoffsets();
                        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);


@@ -341,7 +356,6 @@ keypress(XKeyEvent *ev) {
        case XK_Return:
        case XK_KP_Enter:
                fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
        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) {
                exit(EXIT_SUCCESS);
        case XK_Right:
                if(cursor < len) {


@@ -369,12 +383,11 @@ keypress(XKeyEvent *ev) {
 
 void
 match(void) {
 
 void
 match(void) {

-       size_t len;
-       Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+       size_t len = strlen(text);
+       Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;

 
 

-       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))


@@ -384,34 +397,34 @@ 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 = prev = next = sel = matches;
+       curr = sel = matches;

        calcoffsets();
 }
 
 size_t
 nextrune(int incr) {
        calcoffsets();
 }
 
 size_t
 nextrune(int incr) {

-       size_t n, len;
+       size_t n, len = strlen(text);

 
 

-       len = strlen(text);

        for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
        return n;
 }
        for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
        return n;
 }


@@ -432,19 +445,21 @@ paste(void) {
 
 void
 readstdin(void) {
 
 void
 readstdin(void) {

-       char buf[sizeof text], *p;
-       Item *item, **end;
+       char buf[sizeof text], *p, *maxstr = NULL;
+       size_t i, max = 0, 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)
+                       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 = 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);
+               if(strlen(items[i].text) > max)
+                       max = strlen(maxstr = items[i].text);

        }
        }

+       inputw = maxstr ? textw(dc, maxstr) : 0;

 }
 
 void
 }
 
 void


@@ -473,22 +488,21 @@ run(void) {
 
 void
 setup(void) {
 
 void
 setup(void) {

-       int x, y, screen;
+       int x, y, screen = DefaultScreen(dc->dpy);
+       Window root = RootWindow(dc->dpy, screen);

        XSetWindowAttributes wa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 
        XSetWindowAttributes wa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 

-       screen = DefaultScreen(dc->dpy);
-       root = RootWindow(dc->dpy, screen);
-       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
-

        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);
        selcol[ColBG] = getcolor(dc, selbgcolor);
        selcol[ColFG] = getcolor(dc, selfgcolor);
 
        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);
        selcol[ColBG] = getcolor(dc, selbgcolor);
        selcol[ColFG] = getcolor(dc, selfgcolor);
 

+       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+

        /* menu geometry */
        bh = dc->font.height + 2;
        lines = MAX(lines, 0);
        /* menu geometry */
        bh = dc->font.height + 2;
        lines = MAX(lines, 0);


@@ -500,7 +514,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;


@@ -516,6 +530,10 @@ setup(void) {
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }

+       inputw = MIN(inputw, mw/3);
+       promptw = prompt ? textw(dc, prompt) : 0;
+       match();
+

        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;


@@ -525,18 +543,7 @@ setup(void) {
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       grabkeyboard();
-       resizedc(dc, mw, mh);
-       inputw = MIN(inputw, mw/3);
-       promptw = prompt ? textw(dc, prompt) : 0;

        XMapRaised(dc->dpy, win);
        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);
+       resizedc(dc, mw, mh);
+       drawmenu();

 }
 }