Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Xresources font support

Browse Source
This commit is contained in:
vxid 2019-04-09 11:27:32 +02:00 committed by Bert Münnich
parent a75411567e
commit 4407a3de54
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.def.h
View File

@ -7,6 +7,7 @@ enum {
}; };
/* bar font: /* bar font:
* overwritten by the 'font' X resource property.
* (see fonts-conf(5) subsection "FONT NAMES" for valid values) * (see fonts-conf(5) subsection "FONT NAMES" for valid values)
*/ */
static const char * const BAR_FONT = "monospace:size=8"; static const char * const BAR_FONT = "monospace:size=8";

5
window.c
View File

@ -134,7 +134,7 @@ unsigned int win_luminance(const XftColor *col)
void win_init(win_t *win) void win_init(win_t *win)
{ {
win_env_t *e; win_env_t *e;
const char *bg, *fg; const char *bg, *fg, *f;
memset(win, 0, sizeof(win_t)); memset(win, 0, sizeof(win_t));
@ -152,7 +152,8 @@ void win_init(win_t *win)
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
error(0, 0, "No locale support"); 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); bg = win_res(e->dpy, RES_CLASS ".background", BG_COLOR);
fg = win_res(e->dpy, RES_CLASS ".foreground", FG_COLOR); fg = win_res(e->dpy, RES_CLASS ".foreground", FG_COLOR);