X-Git-Url: https://git.xinqibao.xyz/st.git/blobdiff_plain/273d4ba938dc6bf7edb2b1154ea36c19bfcd22d1..fe724836866d16a6dfd6de3ca3664033d9146a54:/st.c?ds=inline

diff --git a/st.c b/st.c
index 261612f..d0a607b 100644
--- a/st.c
+++ b/st.c
@@ -16,13 +16,15 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.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>
 
 #if   defined(__linux)
  #include <pty.h>
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
  #include <util.h>
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #include <libutil.h>
@@ -30,13 +32,14 @@
 
 #define USAGE \
 	"st-" VERSION ", (c) 2010 st engineers\n" \
-	"usage: st [-t title] [-e cmd] [-v]\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))
@@ -54,12 +57,17 @@ 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, MODE_ALTSCREEN=8 };
+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      */
@@ -103,9 +111,12 @@ typedef struct {
 
 /* Purely graphic info */
 typedef struct {
-	Display* dis;
+	Display* dpy;
+	Colormap cmap;
 	Window win;
 	Pixmap buf;
+	XIM xim;
+	XIC xic;
 	int scr;
 	int w;	/* window width	 */
 	int h;	/* window height */
@@ -113,7 +124,7 @@ typedef struct {
 	int bufh; /* pixmap height */
 	int ch; /* char height */
 	int cw; /* char width  */
-	int hasfocus;
+	char state; /* focus, redraw, visible */
 } XWindow; 
 
 typedef struct {
@@ -124,9 +135,14 @@ typedef struct {
 /* Drawing Context */
 typedef struct {
 	unsigned long col[256];
-	XFontStruct* font;
-	XFontStruct* bfont;
 	GC gc;
+	struct {
+		int ascent;
+		int descent;
+		short lbearing;
+		short rbearing;
+		XFontSet set;
+	} font, bfont;
 } DC;
 
 /* TODO: use better name for vars... */
@@ -159,16 +175,15 @@ static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
-static void tnewline(void);
+static void tnewline(int);
 static void tputtab(void);
-static void tputc(char);
-static void tputs(char*, int);
+static void tputc(char*);
 static void treset(void);
-static void tresize(int, 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);
 
@@ -177,15 +192,19 @@ static void ttyread(void);
 static void ttyresize(int, int);
 static void ttywrite(const char *, size_t);
 
-static void xdraws(char *, Glyph, int, int, int);
+static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void 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 *);
@@ -193,17 +212,32 @@ 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 utf8decode(char *, long *);
+static int utf8encode(long *, char *);
+static int utf8size(char *);
+static int isfullutf8(char *, int);
 
 static void (*handler[LASTEvent])(XEvent *) = {
 	[KeyPress] = kpress,
-	[Expose] = expose,
 	[ConfigureNotify] = resize,
+	[VisibilityNotify] = visibility,
+	[UnmapNotify] = unmap,
+	[Expose] = expose,
 	[FocusIn] = focus,
 	[FocusOut] = focus,
 	[MotionNotify] = bmotion,
 	[ButtonPress] = bpress,
 	[ButtonRelease] = brelease,
+	[SelectionNotify] = selnotify,
+	[SelectionRequest] = selrequest,
 };
 
 /* Globals */
@@ -214,8 +248,122 @@ static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
-static char *opt_cmd   = NULL;
+static char **opt_cmd  = NULL;
 static char *opt_title = NULL;
+static char *opt_class = NULL;
+
+int
+utf8decode(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;
+}
+
+int
+utf8encode(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 */
+int
+isfullutf8(char *s, int b) {
+	unsigned char *c1, *c2, *c3;
+
+	c1 = (unsigned char *) s;
+	c2 = (unsigned char *) ++s;
+	c3 = (unsigned char *) ++s;
+	if(b < 1)
+		return 0;
+	else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+		return 0;
+	else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+	    ((b == 1) || 
+	    ((b == 2) && (*c2&(B7|B6)) == B7)))
+		return 0;
+	else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+	    ((b == 1) ||
+	    ((b == 2) && (*c2&(B7|B6)) == B7) ||
+	    ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
+		return 0;
+	else
+		return 1;
+}
+
+int
+utf8size(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;
+}
 
 void
 selinit(void) {
@@ -224,7 +372,8 @@ selinit(void) {
 	sel.clip = NULL;
 }
 
-static inline int selected(int x, int y) {
+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);
@@ -234,9 +383,11 @@ static inline int selected(int x, int y) {
 		|| (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.state,
-		*b=*b==4096?5:*b==2048?4:*b==1024?3:*b==512?2:*b==256?1:-1;
+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;
@@ -245,43 +396,120 @@ static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
 	sel.e.y = MAX(sel.by, sel.ey);
 }
 
-static void bpress(XEvent *e) {
+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 char *getseltext() {
+void
+selcopy(void) {
 	char *str, *ptr;
-	int ls, x, y, sz;
+	int x, y, sz, sl, ls = 0;
+
 	if(sel.bx == -1)
-		return NULL;
-	sz = (term.col+1) * (sel.e.y-sel.b.y+1);
-	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)))
-				*ptr = term.line[y][x].c, ptr++;
-		if(ls)
-			*ptr = '\n', ptr++;
+		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 = utf8size(term.line[y][x].c);
+					memcpy(ptr, term.line[y][x].c, sl);
+					ptr += sl;
+				}
+			if(ls)
+				*ptr = '\n', ptr++;
+		}
+		*ptr = 0;
 	}
-	*ptr = 0;
-	return str;
+	xsetsel(str);
 }
 
-/* TODO: use X11 clipboard */
-static void selcopy(char *str) {
+void
+selnotify(XEvent *e) {
+	unsigned long nitems;
+	unsigned long ofs, rem;
+	int format;
+	unsigned char *data;
+	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;
+		}
+		ttywrite((const char *) data, nitems * format / 8);
+		XFree(data);
+		/* number of 32-bit chunks returned */
+		ofs += nitems * format / 32;
+	} while(rem > 0);
+}
+
+void
+selpaste() {
+	XConvertSelection(xw.dpy, XA_PRIMARY, XA_STRING, XA_PRIMARY, xw.win, CurrentTime);
+}
+
+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.dpy, "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");
+}
+
+void
+xsetsel(char *str) {
+	/* register the selection for both the clipboard and the primary */
+	Atom clipboard;
+
 	free(sel.clip);
 	sel.clip = str;
-}
 
