X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=st.c;h=bed7e8d007d22f0a0b63fae7ed07533c7c2eaff7;hp=ff437062fefe13427214be2eabff74132656907f;hb=b61afd24be566d8c8d7d5310fdad973441139428;hpb=476f93794acc36ea69dfd33551e311863c8afc9a

diff --git a/st.c b/st.c
old mode 100755
new mode 100644
index ff43706..bed7e8d
--- a/st.c
+++ b/st.c
@@ -17,16 +17,28 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
+#include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 
-#define TNAME "xterm"
+#if   defined(__linux)
+ #include <pty.h>
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <util.h>
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <libutil.h>
+#endif
+
+#define USAGE \
+	"st-" VERSION ", (c) 2010 st engineers\n" \
+	"usage: st [-t title] [-c class] [-e cmd] [-v]\n"
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
+#define UTF_SIZ       4
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -36,17 +48,25 @@
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
+#define IS_SET(flag) (term.mode & (flag))
 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
-enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, CURSOR_HIDE, CURSOR_DRAW, CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT,
+       CURSOR_SAVE, CURSOR_LOAD };
+enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
-enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, 
+       MODE_CRLF=16 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { SCREEN_UPDATE, SCREEN_REDRAW };
+enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
+
+#undef B0
+enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 
 typedef struct {
-	char c;     /* character code  */
+	char c[UTF_SIZ];     /* character code */
 	char mode;  /* attribute flags */
 	int fg;     /* foreground      */
 	int bg;     /* background      */
@@ -56,33 +76,34 @@ typedef struct {
 typedef Glyph* Line;
 
 typedef struct {
-	Glyph attr;  /* current char attributes */
+	Glyph attr;	 /* current char attributes */
 	int x;
 	int y;
+	char state;
 } TCursor;
 
 /* CSI Escape sequence structs */
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
 	char buf[ESC_BUF_SIZ]; /* raw string */
-	int len;               /* raw string length */
+	int len;			   /* raw string length */
 	char priv;
 	int arg[ESC_ARG_SIZ];
-	int narg;              /* nb of args */
+	int narg;			   /* nb of args */
 	char mode;
 } CSIEscape;
 
 /* Internal representation of the screen */
 typedef struct {
-	int row;    /* nb row */  
-	int col;    /* nb col */
-	Line* line; /* screen */
-	TCursor c;  /* cursor */
-	char hidec;
-	int top;    /* top    scroll limit */
-	int bot;    /* bottom scroll limit */
-	int mode;   /* terminal mode flags */
-	int esc;    /* escape state flags */
+	int row;	/* nb row */  
+	int col;	/* nb col */
+	Line* line;	/* screen */
+	Line* alt;	/* alternate screen */
+	TCursor c;	/* cursor */
+	int top;	/* top	  scroll limit */
+	int bot;	/* bottom scroll limit */
+	int mode;	/* terminal mode flags */
+	int esc;	/* escape state flags */
 	char title[ESC_TITLE_SIZ];
 	int titlelen;
 } Term;
@@ -90,13 +111,19 @@ typedef struct {
 /* Purely graphic info */
 typedef struct {
 	Display* dis;
+	Colormap cmap;
 	Window win;
 	Pixmap buf;
+	XIM xim;
+	XIC xic;
 	int scr;
-	int w;  /* window width  */
-	int h;  /* window height */
+	int w;	/* window width	 */
+	int h;	/* window height */
+	int bufw; /* pixmap width  */
+	int bufh; /* pixmap height */
 	int ch; /* char height */
 	int cw; /* char width  */
+	char state; /* focus, redraw, visible */
 } XWindow; 
 
 typedef struct {
@@ -104,16 +131,33 @@ typedef struct {
 	char s[ESC_BUF_SIZ];
 } Key;
 
-#include "config.h"
+typedef struct {
+	XFontSet fs;
+	short lbearing;
+	short rbearing;
+	int ascent;
+	int descent;
+} FontInfo;
 
 /* Drawing Context */
 typedef struct {
-	unsigned long col[LEN(colorname)];
-	XFontStruct* font;
-	XFontStruct* bfont;
+	unsigned long col[256];
+	FontInfo font;
+	FontInfo bfont;
 	GC gc;
 } DC;
 
+/* TODO: use better name for vars... */
+typedef struct {
+	int mode;
+	int bx, by;
+	int ex, ey;
+	struct {int x, y;}  b, e;
+	char *clip;
+} Selection;
+
+#include "config.h"
+
 static void die(const char *errstr, ...);
 static void draw(int);
 static void execsh(void);
@@ -127,44 +171,75 @@ static void csireset(void);
 
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
-static void tmovecursor(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
-static void tnewline(void);
-static void tputc(char);
-static void tputs(char*, int);
+static void tnewline(int);
+static void tputtab(void);
+static void tputc(char*);
 static void treset(void);
-static void tresize(int, int);
-static void tscroll(void);
-static void tscrollup(int);
-static void tscrolldown(int);
+static int tresize(int, int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
 static void tsetattr(int*, int);
-static void tsetchar(char);
+static void tsetchar(char*);
 static void tsetscroll(int, int);
+static void tswapscreen(void);
 
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(int, int);
 static void ttywrite(const char *, size_t);
 
-static unsigned long xgetcol(const char *);
+static void xdraws(char *, Glyph, int, int, int, int);
+static void xhints(void);
 static void xclear(int, int, int, int);
-static void xcursor(int);
+static void xdrawcursor(void);
 static void xinit(void);
+static void xloadcols(void);
+static void xseturgency(int);
+static void xsetsel(char*);
+static void xresize(int, int);
 
 static void expose(XEvent *);
+static void visibility(XEvent *);
+static void unmap(XEvent *);
 static char* kmap(KeySym);
 static void kpress(XEvent *);
 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 selrequest(XEvent *);
+
+static void selinit(void);
+static inline int selected(int, int);
+static void selcopy(void);
+static void selpaste(void);
+
+static int stou(char *, long *);
+static int utos(long *, char *);
+static int slen(char *);
+static int canstou(char *, int);
 
 static void (*handler[LASTEvent])(XEvent *) = {
 	[KeyPress] = kpress,
+	[ConfigureNotify] = resize,
+	[VisibilityNotify] = visibility,
+	[UnmapNotify] = unmap,
 	[Expose] = expose,
-	[ConfigureNotify] = resize
+	[FocusIn] = focus,
+	[FocusOut] = focus,
+	[MotionNotify] = bmotion,
+	[ButtonPress] = bpress,
+	[ButtonRelease] = brelease,
+	[SelectionNotify] = selnotify,
+	[SelectionRequest] = selrequest,
 };
 
 /* Globals */
@@ -174,7 +249,282 @@ static Term term;
 static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
-static int running;
+static Selection sel;
+static char *opt_cmd   = NULL;
+static char *opt_title = NULL;
+static char *opt_class = NULL;
+
+/* UTF-8 decode */
+static int stou(char *s, long *u) {
+	unsigned char c;
+	int i, n, rtn;
+
+	rtn = 1;
+	c = *s;
+	if(~c&B7) { /* 0xxxxxxx */
+		*u = c;
+		return rtn;
+	} else if ((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+		*u = c&(B4|B3|B2|B1|B0);
+		n = 1;
+	} else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
+		*u = c&(B3|B2|B1|B0);
+		n = 2;
+	} else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+		*u = c&(B2|B1|B0);
+		n = 3;
+	} else
+		goto invalid;
+	for (i=n,++s; i>0; --i,++rtn,++s) {
+		c = *s;
+		if ((c&(B7|B6)) != B7) /* 10xxxxxx */
+			goto invalid;
+		*u <<= 6;
+		*u |= c&(B5|B4|B3|B2|B1|B0);
+	}
+	if ((n == 1 && *u < 0x80) ||
+	    (n == 2 && *u < 0x800) ||
+	    (n == 3 && *u < 0x10000) ||
+	    (*u >= 0xD800 && *u <= 0xDFFF))
+		goto invalid;
+	return rtn;
+invalid:
+	*u = 0xFFFD;
+	return rtn;
+}
+
+/* UTF-8 encode */
+static int utos(long *u, char *s) {
+	unsigned char *sp;
+	unsigned long uc;
+	int i, n;
+
+	sp = (unsigned char*) s;
+	uc = *u;
+	if (uc < 0x80) {
+		*sp = uc; /* 0xxxxxxx */
+		return 1;
+	} else if (*u < 0x800) {
+		*sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
+		n = 1;
+	} else if (uc < 0x10000) {
+		*sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
+		n = 2;
+	} else if (uc <= 0x10FFFF) {
+		*sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
+		n = 3;
+	} else {
+		goto invalid;
+	}
+	for (i=n,++sp; i>0; --i,++sp)
+		*sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+	return n+1;
+invalid:
+	/* U+FFFD */
+	*s++ = '\xEF';
+	*s++ = '\xBF';
+	*s = '\xBD';
+	return 3;
+}
+
+/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
+   UTF-8 otherwise return 0 */
+static int canstou(char *s, int b) {
+	unsigned char c = *s;
+	int n;
+
+	if (b < 1)
+		return 0;
+	else if (~c&B7)
+		return 1;
+	else if ((c&(B7|B6|B5)) == (B7|B6))
+		n = 1;
+	else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+		n = 2;
+	else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4))
+		n = 3;
+	else
+		return 1;
+	for (--b,++s; n>0&&b>0; --n,--b,++s) {
+		c = *s;
+		if ((c&(B7|B6)) != B7)
+			break; 
+	}
+	if (n > 0 && b == 0)
+		return 0;
+	else
+		return 1;
+}
+
+static int slen(char *s) {
+	unsigned char c = *s;
+
+	if (~c&B7)
+		return 1;
+	else if ((c&(B7|B6|B5)) == (B7|B6))
+		return 2;
+	else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+		return 3;
+	else 
+		return 4;
+}
+
+static void selinit(void) {
+	sel.mode = 0;
+	sel.bx = -1;
+	sel.clip = NULL;
+}
+
+static inline int selected(int x, int y) {
+	if(sel.ey == y && sel.by == y) {
+		int bx = MIN(sel.bx, sel.ex);
+		int ex = MAX(sel.bx, sel.ex);
+		return BETWEEN(x, bx, ex);
+	}
+	return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) 
+		|| (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
+}
+
+static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
+	if(b) 
+		*b = e->xbutton.button;
+
+	*x = e->xbutton.x/xw.cw;
+	*y = e->xbutton.y/xw.ch;
+	sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
+	sel.b.y = MIN(sel.by, sel.ey);
+	sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
+	sel.e.y = MAX(sel.by, sel.ey);
+}
+
+static void bpress(XEvent *e) {
+	sel.mode = 1;
+	sel.ex = sel.bx = e->xbutton.x/xw.cw;
+	sel.ey = sel.by = e->xbutton.y/xw.ch;
+}
+
+static void selcopy() {
+	char *str, *ptr;
+	int ls, x, y, sz, sl;
+
+	if(sel.bx == -1)
+		str = NULL;
+	else {
+		sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+		ptr = str = malloc(sz);
+		for(y = 0; y < term.row; y++) {
+			for(x = 0; x < term.col; x++)
+				if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
+					sl = slen(term.line[y][x].c);
+					memcpy(ptr, term.line[y][x].c, sl);
+					ptr += sl;
+				}
+			if(ls)
+				*ptr = '\n', ptr++;
+		}
+		*ptr = 0;
+	}
+	xsetsel(str);
+}
+
+static void selnotify(XEvent *e) {
+	unsigned long nitems;
+	unsigned long ofs, rem;
+	int format;
+	unsigned char *data;
+	Atom type;
+
+	ofs = 0;
+	do {
+		if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+					False, AnyPropertyType, &type, &format,
+					&nitems, &rem, &data)) {
+			fprintf(stderr, "Clipboard allocation failed\n");
+			return;
+		}
+		ttywrite((const char *) data, nitems * format / 8);
+		XFree(data);
+		/* number of 32-bit chunks returned */
+		ofs += nitems * format / 32;
+	} while(rem > 0);
+}
+
+static void selpaste() {
+	XConvertSelection(xw.dis, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+}
+
+static void selrequest(XEvent *e)
+{
+	XSelectionRequestEvent *xsre;
+	XSelectionEvent xev;
+	Atom xa_targets;
+
+	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.dis, "TARGETS", 0);
+	if(xsre->target == xa_targets) {
+		/* respond with the supported type */
+		Atom string = XA_STRING;
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				XA_ATOM, 32, PropModeReplace,
+				(unsigned char *) &string, 1);
+		xev.property = xsre->property;
+	} else if(xsre->target == XA_STRING) {
+		XChangeProperty(xsre->display, xsre->requestor, xsre->property,
+				xsre->target, 8, PropModeReplace,
+				(unsigned char *) 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");
+}
+
+static void xsetsel(char *str) {
+	/* register the selection for both the clipboard and the primary */
+	Atom clipboard;
+
+	free(sel.clip);
+	sel.clip = str;
+
+	XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+
+	clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
+	XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+
+	XFlush(xw.dis);
+}
+
+/* TODO: doubleclick to select word */
+static void brelease(XEvent *e) {
+	int b;
+	sel.mode = 0;
+	getbuttoninfo(e, &b, &sel.ex, &sel.ey);
+	if(sel.bx==sel.ex && sel.by==sel.ey) {
+		sel.bx = -1;
+		if(b==2)
+			selpaste();
+	} else {
+		if(b==1)
+			selcopy();
+	}
+	draw(1);
+}
+
+static void bmotion(XEvent *e) {
+	if (sel.mode) {
+		getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+		//	draw(1);
+	}
+}
 
 #ifdef DEBUG
 void
@@ -208,21 +558,15 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-	char *args[3] = {getenv("SHELL"), "-i", NULL};
-	DEFAULT(args[0], "/bin/sh"); /* default shell if getenv() failed */
-	putenv("TERM=" TNAME);
+	char *args[] = {getenv("SHELL"), "-i", NULL};
+	if(opt_cmd)
+		args[0] = opt_cmd, args[1] = NULL;
+	else
+		DEFAULT(args[0], SHELL);
+	putenv("TERM="TNAME);
 	execvp(args[0], args);
 }
 
