X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=4d543d19627f0e6dfb15b510ca4e8b46360987ee;hb=9df9a4723dedf4f5e12c954376c4931a6976b918;hp=a7f957b1c52ee6ba40e89c46af79c2cae25c8437;hpb=44d8c319a9fe51b011ba6a44779659aec45023a7;p=st.git

diff --git a/st.c b/st.c
index a7f957b..4d543d1 100644
--- a/st.c
+++ b/st.c
@@ -1,167 +1,1160 @@
 /* See LICENSE for licence details. */
-#define _XOPEN_SOURCE
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <locale.h>
+#include <pwd.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <stdint.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
 #include <unistd.h>
+#include <libgen.h>
+#include <X11/Xatom.h>
 #include <X11/Xlib.h>
-#include <X11/keysym.h>
 #include <X11/Xutil.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+#include <X11/Xft/Xft.h>
+#include <fontconfig/fontconfig.h>
+#include <wchar.h>
 
-#define TNAME "st"
+#include "arg.h"
 
-/* Arbitrary sizes */
-#define ESCSIZ 256
-#define ESCARG 16
+char *argv0;
+
+#define Glyph Glyph_
+#define Font Font_
+#define Draw XftDraw *
+#define Colour XftColor
+#define Colourmap Colormap
+#define Rectangle XRectangle
 
+#if   defined(__linux)
+ #include <pty.h>
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
+ #include <util.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <libutil.h>
+#endif
+
+
+/* XEMBED messages */
+#define XEMBED_FOCUS_IN  4
+#define XEMBED_FOCUS_OUT 5
+
+/* Arbitrary sizes */
+#define UTF_SIZ       4
+#define ESC_BUF_SIZ   (128*UTF_SIZ)
+#define ESC_ARG_SIZ   16
+#define STR_BUF_SIZ   ESC_BUF_SIZ
+#define STR_ARG_SIZ   ESC_ARG_SIZ
+#define DRAW_BUF_SIZ  20*1024
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
+
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
+
+/* macros */
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define LEN(a)     (sizeof(a) / sizeof(a[0]))
-#define DEFAULT(a, b)     (a) = (a) ? (a) : (b)    
+#define DEFAULT(a, b)     (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-
-/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
-enum { ATnone=0 , ATreverse=1 , ATunderline=2, ATbold=4 };
-enum { CSup, CSdown, CSright, CSleft, CShide, CSdraw, CSwrap, CSsave, CSload };
-enum { CRset=1, CRupdate=2 };
-enum { TMwrap=1, TMinsert=2 };
-enum { SCupdate, SCredraw };
-
-typedef int Color;
-
-typedef struct {
-	KeySym k;
-	char s[ESCSIZ];
-} Key;
+#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
+#define IS_SET(flag) ((term.mode & (flag)) != 0)
+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
+#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+
+#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
+#define IS_TRUECOL(x)    (1 << 24 & (x))
+#define TRUERED(x)       (((x) & 0xff0000) >> 8)
+#define TRUEGREEN(x)     (((x) & 0xff00))
+#define TRUEBLUE(x)      (((x) & 0xff) << 8)
+
+
+#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,
+	ATTR_WRAP      = 64,
+	ATTR_WIDE      = 128,
+	ATTR_WDUMMY    = 256,
+};
+
+enum cursor_movement {
+	CURSOR_SAVE,
+	CURSOR_LOAD
+};
+
+enum cursor_state {
+	CURSOR_DEFAULT  = 0,
+	CURSOR_WRAPNEXT = 1,
+	CURSOR_ORIGIN   = 2
+};
+
+enum term_mode {
+	MODE_WRAP        = 1,
+	MODE_INSERT      = 2,
+	MODE_APPKEYPAD   = 4,
+	MODE_ALTSCREEN   = 8,
+	MODE_CRLF        = 16,
+	MODE_MOUSEBTN    = 32,
+	MODE_MOUSEMOTION = 64,
+	MODE_REVERSE     = 128,
+	MODE_KBDLOCK     = 256,
+	MODE_HIDE        = 512,
+	MODE_ECHO        = 1024,
+	MODE_APPCURSOR   = 2048,
+	MODE_MOUSESGR    = 4096,
+	MODE_8BIT        = 8192,
+	MODE_BLINK       = 16384,
+	MODE_FBLINK      = 32768,
+	MODE_FOCUS       = 65536,
+	MODE_MOUSEX10    = 131072,
+	MODE_MOUSEMANY   = 262144,
+	MODE_BRCKTPASTE  = 524288,
+	MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
+	                  |MODE_MOUSEMANY,
+};
+
+enum charset {
+	CS_GRAPHIC0,
+	CS_GRAPHIC1,
+	CS_UK,
+	CS_USA,
+	CS_MULTI,
+	CS_GER,
+	CS_FIN
+};
+
+enum escape_state {
+	ESC_START      = 1,
+	ESC_CSI        = 2,
+	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 {
+	WIN_VISIBLE = 1,
+	WIN_REDRAW  = 2,
+	WIN_FOCUSED = 4
+};
+
+enum selection_type {
+	SEL_REGULAR = 1,
+	SEL_RECTANGULAR = 2
+};
+
+enum selection_snap {
+	SNAP_WORD = 1,
+	SNAP_LINE = 2
+};
+
+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned short ushort;
 
 typedef struct {
-	char c;     /* character code  */
-	char mode;  /* attribute flags */
-	Color fg;   /* foreground      */
-	Color bg;   /* background      */
-	char state; /* state flag      */
+	char c[UTF_SIZ]; /* character code */
+	ushort mode;      /* attribute flags */
+	uint32_t fg;      /* foreground  */
+	uint32_t bg;      /* background  */
 } Glyph;
 
-typedef Glyph* Line;
+typedef Glyph *Line;
 
 typedef struct {
-	Glyph attr;  /* current char attributes */
-	char hidden;
+	Glyph attr; /* current char attributes */
 	int x;
 	int y;
+	char state;
 } TCursor;
 
-/* Escape sequence structs */
-/* ESC <pre> [[ [<priv>] <arg> [;]] <mode>] */
+/* CSI Escape sequence structs */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
-	char buf[ESCSIZ+1]; /* raw string */
-	int len;            /* raw string length */
-	char pre;           
+	char buf[ESC_BUF_SIZ]; /* raw string */
+	int len;               /* raw string length */
 	char priv;
-	int arg[ESCARG+1];
-	int narg;           /* nb of args */
+	int arg[ESC_ARG_SIZ];
+	int narg;              /* nb of args */
 	char mode;
-} Escseq;
+} CSIEscape;
+
+/* STR Escape sequence structs */
+/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
+typedef struct {
+	char type;             /* ESC type ... */
+	char buf[STR_BUF_SIZ]; /* raw string */
+	int len;               /* raw string length */
+	char *args[STR_ARG_SIZ];
+	int narg;              /* nb of args */
+} STREscape;
 
 /* Internal representation of the screen */
 typedef struct {
-	int row;    /* nb row */  
-	int col;    /* nb col */
-	Line* line; /* screen */
-	TCursor c;  /* cursor */
-	int top;    /* top    scroll limit */
-	int bot;    /* bottom scroll limit */
-	int mode;   /* terminal mode */
+	int row;      /* nb row */
+	int col;      /* nb col */
+	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 */
+	int mode;     /* terminal mode flags */
+	int esc;      /* escape state flags */
+	char trantbl[4]; /* charset table translation */
+	int charset;  /* current charset */
+	int icharset; /* selected charset for sequence */
+	bool numlock; /* lock numbers in keyboard */
+	bool *tabs;
 } Term;
 
 /* Purely graphic info */
 typedef struct {
-	Display* dis;
+	Display *dpy;
+	Colourmap cmap;
 	Window win;
+	Drawable buf;
+	Atom xembed, wmdeletewin, netwmname, netwmpid;
+	XIM xim;
+	XIC xic;
+	Draw draw;
+	Visual *vis;
+	XSetWindowAttributes attrs;
 	int scr;
-	int w;  /* window width  */
-	int h;  /* window height */
+	bool isfixed; /* is fixed geometry? */
+	int fx, fy, fw, fh; /* fixed geometry */
+	int tw, th; /* tty width and height */
+	int w, h; /* window width and height */
 	int ch; /* char height */
 	int cw; /* char width  */
-} XWindow; 
+	char state; /* focus, redraw, visible */
+} XWindow;
 
+typedef struct {
+	uint b;
+	uint mask;
+	char *s;
+} Mousekey;
+
+typedef struct {
+	KeySym k;
+	uint mask;
+	char *s;
+	/* three valued logic variables: 0 indifferent, 1 on, -1 off */
+	signed char appkey;    /* application keypad */
+	signed char appcursor; /* application cursor */
+	signed char crlf;      /* crlf mode          */
+} Key;
+
+typedef struct {
+	int mode;
+	int type;
+	int snap;
+	/*
+	 * Selection variables:
+	 * nb – normalized coordinates of the beginning of the selection
+	 * ne – normalized coordinates of the end of the selection
+	 * ob – original coordinates of the beginning of the selection
+	 * oe – original coordinates of the end of the selection
+	 */
+	struct {
+		int x, y;
+	} nb, ne, ob, oe;
+
+	char *clip;
+	Atom xtarget;
+	bool alt;
+	struct timeval tclick1;
+	struct timeval tclick2;
+} Selection;
+
+typedef union {
+	int i;
+	unsigned int ui;
+	float f;
+	const void *v;
+} Arg;
+
+typedef struct {
+	unsigned int mod;
+	KeySym keysym;
+	void (*func)(const Arg *);
+	const Arg arg;
+} Shortcut;
+
+/* function definitions used in config.h */
+static void clippaste(const Arg *);
+static void numlock(const Arg *);
+static void selpaste(const Arg *);
+static void xzoom(const Arg *);
+
+/* Config.h for applying patches and the configuration. */
 #include "config.h"
 
+/* Font structure */
+typedef struct {
+	int height;
+	int width;
+	int ascent;
+	int descent;
+	short lbearing;
+	short rbearing;
+	XftFont *match;
+	FcFontSet *set;
+	FcPattern *pattern;
+} Font;
+
 /* Drawing Context */
 typedef struct {
-	unsigned long col[LEN(colorname)];
-	XFontStruct* font;
+	Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+	Font font, bfont, ifont, ibfont;
 	GC gc;
 } DC;
 
-void die(const char *errstr, ...);
-void draw(int);
-void execsh(void);
-void sigchld(int);
-char* kmap(KeySym);
-void kpress(XKeyEvent *);
-void resize(XEvent *);
-void run(void);
-
-int escaddc(char);
-int escfinal(char);
-void escdump(void);
-void eschandle(void);
-void escparse(void);
-void escreset(void);
-
-void tclearregion(int, int, int, int);
-void tcpos(int);
-void tcursor(int);
-void tdeletechar(int);
-void tdeleteline(int);
-void tdump(void);
-void tinsertblank(int);
-void tinsertblankline(int);
-void tmoveto(int, int);
-void tnew(int, int);
-void tnewline(void);
-void tputc(char);
-void tputs(char*, int);
-void tresize(int, int);
-void tscroll(void);
-void tsetattr(int*, int);
-void tsetchar(char);
-void tsetscroll(int, int);
-
-void ttynew(void);
-void ttyread(void);
-void ttyresize(int, int);
-void ttywrite(char *, size_t);
-
-unsigned long xgetcol(const char *);
-void xclear(int, int, int, int);
-void xcursor(int);
-void xdrawc(int, int, Glyph);
-void xinit(void);
-void xscroll(void);
+static void die(const char *, ...);
+static void draw(void);
+static void redraw(int);
+static void drawregion(int, int, int, int);
+static void execsh(void);
+static void sigchld(int);
+static void run(void);
+
+static void csidump(void);
+static void csihandle(void);
+static void csiparse(void);
+static void csireset(void);
+static void strdump(void);
+static void strhandle(void);
+static void strparse(void);
+static void strreset(void);
+
+static int tattrset(int);
+static void tclearregion(int, int, int, int);
+static void tcursor(int);
+static void tdeletechar(int);
+static void tdeleteline(int);
+static void tinsertblank(int);
+static void tinsertblankline(int);
+static void tmoveto(int, int);
+static void tmoveato(int x, int y);
+static void tnew(int, int);
+static void tnewline(int);
+static void tputtab(bool);
+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 *, Glyph *, int, int);
+static void tsetscroll(int, int);
+static void tswapscreen(void);
+static void tsetdirt(int, int);
+static void tsetdirtattr(int);
+static void tsetmode(bool, bool, int *, int);
+static void tfulldirt(void);
+static void techo(char *, int);
+static int32_t tdefcolor(int *, int *, int);
+static void tselcs(void);
+static void tdeftran(char);
+static inline bool match(uint, uint);
+static void ttynew(void);
+static void ttyread(void);
+static void ttyresize(void);
+static void ttysend(char *, size_t);
+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 xdrawcursor(void);
+static void xinit(void);
+static void xloadcols(void);
+static int xsetcolorname(int, const char *);
+static int xloadfont(Font *, FcPattern *);
+static void xloadfonts(char *, double);
+static int xloadfontset(Font *);
+static void xsettitle(char *);
+static void xresettitle(void);
+static void xsetpointermotion(int);
+static void xseturgency(int);
+static void xsetsel(char*);
+static void xtermclear(int, int, int, int);
+static void xunloadfont(Font *f);
+static void xunloadfonts(void);
+static void xresize(int, int);
+
+static void expose(XEvent *);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
+static char *kmap(KeySym, uint);
+static void kpress(XEvent *);
+static void cmessage(XEvent *);
+static void cresize(int, int);
+static void resize(XEvent *);
+static void focus(XEvent *);
+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 void selsort(void);
+static inline bool selected(int, int);
+static void selcopy(void);
+static void selscroll(int, int);
+static void selsnap(int, int *, int *, int);
+
+static int utf8decode(char *, long *);
+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 (*handler[LASTEvent])(XEvent *) = {
+	[KeyPress] = kpress,
+	[ClientMessage] = cmessage,
+	[ConfigureNotify] = resize,
+	[VisibilityNotify] = visibility,
+	[UnmapNotify] = unmap,
+	[Expose] = expose,
+	[FocusIn] = focus,
+	[FocusOut] = focus,
+	[MotionNotify] = bmotion,
+	[ButtonPress] = bpress,
+	[ButtonRelease] = brelease,
+	[SelectionClear] = selclear,
+	[SelectionNotify] = selnotify,
+	[SelectionRequest] = selrequest,
+};
 
 /* Globals */
