X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=e19cefd949c60886de515b4fad18b09b2232fa52;hp=8e1afe29441d209e5173c5e36e194c0c0eee3878;hb=ee3fbeb6c8c354cf4db226a5b1583c531ea37af4;hpb=7f17a70834961cd1ff748b2621c6fc87c069be22

diff --git a/st.c b/st.c
index 8e1afe2..e19cefd 100644
--- a/st.c
+++ b/st.c
@@ -25,6 +25,10 @@
 #include <X11/cursorfont.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_
 
 #if   defined(__linux)
  #include <pty.h>
@@ -36,7 +40,8 @@
 
 #define USAGE \
 	"st " VERSION " (c) 2010-2012 st engineers\n" \
-	"usage: st [-t title] [-c class] [-w windowid] [-v] [-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
@@ -47,13 +52,12 @@
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   256
 #define STR_ARG_SIZ   16
-#define DRAW_BUF_SIZ  1024
+#define DRAW_BUF_SIZ  20*1024
 #define UTF_SIZ       4
 #define XK_NO_MOD     UINT_MAX
 #define XK_ANY_MOD    0
 
-#define SELECT_TIMEOUT (20*1000) /* 20 ms */
-#define DRAW_TIMEOUT  (20*1000) /* 20 ms */
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -68,12 +72,16 @@
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
+#define VT102ID "\033[?6c"
+
 enum glyph_attribute {
 	ATTR_NULL      = 0,
 	ATTR_REVERSE   = 1,
 	ATTR_UNDERLINE = 2,
 	ATTR_BOLD      = 4,
 	ATTR_GFX       = 8,
+	ATTR_ITALIC    = 16,
+	ATTR_BLINK     = 32,
 };
 
 enum cursor_movement {
@@ -105,7 +113,8 @@ enum term_mode {
 	MODE_MOUSEBTN    = 32,
 	MODE_MOUSEMOTION = 64,
 	MODE_MOUSE       = 32|64,
-	MODE_REVERSE     = 128
+	MODE_REVERSE     = 128,
+	MODE_KBDLOCK     = 256
 };
 
 enum escape_state {
@@ -114,6 +123,7 @@ enum escape_state {
 	ESC_STR	= 4, /* DSC, OSC, PM, APC */
 	ESC_ALTCHARSET = 8,
 	ESC_STR_END    = 16, /* a final string was encountered */
+	ESC_TEST       = 32, /* Enter in test mode */
 };
 
 enum window_state {
@@ -173,9 +183,9 @@ typedef struct {
 typedef struct {
 	int row;	/* nb row */
 	int col;	/* nb col */
-	Line* line;	/* screen */
-	Line* alt;	/* alternate screen */
-	bool* dirty;	/* dirtyness of lines */
+	Line *line;	/* screen */
+	Line *alt;	/* alternate screen */
+	bool *dirty;	/* dirtyness of lines */
 	TCursor c;	/* cursor */
 	int top;	/* top    scroll limit */
 	int bot;	/* bottom scroll limit */
@@ -190,16 +200,20 @@ typedef struct {
 	Colormap cmap;
 	Window win;
 	XdbeBackBuffer buf;
-	Atom xembed;
+	Atom xembed, wmdeletewin;
 	XIM xim;
 	XIC xic;
+	XftDraw *xft_draw;
+	Visual *vis;
 	int scr;
+	bool isfixed; /* is fixed geometry? */
+	int fx, fy, fw, fh; /* fixed geometry */
+	int tw, th; /* tty width and height */
 	int w;	/* window width */
 	int h;	/* window height */
 	int ch; /* char height */
 	int cw; /* char width  */
 	char state; /* focus, redraw, visible */
-	struct timeval lastdraw;
 } XWindow;
 
 typedef struct {
@@ -208,41 +222,48 @@ typedef struct {
 	char s[ESC_BUF_SIZ];
 } Key;
 
-
 /* TODO: use better name for vars... */
 typedef struct {
 	int mode;
 	int bx, by;
 	int ex, ey;
-	struct {int x, y;} b, e;
+	struct {
+		int x, y;
+	} b, e;
 	char *clip;
 	Atom xtarget;
+	bool alt;
 	struct timeval tclick1;
 	struct timeval tclick2;
 } Selection;
 
 #include "config.h"
 
+/* Font structure */
+typedef struct {
+	int height;
+	int width;
+	int ascent;
+	int descent;
+	short lbearing;
+	short rbearing;
+	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;
-	struct {
-		int ascent;
-		int descent;
-		short lbearing;
-		short rbearing;
-		XFontSet set;
-	} font, bfont;
+	Font font, bfont, ifont, ibfont;
 } DC;
 
-static void die(const char*, ...);
+static void die(const char *, ...);
 static void draw(void);
+static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
 static void run(void);
-static bool last_draw_too_old(void);
 
 static void csidump(void);
 static void csihandle(void);
@@ -263,13 +284,13 @@ static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
-static void tputc(char*);
+static void tputc(char *, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);
-static void tsetchar(char*);
+static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
@@ -278,24 +299,25 @@ static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(void);
-static void ttyresize(int, int);
+static void ttyresize(void);
 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 xcopy();
 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 visibility(XEvent *);
 static void unmap(XEvent *);
-static char* kmap(KeySym, uint);
+static char *kmap(KeySym, uint);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);
 static void resize(XEvent *);
@@ -304,12 +326,13 @@ static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void selnotify(XEvent *);
+static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
 static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
@@ -317,6 +340,12 @@ static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
+static ssize_t xwrite(int, char *, size_t);
+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,
 	[ClientMessage] = cmessage,
@@ -329,6 +358,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
 	[MotionNotify] = bmotion,
 	[ButtonPress] = bpress,
 	[ButtonRelease] = brelease,
+	[SelectionClear] = selclear,
 	[SelectionNotify] = selnotify,
 	[SelectionRequest] = selrequest,
 };
@@ -342,10 +372,94 @@ static STREscape strescseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
-static char **opt_cmd  = NULL;
+static int iofd = -1;
+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_font = NULL;
+
+
+ssize_t
+xwrite(int fd, char *s, size_t len) {
+	size_t aux = len;
+
+	while(len > 0) {
+		ssize_t r = write(fd, s, len);
+		if(r < 0)
+			return r;
+		len -= r;
+		s += r;
+	}
+	return aux;
+}
+
+void *
+xmalloc(size_t len) {
+	void *p = malloc(len);
+
+	if(!p)
+		die("Out of memory\n");
+
+	return p;
+}
+
+void *
+xrealloc(void *p, size_t len) {
+	if((p = realloc(p, len)) == NULL)
+		die("Out of memory\n");
+
+	return p;
+}
+
+void *
+xcalloc(size_t nmemb, size_t size) {
+	void *p = calloc(nmemb, size);
+
+	if(!p)
+		die("Out of memory\n");
+
+	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) {
@@ -366,8 +480,10 @@ utf8decode(char *s, long *u) {
 	} else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
 		*u = c & (B2|B1|B0);
 		n = 3;
-	} else
+	} else {
 		goto invalid;
+	}
+
 	for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
 		c = *s;
 		if((c & (B7|B6)) != B7) /* 10xxxxxx */
@@ -375,14 +491,18 @@ utf8decode(char *s, long *u) {
 		*u <<= 6;
 		*u |= c & (B5|B4|B3|B2|B1|B0);
 	}
+
 	if((n == 1 && *u < 0x80) ||
 	   (n == 2 && *u < 0x800) ||
 	   (n == 3 && *u < 0x10000) ||
-	   (*u >= 0xD800 && *u <= 0xDFFF))
+	   (*u >= 0xD800 && *u <= 0xDFFF)) {
 		goto invalid;
+	}
+
 	return rtn;
 invalid:
 	*u = 0xFFFD;
+
 	return rtn;
 }
 
@@ -392,7 +512,7 @@ utf8encode(long *u, char *s) {
 	ulong uc;
 	int i, n;
 
-	sp = (uchar*) s;
+	sp = (uchar *)s;
 	uc = *u;
 	if(uc < 0x80) {
 		*sp = uc; /* 0xxxxxxx */
@@ -409,14 +529,17 @@ utf8encode(long *u, char *s) {
 	} else {
 		goto invalid;
 	}
+
 	for(i=n,++sp; i>0; --i,++sp)
 		*sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+
 	return n+1;
 invalid:
 	/* U+FFFD */
 	*s++ = '\xEF';
 	*s++ = '\xBF';
 	*s = '\xBD';
+
 	return 3;
 }
 
@@ -426,38 +549,40 @@ int
 isfullutf8(char *s, int b) {
 	uchar *c1, *c2, *c3;
 
-	c1 = (uchar *) s;
-	c2 = (uchar *) ++s;
-	c3 = (uchar *) ++s;
-	if(b < 1)
+	c1 = (uchar *)s;
+	c2 = (uchar *)++s;
+	c3 = (uchar *)++s;
+	if(b < 1) {
 		return 0;
-	else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+	} else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) {
 		return 0;
-	else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+	} else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
 	    ((b == 1) ||
-	    ((b == 2) && (*c2&(B7|B6)) == B7)))
+	    ((b == 2) && (*c2&(B7|B6)) == B7))) {
 		return 0;
-	else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+	} else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
 	    ((b == 1) ||
 	    ((b == 2) && (*c2&(B7|B6)) == B7) ||
-	    ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
+	    ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) {
 		return 0;
-	else
+	} else {
 		return 1;
+	}
 }
 
 int
 utf8size(char *s) {
 	uchar c = *s;
 
-	if(~c&B7)
+	if(~c&B7) {
 		return 1;
-	else if((c&(B7|B6|B5)) == (B7|B6))
+	} else if((c&(B7|B6|B5)) == (B7|B6)) {
 		return 2;
-	else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+	} else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) {
 		return 3;
-	else
+	} else {
 		return 4;
+	}
 }
 
 void