-void
-xbell(void) { /* visual bell */
-	XRectangle r = { BORDER, BORDER, xw.w, xw.h };
-	XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
-	XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
-	/* usleep(30000); */
-	draw(SCREEN_REDRAW);
-}
-
 void 
 sigchld(int a) {
 	int stat = 0;
@@ -237,19 +581,12 @@ sigchld(int a) {
 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);
+	
+	/* seems to work fine on linux, openbsd and freebsd */
+	struct winsize w = {term.row, term.col, 0, 0};
+	if(openpty(&m, &s, NULL, NULL, &w) < 0)
+		die("openpty failed: %s\n", SERRNO);
+
 	switch(pid = fork()) {
 	case -1:
 		die("fork failed\n");
@@ -260,7 +597,9 @@ 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:
@@ -280,13 +619,24 @@ dump(char c) {
 
 void
 ttyread(void) {
-	char buf[BUFSIZ] = {0};
-	int ret;
+	char buf[BUFSIZ], *ptr;
+	char s[UTF_SIZ];
+	int ret, br;
+	static int buflen = 0;
+	long u;
 
-	if((ret = read(cmdfd, buf, BUFSIZ)) < 0)
+	if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
 		die("Couldn't read from shell: %s\n", SERRNO);
-	else
-		tputs(buf, ret);
+	else {
+		buflen += ret;
+		for(ptr=buf; buflen>=UTF_SIZ||canstou(ptr,buflen); buflen-=br) {
+			br = stou(ptr, &u);
+			utos(&u, s);
+			tputc(s);
+			ptr += br;
+		}
+		memcpy(buf, ptr, buflen);
+	}
 }
 
 void
@@ -318,57 +668,49 @@ tcursor(int mode) {
 
 void
 treset(void) {
-	term.c.attr.mode = ATTR_NULL;
-	term.c.attr.fg = DefaultFG;
-	term.c.attr.bg = DefaultBG;
-	term.c.x = term.c.y = 0;
-	term.hidec = 0;
+	term.c = (TCursor){{
+		.mode = ATTR_NULL, 
+		.fg = DefaultFG, 
+		.bg = DefaultBG
+	}, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
+	
 	term.top = 0, term.bot = term.row - 1;
 	term.mode = MODE_WRAP;
 	tclearregion(0, 0, term.col-1, term.row-1);
 }
 
 void
-tnew(int col, int row) {   /* screen size */
+tnew(int col, int row) {
+	/* set screen size */
 	term.row = row, term.col = col;
-	term.top = 0, term.bot = term.row - 1;
-	/* mode */
-	term.mode = MODE_WRAP;
-	/* cursor */
-	term.c.attr.mode = ATTR_NULL;
-	term.c.attr.fg = DefaultFG;
-	term.c.attr.bg = DefaultBG;
-	term.c.x = term.c.y = 0;
-	term.hidec = 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));
-}
-
-/* TODO: Replace with scrollup/scolldown */
-void
-tscroll(void) {
-	Line temp = term.line[term.top];
-	int i;
+	term.line = malloc(term.row * sizeof(Line));
+	term.alt  = malloc(term.row * sizeof(Line));
+	for(row = 0 ; row < term.row; row++) {
+		term.line[row] = malloc(term.col * sizeof(Glyph));
+		term.alt [row] = malloc(term.col * sizeof(Glyph));
+	}
+	/* setup screen */
+	treset();
+}
 
-	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;
+void
+tswapscreen(void) {
+	Line* tmp = term.line;
+	term.line = term.alt;
+	term.alt = tmp;
+	term.mode ^= MODE_ALTSCREEN;
 }
 
 void
-tscrolldown (int n) {
+tscrolldown(int orig, int n) {
 	int i;
 	Line temp;
 	
-	LIMIT(n, 0, term.bot-term.top+1);
+	LIMIT(n, 0, term.bot-orig+1);
 
-	for(i = 0; i < n; i++)
-		memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
-   	
-	for(i = term.bot; i >= term.top+n; i--) {
+	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;
@@ -376,27 +718,28 @@ tscrolldown (int n) {
 }
 
 void
-tscrollup (int n) {
+tscrollup(int orig, int n) {
 	int i;
 	Line temp;
-	LIMIT(n, 0, term.bot-term.top+1);
+	LIMIT(n, 0, term.bot-orig+1);
 	
-	for(i = 0; i < n; i++)
-		memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+	tclearregion(0, orig, term.col-1, orig+n-1);
 	
-	 for(i = term.top; i <= term.bot-n; i++) { 
+	for(i = orig; i <= term.bot-n; i++) { 
 		 temp = term.line[i];
 		 term.line[i] = term.line[i+n]; 
 		 term.line[i+n] = temp;
-	 }
+	}
 }
 
 void
-tnewline(void) {
-	int y = term.c.y + 1;
-	if(y > term.bot)
-		tscroll(), y = term.bot;
-	tmoveto(0, y);
+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
@@ -425,51 +768,23 @@ csiparse(void) {
 
 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;
+	LIMIT(x, 0, term.col-1);
+	LIMIT(y, 0, term.row-1);
+	term.c.state &= ~CURSOR_WRAPNEXT;
+	term.c.x = x;
+	term.c.y = y;
 }
 
 void
-tmovecursor(int dir) {
-	int xf = term.c.x, yf = term.c.y;
-	
-	switch(dir) {
-	case CURSOR_UP:
-		yf--;
-		break;
-	case CURSOR_DOWN:
-		yf++;
-		break;
-	case CURSOR_LEFT:
-		xf--;
-		if(term.mode & MODE_WRAP && xf < 0) {
-			xf = term.col-1, yf--;
-			if(yf < term.top)
-				yf = term.top, xf = 0;
-		}
-		break;
-	case CURSOR_RIGHT:
-		xf++;
-		if(term.mode & MODE_WRAP && xf >= term.col) {
-			xf = 0, yf++;
-			if(yf > term.bot)
-				yf = term.bot, tscroll();
-		}
-		break;
-	}
-	tmoveto(xf, yf);
-}
-	
-void
-tsetchar(char c) {
+tsetchar(char *c) {
 	term.line[term.c.y][term.c.x] = term.c.attr;
-	term.line[term.c.y][term.c.x].c = c;
+	memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
 	term.line[term.c.y][term.c.x].state |= GLYPH_SET;
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
-	int y, temp;
+	int x, y, temp;
 
 	if(x1 > x2)
 		temp = x1, x1 = x2, x2 = temp;
@@ -482,7 +797,8 @@ tclearregion(int x1, int y1, int x2, int y2) {
 	LIMIT(y2, 0, term.row-1);
 
 	for(y = y1; y <= y2; y++)
-		memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
+		for(x = x1; x <= x2; x++)
+			term.line[y][x].state = 0;
 }
 
 void
@@ -496,69 +812,37 @@ tdeletechar(int n) {
 		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);
+	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;
 
 	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);
+	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);
+	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));
-	}
+
+	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;
-	}
-	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));
-	}
+
+	tscrollup(term.c.y, n);
 }
 
 void
@@ -582,7 +866,7 @@ tsetattr(int *attr, int l) {
 			term.c.attr.mode |= ATTR_REVERSE;	
 			break;
 		case 22: 
-			term.c.attr.mode &= ~ATTR_BOLD;  
+			term.c.attr.mode &= ~ATTR_BOLD;	 
 			break;
 		case 24: 
 			term.c.attr.mode &= ~ATTR_UNDERLINE;
@@ -590,19 +874,46 @@ tsetattr(int *attr, int l) {
 		case 27: 
 			term.c.attr.mode &= ~ATTR_REVERSE;	 
 			break;
+		case 38:
+			if (i + 2 < l && attr[i + 1] == 5) {
+				i += 2;
+				if (BETWEEN(attr[i], 0, 255))
+					term.c.attr.fg = attr[i];
+				else
+					fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
+			}
+			else
+				fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
+			break;
 		case 39:
 			term.c.attr.fg = DefaultFG;
 			break;
+		case 48:
+			if (i + 2 < l && attr[i + 1] == 5) {
+				i += 2;
+				if (BETWEEN(attr[i], 0, 255))
+					term.c.attr.bg = attr[i];
+				else
+					fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
+			}
+			else
+				fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]); 
+			break;
 		case 49:
-			term.c.attr.fg = DefaultBG;
+			term.c.attr.bg = DefaultBG;
 			break;
 		default:
 			if(BETWEEN(attr[i], 30, 37))
 				term.c.attr.fg = attr[i] - 30;
 			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.fg = attr[i] - 100 + 8;
 			else 
-				fprintf(stderr, "erresc: gfx attr %d unkown\n", attr[i]); 
+				fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
+			
 			break;
 		}
 	}
