all repos — dmenu @ 81bcf078f6c510314f140471efb8952160fdb3ad

my build of dmenu

made function signatures more consistent to my coding style
Anselm R. Garbe arg@10kloc.org
Tue, 12 Sep 2006 10:59:00 +0200
commit

81bcf078f6c510314f140471efb8952160fdb3ad

parent

0e5f467aa85e318ed27fc5d6d3826426a06ef3c3

3 files changed, 15 insertions(+), 30 deletions(-)

jump to
M draw.cdraw.c

@@ -10,8 +10,7 @@

/* static */ static unsigned int -textnw(const char *text, unsigned int len) -{ +textnw(const char *text, unsigned int len) { XRectangle r; if(dc.font.set) {

@@ -24,8 +23,7 @@

/* extern */ void -drawtext(const char *text, unsigned long col[ColLast]) -{ +drawtext(const char *text, unsigned long col[ColLast]) { int x, y, w, h; static char buf[256]; unsigned int len, olen;

@@ -78,8 +76,7 @@ }

} unsigned long -getcolor(const char *colstr) -{ +getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color;

@@ -88,8 +85,7 @@ return color.pixel;

} void -setfont(const char *fontstr) -{ +setfont(const char *fontstr) { char **missing, *def; int i, n;

@@ -137,7 +133,6 @@ dc.font.height = dc.font.ascent + dc.font.descent;

} unsigned int -textw(const char *text) -{ +textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; }
M main.cmain.c

@@ -42,8 +42,7 @@ static Window root;

static Window win; static void -calcoffsets() -{ +calcoffsets() { unsigned int tw, w; if(!curr)

@@ -71,8 +70,7 @@ }

} static void -drawmenu() -{ +drawmenu() { Item *i; dc.x = 0;

@@ -110,8 +108,7 @@ XFlush(dpy);

} static void -match(char *pattern) -{ +match(char *pattern) { unsigned int plen; Item *i, *j;

@@ -151,8 +148,7 @@ calcoffsets();

} static void -kpress(XKeyEvent * e) -{ +kpress(XKeyEvent * e) { char buf[32]; int num, prev_nitem; unsigned int i, len;

@@ -251,8 +247,7 @@ drawmenu();

} static char * -readstdin() -{ +readstdin() { static char *maxname = NULL; char *p, buf[1024]; unsigned int len = 0, max = 0;

@@ -289,8 +284,7 @@ Display *dpy;

DC dc = {0}; int -main(int argc, char *argv[]) -{ +main(int argc, char *argv[]) { char *maxname; fd_set rd; struct timeval timeout;
M util.cutil.c

@@ -13,16 +13,14 @@

/* static */ static void -badmalloc(unsigned int size) -{ +badmalloc(unsigned int size) { eprint("fatal: could not malloc() %u bytes\n", size); } /* extern */ void * -emalloc(unsigned int size) -{ +emalloc(unsigned int size) { void *res = malloc(size); if(!res) badmalloc(size);

@@ -30,8 +28,7 @@ return res;

} void -eprint(const char *errstr, ...) -{ +eprint(const char *errstr, ...) { va_list ap; va_start(ap, errstr);

@@ -41,8 +38,7 @@ exit(EXIT_FAILURE);

} char * -estrdup(const char *str) -{ +estrdup(const char *str) { void *res = strdup(str); if(!res) badmalloc(strlen(str));