-DC dc;
-XWindow xw;
-Term term;
-Escseq escseq;
-int cmdfd;
-pid_t pid;
-int running;
+static DC dc;
+static XWindow xw;
+static Term term;
+static CSIEscape csiescseq;
+static STREscape strescseq;
+static int cmdfd;
+static pid_t pid;
+static Selection sel;
+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;
+static int oldbutton = 3; /* button event on startup: 3 = release */
+
+static char *usedfont = NULL;
+static double usedfontsize = 0;
+
+/* Font Ring Cache */
+enum {
+	FRC_NORMAL,
+	FRC_ITALIC,
+	FRC_BOLD,
+	FRC_ITALICBOLD
+};
+
+typedef struct {
+	XftFont *font;
+	int flags;
+} Fontcache;
+
+/* Fontcache is an array now. A new font will be appended to the array. */
+static Fontcache frc[16];
+static int frclen = 0;
+
+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;
+}
+
+int
+utf8decode(char *s, long *u) {
+	uchar c;
+	int i, n, rtn;
+
+	rtn = 1;
+	c = *s;
+	if(~c & 0x80) { /* 0xxxxxxx */
+		*u = c;
+		return rtn;
+	} else if((c & 0xE0) == 0xC0) { /* 110xxxxx */
+		*u = c & 0x1F;
+		n = 1;
+	} else if((c & 0xF0) == 0xE0) { /* 1110xxxx */
+		*u = c & 0x0F;
+		n = 2;
+	} else if((c & 0xF8) == 0xF0) { /* 11110xxx */
+		*u = c & 0x07;
+		n = 3;
+	} else {
+		goto invalid;
+	}
+
+	for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
+		c = *s;
+		if((c & 0xC0) != 0x80) /* 10xxxxxx */
+			goto invalid;
+		*u <<= 6;
+		*u |= c & 0x3F;
+	}
+
+	if((n == 1 && *u < 0x80) ||
+	   (n == 2 && *u < 0x800) ||
+	   (n == 3 && *u < 0x10000) ||
+	   (*u >= 0xD800 && *u <= 0xDFFF)) {
+		goto invalid;
+	}
+
+	return rtn;
+invalid:
+	*u = 0xFFFD;
+
+	return rtn;
+}
+
+int
+utf8encode(long *u, char *s) {
+	uchar *sp;
+	ulong uc;
+	int i, n;
+
+	sp = (uchar *)s;
+	uc = *u;
+	if(uc < 0x80) {
+		*sp = uc; /* 0xxxxxxx */
+		return 1;
+	} else if(*u < 0x800) {
+		*sp = (uc >> 6) | 0xC0; /* 110xxxxx */
+		n = 1;
+	} else if(uc < 0x10000) {
+		*sp = (uc >> 12) | 0xE0; /* 1110xxxx */
+		n = 2;
+	} else if(uc <= 0x10FFFF) {
+		*sp = (uc >> 18) | 0xF0; /* 11110xxx */
+		n = 3;
+	} else {
+		goto invalid;
+	}
+
+	for(i=n,++sp; i>0; --i,++sp)
+		*sp = ((uc >> 6*(i-1)) & 0x3F) | 0x80; /* 10xxxxxx */
+
+	return n+1;
+invalid:
+	/* U+FFFD */
+	*s++ = '\xEF';
+	*s++ = '\xBF';
+	*s = '\xBD';
+
+	return 3;
+}
+
+/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
+   UTF-8 otherwise return 0 */
+int
+isfullutf8(char *s, int b) {
+	uchar *c1, *c2, *c3;
+
+	c1 = (uchar *)s;
+	c2 = (uchar *)++s;
+	c3 = (uchar *)++s;
+	if(b < 1) {
+		return 0;
+	} else if((*c1 & 0xE0) == 0xC0 && b == 1) {
+		return 0;
+	} else if((*c1 & 0xF0) == 0xE0 &&
+	    ((b == 1) ||
+	    ((b == 2) && (*c2 & 0xC0) == 0x80))) {
+		return 0;
+	} else if((*c1 & 0xF8) == 0xF0 &&
+	    ((b == 1) ||
+	    ((b == 2) && (*c2 & 0xC0) == 0x80) ||
+	    ((b == 3) && (*c2 & 0xC0) == 0x80 && (*c3 & 0xC0) == 0x80))) {
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+int
+utf8size(char *s) {
+	uchar c = *s;
+
+	if(~c & 0x80) {
+		return 1;
+	} else if((c & 0xE0) == 0xC0) {
+		return 2;
+	} else if((c & 0xF0) == 0xE0) {
+		return 3;
+	} else {
+		return 4;
+	}
+}
+
+static void
+selinit(void) {
+	memset(&sel.tclick1, 0, sizeof(sel.tclick1));
+	memset(&sel.tclick2, 0, sizeof(sel.tclick2));
+	sel.mode = 0;
+	sel.ob.x = -1;
+	sel.clip = NULL;
+	sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
+	if(sel.xtarget == None)
+		sel.xtarget = XA_STRING;
+}
+
+static int
+x2col(int x) {
+	x -= borderpx;
+	x /= xw.cw;
+
+	return LIMIT(x, 0, term.col-1);
+}
+
+static int
+y2row(int y) {
+	y -= borderpx;
+	y /= xw.ch;
+
+	return LIMIT(y, 0, term.row-1);
+}
+
+static void
+selsort(void) {
+	if(sel.ob.y == sel.oe.y) {
+		sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+		sel.ne.x = MAX(sel.ob.x, sel.oe.x);
+	} else {
+		sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
+		sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+	}
+	sel.nb.y = MIN(sel.ob.y, sel.oe.y);
+	sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+}
+
+static inline bool
+selected(int x, int y) {
+	if(sel.ne.y == y && sel.nb.y == y)
+		return BETWEEN(x, sel.nb.x, sel.ne.x);
+
+	if(sel.type == SEL_RECTANGULAR) {
+		return ((sel.nb.y <= y && y <= sel.ne.y)
+			&& (sel.nb.x <= x && x <= sel.ne.x));
+	}
+
+	return ((sel.nb.y < y && y < sel.ne.y)
+		|| (y == sel.ne.y && x <= sel.ne.x))
+		|| (y == sel.nb.y && x >= sel.nb.x
+			&& (x <= sel.ne.x || sel.nb.y != sel.ne.y));
+}
+
+void
+selsnap(int mode, int *x, int *y, int direction) {
+	int i;
+
+	switch(mode) {
+	case SNAP_WORD:
+		/*
+		 * Snap around if the word wraps around at the end or
+		 * beginning of a line.
+		 */
+		for(;;) {
+			if(direction < 0 && *x <= 0) {
+				if(*y > 0 && term.line[*y - 1][term.col-1].mode
+						& ATTR_WRAP) {
+					*y -= 1;
+					*x = term.col-1;
+				} else {
+					break;
+				}
+			}
+			if(direction > 0 && *x >= term.col-1) {
+				if(*y < term.row-1 && term.line[*y][*x].mode
+						& ATTR_WRAP) {
+					*y += 1;
+					*x = 0;
+				} else {
+					break;
+				}
+			}
+
+			if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
+				*x += direction;
+				continue;
+			}
+
+			if(strchr(worddelimiters,
+					term.line[*y][*x+direction].c[0])) {
+				break;
+			}
+
+			*x += direction;
+		}
+		break;
+	case SNAP_LINE:
+		/*
+		 * Snap around if the the previous line or the current one
+		 * has set ATTR_WRAP at its end. Then the whole next or
+		 * previous line will be selected.
+		 */
+		*x = (direction < 0) ? 0 : term.col - 1;
+		if(direction < 0 && *y > 0) {
+			for(; *y > 0; *y += direction) {
+				if(!(term.line[*y-1][term.col-1].mode
+						& ATTR_WRAP)) {
+					break;
+				}
+			}
+		} else if(direction > 0 && *y < term.row-1) {
+			for(; *y < term.row; *y += direction) {
+				if(!(term.line[*y][term.col-1].mode
+						& ATTR_WRAP)) {
+					break;
+				}
+			}
+		}
+		break;
+	default:
+		/*
+		 * Select the whole line when the end of line is reached.
+		 */
+		if(direction > 0) {
+			i = term.col;
+			while(--i > 0 && term.line[*y][i].c[0] == ' ')
+				/* nothing */;
+			if(i > 0 && i < *x)
+				*x = term.col - 1;
+		}
+		break;
+	}
+}
+
+void
+getbuttoninfo(XEvent *e) {
+	int type;
+	uint state = e->xbutton.state &~Button1Mask;
+
+	sel.alt = IS_SET(MODE_ALTSCREEN);
+
+	sel.oe.x = x2col(e->xbutton.x);
+	sel.oe.y = y2row(e->xbutton.y);
+
+	if(sel.ob.y < sel.oe.y
+			|| (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
+		selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+		selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
+	} else {
+		selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
+		selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
+	}
+	selsort();
+
+	sel.type = SEL_REGULAR;
+	for(type = 1; type < LEN(selmasks); ++type) {
+		if(match(selmasks[type], state)) {
+			sel.type = type;
+			break;
+		}
+	}
+}
+
+void
+mousereport(XEvent *e) {
+	int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
+	    button = e->xbutton.button, state = e->xbutton.state,
+	    len;
+	char buf[40];
+	static int ox, oy;
+
+	/* from urxvt */
+	if(e->xbutton.type == MotionNotify) {
+		if(x == ox && y == oy)
+			return;
+		if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
+			return;
+		/* MOUSE_MOTION: no reporting if no button is pressed */
+		if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
+			return;
+
+		button = oldbutton + 32;
+		ox = x;
+		oy = y;
+	} else {
+		if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
+			button = 3;
+		} else {
+			button -= Button1;
+			if(button >= 3)
+				button += 64 - 3;
+		}
+		if(e->xbutton.type == ButtonPress) {
+			oldbutton = button;
+			ox = x;
+			oy = y;
+		} else if(e->xbutton.type == ButtonRelease) {
+			oldbutton = 3;
+			/* MODE_MOUSEX10: no button release reporting */
+			if(IS_SET(MODE_MOUSEX10))
+				return;
+		}
+	}
+
+	if(!IS_SET(MODE_MOUSEX10)) {
+		button += (state & ShiftMask   ? 4  : 0)
+			+ (state & Mod4Mask    ? 8  : 0)
+			+ (state & ControlMask ? 16 : 0);
+	}
+
+	len = 0;
+	if(IS_SET(MODE_MOUSESGR)) {
+		len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
+				button, x+1, y+1,
+				e->xbutton.type == ButtonRelease ? 'm' : 'M');
+	} else if(x < 223 && y < 223) {
+		len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
+				32+button, 32+x+1, 32+y+1);
+	} else {
+		return;
+	}
+
+	ttywrite(buf, len);
+}
+
+void
+bpress(XEvent *e) {
+	struct timeval now;
+	Mousekey *mk;
+
+	if(IS_SET(MODE_MOUSE)) {
+		mousereport(e);
+		return;
+	}
+
+	for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
+		if(e->xbutton.button == mk->b
+				&& match(mk->mask, e->xbutton.state)) {
+			ttysend(mk->s, strlen(mk->s));
+			return;
+		}
+	}
+
+	if(e->xbutton.button == Button1) {
+		gettimeofday(&now, NULL);
+
+		/* Clear previous selection, logically and visually. */
+		selclear(NULL);
+		sel.mode = 1;
+		sel.type = SEL_REGULAR;
+		sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
+		sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
+
+		/*
+		 * If the user clicks below predefined timeouts specific
+		 * snapping behaviour is exposed.
+		 */
+		if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+			sel.snap = SNAP_LINE;
+		} else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+			sel.snap = SNAP_WORD;
+		} else {
+			sel.snap = 0;
+		}
+		selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
+		selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
+		selsort();
+
+		/*
+		 * Draw selection, unless it's regular and we don't want to
+		 * make clicks visible
+		 */
+		if(sel.snap != 0) {
+			sel.mode++;
+			tsetdirt(sel.nb.y, sel.ne.y);
+		}
+		sel.tclick2 = sel.tclick1;
+		sel.tclick1 = now;
+	}
+}
+
+void
+selcopy(void) {
+	char *str, *ptr;
+	int x, y, bufsize, size, i, ex;
+	Glyph *gp, *last;
+
+	if(sel.ob.x == -1) {
+		str = NULL;
+	} else {
+		bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
+		ptr = str = xmalloc(bufsize);
+
+		/* append every set & selected glyph to the selection */
+		for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
+			gp = &term.line[y][0];
+			last = gp + term.col;
+
+			while(--last >= gp && !(selected(last - gp, y) && \
+						strcmp(last->c, " ") != 0))
+				/* nothing */;
+
+			for(x = 0; gp <= last; x++, ++gp) {
+				if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
+					continue;
+
+				size = utf8size(gp->c);
+				memcpy(ptr, gp->c, size);
+				ptr += size;
+			}
+
+			/*
+			 * Copy and pasting of line endings is inconsistent
+			 * in the inconsistent terminal and GUI world.
+			 * The best solution seems like to produce '\n' when
+			 * something is copied from st and convert '\n' to
+			 * '\r', when something to be pasted is received by
+			 * st.
+			 * FIXME: Fix the computer world.
+			 */
+			if(y < sel.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP))
+				*ptr++ = '\n';
+
+			/*
+			 * If the last selected line expands in the selection
+			 * after the visible text '\n' is appended.
+			 */
+			if(y == sel.ne.y) {
+				i = term.col;
+				while(--i > 0 && term.line[y][i].c[0] == ' ')
+					/* nothing */;
+				ex = sel.ne.x;
+				if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
+					ex = sel.nb.x;
+				if(i < ex)
+					*ptr++ = '\n';
+			}
+		}
+		*ptr = 0;
+	}
+	xsetsel(str);
+}
+
+void
+selnotify(XEvent *e) {
+	ulong nitems, ofs, rem;
+	int format;
+	uchar *data, *last, *repl;
+	Atom type;
+
+	ofs = 0;
+	do {
+		if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+					False, AnyPropertyType, &type, &format,
+					&nitems, &rem, &data)) {
+			fprintf(stderr, "Clipboard allocation failed\n");
+			return;
+		}
+
+		/*
+		 * As seen in selcopy:
+		 * Line endings are inconsistent in the terminal and GUI world
+		 * copy and pasting. When receiving some selection data,
+		 * replace all '\n' with '\r'.
+		 * FIXME: Fix the computer world.
+		 */
+		repl = data;
+		last = data + nitems * format / 8;
+		while((repl = memchr(repl, '\n', last - repl))) {
+			*repl++ = '\r';
+		}
+
+		if(IS_SET(MODE_BRCKTPASTE))
+			ttywrite("\033[200~", 6);
+		ttysend((char *)data, nitems * format / 8);
+		if(IS_SET(MODE_BRCKTPASTE))
+			ttywrite("\033[201~", 6);
+		XFree(data);
+		/* number of 32-bit chunks returned */
+		ofs += nitems * format / 32;
+	} while(rem > 0);
+}
+
+void
+selpaste(const Arg *dummy) {
+	XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
+			xw.win, CurrentTime);
+}
+
+void
+clippaste(const Arg *dummy) {
+	Atom clipboard;
+
+	clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+	XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+			xw.win, CurrentTime);
+}
+
+void
+selclear(XEvent *e) {
+	if(sel.ob.x == -1)
+		return;
+	sel.ob.x = -1;
+	tsetdirt(sel.nb.y, sel.ne.y);
+}
+
+void
+selrequest(XEvent *e) {
+	XSelectionRequestEvent *xsre;
+	XSelectionEvent xev;
+	Atom xa_targets, string;
+
+	xsre = (XSelectionRequestEvent *) e;
+	xev.type = SelectionNotify;
+	xev.requestor = xsre->requestor;
+	xev.selection = xsre->selection;
+	xev.target = xsre->target;
+	xev.time = xsre->time;
+	/* reject */
+	xev.property = None;
+
+	xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
+	if(xsre->target == xa_targets) {
+		/* respond with the supported type */
+		string = sel.xtarget;
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				XA_ATOM, 32, PropModeReplace,
+				(uchar *) &string, 1);
+		xev.property = xsre->property;
+	} else if(xsre->target == sel.xtarget && sel.clip != NULL) {
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				xsre->target, 8, PropModeReplace,
+				(uchar *) sel.clip, strlen(sel.clip));
+		xev.property = xsre->property;
+	}
+
+	/* all done, send a notification to the listener */
+	if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+		fprintf(stderr, "Error sending SelectionNotify event\n");
+}
+
+void
+xsetsel(char *str) {
+	/* register the selection for both the clipboard and the primary */
+	Atom clipboard;
+
+	free(sel.clip);
+	sel.clip = str;
+
+	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
+
+	clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+	XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+}
+
+void
+brelease(XEvent *e) {
+	if(IS_SET(MODE_MOUSE)) {
+		mousereport(e);
+		return;
+	}
+
+	if(e->xbutton.button == Button2) {
+		selpaste(NULL);
+	} else if(e->xbutton.button == Button1) {
+		if(sel.mode < 2) {
+			selclear(NULL);
+		} else {
+			getbuttoninfo(e);
+			selcopy();
+		}
+		sel.mode = 0;
+		tsetdirt(sel.nb.y, sel.ne.y);
+	}
+}
+
+void
+bmotion(XEvent *e) {
+	int oldey, oldex, oldsby, oldsey;
+
+	if(IS_SET(MODE_MOUSE)) {
+		mousereport(e);
+		return;
+	}
+
+	if(!sel.mode)
+		return;
+
+	sel.mode++;
+	oldey = sel.oe.y;
+	oldex = sel.oe.x;
+	oldsby = sel.nb.y;
+	oldsey = sel.ne.y;
+	getbuttoninfo(e);
+
+	if(oldey != sel.oe.y || oldex != sel.oe.x)
+		tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
+}
 
 void
 die(const char *errstr, ...) {
@@ -175,47 +1168,62 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-	char *args[3] = {SHELL, "-i", NULL};
-	putenv("TERM=" TNAME);
-	execvp(SHELL, args);
-}
+	char **args;
+	char *envshell = getenv("SHELL");
+	const struct passwd *pass = getpwuid(getuid());
+	char buf[sizeof(long) * 8 + 1];
+
+	unsetenv("COLUMNS");
+	unsetenv("LINES");
+	unsetenv("TERMCAP");
+
+	if(pass) {
+		setenv("LOGNAME", pass->pw_name, 1);
+		setenv("USER", pass->pw_name, 1);
+		setenv("SHELL", pass->pw_shell, 0);
+		setenv("HOME", pass->pw_dir, 0);
+	}
 
