Move column and row default numbers into config.h

[st.git] / st.c

diff --git a/st.c b/st.c
index e50e884..fbcd9e0 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3373,16 +3373,32 @@ xgeommasktogravity(int mask)
 int
 xloadfont(Font *f, FcPattern *pattern)
 {
 int
 xloadfont(Font *f, FcPattern *pattern)
 {

+       FcPattern *configured;

        FcPattern *match;
        FcResult result;
        XGlyphInfo extents;
        int wantattr, haveattr;
 
        FcPattern *match;
        FcResult result;
        XGlyphInfo extents;
        int wantattr, haveattr;
 

-       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
-       if (!match)
+       /*
+        * Manually configure instead of calling XftMatchFont
+        * so that we can use the configured pattern for
+        * "missing glyph" lookups.
+        */
+       configured = FcPatternDuplicate(pattern);
+       if (!configured)

                return 1;
 
                return 1;
 

+       FcConfigSubstitute(NULL, configured, FcMatchPattern);
+       XftDefaultSubstitute(xw.dpy, xw.scr, configured);
+
+       match = FcFontMatch(NULL, configured, &result);
+       if (!match) {
+               FcPatternDestroy(configured);
+               return 1;
+       }
+

        if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {
        if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {

+               FcPatternDestroy(configured);

                FcPatternDestroy(match);
                return 1;
        }
                FcPatternDestroy(match);
                return 1;
        }


@@ -3414,7 +3430,7 @@ xloadfont(Font *f, FcPattern *pattern)
                strlen(ascii_printable), &extents);
 
        f->set = NULL;
                strlen(ascii_printable), &extents);
 
        f->set = NULL;

-       f->pattern = FcPatternDuplicate(pattern);
+       f->pattern = configured;

 
        f->ascent = f->match->ascent;
        f->descent = f->match->descent;
 
        f->ascent = f->match->ascent;
        f->descent = f->match->descent;


@@ -3472,9 +3488,6 @@ xloadfonts(char *fontstr, double fontsize)
        if (usedfontsize < 0) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
        if (usedfontsize < 0) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);

-               FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-               if (xloadfont(&dc.font, pattern))
-                       die("st: can't open font %s\n", fontstr);

                usedfontsize = fontval;
                if (fontsize == 0)
                        defaultfontsize = fontval;
                usedfontsize = fontval;
                if (fontsize == 0)
                        defaultfontsize = fontval;


@@ -4458,8 +4471,6 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
 int
 main(int argc, char *argv[])
 {

-       uint cols = 80, rows = 24;
-

        xw.l = xw.t = 0;
        xw.isfixed = False;
        xw.cursor = cursorshape;
        xw.l = xw.t = 0;
        xw.isfixed = False;
        xw.cursor = cursorshape;