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:
2ca16c9
)
Default font backend should be font set.
author
Reginald Kennedy
<rk@rejii.com>
Tue, 31 Jul 2012 18:14:42 +0000
(
02:14
+0800)
committer
Reginald Kennedy
<rk@rejii.com>
Tue, 31 Jul 2012 18:49:20 +0000
(
02:49
+0800)
spectrwm.c
patch
|
blob
|
history
diff --git
a/spectrwm.c
b/spectrwm.c
index
ec56f46
..
7d2d1a8
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-371,7
+371,7
@@
pid_t bar_pid;
XFontSet bar_fs;
XFontSetExtents *bar_fs_extents;
XftFont *bar_font;
XFontSet bar_fs;
XFontSetExtents *bar_fs_extents;
XftFont *bar_font;
-int bar_font_legacy = 0;
+int bar_font_legacy = 1;
char *bar_fonts;
XftColor bar_font_color;
struct passwd *pwd;
char *bar_fonts;
XftColor bar_font_color;
struct passwd *pwd;
@@
-6043,9
+6043,11
@@
setconfvalue(char *selector, char *value, int flags)
"memory for bar_fonts.");
free(b);
"memory for bar_fonts.");
free(b);
- /* check if entry contains only xlfd entries */
- bar_font_legacy = 1;
+ /* If already in xft mode, then we are done. */
+ if (!bar_font_legacy)
+ break;
+ /* If there are any non-XLFD entries, switch to Xft mode. */
while ((b = strsep(&value, ",")) != NULL) {
if (*b == '\0')
continue;
while ((b = strsep(&value, ",")) != NULL) {
if (*b == '\0')
continue;