From a8f3b8b0dc08ecc4033b8470c34a8cb067f56286 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 19 Aug 2022 22:04:01 +0200 Subject: uncommented the iscol (only way to prevent crashes for now) --- config.h | 2 +- drw.c | 24 ++++++++++++------------ drw.o | Bin 11352 -> 11512 bytes dwm | Bin 69608 -> 69680 bytes dwm.o | Bin 58128 -> 58040 bytes 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/config.h b/config.h index 85890f3..be72c8a 100644 --- a/config.h +++ b/config.h @@ -7,7 +7,7 @@ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ static const int focusonwheel = 0; static const int gappx = 5; -static const char *fonts[] = { "Hack Nerd Font:size=11", "Symbola:pixelsize=11:antialias=true:autohint=true" }; +static const char *fonts[] = { "Hack Nerd Font:size=11"}; static const char dmenufont[] = "Hack Nerd Font:size=11"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; diff --git a/drw.c b/drw.c index 85a8b26..85fe42f 100644 --- a/drw.c +++ b/drw.c @@ -133,18 +133,18 @@ 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;*/ - /* }*/ + /* 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; diff --git a/drw.o b/drw.o index da1cb9d..e3d1a47 100644 Binary files a/drw.o and b/drw.o differ diff --git a/dwm b/dwm index 277b7d8..7b93705 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index ae51f98..2cfdf97 100644 Binary files a/dwm.o and b/dwm.o differ -- cgit v1.2.3