diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-07 13:40:27 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-07 13:40:27 +0000 |
| commit | 3fd28e8708f116f882b45db100af28a3ca29f329 (patch) | |
| tree | 4811704120203cb1c1a829bcfc51553fd5f2298a /app | |
| parent | 873336781439d7e5eaac49d5ff0534332b6d8ee3 (diff) | |
trying parsing a XLFD string first, then by pattern
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/conf.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c index 01a4d0f03..c6803a567 100644 --- a/app/cwm/conf.c +++ b/app/cwm/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.145 2013/07/16 14:22:25 okan Exp $ + * $OpenBSD: conf.c,v 1.146 2013/10/07 13:40:26 okan Exp $ */ #include <sys/param.h> @@ -104,9 +104,12 @@ conf_screen(struct screen_ctx *sc) sc->gap = Conf.gap; - sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font); - if (sc->xftfont == NULL) - errx(1, "XftFontOpenName"); + sc->xftfont = XftFontOpenXlfd(X_Dpy, sc->which, Conf.font); + if (sc->xftfont == NULL) { + sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font); + if (sc->xftfont == NULL) + errx(1, "XftFontOpenName"); + } for (i = 0; i < nitems(color_binds); i++) { if (i == CWM_COLOR_MENU_FONT_SEL && *Conf.color[i] == '\0') { |