Initial font size issue.

[st.git] / st.c

diff --git a/st.c b/st.c
index 4d44388..e50e884 100644 (file)
--- a/st.c
+++ b/st.c
@@ -2490,22 +2490,22 @@ csidump(void)
        int i;
        uint c;
 
        int i;
        uint c;
 

-       printf("ESC[");
+       fprintf(stderr, "ESC[");

        for (i = 0; i < csiescseq.len; i++) {
                c = csiescseq.buf[i] & 0xff;
                if (isprint(c)) {
        for (i = 0; i < csiescseq.len; i++) {
                c = csiescseq.buf[i] & 0xff;
                if (isprint(c)) {

-                       putchar(c);
+                       putc(c, stderr);

                } else if (c == '\n') {
                } else if (c == '\n') {

-                       printf("(\\n)");
+                       fprintf(stderr, "(\\n)");

                } else if (c == '\r') {
                } else if (c == '\r') {

-                       printf("(\\r)");
+                       fprintf(stderr, "(\\r)");

                } else if (c == 0x1b) {
                } else if (c == 0x1b) {

-                       printf("(\\e)");
+                       fprintf(stderr, "(\\e)");

                } else {
                } else {

-                       printf("(%02x)", c);
+                       fprintf(stderr, "(%02x)", c);

                }
        }
                }
        }

-       putchar('\n');
+       putc('\n', stderr);

 }
 
 void
 }
 
 void


@@ -2594,24 +2594,25 @@ strdump(void)
        int i;
        uint c;
 
        int i;
        uint c;
 

-       printf("ESC%c", strescseq.type);
+       fprintf(stderr, "ESC%c", strescseq.type);

        for (i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;
                if (c == '\0') {
        for (i = 0; i < strescseq.len; i++) {
                c = strescseq.buf[i] & 0xff;
                if (c == '\0') {

+                       putc('\n', stderr);

                        return;
                } else if (isprint(c)) {
                        return;
                } else if (isprint(c)) {

-                       putchar(c);
+                       putc(c, stderr);

                } else if (c == '\n') {
                } else if (c == '\n') {

-                       printf("(\\n)");
+                       fprintf(stderr, "(\\n)");

                } else if (c == '\r') {
                } else if (c == '\r') {

-                       printf("(\\r)");
+                       fprintf(stderr, "(\\r)");

                } else if (c == 0x1b) {
                } else if (c == 0x1b) {

-                       printf("(\\e)");
+                       fprintf(stderr, "(\\e)");

                } else {
                } else {

-                       printf("(%02x)", c);
+                       fprintf(stderr, "(%02x)", c);

                }
        }
                }
        }

-       printf("ESC\\\n");
+       fprintf(stderr, "ESC\\\n");

 }
 
 void
 }
 
 void


@@ -3471,6 +3472,9 @@ 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;