-void
-xbell(void) { /* visual bell */
-	XRectangle r = { 0, 0, xw.w, xw.h };
-	XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
-	XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
-	/* usleep(30000); */
-	draw(SCredraw);
+	snprintf(buf, sizeof(buf), "%lu", xw.win);
+	setenv("WINDOWID", buf, 1);
+
+	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);
+	setenv("TERM", termname, 1);
+	args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
+	execvp(args[0], args);
+	exit(EXIT_FAILURE);
 }
 
-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))
+		die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+
+	if(WIFEXITED(stat)) {
 		exit(WEXITSTATUS(stat));
-	else
+	} else {
 		exit(EXIT_FAILURE);
+	}
 }
 
 void
 ttynew(void) {
 	int m, s;
-	char *pts;
-
-	if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
-		die("openpt failed: %s\n", SERRNO);
-	if(grantpt(m) < 0)
-		die("grandpt failed: %s\n", SERRNO);
-	if(unlockpt(m) < 0)
-		die("unlockpt failed: %s\n", SERRNO);
-	if(!(pts = ptsname(m)))
-		die("ptsname failed: %s\n", SERRNO);
-	if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
-		die("Couldn't open slave: %s\n", SERRNO);
-	fcntl(s, F_SETFL, O_NDELAY);
+	struct winsize w = {term.row, term.col, 0, 0};
+
+	/* seems to work fine on linux, openbsd and freebsd */
+	if(openpty(&m, &s, NULL, NULL, &w) < 0)
+		die("openpty failed: %s\n", SERRNO);
+
 	switch(pid = fork()) {
 	case -1:
 		die("fork failed\n");
@@ -226,222 +1234,385 @@ ttynew(void) {
 		dup2(s, STDOUT_FILENO);
 		dup2(s, STDERR_FILENO);
 		if(ioctl(s, TIOCSCTTY, NULL) < 0)
-			die("ioctl TTIOCSTTY failed: %s\n", SERRNO);
+			die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+		close(s);
+		close(m);
 		execsh();
 		break;
 	default:
 		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:'.');
+
+	fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
 	if(++col % 10 == 0)
 		fprintf(stderr, "\n");
 }
 
 void
 ttyread(void) {
-	char buf[BUFSIZ] = {0};
+	static char buf[BUFSIZ];
+	static int buflen = 0;
+	char *ptr;
+	char s[UTF_SIZ];
+	int charsize; /* size of utf8 char in bytes */
+	long utf8c;
 	int ret;
 
-	switch(ret = read(cmdfd, buf, BUFSIZ)) {
-	case -1: 
+	/* append read bytes to unprocessed bytes */
+	if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
 		die("Couldn't read from shell: %s\n", SERRNO);
-		break;
-	default:
-		tputs(buf, ret);
+
+	/* process every complete utf8 char */
+	buflen += ret;
+	ptr = buf;
+	while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
+		charsize = utf8decode(ptr, &utf8c);
+		utf8encode(&utf8c, s);
+		tputc(s, charsize);
+		ptr += charsize;
+		buflen -= charsize;
 	}
+
+	/* keep any uncomplete utf8 char for the next call */
+	memmove(buf, ptr, buflen);
 }
 
 void
-ttywrite(char *s, size_t n) {
+ttywrite(const char *s, size_t n) {
 	if(write(cmdfd, s, n) == -1)
 		die("write error on tty: %s\n", SERRNO);
 }
 
 void
-ttyresize(int x, int y) {
+ttysend(char *s, size_t n) {
+	ttywrite(s, n);
+	if(IS_SET(MODE_ECHO))
+		techo(s, n);
+}
+
+void
+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);
 }
 
 int
-escfinal(char c) {
-	if(escseq.len == 1)
-		switch(c) {
-		case '[':
-		case ']':
-		case '(':
-			return 0;
-		case '=':
-		case '>':
-		default:
-			return 1;
+tattrset(int attr) {
+	int i, j;
+
+	for(i = 0; i < term.row-1; i++) {
+		for(j = 0; j < term.col-1; j++) {
+			if(term.line[i][j].mode & attr)
+				return 1;
 		}
-	else if(BETWEEN(c, 0x40, 0x7E))
-		return 1;
-	return 0;	  
+	}
+
+	return 0;
 }
 
 void
-tcpos(int mode) {
-	static int x = 0;
-	static int y = 0;
+tsetdirt(int top, int bot) {
+	int i;
+
+	LIMIT(top, 0, term.row-1);
+	LIMIT(bot, 0, term.row-1);
 
-	if(mode == CSsave)
-		x = term.c.x, y = term.c.y;
-	else if(mode == CSload)
-		tmoveto(x, y);
+	for(i = top; i <= bot; i++)
+		term.dirty[i] = 1;
 }
 
 void
-tnew(int col, int row) {   /* screen size */
-	term.row = row, term.col = col;
-	term.top = 0, term.bot = term.row - 1;
-	/* mode */
-	term.mode = TMwrap;
-	/* cursor */
-	term.c.attr.mode = ATnone;
-	term.c.attr.fg = DefaultFG;
-	term.c.attr.bg = DefaultBG;
-	term.c.x = term.c.y = 0;
-	term.c.hidden = 0;
-	/* allocate screen */
-	term.line = calloc(term.row, sizeof(Line));
-	for(row = 0 ; row < term.row; row++)
-		term.line[row] = calloc(term.col, sizeof(Glyph));
+tsetdirtattr(int attr) {
+	int i, j;
+
+	for(i = 0; i < term.row-1; i++) {
+		for(j = 0; j < term.col-1; j++) {
+			if(term.line[i][j].mode & attr) {
+				tsetdirt(i, i);
+				break;
+			}
+		}
+	}
 }
 
 void
-tscroll(void) {
-	Line temp = term.line[term.top];
-	int i;
-	/* X stuff _before_ the line swapping (results in wrong line index) */
-	xscroll();
-	for(i = term.top; i < term.bot; i++)
-		term.line[i] = term.line[i+1];
-	memset(temp, 0, sizeof(Glyph) * term.col);
-	term.line[term.bot] = temp;
+tfulldirt(void) {
+	tsetdirt(0, term.row-1);
 }
 
 void
-tnewline(void) {
-	int y = term.c.y + 1;
-	if(y > term.bot)
-		tscroll(), y = term.bot;
-	tmoveto(0, y);
+tcursor(int mode) {
+	static TCursor c[2];
+	bool alt = IS_SET(MODE_ALTSCREEN);
+
+	if(mode == CURSOR_SAVE) {
+		c[alt] = term.c;
+	} else if(mode == CURSOR_LOAD) {
+		term.c = c[alt];
+		tmoveto(c[alt].x, c[alt].y);
+	}
 }
 
-int
-escaddc(char c) {
-	escseq.buf[escseq.len++] = c;
-	if(escfinal(c) || escseq.len >= ESCSIZ) {
-		escparse(), eschandle();
-		return 0;
-	}
-	return 1;
+void
+treset(void) {
+	uint i;
+
+	term.c = (TCursor){{
+		.mode = ATTR_NULL,
+		.fg = defaultfg,
+		.bg = defaultbg
+	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
+
+	memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+	for(i = tabspaces; i < term.col; i += tabspaces)
+		term.tabs[i] = 1;
+	term.top = 0;
+	term.bot = term.row - 1;
+	term.mode = MODE_WRAP;
+	memset(term.trantbl, sizeof(term.trantbl), CS_USA);
+	term.charset = 0;
+
+	tclearregion(0, 0, term.col-1, term.row-1);
+	tmoveto(0, 0);
+	tcursor(CURSOR_SAVE);
 }
 
 void
-escparse(void) {
-	/* int noarg = 1; */
-	char *p = escseq.buf;
+tnew(int col, int row) {
+	term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };
+	tresize(col, row);
+	term.numlock = 1;
 
-	escseq.narg = 0;
-	switch(escseq.pre = *p++) {
-	case '[': /* CSI */
-		if(*p == '?')
-			escseq.priv = 1, p++;
+	treset();
+}
 
-		while(p < escseq.buf+escseq.len) {
-			while(isdigit(*p)) {
-				escseq.arg[escseq.narg] *= 10;
-				escseq.arg[escseq.narg] += *(p++) - '0'/*, noarg = 0 */;
-			}
-			if(*p == ';')
-				escseq.narg++, p++;
-			else {
-				escseq.mode = *p;
-				escseq.narg++;
-				return;
-			}
-		}
-		break;
-	case '(':
-		/* XXX: graphic character set */
-		break;
+void
+tswapscreen(void) {
+	Line *tmp = term.line;
+
+	term.line = term.alt;
+	term.alt = tmp;
+	term.mode ^= MODE_ALTSCREEN;
+	tfulldirt();
+}
+
+void
+tscrolldown(int orig, int n) {
+	int i;
+	Line temp;
+
+	LIMIT(n, 0, term.bot-orig+1);
+
+	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
+
+	for(i = term.bot; i >= orig+n; i--) {
+		temp = term.line[i];
+		term.line[i] = term.line[i-n];
+		term.line[i-n] = temp;
+
+		term.dirty[i] = 1;
+		term.dirty[i-n] = 1;
 	}
+
+	selscroll(orig, n);
 }
 
 void
-tmoveto(int x, int y) {
-	term.c.x = x < 0 ? 0 : x >= term.col ? term.col-1 : x;
-	term.c.y = y < 0 ? 0 : y >= term.row ? term.row-1 : y;
+tscrollup(int orig, int n) {
+	int i;
+	Line temp;
+	LIMIT(n, 0, term.bot-orig+1);
+
+	tclearregion(0, orig, term.col-1, orig+n-1);
+
+	for(i = orig; i <= term.bot-n; i++) {
+		 temp = term.line[i];
+		 term.line[i] = term.line[i+n];
+		 term.line[i+n] = temp;
+
+		 term.dirty[i] = 1;
+		 term.dirty[i+n] = 1;
+	}
+
+	selscroll(orig, -n);
 }
 
 void
-tcursor(int dir) {
-	int xf = term.c.x, yf = term.c.y;
+selscroll(int orig, int n) {
+	if(sel.ob.x == -1)
+		return;
 
-	switch(dir) {
-	case CSup:
-		yf--;
-		break;
-	case CSdown:
-		yf++;
-		break;
-	case CSleft:
-		xf--;
-		if(xf < 0) {
-			xf = term.col-1, yf--;
-			if(yf < term.top)
-				yf = term.top, xf = 0;
+	if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+		if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+			selclear(NULL);
+			return;
 		}
-		break;
-	case CSright:
-		xf++;
-		if(xf >= term.col) {
-			xf = 0, yf++;
-			if(yf > term.bot)
-				yf = term.bot, tscroll();
+		if(sel.type == SEL_RECTANGULAR) {
+			if(sel.ob.y < term.top)
+				sel.ob.y = term.top;
+			if(sel.oe.y > term.bot)
+				sel.oe.y = term.bot;
+		} else {
+			if(sel.ob.y < term.top) {
+				sel.ob.y = term.top;
+				sel.ob.x = 0;
+			}
+			if(sel.oe.y > term.bot) {
+				sel.oe.y = term.bot;
+				sel.oe.x = term.col;
+			}
 		}
-		break;
+		selsort();
+	}
+}
+
+void
+tnewline(int first_col) {
+	int y = term.c.y;
+
+	if(y == term.bot) {
+		tscrollup(term.top, 1);
+	} else {
+		y++;
+	}
+	tmoveto(first_col ? 0 : term.c.x, y);
+}
+
+void
+csiparse(void) {
+	char *p = csiescseq.buf, *np;
+	long int v;
+
+	csiescseq.narg = 0;
+	if(*p == '?') {
+		csiescseq.priv = 1;
+		p++;
+	}
+
+	csiescseq.buf[csiescseq.len] = '\0';
+	while(p < csiescseq.buf+csiescseq.len) {
+		np = NULL;
+		v = strtol(p, &np, 10);
+		if(np == p)
+			v = 0;
+		if(v == LONG_MAX || v == LONG_MIN)
+			v = -1;
+		csiescseq.arg[csiescseq.narg++] = v;
+		p = np;
+		if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+			break;
+		p++;
+	}
+	csiescseq.mode = *p;
+}
+
+/* for absolute user moves, when decom is set */
+void
+tmoveato(int x, int y) {
+	tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
+}
+
+void
+tmoveto(int x, int y) {
+	int miny, maxy;
+
+	if(term.c.state & CURSOR_ORIGIN) {
+		miny = term.top;
+		maxy = term.bot;
+	} else {
+		miny = 0;
+		maxy = term.row - 1;
 	}
-	tmoveto(xf, yf);
+	LIMIT(x, 0, term.col-1);
+	LIMIT(y, miny, maxy);
+	term.c.state &= ~CURSOR_WRAPNEXT;
+	term.c.x = x;
+	term.c.y = y;
 }
 
 void
-tsetchar(char c) {
-	term.line[term.c.y][term.c.x] = term.c.attr;
-	term.line[term.c.y][term.c.x].c = c;
-	term.line[term.c.y][term.c.x].state |= CRset | CRupdate;
+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];
+		}
+	}
+
+	if(term.line[y][x].mode & ATTR_WIDE) {
+		if(x+1 < term.col) {
+			term.line[y][x+1].c[0] = ' ';
+			term.line[y][x+1].mode &= ~ATTR_WDUMMY;
+		}
+	} else if(term.line[y][x].mode & ATTR_WDUMMY) {
+		term.line[y][x-1].c[0] = ' ';
+		term.line[y][x-1].mode &= ~ATTR_WIDE;
+	}
+
+	term.dirty[y] = 1;
+	term.line[y][x] = *attr;
+	memcpy(term.line[y][x].c, c, UTF_SIZ);
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
-	int x, y;
+	int x, y, temp;
+
+	if(x1 > x2)
+		temp = x1, x1 = x2, x2 = temp;
+	if(y1 > y2)
+		temp = y1, y1 = y2, y2 = temp;
 
 	LIMIT(x1, 0, term.col-1);
 	LIMIT(x2, 0, term.col-1);
 	LIMIT(y1, 0, term.row-1);
 	LIMIT(y2, 0, term.row-1);
 
-	/* XXX: could be optimized */
-	for(x = x1; x <= x2; x++)
-		for(y = y1; y <= y2; y++)
-			memset(&term.line[y][x], 0, sizeof(Glyph));
-
-	xclear(x1, y1, x2, y2);
+	for(y = y1; y <= y2; y++) {
+		term.dirty[y] = 1;
+		for(x = x1; x <= x2; x++) {
+			if(selected(x, y))
+				selclear(NULL);
+			term.line[y][x] = term.c.attr;
+			memcpy(term.line[y][x].c, " ", 2);
+		}
+	}
 }
 
 void
@@ -450,130 +1621,175 @@ tdeletechar(int n) {
 	int dst = term.c.x;
 	int size = term.col - src;
 
+	term.dirty[term.c.y] = 1;
+
 	if(src >= term.col) {
 		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));
-	tclearregion(term.col-size, term.c.y, term.col-1, term.c.y);
+
+	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);
 }
 
 void
 tinsertblank(int n) {
 	int src = term.c.x;
 	int dst = src + n;
-	int size = term.col - n - src;
+	int size = term.col - dst;
+
+	term.dirty[term.c.y] = 1;
 
 	if(dst >= term.col) {
 		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));
-	tclearregion(src, term.c.y, dst, term.c.y);
-}
 
-void
-tsetlinestate(int n, int state) {
-	int i;
-	for(i = 0; i < term.col; i++)
-		term.line[n][i].state |= state;
+	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);
 }
 
 void
-tinsertblankline (int n) {
-	int i;
-	Line blank;
-	int bot = term.bot;
-
-	if(term.c.y > term.bot)
-		bot = term.row - 1;
-	else if(term.c.y < term.top)
-		bot = term.top - 1;
-	if(term.c.y + n >= bot) {
-		tclearregion(0, term.c.y, term.col-1, bot);
+tinsertblankline(int n) {
+	if(term.c.y < term.top || term.c.y > term.bot)
 		return;
-	}
-	for(i = bot; i >= term.c.y+n; i--) {
-		/* swap deleted line <-> blanked line */
-		blank = term.line[i];
-		term.line[i] = term.line[i-n];
-		term.line[i-n] = blank;
-		/* blank it */
-		memset(blank, 0, term.col * sizeof(Glyph));
-		tsetlinestate(i, CRupdate);
-		tsetlinestate(i-n, CRupdate);
-	}
+
+	tscrolldown(term.c.y, n);
 }
 
 void
 tdeleteline(int n) {
-	int i;
-	Line blank;
-	int bot = term.bot;
-
-	if(term.c.y > term.bot)
-		bot = term.row - 1;
-	else if(term.c.y < term.top)
-		bot = term.top - 1;
-	if(term.c.y + n >= bot) {
-		tclearregion(0, term.c.y, term.col-1, bot);
+	if(term.c.y < term.top || term.c.y > term.bot)
 		return;
+
+	tscrollup(term.c.y, n);
+}
+
+int32_t
+tdefcolor(int *attr, int *npar, int l) {
+	int32_t idx = -1;
+	uint r, g, b;
+
+	switch (attr[*npar + 1]) {
+	case 2: /* direct colour in RGB space */
+		if (*npar + 4 >= l) {
+			fprintf(stderr,
+				"erresc(38): Incorrect number of parameters (%d)\n",
+				*npar);
+			break;
+		}
+		r = attr[*npar + 2];
+		g = attr[*npar + 3];
+		b = attr[*npar + 4];
+		*npar += 4;
+		if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
+			fprintf(stderr, "erresc: bad rgb color (%d,%d,%d)\n",
+				r, g, b);
+		else
+			idx = TRUECOLOR(r, g, b);
+		break;
+	case 5: /* indexed colour */
+		if (*npar + 2 >= l) {
+			fprintf(stderr,
+				"erresc(38): Incorrect number of parameters (%d)\n",
+				*npar);
+			break;
+		}
+		*npar += 2;
+		if(!BETWEEN(attr[*npar], 0, 255))
+			fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
+		else
+			idx = attr[*npar];
+		break;
+	case 0: /* implemented defined (only foreground) */
+	case 1: /* transparent */
+	case 3: /* direct colour in CMY space */
+	case 4: /* direct colour in CMYK space */
+	default:
+		fprintf(stderr,
+		        "erresc(38): gfx attr %d unknown\n", attr[*npar]);
 	}
-	for(i = term.c.y; i <= bot-n; i++) {
-		/* swap deleted line <-> blanked line */
-		blank = term.line[i];
-		term.line[i] = term.line[i+n];
-		term.line[i+n] = blank;
-		/* blank it */
-		memset(blank, 0, term.col * sizeof(Glyph));
-		tsetlinestate(i, CRupdate);
-		tsetlinestate(i-n, CRupdate);
-	}
+
+	return idx;
 }
 
 void
 tsetattr(int *attr, int l) {
 	int i;
+	int32_t idx;
 
 	for(i = 0; i < l; i++) {
 		switch(attr[i]) {
 		case 0:
-			memset(&term.c.attr, 0, sizeof(term.c.attr));
-			term.c.attr.fg = DefaultFG;
-			term.c.attr.bg = DefaultBG;
+			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 |= ATbold;	 
+			term.c.attr.mode |= ATTR_BOLD;
+			break;
+		case 3:
+			term.c.attr.mode |= ATTR_ITALIC;
+			break;
+		case 4:
+			term.c.attr.mode |= ATTR_UNDERLINE;
+			break;
+		case 5: /* slow blink */
+		case 6: /* rapid blink */
+			term.c.attr.mode |= ATTR_BLINK;
 			break;
-		case 4: 
-			term.c.attr.mode |= ATunderline;
+		case 7:
+			term.c.attr.mode |= ATTR_REVERSE;
 			break;
-		case 7: 
-			term.c.attr.mode |= ATreverse;	
+		case 21:
+		case 22:
+			term.c.attr.mode &= ~ATTR_BOLD;
 			break;
-		case 8:
-			term.c.hidden = CShide;
+		case 23:
+			term.c.attr.mode &= ~ATTR_ITALIC;
 			break;
-		case 22: 
-			term.c.attr.mode &= ~ATbold;  
+		case 24:
+			term.c.attr.mode &= ~ATTR_UNDERLINE;
 			break;
-		case 24: 
-			term.c.attr.mode &= ~ATunderline;
+		case 25:
+		case 26:
+			term.c.attr.mode &= ~ATTR_BLINK;
 			break;
-		case 27: 
-			term.c.attr.mode &= ~ATreverse;	 
+		case 27:
+			term.c.attr.mode &= ~ATTR_REVERSE;
+			break;
+		case 38:
+			if ((idx = tdefcolor(attr, &i, l)) >= 0)
+				term.c.attr.fg = idx;
 			break;
 		case 39:
-			term.c.attr.fg = DefaultFG;
+			term.c.attr.fg = defaultfg;
+			break;
+		case 48:
+			if ((idx = tdefcolor(attr, &i, l)) >= 0)
+				term.c.attr.bg = idx;
 			break;
 		case 49:
-			term.c.attr.fg = DefaultBG;
+			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)) {
+				term.c.attr.fg = attr[i] - 90 + 8;
+			} 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;
 		}
 	}
@@ -591,523 +1807,2039 @@ tsetscroll(int t, int b) {
 		b = temp;
 	}
 	term.top = t;
-	term.bot = b;	 
+	term.bot = b;
 }
 
+#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
+
 void
-eschandle(void) {
-	switch(escseq.pre) {
-	default:
-		goto unknown_seq;
-	case '[':
-		switch(escseq.mode) {
-		default:
-		unknown_seq:
-			fprintf(stderr, "erresc: unknown sequence\n");
-			escdump();
-			break;
-		case '@': /* Insert <n> blank char */
-			DEFAULT(escseq.arg[0], 1);
-			tinsertblank(escseq.arg[0]);
-			break;
-		case 'A': /* Cursor <n> Up */
-		case 'e':
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(term.c.x, term.c.y-escseq.arg[0]);
-			break;
-		case 'B': /* Cursor <n> Down */
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(term.c.x, term.c.y+escseq.arg[0]);
-			break;
-		case 'C': /* Cursor <n> Forward */
-		case 'a':
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(term.c.x+escseq.arg[0], term.c.y);
-			break;
-		case 'D': /* Cursor <n> Backward */
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(term.c.x-escseq.arg[0], term.c.y);
-			break;
-		case 'E': /* Cursor <n> Down and first col */
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(0, term.c.y+escseq.arg[0]);
-			break;
-		case 'F': /* Cursor <n> Up and first col */
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(0, term.c.y-escseq.arg[0]);
-			break;
-		case 'G': /* Move to <col> */
-		case '`':
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(escseq.arg[0]-1, term.c.y);
-			break;
-		case 'H': /* Move to <row> <col> */
-		case 'f':
-			DEFAULT(escseq.arg[0], 1);
-			DEFAULT(escseq.arg[1], 1);
-			tmoveto(escseq.arg[1]-1, escseq.arg[0]-1);
-			break;
-		case 'J': /* Clear screen */
-			switch(escseq.arg[0]) {
-			case 0: /* below */
-				tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
+tsetmode(bool priv, bool set, int *args, int narg) {
+	int *lim, mode;
+	bool alt;
+
+	for(lim = args + narg; args < lim; ++args) {
+		if(priv) {
+			switch(*args) {
+				break;
+			case 1: /* DECCKM -- Cursor key */
+				MODBIT(term.mode, set, MODE_APPCURSOR);
+				break;
+			case 5: /* DECSCNM -- Reverse video */
+				mode = term.mode;
+				MODBIT(term.mode, set, MODE_REVERSE);
+				if(mode != term.mode)
+					redraw(REDRAW_TIMEOUT);
+				break;
+			case 6: /* DECOM -- Origin */
+				MODBIT(term.c.state, set, CURSOR_ORIGIN);
+				tmoveato(0, 0);
+				break;
+			case 7: /* DECAWM -- Auto wrap */
+				MODBIT(term.mode, set, MODE_WRAP);
+				break;
+			case 0:  /* Error (IGNORED) */
+			case 2:  /* DECANM -- ANSI/VT52 (IGNORED) */
+			case 3:  /* DECCOLM -- Column  (IGNORED) */
+			case 4:  /* DECSCLM -- Scroll (IGNORED) */
+			case 8:  /* DECARM -- Auto repeat (IGNORED) */
+			case 18: /* DECPFF -- Printer feed (IGNORED) */
+			case 19: /* DECPEX -- Printer extent (IGNORED) */
+			case 42: /* DECNRCM -- National characters (IGNORED) */
+			case 12: /* att610 -- Start blinking cursor (IGNORED) */
+				break;
+			case 25: /* DECTCEM -- Text Cursor Enable Mode */
+				MODBIT(term.mode, !set, MODE_HIDE);
+				break;
+			case 9:    /* X10 mouse compatibility mode */
+				xsetpointermotion(0);
+				MODBIT(term.mode, 0, MODE_MOUSE);
+				MODBIT(term.mode, set, MODE_MOUSEX10);
 				break;
-			case 1: /* above */
-				tclearregion(0, 0, term.c.x, term.c.y);
+			case 1000: /* 1000: report button press */
+				xsetpointermotion(0);
+				MODBIT(term.mode, 0, MODE_MOUSE);
+				MODBIT(term.mode, set, MODE_MOUSEBTN);
+				break;
+			case 1002: /* 1002: report motion on button press */
+				xsetpointermotion(0);
+				MODBIT(term.mode, 0, MODE_MOUSE);
+				MODBIT(term.mode, set, MODE_MOUSEMOTION);
+				break;
+			case 1003: /* 1003: enable all mouse motions */
+				xsetpointermotion(set);
+				MODBIT(term.mode, 0, MODE_MOUSE);
+				MODBIT(term.mode, set, MODE_MOUSEMANY);
+				break;
+			case 1004: /* 1004: send focus events to tty */
+				MODBIT(term.mode, set, MODE_FOCUS);
+				break;
+			case 1006: /* 1006: extended reporting mode */
+				MODBIT(term.mode, set, MODE_MOUSESGR);
+				break;
+			case 1034:
+				MODBIT(term.mode, set, MODE_8BIT);
+				break;
+			case 1049: /* swap screen & set/restore cursor as xterm */
+				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+			case 47: /* swap screen */
+			case 1047:
+				if (!allowaltscreen)
+					break;
+				alt = IS_SET(MODE_ALTSCREEN);
+				if(alt) {
+					tclearregion(0, 0, term.col-1,
+							term.row-1);
+				}
+				if(set ^ alt) /* set is always 1 or 0 */
+					tswapscreen();
+				if(*args != 1049)
+					break;
+				/* FALLTRU */
+			case 1048:
+				tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+				break;
+			case 2004: /* 2004: bracketed paste mode */
+				MODBIT(term.mode, set, MODE_BRCKTPASTE);
+				break;
+			/* Not implemented mouse modes. See comments there. */
+			case 1001: /* mouse highlight mode; can hang the
+				      terminal by design when implemented. */
+			case 1005: /* UTF-8 mouse mode; will confuse
+				      applications not supporting UTF-8
+				      and luit. */
+			case 1015: /* urxvt mangled mouse mode; incompatible
+				      and can be mistaken for other control
+				      codes. */
+			default:
+				fprintf(stderr,
+					"erresc: unknown private set/reset mode %d\n",
+					*args);
 				break;
-			case 2: /* all */
-				tclearregion(0, 0, term.col-1, term.row-1);
-				break;				  
 			}
-			break;
-		case 'K': /* Clear line */
-			switch(escseq.arg[0]) {
-			case 0: /* right */
-				tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+		} else {
+			switch(*args) {
+			case 0:  /* Error (IGNORED) */
 				break;
-			case 1: /* left */
-				tclearregion(0, term.c.y, term.c.x, term.c.y);
+			case 2:  /* KAM -- keyboard action */
+				MODBIT(term.mode, set, MODE_KBDLOCK);
 				break;
-			case 2: /* all */
-				tclearregion(0, term.c.y, term.col-1, term.c.y);
+			case 4:  /* IRM -- Insertion-replacement */
+				MODBIT(term.mode, set, MODE_INSERT);
+				break;
+			case 12: /* SRM -- Send/Receive */
+				MODBIT(term.mode, !set, MODE_ECHO);
+				break;
+			case 20: /* LNM -- Linefeed/new line */
+				MODBIT(term.mode, set, MODE_CRLF);
+				break;
+			default:
+				fprintf(stderr,
+					"erresc: unknown set/reset mode %d\n",
+					*args);
 				break;
 			}
+		}
+	}
+}
+
+void
+csihandle(void) {
+	char buf[40];
+	int len;
+
+	switch(csiescseq.mode) {
+	default:
+	unknown:
+		fprintf(stderr, "erresc: unknown csi ");
+		csidump();
+		/* die(""); */
+		break;
+	case '@': /* ICH -- Insert <n> blank char */
+		DEFAULT(csiescseq.arg[0], 1);
+		tinsertblank(csiescseq.arg[0]);
+		break;
+	case 'A': /* CUU -- Cursor <n> Up */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
+		break;
+	case 'B': /* CUD -- Cursor <n> Down */
+	case 'e': /* VPR --Cursor <n> Down */
+		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': /* HPR -- Cursor <n> Forward */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
+		break;
+	case 'D': /* CUB -- Cursor <n> Backward */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
+		break;
+	case 'E': /* CNL -- Cursor <n> Down and first col */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveto(0, term.c.y+csiescseq.arg[0]);
+		break;
+	case 'F': /* CPL -- Cursor <n> Up and first col */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveto(0, term.c.y-csiescseq.arg[0]);
+		break;
+	case 'g': /* TBC -- Tabulation clear */
+		switch(csiescseq.arg[0]) {
+		case 0: /* clear current tab stop */
+			term.tabs[term.c.x] = 0;
 			break;
-		case 'L': /* Insert <n> blank lines */
-			DEFAULT(escseq.arg[0], 1);
-			tinsertblankline(escseq.arg[0]);
-			break;
-		case 'l':
-			if(escseq.priv && escseq.arg[0] == 25)
-				term.c.hidden = 1;
-			break;
-		case 'M': /* Delete <n> lines */
-			DEFAULT(escseq.arg[0], 1);
-			tdeleteline(escseq.arg[0]);
+		case 3: /* clear all the tabs */
+			memset(term.tabs, 0, term.col * sizeof(*term.tabs));
 			break;
-		case 'P': /* Delete <n> char */
-			DEFAULT(escseq.arg[0], 1);
-			tdeletechar(escseq.arg[0]);
+		default:
+			goto unknown;
+		}
+		break;
+	case 'G': /* CHA -- Move to <col> */
+	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': /* HVP */
+		DEFAULT(csiescseq.arg[0], 1);
+		DEFAULT(csiescseq.arg[1], 1);
+		tmoveato(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]--)
+			tputtab(1);
+		break;
+	case 'J': /* ED -- Clear screen */
+		selclear(NULL);
+		switch(csiescseq.arg[0]) {
+		case 0: /* below */
+			tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+			if(term.c.y < term.row-1) {
+				tclearregion(0, term.c.y+1, term.col-1,
+						term.row-1);
+			}
 			break;
-		case 'd': /* Move to <row> */
-			DEFAULT(escseq.arg[0], 1);
-			tmoveto(term.c.x, escseq.arg[0]-1);
+		case 1: /* above */
+			if(term.c.y > 1)
+				tclearregion(0, 0, term.col-1, term.c.y-1);
+			tclearregion(0, term.c.y, term.c.x, term.c.y);
 			break;
-		case 'h': /* Set terminal mode */
-			if(escseq.priv && escseq.arg[0] == 25)
-				term.c.hidden = 0;
+		case 2: /* all */
+			tclearregion(0, 0, term.col-1, term.row-1);
 			break;
-		case 'm': /* Terminal attribute (color) */
-			tsetattr(escseq.arg, escseq.narg);
+		default:
+			goto unknown;
+		}
+		break;
+	case 'K': /* EL -- Clear line */
+		switch(csiescseq.arg[0]) {
+		case 0: /* right */
+			tclearregion(term.c.x, term.c.y, term.col-1,
+					term.c.y);
 			break;
-		case 'r':
-			if(escseq.priv)
-				;
-			else {
-				DEFAULT(escseq.arg[0], 1);
-				DEFAULT(escseq.arg[1], term.row);
-				tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
-			}
+		case 1: /* left */
+			tclearregion(0, term.c.y, term.c.x, term.c.y);
 			break;
-		case 's': /* Save cursor position */
-			tcpos(CSsave);
+		case 2: /* all */
+			tclearregion(0, term.c.y, term.col-1, term.c.y);
 			break;
-		case 'u': /* Load cursor position */
-			tcpos(CSload);
+		}
+		break;
+	case 'S': /* SU -- Scroll <n> line up */
+		DEFAULT(csiescseq.arg[0], 1);
+		tscrollup(term.top, csiescseq.arg[0]);
+		break;
+	case 'T': /* SD -- Scroll <n> line down */
+		DEFAULT(csiescseq.arg[0], 1);
+		tscrolldown(term.top, csiescseq.arg[0]);
+		break;
+	case 'L': /* IL -- Insert <n> blank lines */
+		DEFAULT(csiescseq.arg[0], 1);
+		tinsertblankline(csiescseq.arg[0]);
+		break;
+	case 'l': /* RM -- Reset Mode */
+		tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
+		break;
+	case 'M': /* DL -- Delete <n> lines */
+		DEFAULT(csiescseq.arg[0], 1);
+		tdeleteline(csiescseq.arg[0]);
+		break;
+	case 'X': /* ECH -- Erase <n> char */
+		DEFAULT(csiescseq.arg[0], 1);
+		tclearregion(term.c.x, term.c.y,
+				term.c.x + csiescseq.arg[0] - 1, term.c.y);
+		break;
+	case 'P': /* DCH -- Delete <n> char */
+		DEFAULT(csiescseq.arg[0], 1);
+		tdeletechar(csiescseq.arg[0]);
+		break;
+	case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
+		DEFAULT(csiescseq.arg[0], 1);
+		while(csiescseq.arg[0]--)
+			tputtab(0);
+		break;
+	case 'd': /* VPA -- Move to <row> */
+		DEFAULT(csiescseq.arg[0], 1);
+		tmoveato(term.c.x, csiescseq.arg[0]-1);
+		break;
+	case 'h': /* SM -- Set terminal mode */
+		tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
+		break;
+	case 'm': /* SGR -- Terminal attribute (color) */
+		tsetattr(csiescseq.arg, csiescseq.narg);
+		break;
+	case 'n': /* DSR – Device Status Report (cursor position) */
+		if (csiescseq.arg[0] == 6) {
+			len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
+					term.c.y+1, term.c.x+1);
+			ttywrite(buf, len);
 			break;
 		}
+	case 'r': /* DECSTBM -- Set Scrolling Region */
+		if(csiescseq.priv) {
+			goto unknown;
+		} else {
+			DEFAULT(csiescseq.arg[0], 1);
+			DEFAULT(csiescseq.arg[1], term.row);
+			tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
+			tmoveato(0, 0);
+		}
+		break;
+	case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
+		tcursor(CURSOR_SAVE);
+		break;
+	case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
+		tcursor(CURSOR_LOAD);
 		break;
 	}
 }
 
 void
-escdump(void) { 
+csidump(void) {
 	int i;
-	printf("rawbuf	: %s\n", escseq.buf);
-	printf("prechar : %c\n", escseq.pre);
-	printf("private : %c\n", escseq.priv ? '?' : ' ');
-	printf("narg	: %d\n", escseq.narg);
-	if(escseq.narg)
-		for(i = 0; i < escseq.narg; i++)
-			printf("\targ %d = %d\n", i, escseq.arg[i]);
-	printf("mode	: %c\n", escseq.mode);
+	uint c;
+
+	printf("ESC[");
+	for(i = 0; i < csiescseq.len; i++) {
+		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');
 }
 
 void
-escreset(void) {
-	memset(&escseq, 0, sizeof(escseq));
+csireset(void) {
+	memset(&csiescseq, 0, sizeof(csiescseq));
 }
 
 void
-tputtab(void) {
-	int space = TAB - term.c.x % TAB;
-	
-	if(term.c.x + space >= term.col)
-		space--;
-	
-	for(; space > 0; space--)
-		tcursor(CSright);
-}
+strhandle(void) {
+	char *p = NULL;
+	int i, j, narg;
 
-void
-tputc(char c) {
-	static int inesc = 0;
-#if 0
-	dump(c);
-#endif	
-	/* start of escseq */
-	if(c == '\033')
-		escreset(), inesc = 1;
-	else if(inesc) {
-		inesc = escaddc(c);
-	} /* normal char */ 
-	else switch(c) { 
-		default:
-			tsetchar(c);
-			tcursor(CSright);
-			break;
-		case '\t':
-			tputtab();
-			break;
-		case '\b':
-			tcursor(CSleft);
-			break;
-		case '\r':
-			tmoveto(0, term.c.y);
+	strparse();
+	narg = strescseq.narg;
+
+	switch(strescseq.type) {
+	case ']': /* OSC -- Operating System Command */
+		switch(i = atoi(strescseq.args[0])) {
+		case 0:
+		case 1:
+		case 2:
+			if(narg > 1)
+				xsettitle(strescseq.args[1]);
 			break;
-		case '\n':
-			tnewline();
+		case 4: /* color set */
+			if(narg < 3)
+				break;
+			p = strescseq.args[2];
+			/* fall through */
+		case 104: /* color reset, here p = NULL */
+			j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
+			if (!xsetcolorname(j, p)) {
+				fprintf(stderr, "erresc: invalid color %s\n", p);
+			} else {
+				/*
+				 * TODO if defaultbg color is changed, borders
+				 * are dirty
+				 */
+				redraw(0);
+			}
 			break;
-		case '\a':
-			xbell();
+		default:
+			fprintf(stderr, "erresc: unknown str ");
+			strdump();
 			break;
+		}
+		break;
+	case 'k': /* old title set compatibility */
+		xsettitle(strescseq.args[0]);
+		break;
+	case 'P': /* DSC -- Device Control String */
+	case '_': /* APC -- Application Program Command */
+	case '^': /* PM -- Privacy Message */
+	default:
+		fprintf(stderr, "erresc: unknown str ");
+		strdump();
+		/* die(""); */
+		break;
 	}
 }
 
 void
-tputs(char *s, int len) { 
-	for(; len > 0; len--)
-		tputc(*s++);
+strparse(void) {
+	char *p = strescseq.buf;
+
+	strescseq.narg = 0;
+	strescseq.buf[strescseq.len] = '\0';
+	while(p && strescseq.narg < STR_ARG_SIZ)
+		strescseq.args[strescseq.narg++] = strsep(&p, ";");
 }
 
 void
-tdump(void) {
-	int row, col;
-	Glyph c;
-
-	for(row = 0; row < term.row; row++) {
-		for(col = 0; col < term.col; col++) {
-			if(col == term.c.x && row == term.c.y)
-				putchar('#');
-			else {
-				c = term.line[row][col];
-				putchar(c.state & CRset ? c.c : '.');
-			}
+strdump(void) {
+	int i;
+	uint c;
+
+	printf("ESC%c", strescseq.type);
+	for(i = 0; i < strescseq.len; i++) {
+		c = strescseq.buf[i] & 0xff;
+		if(c == '\0') {
+			return;
+		} else 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');
 	}
+	printf("ESC\\\n");
 }
 
 void
-tresize(int col, int row) {
-	int i;
-	Line *line;
-	int minrow = MIN(row, term.row);
-	int mincol = MIN(col, term.col);
-
-	if(col < 1 || row < 1)
-		return;
-	/* alloc */
-	line = calloc(row, sizeof(Line));
-	for(i = 0 ; i < row; i++)
-		line[i] = calloc(col, sizeof(Glyph));
-	/* copy */
-	for(i = 0 ; i < minrow; i++)
-		memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
-	/* free */
-	for(i = 0; i < term.row; i++)
-		free(term.line[i]);
-	free(term.line);
-	
-	LIMIT(term.c.x, 0, col-1);
-	LIMIT(term.c.y, 0, row-1);
-	LIMIT(term.top, 0, row-1);
-	LIMIT(term.bot, 0, row-1);
-	
-	term.bot = row-1;
-	term.line = line;
-	term.col = col, term.row = row;
+strreset(void) {
+	memset(&strescseq, 0, sizeof(strescseq));
 }
 
-unsigned long
-xgetcol(const char *s) {
-	XColor color;
-	Colormap cmap = DefaultColormap(xw.dis, xw.scr);
-
-	if(!XAllocNamedColor(xw.dis, cmap, s, &color, &color)) {
-		color.pixel = WhitePixel(xw.dis, xw.scr);
-		fprintf(stderr, "Could not allocate color '%s'\n", s);
+void
+tputtab(bool forward) {
+	uint x = term.c.x;
+
+	if(forward) {
+		if(x == term.col)
+			return;
+		for(++x; x < term.col && !term.tabs[x]; ++x)
+			/* nothing */ ;
+	} else {
+		if(x == 0)
+			return;
+		for(--x; x > 0 && !term.tabs[x]; --x)
+			/* nothing */ ;
 	}
-	return color.pixel;
+	tmoveto(x, term.c.y);
 }
 
 void
-xclear(int x1, int y1, int x2, int y2) {
-	XClearArea(xw.dis, xw.win, 
-			x1 * xw.cw, y1 * xw.ch, 
-			(x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch, 
-			False);
+techo(char *buf, int len) {
+	for(; len > 0; buf++, len--) {
+		char c = *buf;
+
+		if(c == '\033') { /* escape */
+			tputc("^", 1);
+			tputc("[", 1);
+		} else if(c < '\x20') { /* control code */
+			if(c != '\n' && c != '\r' && c != '\t') {
+				c |= '\x40';
+				tputc("^", 1);
+			}
+			tputc(&c, 1);
+		} else {
+			break;
+		}
+	}
+	if(len)
+		tputc(buf, len);
 }
 
 void
-xscroll(void) {
-	int srcy = (term.top+1) * xw.ch;
-	int dsty = term.top * xw.ch;
-	int height = (term.bot-term.top) * xw.ch;
-
-	xcursor(CShide);
-	XCopyArea(xw.dis, xw.win, xw.win, dc.gc, 0, srcy, xw.w, height, 0, dsty);
-	xclear(0, term.bot, term.col-1, term.bot);
+tdeftran(char ascii) {
+	char c, (*bp)[2];
+	static char tbl[][2] = {
+		{'0', CS_GRAPHIC0}, {'1', CS_GRAPHIC1}, {'A', CS_UK},
+		{'B', CS_USA},      {'<', CS_MULTI},    {'K', CS_GER},
+		{'5', CS_FIN},      {'C', CS_FIN},
+		{0, 0}
+	};
+
+	for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp)
+		/* nothing */;
+
+	if (c == 0)
+		fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
+	else
+		term.trantbl[term.icharset] = (*bp)[1];
 }
 
 void
-xinit(void) {
-	XGCValues values;
-	unsigned long valuemask;
-	XClassHint chint;
-	XWMHints wmhint;
-	XSizeHints shint;
-	char *args[] = {NULL};
-	int i;
-
-	xw.dis = XOpenDisplay(NULL);
-	xw.scr = XDefaultScreen(xw.dis);
-	if(!xw.dis)
-		die("Can't open display\n");
-	
-	/* font */
-	if(!(dc.font = XLoadQueryFont(xw.dis, FONT)))
-		die("Can't load font %s\n", FONT);
-
-	xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
-	xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
-
-	/* colors */
-	for(i = 0; i < LEN(colorname); i++)
-		dc.col[i] = xgetcol(colorname[i]);
-
-	term.c.attr.fg = DefaultFG;
-	term.c.attr.bg = DefaultBG;
-	term.c.attr.mode = ATnone;
-	/* windows */
-	xw.h = term.row * xw.ch;
-	xw.w = term.col * xw.cw;
-	/* XXX: this BORDER is useless after the first resize, handle it in xdraws() */
-	xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-			xw.w, xw.h, BORDER, 
-			dc.col[DefaultBG],
-			dc.col[DefaultBG]);
-	/* gc */
-	values.foreground = XWhitePixel(xw.dis, xw.scr);
-	values.font = dc.font->fid;
-	valuemask = GCForeground | GCFont;
-	dc.gc = XCreateGC(xw.dis, xw.win, valuemask, &values);
-	XMapWindow(xw.dis, xw.win);
-	/* wm stuff */
-	chint.res_name = TNAME, chint.res_class = TNAME;
-	wmhint.input = 1, wmhint.flags = InputHint;
-	shint.height_inc = xw.ch, shint.width_inc = xw.cw;
-	shint.height = xw.h, shint.width = xw.w;
-	shint.flags = PSize | PResizeInc;
-	XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
-	XStoreName(xw.dis, xw.win, TNAME);
-	XSync(xw.dis, 0);
-}
-
-void
-xdrawc(int x, int y, Glyph g) {
-	XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
-	unsigned long xfg, xbg;
-
-	/* reverse video */
-	if(g.mode & ATreverse)
-		xfg = dc.col[g.bg], xbg = dc.col[g.fg];
+tselcs(void) {
+	if (term.trantbl[term.charset] == CS_GRAPHIC0)
+		term.c.attr.mode |= ATTR_GFX;
 	else
-		xfg = dc.col[g.fg], xbg = dc.col[g.bg];
-	/* background */
-	XSetForeground(xw.dis, dc.gc, xbg);
-	XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
-	/* string */
-	XSetForeground(xw.dis, dc.gc, xfg);
-	XDrawString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &(g.c), 1);
-	if(g.mode & ATbold)	 /* XXX: bold hack (draw again at x+1) */
-		XDrawString(xw.dis, xw.win, dc.gc, r.x+1, r.y+dc.font->ascent, &(g.c), 1);
-	/* underline */
-	if(g.mode & ATunderline) {
-		r.y += dc.font->ascent + 1;
-		XDrawLine(xw.dis, xw.win, dc.gc, r.x, r.y, r.x+r.width-1, r.y);
-	}
-}
-
-void
-xcursor(int mode) {
-	static int oldx = 0;
-	static int oldy = 0;
-	Glyph g = {' ', ATnone, DefaultBG, DefaultCS, 0};
-	
-	LIMIT(oldx, 0, term.col-1);
-	LIMIT(oldy, 0, term.row-1);
-	
-	if(term.line[term.c.y][term.c.x].state & CRset)
-		g.c = term.line[term.c.y][term.c.x].c;
-	/* remove the old cursor */
-	if(term.line[oldy][oldx].state & CRset)
-		xdrawc(oldx, oldy, term.line[oldy][oldx]);
-	else 
-		xclear(oldx, oldy, oldx, oldy);
-	/* draw the new one */
-	if(mode == CSdraw) {
-		xdrawc(term.c.x, term.c.y, g);
-		oldx = term.c.x, oldy = term.c.y;
-	}
+		term.c.attr.mode &= ~ATTR_GFX;
 }
 
 void
-draw(int redraw_all) {
-	int x, y;
-	int changed, set;
-
-	if(redraw_all)
-		XClearWindow(xw.dis, xw.win);
+tputc(char *c, int len) {
+	uchar ascii = *c;
+	bool control = ascii < '\x20' || ascii == 0177;
+	long u8char;
+	int width;
+
+	if(len == 1) {
+		width = 1;
+	} else {
+		utf8decode(c, &u8char);
+		width = wcwidth(u8char);
+	}
 
-	/* XXX: drawing could be optimised */
-	for(y = 0; y < term.row; y++) {
-		for(x = 0; x < term.col; x++) {
-			changed = term.line[y][x].state & CRupdate;
-			set = term.line[y][x].state & CRset;
-			if(redraw_all || changed) {
-				term.line[y][x].state &= ~CRupdate;
-				if(set)
-					xdrawc(x, y, term.line[y][x]);
-				else
-					xclear(x, y, x, y);
-			}
+	if(iofd != -1) {
+		if(xwrite(iofd, c, len) < 0) {
+			fprintf(stderr, "Error writing in %s:%s\n",
+				opt_io, strerror(errno));
+			close(iofd);
+			iofd = -1;
 		}
 	}
-	xcursor(CSdraw);
-}
-
-char*
-kmap(KeySym k) {
-	int i;
-	for(i = 0; i < LEN(key); i++)
-		if(key[i].k == k)
-			return (char*)key[i].s;
-	return NULL;
-}
 
-void
-kpress(XKeyEvent *e) {
-	KeySym ksym;
-	char buf[32];
-	int len;
-	int meta;
-	int shift;
-	char* skmap;
-
-	meta  = e->state & Mod1Mask;
-	shift = e->state & ShiftMask;
-	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-	if(skmap = kmap(ksym))
-		ttywrite(skmap, strlen(skmap));
-	else if(len > 0) {
-		buf[sizeof(buf)-1] = '\0';
-		if(meta && len == 1)
-			ttywrite("\033", 1);
-		ttywrite(buf, len);
-	} else
-		switch(ksym) {
-		case XK_Insert:
-			if(shift)
-				/* XXX: paste X clipboard */;
+	/*
+	 * STR sequences must be checked before anything else
+	 * 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;
-		default:
-			fprintf(stderr, "errkey: %d\n", (int)ksym);
+		case '\a': /* backwards compatibility to xterm */
+			term.esc = 0;
+			strhandle();
 			break;
+		default:
+			if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
+				memmove(&strescseq.buf[strescseq.len], c, len);
+				strescseq.len += len;
+			} else {
+			/*
+			 * Here is a bug in terminals. If the user never sends
+			 * some code to stop the str or esc command, then st
+			 * will stop responding. But this is better than
+			 * silently failing with unknown characters. At least
+			 * then users will report back.
+			 *
+			 * In the case users ever get fixed, here is the code:
+			 */
+			/*
+			 * term.esc = 0;
+			 * strhandle();
+			 */
+			}
 		}
-}
-
-void
-resize(XEvent *e) {
-	int col, row;
-	col = e->xconfigure.width / xw.cw;
-	row = e->xconfigure.height / xw.ch;
-	
-	if(term.col != col || term.row != row) {
-		tresize(col, row);
-		ttyresize(col, row);
-		xw.w = e->xconfigure.width;
-		xw.h = e->xconfigure.height;
-		draw(SCredraw);
+		return;
 	}
-}
-
-void
-run(void) {
-	int ret;
-	XEvent ev;
-	fd_set rfd;
-	int xfd = XConnectionNumber(xw.dis);
 
-	running = 1;
-	XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
-	XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */
-	
-	while(running) {
-		FD_ZERO(&rfd);
+	/*
+	 * 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);
+			if (bellvolume)
+				XBell(xw.dpy, bellvolume);
+			return;
+		case '\033': /* ESC */
+			csireset();
+			term.esc = ESC_START;
+			return;
+		case '\016': /* SO */
+			term.charset = 0;
+			tselcs();
+			return;
+		case '\017': /* SI */
+			term.charset = 1;
+			tselcs();
+			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 >= \
+					sizeof(csiescseq.buf)-1) {
+				term.esc = 0;
+				csiparse();
+				csihandle();
+			}
+		} else if(term.esc & ESC_STR_END) {
+			term.esc = 0;
+			if(ascii == '\\')
+				strhandle();
+		} else if(term.esc & ESC_ALTCHARSET) {
+			tdeftran(ascii);
+			tselcs();
+			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 '(': /* set primary charset G0 */
+			case ')': /* set secondary charset G1 */
+			case '*': /* set tertiary charset G2 */
+			case '+': /* set quaternary charset G3 */
+				term.icharset = ascii - '(';
+				term.esc |= ESC_ALTCHARSET;
+				break;
+			case 'D': /* IND -- Linefeed */
+				if(term.c.y == term.bot) {
+					tscrollup(term.top, 1);
+				} else {
+					tmoveto(term.c.x, term.c.y+1);
+				}
+				term.esc = 0;
+				break;
+			case 'E': /* NEL -- Next line */
+				tnewline(1); /* always go to first col */
+				term.esc = 0;
+				break;
+			case 'H': /* HTS -- Horizontal tab stop */
+				term.tabs[term.c.x] = 1;
+				term.esc = 0;
+				break;
+			case 'M': /* RI -- Reverse index */
+				if(term.c.y == term.top) {
+					tscrolldown(term.top, 1);
+				} 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();
+				xloadcols();
+				break;
+			case '=': /* DECPAM -- Application keypad */
+				term.mode |= MODE_APPKEYPAD;
+				term.esc = 0;
+				break;
+			case '>': /* DECPNM -- Normal keypad */
+				term.mode &= ~MODE_APPKEYPAD;
+				term.esc = 0;
+				break;
+			case '7': /* DECSC -- Save Cursor */
+				tcursor(CURSOR_SAVE);
+				term.esc = 0;
+				break;
+			case '8': /* DECRC -- Restore Cursor */
+				tcursor(CURSOR_LOAD);
+				term.esc = 0;
+				break;
+			case '\\': /* ST -- Stop */
+				term.esc = 0;
+				break;
+			default:
+				fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+					(uchar) ascii, isprint(ascii)? ascii:'.');
+				term.esc = 0;
+			}
+		}
+		/*
+		 * All characters which form 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.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
+		selclear(NULL);
+	if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+		term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+		tnewline(1);
+	}
+
+	if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
+		memmove(&term.line[term.c.y][term.c.x+1],
+			&term.line[term.c.y][term.c.x],
+			(term.col - term.c.x - 1) * sizeof(Glyph));
+	}
+
+	if(term.c.x+width > term.col)
+		tnewline(1);
+
+	tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+
+	if(width == 2) {
+		term.line[term.c.y][term.c.x].mode |= ATTR_WIDE;
+		if(term.c.x+1 < term.col) {
+			term.line[term.c.y][term.c.x+1].c[0] = '\0';
+			term.line[term.c.y][term.c.x+1].mode = ATTR_WDUMMY;
+		}
+	}
+	if(term.c.x+width < term.col) {
+		tmoveto(term.c.x+width, term.c.y);
+	} else {
+		term.c.state |= CURSOR_WRAPNEXT;
+	}
+}
+
+int
+tresize(int col, int row) {
+	int i;
+	int minrow = MIN(row, term.row);
+	int mincol = MIN(col, term.col);
+	int slide = term.c.y - row + 1;
+	bool *bp;
+	Line *orig;
+
+	if(col < 1 || row < 1)
+		return 0;
+
+	/* free unneeded rows */
+	i = 0;
+	if(slide > 0) {
+		/*
+		 * slide screen to keep cursor where we expect it -
+		 * tscrollup would work here, but we can optimize to
+		 * memmove because we're freeing the earlier lines
+		 */
+		for(/* i = 0 */; i < slide; i++) {
+			free(term.line[i]);
+			free(term.alt[i]);
+		}
+		memmove(term.line, term.line + slide, row * sizeof(Line));
+		memmove(term.alt, term.alt + slide, row * sizeof(Line));
+	}
+	for(i += row; i < term.row; i++) {
+		free(term.line[i]);
+		free(term.alt[i]);
+	}
+
+	/* resize to new height */
+	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] = xrealloc(term.line[i], col * sizeof(Glyph));
+		term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
+	}
+
+	/* allocate any new rows */
+	for(/* i == minrow */; i < row; i++) {
+		term.dirty[i] = 1;
+		term.line[i] = xmalloc(col * sizeof(Glyph));
+		term.alt[i] = xmalloc(col * sizeof(Glyph));
+	}
+	if(col > term.col) {
+		bp = term.tabs + term.col;
+
+		memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
+		while(--bp > term.tabs && !*bp)
+			/* nothing */ ;
+		for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+			*bp = 1;
+	}
+	/* update terminal size */
+	term.col = col;
+	term.row = row;
+	/* reset scrolling region */
+	tsetscroll(0, row-1);
+	/* make use of the LIMIT in tmoveto */
+	tmoveto(term.c.x, term.c.y);
+	/* Clearing both screens */
+	orig = term.line;
+	do {
+		if(mincol < col && 0 < minrow) {
+			tclearregion(mincol, 0, col - 1, minrow - 1);
+		}
+		if(0 < col && minrow < row) {
+			tclearregion(0, minrow, col - 1, row - 1);
+		}
+		tswapscreen();
+	} while(orig != term.line);
+
+	return (slide > 0);
+}
+
+void
+xresize(int col, int row) {
+	xw.tw = MAX(1, col * xw.cw);
+	xw.th = MAX(1, row * xw.ch);
+
+	XFreePixmap(xw.dpy, xw.buf);
+	xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+			DefaultDepth(xw.dpy, xw.scr));
+	XftDrawChange(xw.draw, xw.buf);
+	xclear(0, 0, xw.w, xw.h);
+}
+
+static inline ushort
+sixd_to_16bit(int x) {
+	return x == 0 ? 0 : 0x3737 + 0x2828 * x;
+}
+
+void
+xloadcols(void) {
+	int i, r, g, b;
+	XRenderColor color = { .alpha = 0xffff };
+	static bool loaded;
+	Colour *cp;
+
+	if(loaded) {
+		for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
+			XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
+	}
+
+	/* 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.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(b = 0; b < 6; b++) {
+				color.red = sixd_to_16bit(r);
+				color.green = sixd_to_16bit(g);
+				color.blue = sixd_to_16bit(b);
+				if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.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(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
+					&dc.col[i])) {
+			die("Could not allocate color %d\n", i);
+		}
+	}
+	loaded = true;
+}
+
+int
+xsetcolorname(int x, const char *name) {
+	XRenderColor color = { .alpha = 0xffff };
+	Colour colour;
+	if (x < 0 || x > LEN(colorname))
+		return -1;
+	if(!name) {
+		if(16 <= x && x < 16 + 216) {
+			int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
+			color.red = sixd_to_16bit(r);
+			color.green = sixd_to_16bit(g);
+			color.blue = sixd_to_16bit(b);
+			if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+				return 0; /* something went wrong */
+			dc.col[x] = colour;
+			return 1;
+		} else if (16 + 216 <= x && x < 256) {
+			color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
+			if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+				return 0; /* something went wrong */
+			dc.col[x] = colour;
+			return 1;
+		} else {
+			name = colorname[x];
+		}
+	}
+	if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
+		return 0;
+	dc.col[x] = colour;
+	return 1;
+}
+
+void
+xtermclear(int col1, int row1, int col2, int row2) {
+	XftDrawRect(xw.draw,
+			&dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+			borderpx + col1 * xw.cw,
+			borderpx + 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) {
+	XftDrawRect(xw.draw,
+			&dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
+			x1, y1, x2-x1, y2-y1);
+}
+
+void
+xhints(void) {
+	XClassHint class = {opt_class ? opt_class : termname, termname};
+	XWMHints wm = {.flags = InputHint, .input = 1};
+	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 * borderpx;
+		sizeh->base_width = 2 * borderpx;
+	} else {
+		sizeh->flags = PMaxSize | PMinSize;
+		sizeh->min_width = sizeh->max_width = xw.fw;
+		sizeh->min_height = sizeh->max_height = xw.fh;
+	}
+
+	XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+	XFree(sizeh);
+}
+
+int
+xloadfont(Font *f, FcPattern *pattern) {
+	FcPattern *match;
+	FcResult result;
+
+	match = FcFontMatch(NULL, pattern, &result);
+	if(!match)
+		return 1;
+
+	if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+		FcPatternDestroy(match);
+		return 1;
+	}
+
+	f->set = NULL;
+	f->pattern = FcPatternDuplicate(pattern);
+
+	f->ascent = f->match->ascent;
+	f->descent = f->match->descent;
+	f->lbearing = 0;
+	f->rbearing = f->match->max_advance_width;
+
+	f->height = f->ascent + f->descent;
+	f->width = f->lbearing + f->rbearing;
+
+	return 0;
+}
+
+void
+xloadfonts(char *fontstr, double fontsize) {
+	FcPattern *pattern;
+	FcResult r_sz, r_psz;
+	double fontval;
+
+	if(fontstr[0] == '-') {
+		pattern = XftXlfdParse(fontstr, False, False);
+	} else {
+		pattern = FcNameParse((FcChar8 *)fontstr);
+	}
+
+	if(!pattern)
+		die("st: can't open font %s\n", fontstr);
+
+	if(fontsize > 0) {
+		FcPatternDel(pattern, FC_PIXEL_SIZE);
+		FcPatternDel(pattern, FC_SIZE);
+		FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
+		usedfontsize = fontsize;
+	} else {
+		r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
+		r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval);
+		if(r_psz == FcResultMatch) {
+			usedfontsize = fontval;
+		} else if(r_sz == FcResultMatch) {
+			usedfontsize = -1;
+		} else {
+			/*
+			 * Default font size is 12, if none given. This is to
+			 * have a known usedfontsize value.
+			 */
+			FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
+			usedfontsize = 12;
+		}
+	}
+
+	FcConfigSubstitute(0, pattern, FcMatchPattern);
+	FcDefaultSubstitute(pattern);
+
+	if(xloadfont(&dc.font, pattern))
+		die("st: can't open font %s\n", fontstr);
+
+	if(usedfontsize < 0) {
+		FcPatternGetDouble(dc.font.match->pattern,
+		                   FC_PIXEL_SIZE, 0, &fontval);
+		usedfontsize = fontval;
+	}
+
+	/* Setting character width and height. */
+	xw.cw = CEIL(dc.font.width * cwscale);
+	xw.ch = CEIL(dc.font.height * chscale);
+
+	FcPatternDel(pattern, FC_SLANT);
+	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+	if(xloadfont(&dc.ifont, pattern))
+		die("st: can't open font %s\n", fontstr);
+
+	FcPatternDel(pattern, FC_WEIGHT);
+	FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+	if(xloadfont(&dc.ibfont, pattern))
+		die("st: can't open font %s\n", fontstr);
+
+	FcPatternDel(pattern, FC_SLANT);
+	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+	if(xloadfont(&dc.bfont, pattern))
+		die("st: can't open font %s\n", fontstr);
+
+	FcPatternDestroy(pattern);
+}
+
+int
+xloadfontset(Font *f) {
+	FcResult result;
+
+	if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
+		return 1;
+	return 0;
+}
+
+void
+xunloadfont(Font *f) {
+	XftFontClose(xw.dpy, f->match);
+	FcPatternDestroy(f->pattern);
+	if(f->set)
+		FcFontSetDestroy(f->set);
+}
+
+void
+xunloadfonts(void) {
+	int i;
+
+	/* Free the loaded fonts in the font cache.  */
+	for(i = 0; i < frclen; i++) {
+		XftFontClose(xw.dpy, frc[i].font);
+	}
+	frclen = 0;
+
+	xunloadfont(&dc.font);
+	xunloadfont(&dc.bfont);
+	xunloadfont(&dc.ifont);
+	xunloadfont(&dc.ibfont);
+}
+
+void
+xzoom(const Arg *arg) {
+	xunloadfonts();
+	xloadfonts(usedfont, usedfontsize + arg->i);
+	cresize(0, 0);
+	redraw(0);
+}
+
+void
+xinit(void) {
+	XGCValues gcvalues;
+	Cursor cursor;
+	Window parent;
+	int sw, sh;
+	pid_t thispid = getpid();
+
+	if(!(xw.dpy = XOpenDisplay(NULL)))
+		die("Can't open display\n");
+	xw.scr = XDefaultScreen(xw.dpy);
+	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
+
+	/* font */
+	if(!FcInit())
+		die("Could not init fontconfig.\n");
+
+	usedfont = (opt_font == NULL)? font : opt_font;
+	xloadfonts(usedfont, 0);
+
+	/* colors */
+	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
+	xloadcols();
+
+	/* 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 * borderpx + term.row * xw.ch;
+		xw.w = 2 * borderpx + term.col * xw.cw;
+		xw.fx = 0;
+		xw.fy = 0;
+	}
+
+	/* Events */
+	xw.attrs.background_pixel = dc.col[defaultbg].pixel;
+	xw.attrs.border_pixel = dc.col[defaultbg].pixel;
+	xw.attrs.bit_gravity = NorthWestGravity;
+	xw.attrs.event_mask = FocusChangeMask | KeyPressMask
+		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
+		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
+	xw.attrs.colormap = xw.cmap;
+
+	parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
+			XRootWindow(xw.dpy, xw.scr);
+	xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
+			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
+			| CWEventMask | CWColormap, &xw.attrs);
+
+	memset(&gcvalues, 0, sizeof(gcvalues));
+	gcvalues.graphics_exposures = False;
+	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+			&gcvalues);
+	xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+			DefaultDepth(xw.dpy, xw.scr));
+	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
+	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+
+	/* Xft rendering context */
+	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
+
+	/* input methods */
+	if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+		XSetLocaleModifiers("@im=local");
+		if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+			XSetLocaleModifiers("@im=");
+			if((xw.xim = XOpenIM(xw.dpy,
+					NULL, NULL, NULL)) == NULL) {
+				die("XOpenIM failed. Could not open input"
+					" device.\n");
+			}
+		}
+	}
+	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+					   | XIMStatusNothing, XNClientWindow, xw.win,
+					   XNFocusWindow, xw.win, NULL);
+	if(xw.xic == NULL)
+		die("XCreateIC failed. Could not obtain input method.\n");
+
+	/* white cursor, black outline */
+	cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+	XDefineCursor(xw.dpy, xw.win, cursor);
+	XRecolorCursor(xw.dpy, cursor,
+		&(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
+		&(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+
+	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+	xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
+	XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
+
+	xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+	XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+			PropModeReplace, (unsigned char *)&thispid, 1);
+
+	xresettitle();
+	XMapWindow(xw.dpy, xw.win);
+	xhints();
+	XSync(xw.dpy, 0);
+}
+
+void
+xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
+	int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
+	    width = charlen * xw.cw, xp, i;
+	int frcflags;
+	int u8fl, u8fblen, u8cblen, doesexist;
+	char *u8c, *u8fs;
+	long u8char;
+	Font *font = &dc.font;
+	FcResult fcres;
+	FcPattern *fcpattern, *fontpattern;
+	FcFontSet *fcsets[] = { NULL };
+	FcCharSet *fccharset;
+	Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
+	XRenderColor colfg, colbg;
+	Rectangle r;
+	int oneatatime;
+
+	frcflags = FRC_NORMAL;
+
+	if(base.mode & ATTR_ITALIC) {
+		if(base.fg == defaultfg)
+			base.fg = defaultitalic;
+		font = &dc.ifont;
+		frcflags = FRC_ITALIC;
+	} else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+		if(base.fg == defaultfg)
+			base.fg = defaultitalic;
+		font = &dc.ibfont;
+		frcflags = FRC_ITALICBOLD;
+	} else if(base.mode & ATTR_UNDERLINE) {
+		if(base.fg == defaultfg)
+			base.fg = defaultunderline;
+	}
+	if(IS_TRUECOL(base.fg)) {
+		colfg.alpha = 0xffff;
+		colfg.red = TRUERED(base.fg);
+		colfg.green = TRUEGREEN(base.fg);
+		colfg.blue = TRUEBLUE(base.fg);
+		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
+		fg = &truefg;
+	} else {
+		fg = &dc.col[base.fg];
+	}
+
+	if(IS_TRUECOL(base.bg)) {
+		colbg.alpha = 0xffff;
+		colbg.green = TRUEGREEN(base.bg);
+		colbg.red = TRUERED(base.bg);
+		colbg.blue = TRUEBLUE(base.bg);
+		XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
+		bg = &truebg;
+	} else {
+		bg = &dc.col[base.bg];
+	}
+
+
+
+	if(base.mode & ATTR_BOLD) {
+		if(BETWEEN(base.fg, 0, 7)) {
+			/* basic system colors */
+			fg = &dc.col[base.fg + 8];
+		} else if(BETWEEN(base.fg, 16, 195)) {
+			/* 256 colors */
+			fg = &dc.col[base.fg + 36];
+		} else if(BETWEEN(base.fg, 232, 251)) {
+			/* greyscale */
+			fg = &dc.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;
+		frcflags = FRC_BOLD;
+	}
+
+	if(IS_SET(MODE_REVERSE)) {
+		if(fg == &dc.col[defaultfg]) {
+			fg = &dc.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.col[defaultbg]) {
+			bg = &dc.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;
+		}
+	}
+
+	if(base.mode & ATTR_REVERSE) {
+		temp = fg;
+		fg = bg;
+		bg = temp;
+	}
+
+	if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+		fg = bg;
+
+	/* Intelligent cleaning up of the borders. */
+	if(x == 0) {
+		xclear(0, (y == 0)? 0 : winy, borderpx,
+			winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
+	}
+	if(x + charlen >= term.col) {
+		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, borderpx);
+	if(y == term.row-1)
+		xclear(winx, winy + xw.ch, winx + width, xw.h);
+
+	/* Clean up the region we want to draw to. */
+	XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
+
+	/* Set the clip region because Xft is sometimes dirty. */
+	r.x = 0;
+	r.y = 0;
+	r.height = xw.ch;
+	r.width = width;
+	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+
+	for(xp = winx; bytelen > 0;) {
+		/*
+		 * Search for the range in the to be printed string of glyphs
+		 * that are in the main font. Then print that range. If
+		 * some glyph is found that is not in the font, do the
+		 * fallback dance.
+		 */
+		u8fs = s;
+		u8fblen = 0;
+		u8fl = 0;
+		oneatatime = font->width != xw.cw;
+		for(;;) {
+			u8c = s;
+			u8cblen = utf8decode(s, &u8char);
+			s += u8cblen;
+			bytelen -= u8cblen;
+
+			doesexist = XftCharExists(xw.dpy, font->match, u8char);
+			if(oneatatime || !doesexist || bytelen <= 0) {
+				if(oneatatime || bytelen <= 0) {
+					if(doesexist) {
+						u8fl++;
+						u8fblen += u8cblen;
+					}
+				}
+
+				if(u8fl > 0) {
+					XftDrawStringUtf8(xw.draw, fg,
+							font->match, xp,
+							winy + font->ascent,
+							(FcChar8 *)u8fs,
+							u8fblen);
+					xp += xw.cw * u8fl;
+
+				}
+				break;
+			}
+
+			u8fl++;
+			u8fblen += u8cblen;
+		}
+		if(doesexist) {
+			if (oneatatime)
+				continue;
+			break;
+		}
+
+		/* Search the font cache. */
+		for(i = 0; i < frclen; i++) {
+			if(XftCharExists(xw.dpy, frc[i].font, u8char)
+					&& frc[i].flags == frcflags) {
+				break;
+			}
+		}
+
+		/* Nothing was found. */
+		if(i >= frclen) {
+			if(!font->set)
+				xloadfontset(font);
+			fcsets[0] = font->set;
+
+			/*
+			 * Nothing was found in the cache. Now use
+			 * some dozen of Fontconfig calls to get the
+			 * font for one single character.
+			 */
+			fcpattern = FcPatternDuplicate(font->pattern);
+			fccharset = FcCharSetCreate();
+
+			FcCharSetAddChar(fccharset, u8char);
+			FcPatternAddCharSet(fcpattern, FC_CHARSET,
+					fccharset);
+			FcPatternAddBool(fcpattern, FC_SCALABLE,
+					FcTrue);
+
+			FcConfigSubstitute(0, fcpattern,
+					FcMatchPattern);
+			FcDefaultSubstitute(fcpattern);
+
+			fontpattern = FcFontSetMatch(0, fcsets,
+					FcTrue, fcpattern, &fcres);
+
+			/*
+			 * Overwrite or create the new cache entry.
+			 */
+			if(frclen >= LEN(frc)) {
+				frclen = LEN(frc) - 1;
+				XftFontClose(xw.dpy, frc[frclen].font);
+			}
+
+			frc[frclen].font = XftFontOpenPattern(xw.dpy,
+					fontpattern);
+			frc[frclen].flags = frcflags;
+
+			i = frclen;
+			frclen++;
+
+			FcPatternDestroy(fcpattern);
+			FcCharSetDestroy(fccharset);
+		}
+
+		XftDrawStringUtf8(xw.draw, fg, frc[i].font,
+				xp, winy + frc[i].font->ascent,
+				(FcChar8 *)u8c, u8cblen);
+
+		xp += xw.cw * wcwidth(u8char);
+	}
+
+	/*
+	XftDrawStringUtf8(xw.draw, fg, font->set, winx,
+			winy + font->ascent, (FcChar8 *)s, bytelen);
+	*/
+
+	if(base.mode & ATTR_UNDERLINE) {
+		XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
+				width, 1);
+	}
+
+	/* Reset clip to none. */
+	XftDrawSetClip(xw.draw, 0);
+}
+
+void
+xdrawcursor(void) {
+	static int oldx = 0, oldy = 0;
+	int sl, width, curx;
+	Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
+
+	LIMIT(oldx, 0, term.col-1);
+	LIMIT(oldy, 0, term.row-1);
+
+	curx = term.c.x;
+
+	/* adjust position if in dummy */
+	if(term.line[oldy][oldx].mode & ATTR_WDUMMY)
+		oldx--;
+	if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
+		curx--;
+
+	memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
+
+	/* remove the old cursor */
+	sl = utf8size(term.line[oldy][oldx].c);
+	width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
+	xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
+			oldy, width, sl);
+
+	/* draw the new one */
+	if(!(IS_SET(MODE_HIDE))) {
+		if(xw.state & WIN_FOCUSED) {
+			if(IS_SET(MODE_REVERSE)) {
+				g.mode |= ATTR_REVERSE;
+				g.fg = defaultcs;
+				g.bg = defaultfg;
+			}
+
+			sl = utf8size(g.c);
+			width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+				? 2 : 1;
+			xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+		} else {
+			XftDrawRect(xw.draw, &dc.col[defaultcs],
+					borderpx + curx * xw.cw,
+					borderpx + term.c.y * xw.ch,
+					xw.cw - 1, 1);
+			XftDrawRect(xw.draw, &dc.col[defaultcs],
+					borderpx + curx * xw.cw,
+					borderpx + term.c.y * xw.ch,
+					1, xw.ch - 1);
+			XftDrawRect(xw.draw, &dc.col[defaultcs],
+					borderpx + (curx + 1) * xw.cw - 1,
+					borderpx + term.c.y * xw.ch,
+					1, xw.ch - 1);
+			XftDrawRect(xw.draw, &dc.col[defaultcs],
+					borderpx + curx * xw.cw,
+					borderpx + (term.c.y + 1) * xw.ch - 1,
+					xw.cw, 1);
+		}
+		oldx = curx, oldy = term.c.y;
+	}
+}
+
+
+void
+xsettitle(char *p) {
+	XTextProperty prop;
+
+	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+			&prop);
+	XSetWMName(xw.dpy, xw.win, &prop);
+	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
+	XFree(prop.value);
+}
+
+void
+xresettitle(void) {
+	xsettitle(opt_title ? opt_title : "st");
+}
+
+void
+redraw(int timeout) {
+	struct timespec tv = {0, timeout * 1000};
+
+	tfulldirt();
+	draw();
+
+	if(timeout > 0) {
+		nanosleep(&tv, NULL);
+		XSync(xw.dpy, False); /* necessary for a good tput flash */
+	}
+}
+
+void
+draw(void) {
+	drawregion(0, 0, term.col, term.row);
+	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
+			xw.h, 0, 0);
+	XSetForeground(xw.dpy, dc.gc,
+			dc.col[IS_SET(MODE_REVERSE)?
+				defaultfg : defaultbg].pixel);
+}
+
+void
+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.ob.x != -1;
+	long u8char;
+
+	if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
+		ena_sel = 0;
+
+	if(!(xw.state & WIN_VISIBLE))
+		return;
+
+	for(y = y1; y < y2; y++) {
+		if(!term.dirty[y])
+			continue;
+
+		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(new.mode == ATTR_WDUMMY)
+				continue;
+			if(ena_sel && selected(x, y))
+				new.mode ^= ATTR_REVERSE;
+			if(ib > 0 && (ATTRCMP(base, new)
+					|| ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+				xdraws(buf, base, ox, y, ic, ib);
+				ic = ib = 0;
+			}
+			if(ib == 0) {
+				ox = x;
+				base = new;
+			}
+
+			sl = utf8decode(new.c, &u8char);
+			memcpy(buf+ib, new.c, sl);
+			ib += sl;
+			ic += (new.mode & ATTR_WIDE)? 2 : 1;
+		}
+		if(ib > 0)
+			xdraws(buf, base, ox, y, ic, ib);
+	}
+	xdrawcursor();
+}
+
+void
+expose(XEvent *ev) {
+	XExposeEvent *e = &ev->xexpose;
+
+	if(xw.state & WIN_REDRAW) {
+		if(!e->count)
+			xw.state &= ~WIN_REDRAW;
+	}
+	redraw(0);
+}
+
+void
+visibility(XEvent *ev) {
+	XVisibilityEvent *e = &ev->xvisibility;
+
+	if(e->state == VisibilityFullyObscured) {
+		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
+unmap(XEvent *ev) {
+	xw.state &= ~WIN_VISIBLE;
+}
+
+void
+xsetpointermotion(int set) {
+	MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
+	XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
+}
+
+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);
+}
+
+void
+focus(XEvent *ev) {
+	XFocusChangeEvent *e = &ev->xfocus;
+
+	if(e->mode == NotifyGrab)
+		return;
+
+	if(ev->type == FocusIn) {
+		XSetICFocus(xw.xic);
+		xw.state |= WIN_FOCUSED;
+		xseturgency(0);
+		if(IS_SET(MODE_FOCUS))
+			ttywrite("\033[I", 3);
+	} else {
+		XUnsetICFocus(xw.xic);
+		xw.state &= ~WIN_FOCUSED;
+		if(IS_SET(MODE_FOCUS))
+			ttywrite("\033[O", 3);
+	}
+}
+
+static inline bool
+match(uint mask, uint state) {
+	return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
+}
+
+void
+numlock(const Arg *dummy) {
+	term.numlock ^= 1;
+}
+
+char*
+kmap(KeySym k, uint state) {
+	Key *kp;
+	int i;
+
+	/* Check for mapped keys out of X11 function keys. */
+	for(i = 0; i < LEN(mappedkeys); i++) {
+		if(mappedkeys[i] == k)
+			break;
+	}
+	if(i == LEN(mappedkeys)) {
+		if((k & 0xFFFF) < 0xFD00)
+			return NULL;
+	}
+
+	for(kp = key; kp < key + LEN(key); kp++) {
+		if(kp->k != k)
+			continue;
+
+		if(!match(kp->mask, state))
+			continue;
+
+		if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+			continue;
+		if(term.numlock && kp->appkey == 2)
+			continue;
+
+		if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
+			continue;
+
+		if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
+			continue;
+
+		return kp->s;
+	}
+
+	return NULL;
+}
+
+void
+kpress(XEvent *ev) {
+	XKeyEvent *e = &ev->xkey;
+	KeySym ksym;
+	char buf[32], *customkey;
+	int len;
+	long c;
+	Status status;
+	Shortcut *bp;
+
+	if(IS_SET(MODE_KBDLOCK))
+		return;
+
+	len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
+	/* 1. shortcuts */
+	for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+		if(ksym == bp->keysym && match(bp->mod, e->state)) {
+			bp->func(&(bp->arg));
+			return;
+		}
+	}
+
+	/* 2. custom keys from config.h */
+	if((customkey = kmap(ksym, e->state))) {
+		ttysend(customkey, strlen(customkey));
+		return;
+	}
+
+	/* 3. composed string from input method */
+	if(len == 0)
+		return;
+	if(len == 1 && e->state & Mod1Mask) {
+		if(IS_SET(MODE_8BIT)) {
+			if(*buf < 0177) {
+				c = *buf | 0x80;
+				len = utf8encode(&c, buf);
+			}
+		} else {
+			buf[1] = buf[0];
+			buf[0] = '\033';
+			len = 2;
+		}
+	}
+	ttysend(buf, len);
+}
+
+
+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) {
+			xw.state |= WIN_FOCUSED;
+			xseturgency(0);
+		} else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+			xw.state &= ~WIN_FOCUSED;
+		}
+	} else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+		/* Send SIGHUP to shell */
+		kill(pid, SIGHUP);
+		exit(EXIT_SUCCESS);
+	}
+}
+
+void
+cresize(int width, int height) {
+	int col, row;
+
+	if(width != 0)
+		xw.w = width;
+	if(height != 0)
+		xw.h = height;
+
+	col = (xw.w - 2 * borderpx) / xw.cw;
+	row = (xw.h - 2 * borderpx) / xw.ch;
+
+	tresize(col, row);
+	xresize(col, row);
+	ttyresize();
+}
+
+void
+resize(XEvent *e) {
+	if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+		return;
+
+	cresize(e->xconfigure.width, e->xconfigure.height);
+}
+
+void
+run(void) {
+	XEvent ev;
+	int w = xw.w, h = xw.h;
+	fd_set rfd;
+	int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
+	struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+
+	/* Waiting for window mapping */
+	while(1) {
+		XNextEvent(xw.dpy, &ev);
+		if(ev.type == ConfigureNotify) {
+			w = ev.xconfigure.width;
+			h = ev.xconfigure.height;
+		} else if(ev.type == MapNotify) {
+			break;
+		}
+	}
+
+	ttynew();
+	if(!xw.isfixed)
+		cresize(w, h);
+	else
+		cresize(xw.fw, xw.fh);
+
+	gettimeofday(&lastblink, NULL);
+	gettimeofday(&last, NULL);
+
+	for(xev = actionfps;;) {
+		long deltatime;
+
+		FD_ZERO(&rfd);
 		FD_SET(cmdfd, &rfd);
 		FD_SET(xfd, &rfd);
-		XFlush(xw.dis);
-		ret = select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL);
 
-		if(ret < 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(xfd, &rfd)) {
-			while(XPending(xw.dis)) {
-				XNextEvent(xw.dis, &ev);
-				switch (ev.type) {
-				default:
-					break;
-				case KeyPress:
-					kpress(&ev.xkey);
-					break;
-				case Expose:
-					draw(SCredraw);
-					break;
-				case ConfigureNotify:
-					resize(&ev);
-					break;
-				}
-			}
 		}
 		if(FD_ISSET(cmdfd, &rfd)) {
 			ttyread();
-			draw(SCupdate);
+			if(blinktimeout) {
+				blinkset = tattrset(ATTR_BLINK);
+				if(!blinkset)
+					MODBIT(term.mode, 0, MODE_BLINK);
+			}
+		}
+
+		if(FD_ISSET(xfd, &rfd))
+			xev = actionfps;
+
+		gettimeofday(&now, NULL);
+		drawtimeout.tv_sec = 0;
+		drawtimeout.tv_usec = (1000/xfps) * 1000;
+		tv = &drawtimeout;
+
+		dodraw = 0;
+		if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+			tsetdirtattr(ATTR_BLINK);
+			term.mode ^= MODE_BLINK;
+			gettimeofday(&lastblink, NULL);
+			dodraw = 1;
+		}
+		deltatime = TIMEDIFF(now, last);
+		if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+				|| deltatime < 0) {
+			dodraw = 1;
+			last = now;
+		}
+
+		if(dodraw) {
+			while(XPending(xw.dpy)) {
+				XNextEvent(xw.dpy, &ev);
+				if(XFilterEvent(&ev, None))
+					continue;
+				if(handler[ev.type])
+					(handler[ev.type])(&ev);
+			}
+
+			draw();
+			XFlush(xw.dpy);
+
+			if(xev && !FD_ISSET(xfd, &rfd))
+				xev--;
+			if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+				if(blinkset) {
+					if(TIMEDIFF(now, lastblink) \
+							> blinktimeout) {
+						drawtimeout.tv_usec = 1;
+					} else {
+						drawtimeout.tv_usec = (1000 * \
+							(blinktimeout - \
+							TIMEDIFF(now,
+								lastblink)));
+					}
+				} else {
+					tv = NULL;
+				}
+			}
 		}
 	}
 }
 
