backport of local changes

1 files changed, 915 insertions, 11 deletions

diff --git a/st.c b/st.c
index 8a8804f..d5f004b 100644
--- a/st.c
+++ b/st.c
@@ -1,17 +1,921 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+/* See LICENSE for licence details.  */
+#include "st.h"
+
+/* Globals */
+DC dc;
+XWindow xw;
+Term term;
+Escseq escseq;
+int cmdfd;
+int running;
+
+void
+die(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
+void
+execsh(void) {
+	char *args[3] = {SHELL, "-i", NULL};
+	putenv("TERM=" TNAME);
+	execvp(SHELL, args);
+}
+
+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);
+	XFlush(xw.dis);
+	usleep(30000);
+	draw(SCredraw);
+}
+
+void
+ttynew(void) {
+	int m, s;
+	pid_t pid;
+	char *pts;
+
+	if((m = posix_openpt(O_RDWR | O_NOCTTY)) < 0)
+		die("openpt");
+	if(grantpt(m) == -1)
+		die("grandpt");
+	if(unlockpt(m) == -1)
+		die("unlockpt");
+	if((pts = ptsname(m)) == NULL)
+		die("ptsname");
+	if((s = open(pts, O_RDWR | O_NOCTTY)) < 0)
+		die("slave open");
+	fcntl(s, F_SETFL, O_NDELAY);
+	switch(pid = fork()) {
+	case -1:
+		die("fork");
+		break;
+	case 0:
+		setsid(); /* create a new process group */
+		dup2(s, STDIN_FILENO);
+		dup2(s, STDOUT_FILENO);
+		dup2(s, STDERR_FILENO);
+		if(ioctl(s, TIOCSCTTY, NULL) < 0)
+			die("slave TTIOCSTTY");
+		execsh();
+		break;
+	default:
+		close(s);
+		cmdfd = m;
+	}
+}
+
+void
+dump(char c) {
+	static int col;
+	fprintf(stderr, " %02x %c ", c, isprint(c)?c:'.');
+	if(++col % 10 == 0)
+		fprintf(stderr, "\n");
+}
+
+void
+ttyread(void) {
+	char buf[BUFSIZ] = {0};
+	int ret;
+
+	switch(ret = read(cmdfd, buf, BUFSIZ)) {
+	case -1: /* error or exit */
+		/* XXX: be more precise */
+		running = 0;
+		break;
+	default:
+		tputs(buf, ret);
+	}
+}
+
+void
+ttywrite(char *s, size_t n) {
+	if(write(cmdfd, s, n) == -1)
+		die("write error on tty.");
+}
+
+void
+ttyresize(int x, int y) {
+	struct winsize w;
+
+	w.ws_row = term.row;
+	w.ws_col = term.col;
+	w.ws_xpixel = w.ws_ypixel = 0;
+	if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
+		fprintf(stderr, "Couldn't set window size: %m\n");
+}
 
 int
