Implementing italic-bold. This will require an increase of the avgWdth.

[st.git] / st.c

diff --git a/st.c b/st.c
index fe2b922..2e1ac67 100644 (file)
--- a/st.c
+++ b/st.c
@@ -240,7 +240,7 @@ typedef struct {
                short lbearing;
                short rbearing;
                XFontSet set;
                short lbearing;
                short rbearing;
                XFontSet set;

-       } font, bfont, ifont;
+       } font, bfont, ifont, ibfont;

 } DC;
 
 static void die(const char*, ...);
 } DC;
 
 static void die(const char*, ...);


@@ -774,6 +774,13 @@ execsh(void) {
        unsetenv("LINES");
        unsetenv("TERMCAP");
 
        unsetenv("LINES");
        unsetenv("TERMCAP");
 

+       signal(SIGCHLD, SIG_DFL);
+       signal(SIGHUP, SIG_DFL);
+       signal(SIGINT, SIG_DFL);
+       signal(SIGQUIT, SIG_DFL);
+       signal(SIGTERM, SIG_DFL);
+       signal(SIGALRM, SIG_DFL);
+

        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};


@@ -1716,6 +1723,8 @@ tputc(char *c) {
                if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
                        sel.bx = -1;
                switch(ascii) {
                if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
                        sel.bx = -1;
                switch(ascii) {

+               case '\0': /* padding character, do nothing */
+                       break;

                case '\t':
                        tputtab(1);
                        break;
                case '\t':
                        tputtab(1);
                        break;


@@ -1936,13 +1945,15 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
 }
 
 void

-initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
+initfonts(char *fontstr, char *bfontstr, char *ifontstr, char *ibfontstr) {

        if((dc.font.set = xinitfont(fontstr)) == NULL)
                die("Can't load font %s\n", fontstr);
        if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
                die("Can't load bfont %s\n", bfontstr);
        if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
                die("Can't load ifont %s\n", ifontstr);
        if((dc.font.set = xinitfont(fontstr)) == NULL)
                die("Can't load font %s\n", fontstr);
        if((dc.bfont.set = xinitfont(bfontstr)) == NULL)
                die("Can't load bfont %s\n", bfontstr);
        if((dc.ifont.set = xinitfont(ifontstr)) == NULL)
                die("Can't load ifont %s\n", ifontstr);

+       if((dc.ibfont.set = xinitfont(ibfontstr)) == NULL)
+               die("Can't load ibfont %s\n", ibfontstr);

 
        xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
            &dc.font.lbearing, &dc.font.rbearing);
 
        xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
            &dc.font.lbearing, &dc.font.rbearing);


@@ -1950,6 +1961,8 @@ initfonts(char *fontstr, char *bfontstr, char *ifontstr) {
            &dc.bfont.lbearing, &dc.bfont.rbearing);
        xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
            &dc.ifont.lbearing, &dc.ifont.rbearing);
            &dc.bfont.lbearing, &dc.bfont.rbearing);
        xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
            &dc.ifont.lbearing, &dc.ifont.rbearing);

+       xgetfontinfo(dc.ibfont.set, &dc.ibfont.ascent, &dc.ibfont.descent,
+           &dc.ibfont.lbearing, &dc.ibfont.rbearing);

 }
 
 void
 }
 
 void


@@ -1964,7 +1977,7 @@ xinit(void) {
        xw.scr = XDefaultScreen(xw.dpy);
 
        /* font */
        xw.scr = XDefaultScreen(xw.dpy);
 
        /* font */

-       initfonts(FONT, BOLDFONT, ITALICFONT);
+       initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);

 
        /* XXX: Assuming same size for bold font */
        xw.cw = dc.font.rbearing - dc.font.lbearing;
 
        /* XXX: Assuming same size for bold font */
        xw.cw = dc.font.rbearing - dc.font.lbearing;


@@ -2059,6 +2072,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
        if(base.mode & ATTR_ITALIC)
                fontset = dc.ifont.set;
 
        if(base.mode & ATTR_ITALIC)
                fontset = dc.ifont.set;

+       if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+               fontset = dc.ibfont.set;

 
        XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
        XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
        XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
        XSetForeground(xw.dpy, dc.gc, dc.col[fg]);