Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
When the drawing behaviour was changed underline was not corrected.
[st.git] / st.c
diff --git a/st.c b/st.c
index a64b84d..df166b7 100644 (file)
--- a/st.c
+++ b/st.c
@@ -26,6 +26,7 @@
 #include <X11/keysym.h>
 #include <X11/extensions/Xdbe.h>
 #include <X11/Xft/Xft.h>
 #include <X11/keysym.h>
 #include <X11/extensions/Xdbe.h>
 #include <X11/Xft/Xft.h>
+#include <fontconfig/fontconfig.h>
 #define Glyph Glyph_
 #define Font Font_
 
 #define Glyph Glyph_
 #define Font Font_
 
@@ -39,8 +40,8 @@
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
-       "usage: st [-t title] [-c class] [-g geometry]" \
-       " [-w windowid] [-v] [-f file] [-e command...]\n"
+       "usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+       " [-t title] [-w windowid] [-e command ...]\n"
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
@@ -235,17 +236,17 @@ typedef struct {
 
 /* Font structure */
 typedef struct {
 
 /* Font structure */
 typedef struct {
+       int height;
+       int width;
        int ascent;
        int descent;
        short lbearing;
        short rbearing;
        int ascent;
        int descent;
        short lbearing;
        short rbearing;
-       XFontSet set;
        XftFont* xft_set;
 } Font;
 
 /* Drawing Context */
 typedef struct {
        XftFont* xft_set;
 } Font;
 
 /* Drawing Context */
 typedef struct {
-       ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        GC gc;
        Font font, bfont, ifont, ibfont;
        XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        GC gc;
        Font font, bfont, ifont, ibfont;
@@ -299,12 +300,14 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
+static void xclearborders(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
+static void xtermclear(int, int, int, int);
 static void xresize(int, int);
 
 static void expose(XEvent *);
 static void xresize(int, int);
 
 static void expose(XEvent *);
@@ -336,6 +339,7 @@ static int isfullutf8(char *, int);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);
+static char *smstrcat(char *, ...);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
@@ -364,11 +368,12 @@ static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
-static char **opt_cmd  = NULL;
-static char *opt_io    = NULL;
+static char **opt_cmd = NULL;
+static char *opt_io = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
+static char *opt_font = NULL;
 
 void *
 xmalloc(size_t len) {
 
 void *
 xmalloc(size_t len) {
@@ -393,6 +398,44 @@ xcalloc(size_t nmemb, size_t size) {
        return p;
 }
 
        return p;
 }
 
+char *
+smstrcat(char *src, ...)
+{
+       va_list fmtargs;
+       char *ret, *p, *v;
+       int len, slen, flen;
+
+       len = slen = strlen(src);
+
+       va_start(fmtargs, src);
+       for(;;) {
+               v = va_arg(fmtargs, char *);
+               if(v == NULL)
+                       break;
+               len += strlen(v);
+       }
+       va_end(fmtargs);
+
+       p = ret = xmalloc(len+1);
+       memmove(p, src, slen);
+       p += slen;
+
+       va_start(fmtargs, src);
+       for(;;) {
+               v = va_arg(fmtargs, char *);
+               if(v == NULL)
+                       break;
+               flen = strlen(v);
+               memmove(p, v, flen);
+               p += flen;
+       }
+       va_end(fmtargs);
+
+       ret[len] = '\0';
+
+       return ret;
+}
+
 int
 utf8decode(char *s, long *u) {
        uchar c;
 int
 utf8decode(char *s, long *u) {
        uchar c;
@@ -1305,9 +1348,9 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
-                       case 5: /* DECSCNM -- Reverve video */
+                       case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                mode = term.mode;
-                               MODBIT(term.mode,set, MODE_REVERSE);
+                               MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
                                        redraw();
                                break;
                                if(mode != term.mode)
                                        redraw();
                                break;
@@ -1663,11 +1706,40 @@ tputtab(bool forward) {
 
 void
 tputc(char *c, int len) {
 
 void
 tputc(char *c, int len) {
-       char ascii = *c;
+       uchar ascii = *c;
 
        if(iofd != -1)
                write(iofd, c, len);
 
 
        if(iofd != -1)
                write(iofd, c, len);
 
+       switch(ascii) {
+       case '\t':
+               tputtab(1);
+               return;
+       case '\b':
+               tmoveto(term.c.x-1, term.c.y);
+               return;
+       case '\r':
+               tmoveto(0, term.c.y);
+               return;
+       case '\f':
+       case '\v':
+       case '\n':
+               /* go to first col if the mode is set */
+               tnewline(IS_SET(MODE_CRLF));
+               return;
+       case '\a':
+               if(term.esc & ESC_STR)
+                       break;
+
+               if(!(xw.state & WIN_FOCUSED))
+                       xseturgency(1);
+               return;
+       case '\033':
+               csireset();
+               term.esc = ESC_START;
+               return;
+       }
+
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
@@ -1760,7 +1832,7 @@ tputc(char *c, int len) {
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
-                               xclear(0, 0, xw.w, xw.h);
+                               xclearborders();
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
@@ -1791,33 +1863,7 @@ tputc(char *c, int len) {
        } else {
                if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
                        sel.bx = -1;
        } else {
                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 '\b':
-                       tmoveto(term.c.x-1, term.c.y);
-                       break;
-               case '\r':
-                       tmoveto(0, term.c.y);
-                       break;
-               case '\f':
-               case '\v':
-               case '\n':
-                       /* go to first col if the mode is set */
-                       tnewline(IS_SET(MODE_CRLF));
-                       break;
-               case '\a':
-                       if(!(xw.state & WIN_FOCUSED))
-                               xseturgency(1);
-                       break;
-               case '\033':
-                       csireset();
-                       term.esc = ESC_START;
-                       break;
-               default:
+               if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
                        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                                tnewline(1); /* always go to first col */
                        tsetchar(c);
                        if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
                                tnewline(1); /* always go to first col */
                        tsetchar(c);
@@ -1911,50 +1957,69 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XRenderColor xft_color = { .alpha = 0 };
 xloadcols(void) {
        int i, r, g, b;
        XRenderColor xft_color = { .alpha = 0 };
-       ulong white = WhitePixel(xw.dpy, xw.scr);
 
        /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
                if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
 
        /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
                if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
-                       dc.col[i] = white;
-                       fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
-               } else
-                       dc.col[i] = dc.xft_col[i].pixel;
+                       die("Could not allocate color '%s'\n", colorname[i]);
+               }
        }
 
        /* load colors [16-255] ; same colors as xterm */
        }
 
        /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++)
-               for(g = 0; g < 6; g++)
+       for(i = 16, r = 0; r < 6; r++) {
+               for(g = 0; g < 6; g++) {
                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
                                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
                                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
-                                       dc.col[i] = white;
-                                       fprintf(stderr, "Could not allocate color %d\n", i);
-                               } else
-                                       dc.col[i] = dc.xft_col[i].pixel;
+                                       die("Could not allocate color %d\n", i);
+                               }
                                i++;
                        }
                                i++;
                        }
+               }
+       }
 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
-                       dc.col[i] = white;
-                       fprintf(stderr, "Could not allocate color %d\n", i);
-               } else
-                       dc.col[i] = dc.xft_col[i].pixel;
+                       die("Could not allocate color %d\n", i);
+               }
        }
 }
 
        }
 }
 
