From f5bd1eed8d746414f5fbf9645124ccd54a095386 Mon Sep 17 00:00:00 2001 From: Connor Lane Smith Date: Sun, 15 May 2011 13:02:33 +0100 Subject: fast but inexact --- dmenu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dmenu.c b/dmenu.c index 40b220c..1681a55 100644 --- a/dmenu.c +++ b/dmenu.c @@ -444,19 +444,22 @@ paste(void) { void readstdin(void) { - char buf[sizeof text], *p; - size_t i, size = 0; + char buf[sizeof text], *p, *maxstr = NULL; + size_t i, max = 0, size = 0; for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) { - if(i+1 == size / sizeof *items || !items) + 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(!(items[i].text = strdup(buf))) eprintf("cannot strdup %u bytes:", strlen(buf)+1); - inputw = MAX(inputw, textw(dc, items[i].text)); + if(strlen(items[i].text) > max) + max = strlen(maxstr = items[i].text); } + if(maxstr) + inputw = textw(dc, maxstr); } void -- cgit v1.2.3-13-gbd6f