speediegq 2022-10-03 00:24:54 +02:00
parent 011f3351fe
commit 0109ef2845
3 changed files with 10 additions and 12 deletions

15
drw.c
View file

@ -154,18 +154,13 @@ 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 USEXFTWORKAROUND
FcBool iscol;
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
XftFontClose(drw->dpy, xfont);
return NULL;
}*/
}
#endif
font = ecalloc(1, sizeof(Fnt));
font->xfont = xfont;
@ -459,7 +454,9 @@ 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);
#if USEXFTWORKAROUND
FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
#endif
FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
FcDefaultSubstitute(fcpattern);

View file

@ -4387,6 +4387,8 @@ setup(void)
Atom utf8string;
/* clean up any zombies immediately */
if (signal(SIGCHLD, sigchld) == SIG_ERR)
die("can't install SIGCHLD handler:");
sigchld(0);
signal(SIGHUP, sighup);
@ -4589,9 +4591,6 @@ sigchld(int unused)
{
pid_t pid;
if (signal(SIGCHLD, sigchld) == SIG_ERR)
die("can't install SIGCHLD handler:");
while (0 < (pid = waitpid(-1, NULL, WNOHANG))) {
pid_t *p, *lim;

View file

@ -23,6 +23,8 @@ Not compatible with BSDs so for those, set this to 0. */
#define USEROUNDCORNERS 1 /* Whether or not to use rounded corners */
#define USEMEDIA 1 /* Whether or not to use media keys */
#define USEMOUSE 1 /* Whether or not to use mouse binds */
#define USEXFTWORKAROUND 0 /* Whether or not to include the libXft emoji workaround.
This is usually not necessary so only enable it if you find that you need it. */
/* Image related patches
*