From 4407a3de54e0239ab1354d63cc6408051474fce2 Mon Sep 17 00:00:00 2001 From: vxid Date: Tue, 9 Apr 2019 11:27:32 +0200 Subject: Add Xresources font support --- config.def.h | 1 + window.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h index 1e9beb0..a1c123a 100644 --- a/config.def.h +++ b/config.def.h @@ -7,6 +7,7 @@ enum { }; /* bar font: + * overwritten by the 'font' X resource property. * (see fonts-conf(5) subsection "FONT NAMES" for valid values) */ static const char * const BAR_FONT = "monospace:size=8"; diff --git a/window.c b/window.c index 9879880..704a7e0 100644 --- a/window.c +++ b/window.c @@ -134,7 +134,7 @@ unsigned int win_luminance(const XftColor *col) void win_init(win_t *win) { win_env_t *e; - const char *bg, *fg; + const char *bg, *fg, *f; memset(win, 0, sizeof(win_t)); @@ -152,7 +152,8 @@ void win_init(win_t *win) if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) error(0, 0, "No locale support"); - win_init_font(e, BAR_FONT); + f = win_res(e->dpy, RES_CLASS ".font", BAR_FONT); + win_init_font(e, f); bg = win_res(e->dpy, RES_CLASS ".background", BG_COLOR); fg = win_res(e->dpy, RES_CLASS ".foreground", FG_COLOR); -- cgit v1.2.3-54-g00ecf