cleanup

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 2193f82..cf5e4a6 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);


@@ -39,7 +38,7 @@ static void setup(void);
 
 static char text[BUFSIZ] = "";
 static int bh, mw, mh;
 
 static char text[BUFSIZ] = "";
 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;


@@ -56,8 +55,8 @@ 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;
 static Window root, win;
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;


@@ -67,7 +66,6 @@ main(int argc, char *argv[]) {
        Bool fast = False;
        int i;
 
        Bool fast = False;
        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")) {


@@ -76,11 +74,11 @@ 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], "-i"))
-                       fstrncmp = strncasecmp;

                else if(!strcmp(argv[i], "-f"))
                        fast = True;
                else if(!strcmp(argv[i], "-f"))
                        fast = True;

-               else if(i == argc-1)
+               else if(!strcmp(argv[i], "-i"))
+                       fstrncmp = strncasecmp;
+               else if(i+1 == argc)

                        goto usage;
                /* double flags */
                else if(!strcmp(argv[i], "-l"))
                        goto usage;
                /* double flags */
                else if(!strcmp(argv[i], "-l"))


@@ -222,9 +220,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();
 }


@@ -309,12 +307,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);


@@ -381,12 +382,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))


@@ -396,24 +396,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();


@@ -421,9 +422,8 @@ match(void) {
 
 size_t
 nextrune(int incr) {
 
 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;
 }


@@ -444,18 +444,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 = calloc(1, sizeof *item)))
-                       eprintf("cannot malloc %u bytes:", sizeof *item);
-               if(!(item->text = strdup(buf)))
+               if(!(items[i].text = strdup(buf)))

                        eprintf("cannot strdup %u bytes:", strlen(buf)+1);
                        eprintf("cannot strdup %u bytes:", strlen(buf)+1);

-               inputw = MAX(inputw, textw(dc, item->text));
+               if(strlen(items[i].text) > max)
+                       max = strlen(maxstr = items[i].text);

        }
        }

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

 }
 
 void
 }
 
 void


@@ -511,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;