Implement italic font support.

[st.git] / st.c

diff --git a/st.c b/st.c
index d483d85..655d5a3 100644 (file)
--- a/st.c
+++ b/st.c
@@ -76,6 +76,7 @@ enum glyph_attribute {
        ATTR_UNDERLINE = 2,
        ATTR_BOLD      = 4,
        ATTR_GFX       = 8,
+       ATTR_ITALIC    = 16,
 };
 
 enum cursor_movement {
@@ -238,7 +239,7 @@ typedef struct {
                short lbearing;
                short rbearing;
                XFontSet set;
-       } font, bfont;
+       } font, bfont, ifont;
 } DC;
 
 static void die(const char*, ...);
@@ -739,6 +740,10 @@ execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
+
        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
@@ -841,7 +846,8 @@ ttyresize(int x, int y) {
 
        w.ws_row = term.row;
        w.ws_col = term.col;
-       w.ws_xpixel = w.ws_ypixel = 0;
+       w.ws_xpixel = xw.w;
+       w.ws_ypixel = xw.h;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
@@ -1117,8 +1123,8 @@ tsetattr(int *attr, int l) {
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
-               case 3: /* enter standout (highlight) mode TODO: make it italic */
-                       term.c.attr.mode |= ATTR_REVERSE;
+               case 3: /* enter standout (highlight) */
+                       term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
@@ -1129,8 +1135,8 @@ tsetattr(int *attr, int l) {
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
-               case 23: /* leave standout (highlight) mode TODO: make it italic */
-                       term.c.attr.mode &= ~ATTR_REVERSE;
+               case 23: /* leave standout (highlight) mode */
+                       term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
@@ -1322,12 +1328,12 @@ csihandle(void) {
                }
                break;
        case 'G': /* CHA -- Move to <col> */
-       case '`': /* XXX: HPA -- same? */
+       case '`': /* HPA */
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(csiescseq.arg[0]-1, term.c.y);
                break;
        case 'H': /* CUP -- Move to <row> <col> */
-       case 'f': /* XXX: HVP -- same? */
+       case 'f': /* HVP */
                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[1], 1);
                tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
@@ -1881,14 +1887,20 @@ xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rb
 }
 
 void
-initfonts(char *fontstr, char *bfontstr) {
-       if((dc.font.set = xinitfont(fontstr)) == NULL ||
-          (dc.bfont.set = xinitfont(bfontstr)) == NULL)
-               die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+initfonts(char *fontstr, char *bfontstr, char *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);
+
        xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
            &dc.font.lbearing, &dc.font.rbearing);
        xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
            &dc.bfont.lbearing, &dc.bfont.rbearing);
+       xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent,
+           &dc.ifont.lbearing, &dc.ifont.rbearing);
 }
 
 void
@@ -1910,16 +1922,19 @@ xinit(void) {
                        xw.fx = sw + xw.fx - xw.fw - 1;
                if(xw.fy < 0)
                        xw.fy = sh + xw.fy - xw.fh - 1;
+
+               xw.h = xw.fh;
+               xw.w = xw.fw;
        } else {
                /* window - default size */
                xw.h = 2*BORDER + term.row * xw.ch;
                xw.w = 2*BORDER + term.col * xw.cw;
-               xw.fw = xw.w;
-               xw.fh = xw.h;
+               xw.fx = 0;
+               xw.fy = 0;
        }
 
        /* font */
-       initfonts(FONT, BOLDFONT);
+       initfonts(FONT, BOLDFONT, ITALICFONT);
 
        /* XXX: Assuming same size for bold font */
        xw.cw = dc.font.rbearing - dc.font.lbearing;
@@ -1940,7 +1955,7 @@ xinit(void) {
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
-                       xw.fw, xw.fh, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+                       xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        XDefaultVisual(xw.dpy, xw.scr),
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
@@ -1994,6 +2009,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                fontset = dc.bfont.set;
        }
 
+       if(base.mode & ATTR_ITALIC)
+               fontset = dc.ifont.set;
+
        XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
        XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
@@ -2254,8 +2272,8 @@ resize(XEvent *e) {
                return;
        if(tresize(col, row))
                draw();
-       ttyresize(col, row);
        xresize(col, row);
+       ttyresize(col, row);
 }
 
 bool
@@ -2310,6 +2328,7 @@ main(int argc, char *argv[]) {
        unsigned int wr, hr;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
+       xw.isfixed = False;
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {