[hackers] [dmenu] drw: cleanup drw_text, prevent gcc warning false-positive of unused var || Hiltjo Posthuma

From: <git_AT_suckless.org>
Date: Tue, 20 Oct 2015 23:04:13 +0200 (CEST)

commit 44b242c76359e21b97418675f253d45feb7c04e0
Author: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
AuthorDate: Tue Oct 20 22:56:57 2015 +0200
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Tue Oct 20 22:56:57 2015 +0200

    drw: cleanup drw_text, prevent gcc warning false-positive of unused var
    
    ... we don't allow passing text is NULL anymore either, for that behaviour
    just use drw_rect() (it is used in dwm).

diff --git a/drw.c b/drw.c
index 4364117..80e3c39 100644
--- a/drw.c
+++ b/drw.c
_AT_@ -224,9 +224,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
         char buf[1024];
         int tx, ty, th;
         Extnts tex;
- Colormap cmap;
- Visual *vis;
- XftDraw *d;
+ XftDraw *d = NULL;
         Fnt *curfont, *nextfont;
         size_t i, len;
         int utf8strlen, utf8charlen, render;
_AT_@ -238,22 +236,18 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
         XftResult result;
         int charexists = 0;
 
- if (!(render = x || y || w || h))
- w = ~w;
-
- if (!drw || !drw->scheme) {
+ if (!drw->scheme || !drw->fontcount)
                 return 0;
- } else if (render) {
- XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
- XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
- }
 
- if (!text || !drw->fontcount) {
- return 0;
- } else if (render) {
- cmap = DefaultColormap(drw->dpy, drw->screen);
- vis = DefaultVisual(drw->dpy, drw->screen);
- d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
+ if (!(render = x || y || w || h)) {
+ w = ~w;
+ } else {
+ XSetForeground(drw->dpy, drw->gc, invert ?
+ drw->scheme->fg->pix : drw->scheme->bg->pix);
+ XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+ d = XftDrawCreate(drw->dpy, drw->drawable,
+ DefaultVisual(drw->dpy, drw->screen),
+ DefaultColormap(drw->dpy, drw->screen));
         }
 
         curfont = drw->fonts[0];
_AT_@ -325,7 +319,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                         if (!drw->fonts[0]->pattern) {
                                 /* Refer to the comment in drw_font_xcreate for more
                                  * information. */
- die("The first font in the cache must be loaded from a font string.\n");
+ die("the first font in the cache must be loaded from a font string.\n");
                         }
 
                         fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
_AT_@ -344,14 +338,13 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
                                 if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
                                         drw->fonts[drw->fontcount++] = curfont;
                                 } else {
- if (curfont)
- drw_font_free(curfont);
+ drw_font_free(curfont);
                                         curfont = drw->fonts[0];
                                 }
                         }
                 }
         }
- if (render)
+ if (d)
                 XftDrawDestroy(d);
 
         return x;
Received on Tue Oct 20 2015 - 23:04:13 CEST