Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1931c8e
)
allow core fonts to load again. this may need more magic.
author
David Hill
<dhill@conformal.com>
Thu, 19 Jul 2012 19:52:15 +0000
(15:52 -0400)
committer
Reginald Kennedy
<rk@rejii.com>
Fri, 20 Jul 2012 22:00:03 +0000
(06:00 +0800)
spectrwm.c
patch
|
blob
|
history
diff --git
a/spectrwm.c
b/spectrwm.c
index
4ec1967
..
596db23
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-1866,7
+1866,8
@@
bar_refresh(void)
void
bar_setup(struct swm_region *r)
{
void
bar_setup(struct swm_region *r)
{
- char *font;
+ char *font, *fontpos;
+ int count;
xcb_screen_t *screen = get_screen(r->s->idx);
uint32_t wa[3];
XRenderColor color;
xcb_screen_t *screen = get_screen(r->s->idx);
uint32_t wa[3];
XRenderColor color;
@@
-1883,7
+1884,20
@@
bar_setup(struct swm_region *r)
continue;
DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font);
continue;
DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font);
- bar_font = XftFontOpenName(display, r->s->idx, font);
+
+ count = 0;
+ fontpos = font;
+ while ((fontpos = index(fontpos, '-'))) {
+ count++;
+ fontpos++;
+ }
+
+ if (count == 14)
+ bar_font = XftFontOpenXlfd(display, r->s->idx,
+ font);
+ else
+ bar_font = XftFontOpenName(display, r->s->idx,
+ font);
if (!bar_font) {
warnx("unable to load font %s", font);
continue;
if (!bar_font) {
warnx("unable to load font %s", font);
continue;