X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/13ef97e65ea5a713a3d5ab46916d1ac6d071b825..b661ca75deda910fbbba38970b58a867c13a59a0:/draw.c diff --git a/draw.c b/draw.c index d0f21cd..68b8cb7 100644 --- a/draw.c +++ b/draw.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 @@ textnw(const char *text, unsigned int len) /* 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,18 +76,17 @@ drawtext(const char *text, unsigned long col[ColLast]) } unsigned long -getcolor(const char *colstr) -{ +getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; - XAllocNamedColor(dpy, cmap, colstr, &color, &color); + if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) + eprint("error, cannot allocate color '%s'\n", colstr); return color.pixel; } void -setfont(const char *fontstr) -{ +setfont(const char *fontstr) { char **missing, *def; int i, n; @@ -137,7 +134,6 @@ setfont(const char *fontstr) } unsigned int -textw(const char *text) -{ +textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; }