-main(int argc, char *argv[]) {
-	if(argc == 2 && !strcmp("-v", argv[1])) {
-		fprintf(stderr, "st-"VERSION", © 2007-2008 st engineers, see LICENSE for details\n");
-		exit(EXIT_SUCCESS);
+escfinal(char c) {
+	if(escseq.len == 1)
+		switch(c) {
+		case '[':
+		case ']':
+		case '(':
+			return 0;
+		case '=':
+		case '>':
+		default:
+			return 1;
+		}
+	else if(BETWEEN(c, 0x40, 0x7E))
+		return 1;
+	return 0;     
+}
+
+void
+tcpos(int mode) {
+	static int x = 0;
+	static int y = 0;
+
+	if(mode == CSsave)
+		x = term.c.x, y = term.c.y;
+	else if(mode == CSload)
+		tmoveto(x, y);
+}
+
+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));
+}
+
+void
+tscroll(void) {
+	Line temp = term.line[term.top];
+	int i;
+
+	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;
+	xscroll();    
+}
+
+void
+tnewline(void) {
+	int y = term.c.y + 1;
+
+	if(y > term.bot) {
+		tscroll(), y = term.bot;
 	}
-	else if(argc != 1) {
-		fprintf(stderr, "usage: st [-v]\n");
-		exit(EXIT_FAILURE);
+	tmoveto(0, y);
+}
+
+int
+escaddc(char c) {
+	escseq.buf[escseq.len++] = c;
+	if(escfinal(c) || escseq.len >= ESCSIZ) {
+		escparse(), eschandle();
+		return 0;
 	}
+	return 1;
+}
+
+void
+escparse(void) {
+	/* int noarg = 1; */
+	char *p = escseq.buf;
+
+	escseq.narg = 0;
+	switch(escseq.pre = *p++) {
+	case '[': /* CSI */
+		if(*p == '?')
+			escseq.priv = 1, p++;
+
+		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 '(':
+		/* humf charset stuff */
+		break;
+	}
+}
+
+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;
+}
+
+void
+tcursor(int dir) {
+	int xi = term.c.x, yi = term.c.y;
+	int xf = xi, yf = yi;
+
+	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;
+		}
+		break;
+	case CSright:
+		xf++;
+		if(xf >= term.col) {
+			xf = 0, yf++;
+			if(yf > term.bot)
+				yf = term.bot, tscroll();
+		}
+		break;
+	}
+	tmoveto(xf, yf);
+}
+
+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;
+}
+
+void
+tclearregion(int x1, int y1, int x2, int y2) {
+	int x, y;
+
+	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);
+}
+
+void
+tdeletechar(int n) {
+	int src = term.c.x + n;
+	int dst = term.c.x;
+	int size = term.col - src;
+
+	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);
+}
+
+void
+tinsertblank(int n) {
+	int src = term.c.x;
+	int dst = src + n;
+	int size = term.col - n - src;
+
+	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
+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);
+		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));
+	}
+}
+
+
+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);
+		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));
+	}
+}
+
+void
+tsetattr(int *attr, int l) {
+	int i;
+
+#ifdef TRUECOLOR /* ESC [ ? <fg/bg> ; <r> ; <g> ; <b> m */
+	Color col;
+	if(escseq.priv && escseq.len == 4) { /* True color extension :) */
+		col = (escseq.arg[1]<<16) + (escseq.arg[2]<<8) + escseq.arg[3];
+		switch(escseq.arg[0]) {
+		case 3: /* foreground */
+			term.c.attr.fg = col;
+			break;
+		case 4: /* background */
+			term.c.attr.bg = col;
+			break;
+		}
+	}
+	else
+#endif
+		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;
+				break;
+			case 1:
+				term.c.attr.mode |= ATbold;  
+				break;
+			case 4: 
+				term.c.attr.mode |= ATunderline;
+				break;
+			case 7: 
+				term.c.attr.mode |= ATreverse;  
+				break;
+			case 8:
+				term.c.hidden = CShide;
+				break;
+			case 22: 
+				term.c.attr.mode &= ~ATbold;  
+				break;
+			case 24: 
+				term.c.attr.mode &= ~ATunderline;
+				break;
+			case 27: 
+				term.c.attr.mode &= ~ATreverse;  
+				break;
+			case 39:
+				term.c.attr.fg = DefaultFG;
+				break;
+			case 49:
+				term.c.attr.fg = 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;
+				break;
+			}
+		}
+}
+
+void
+tsetscroll(int t, int b) {
+	int temp;
+
+	LIMIT(t, 0, term.row-1);
+	LIMIT(b, 0, term.row-1);
+	if(t > b) {
+		temp = t;
+		t = b;
+		b = temp;
+	}
+	term.top = t;
+	term.bot = b;    
+}
+
+
+void
+eschandle(void) { 
+	/* escdump(); */
+	switch(escseq.pre) {
+	case '[':
+		switch(escseq.mode) {
+		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);
+				break;
+			case 1: /* above */
+				tclearregion(0, 0, term.c.x, term.c.y);
+				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);
+				break;
+			case 1: /* left */
+				tclearregion(0, term.c.y, term.c.x, term.c.y);
+				break;
+			case 2: /* all */
+				tclearregion(0, term.c.y, term.col-1, term.c.y);
+				break;
+			}
+			break;
+		case 'L': /* Insert <n> blank lines */
+			DEFAULT(escseq.arg[0], 1);
+			tinsertblankline(escseq.arg[0]);
+			break;
+		case 'M': /* Delete <n> lines */
+			DEFAULT(escseq.arg[0], 1);
+			tdeleteline(escseq.arg[0]);
+			break;
+		case 'P': /* Delete <n> char */
+			DEFAULT(escseq.arg[0], 1);
+			tdeletechar(escseq.arg[0]);
+			break;
+		case 'd': /* Move to <row> */
+			DEFAULT(escseq.arg[0], 1);
+			tmoveto(term.c.x, escseq.arg[0]-1);
+			break;
+		case 'h': /* Set terminal mode */
+			break;
+		case 'm': /* Terminal attribute (color) */
+			tsetattr(escseq.arg, escseq.narg);
+			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);
+			}
+			break;
+		case 's': /* Save cursor position */
+			tcpos(CSsave);
+			break;
+		case 'u': /* Load cursor position */
+			tcpos(CSload);
+			break;
+		}
+		break;
+	}
+}
+
+void
+escdump(void) { 
+	int i;
+	puts("------");
+	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);
+}
+
+void
+escreset(void) {
+	memset(&escseq, 0, sizeof(escseq));
+}
+
+void
+tputc(char c) {
+	static int inesc = 0;
+
+	dump(c);
+	/* 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 '\b':
+			tcursor(CSleft);
+			break;
+		case '\r':
+			tmoveto(0, term.c.y);
+			break;
+		case '\n':
+			tnewline();
+			break;
+		case '\a':
+			xbell();
+			break;
+	}
+}
+
+void
+tputs(char *s, int len) { 
+	for(; len > 0; len--)
+		tputc(*s++);
+}
+
+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 : '.');
+			}
+		}
+		putchar('\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;
+	line = calloc(row, sizeof(Line));
+	for(i = 0 ; i < row; i++)
+		line[i] = calloc(col, sizeof(Glyph));
+	for(i = 0 ; i < minrow; i++) {
+		memcpy(line[i], term.line[i], mincol * sizeof(Glyph));
+		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);
+	//    if(term.bot == term.row-1)
+	term.bot = row-1;
+	term.line = line;
+	term.col = col, term.row = row;
+}
+
+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);
+	}
+	return color.pixel;
+}
+
+
+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);
+}
+
+
+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);
+}
+
+
+
+
+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);
+	/* font */
+	dc.font = XLoadQueryFont(xw.dis, 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];
+	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};
+
+	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); /* XXX: maybe a bug */
+	if(mode == CSdraw && !term.c.hidden) {
+		xdrawc(term.c.x, term.c.y, g);
+		oldx = term.c.x, oldy = term.c.y;
+	}
+}
+
+
+void
+draw(int redraw_all) {
+	int x, y;
+	int changed, set;
+
+	if(redraw_all)
+		XClearWindow(xw.dis, xw.win);
+	/* 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((changed && set) || (redraw_all && set)) {
+				term.line[y][x].state &= ~CRupdate;
+				xdrawc(x, y, term.line[y][x]);
+			}
+		}
+	}
+	xcursor(CSdraw);
+}
+
+void
+kpress(XKeyEvent *e) {
+	KeySym ksym;
+	char buf[32];
+	int len;
+	int meta;
+	int shift;
+
+	meta  = e->state & Mod4Mask;
+	shift = e->state & ShiftMask;
+	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
+	if(len > 0) {
+		buf[sizeof(buf)-1] = '\0';
+		if(meta && len == 1)
+			ttywrite("\033", 1);
+		ttywrite(buf, len);
+		return;
+	}
+	switch(ksym) {
+#ifdef DEBUG1
+	default:
+		printf("errkey: %d\n", (int)ksym);
+		break;
+#endif
+	case XK_Up:
+	case XK_Down:
+	case XK_Left:
+	case XK_Right:
+		sprintf(buf, "\033[%c", "DACB"[ksym - XK_Left]);
+		ttywrite(buf, 3);
+		break;
+	case XK_Delete: ttywrite(KEYDELETE, sizeof(KEYDELETE)-1); break;
+	case XK_Home:   ttywrite(  KEYHOME, sizeof(  KEYHOME)-1); break;
+	case XK_End:    ttywrite(   KEYEND, sizeof(   KEYEND)-1); break;
+	case XK_Prior:	ttywrite(  KEYPREV, sizeof(  KEYPREV)-1); break;
+	case XK_Next:	ttywrite(  KEYNEXT, sizeof(  KEYNEXT)-1); break;
+	case XK_Insert:
+		/* XXX: paste X clipboard */
+		if(shift);
+		break;
+	}
+}
+
+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);
+	}
+}
+
+
+void
+run(void) {
+	int ret;
+	XEvent ev;
+	fd_set rfd;
+	struct timeval tv = {0, 10000};
+
+	running = 1;
+	XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
+	XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* seems to fix the resize bug in wmii */
+	while(running) {
+		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;
+			}
+		}
+		FD_ZERO(&rfd);
+		FD_SET(cmdfd, &rfd);
+		ret = select(cmdfd+1, &rfd, NULL, NULL, &tv);
+		if(ret < 0) {
+			fprintf(stderr, "select: %m\n");
+			running = 0;
+		}
+		if(!ret)
+			continue;
+		if(FD_ISSET(cmdfd, &rfd)) {
+			ttyread();
+			draw(SCupdate);
+		}
+	}
+}
+
+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");
+	setlocale(LC_CTYPE, "");
+	tnew(80, 24);
+	ttynew();
+	xinit();
+	run();
 	return 0;
 }