@@ -665,7 +976,7 @@ csihandle(void) {
 	case 'G': /* CHA -- Move to <col> */
 	case '`': /* XXX: HPA -- same? */
 		DEFAULT(escseq.arg[0], 1);
-     	tmoveto(escseq.arg[0]-1, term.c.y);
+		tmoveto(escseq.arg[0]-1, term.c.y);
 		break;
 	case 'H': /* CUP -- Move to <row> <col> */
 	case 'f': /* XXX: HVP -- same? */
@@ -677,15 +988,18 @@ csihandle(void) {
 	case 'J': /* ED -- Clear screen */
 		switch(escseq.arg[0]) {
 		case 0: /* below */
-			tclearregion(term.c.x, term.c.y, term.col-1, term.row-1);
+			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 1: /* above */
-			tclearregion(0, 0, term.c.x, term.c.y);
+			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 2: /* all */
 			tclearregion(0, 0, term.col-1, term.row-1);
 			break;
-		case 3: /* XXX: erase saved lines (xterm) */
 		default:
 			goto unknown;
 		}
@@ -705,11 +1019,11 @@ csihandle(void) {
 		break;
 	case 'S': /* SU -- Scroll <n> line up */
 		DEFAULT(escseq.arg[0], 1);
-		tscrollup(escseq.arg[0]);
+		tscrollup(term.top, escseq.arg[0]);
 		break;
 	case 'T': /* SD -- Scroll <n> line down */
 		DEFAULT(escseq.arg[0], 1);
-		tscrolldown(escseq.arg[0]);
+		tscrolldown(term.top, escseq.arg[0]);
 		break;
 	case 'L': /* IL -- Insert <n> blank lines */
 		DEFAULT(escseq.arg[0], 1);
@@ -721,18 +1035,29 @@ csihandle(void) {
 			case 1:
 				term.mode &= ~MODE_APPKEYPAD;
 				break;
+			case 5: /* TODO: DECSCNM -- Remove reverse video */
+				break;
 			case 7:
 				term.mode &= ~MODE_WRAP;
 				break;
 			case 12: /* att610 -- Stop blinking cursor (IGNORED) */
 				break;
+			case 20:
+				term.mode &= ~MODE_CRLF;
+				break;
 			case 25:
-				term.hidec = 1;
+				term.c.state |= CURSOR_HIDE;
 				break;
-			case 1048: /* XXX: no alt. screen to erase/save */
-			case 1049:
+			case 1049: /* = 1047 and 1048 */
+			case 1047:
+				if(IS_SET(MODE_ALTSCREEN)) {
+					tclearregion(0, 0, term.col-1, term.row-1);
+					tswapscreen();
+				}
+				if(escseq.arg[0] == 1047)
+					break;
+			case 1048:
 				tcursor(CURSOR_LOAD);
-				tclearregion(0, 0, term.col-1, term.row-1);
 				break;
 			default:
 				goto unknown;
@@ -770,18 +1095,32 @@ csihandle(void) {
 			case 1:
 				term.mode |= MODE_APPKEYPAD;
 				break;
+			case 5: /* DECSCNM -- Reverve video */
+				/* TODO: set REVERSE on the whole screen (f) */
+				break;
 			case 7:
 				term.mode |= MODE_WRAP;
 				break;
-			case 12: /* att610 -- Start blinking cursor (IGNORED) */
+			case 20:
+				term.mode |= MODE_CRLF;
 				break;
+			case 12: /* att610 -- Start blinking cursor (IGNORED) */
+				 /* fallthrough for xterm cvvis = CSI [ ? 12 ; 25 h */
+				if(escseq.narg > 1 && escseq.arg[1] != 25)
+					break;
 			case 25:
-				term.hidec = 0;
+				term.c.state &= ~CURSOR_HIDE;
 				break;
-			case 1048: 
-			case 1049: /* XXX: no alt. screen to erase/save */
+			case 1049: /* = 1047 and 1048 */
+			case 1047:
+				if(IS_SET(MODE_ALTSCREEN))
+					tclearregion(0, 0, term.col-1, term.row-1);
+				else
+					tswapscreen();
+				if(escseq.arg[0] == 1047)
+					break;
+			case 1048:
 				tcursor(CURSOR_SAVE);
-				tclearregion(0, 0, term.col-1, term.row-1);
 				break;
 			default: goto unknown;
 			}
@@ -804,6 +1143,7 @@ csihandle(void) {
 			DEFAULT(escseq.arg[0], 1);
 			DEFAULT(escseq.arg[1], term.row);
 			tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
+			tmoveto(0, 0);
 		}
 		break;
 	case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
@@ -835,38 +1175,35 @@ csireset(void) {
 void
 tputtab(void) {
 	int space = TAB - term.c.x % TAB;
-	
-	if(term.c.x + space >= term.col)
-		space--;
-	
-	for(; space > 0; space--)
-		tmovecursor(CURSOR_RIGHT);
+	tmoveto(term.c.x + space, term.c.y);
 }
 
 void
-tputc(char c) {
+tputc(char *c) {
+	char ascii = *c;
 	if(term.esc & ESC_START) {
 		if(term.esc & ESC_CSI) {
-			escseq.buf[escseq.len++] = c;
-			if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+			escseq.buf[escseq.len++] = ascii;
+			if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
 				term.esc = 0;
 				csiparse(), csihandle();
 			}
-		} else if(term.esc & ESC_OSC) {
-			if(c == ';') {
+			/* TODO: handle other OSC */
+		} else if(term.esc & ESC_OSC) { 
+			if(ascii == ';') {
 				term.titlelen = 0;
 				term.esc = ESC_START | ESC_TITLE;
 			}
 		} else if(term.esc & ESC_TITLE) {
-			if(c == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+			if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
 				term.esc = 0;
 				term.title[term.titlelen] = '\0';
 				XStoreName(xw.dis, xw.win, term.title);
 			} else {
-				term.title[term.titlelen++] = c;
+				term.title[term.titlelen++] = ascii;
 			}
 		} else if(term.esc & ESC_ALTCHARSET) {
-			switch(c) {
+			switch(ascii) {
 			case '0': /* Line drawing crap */
 				term.c.attr.mode |= ATTR_GFX;
 				break;
@@ -874,11 +1211,11 @@ tputc(char c) {
 				term.c.attr.mode &= ~ATTR_GFX;
 				break;
 			default:
-				printf("esc unhandled charset: ESC ( %c\n", c);
+				printf("esc unhandled charset: ESC ( %c\n", ascii);
 			}
 			term.esc = 0;
-		} else {		
-			switch(c) {
+		} else {
+			switch(ascii) {
 			case '[':
 				term.esc |= ESC_CSI;
 				break;
@@ -888,29 +1225,20 @@ tputc(char c) {
 			case '(':
 				term.esc |= ESC_ALTCHARSET;
 				break;
-			case 'A':
-				tmoveto(term.c.x, term.c.y-1);
-				term.esc = 0;
-				break;
-			case 'B':
-				tmoveto(term.c.x, term.c.y+1);
-				term.esc = 0;
-				break;
-			case 'C':
-				tmoveto(term.c.x+1, term.c.y);
-				term.esc = 0;
-				break;
-			case 'D': /* XXX: CUP (VT100) or IND (VT52) ... */
-				tmoveto(term.c.x-1, term.c.y);
+			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();
+				tnewline(1); /* always go to first col */
 				term.esc = 0;
 				break;
 			case 'M': /* RI -- Reverse index */
 				if(term.c.y == term.top)
-					tscrolldown(1);
+					tscrolldown(term.top, 1);
 				else
 					tmoveto(term.c.x, term.c.y-1);
 				term.esc = 0;
@@ -919,169 +1247,310 @@ tputc(char c) {
 				treset();
 				term.esc = 0;
 				break;
-			case '=': /* DECPAM */
+			case '=': /* DECPAM -- Application keypad */
 				term.mode |= MODE_APPKEYPAD;
 				term.esc = 0;
 				break;
-			case '>': /* DECPNM */
+			case '>': /* DECPNM -- Normal keypad */
 				term.mode &= ~MODE_APPKEYPAD;
 				term.esc = 0;
 				break;
-			case '7':
+			case '7': /* DECSC -- Save Cursor */
 				tcursor(CURSOR_SAVE);
 				term.esc = 0;
 				break;
-			case '8':
+			case '8': /* DECRC -- Restore Cursor */
 				tcursor(CURSOR_LOAD);
 				term.esc = 0;
 				break;
 			default:
-				fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
+				fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+				    (unsigned char) ascii, isprint(ascii)?ascii:'.');
 				term.esc = 0;
 			}
 		}
 	} else {
-		switch(c) {
+		switch(ascii) {
 		case '\t':
 			tputtab();
 			break;
 		case '\b':
-			tmovecursor(CURSOR_LEFT);
+			tmoveto(term.c.x-1, term.c.y);
 			break;
 		case '\r':
 			tmoveto(0, term.c.y);
 			break;
+		case '\f':
+		case '\v':
 		case '\n':
-			tnewline();
+			/* go to first col if the mode is set */
+			tnewline(IS_SET(MODE_CRLF));
 			break;
 		case '\a':
-			xbell();
+			if(!(xw.state & WIN_FOCUSED))
+				xseturgency(1);
 			break;
 		case '\033':
 			csireset();
 			term.esc = ESC_START;
 			break;
 		default:
+			if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+				tnewline(1); /* always go to first col */
 			tsetchar(c);
-			tmovecursor(CURSOR_RIGHT);
+			if(term.c.x+1 < term.col)
+				tmoveto(term.c.x+1, term.c.y);
+			else
+				term.c.state |= CURSOR_WRAPNEXT;
 			break;
 		}
 	}
 }
 
-void
-tputs(char *s, int len) { 
-	for(; len > 0; len--)
-		tputc(*s++);
-}
-
-void
+int
 tresize(int col, int row) {
-	int i;
-	Line *line;
+	int i, x;
 	int minrow = MIN(row, term.row);
 	int mincol = MIN(col, term.col);
+	int slide = term.c.y - row + 1;
 
 	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++)
+		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.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);
+		free(term.alt[i]);
+	}
+
+	/* resize to new height */
+	term.line = realloc(term.line, row * sizeof(Line));
+	term.alt  = realloc(term.alt,  row * sizeof(Line));
+
+	/* resize each row to new width, zero-pad if needed */
+	for(i = 0; i < minrow; i++) {
+		term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
+		term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
+		for(x = mincol; x < col; x++) {
+			term.line[i][x].state = 0;
+			term.alt[i][x].state = 0;
+		}
+	}
+
+	/* allocate any new rows */
+	for(/* i == minrow */; i < row; i++) {
+		term.line[i] = calloc(col, sizeof(Glyph));
+		term.alt [i] = calloc(col, sizeof(Glyph));
+	}
 	
-	term.bot = row-1;
-	term.line = line;
+	/* update terminal size */
 	term.col = col, term.row = row;
+	/* make use of the LIMIT in tmoveto */
+	tmoveto(term.c.x, term.c.y);
+	/* reset scrolling region */
+	tsetscroll(0, row-1);
+	return (slide > 0);
 }
 
-unsigned long
-xgetcol(const char *s) {
+void
+xresize(int col, int row) {
+	Pixmap newbuf;
+	int oldw, oldh;
+
+	oldw = xw.bufw;
+	oldh = xw.bufh;
+	xw.bufw = MAX(1, col * xw.cw);
+	xw.bufh = MAX(1, row * xw.ch);
+	newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+	XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+	XFreePixmap(xw.dis, xw.buf);
+	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+	if(xw.bufw > oldw)
+		XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+				xw.bufw-oldw, MIN(xw.bufh, oldh));
+	else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
+		XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+				xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
+				False);
+	if(xw.bufh > oldh)
+		XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+				xw.bufw, xw.bufh-oldh);
+	else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
+		XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+				xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
+				False);
+	xw.buf = newbuf;
+}
+
+void
+xloadcols(void) {
+	int i, r, g, b;
 	XColor color;
-	Colormap cmap = DefaultColormap(xw.dis, xw.scr);
+	unsigned long white = WhitePixel(xw.dis, xw.scr);
+
+	for(i = 0; i < 16; i++) {
+		if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
+			dc.col[i] = white;
+			fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
+		} else
+			dc.col[i] = color.pixel;
+	}
+
+	/* same colors as xterm */
+	for(r = 0; r < 6; r++)
+		for(g = 0; g < 6; g++)
+			for(b = 0; b < 6; b++) {
+				color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
+				color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
+				color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
+				if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+					dc.col[i] = white;
+					fprintf(stderr, "Could not allocate color %d\n", i);
+				} else
+					dc.col[i] = color.pixel;
+				i++;
+			}
 
-	if(!XAllocNamedColor(xw.dis, cmap, s, &color, &color)) {
-		color.pixel = WhitePixel(xw.dis, xw.scr);
-		fprintf(stderr, "Could not allocate color '%s'\n", s);
+	for(r = 0; r < 24; r++, i++) {
+		color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
+		if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+			dc.col[i] = white;
+			fprintf(stderr, "Could not allocate color %d\n", i);
+		} else
+			dc.col[i] = color.pixel;
 	}
-	return color.pixel;
 }
 
 void
 xclear(int x1, int y1, int x2, int y2) {
 	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
 	XFillRectangle(xw.dis, xw.buf, dc.gc,
-				   x1 * xw.cw, y1 * xw.ch, 
-				   (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+	               x1 * xw.cw, y1 * xw.ch,
+	               (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void
-xinit(void) {
-	XClassHint chint;
-	XWMHints wmhint;
-	XSizeHints shint;
-	char *args[] = {NULL};
+xhints(void)
+{
+	XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
+	XWMHints wm = {.flags = InputHint, .input = 1};
+	XSizeHints size = {
+		.flags = PSize | PResizeInc | PBaseSize,
+		.height = xw.h,
+		.width = xw.w,
+		.height_inc = xw.ch,
+		.width_inc = xw.cw,
+		.base_height = 2*BORDER,
+		.base_width = 2*BORDER,
+	};
+	XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+}
+
+void
+xsetfontinfo(FontInfo *fi)
+{
+	XFontStruct **xfonts;
+	int fnum;
 	int i;
+	char **fontnames;
+
+	fi->lbearing = 0;
+	fi->rbearing = 0;
+	fi->ascent = 0;
+	fi->descent = 0;
+	fnum = XFontsOfFontSet(fi->fs, &xfonts, &fontnames);
+	for(i=0; i<fnum; i++,xfonts++,fontnames++) {
+		puts(*fontnames);
+		if(fi->ascent < (*xfonts)->ascent)
+			fi->ascent = (*xfonts)->ascent;
+		if(fi->descent < (*xfonts)->descent)
+			fi->descent = (*xfonts)->descent;
+		if(fi->rbearing < (*xfonts)->max_bounds.rbearing)
+			fi->rbearing = (*xfonts)->max_bounds.rbearing;
+		if(fi->lbearing < (*xfonts)->min_bounds.lbearing)
+			fi->lbearing = (*xfonts)->min_bounds.lbearing;
+	}
+}
 
-	xw.dis = XOpenDisplay(NULL);
-	xw.scr = XDefaultScreen(xw.dis);
-	if(!xw.dis)
+void
+xinit(void) {
+	XSetWindowAttributes attrs;
+	char **mc;
+	char *ds;
+	int nmc;
+
+	if(!(xw.dis = XOpenDisplay(NULL)))
 		die("Can't open display\n");
+	xw.scr = XDefaultScreen(xw.dis);
 	
 	/* font */
-	if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
-		die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
+	if ((dc.font.fs = XCreateFontSet(xw.dis, FONT, &mc, &nmc, &ds)) == NULL ||
+	    (dc.bfont.fs = XCreateFontSet(xw.dis, BOLDFONT, &mc, &nmc, &ds)) == NULL)
+		die("Can't load font %s\n", dc.font.fs ? BOLDFONT : FONT); 
+	xsetfontinfo(&dc.font);
+	xsetfontinfo(&dc.bfont);
 
 	/* XXX: Assuming same size for bold font */
-	xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
-	xw.ch = dc.font->ascent + dc.font->descent;
+ 	xw.cw = dc.font.rbearing - dc.font.lbearing;
+	xw.ch = dc.font.ascent + dc.font.descent;
 
 	/* 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 = ATTR_NULL;
-	/* windows */
-	xw.h = term.row * xw.ch;
-	xw.w = term.col * xw.cw;
-	xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-			xw.w + 2*BORDER, xw.h + 2*BORDER, 0, 
-			dc.col[DefaultBG],
-			dc.col[DefaultBG]);
-	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr));
+	xw.cmap = XDefaultColormap(xw.dis, xw.scr);
+	xloadcols();
+
+	/* window - default size */
+	xw.bufh = 24 * xw.ch;
+	xw.bufw = 80 * xw.cw;
+	xw.h = xw.bufh + 2*BORDER;
+	xw.w = xw.bufw + 2*BORDER;
+
+	attrs.background_pixel = dc.col[DefaultBG];
+	attrs.border_pixel = dc.col[DefaultBG];
+	attrs.bit_gravity = NorthWestGravity;
+	attrs.event_mask = FocusChangeMask | KeyPressMask
+		| ExposureMask | VisibilityChangeMask | StructureNotifyMask
+		| PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+	attrs.colormap = xw.cmap;
+
+	xw.win = XCreateWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
+			xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOutput,
+			XDefaultVisual(xw.dis, xw.scr),
+			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
+			| CWColormap,
+			&attrs);
+	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+
+
+	/* input methods */
+	xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
+	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing 
+					   | XIMStatusNothing, XNClientWindow, xw.win, 
+					   XNFocusWindow, xw.win, NULL);
 	/* gc */
 	dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+	
 	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 + 2*BORDER, shint.width = xw.w + 2*BORDER;
-	shint.flags = PSize | PResizeInc;
-	XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
-	XStoreName(xw.dis, xw.win, TNAME);
-	XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
+	xhints();
+	XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
 	XSync(xw.dis, 0);
-
 }
 
 void
-xdraws(char *s, Glyph base, int x, int y, int len) {
+xdraws(char *s, Glyph base, int x, int y, int cl, int sl) {
 	unsigned long xfg, xbg;
-	int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw;
+	int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = cl*xw.cw;
 	int i;
 
 	if(base.mode & ATTR_REVERSE)
@@ -1091,57 +1560,65 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
 
 	XSetBackground(xw.dis, dc.gc, xbg);
 	XSetForeground(xw.dis, dc.gc, xfg);
-	
+
 	if(base.mode & ATTR_GFX)
-		for(i = 0; i < len; i++)
-			s[i] = gfx[s[i]];
+		for(i = 0; i < cl; i++) {
+			char c = gfx[(unsigned int)s[i] % 256];
+			if(c)
+				s[i] = c;
+			else if(s[i] > 0x5f)
+				s[i] -= 0x5f;
+		}
 
-	XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);	
-	XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
+	XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.fs : dc.font.fs,
+	    dc.gc, winx, winy, s, sl);
 	
 	if(base.mode & ATTR_UNDERLINE)
 		XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
 
 void
-xcursor(int mode) {
+xdrawcursor(void) {
 	static int oldx = 0;
 	static int oldy = 0;
-	Glyph g = {' ', ATTR_NULL, DefaultBG, DefaultCS, 0};
+	int sl;
+	Glyph g = {{' '}, ATTR_NULL, 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 & GLYPH_SET)
-		g.c = term.line[term.c.y][term.c.x].c;
+		memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
 	/* remove the old cursor */
-	if(term.line[oldy][oldx].state & GLYPH_SET)
-		xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
-	else
+	if(term.line[oldy][oldx].state & GLYPH_SET) {
+		sl = slen(term.line[oldy][oldx].c);
+		xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
+	} else
 		xclear(oldx, oldy, oldx, oldy);
 	
 	/* draw the new one */
-	if(mode == CURSOR_DRAW) {
-		xdraws(&g.c, g, term.c.x, term.c.y, 1);
+	if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
+		sl = slen(g.c);
+		xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
 		oldx = term.c.x, oldy = term.c.y;
 	}
 }
 
-
 #ifdef DEBUG
 /* basic drawing routines */
 void
 xdrawc(int x, int y, Glyph g) {
+	int sl = slen(g.c);
 	XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
 	XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
 	XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
-	XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
-	XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+	XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
+	    dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
 }
 
 void
-draw_(int dummy) {
+draw(int dummy) {
 	int x, y;
 
 	xclear(0, 0, term.col-1, term.row-1);
@@ -1150,44 +1627,99 @@ draw_(int dummy) {
 			if(term.line[y][x].state & GLYPH_SET)
 				xdrawc(x, y, term.line[y][x]);
 
-	if(!term.hidec)
-		xcursor(CURSOR_DRAW);
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
+	xdrawcursor();
+	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 	XFlush(xw.dis);
 }
-#endif
 
+#else
+/* optimized drawing routine */
 void
 draw(int redraw_all) {
-	int i, x, y, ox;
+	int ic, ib, x, y, ox, sl;
 	Glyph base, new;
 	char buf[DRAW_BUF_SIZ];
-	
+
+	if(!(xw.state & WIN_VISIBLE))
+		return;
+
+	xclear(0, 0, term.col-1, term.row-1);
 	for(y = 0; y < term.row; y++) {
 		base = term.line[y][0];
-		i = ox = 0;
+		ic = ib = ox = 0;
 		for(x = 0; x < term.col; x++) {
 			new = term.line[y][x];
-			if(!ATTRCMP(base, new) && i < DRAW_BUF_SIZ)
-				buf[i++] = new.c;
-			else {
-				xdraws(buf, base, ox, y, i);
-				buf[0] = new.c;
-				i = 1;
-				ox = x;
-				base = new;
+			if(sel.bx!=-1 && *(new.c) && selected(x, y))
+				new.mode ^= ATTR_REVERSE;
+			if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
+					ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+				xdraws(buf, base, ox, y, ic, ib);
+				ic = ib = 0;
+			}
+			if(new.state & GLYPH_SET) {
+				if(ib == 0) {
+					ox = x;
+					base = new;
+				}
+				sl = slen(new.c);
+				memcpy(buf+ib, new.c, sl);
+				ib += sl;
+				++ic;
 			}
 		}
-		xdraws(buf, base, ox, y, i);
+		if(ib > 0)
+			xdraws(buf, base, ox, y, ic, ib);
 	}
-	xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
-	XFlush(xw.dis);
+	xdrawcursor();
+	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 }
 
+#endif
+
 void
 expose(XEvent *ev) {
-	draw(SCREEN_REDRAW);
+	XExposeEvent *e = &ev->xexpose;
+	if(xw.state & WIN_REDRAW) {
+		if(!e->count) {
+			xw.state &= ~WIN_REDRAW;
+			draw(SCREEN_REDRAW);
+		}
+	} else
+		XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
+				e->width, e->height, e->x, e->y);
+}
+
+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
+xseturgency(int add) {
+	XWMHints *h = XGetWMHints(xw.dis, xw.win);
+	h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
+	XSetWMHints(xw.dis, xw.win, h);
+	XFree(h);
+}
+
+void
+focus(XEvent *ev) {
+	if(ev->type == FocusIn) {
+		xw.state |= WIN_FOCUSED;
+		xseturgency(0);
+	} else
+		xw.state &= ~WIN_FOCUSED;
+	draw(SCREEN_UPDATE);
 }
 
 char*
@@ -1208,33 +1740,44 @@ kpress(XEvent *ev) {
 	int len;
 	int meta;
 	int shift;
+	Status status;
 
-	meta  = e->state & Mod1Mask;
+	meta = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
-	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-
-	if(customkey = kmap(ksym))
+	len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
+	
+	/* 1. custom keys from config.h */
+	if((customkey = kmap(ksym)))
 		ttywrite(customkey, strlen(customkey));
-	else if(len > 0) {
-		buf[sizeof(buf)-1] = '\0';
-		if(meta && len == 1)
-			ttywrite("\033", 1);
-		ttywrite(buf, len);
-	} else
+	/* 2. hardcoded (overrides X lookup) */
+	else
 		switch(ksym) {
 		case XK_Up:
 		case XK_Down:
 		case XK_Left:
 		case XK_Right:
-			sprintf(buf, "\033%c%c", term.mode & MODE_APPKEYPAD ? 'O' : '[', "DACB"[ksym - XK_Left]);
+			sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
 			ttywrite(buf, 3);
 			break;
 		case XK_Insert:
 			if(shift)
-				draw(1), puts("draw!")/* XXX: paste X clipboard */;
+				selpaste();
+			break;
+		case XK_Return:
+			if(IS_SET(MODE_CRLF))
+				ttywrite("\r\n", 2);
+			else
+				ttywrite("\r", 1);
 			break;
+			/* 3. X lookup  */
 		default:
-			fprintf(stderr, "errkey: %d\n", (int)ksym);
+			if(len > 0) {
+				buf[sizeof(buf)-1] = '\0';
+				if(meta && len == 1)
+					ttywrite("\033", 1);
+				ttywrite(buf, len);
+			} else /* 4. nothing to send */
+				fprintf(stderr, "errkey: %d\n", (int)ksym);
 			break;
 		}
 }
@@ -1242,18 +1785,20 @@ kpress(XEvent *ev) {
 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;
-		XFreePixmap(xw.dis, xw.buf);
-		xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr));
+	if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+		return;
+	
+	xw.w = e->xconfigure.width;
+	xw.h = e->xconfigure.height;
+	col = (xw.w - 2*BORDER) / xw.cw;
+	row = (xw.h - 2*BORDER) / xw.ch;
+	if(col == term.col && row == term.row)
+		return;
+	if(tresize(col, row))
 		draw(SCREEN_REDRAW);
-	}
+	ttyresize(col, row);
+	xresize(col, row);
 }
 
 void
@@ -1262,15 +1807,11 @@ run(void) {
 	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+2*BORDER, xw.h+2*BORDER); /* fix resize bug in wmii (?) */
-
-	while(running) {
+	for(;;) {
 		FD_ZERO(&rfd);
 		FD_SET(cmdfd, &rfd);
 		FD_SET(xfd, &rfd);
-		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) {
+		if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
 			if(errno == EINTR)
 				continue;
 			die("select failed: %s\n", SERRNO);
@@ -1281,6 +1822,8 @@ run(void) {
 		}
 		while(XPending(xw.dis)) {
 			XNextEvent(xw.dis, &ev);
+			if (XFilterEvent(&ev, xw.win))
+				continue;
 			if(handler[ev.type])
 				(handler[ev.type])(&ev);
 		}
@@ -1289,14 +1832,29 @@ run(void) {
 
 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 i;
+	
+	for(i = 1; i < argc; i++) {
+		switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
+		case 't':
+			if(++i < argc) opt_title = argv[i];
+			break;
+		case 'c':
+			if(++i < argc) opt_class = argv[i];
+			break;
+		case 'e':
+			if(++i < argc) opt_cmd = argv[i];
+			break;
+		case 'v':
+		default:
+			die(USAGE);
+		}
+	}
 	setlocale(LC_CTYPE, "");
 	tnew(80, 24);
 	ttynew();
 	xinit();
+	selinit();
 	run();
 	return 0;
 }