diff options
-rw-r--r-- | drw.c | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -133,19 +133,6 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) | |||
133 | die("no font specified."); | 133 | die("no font specified."); |
134 | } | 134 | } |
135 | 135 | ||
136 | /* Do not allow using color fonts. This is a workaround for a BadLength | ||
137 | * error from Xft with color glyphs. Modelled on the Xterm workaround. See | ||
138 | * https://bugzilla.redhat.com/show_bug.cgi?id=1498269 | ||
139 | * https://lists.suckless.org/dev/1701/30932.html | ||
140 | * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349 | ||
141 | * and lots more all over the internet. | ||
142 | */ | ||
143 | FcBool iscol; | ||
144 | if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) { | ||
145 | XftFontClose(drw->dpy, xfont); | ||
146 | return NULL; | ||
147 | } | ||
148 | |||
149 | font = ecalloc(1, sizeof(Fnt)); | 136 | font = ecalloc(1, sizeof(Fnt)); |
150 | font->xfont = xfont; | 137 | font->xfont = xfont; |
151 | font->pattern = pattern; | 138 | font->pattern = pattern; |
@@ -368,7 +355,6 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp | |||
368 | fcpattern = FcPatternDuplicate(drw->fonts->pattern); | 355 | fcpattern = FcPatternDuplicate(drw->fonts->pattern); |
369 | FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); | 356 | FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); |
370 | FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); | 357 | FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); |
371 | FcPatternAddBool(fcpattern, FC_COLOR, FcFalse); | ||
372 | 358 | ||
373 | FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); | 359 | FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); |
374 | FcDefaultSubstitute(fcpattern); | 360 | FcDefaultSubstitute(fcpattern); |