Xinqi Bao's Git
projects
/
dmenu.git
/ commitdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
1654d6c
)
fast but inexact
author
Connor Lane Smith <
[email protected]
>
Sun, 15 May 2011 12:02:33 +0000
(13:02 +0100)
committer
Connor Lane Smith <
[email protected]
>
Sun, 15 May 2011 12:02:33 +0000
(13:02 +0100)
dmenu.c
patch
|
blob
|
history
diff --git
a/dmenu.c
b/dmenu.c
index
40b220c
..
1681a55
100644
(file)
--- a/
dmenu.c
+++ b/
dmenu.c
@@
-444,19
+444,22
@@
paste(void) {
void
readstdin(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) {
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);
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
}
void