+void
+usage(void) {
+	die("%s " VERSION " (c) 2010-2013 st engineers\n" \
+	"usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+	" [-t title] [-w windowid] [-e command ...]\n", argv0);
+}
+
 int
 main(int argc, char *argv[]) {
-	if(argc == 2 && !strncmp("-v", argv[1], 3))
-		die("st-" VERSION ", © 2009 st engineers\n");
-	else if(argc != 1)
-		die("usage: st [-v]\n");
+	int bitm, xr, yr;
+	uint wr, hr;
+	char *titles;
+
+	xw.fw = xw.fh = xw.fx = xw.fy = 0;
+	xw.isfixed = False;
+
+	ARGBEGIN {
+	case 'a':
+		allowaltscreen = false;
+		break;
+	case 'c':
+		opt_class = EARGF(usage());
+		break;
+	case 'e':
+		/* eat all remaining arguments */
+		if(argc > 1) {
+			opt_cmd = &argv[1];
+			if(argv[1] != NULL && opt_title == NULL) {
+				titles = strdup(argv[1]);
+				opt_title = basename(titles);
+			}
+		}
+		goto run;
+	case 'f':
+		opt_font = EARGF(usage());
+		break;
+	case 'g':
+		bitm = XParseGeometry(EARGF(usage()), &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 & YNegative && xw.fy == 0)
+			xw.fy = -1;
+
+		if(xw.fh != 0 && xw.fw != 0)
+			xw.isfixed = True;
+		break;
+	case 'o':
+		opt_io = EARGF(usage());
+		break;
+	case 't':
+		opt_title = EARGF(usage());
+		break;
+	case 'w':
+		opt_embed = EARGF(usage());
+		break;
+	case 'v':
+	default:
+		usage();
+	} ARGEND;
+
+run:
 	setlocale(LC_CTYPE, "");
+	XSetLocaleModifiers("");
 	tnew(80, 24);
-	ttynew();
 	xinit();
+	selinit();
 	run();
+
 	return 0;
 }
+