nsxiv4407a3d
Add Xresources font support
+4 −2
2 files changed
- M config.def.h +1 −0
- M window.c +3 −2
| @@ -7,6 +7,7 @@ enum { | |||
| 7 | 7 | }; | |
| 8 | 8 | ||
| 9 | 9 | /* bar font: | |
| 10 | + | * overwritten by the 'font' X resource property. | |
| 10 | 11 | * (see fonts-conf(5) subsection "FONT NAMES" for valid values) | |
| 11 | 12 | */ | |
| 12 | 13 | static const char * const BAR_FONT = "monospace:size=8"; | |
| @@ -134,7 +134,7 @@ unsigned int win_luminance(const XftColor *col) | |||
| 134 | 134 | void win_init(win_t *win) | |
| 135 | 135 | { | |
| 136 | 136 | win_env_t *e; | |
| 137 | − | const char *bg, *fg; | |
| 137 | + | const char *bg, *fg, *f; | |
| 138 | 138 | ||
| 139 | 139 | memset(win, 0, sizeof(win_t)); | |
| 140 | 140 | ||
| @@ -152,7 +152,8 @@ void win_init(win_t *win) | |||
| 152 | 152 | if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) | |
| 153 | 153 | error(0, 0, "No locale support"); | |
| 154 | 154 | ||
| 155 | − | win_init_font(e, BAR_FONT); | |
| 155 | + | f = win_res(e->dpy, RES_CLASS ".font", BAR_FONT); | |
| 156 | + | win_init_font(e, f); | |
| 156 | 157 | ||
| 157 | 158 | bg = win_res(e->dpy, RES_CLASS ".background", BG_COLOR); | |
| 158 | 159 | fg = win_res(e->dpy, RES_CLASS ".foreground", FG_COLOR); | |