2 files changed, 108 insertions, 1 deletions

diff --git a/config.h b/config.h
index 7a7b4ed..40f8213 100644
--- a/config.h
+++ b/config.h
@@ -6,6 +6,11 @@
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
 static char *font = "curie";
+static char *font2[] = {
+    "Twitter Color Emoji:size=8",
+/*      "Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
+/*      "Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
+};
 static int borderpx = 2;
 
 /*
@@ -24,7 +29,7 @@ char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 char *vtiden = "\033[?6c";
 
 /* Kerning / character bounding-box multipliers */
-static float cwscale = 0.6;
+static float cwscale = 0.65;
 static float chscale = 1.0;
 
 /*
diff --git a/x.c b/x.c
index 48a6676..be1d3d0 100644
--- a/x.c
+++ b/x.c
@@ -157,6 +157,8 @@ static void xhints(void);
 static int xloadcolor(int, const char *, Color *);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
+static int xloadsparefont(FcPattern *, int);
+static void xloadsparefonts(void);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xsetenv(void);
@@ -305,6 +307,7 @@ zoomabs(const Arg *arg)
 {
         xunloadfonts();
         xloadfonts(usedfont, arg->f);
+        xloadsparefonts();
         cresize(0, 0);
         redraw();
         xhints();
@@ -1004,6 +1007,102 @@ xloadfonts(char *fontstr, double fontsize)
         FcPatternDestroy(pattern);
 }
 
+int
+xloadsparefont(FcPattern *pattern, int flags)
+{
+        FcPattern *match;
+        FcResult result;
+        
+        match = FcFontMatch(NULL, pattern, &result);
+        if (!match) {
+                return 1;
+        }
+
+        if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
+                FcPatternDestroy(match);
+                return 1;
+        }
+
+        frc[frclen].flags = flags;
+        /* Believe U+0000 glyph will present in each default font */
+        frc[frclen].unicodep = 0;
+        frclen++;
+
+        return 0;
+}
+
+void
+xloadsparefonts(void)
+{
+        FcPattern *pattern;
+        double sizeshift, fontval;
+        int fc;
+        char **fp;
+
+        if (frclen != 0)
+                die("can't embed spare fonts. cache isn't empty");
+
+        /* Calculate count of spare fonts */
+        fc = sizeof(font2) / sizeof(*font2);
+        if (fc == 0)
+                return;
+
+        /* Allocate memory for cache entries. */
+        if (frccap < 4 * fc) {
+                frccap += 4 * fc - frccap;
+                frc = xrealloc(frc, frccap * sizeof(Fontcache));
+        }
+
+        for (fp = font2; fp - font2 < fc; ++fp) {
+        
+                if (**fp == '-')
+                        pattern = XftXlfdParse(*fp, False, False);
+                else
+                        pattern = FcNameParse((FcChar8 *)*fp);
+        
+                if (!pattern)
+                        die("can't open spare font %s\n", *fp);
+                        
+                if (defaultfontsize > 0) {
+                        sizeshift = usedfontsize - defaultfontsize;
+                        if (sizeshift != 0 &&
+                                        FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
+                                        FcResultMatch) {        
+                                fontval += sizeshift;
+                                FcPatternDel(pattern, FC_PIXEL_SIZE);
+                                FcPatternDel(pattern, FC_SIZE);
+                                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
+                        }
+                }
+        
+                FcPatternAddBool(pattern, FC_SCALABLE, 1);
+        
+                FcConfigSubstitute(NULL, pattern, FcMatchPattern);
+                XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
+        
+                if (xloadsparefont(pattern, FRC_NORMAL))
+                        die("can't open spare font %s\n", *fp);
+        
+                FcPatternDel(pattern, FC_SLANT);
+                FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+                if (xloadsparefont(pattern, FRC_ITALIC))
+                        die("can't open spare font %s\n", *fp);
+                        
+                FcPatternDel(pattern, FC_WEIGHT);
+                FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+                if (xloadsparefont(pattern, FRC_ITALICBOLD))
+                        die("can't open spare font %s\n", *fp);
+        
+                FcPatternDel(pattern, FC_SLANT);
+                FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+                if (xloadsparefont(pattern, FRC_BOLD))
+                        die("can't open spare font %s\n", *fp);
+        
+                FcPatternDestroy(pattern);
+        }
+}
+
+
 void
 xunloadfont(Font *f)
 {
@@ -1101,6 +1200,9 @@ xinit(int cols, int rows)
         usedfont = (opt_font == NULL)? font : opt_font;
         xloadfonts(usedfont, 0);
 
+        /* spare fonts */
+        xloadsparefonts();
+
         /* colors */
         xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
         xloadcols();