]> code.delx.au - spectrwm/commitdiff
Default font backend should be font set.
authorReginald Kennedy <rk@rejii.com>
Tue, 31 Jul 2012 18:14:42 +0000 (02:14 +0800)
committerReginald Kennedy <rk@rejii.com>
Tue, 31 Jul 2012 18:49:20 +0000 (02:49 +0800)
spectrwm.c

index ec56f4695ab9c6accafb43a120d366305fb04256..7d2d1a8df1e97ac3b844d3629f69cc8394dc5bfe 100644 (file)
@@ -371,7 +371,7 @@ pid_t                bar_pid;
 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;
@@ -6043,9 +6043,11 @@ setconfvalue(char *selector, char *value, int flags)
                                "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;