git clone dmenu dmenu Log gph
Found at: gopher.r-36.net:70/scm/dmenu/commit/210b303941e517a9d7df1cba1e3229165fb4037b.gph
tparing - dmenu - Dmenu fork with xft fonts.
git clone git://r-36.net/dmenu
---
commit 210b303941e517a9d7df1cba1e3229165fb4037b
parent 47e3e8be7b7df3ed37929dab8941f71cbee19fa9
Date: Thu, 5 May 2011 15:46:48 +0100
paring
Diffstat:
dmenu.c | 30 +++++++++++-------------------
draw.c | 7 ++-----
2 files changed, 13 insertions(+), 24 deletions(-)
---
diff --git a/dmenu.c b/dmenu.c
t@@ -36,9 +36,8 @@ static void paste(void);
static void readstdin(void);
static void run(void);
static void setup(void);
-static void usage(void);
-static char text[BUFSIZ];
+static char text[BUFSIZ] = "";
static int bh, mw, mh;
static int inputw = 0;
static int lines = 0;
t@@ -79,7 +78,7 @@ main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
else if(i == argc-1)
- usage();
+ goto usage;
/* double flags */
else if(!strcmp(argv[i], "-l"))
lines = atoi(argv[++i]);
t@@ -98,15 +97,19 @@ main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-sf"))
selfgcolor = argv[++i];
else
- usage();
+ goto usage;
dc = initdc();
initfont(dc, font);
readstdin();
setup();
run();
+ return EXIT_FAILURE;
- return EXIT_FAILURE; /* should not reach */
+usage:
+ fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
+ " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+ return EXIT_FAILURE;
}
void
t@@ -223,7 +226,7 @@ keypress(XKeyEvent *ev) {
len = strlen(text);
XLookupString(ev, buf, sizeof buf, &ksym, NULL);
- if(ev->state & ControlMask) {
+ if(ev->state & ControlMask)
switch(tolower(ksym)) {
default:
return;
t@@ -277,7 +280,6 @@ keypress(XKeyEvent *ev) {
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
return;
}
- }
switch(ksym) {
default:
if(!iscntrl(*buf))
t@@ -341,7 +343,6 @@ keypress(XKeyEvent *ev) {
case XK_Return:
case XK_KP_Enter:
fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
- fflush(stdout);
exit(EXIT_SUCCESS);
case XK_Right:
if(cursor < len) {
t@@ -403,7 +404,7 @@ match(void) {
else
matches = lsubstr;
}
- curr = prev = next = sel = matches;
+ curr = sel = matches;
calcoffsets();
}
t@@ -438,11 +439,10 @@ readstdin(void) {
for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
if((p = strchr(buf, '\n')))
*p = '\0';
- if(!(item = malloc(sizeof *item)))
+ if(!(item = calloc(1, sizeof *item)))
eprintf("cannot malloc %u bytes\n", sizeof *item);
if(!(item->text = strdup(buf)))
eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
- item->next = item->left = item->right = NULL;
inputw = MAX(inputw, textw(dc, item->text));
}
}
t@@ -530,13 +530,5 @@ setup(void) {
inputw = MIN(inputw, mw/3);
promptw = prompt ? textw(dc, prompt) : 0;
XMapRaised(dc->dpy, win);
- text[0] = '\0';
match();
}
-
-void
-usage(void) {
- fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n"
- " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
- exit(EXIT_FAILURE);
-}
t@@ -100,16 +100,13 @@ initdc(void) {
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
weprintf("no locale support\n");
- if(!(dc = malloc(sizeof *dc)))
+ if(!(dc = calloc(1, sizeof *dc)))
eprintf("cannot malloc %u bytes\n", sizeof *dc);
if(!(dc->dpy = XOpenDisplay(NULL)))
eprintf("cannot open display\n");
dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
- dc->font.xfont = NULL;
- dc->font.set = NULL;
- dc->canvas = None;
return dc;
}
t@@ -187,7 +184,7 @@ void
weprintf(const char *fmt, ...) {
va_list ap;
- fprintf(stderr, "%s: warning: ", progname);
+ fprintf(stderr, "%s: ", progname);
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
.