minor update, tab to space

[dwm.git] / drw.c

diff --git a/drw.c b/drw.c
index 319eb6b..cf8b37a 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
 }
 
 Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
 {
        Drw *drw = ecalloc(1, sizeof(Drw));
 
@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
        drw->root = root;
        drw->w = w;
        drw->h = h;
-       drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-       drw->gc = XCreateGC(dpy, root, 0, NULL);
+       drw->visual = visual;
+       drw->depth = depth;
+       drw->cmap = cmap;
+       drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
+       drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
        XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
 
        return drw;
@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
        drw->h = h;
        if (drw->drawable)
                XFreePixmap(drw->dpy, drw->drawable);
-       drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
+       drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
 }
 
 void
@@ -95,6 +98,7 @@ drw_free(Drw *drw)
 {
        XFreePixmap(drw->dpy, drw->drawable);
        XFreeGC(drw->dpy, drw->gc);
+       drw_fontset_free(drw->fonts);
        free(drw);
 }
 
@@ -132,6 +136,19 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
                die("no font specified.");
        }
 
+       /* Do not allow using color fonts. This is a workaround for a BadLength
+        * error from Xft with color glyphs. Modelled on the Xterm workaround. See
+        * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
+        * https://lists.suckless.org/dev/1701/30932.html
+        * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
+        * and lots more all over the internet.
+        */
+       FcBool iscol;
+       if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
+               XftFontClose(drw->dpy, xfont);
+               return NULL;
+       }
+
        font = ecalloc(1, sizeof(Fnt));
        font->xfont = xfont;
        font->pattern = pattern;
@@ -180,31 +197,32 @@ drw_fontset_free(Fnt *font)
 }
 
 void
-drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
 {
        if (!drw || !dest || !clrname)
                return;
 
-       if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-                              DefaultColormap(drw->dpy, drw->screen),
+       if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
                               clrname, dest))
                die("error, cannot allocate color '%s'", clrname);
+
+       dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
 }
 
 /* Wrapper to create color schemes. The caller has to call free(3) on the
  * returned color scheme when done using it. */
-Scm
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
+Clr *
+drw_scm_create(Drw *drw, char *clrnames[], const unsigned int alphas[], size_t clrcount)
 {
        size_t i;
-       Scm ret;
+       Clr *ret;
 
        /* need at least two colors for a scheme */
        if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
                return NULL;
 
        for (i = 0; i < clrcount; i++)
-               drw_clr_create(drw, &ret[i], clrnames[i]);
+               drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
        return ret;
 }
 
@@ -216,7 +234,7 @@ drw_setfontset(Drw *drw, Fnt *set)
 }
 
 void
-drw_setscheme(Drw *drw, Scm scm)
+drw_setscheme(Drw *drw, Clr *scm)
 {
        if (drw)
                drw->scheme = scm;
@@ -260,9 +278,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
        } else {
                XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
                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));
+               d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
                x += lpad;
                w -= lpad;
        }
@@ -337,6 +353,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
                        fcpattern = FcPatternDuplicate(drw->fonts->pattern);
                        FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
+                       FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
 
                        FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);