kske/dmenu
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Connor Lane Smith 2011-05-15 13:58:54 +01:00
parent f5bd1eed8d
commit fb67bd666e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dmenu.c
View File

@ -38,7 +38,7 @@ static void setup(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 lines = 0;
static int monitor = -1; static int monitor = -1;
static int promptw; static int promptw;
@ -78,7 +78,7 @@ main(int argc, char *argv[]) {
fast = True; fast = True;
else if(!strcmp(argv[i], "-i")) else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp; fstrncmp = strncasecmp;
else if(i == argc-1) else if(i+1 == argc)
goto usage; goto usage;
/* double flags */ /* double flags */
else if(!strcmp(argv[i], "-l")) else if(!strcmp(argv[i], "-l"))
@ -220,9 +220,9 @@ void
insert(const char *s, ssize_t n) { insert(const char *s, ssize_t n) {
if(strlen(text) + n > sizeof text - 1) if(strlen(text) + n > sizeof text - 1)
return; 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; cursor += n;
match(); match();
} }
@ -458,8 +458,7 @@ readstdin(void) {
if(strlen(items[i].text) > max) if(strlen(items[i].text) > max)
max = strlen(maxstr = items[i].text); max = strlen(maxstr = items[i].text);
} }
if(maxstr) inputw = maxstr ? textw(dc, maxstr) : 0;
inputw = textw(dc, maxstr);
} }
void void