-static void selpaste() {
-	if(sel.clip)
-		ttywrite(sel.clip, strlen(sel.clip));
+	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
+
+	clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+	XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+
+	XFlush(xw.dpy);
 }
 
 /* TODO: doubleclick to select word */
-static void brelease(XEvent *e) {
+void
+brelease(XEvent *e) {
 	int b;
 	sel.mode = 0;
 	getbuttoninfo(e, &b, &sel.ex, &sel.ey);
@@ -291,37 +519,20 @@ static void brelease(XEvent *e) {
 			selpaste();
 	} else {
 		if(b==1)
-			selcopy(getseltext());
+			selcopy();
 	}
 	draw(1);
 }
 
-static void bmotion(XEvent *e) {
+void
+bmotion(XEvent *e) {
 	if (sel.mode) {
 		getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
-		draw(1);
-	}
-}
-
-#ifdef DEBUG
-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 & GLYPH_SET ? c.c : '.');
-			}
-		}
-		putchar('\n');
+		/* XXX: draw() can't keep up, disabled for now.
+		   selection is visible on button release.
+		   draw(1); */
 	}
 }
-#endif
 
 void
 die(const char *errstr, ...) {
@@ -335,13 +546,14 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
-	char *args[] = {getenv("SHELL"), "-i", NULL};
-	if(opt_cmd)
-		args[0] = opt_cmd, args[1] = NULL;
-	else
-		DEFAULT(args[0], SHELL);
+	char **args;
+	char *envshell = getenv("SHELL");
+
+	DEFAULT(envshell, "sh");
 	putenv("TERM="TNAME);
+	args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
 	execvp(args[0], args);
+	exit(EXIT_FAILURE);
 }
 
 void 