+void
+xtermclear(int col1, int row1, int col2, int row2) {
+       XftDrawRect(xw.xft_draw,
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+                       BORDER + col1 * xw.cw,
+                       BORDER + row1 * xw.ch,
+                       (col2-col1+1) * xw.cw,
+                       (row2-row1+1) * xw.ch);
+}
+
+/*
+ * Absolute coordinates.
+ */
 void
 xclear(int x1, int y1, int x2, int y2) {
 void
 xclear(int x1, int y1, int x2, int y2) {
-       XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
-       XFillRectangle(xw.dpy, xw.buf, dc.gc,
-                      BORDER + x1 * xw.cw, BORDER + y1 * xw.ch,
-                      (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+       XftDrawRect(xw.xft_draw,
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+                       x1, y1, x2-x1, y2-y1);
+}
+
+void
+xclearborders(void) {
+       /* top and left border */
+       xclear(0, 0, BORDER, xw.h);
+       xclear(0, 0, xw.w, BORDER);
+
+       /* lower and right border */
+       xclear(BORDER, xw.th - 1, xw.w, xw.h);
+       /* Will just draw what hasn't been drawn by the previous call. */
+       xclear(xw.tw - 1, BORDER, xw.w, xw.h - xw.th - 2);
 }
 
 void
 }
 
 void
@@ -1984,23 +2049,50 @@ xhints(void) {
 
 void
 xinitfont(Font *f, char *fontstr) {
 
 void
 xinitfont(Font *f, char *fontstr) {
-       f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr);
-
-       if(!f->xft_set)
+       FcPattern *pattern, *match;
+       FcResult result;
+
+       pattern = FcNameParse((FcChar8 *)fontstr);
+       if(!pattern)
+               die("st: can't open font %s\n", fontstr);
+
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
+       FcPatternDestroy(pattern);
+       if(!match)
+               die("st: can't open font %s\n", fontstr);
+       if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
+               FcPatternDestroy(match);
                die("st: can't open font %s.\n", fontstr);
                die("st: can't open font %s.\n", fontstr);
+       }
 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;
 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;
+
+       f->height = f->xft_set->height;
+       f->width = f->lbearing + f->rbearing;
 }
 
 void
 }
 
 void
-initfonts(char *fontstr, char *bfontstr, char *ifontstr, char *ibfontstr) {
+initfonts(char *fontstr) {
+       char *fstr;
+
        xinitfont(&dc.font, fontstr);
        xinitfont(&dc.font, fontstr);
-       xinitfont(&dc.bfont, bfontstr);
-       xinitfont(&dc.ifont, ifontstr);
-       xinitfont(&dc.ibfont, ibfontstr);
+       xw.cw = dc.font.width;
+       xw.ch = dc.font.height;
+
+       fstr = smstrcat(fontstr, ":weight=bold", NULL);
+       xinitfont(&dc.bfont, fstr);
+       free(fstr);
+
+       fstr = smstrcat(fontstr, ":slant=italic,oblique", NULL);
+       xinitfont(&dc.ifont, fstr);
+       free(fstr);
+
+       fstr = smstrcat(fontstr, ":weight=bold:slant=italic,oblique", NULL);
+       xinitfont(&dc.ibfont, fstr);
+       free(fstr);
 }
 
 void
 }
 
 void
@@ -2016,11 +2108,7 @@ xinit(void) {
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
-       initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);
-
-       /* XXX: Assuming same size for bold font */
-       xw.cw = dc.font.rbearing - dc.font.lbearing;
-       xw.ch = dc.font.ascent + dc.font.descent;
+       initfonts((opt_font != NULL)? opt_font : FONT);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
@@ -2045,8 +2133,8 @@ xinit(void) {
                xw.fy = 0;
        }
 
                xw.fy = 0;
        }
 