@@ -474,13 +599,18 @@ selinit(void) {
 
 static inline bool
 selected(int x, int y) {
+	int bx, ex;
+
 	if(sel.ey == y && sel.by == y) {
-		int bx = MIN(sel.bx, sel.ex);
-		int ex = MAX(sel.bx, sel.ex);
+		bx = MIN(sel.bx, sel.ex);
+		ex = MAX(sel.bx, sel.ex);
 		return BETWEEN(x, bx, ex);
 	}
-	return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
-		|| (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
+
+	return ((sel.b.y < y && y < sel.e.y)
+			|| (y == sel.e.y && x <= sel.e.x))
+			|| (y == sel.b.y && x >= sel.b.x
+				&& (x <= sel.e.x || sel.b.y != sel.e.y));
 }
 
 void
@@ -532,11 +662,14 @@ mousereport(XEvent *e) {
 
 void
 bpress(XEvent *e) {
-	if(IS_SET(MODE_MOUSE))
+	if(IS_SET(MODE_MOUSE)) {
 		mousereport(e);
-	else if(e->xbutton.button == Button1) {
-		if(sel.bx != -1)
+	} else if(e->xbutton.button == Button1) {
+		if(sel.bx != -1) {
+			sel.bx = -1;
 			tsetdirt(sel.b.y, sel.e.y);
+			draw();
+		}
 		sel.mode = 1;
 		sel.ex = sel.bx = X2COL(e->xbutton.x);
 		sel.ey = sel.by = Y2ROW(e->xbutton.y);
@@ -545,33 +678,35 @@ bpress(XEvent *e) {
 
 void
 selcopy(void) {
-	char *str, *ptr;
-	int x, y, bufsize, is_selected = 0;
+	char *str, *ptr, *p;
+	int x, y, bufsize, is_selected = 0, size;
+	Glyph *gp;
 
-	if(sel.bx == -1)
+	if(sel.bx == -1) {
 		str = NULL;
-
-	else {
+	} else {
 		bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
-		ptr = str = malloc(bufsize);
+		ptr = str = xmalloc(bufsize);
 
 		/* append every set & selected glyph to the selection */
 		for(y = 0; y < term.row; y++) {
 			for(x = 0; x < term.col; x++) {
-				is_selected = selected(x, y);
-				if((term.line[y][x].state & GLYPH_SET) && is_selected) {
-					int size = utf8size(term.line[y][x].c);
-					memcpy(ptr, term.line[y][x].c, size);
-					ptr += size;
-				}
+				gp = &term.line[y][x];
+
+				if(!(is_selected = selected(x, y)))
+					continue;
+				p = (gp->state & GLYPH_SET) ? gp->c : " ";
+				size = utf8size(p);
+				memcpy(ptr, p, size);
+				ptr += size;
 			}
-
 			/* \n at the end of every selected line except for the last one */
 			if(is_selected && y < sel.e.y)
 				*ptr++ = '\n';
 		}
 		*ptr = 0;
 	}
+	sel.alt = IS_SET(MODE_ALTSCREEN);
 	xsetsel(str);
 }
 
@@ -598,15 +733,23 @@ selnotify(XEvent *e) {
 }
 
 void
-selpaste() {
-	XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
+selpaste(void) {
+	XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
+			xw.win, CurrentTime);
+}
+
+void selclear(XEvent *e) {
+	if(sel.bx == -1)
+		return;
+	sel.bx = -1;
+	tsetdirt(sel.b.y, sel.e.y);
 }
 
 void
 selrequest(XEvent *e) {
 	XSelectionRequestEvent *xsre;
 	XSelectionEvent xev;
-	Atom xa_targets;
+	Atom xa_targets, string;
 
 	xsre = (XSelectionRequestEvent *) e;
 	xev.type = SelectionNotify;
@@ -620,7 +763,7 @@ selrequest(XEvent *e) {
 	xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
 	if(xsre->target == xa_targets) {
 		/* respond with the supported type */
-		Atom string = sel.xtarget;
+		string = sel.xtarget;
 		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
 				XA_ATOM, 32, PropModeReplace,
 				(uchar *) &string, 1);
@@ -649,24 +792,24 @@ xsetsel(char *str) {
 
 	clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
 	XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-
-	XFlush(xw.dpy);
 }
 
 void
 brelease(XEvent *e) {
+	struct timeval now;
+
 	if(IS_SET(MODE_MOUSE)) {
 		mousereport(e);
 		return;
 	}
-	if(e->xbutton.button == Button2)
+
+	if(e->xbutton.button == Button2) {
 		selpaste();
-	else if(e->xbutton.button == Button1) {
+	} else if(e->xbutton.button == Button1) {
 		sel.mode = 0;
 		getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 		term.dirty[sel.ey] = 1;
 		if(sel.bx == sel.ex && sel.by == sel.ey) {
-			struct timeval now;
 			sel.bx = -1;
 			gettimeofday(&now, NULL);
 
@@ -680,37 +823,45 @@ brelease(XEvent *e) {
 				/* double click to select word */
 				sel.bx = sel.ex;
 				while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
-					  term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--;
+						term.line[sel.ey][sel.bx-1].c[0] != ' ') {
+					sel.bx--;
+				}
 				sel.b.x = sel.bx;
 				while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
-					  term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++;
+						term.line[sel.ey][sel.ex+1].c[0] != ' ') {
+					sel.ex++;
+				}
 				sel.e.x = sel.ex;
 				sel.b.y = sel.e.y = sel.ey;
 				selcopy();
 			}
-		} else
+		} else {
 			selcopy();
+		}
 	}
+
 	memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
 	gettimeofday(&sel.tclick1, NULL);
-	draw();
 }
 
 void
 bmotion(XEvent *e) {
+	int starty, endy, oldey, oldex;
+
 	if(IS_SET(MODE_MOUSE)) {
 		mousereport(e);
 		return;
 	}
+
 	if(sel.mode) {
-		int oldey = sel.ey, oldex = sel.ex;
+		oldey = sel.ey;
+		oldex = sel.ex;
 		getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
 		if(oldey != sel.ey || oldex != sel.ex) {
-			int starty = MIN(oldey, sel.ey);
-			int endy = MAX(oldey, sel.ey);
+			starty = MIN(oldey, sel.ey);
+			endy = MAX(oldey, sel.ey);
 			tsetdirt(starty, endy);
-			draw();
 		}
 	}
 }
@@ -730,9 +881,20 @@ execsh(void) {
 	char **args;
 	char *envshell = getenv("SHELL");
 
+	unsetenv("COLUMNS");
+	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};
+	args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
 	execvp(args[0], args);
 	exit(EXIT_FAILURE);
 }
@@ -740,20 +902,23 @@ execsh(void) {
 void
 sigchld(int a) {
 	int stat = 0;
+
 	if(waitpid(pid, &stat, 0) < 0)
 		die("Waiting for pid %hd failed: %s\n",	pid, SERRNO);
-	if(WIFEXITED(stat))
+
+	if(WIFEXITED(stat)) {
 		exit(WEXITSTATUS(stat));
-	else
+	} else {
 		exit(EXIT_FAILURE);
+	}
 }
 
 void
 ttynew(void) {
 	int m, s;
+	struct winsize w = {term.row, term.col, 0, 0};
 
 	/* seems to work fine on linux, openbsd and freebsd */
-	struct winsize w = {term.row, term.col, 0, 0};
 	if(openpty(&m, &s, NULL, NULL, &w) < 0)
 		die("openpty failed: %s\n", SERRNO);
 
@@ -776,12 +941,22 @@ ttynew(void) {
 		close(s);
 		cmdfd = m;
 		signal(SIGCHLD, sigchld);
+		if(opt_io) {
+			iofd = (!strcmp(opt_io, "-")) ?
+				  STDOUT_FILENO :
+				  open(opt_io, O_WRONLY | O_CREAT, 0666);
+			if(iofd < 0) {
+				fprintf(stderr, "Error opening %s:%s\n",
+					opt_io, strerror(errno));
+			}
+		}
 	}
 }
 
 void
 dump(char c) {
 	static int col;
+
 	fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
 	if(++col % 10 == 0)
 		fprintf(stderr, "\n");
@@ -807,8 +982,8 @@ ttyread(void) {
 	while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
 		charsize = utf8decode(ptr, &utf8c);
 		utf8encode(&utf8c, s);
-		tputc(s);
-		ptr    += charsize;
+		tputc(s, charsize);
+		ptr += charsize;
 		buflen -= charsize;
 	}
 
@@ -823,19 +998,19 @@ ttywrite(const char *s, size_t n) {
 }
 
 void
-ttyresize(int x, int y) {
+ttyresize(void) {
 	struct winsize w;
 
 	w.ws_row = term.row;
 	w.ws_col = term.col;
-	w.ws_xpixel = w.ws_ypixel = 0;
+	w.ws_xpixel = xw.tw;
+	w.ws_ypixel = xw.th;
 	if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
 		fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
 void
-tsetdirt(int top, int bot)
-{
+tsetdirt(int top, int bot) {
 	int i;
 
 	LIMIT(top, 0, term.row-1);
@@ -846,8 +1021,7 @@ tsetdirt(int top, int bot)
 }
 
 void
-tfulldirt(void)
-{
+tfulldirt(void) {
 	tsetdirt(0, term.row-1);
 }
 
@@ -855,15 +1029,18 @@ void
 tcursor(int mode) {
 	static TCursor c;
 
-	if(mode == CURSOR_SAVE)
+	if(mode == CURSOR_SAVE) {
 		c = term.c;
-	else if(mode == CURSOR_LOAD)
-		term.c = c, tmoveto(c.x, c.y);
+	} else if(mode == CURSOR_LOAD) {
+		term.c = c;
+		tmoveto(c.x, c.y);
+	}
 }
 
 void
 treset(void) {
-	unsigned i;
+	uint i;
+
 	term.c = (TCursor){{
 		.mode = ATTR_NULL,
 		.fg = DefaultFG,
@@ -871,25 +1048,28 @@ treset(void) {
 	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
 	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
-	for (i = TAB; i < term.col; i += TAB)
+	for(i = TAB; i < term.col; i += TAB)
 		term.tabs[i] = 1;
-	term.top = 0, term.bot = term.row - 1;
+	term.top = 0;
+	term.bot = term.row - 1;
 	term.mode = MODE_WRAP;
+
 	tclearregion(0, 0, term.col-1, term.row-1);
 }
 
 void
 tnew(int col, int row) {
 	/* set screen size */
-	term.row = row, term.col = col;
-	term.line = malloc(term.row * sizeof(Line));
-	term.alt  = malloc(term.row * sizeof(Line));
-	term.dirty = malloc(term.row * sizeof(*term.dirty));
-	term.tabs = malloc(term.col * sizeof(*term.tabs));
+	term.row = row;
+	term.col = col;
+	term.line = xmalloc(term.row * sizeof(Line));
+	term.alt  = xmalloc(term.row * sizeof(Line));
+	term.dirty = xmalloc(term.row * sizeof(*term.dirty));
+	term.tabs = xmalloc(term.col * sizeof(*term.tabs));
 
 	for(row = 0; row < term.row; row++) {
-		term.line[row] = malloc(term.col * sizeof(Glyph));
-		term.alt [row] = malloc(term.col * sizeof(Glyph));
+		term.line[row] = xmalloc(term.col * sizeof(Glyph));
+		term.alt [row] = xmalloc(term.col * sizeof(Glyph));
 		term.dirty[row] = 0;
 	}
 	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
@@ -899,7 +1079,8 @@ tnew(int col, int row) {
 
 void
 tswapscreen(void) {
-	Line* tmp = term.line;
+	Line *tmp = term.line;
+
 	term.line = term.alt;
 	term.alt = tmp;
 	term.mode ^= MODE_ALTSCREEN;
@@ -973,10 +1154,12 @@ selscroll(int orig, int n) {
 void
 tnewline(int first_col) {
 	int y = term.c.y;
-	if(y == term.bot)
+
+	if(y == term.bot) {
 		tscrollup(term.top, 1);
-	else
+	} else {
 		y++;
+	}
 	tmoveto(first_col ? 0 : term.c.x, y);
 }
 
@@ -994,11 +1177,12 @@ csiparse(void) {
 			csiescseq.arg[csiescseq.narg] *= 10;
 			csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
 		}
-		if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ)
+		if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) {
 			csiescseq.narg++, p++;
-		else {
+		} else {
 			csiescseq.mode = *p;
 			csiescseq.narg++;
+
 			return;
 		}
 	}
@@ -1014,11 +1198,32 @@ tmoveto(int x, int y) {
 }
 
 void
-tsetchar(char *c) {
-	term.dirty[term.c.y] = 1;
-	term.line[term.c.y][term.c.x] = term.c.attr;
-	memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
-	term.line[term.c.y][term.c.x].state |= GLYPH_SET;
+tsetchar(char *c, Glyph *attr, int x, int y) {
+	static char *vt100_0[62] = { /* 0x41 - 0x7e */
+		"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+		0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+		0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+		0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+		"◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+		"␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+		"⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+		"│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+	};
+
+	/*
+	 * The table is proudly stolen from rxvt.
+	 */
+	if(attr->mode & ATTR_GFX) {
+		if(c[0] >= 0x41 && c[0] <= 0x7e
+				&& vt100_0[c[0] - 0x41]) {
+			c = vt100_0[c[0] - 0x41];
+		}
+	}
+
+	term.dirty[y] = 1;
+	term.line[y][x] = *attr;
+	memcpy(term.line[y][x].c, c, UTF_SIZ);
+	term.line[y][x].state |= GLYPH_SET;
 }
 
 void
@@ -1054,7 +1259,9 @@ tdeletechar(int n) {
 		tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
 		return;
 	}
-	memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
+
+	memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
+			size * sizeof(Glyph));
 	tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
@@ -1070,7 +1277,9 @@ tinsertblank(int n) {
 		tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
 		return;
 	}
-	memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
+
+	memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
+			size * sizeof(Glyph));
 	tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
@@ -1097,38 +1306,57 @@ tsetattr(int *attr, int l) {
 	for(i = 0; i < l; i++) {
 		switch(attr[i]) {
 		case 0:
-			term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+			term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+					| ATTR_ITALIC | ATTR_BLINK);
 			term.c.attr.fg = DefaultFG;
 			term.c.attr.bg = DefaultBG;
 			break;
 		case 1:
 			term.c.attr.mode |= ATTR_BOLD;
 			break;
+		case 3: /* enter standout (highlight) */
+			term.c.attr.mode |= ATTR_ITALIC;
+			break;
 		case 4:
 			term.c.attr.mode |= ATTR_UNDERLINE;
 			break;
+		case 5:
+			term.c.attr.mode |= ATTR_BLINK;
+			break;
 		case 7:
 			term.c.attr.mode |= ATTR_REVERSE;
 			break;
+		case 21:
 		case 22:
 			term.c.attr.mode &= ~ATTR_BOLD;
 			break;
+		case 23: /* leave standout (highlight) mode */
+			term.c.attr.mode &= ~ATTR_ITALIC;
+			break;
 		case 24:
 			term.c.attr.mode &= ~ATTR_UNDERLINE;
 			break;
+		case 25:
+			term.c.attr.mode &= ~ATTR_BLINK;
+			break;
 		case 27:
 			term.c.attr.mode &= ~ATTR_REVERSE;
 			break;
 		case 38:
 			if(i + 2 < l && attr[i + 1] == 5) {
 				i += 2;
-				if(BETWEEN(attr[i], 0, 255))
+				if(BETWEEN(attr[i], 0, 255)) {
 					term.c.attr.fg = attr[i];
-				else
-					fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
+				} else {
+					fprintf(stderr,
+						"erresc: bad fgcolor %d\n",
+						attr[i]);
+				}
+			} else {
+				fprintf(stderr,
+					"erresc(38): gfx attr %d unknown\n",
+					attr[i]);
 			}
-			else
-				fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]);
 			break;
 		case 39:
 			term.c.attr.fg = DefaultFG;
@@ -1136,28 +1364,36 @@ tsetattr(int *attr, int l) {
 		case 48:
 			if(i + 2 < l && attr[i + 1] == 5) {
 				i += 2;
-				if(BETWEEN(attr[i], 0, 255))
+				if(BETWEEN(attr[i], 0, 255)) {
 					term.c.attr.bg = attr[i];
-				else
-					fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
+				} else {
+					fprintf(stderr,
+						"erresc: bad bgcolor %d\n",
+						attr[i]);
+				}
+			} else {
+				fprintf(stderr,
+					"erresc(48): gfx attr %d unknown\n",
+					attr[i]);
 			}
-			else
-				fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]);
 			break;
 		case 49:
 			term.c.attr.bg = DefaultBG;
 			break;
 		default:
-			if(BETWEEN(attr[i], 30, 37))
+			if(BETWEEN(attr[i], 30, 37)) {
 				term.c.attr.fg = attr[i] - 30;
-			else if(BETWEEN(attr[i], 40, 47))
+			} else if(BETWEEN(attr[i], 40, 47)) {
 				term.c.attr.bg = attr[i] - 40;
-			else if(BETWEEN(attr[i], 90, 97))
+			} else if(BETWEEN(attr[i], 90, 97)) {
 				term.c.attr.fg = attr[i] - 90 + 8;
-			else if(BETWEEN(attr[i], 100, 107))
-				term.c.attr.fg = attr[i] - 100 + 8;
-			else
-				fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
+			} else if(BETWEEN(attr[i], 100, 107)) {
+				term.c.attr.bg = attr[i] - 100 + 8;
+			} else {
+				fprintf(stderr,
+					"erresc(default): gfx attr %d unknown\n",
+					attr[i]), csidump();
+			}
 			break;
 		}
 	}
@@ -1184,24 +1420,27 @@ void
 tsetmode(bool priv, bool set, int *args, int narg) {
 	int *lim, mode;
 
-	for (lim = args + narg; args < lim; ++args) {
+	for(lim = args + narg; args < lim; ++args) {
 		if(priv) {
 			switch(*args) {
-			case 1:
+				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;
-				MODBIT(term.mode,set, MODE_REVERSE);
-				if (mode != term.mode)
-					draw();
+				MODBIT(term.mode, set, MODE_REVERSE);
+				if(mode != term.mode)
+					redraw();
+				break;
+			case 6: /* XXX: DECOM -- Origin */
 				break;
-			case 7:
+			case 7: /* DECAWM -- Auto wrap */
 				MODBIT(term.mode, set, MODE_WRAP);
 				break;
-			case 20:
-				MODBIT(term.mode, set, MODE_CRLF);
+			case 8: /* XXX: DECARM -- Auto repeat */
 				break;
+			case 0:  /* Error (IGNORED) */
 			case 12: /* att610 -- Start blinking cursor (IGNORED) */
 				break;
 			case 25:
@@ -1218,17 +1457,23 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 			case 1047:
 				if(IS_SET(MODE_ALTSCREEN))
 					tclearregion(0, 0, term.col-1, term.row-1);
-				if ((set && !IS_SET(MODE_ALTSCREEN)) ||
-				    (!set && IS_SET(MODE_ALTSCREEN))) {
-					    tswapscreen();
+				if((set && !IS_SET(MODE_ALTSCREEN)) ||
+						(!set && IS_SET(MODE_ALTSCREEN))) {
+					tswapscreen();
 				}
-				if (*args != 1049)
+				if(*args != 1049)
 					break;
 				/* pass through */
 			case 1048:
 				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
 				break;
 			default:
+			/* case 2:  DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
+			/* case 3:  DECCOLM -- Column  (NOT SUPPORTED) */
+			/* case 4:  DECSCLM -- Scroll (NOT SUPPORTED) */
+			/* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
+			/* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
+			/* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
 				fprintf(stderr,
 					"erresc: unknown private set/reset mode %d\n",
 					*args);
@@ -1236,9 +1481,19 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 			}
 		} else {
 			switch(*args) {
-			case 4:
+			case 0:  /* Error (IGNORED) */
+				break;
+			case 2:  /* KAM -- keyboard action */
+				MODBIT(term.mode, set, MODE_KBDLOCK);
+				break;
+			case 4:  /* IRM -- Insertion-replacement */
 				MODBIT(term.mode, set, MODE_INSERT);
 				break;
+			case 12: /* XXX: SRM -- Send/Receive */
+				break;
+			case 20: /* LNM -- Linefeed/new line */
+				MODBIT(term.mode, set, MODE_CRLF);
+				break;
 			default:
 				fprintf(stderr,
 					"erresc: unknown set/reset mode %d\n",
@@ -1273,6 +1528,10 @@ csihandle(void) {
 		DEFAULT(csiescseq.arg[0], 1);
 		tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
 		break;
+	case 'c': /* DA -- Device Attributes */
+		if(csiescseq.arg[0] == 0)
+			ttywrite(VT102ID, sizeof(VT102ID) - 1);
+		break;
 	case 'C': /* CUF -- Cursor <n> Forward */
 	case 'a':
 		DEFAULT(csiescseq.arg[0], 1);
@@ -1303,19 +1562,19 @@ 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);
 		break;
 	case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
 		DEFAULT(csiescseq.arg[0], 1);
-		while (csiescseq.arg[0]--)
+		while(csiescseq.arg[0]--)
 			tputtab(1);
 		break;
 	case 'J': /* ED -- Clear screen */
@@ -1380,7 +1639,7 @@ csihandle(void) {
 		break;
 	case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
 		DEFAULT(csiescseq.arg[0], 1);
-		while (csiescseq.arg[0]--)
+		while(csiescseq.arg[0]--)
 			tputtab(0);
 		break;
 	case 'd': /* VPA -- Move to <row> */
@@ -1394,9 +1653,9 @@ csihandle(void) {
 		tsetattr(csiescseq.arg, csiescseq.narg);
 		break;
 	case 'r': /* DECSTBM -- Set Scrolling Region */
-		if(csiescseq.priv)
+		if(csiescseq.priv) {
 			goto unknown;
-		else {
+		} else {
 			DEFAULT(csiescseq.arg[0], 1);
 			DEFAULT(csiescseq.arg[1], term.row);
 			tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
@@ -1415,14 +1674,22 @@ csihandle(void) {
 void
 csidump(void) {
 	int i;
+	uint c;
+
 	printf("ESC[");
 	for(i = 0; i < csiescseq.len; i++) {
-		uint c = csiescseq.buf[i] & 0xff;
-		if(isprint(c)) putchar(c);
-		else if(c == '\n') printf("(\\n)");
-		else if(c == '\r') printf("(\\r)");
-		else if(c == 0x1b) printf("(\\e)");
-		else printf("(%02x)", c);
+		c = csiescseq.buf[i] & 0xff;
+		if(isprint(c)) {
+			putchar(c);
+		} else if(c == '\n') {
+			printf("(\\n)");
+		} else if(c == '\r') {
+			printf("(\\r)");
+		} else if(c == 0x1b) {
+			printf("(\\e)");
+		} else {
+			printf("(%02x)", c);
+		}
 	}
 	putchar('\n');
 }
@@ -1441,7 +1708,7 @@ strhandle(void) {
 	 */
 	strparse();
 
-	p = strescseq.buf; 
+	p = strescseq.buf;
 
 	switch(strescseq.type) {
 	case ']': /* OSC -- Operating System Command */
@@ -1467,6 +1734,9 @@ strhandle(void) {
 			break;
 		}
 		break;
+	case 'k': /* old title set compatibility */
+		XStoreName(xw.dpy, xw.win, strescseq.buf);
+		break;
 	case 'P': /* DSC -- Device Control String */
 	case '_': /* APC -- Application Program Command */
 	case '^': /* PM -- Privacy Message */
@@ -1490,14 +1760,22 @@ strparse(void) {
 void
 strdump(void) {
 	int i;
+	uint c;
+
 	printf("ESC%c", strescseq.type);
 	for(i = 0; i < strescseq.len; i++) {
-		uint c = strescseq.buf[i] & 0xff;
-		if(isprint(c)) putchar(c);
-		else if(c == '\n') printf("(\\n)");
-		else if(c == '\r') printf("(\\r)");
-		else if(c == 0x1b) printf("(\\e)");
-		else printf("(%02x)", c);
+		c = strescseq.buf[i] & 0xff;
+		if(isprint(c)) {
+			putchar(c);
+		} else if(c == '\n') {
+			printf("(\\n)");
+		} else if(c == '\r') {
+			printf("(\\r)");
+		} else if(c == 0x1b) {
+			printf("(\\e)");
+		} else {
+			printf("(%02x)", c);
+		}
 	}
 	printf("ESC\\\n");
 }
@@ -1509,85 +1787,176 @@ strreset(void) {
 
 void
 tputtab(bool forward) {
-	unsigned x = term.c.x;
+	uint x = term.c.x;
 
-	if (forward) {
-		if (x == term.col)
+	if(forward) {
+		if(x == term.col)
 			return;
-		for (++x; x < term.col && !term.tabs[x]; ++x)
+		for(++x; x < term.col && !term.tabs[x]; ++x)
 			/* nothing */ ;
 	} else {
-		if (x == 0)
+		if(x == 0)
 			return;
-		for (--x; x > 0 && !term.tabs[x]; --x)
+		for(--x; x > 0 && !term.tabs[x]; --x)
 			/* nothing */ ;
 	}
 	tmoveto(x, term.c.y);
 }
 
 void
-tputc(char *c) {
-	char ascii = *c;
-	if(term.esc & ESC_START) {
+tputc(char *c, int len) {
+	uchar ascii = *c;
+	bool control = ascii < '\x20' || ascii == 0177;
+
+	if(iofd != -1) {
+		if (xwrite(iofd, c, len) < 0) {
+			fprintf(stderr, "Error writting in %s:%s\n",
+				opt_io, strerror(errno));
+			close(iofd);
+			iofd = -1;
+		}
+	}
+	/*
+	 * STR sequences must be checked before of anything
+	 * because it can use some control codes as part of the sequence
+	 */
+	if(term.esc & ESC_STR) {
+		switch(ascii) {
+		case '\033':
+			term.esc = ESC_START | ESC_STR_END;
+			break;
+		case '\a': /* backwards compatibility to xterm */
+			term.esc = 0;
+			strhandle();
+			break;
+		default:
+			strescseq.buf[strescseq.len++] = ascii;
+			if(strescseq.len+1 >= STR_BUF_SIZ) {
+				term.esc = 0;
+				strhandle();
+			}
+		}
+		return;
+	}
+	/*
+	 * Actions of control codes must be performed as soon they arrive
+	 * because they can be embedded inside a control sequence, and
+	 * they must not cause conflicts with sequences.
+	 */
+	if(control) {
+		switch(ascii) {
+		case '\t':	/* HT */
+			tputtab(1);
+			return;
+		case '\b':	/* BS */
+			tmoveto(term.c.x-1, term.c.y);
+			return;
+		case '\r':	/* CR */
+			tmoveto(0, term.c.y);
+			return;
+		case '\f':	/* LF */
+		case '\v':	/* VT */
+		case '\n':	/* LF */
+			/* go to first col if the mode is set */
+			tnewline(IS_SET(MODE_CRLF));
+			return;
+		case '\a':	/* BEL */
+			if(!(xw.state & WIN_FOCUSED))
+				xseturgency(1);
+			return;
+		case '\033':	/* ESC */
+			csireset();
+			term.esc = ESC_START;
+			return;
+		case '\016':	/* SO */
+			term.c.attr.mode |= ATTR_GFX;
+			return;
+		case '\017':	/* SI */
+			term.c.attr.mode &= ~ATTR_GFX;
+			return;
+		case '\032':	/* SUB */
+		case '\030':	/* CAN */
+			csireset();
+			return;
+		 case '\005':	/* ENQ (IGNORED) */
+		 case '\000':	/* NUL (IGNORED) */
+		 case '\021':	/* XON (IGNORED) */
+		 case '\023':	/* XOFF (IGNORED) */
+		 case 0177:	/* DEL (IGNORED) */
+			return;
+		}
+	} else if(term.esc & ESC_START) {
 		if(term.esc & ESC_CSI) {
 			csiescseq.buf[csiescseq.len++] = ascii;
-			if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) {
+			if(BETWEEN(ascii, 0x40, 0x7E)
+					|| csiescseq.len >= ESC_BUF_SIZ) {
 				term.esc = 0;
 				csiparse(), csihandle();
 			}
-		} else if(term.esc & ESC_STR) {
-			switch(ascii) {
-			case '\033':
-				term.esc = ESC_START | ESC_STR_END;
-				break;
-			case '\a': /* backwards compatibility to xterm */
-				term.esc = 0;
-				strhandle();
-				break;
-			default:
-				strescseq.buf[strescseq.len++] = ascii;
-				if (strescseq.len+1 >= STR_BUF_SIZ) {
-					term.esc = 0;
-					strhandle();
-				}
-			}
 		} else if(term.esc & ESC_STR_END) {
 			term.esc = 0;
 			if(ascii == '\\')
 				strhandle();
 		} else if(term.esc & ESC_ALTCHARSET) {
 			switch(ascii) {
-			case '0': /* Line drawing crap */
+			case '0': /* Line drawing set */
 				term.c.attr.mode |= ATTR_GFX;
 				break;
-			case 'B': /* Back to regular text */
+			case 'B': /* USASCII */
 				term.c.attr.mode &= ~ATTR_GFX;
 				break;
+			case 'A': /* UK (IGNORED) */
+			case '<': /* multinational charset (IGNORED) */
+			case '5': /* Finnish (IGNORED) */
+			case 'C': /* Finnish (IGNORED) */
+			case 'K': /* German (IGNORED) */
+				break;
 			default:
 				fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
 			}
 			term.esc = 0;
+		} else if(term.esc & ESC_TEST) {
+			if(ascii == '8') { /* DEC screen alignment test. */
+				char E[UTF_SIZ] = "E";
+				int x, y;
+
+				for(x = 0; x < term.col; ++x) {
+					for(y = 0; y < term.row; ++y)
+						tsetchar(E, &term.c.attr, x, y);
+				}
+			}
+			term.esc = 0;
 		} else {
 			switch(ascii) {
 			case '[':
 				term.esc |= ESC_CSI;
 				break;
+			case '#':
+				term.esc |= ESC_TEST;
+				break;
 			case 'P': /* DCS -- Device Control String */
 			case '_': /* APC -- Application Program Command */
 			case '^': /* PM -- Privacy Message */
 			case ']': /* OSC -- Operating System Command */
+			case 'k': /* old title set compatibility */
 				strreset();
 				strescseq.type = ascii;
 				term.esc |= ESC_STR;
 				break;
-			case '(':
+			case '(': /* set primary charset G0 */
 				term.esc |= ESC_ALTCHARSET;
 				break;
+			case ')': /* set secondary charset G1 (IGNORED) */
+			case '*': /* set tertiary charset G2 (IGNORED) */
+			case '+': /* set quaternary charset G3 (IGNORED) */
+				term.esc = 0;
+				break;
 			case 'D': /* IND -- Linefeed */
-				if(term.c.y == term.bot)
+				if(term.c.y == term.bot) {
 					tscrollup(term.top, 1);
-				else
+				} else {
 					tmoveto(term.c.x, term.c.y+1);
+				}
 				term.esc = 0;
 				break;
 			case 'E': /* NEL -- Next line */
@@ -1599,15 +1968,21 @@ tputc(char *c) {
 				term.esc = 0;
 				break;
 			case 'M': /* RI -- Reverse index */
-				if(term.c.y == term.top)
+				if(term.c.y == term.top) {
 					tscrolldown(term.top, 1);
-				else
+				} else {
 					tmoveto(term.c.x, term.c.y-1);
+				}
+				term.esc = 0;
+				break;
+			case 'Z': /* DECID -- Identify Terminal */
+				ttywrite(VT102ID, sizeof(VT102ID) - 1);
 				term.esc = 0;
 				break;
 			case 'c': /* RIS -- Reset to inital state */
 				treset();
 				term.esc = 0;
+				xresettitle();
 				break;
 			case '=': /* DECPAM -- Application keypad */
 				term.mode |= MODE_APPKEYPAD;
@@ -1630,47 +2005,30 @@ tputc(char *c) {
 				break;
 			default:
 				fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
-				    (uchar) ascii, isprint(ascii)?ascii:'.');
+					(uchar) ascii, isprint(ascii)? ascii:'.');
 				term.esc = 0;
 			}
 		}
-	} else {
-		if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
-			sel.bx = -1;
-		switch(ascii) {
-		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(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-				tnewline(1); /* always go to first col */
-			tsetchar(c);
-			if(term.c.x+1 < term.col)
-				tmoveto(term.c.x+1, term.c.y);
-			else
-				term.c.state |= CURSOR_WRAPNEXT;
-		}
+		/*
+		 * All characters which forms part of a sequence are not
+		 * printed
+		 */
+		return;
 	}
+	/*
+	 * Display control codes only if we are in graphic mode
+	 */
+	if(control && !(term.c.attr.mode & ATTR_GFX))
+		return;
+	if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+		sel.bx = -1;
+	if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+		tnewline(1); /* always go to first col */
+	tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+	if(term.c.x+1 < term.col)
+		tmoveto(term.c.x+1, term.c.y);
+	else
+		term.c.state |= CURSOR_WRAPNEXT;
 }
 
 int
@@ -1679,6 +2037,7 @@ tresize(int col, int row) {
 	int minrow = MIN(row, term.row);
 	int mincol = MIN(col, term.col);
 	int slide = term.c.y - row + 1;
+	bool *bp;
 
 	if(col < 1 || row < 1)
 		return 0;
@@ -1702,16 +2061,16 @@ tresize(int col, int row) {
 	}
 
 	/* resize to new height */
-	term.line = realloc(term.line, row * sizeof(Line));
-	term.alt  = realloc(term.alt,  row * sizeof(Line));
-	term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));
-	term.tabs = realloc(term.tabs, col * sizeof(*term.tabs));
+	term.line = xrealloc(term.line, row * sizeof(Line));
+	term.alt  = xrealloc(term.alt,  row * sizeof(Line));
+	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
+	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
 	/* resize each row to new width, zero-pad if needed */
 	for(i = 0; i < minrow; i++) {
 		term.dirty[i] = 1;
-		term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
-		term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
+		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
+		term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
 		for(x = mincol; x < col; x++) {
 			term.line[i][x].state = 0;
 			term.alt[i][x].state = 0;
@@ -1721,16 +2080,16 @@ tresize(int col, int row) {
 	/* allocate any new rows */
 	for(/* i == minrow */; i < row; i++) {
 		term.dirty[i] = 1;
-		term.line[i] = calloc(col, sizeof(Glyph));
-		term.alt [i] = calloc(col, sizeof(Glyph));
+		term.line[i] = xcalloc(col, sizeof(Glyph));
+		term.alt [i] = xcalloc(col, sizeof(Glyph));
 	}
-	if (col > term.col) {
-		bool *bp = term.tabs + term.col;
+	if(col > term.col) {
+		bp = term.tabs + term.col;
 
 		memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
-		while (--bp > term.tabs && !*bp)
+		while(--bp > term.tabs && !*bp)
 			/* nothing */ ;
-		for (bp += TAB; bp < term.tabs + col; bp += TAB)
+		for(bp += TAB; bp < term.tabs + col; bp += TAB)
 			*bp = 1;
 	}
 	/* update terminal size */
@@ -1745,118 +2104,141 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
-	xw.w = MAX(1, 2*BORDER + col * xw.cw);
-	xw.h = MAX(1, 2*BORDER + row * xw.ch);
+	xw.tw = MAX(1, 2*BORDER + col * xw.cw);
+	xw.th = MAX(1, 2*BORDER + row * xw.ch);
+
+	XftDrawChange(xw.xft_draw, xw.buf);
 }
 
 void
 xloadcols(void) {
 	int i, r, g, b;
-	XColor color;
-	ulong white = WhitePixel(xw.dpy, xw.scr);
+	XRenderColor xft_color = { .alpha = 0 };
 
 	/* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
 	for(i = 0; i < LEN(colorname); i++) {
 		if(!colorname[i])
 			continue;
-		if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
-			dc.col[i] = white;
-			fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
-		} else
-			dc.col[i] = color.pixel;
+		if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
+			die("Could not allocate color '%s'\n", colorname[i]);
+		}
 	}
 
 	/* 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++) {
-				color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
-				color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
-				color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
-				if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
-					dc.col[i] = white;
-					fprintf(stderr, "Could not allocate color %d\n", i);
-				} else
-					dc.col[i] = color.pixel;
+				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])) {
+					die("Could not allocate color %d\n", i);
+				}
 				i++;
 			}
+		}
+	}
 
 	for(r = 0; r < 24; r++, i++) {
-		color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-		if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
-			dc.col[i] = white;
-			fprintf(stderr, "Could not allocate color %d\n", i);
-		} else
-			dc.col[i] = color.pixel;
+		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])) {
+			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) {
-	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
 xhints(void) {
 	XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
 	XWMHints wm = {.flags = InputHint, .input = 1};
-	XSizeHints size = {
-		.flags = PSize | PResizeInc | PBaseSize,
-		.height = xw.h,
-		.width = xw.w,
-		.height_inc = xw.ch,
-		.width_inc = xw.cw,
-		.base_height = 2*BORDER,
-		.base_width = 2*BORDER,
-	};
-	XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
-}
-
-XFontSet
-xinitfont(char *fontstr) {
-	XFontSet set;
-	char *def, **missing;
-	int n;
-
-	missing = NULL;
-	set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
-	if(missing) {
-		while(n--)
-			fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
-		XFreeStringList(missing);
+	XSizeHints *sizeh = NULL;
+
+	sizeh = XAllocSizeHints();
+	if(xw.isfixed == False) {
+		sizeh->flags = PSize | PResizeInc | PBaseSize;
+		sizeh->height = xw.h;
+		sizeh->width = xw.w;
+		sizeh->height_inc = xw.ch;
+		sizeh->width_inc = xw.cw;
+		sizeh->base_height = 2*BORDER;
+		sizeh->base_width = 2*BORDER;
+	} else {
+		sizeh->flags = PMaxSize | PMinSize;
+		sizeh->min_width = sizeh->max_width = xw.fw;
+		sizeh->min_height = sizeh->max_height = xw.fh;
 	}
-	return set;
+
+	XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+	XFree(sizeh);
 }
 
 void
-xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {
-	XFontStruct **xfonts;
-	char **font_names;
-	int i, n;
+xinitfont(Font *f, char *fontstr) {
+	FcPattern *pattern, *match;
+	FcResult result;
 
-	*ascent = *descent = *lbearing = *rbearing = 0;
-	n = XFontsOfFontSet(set, &xfonts, &font_names);
-	for(i = 0; i < n; i++) {
-		*ascent = MAX(*ascent, (*xfonts)->ascent);
-		*descent = MAX(*descent, (*xfonts)->descent);
-		*lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing);
-		*rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing);
-		xfonts++;
+	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);
 	}
+
+	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
-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);
-	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);
+initfonts(char *fontstr) {
+	char *fstr;
+
+	xinitfont(&dc.font, fontstr);
+	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
@@ -1864,44 +2246,62 @@ xinit(void) {
 	XSetWindowAttributes attrs;
 	Cursor cursor;
 	Window parent;
+	int sw, sh, major, minor;
 
 	if(!(xw.dpy = XOpenDisplay(NULL)))
 		die("Can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
+	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
 	/* font */
-	initfonts(FONT, BOLDFONT);
-
-	/* 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);
 	xloadcols();
 
-	/* window - default size */
-	xw.h = 2*BORDER + term.row * xw.ch;
-	xw.w = 2*BORDER + term.col * xw.cw;
+	/* adjust fixed window geometry */
+	if(xw.isfixed) {
+		sw = DisplayWidth(xw.dpy, xw.scr);
+		sh = DisplayHeight(xw.dpy, xw.scr);
+		if(xw.fx < 0)
+			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.fx = 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
-		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
-		| EnterWindowMask | LeaveWindowMask;
+		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	attrs.colormap = xw.cmap;
 
 	parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
-	xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
+	xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
 			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-			XDefaultVisual(xw.dpy, xw.scr),
+			xw.vis,
 			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
 			| CWColormap,
 			&attrs);
+
+	/* double buffering */
+	if(!XdbeQueryExtension(xw.dpy, &major, &minor))
+		die("Xdbe extension is not present\n");
 	xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
 
+	/* Xft rendering context */
+	xw.xft_draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
 	/* input methods */
 	xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
@@ -1919,8 +2319,10 @@ xinit(void) {
 		&(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
 	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+	XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
-	XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+	xresettitle();
 	XMapWindow(xw.dpy, xw.win);
 	xhints();
 	XSync(xw.dpy, 0);
@@ -1928,58 +2330,97 @@ xinit(void) {
 
 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;
-	XFontSet fontset = dc.font.set;
-	int i;
-
-	/* 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;
-	}
+	int winx = BORDER + x * xw.cw, winy = BORDER + y * xw.ch,
+	    width = charlen * xw.cw;
+	Font *font = &dc.font;
+	XGlyphInfo extents;
+	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_BOLD) {
-		fg += 8;
-		fontset = dc.bfont.set;
+		if(BETWEEN(base.fg, 0, 7)) {
+			/* basic system colors */
+			fg = &dc.xft_col[base.fg + 8];
+		} else if(BETWEEN(base.fg, 16, 195)) {
+			/* 256 colors */
+			fg = &dc.xft_col[base.fg + 36];
+		} else if(BETWEEN(base.fg, 232, 251)) {
+			/* greyscale */
+			fg = &dc.xft_col[base.fg + 4];
+		}
+		/*
+		 * Those ranges will not be brightened:
+		 *	8 - 15 – bright system colors
+		 *	196 - 231 – highest 256 color cube
+		 *	252 - 255 – brightest colors in greyscale
+		 */
+		font = &dc.bfont;
 	}
 
-	XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
-	XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
+	if(base.mode & ATTR_ITALIC)
+		font = &dc.ifont;
+	if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+		font = &dc.ibfont;
 
-	if(base.mode & ATTR_GFX) {
-		for(i = 0; i < bytelen; i++) {
-			char c = gfx[(uint)s[i] % 256];
-			if(c)
-				s[i] = c;
-			else if(s[i] > 0x5f)
-				s[i] -= 0x5f;
+	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;
 		}
-	}
-
-	XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen);
 
-	if(base.mode & ATTR_UNDERLINE)
-		XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
-}
+		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;
+		}
+	}
 
-/* copy buffer pixmap to screen pixmap */
-void
-xcopy() {
-	XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
-	XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+	XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
+			&extents);
+	width = extents.xOff;
 
+	/* Intelligent cleaning up of the borders. */
+	if(x == 0) {
+		xclear(0, (y == 0)? 0 : winy, BORDER,
+			winy + xw.ch + (y == term.row-1)? xw.h : 0);
+	}
+	if(x + charlen >= term.col-1) {
+		xclear(winx + width, (y == 0)? 0 : winy, xw.w,
+			(y == term.row-1)? xw.h : (winy + xw.ch));
+	}
+	if(y == 0)
+		xclear(winx, 0, winx + width, BORDER);
+	if(y == term.row-1)
+		xclear(winx, winy + xw.ch, winx + width, xw.h);
+
+	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
 xdrawcursor(void) {
-	static int oldx = 0;
-	static int oldy = 0;
+	static int oldx = 0, oldy = 0;
 	int sl;
 	Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
 
@@ -1992,11 +2433,11 @@ xdrawcursor(void) {
 	/* remove the old cursor */
 	if(term.line[oldy][oldx].state & GLYPH_SET) {
 		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);
-
-	xcopy(oldx, oldy, 1, 1);
+		xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
+				oldy, 1, sl);
+	} else {
+		xtermclear(oldx, oldy, oldx, oldy);
+	}
 
 	/* draw the new one */
 	if(!(term.c.state & CURSOR_HIDE)) {
@@ -2010,15 +2451,29 @@ xdrawcursor(void) {
 		xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
 		oldx = term.c.x, oldy = term.c.y;
 	}
+}
 
-	xcopy(term.c.x, term.c.y, 1, 1);
+void
+xresettitle(void) {
+	XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+}
+
+void
+redraw(void) {
+	struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+
+	tfulldirt();
+	draw();
+	XSync(xw.dpy, False); /* necessary for a good tput flash */
+	nanosleep(&tv, NULL);
 }
 
 void
-draw() {
+draw(void) {
+	XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
+
 	drawregion(0, 0, term.col, term.row);
-	xcopy();
-	gettimeofday(&xw.lastdraw, NULL);
+	XdbeSwapBuffers(xw.dpy, swpinfo, 1);
 }
 
 void
@@ -2026,23 +2481,28 @@ drawregion(int x1, int y1, int x2, int y2) {
 	int ic, ib, x, y, ox, sl;
 	Glyph base, new;
 	char buf[DRAW_BUF_SIZ];
+	bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);
 
+	if((sel.alt && !alt) || (!sel.alt && alt))
+		ena_sel = 0;
 	if(!(xw.state & WIN_VISIBLE))
 		return;
 
 	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;
 		for(x = x1; x < x2; x++) {
 			new = term.line[y][x];
-			if(sel.bx != -1 && *(new.c) && selected(x, y))
+			if(ena_sel && *(new.c) && selected(x, y))
 				new.mode ^= ATTR_REVERSE;
-			if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-						  ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+			if(ib > 0 && (!(new.state & GLYPH_SET)
+					|| ATTRCMP(base, new)
+					|| ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
 				xdraws(buf, base, ox, y, ic, ib);
 				ic = ib = 0;
 			}
@@ -2066,21 +2526,23 @@ drawregion(int x1, int y1, int x2, int y2) {
 void
 expose(XEvent *ev) {
 	XExposeEvent *e = &ev->xexpose;
+
 	if(xw.state & WIN_REDRAW) {
 		if(!e->count)
 			xw.state &= ~WIN_REDRAW;
 	}
-	xcopy();
 }
 
 void
 visibility(XEvent *ev) {
 	XVisibilityEvent *e = &ev->xvisibility;
-	if(e->state == VisibilityFullyObscured)
+
+	if(e->state == VisibilityFullyObscured) {
 		xw.state &= ~WIN_VISIBLE;
-	else if(!(xw.state & WIN_VISIBLE))
+	} else if(!(xw.state & WIN_VISIBLE)) {
 		/* need a full redraw for next Expose, not just a buf copy */
 		xw.state |= WIN_VISIBLE | WIN_REDRAW;
+	}
 }
 
 void
@@ -2091,6 +2553,7 @@ unmap(XEvent *ev) {
 void
 xseturgency(int add) {
 	XWMHints *h = XGetWMHints(xw.dpy, xw.win);
+
 	h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
 	XSetWMHints(xw.dpy, xw.win, h);
 	XFree(h);
@@ -2101,19 +2564,24 @@ focus(XEvent *ev) {
 	if(ev->type == FocusIn) {
 		xw.state |= WIN_FOCUSED;
 		xseturgency(0);
-	} else
+	} else {
 		xw.state &= ~WIN_FOCUSED;
-	draw();
+	}
 }
 
 char*
 kmap(KeySym k, uint state) {
 	int i;
+	uint mask;
+
 	state &= ~Mod2Mask;
 	for(i = 0; i < LEN(key); i++) {
-		uint mask = key[i].mask;
-		if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
+		mask = key[i].mask;
+
+		if(key[i].k == k && ((state & mask) == mask
+				|| (mask == XK_NO_MOD && !state))) {
 			return (char*)key[i].s;
+		}
 	}
 	return NULL;
 }
@@ -2129,22 +2597,27 @@ kpress(XEvent *ev) {
 	int shift;
 	Status status;
 
+	if (IS_SET(MODE_KBDLOCK))
+		return;
+
 	meta = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
 	len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 
 	/* 1. custom keys from config.h */
-	if((customkey = kmap(ksym, e->state)))
+	if((customkey = kmap(ksym, e->state))) {
 		ttywrite(customkey, strlen(customkey));
 	/* 2. hardcoded (overrides X lookup) */
-	else
+	} else {
 		switch(ksym) {
 		case XK_Up:
 		case XK_Down:
 		case XK_Left:
 		case XK_Right:
 			/* XXX: shift up/down doesn't work */
-			sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
+			sprintf(buf, "\033%c%c",
+				IS_SET(MODE_APPKEYPAD) ? 'O' : '[',
+				(shift ? "dacb":"DACB")[ksym - XK_Left]);
 			ttywrite(buf, 3);
 			break;
 		case XK_Insert:
@@ -2152,10 +2625,11 @@ kpress(XEvent *ev) {
 				selpaste();
 			break;
 		case XK_Return:
-			if(IS_SET(MODE_CRLF))
+			if(IS_SET(MODE_CRLF)) {
 				ttywrite("\r\n", 2);
-			else
+			} else {
 				ttywrite("\r", 1);
+			}
 			break;
 			/* 3. X lookup  */
 		default:
@@ -2166,20 +2640,24 @@ kpress(XEvent *ev) {
 			}
 			break;
 		}
+	}
 }
 
 void
 cmessage(XEvent *e) {
 	/* See xembed specs
 	   http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
-	if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
-		if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+	if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+		if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
 			xw.state |= WIN_FOCUSED;
 			xseturgency(0);
-		} else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+		} else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
 			xw.state &= ~WIN_FOCUSED;
 		}
-		draw();
+	} else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+		/* Send SIGHUP to shell */
+		kill(pid, SIGHUP);
+		exit(EXIT_SUCCESS);
 	}
 }
 
@@ -2196,47 +2674,47 @@ resize(XEvent *e) {
 	row = (xw.h - 2*BORDER) / xw.ch;
 	if(col == term.col && row == term.row)
 		return;
-	if(tresize(col, row))
-		draw();
-	ttyresize(col, row);
-	xresize(col, row);
-}
 
-bool
-last_draw_too_old(void) {
-	struct timeval now;
-	gettimeofday(&now, NULL);
-	return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000;
+	tresize(col, row);
+	xresize(col, row);
+	ttyresize();
 }
 
 void
 run(void) {
 	XEvent ev;
 	fd_set rfd;
-	int xfd = XConnectionNumber(xw.dpy);
-	struct timeval timeout = {0};
-	bool stuff_to_print = 0;
+	int xfd = XConnectionNumber(xw.dpy), i;
+	struct timeval drawtimeout, *tv = NULL;
 
-	for(;;) {
+	for(i = 0;; i++) {
 		FD_ZERO(&rfd);
 		FD_SET(cmdfd, &rfd);
 		FD_SET(xfd, &rfd);
-		timeout.tv_sec  = 0;
-		timeout.tv_usec = SELECT_TIMEOUT;
-		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) {
+		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
 			if(errno == EINTR)
 				continue;
 			die("select failed: %s\n", SERRNO);
 		}
-		if(FD_ISSET(cmdfd, &rfd)) {
+
+		/*
+		 * Stop after a certain number of reads so the user does not
+		 * feel like the system is stuttering.
+		 */
+		if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {
 			ttyread();
-			stuff_to_print = 1;
-		}
 
-		if(stuff_to_print && last_draw_too_old()) {
-			stuff_to_print = 0;
-			draw();
+			/*
+			 * Just wait a bit so it isn't disturbing the
+			 * user and the system is able to write something.
+			 */
+			drawtimeout.tv_sec = 0;
+			drawtimeout.tv_usec = 5;
+			tv = &drawtimeout;
+			continue;
 		}
+		i = 0;
+		tv = NULL;
 
 		while(XPending(xw.dpy)) {
 			XNextEvent(xw.dpy, &ev);
@@ -2245,35 +2723,75 @@ run(void) {
 			if(handler[ev.type])
 				(handler[ev.type])(&ev);
 		}
+
+		draw();
+		XFlush(xw.dpy);
 	}
 }
 
 int
 main(int argc, char *argv[]) {
-	int i;
+	int i, bitm, xr, yr;
+	uint 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]) {
-		case 't':
-			if(++i < argc) opt_title = argv[i];
-			break;
 		case 'c':
-			if(++i < argc) opt_class = argv[i];
-			break;
-		case 'w':
-			if(++i < argc) opt_embed = argv[i];
+			if(++i < argc)
+				opt_class = argv[i];
 			break;
 		case 'e':
 			/* eat every remaining arguments */
-			if(++i < argc) opt_cmd = &argv[i];
+			if(++i < argc)
+				opt_cmd = &argv[i];
 			goto run;
+		case 'f':
+			if(++i < argc)
+				opt_font = argv[i];
+			break;
+		case 'g':
+			if(++i >= argc)
+				break;
+
+			bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr);
+			if(bitm & XValue)
+				xw.fx = xr;
+			if(bitm & YValue)
+				xw.fy = yr;
+			if(bitm & WidthValue)
+				xw.fw = (int)wr;
+			if(bitm & HeightValue)
+				xw.fh = (int)hr;
+			if(bitm & XNegative && xw.fx == 0)
+				xw.fx = -1;
+			if(bitm & XNegative && xw.fy == 0)
+				xw.fy = -1;
+
+			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 'w':
+			if(++i < argc)
+				opt_embed = argv[i];
+			break;
 		}
 	}
 
- run:
+run:
 	setlocale(LC_CTYPE, "");
 	tnew(80, 24);
 	ttynew();
@@ -2282,3 +2800,4 @@ main(int argc, char *argv[]) {
 	run();
 	return 0;
 }
+