apply nibble patch removing per-item length limit

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6177906..f6552aa 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -394,6 +394,14 @@ kpress(XKeyEvent * e) {
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;
                switch (ksym) {
                default:        /* ignore other control sequences */
                        return;

+               case XK_a:
+               case XK_A:
+                       cursor = 0;
+                       break;
+               case XK_e:
+               case XK_E:
+                       cursor = strlen(text);
+                       break;

                case XK_c:
                case XK_C:
                        ksym = XK_Escape;
                case XK_c:
                case XK_C:
                        ksym = XK_Escape;


@@ -614,24 +622,31 @@ match(char *pattern) {
 void
 readstdin(void) {
        char *p, buf[1024];
 void
 readstdin(void) {
        char *p, buf[1024];

-       unsigned int len = 0, max = 0;
+       unsigned int len = 0, blen = 0, max = 0;

        Item *i, *new;
 
        Item *i, *new;
 

-       i = NULL;
+       i = 0, p = NULL;

        while(fgets(buf, sizeof buf, stdin)) {
        while(fgets(buf, sizeof buf, stdin)) {

-               len = strlen(buf);
-               if(buf[len-1] == '\n')
-                       buf[--len] = '\0';
-               if(!(p = strdup(buf)))
-                       eprint("fatal: could not strdup() %u bytes\n", len);
+               len += (blen = strlen(buf));
+               if(!(p = realloc(p, len))) {
+                       eprint("fatal: could not realloc() %u bytes\n", len);
+                       return;
+               }
+               memcpy (p + len - blen, buf, blen);
+               if (p[len - 1] == '\n')
+                       p[len - 1] = 0;
+               else if (!feof(stdin))
+                       continue;

                if(max < len) {
                        maxname = p;
                        max = len;
                }
                if(max < len) {
                        maxname = p;
                        max = len;
                }

+               len = 0;

                if(!(new = (Item *)malloc(sizeof(Item))))
                        eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;
                if(!(new = (Item *)malloc(sizeof(Item))))
                        eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
                new->next = new->left = new->right = NULL;
                new->text = p;

+               p = NULL;

                if(!i)
                        allitems = new;
                else 
                if(!i)
                        allitems = new;
                else 


@@ -768,6 +783,9 @@ 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], "-e")) {
+                       if(++i < argc) root = atoi(argv[i]);
+               }

                else if(!strcmp(argv[i], "-l")) {
                        vlist = True;
                        calcoffsets = calcoffsetsv;
                else if(!strcmp(argv[i], "-l")) {
                        vlist = True;
                        calcoffsets = calcoffsetsv;


@@ -801,7 +819,8 @@ main(int argc, char *argv[]) {
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);
        if(!(dpy = XOpenDisplay(NULL)))
                eprint("dmenu: cannot open display\n");
        screen = DefaultScreen(dpy);

-       root = RootWindow(dpy, screen);
+       if(!root)
+               root = RootWindow(dpy, screen);

 
        if(isatty(STDIN_FILENO)) {
                readstdin();
 
        if(isatty(STDIN_FILENO)) {
                readstdin();