-       attrs.background_pixel = dc.col[DefaultBG];
-       attrs.border_pixel = dc.col[DefaultBG];
+       attrs.background_pixel = dc.xft_col[DefaultBG].pixel;
+       attrs.border_pixel = dc.xft_col[DefaultBG].pixel;
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
@@ -2094,42 +2182,61 @@ xinit(void) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
-       int fg = base.fg, bg = base.bg, temp;
-       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch,
+           width = charlen*xw.cw;
        Font *font = &dc.font;
        XGlyphInfo extents;
        Font *font = &dc.font;
        XGlyphInfo extents;
-
-       /* only switch default fg/bg if term is in RV mode */
-       if(IS_SET(MODE_REVERSE)) {
-               if(fg == DefaultFG)
-                       fg = DefaultBG;
-               if(bg == DefaultBG)
-                       bg = DefaultFG;
-       }
+       XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
+                *temp, revfg, revbg;
+       XRenderColor colfg, colbg;
 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
-
        if(base.mode & ATTR_BOLD) {
        if(base.mode & ATTR_BOLD) {
-               fg += 8;
+               fg = &dc.xft_col[base.fg + 8];
                font = &dc.bfont;
        }
                font = &dc.bfont;
        }
-
        if(base.mode & ATTR_ITALIC)
                font = &dc.ifont;
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 
        if(base.mode & ATTR_ITALIC)
                font = &dc.ifont;
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 
-       XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
-       XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
+       if(IS_SET(MODE_REVERSE)) {
+               if(fg == &dc.xft_col[DefaultFG]) {
+                       fg = &dc.xft_col[DefaultBG];
+               } else {
+                       colfg.red = ~fg->color.red;
+                       colfg.green = ~fg->color.green;
+                       colfg.blue = ~fg->color.blue;
+                       colfg.alpha = fg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       fg = &revfg;
+               }
+
+               if(bg == &dc.xft_col[DefaultBG]) {
+                       bg = &dc.xft_col[DefaultFG];
+               } else {
+                       colbg.red = ~bg->color.red;
+                       colbg.green = ~bg->color.green;
+                       colbg.blue = ~bg->color.blue;
+                       colbg.alpha = bg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       bg = &revbg;
+               }
+       }
 
 
-       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
+       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
+                       &extents);
        width = extents.xOff;
        width = extents.xOff;