@@ -396,13 +608,31 @@ dump(char c) {
 
 void
 ttyread(void) {
-	char buf[BUFSIZ];
+	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;
 
-	if((ret = read(cmdfd, buf, LEN(buf))) < 0)
+	/* 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);
-	else
-		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);
+		ptr    += charsize;
+		buflen -= charsize;
+	}
+
+	/* keep any uncomplete utf8 char for the next call */
+	memmove(buf, ptr, buflen);
 }
 
 void
@@ -499,13 +729,13 @@ tscrollup(int orig, int n) {
 }
 
 void
-tnewline(void) {
+tnewline(int first_col) {
 	int y = term.c.y;
-	if(term.c.y == term.bot)
+	if(y == term.bot)
 		tscrollup(term.top, 1);
 	else
 		y++;
-	tmoveto(0, y);
+	tmoveto(first_col ? 0 : term.c.x, y);
 }
 
 void
@@ -542,15 +772,15 @@ tmoveto(int x, int y) {
 }
 
 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;
@@ -563,7 +793,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
@@ -704,7 +935,7 @@ csihandle(void) {
 	switch(escseq.mode) {
 	default:
 	unknown:
-		printf("erresc: unknown csi ");
+		fprintf(stderr, "erresc: unknown csi ");
 		csidump();
 		/* die(""); */
 		break;
@@ -753,10 +984,14 @@ 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);
@@ -803,6 +1038,9 @@ csihandle(void) {
 				break;
 			case 12: /* att610 -- Stop blinking cursor (IGNORED) */
 				break;
+			case 20:
+				term.mode &= ~MODE_CRLF;
+				break;
 			case 25:
 				term.c.state |= CURSOR_HIDE;
 				break;
@@ -859,6 +1097,9 @@ csihandle(void) {
 			case 7:
 				term.mode |= MODE_WRAP;
 				break;
+			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)
@@ -934,30 +1175,31 @@ tputtab(void) {
 }
 
 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();
 			}
 			/* TODO: handle other OSC */
 		} else if(term.esc & ESC_OSC) { 
-			if(c == ';') {
+			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);
+				XStoreName(xw.dpy, 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;
@@ -965,11 +1207,11 @@ tputc(char c) {
 				term.c.attr.mode &= ~ATTR_GFX;
 				break;
 			default:
-				printf("esc unhandled charset: ESC ( %c\n", c);
+				fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
 			}
 			term.esc = 0;
 		} else {
-			switch(c) {
+			switch(ascii) {
 			case '[':
 				term.esc |= ESC_CSI;
 				break;
@@ -987,7 +1229,7 @@ tputc(char c) {
 				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 */
@@ -1018,12 +1260,13 @@ tputc(char c) {
 				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;
@@ -1033,11 +1276,14 @@ tputc(char c) {
 		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':
-			if(!xw.hasfocus)
+			if(!(xw.state & WIN_FOCUSED))
 				xseturgency(1);
 			break;
 		case '\033':
@@ -1046,7 +1292,7 @@ tputc(char c) {
 			break;
 		default:
 			if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-				tnewline();
+				tnewline(1); /* always go to first col */
 			tsetchar(c);
 			if(term.c.x+1 < term.col)
 				tmoveto(term.c.x+1, term.c.y);
@@ -1057,21 +1303,15 @@ tputc(char c) {
 	}
 }
 
-void
-tputs(char *s, int len) {
-	for(; len > 0; len--)
-		tputc(*s++);
-}
-
-void
+int
 tresize(int col, int row) {
-	int i;
+	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;
+		return 0;
 
 	/* free unneeded rows */
 	i = 0;
@@ -1099,8 +1339,10 @@ tresize(int col, int row) {
 	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));
-		memset(term.line[i] + mincol, 0, (col - mincol) * sizeof(Glyph));
-		memset(term.alt[i]  + mincol, 0, (col - mincol) * sizeof(Glyph));
+		for(x = mincol; x < col; x++) {
+			term.line[i][x].state = 0;
+			term.alt[i][x].state = 0;
+		}
 	}
 
 	/* allocate any new rows */
@@ -1115,17 +1357,47 @@ tresize(int col, int row) {
 	tmoveto(term.c.x, term.c.y);
 	/* reset scrolling region */
 	tsetscroll(0, row-1);
+	return (slide > 0);
+}
+
+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.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+	XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+	XFreePixmap(xw.dpy, xw.buf);
+	XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
+	if(xw.bufw > oldw)
+		XFillRectangle(xw.dpy, 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.dpy, xw.win, BORDER+xw.bufw, BORDER,
+				xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
+				False);
+	if(xw.bufh > oldh)
+		XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh,
+				xw.bufw, xw.bufh-oldh);
+	else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
+		XClearArea(xw.dpy, 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);
+	unsigned long white = WhitePixel(xw.dpy, xw.scr);
 
 	for(i = 0; i < 16; i++) {
-		if (!XAllocNamedColor(xw.dis, cmap, colorname[i], &color, &color)) {
+		if (!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
 			dc.col[i] = white;
 			fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
 		} else
@@ -1139,7 +1411,7 @@ xloadcols(void) {
 				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, cmap, &color)) {
+				if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
 					dc.col[i] = white;
 					fprintf(stderr, "Could not allocate color %d\n", i);
 				} else
@@ -1149,7 +1421,7 @@ xloadcols(void) {
 
 	for(r = 0; r < 24; r++, i++) {
 		color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-		if (!XAllocColor(xw.dis, cmap, &color)) {
+		if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
 			dc.col[i] = white;
 			fprintf(stderr, "Could not allocate color %d\n", i);
 		} else
@@ -1159,8 +1431,8 @@ xloadcols(void) {
 
 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,
+	XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);
+	XFillRectangle(xw.dpy, xw.buf, dc.gc,
 	               x1 * xw.cw, y1 * xw.ch,
 	               (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
@@ -1168,7 +1440,7 @@ xclear(int x1, int y1, int x2, int y2) {
 void
 xhints(void)
 {
-	XClassHint class = {TNAME, TNAME};
+	XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
 	XWMHints wm = {.flags = InputHint, .input = 1};
 	XSizeHints size = {
 		.flags = PSize | PResizeInc | PBaseSize,
@@ -1179,54 +1451,124 @@ xhints(void)
 		.base_height = 2*BORDER,
 		.base_width = 2*BORDER,
 	};
-	XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+	XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+}
+
+XFontSet
+xinitfont(char *fontstr)
+{
+	XFontSet set;
+	char *def, **missing;
+	int n;
+
+	missing = NULL;
+	set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
+	if(missing) {
+		while(n--)
+			fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
+		XFreeStringList(missing);
+	}
+	return set;
+}
+
+void
+xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing)
+{
+	XFontStruct **xfonts;
+	char **font_names;
+	int i, n;
+
+	*ascent = *descent = *lbearing = *rbearing = 0;
+	n = XFontsOfFontSet(set, &xfonts, &font_names);
+	for(i = 0; i < n; i++) {
+		*ascent = MAX(*ascent, (*xfonts)->ascent);
+		*descent = MAX(*descent, (*xfonts)->descent);
+		*lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing);
+		*rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing);
+		xfonts++;
+	}
+}
+
+void
+initfonts(char *fontstr, char *bfontstr)
+{
+	if((dc.font.set = xinitfont(fontstr)) == NULL ||
+	   (dc.bfont.set = xinitfont(bfontstr)) == NULL)
+		die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+	xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
+	    &dc.font.lbearing, &dc.font.rbearing);
+	xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
+	    &dc.bfont.lbearing, &dc.bfont.rbearing);
 }
 
 void
 xinit(void) {
-	if(!(xw.dis = XOpenDisplay(NULL)))
+	XSetWindowAttributes attrs;
+	Cursor cursor;
+
+	if(!(xw.dpy = XOpenDisplay(NULL)))
 		die("Can't open display\n");
-	xw.scr = XDefaultScreen(xw.dis);
+	xw.scr = XDefaultScreen(xw.dpy);
 	
 	/* 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);
+	initfonts(FONT, BOLDFONT);
 
 	/* 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 */
+	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 	xloadcols();
 
-	/* windows */
-	xw.bufh = term.row * xw.ch;
-	xw.bufw = term.col * xw.cw;
+	/* 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;
-	xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-			xw.w, xw.h, 0,
-			dc.col[DefaultBG],
-			dc.col[DefaultBG]);
-	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
-	/* gc */
-	dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
 
-	/* event mask */
-	XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask
-		| StructureNotifyMask | FocusChangeMask | PointerMotionMask
-		| ButtonPressMask | ButtonReleaseMask);
+	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.dpy, XRootWindow(xw.dpy, xw.scr), 0, 0,
+			xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+			XDefaultVisual(xw.dpy, xw.scr),
+			CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
+			| CWColormap,
+			&attrs);
+	xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+
+
+	/* input methods */
+	xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
+	xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing 
+					   | XIMStatusNothing, XNClientWindow, xw.win, 
+					   XNFocusWindow, xw.win, NULL);
+	/* gc */
+	dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
 	
-	XMapWindow(xw.dis, xw.win);
+	/* 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});
+
+	XMapWindow(xw.dpy, xw.win);
 	xhints();
-	XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
-	XSync(xw.dis, 0);
+	XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+	XSync(xw.dpy, 0);
 }
 
 void
-xdraws(char *s, Glyph base, int x, int y, int len) {
+xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 	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 = charlen*xw.cw;
 	int i;
 
 	if(base.mode & ATTR_REVERSE)
@@ -1234,46 +1576,50 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
 	else
 		xfg = dc.col[base.fg], xbg = dc.col[base.bg];
 
-	XSetBackground(xw.dis, dc.gc, xbg);
-	XSetForeground(xw.dis, dc.gc, xfg);
-	
-	if(base.mode & ATTR_GFX)
-		for(i = 0; i < len; i++) {
+	XSetBackground(xw.dpy, dc.gc, xbg);
+	XSetForeground(xw.dpy, dc.gc, xfg);
+
+	if(base.mode & ATTR_GFX) {
+		for(i = 0; i < bytelen; 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.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
+	    dc.gc, winx, winy, s, bytelen);
 	
 	if(base.mode & ATTR_UNDERLINE)
-		XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+		XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
 
 void
 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 = utf8size(term.line[oldy][oldx].c);
+		xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
+	} else
 		xclear(oldx, oldy, oldx, oldy);
 	
 	/* draw the new one */
-	if(!(term.c.state & CURSOR_HIDE) && xw.hasfocus) {
-		xdraws(&g.c, g, term.c.x, term.c.y, 1);
+	if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
+		sl = utf8size(g.c);
+		xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
 		oldx = term.c.x, oldy = term.c.y;
 	}
 }
@@ -1282,11 +1628,12 @@ xdrawcursor(void) {
 /* basic drawing routines */
 void
 xdrawc(int x, int y, Glyph g) {
+	int sl = utf8size(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);
+	XSetBackground(xw.dpy, dc.gc, dc.col[g.bg]);
+	XSetForeground(xw.dpy, dc.gc, dc.col[g.fg]);
+	XmbDrawImageString(xw.dpy, 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
@@ -1300,67 +1647,97 @@ draw(int dummy) {
 				xdrawc(x, y, term.line[y][x]);
 
 	xdrawcursor();
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
-	XFlush(xw.dis);
+	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+	XFlush(xw.dpy);
 }
 
 #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];
 
-	XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
-	XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.bufw, xw.bufh);
+	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(sel.bx!=-1 && new.c && selected(x, y))
+			if(sel.bx!=-1 && *(new.c) && selected(x, y))
 				new.mode ^= ATTR_REVERSE;
-			if(i > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-					i >= DRAW_BUF_SIZ)) {
-				xdraws(buf, base, ox, y, i);
-				i = 0;
+			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(i == 0) {
+				if(ib == 0) {
 					ox = x;
 					base = new;
 				}
-				buf[i++] = new.c;
+				sl = utf8size(new.c);
+				memcpy(buf+ib, new.c, sl);
+				ib += sl;
+				++ic;
 			}
 		}
-		if(i > 0)
-			xdraws(buf, base, ox, y, i);
+		if(ib > 0)
+			xdraws(buf, base, ox, y, ic, ib);
 	}
 	xdrawcursor();
-	XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
-	XFlush(xw.dis);
+	XCopyArea(xw.dpy, 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.dpy, 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);
+	XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 	h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
-	XSetWMHints(xw.dis, xw.win, h);
+	XSetWMHints(xw.dpy, xw.win, h);
 	XFree(h);
 }
 
 void
 focus(XEvent *ev) {
-	if((xw.hasfocus = ev->type == FocusIn))
+	if(ev->type == FocusIn) {
+		xw.state |= WIN_FOCUSED;
 		xseturgency(0);
+	} else
+		xw.state &= ~WIN_FOCUSED;
 	draw(SCREEN_UPDATE);
 }
 
@@ -1382,19 +1759,17 @@ kpress(XEvent *ev) {
 	int len;
 	int meta;
 	int shift;
+	Status status;
 
 	meta = e->state & Mod1Mask;
 	shift = e->state & ShiftMask;
-	len = XLookupString(e, buf, sizeof(buf), &ksym, NULL);
-
+	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:
@@ -1405,10 +1780,21 @@ kpress(XEvent *ev) {
 			break;
 		case XK_Insert:
 			if(shift)
-				selpaste(), draw(1);
+				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) {
+				if(meta && len == 1)
+					ttywrite("\033", 1);
+				ttywrite(buf, len);
+			}
 			break;
 		}
 }
@@ -1422,24 +1808,21 @@ resize(XEvent *e) {
 	
 	xw.w = e->xconfigure.width;
 	xw.h = e->xconfigure.height;
-	xw.bufw = xw.w - 2*BORDER;
-	xw.bufh = xw.h - 2*BORDER;
-	col = xw.bufw / xw.cw;
-	row = xw.bufh / xw.ch;
-	tresize(col, row);
+	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);
-	xw.bufh = MAX(1, xw.bufh);
-	xw.bufw = MAX(1, xw.bufw);
-	XFreePixmap(xw.dis, xw.buf);
-	xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
-	draw(SCREEN_REDRAW);
+	xresize(col, row);
 }
 
 void
 run(void) {
 	XEvent ev;
 	fd_set rfd;
-	int xfd = XConnectionNumber(xw.dis);
+	int xfd = XConnectionNumber(xw.dpy);
 
 	for(;;) {
 		FD_ZERO(&rfd);
@@ -1454,8 +1837,10 @@ run(void) {
 			ttyread();
 			draw(SCREEN_UPDATE); 
 		}
-		while(XPending(xw.dis)) {
-			XNextEvent(xw.dis, &ev);
+		while(XPending(xw.dpy)) {
+			XNextEvent(xw.dpy, &ev);
+			if (XFilterEvent(&ev, xw.win))
+				continue;
 			if(handler[ev.type])
 				(handler[ev.type])(&ev);
 		}
@@ -1471,13 +1856,19 @@ main(int argc, char *argv[]) {
 		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];
+			if(++i < argc) opt_cmd = &argv[i];
 			break;
 		case 'v':
 		default:
 			die(USAGE);
 		}
+		/* -e eats every remaining arguments */
+		if(opt_cmd)
+			break;
 	}
 	setlocale(LC_CTYPE, "");
 	tnew(80, 24);