-       XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
-       XftDrawStringUtf8(xw.xft_draw, &dc.xft_col[fg], font->xft_set, winx, winy, (FcChar8 *)s, bytelen);
 
 
-       if(base.mode & ATTR_UNDERLINE)
-               XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+       XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
+       XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
+                       winy + font->ascent, (FcChar8 *)s, bytelen);
+
+       if(base.mode & ATTR_UNDERLINE) {
+               XftDrawRect(xw.xft_draw, fg, winx, winy + font->ascent + 1,
+                               width, 1);
+       }
 }
 
 void
 }
 
 void
@@ -2150,7 +2257,7 @@ xdrawcursor(void) {
                sl = utf8size(term.line[oldy][oldx].c);
                xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
        } else
                sl = utf8size(term.line[oldy][oldx].c);
                xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
        } else
-               xclear(oldx, oldy, oldx, oldy);
+               xtermclear(oldx, oldy, oldx, oldy);
 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
@@ -2175,7 +2282,7 @@ void
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
 
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
 
-       xclear(0, 0, xw.w, xw.h);
+       xclearborders();
        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */
        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */
@@ -2183,7 +2290,7 @@ redraw(void) {
 }
 
 void
 }
 
 void
-draw() {
+draw(void) {
        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 
        drawregion(0, 0, term.col, term.row);
        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 
        drawregion(0, 0, term.col, term.row);
@@ -2205,7 +2312,7 @@ drawregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;
-               xclear(0, y, term.col, y);
+               xtermclear(0, y, term.col, y);
                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
@@ -2368,9 +2475,9 @@ resize(XEvent *e) {
        if(col == term.col && row == term.row)
                return;
 
        if(col == term.col && row == term.row)
                return;
 
-       xclear(0, 0, xw.w, xw.h);
        tresize(col, row);
        xresize(col, row);
        tresize(col, row);
        xresize(col, row);
+       xclearborders();
        ttyresize();
 }
 
        ttyresize();
 }
 
@@ -2433,22 +2540,19 @@ main(int argc, char *argv[]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
-               case 't':
-                       if(++i < argc) opt_title = argv[i];
-                       break;
                case 'c':
                case 'c':
-                       if(++i < argc) opt_class = argv[i];
-                       break;
-               case 'w':
-                       if(++i < argc) opt_embed = argv[i];
-                       break;
-               case 'f':
-                       if(++i < argc) opt_io = argv[i];
+                       if(++i < argc)
+                               opt_class = argv[i];
                        break;
                case 'e':
                        /* eat every remaining arguments */
                        break;
                case 'e':
                        /* eat every remaining arguments */
-                       if(++i < argc) opt_cmd = &argv[i];
+                       if(++i < argc)
+                               opt_cmd = &argv[i];
                        goto run;
                        goto run;
+               case 'f':
+                       if(++i < argc)
+                               opt_font = argv[i];
+                       break;
                case 'g':
                        if(++i >= argc)
                                break;
                case 'g':
                        if(++i >= argc)
                                break;
@@ -2470,9 +2574,21 @@ main(int argc, char *argv[]) {
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;
+               case 'o':
+                       if(++i < argc)
+                               opt_io = argv[i];
+                       break;
+               case 't':
+                       if(++i < argc)
+                               opt_title = argv[i];
+                       break;
                case 'v':
                default:
                        die(USAGE);
                case 'v':
                default:
                        die(USAGE);
+               case 'w':
+                       if(++i < argc)
+                               opt_embed = argv[i];
+                       break;
                }
        }
 
                }
        }