Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Fix LNM sequence
[st.git] / st.c
diff --git a/st.c b/st.c
index df8353a..d432ee7 100644 (file)
--- a/st.c
+++ b/st.c
@@ -6,6 +6,7 @@
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -13,17 +14,20 @@
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <time.h>
 #include <unistd.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <unistd.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
-
-#include <sys/time.h>
-#include <time.h>
+#include <X11/extensions/Xdbe.h>
+#include <X11/Xft/Xft.h>
+#define Glyph Glyph_
+#define Font Font_
 
 #if   defined(__linux)
  #include <pty.h>
 
 #if   defined(__linux)
  #include <pty.h>
@@ -34,15 +38,25 @@
 #endif
 
 #define USAGE \
 #endif
 
 #define USAGE \
-       "st-" VERSION ", (c) 2010-2011 st engineers\n" \
-       "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
+       "st " VERSION " (c) 2010-2012 st engineers\n" \
+       "usage: st [-t title] [-c class] [-g geometry]" \
+       " [-w windowid] [-v] [-f file] [-e command...]\n"
+
+/* XEMBED messages */
+#define XEMBED_FOCUS_IN  4
+#define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
 
 /* Arbitrary sizes */
-#define ESC_TITLE_SIZ 256
 #define ESC_BUF_SIZ   256
 #define ESC_ARG_SIZ   16
 #define ESC_BUF_SIZ   256
 #define ESC_ARG_SIZ   16
-#define DRAW_BUF_SIZ  1024
+#define STR_BUF_SIZ   256
+#define STR_ARG_SIZ   16
+#define DRAW_BUF_SIZ  20*1024
 #define UTF_SIZ       4
 #define UTF_SIZ       4
+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0
+
+#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
@@ -57,26 +71,78 @@
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
-/* 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_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,
-       MODE_CRLF=16, MODE_MOUSEBTN=32, MODE_MOUSEMOTION=64, MODE_MOUSE=32|64, MODE_REVERSE=128 };
-enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
-enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
+enum glyph_attribute {
+       ATTR_NULL      = 0,
+       ATTR_REVERSE   = 1,
+       ATTR_UNDERLINE = 2,
+       ATTR_BOLD      = 4,
+       ATTR_GFX       = 8,
+       ATTR_ITALIC    = 16,
+       ATTR_BLINK     = 32,
+};
+
+enum cursor_movement {
+       CURSOR_UP,
+       CURSOR_DOWN,
+       CURSOR_LEFT,
+       CURSOR_RIGHT,
+       CURSOR_SAVE,
+       CURSOR_LOAD
+};
+
+enum cursor_state {
+       CURSOR_DEFAULT  = 0,
+       CURSOR_HIDE     = 1,
+       CURSOR_WRAPNEXT = 2
+};
+
+enum glyph_state {
+       GLYPH_SET   = 1,
+       GLYPH_DIRTY = 2
+};
 
 
+enum term_mode {
+       MODE_WRAP       = 1,
+       MODE_INSERT      = 2,
+       MODE_APPKEYPAD   = 4,
+       MODE_ALTSCREEN   = 8,
+       MODE_CRLF       = 16,
+       MODE_MOUSEBTN    = 32,
+       MODE_MOUSEMOTION = 64,
+       MODE_MOUSE       = 32|64,
+       MODE_REVERSE     = 128,
+       MODE_KBDLOCK     = 256
+};
+
+enum escape_state {
+       ESC_START      = 1,
+       ESC_CSI = 2,
+       ESC_STR = 4, /* DSC, OSC, PM, APC */
+       ESC_ALTCHARSET = 8,
+       ESC_STR_END    = 16, /* a final string was encountered */
+};
+
+enum window_state {
+       WIN_VISIBLE = 1,
+       WIN_REDRAW  = 2,
+       WIN_FOCUSED = 4
+};
+
+/* bit macro */
 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 
 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 
+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned short ushort;
+
 typedef struct {
        char c[UTF_SIZ];     /* character code */
 typedef struct {
        char c[UTF_SIZ];     /* character code */
-       char mode;  /* attribute flags */
-       int fg;     /* foreground      */
-       int bg;     /* background      */
-       char state; /* state flags     */
+       uchar mode;  /* attribute flags */
+       ushort fg;   /* foreground  */
+       ushort bg;   /* background  */
+       uchar state; /* state flags    */
 } Glyph;
 
 typedef Glyph* Line;
 } Glyph;
 
 typedef Glyph* Line;
@@ -92,26 +158,36 @@ typedef struct {
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
 /* 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];
        char priv;
        int arg[ESC_ARG_SIZ];
-       int narg;              /* nb of args */
+       int narg;             /* nb of args */
        char mode;
 } CSIEscape;
 
        char mode;
 } CSIEscape;
 
+/* STR Escape sequence structs */
+/* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
+typedef struct {
+       char type;           /* ESC type ... */
+       char buf[STR_BUF_SIZ]; /* raw string */
+       int len;               /* raw string length */
+       char *args[STR_ARG_SIZ];
+       int narg;             /* nb of args */
+} STREscape;
+
 /* Internal representation of the screen */
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */
        Line* line;     /* screen */
        Line* alt;      /* alternate screen */
 /* Internal representation of the screen */
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */
        Line* line;     /* screen */
        Line* alt;      /* alternate screen */
+       bool* dirty;    /* dirtyness of lines */
        TCursor c;      /* cursor */
        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */
        int mode;       /* terminal mode flags */
        int esc;        /* escape state flags */
        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;
+       bool *tabs;
 } Term;
 
 /* Purely graphic info */
 } Term;
 
 /* Purely graphic info */
@@ -119,14 +195,18 @@ typedef struct {
        Display* dpy;
        Colormap cmap;
        Window win;
        Display* dpy;
        Colormap cmap;
        Window win;
-       Pixmap buf;
+       XdbeBackBuffer buf;
+       Atom xembed;
        XIM xim;
        XIC xic;
        XIM xim;
        XIC xic;
+       XftDraw *xft_draw;
+       Visual *vis;
        int scr;
        int scr;
+       bool isfixed; /* is fixed geometry? */
+       int fx, fy, fw, fh; /* fixed geometry */
+       int tw, th; /* tty width and height */
        int w;  /* window width */
        int h;  /* window height */
        int 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 */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
@@ -134,23 +214,10 @@ typedef struct {
 
 typedef struct {
        KeySym k;
 
 typedef struct {
        KeySym k;
-       unsigned int mask;
+       uint mask;
        char s[ESC_BUF_SIZ];
 } Key;
 
        char s[ESC_BUF_SIZ];
 } Key;
 
-/* Drawing Context */
-typedef struct {
-       unsigned long col[256];
-       GC gc;
-       struct {
-               int ascent;
-               int descent;
-               short lbearing;
-               short rbearing;
-               XFontSet set;
-       } font, bfont;
-} DC;
-
 /* TODO: use better name for vars... */
 typedef struct {
        int mode;
 /* TODO: use better name for vars... */
 typedef struct {
        int mode;
@@ -159,14 +226,34 @@ typedef struct {
        struct {int x, y;} b, e;
        char *clip;
        Atom xtarget;
        struct {int x, y;} b, e;
        char *clip;
        Atom xtarget;
+       bool alt;
        struct timeval tclick1;
        struct timeval tclick2;
 } Selection;
 
 #include "config.h"
 
        struct timeval tclick1;
        struct timeval tclick2;
 } Selection;
 
 #include "config.h"
 
+/* Font structure */
+typedef struct {
+       int ascent;
+       int descent;
+       short lbearing;
+       short rbearing;
+       XFontSet set;
+       XftFont* xft_set;
+} Font;
+
+/* Drawing Context */
+typedef struct {
+       ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       GC gc;
+       Font font, bfont, ifont, ibfont;
+} DC;
+
 static void die(const char*, ...);
 static void draw(void);
 static void die(const char*, ...);
 static void draw(void);
+static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void sigchld(int);
@@ -176,6 +263,10 @@ static void csidump(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
+static void strdump(void);
+static void strhandle(void);
+static void strparse(void);
+static void strreset(void);
 
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
@@ -186,7 +277,7 @@ static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
-static void tputtab(void);
+static void tputtab(bool);
 static void tputc(char*);
 static void treset(void);
 static int tresize(int, int);
 static void tputc(char*);
 static void treset(void);
 static int tresize(int, int);
@@ -196,10 +287,13 @@ static void tsetattr(int*, int);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
+static void tsetdirt(int, int);
+static void tsetmode(bool, bool, int *, int);
+static void tfulldirt(void);
 
 static void ttynew(void);
 static void ttyread(void);
 
 static void ttynew(void);
 static void ttyread(void);
-static void ttyresize(int, int);
+static void ttyresize(void);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
@@ -208,6 +302,7 @@ static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
+static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xresize(int, int);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xresize(int, int);
@@ -215,28 +310,36 @@ static void xresize(int, int);
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
-static char* kmap(KeySym, unsigned int state);
+static char* kmap(KeySym, uint);
 static void kpress(XEvent *);
 static void kpress(XEvent *);
+static void cmessage(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 resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void selnotify(XEvent *);
+static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selrequest(XEvent *);
 
 static void selinit(void);
-static inline int selected(int, int);
+static inline bool selected(int, int);
 static void selcopy(void);
 static void selcopy(void);
-static void selpaste();
+static void selpaste(void);
+static void selscroll(int, int);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
+static void *xmalloc(size_t);
+static void *xrealloc(void *, size_t);
+static void *xcalloc(size_t nmemb, size_t size);
+
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
+       [ClientMessage] = cmessage,
        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,
        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,
@@ -246,6 +349,7 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
+       [SelectionClear] = selclear,
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
@@ -254,42 +358,68 @@ static void (*handler[LASTEvent])(XEvent *) = {
 static DC dc;
 static XWindow xw;
 static Term term;
 static DC dc;
 static XWindow xw;
 static Term term;
-static CSIEscape escseq;
+static CSIEscape csiescseq;
+static STREscape strescseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
+static int iofd = -1;
 static char **opt_cmd  = NULL;
 static char **opt_cmd  = NULL;
+static char *opt_io    = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 
+void *
+xmalloc(size_t len) {
+       void *p = malloc(len);
+       if(!p)
+               die("Out of memory\n");
+       return p;
+}
+
+void *
+xrealloc(void *p, size_t len) {
+       if((p = realloc(p, len)) == NULL)
+               die("Out of memory\n");
+       return p;
+}
+
+void *
+xcalloc(size_t nmemb, size_t size) {
+       void *p = calloc(nmemb, size);
+       if(!p)
+               die("Out of memory\n");
+       return p;
+}
+
 int
 utf8decode(char *s, long *u) {
 int
 utf8decode(char *s, long *u) {
-       unsigned char c;
+       uchar c;
        int i, n, rtn;
 
        rtn = 1;
        c = *s;
        int i, n, rtn;
 
        rtn = 1;
        c = *s;
-       if(~c&B7) { /* 0xxxxxxx */
+       if(~c & B7) { /* 0xxxxxxx */
                *u = c;
                return rtn;
                *u = c;
                return rtn;
-       } else if((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+       } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
                *u = c&(B4|B3|B2|B1|B0);
                n = 1;
                *u = c&(B4|B3|B2|B1|B0);
                n = 1;
-       } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
+       } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */
                *u = c&(B3|B2|B1|B0);
                n = 2;
                *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);
+       } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+               *u = c & (B2|B1|B0);
                n = 3;
        } else
                goto invalid;
                n = 3;
        } else
                goto invalid;
-       for(i=n,++s; i>0; --i,++rtn,++s) {
+       for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
                c = *s;
                c = *s;
-               if((c&(B7|B6)) != B7) /* 10xxxxxx */
+               if((c & (B7|B6)) != B7) /* 10xxxxxx */
                        goto invalid;
                *u <<= 6;
                        goto invalid;
                *u <<= 6;
-               *u |= c&(B5|B4|B3|B2|B1|B0);
+               *u |= c & (B5|B4|B3|B2|B1|B0);
        }
        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
        }
        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
@@ -304,11 +434,11 @@ invalid:
 
 int
 utf8encode(long *u, char *s) {
 
 int
 utf8encode(long *u, char *s) {
-       unsigned char *sp;
-       unsigned long uc;
+       uchar *sp;
+       ulong uc;
        int i, n;
 
        int i, n;
 
-       sp = (unsigned char*) s;
+       sp = (uchar*) s;
        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */
        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */
@@ -340,11 +470,11 @@ invalid:
    UTF-8 otherwise return 0 */
 int
 isfullutf8(char *s, int b) {
    UTF-8 otherwise return 0 */
 int
 isfullutf8(char *s, int b) {
-       unsigned char *c1, *c2, *c3;
+       uchar *c1, *c2, *c3;
 
 
-       c1 = (unsigned char *) s;
-       c2 = (unsigned char *) ++s;
-       c3 = (unsigned char *) ++s;
+       c1 = (uchar *) s;
+       c2 = (uchar *) ++s;
+       c3 = (uchar *) ++s;
        if(b < 1)
                return 0;
        else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
        if(b < 1)
                return 0;
        else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
@@ -364,7 +494,7 @@ isfullutf8(char *s, int b) {
 
 int
 utf8size(char *s) {
 
 int
 utf8size(char *s) {
-       unsigned char c = *s;
+       uchar c = *s;
 
        if(~c&B7)
                return 1;
 
        if(~c&B7)
                return 1;
@@ -378,8 +508,8 @@ utf8size(char *s) {
 
 void
 selinit(void) {
 
 void
 selinit(void) {
-       sel.tclick1.tv_sec = 0;
-       sel.tclick1.tv_usec = 0;
+       memset(&sel.tclick1, 0, sizeof(sel.tclick1));
+       memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;
        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;
@@ -388,7 +518,7 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 
-static inline int
+static inline bool
 selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
 selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
@@ -420,7 +550,7 @@ mousereport(XEvent *e) {
        int state = e->xbutton.state;
        char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
        static int ob, ox, oy;
        int state = e->xbutton.state;
        char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
        static int ob, ox, oy;
-       
+
        /* from urxvt */
        if(e->xbutton.type == MotionNotify) {
                if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
        /* from urxvt */
        if(e->xbutton.type == MotionNotify) {
                if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
@@ -438,11 +568,11 @@ mousereport(XEvent *e) {
                        ox = x, oy = y;
                }
        }
                        ox = x, oy = y;
                }
        }
-       
+
        buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
        buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
-       
+
        ttywrite(buf, sizeof(buf));
 }
 
        ttywrite(buf, sizeof(buf));
 }
 
@@ -451,6 +581,11 @@ bpress(XEvent *e) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {
+               if(sel.bx != -1) {
+                       sel.bx = -1;
+                       tsetdirt(sel.b.y, sel.e.y);
+                       draw();
+               }
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
@@ -460,33 +595,44 @@ bpress(XEvent *e) {
 void
 selcopy(void) {
        char *str, *ptr;
 void
 selcopy(void) {
        char *str, *ptr;
-       int x, y, sz, sl, ls = 0;
+       int x, y, bufsize, is_selected = 0;
 
        if(sel.bx == -1)
                str = NULL;
 
        if(sel.bx == -1)
                str = NULL;
+
        else {
        else {
-               sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
-               ptr = str = malloc(sz);
+               bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
+               ptr = str = xmalloc(bufsize);
+
+               /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
                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 && y < sel.e.y)
+                       for(x = 0; x < term.col; x++) {
+                               int size;
+                               char *p;
+                               Glyph *gp = &term.line[y][x];
+
+                               if(!(is_selected = selected(x, y)))
+                                       continue;
+                               p = (gp->state & GLYPH_SET) ? gp->c : " ";
+                               size = utf8size(p);
+                               memcpy(ptr, p, size);
+                               ptr += size;
+                       }
+                       /* \n at the end of every selected line except for the last one */
+                       if(is_selected && y < sel.e.y)
                                *ptr++ = '\n';
                }
                *ptr = 0;
        }
                                *ptr++ = '\n';
                }
                *ptr = 0;
        }
+       sel.alt = IS_SET(MODE_ALTSCREEN);
        xsetsel(str);
 }
 
 void
 selnotify(XEvent *e) {
        xsetsel(str);
 }
 
 void
 selnotify(XEvent *e) {
-       unsigned long nitems, ofs, rem;
+       ulong nitems, ofs, rem;
        int format;
        int format;
-       unsigned char *data;
+       uchar *data;
        Atom type;
 
        ofs = 0;
        Atom type;
 
        ofs = 0;
@@ -509,6 +655,13 @@ selpaste() {
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
 }
 
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
 }
 
+void selclear(XEvent *e) {
+       if(sel.bx == -1)
+               return;
+       sel.bx = -1;
+       tsetdirt(sel.b.y, sel.e.y);
+}
+
 void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
 void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
@@ -530,12 +683,12 @@ selrequest(XEvent *e) {
                Atom string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                Atom string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
-                               (unsigned char *) &string, 1);
+                               (uchar *) &string, 1);
                xev.property = xsre->property;
                xev.property = xsre->property;
-       } else if(xsre->target == sel.xtarget) {
+       } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,
-                               (unsigned char *) sel.clip, strlen(sel.clip));
+                               (uchar *) sel.clip, strlen(sel.clip));
                xev.property = xsre->property;
        }
 
                xev.property = xsre->property;
        }
 
@@ -556,8 +709,6 @@ xsetsel(char *str) {
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
        XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
        XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
-
-       XFlush(xw.dpy);
 }
 
 void
 }
 
 void
@@ -571,6 +722,7 @@ brelease(XEvent *e) {
        else if(e->xbutton.button == Button1) {
                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
        else if(e->xbutton.button == Button1) {
                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+               term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        struct timeval now;
                        sel.bx = -1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        struct timeval now;
                        sel.bx = -1;
@@ -599,7 +751,6 @@ brelease(XEvent *e) {
        }
        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
        gettimeofday(&sel.tclick1, NULL);
        }
        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
        gettimeofday(&sel.tclick1, NULL);
-       draw();
 }
 
 void
 }
 
 void
@@ -615,7 +766,7 @@ bmotion(XEvent *e) {
                if(oldey != sel.ey || oldex != sel.ex) {
                        int starty = MIN(oldey, sel.ey);
                        int endy = MAX(oldey, sel.ey);
                if(oldey != sel.ey || oldex != sel.ex) {
                        int starty = MIN(oldey, sel.ey);
                        int endy = MAX(oldey, sel.ey);
-                       drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row));
+                       tsetdirt(starty, endy);
                }
        }
 }
                }
        }
 }
@@ -635,7 +786,18 @@ execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 
        char **args;
        char *envshell = getenv("SHELL");
 
-       DEFAULT(envshell, "sh");
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
+
+       signal(SIGCHLD, SIG_DFL);
+       signal(SIGHUP, SIG_DFL);
+       signal(SIGINT, SIG_DFL);
+       signal(SIGQUIT, SIG_DFL);
+       signal(SIGTERM, SIG_DFL);
+       signal(SIGALRM, SIG_DFL);
+
+       DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
        execvp(args[0], args);
        putenv("TERM="TNAME);
        args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
        execvp(args[0], args);
@@ -656,7 +818,7 @@ sigchld(int a) {
 void
 ttynew(void) {
        int m, s;
 void
 ttynew(void) {
        int m, s;
-       
+
        /* 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)
        /* 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)
@@ -681,6 +843,16 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
+               if(opt_io) {
+                       if(!strcmp(opt_io, "-")) {
+                               iofd = STDOUT_FILENO;
+                       } else {
+                               if((iofd = open(opt_io, O_WRONLY | O_CREAT, 0666)) < 0) {
+                                       fprintf(stderr, "Error opening %s:%s\n",
+                                               opt_io, strerror(errno));
+                               }
+                       }
+               }
        }
 }
 
        }
 }
 
@@ -728,16 +900,35 @@ ttywrite(const char *s, size_t n) {
 }
 
 void
 }
 
 void
-ttyresize(int x, int y) {
+ttyresize(void) {
        struct winsize w;
 
        w.ws_row = term.row;
        w.ws_col = term.col;
        struct winsize w;
 
        w.ws_row = term.row;
        w.ws_col = term.col;
-       w.ws_xpixel = w.ws_ypixel = 0;
+       w.ws_xpixel = xw.tw;
+       w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
+void
+tsetdirt(int top, int bot)
+{
+       int i;
+
+       LIMIT(top, 0, term.row-1);
+       LIMIT(bot, 0, term.row-1);
+
+       for(i = top; i <= bot; i++)
+               term.dirty[i] = 1;
+}
+
+void
+tfulldirt(void)
+{
+       tsetdirt(0, term.row-1);
+}
+
 void
 tcursor(int mode) {
        static TCursor c;
 void
 tcursor(int mode) {
        static TCursor c;
@@ -750,14 +941,19 @@ tcursor(int mode) {
 
 void
 treset(void) {
 
 void
 treset(void) {
+       uint i;
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
-       
+
+       memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+       for(i = TAB; i < term.col; i += TAB)
+               term.tabs[i] = 1;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        term.top = 0, term.bot = term.row - 1;
        term.mode = MODE_WRAP;
+       xclear(0, 0, xw.w, xw.h);
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
        tclearregion(0, 0, term.col-1, term.row-1);
 }
 
@@ -765,12 +961,17 @@ void
 tnew(int col, int row) {
        /* set screen size */
        term.row = row, term.col = col;
 tnew(int col, int row) {
        /* set screen size */
        term.row = row, term.col = col;
-       term.line = malloc(term.row * sizeof(Line));
-       term.alt  = malloc(term.row * sizeof(Line));
+       term.line = xmalloc(term.row * sizeof(Line));
+       term.alt  = xmalloc(term.row * sizeof(Line));
+       term.dirty = xmalloc(term.row * sizeof(*term.dirty));
+       term.tabs = xmalloc(term.col * sizeof(*term.tabs));
+
        for(row = 0; row < term.row; row++) {
        for(row = 0; row < term.row; row++) {
-               term.line[row] = malloc(term.col * sizeof(Glyph));
-               term.alt [row] = malloc(term.col * sizeof(Glyph));
+               term.line[row] = xmalloc(term.col * sizeof(Glyph));
+               term.alt [row] = xmalloc(term.col * sizeof(Glyph));
+               term.dirty[row] = 0;
        }
        }
+       memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        /* setup screen */
        treset();
 }
        /* setup screen */
        treset();
 }
@@ -781,22 +982,28 @@ tswapscreen(void) {
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
+       tfulldirt();
 }
 
 void
 tscrolldown(int orig, int n) {
        int i;
        Line temp;
 }
 
 void
 tscrolldown(int orig, int n) {
        int i;
        Line temp;
-       
+
        LIMIT(n, 0, term.bot-orig+1);
 
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
        LIMIT(n, 0, term.bot-orig+1);
 
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
-       
+
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
+
+               term.dirty[i] = 1;
+               term.dirty[i-n] = 1;
        }
        }
+
+       selscroll(orig, n);
 }
 
 void
 }
 
 void
@@ -804,13 +1011,41 @@ tscrollup(int orig, int n) {
        int i;
        Line temp;
        LIMIT(n, 0, term.bot-orig+1);
        int i;
        Line temp;
        LIMIT(n, 0, term.bot-orig+1);
-       
+
        tclearregion(0, orig, term.col-1, orig+n-1);
        tclearregion(0, orig, term.col-1, orig+n-1);
-       
+
        for(i = orig; i <= term.bot-n; i++) {
                 temp = term.line[i];
                 term.line[i] = term.line[i+n];
                 term.line[i+n] = temp;
        for(i = orig; i <= term.bot-n; i++) {
                 temp = term.line[i];
                 term.line[i] = term.line[i+n];
                 term.line[i+n] = temp;
+
+                term.dirty[i] = 1;
+                term.dirty[i+n] = 1;
+       }
+
+       selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+       if(sel.bx == -1)
+               return;
+
+       if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+               if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+                       sel.bx = -1;
+                       return;
+               }
+               if(sel.by < term.top) {
+                       sel.by = term.top;
+                       sel.bx = 0;
+               }
+               if(sel.ey > term.bot) {
+                       sel.ey = term.bot;
+                       sel.ex = term.col;
+               }
+               sel.b.y = sel.by, sel.b.x = sel.bx;
+               sel.e.y = sel.ey, sel.e.x = sel.ex;
        }
 }
 
        }
 }
 
@@ -827,22 +1062,22 @@ tnewline(int first_col) {
 void
 csiparse(void) {
        /* int noarg = 1; */
 void
 csiparse(void) {
        /* int noarg = 1; */
-       char *p = escseq.buf;
+       char *p = csiescseq.buf;
 
 
-       escseq.narg = 0;
+       csiescseq.narg = 0;
        if(*p == '?')
        if(*p == '?')
-               escseq.priv = 1, p++;
-       
-       while(p < escseq.buf+escseq.len) {
+               csiescseq.priv = 1, p++;
+
+       while(p < csiescseq.buf+csiescseq.len) {
                while(isdigit(*p)) {
                while(isdigit(*p)) {
-                       escseq.arg[escseq.narg] *= 10;
-                       escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */;
+                       csiescseq.arg[csiescseq.narg] *= 10;
+                       csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
                }
                }
-               if(*p == ';' && escseq.narg+1 < ESC_ARG_SIZ)
-                       escseq.narg++, p++;
+               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ)
+                       csiescseq.narg++, p++;
                else {
                else {
-                       escseq.mode = *p;
-                       escseq.narg++;
+                       csiescseq.mode = *p;
+                       csiescseq.narg++;
                        return;
                }
        }
                        return;
                }
        }
@@ -859,6 +1094,7 @@ tmoveto(int x, int y) {
 
 void
 tsetchar(char *c) {
 
 void
 tsetchar(char *c) {
+       term.dirty[term.c.y] = 1;
        term.line[term.c.y][term.c.x] = term.c.attr;
        memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
        term.line[term.c.y][term.c.x].state |= GLYPH_SET;
        term.line[term.c.y][term.c.x] = term.c.attr;
        memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
        term.line[term.c.y][term.c.x].state |= GLYPH_SET;
@@ -878,9 +1114,11 @@ tclearregion(int x1, int y1, int x2, int y2) {
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
-       for(y = y1; y <= y2; y++)
+       for(y = y1; y <= y2; y++) {
+               term.dirty[y] = 1;
                for(x = x1; x <= x2; x++)
                        term.line[y][x].state = 0;
                for(x = x1; x <= x2; x++)
                        term.line[y][x].state = 0;
+       }
 }
 
 void
 }
 
 void
@@ -889,6 +1127,8 @@ tdeletechar(int n) {
        int dst = term.c.x;
        int size = term.col - src;
 
        int dst = term.c.x;
        int size = term.col - src;
 
+       term.dirty[term.c.y] = 1;
+
        if(src >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        if(src >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
@@ -903,6 +1143,8 @@ tinsertblank(int n) {
        int dst = src + n;
        int size = term.col - dst;
 
        int dst = src + n;
        int size = term.col - dst;
 
+       term.dirty[term.c.y] = 1;
+
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
@@ -934,25 +1176,39 @@ tsetattr(int *attr, int l) {
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:
-                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD);
+                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \
+                                       | ATTR_ITALIC | ATTR_BLINK);
                        term.c.attr.fg = DefaultFG;
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                        term.c.attr.fg = DefaultFG;
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
+               case 3: /* enter standout (highlight) */
+                       term.c.attr.mode |= ATTR_ITALIC;
+                       break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
+               case 5:
+                       term.c.attr.mode |= ATTR_BLINK;
+                       break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
+               case 21:
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
+               case 23: /* leave standout (highlight) mode */
+                       term.c.attr.mode &= ~ATTR_ITALIC;
+                       break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
+               case 25:
+                       term.c.attr.mode &= ~ATTR_BLINK;
+                       break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
@@ -965,7 +1221,7 @@ tsetattr(int *attr, int l) {
                                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
                        }
                        else
                                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
                        }
                        else
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+                               fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]);
                        break;
                case 39:
                        term.c.attr.fg = DefaultFG;
                        break;
                case 39:
                        term.c.attr.fg = DefaultFG;
@@ -979,7 +1235,7 @@ tsetattr(int *attr, int l) {
                                        fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
                        }
                        else
                                        fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
                        }
                        else
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]);
+                               fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]);
                        break;
                case 49:
                        term.c.attr.bg = DefaultBG;
                        break;
                case 49:
                        term.c.attr.bg = DefaultBG;
@@ -992,10 +1248,9 @@ tsetattr(int *attr, int l) {
                        else if(BETWEEN(attr[i], 90, 97))
                                term.c.attr.fg = attr[i] - 90 + 8;
                        else if(BETWEEN(attr[i], 100, 107))
                        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;
+                               term.c.attr.bg = attr[i] - 100 + 8;
                        else
                        else
-                               fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
-                       
+                               fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
                        break;
                }
        }
                        break;
                }
        }
@@ -1016,9 +1271,85 @@ tsetscroll(int t, int b) {
        term.bot = b;
 }
 
        term.bot = b;
 }
 
+#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
+
+void
+tsetmode(bool priv, bool set, int *args, int narg) {
+       int *lim, mode;
+
+       for(lim = args + narg; args < lim; ++args) {
+               if(priv) {
+                       switch(*args) {
+                       case 1:
+                               MODBIT(term.mode, set, MODE_APPKEYPAD);
+                               break;
+                       case 5: /* DECSCNM -- Reverve video */
+                               mode = term.mode;
+                               MODBIT(term.mode,set, MODE_REVERSE);
+                               if(mode != term.mode)
+                                       redraw();
+                               break;
+                       case 7:
+                               MODBIT(term.mode, set, MODE_WRAP);
+                               break;
+                       case 12: /* att610 -- Start blinking cursor (IGNORED) */
+                               break;
+                       case 25:
+                               MODBIT(term.c.state, !set, CURSOR_HIDE);
+                               break;
+                       case 1000: /* 1000,1002: enable xterm mouse report */
+                               MODBIT(term.mode, set, MODE_MOUSEBTN);
+                               break;
+                       case 1002:
+                               MODBIT(term.mode, set, MODE_MOUSEMOTION);
+                               break;
+                       case 1049: /* = 1047 and 1048 */
+                       case 47:
+                       case 1047:
+                               if(IS_SET(MODE_ALTSCREEN))
+                                       tclearregion(0, 0, term.col-1, term.row-1);
+                               if((set && !IS_SET(MODE_ALTSCREEN)) ||
+                                   (!set && IS_SET(MODE_ALTSCREEN))) {
+                                           tswapscreen();
+                               }
+                               if(*args != 1049)
+                                       break;
+                               /* pass through */
+                       case 1048:
+                               tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+                               break;
+                       default:
+                               fprintf(stderr,
+                                       "erresc: unknown private set/reset mode %d\n",
+                                       *args);
+                               break;
+                       }
+               } else {
+                       switch(*args) {
+                       case 2:
+                               MODBIT(term.mode, set, MODE_KBDLOCK);
+                               break;
+                       case 4:
+                               MODBIT(term.mode, set, MODE_INSERT);
+                               break;
+                       case 20:
+                               MODBIT(term.mode, set, MODE_CRLF);
+                               break;
+                       default:
+                               fprintf(stderr,
+                                       "erresc: unknown set/reset mode %d\n",
+                                       *args);
+                               break;
+                       }
+               }
+       }
+}
+#undef MODBIT
+
+
 void
 csihandle(void) {
 void
 csihandle(void) {
-       switch(escseq.mode) {
+       switch(csiescseq.mode) {
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
@@ -1026,49 +1357,66 @@ csihandle(void) {
                /* die(""); */
                break;
        case '@': /* ICH -- Insert <n> blank char */
                /* die(""); */
                break;
        case '@': /* ICH -- Insert <n> blank char */
-               DEFAULT(escseq.arg[0], 1);
-               tinsertblank(escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tinsertblank(csiescseq.arg[0]);
                break;
        case 'A': /* CUU -- Cursor <n> Up */
        case 'e':
                break;
        case 'A': /* CUU -- Cursor <n> Up */
        case 'e':
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(term.c.x, term.c.y-escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
                break;
        case 'B': /* CUD -- Cursor <n> Down */
                break;
        case 'B': /* CUD -- Cursor <n> Down */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(term.c.x, term.c.y+escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(term.c.x+escseq.arg[0], term.c.y);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
                break;
        case 'D': /* CUB -- Cursor <n> Backward */
                break;
        case 'D': /* CUB -- Cursor <n> Backward */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(term.c.x-escseq.arg[0], term.c.y);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(term.c.x-csiescseq.arg[0], term.c.y);
                break;
        case 'E': /* CNL -- Cursor <n> Down and first col */
                break;
        case 'E': /* CNL -- Cursor <n> Down and first col */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(0, term.c.y+escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(0, term.c.y+csiescseq.arg[0]);
                break;
        case 'F': /* CPL -- Cursor <n> Up and first col */
                break;
        case 'F': /* CPL -- Cursor <n> Up and first col */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(0, term.c.y-escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(0, term.c.y-csiescseq.arg[0]);
+               break;
+       case 'g': /* TBC -- Tabulation clear */
+               switch (csiescseq.arg[0]) {
+               case 0: /* clear current tab stop */
+                       term.tabs[term.c.x] = 0;
+                       break;
+               case 3: /* clear all the tabs */
+                       memset(term.tabs, 0, term.col * sizeof(*term.tabs));
+                       break;
+               default:
+                       goto unknown;
+               }
                break;
        case 'G': /* CHA -- Move to <col> */
                break;
        case 'G': /* CHA -- Move to <col> */
-       case '`': /* XXX: HPA -- same? */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(escseq.arg[0]-1, term.c.y);
+       case '`': /* HPA */
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(csiescseq.arg[0]-1, term.c.y);
                break;
        case 'H': /* CUP -- Move to <row> <col> */
                break;
        case 'H': /* CUP -- Move to <row> <col> */
-       case 'f': /* XXX: HVP -- same? */
-               DEFAULT(escseq.arg[0], 1);
-               DEFAULT(escseq.arg[1], 1);
-               tmoveto(escseq.arg[1]-1, escseq.arg[0]-1);
+       case 'f': /* HVP */
+               DEFAULT(csiescseq.arg[0], 1);
+               DEFAULT(csiescseq.arg[1], 1);
+               tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
+               break;
+       case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
+               DEFAULT(csiescseq.arg[0], 1);
+               while(csiescseq.arg[0]--)
+                       tputtab(1);
                break;
                break;
-       /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */
        case 'J': /* ED -- Clear screen */
-               switch(escseq.arg[0]) {
+               sel.bx = -1;
+               switch(csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                        if(term.c.y < term.row-1)
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                        if(term.c.y < term.row-1)
@@ -1087,7 +1435,7 @@ csihandle(void) {
                }
                break;
        case 'K': /* EL -- Clear line */
                }
                break;
        case 'K': /* EL -- Clear line */
-               switch(escseq.arg[0]) {
+               switch(csiescseq.arg[0]) {
                case 0: /* right */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                        break;
                case 0: /* right */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                        break;
@@ -1100,152 +1448,54 @@ csihandle(void) {
                }
                break;
        case 'S': /* SU -- Scroll <n> line up */
                }
                break;
        case 'S': /* SU -- Scroll <n> line up */
-               DEFAULT(escseq.arg[0], 1);
-               tscrollup(term.top, escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tscrollup(term.top, csiescseq.arg[0]);
                break;
        case 'T': /* SD -- Scroll <n> line down */
                break;
        case 'T': /* SD -- Scroll <n> line down */
-               DEFAULT(escseq.arg[0], 1);
-               tscrolldown(term.top, escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tscrolldown(term.top, csiescseq.arg[0]);
                break;
        case 'L': /* IL -- Insert <n> blank lines */
                break;
        case 'L': /* IL -- Insert <n> blank lines */
-               DEFAULT(escseq.arg[0], 1);
-               tinsertblankline(escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tinsertblankline(csiescseq.arg[0]);
                break;
        case 'l': /* RM -- Reset Mode */
                break;
        case 'l': /* RM -- Reset Mode */
-               if(escseq.priv) {
-                       switch(escseq.arg[0]) {
-                       case 1:
-                               term.mode &= ~MODE_APPKEYPAD;
-                               break;
-                       case 5: /* DECSCNM -- Remove reverse video */
-                               if(IS_SET(MODE_REVERSE)) {
-                                       term.mode &= ~MODE_REVERSE;
-                                       draw();
-                               }
-                               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.c.state |= CURSOR_HIDE;
-                               break;
-                       case 1000: /* disable X11 xterm mouse reporting */
-                               term.mode &= ~MODE_MOUSEBTN;
-                               break;
-                       case 1002:
-                               term.mode &= ~MODE_MOUSEMOTION;
-                               break;
-                       case 1049: /* = 1047 and 1048 */
-                       case 47:
-                       case 1047:
-                               if(IS_SET(MODE_ALTSCREEN)) {
-                                       tclearregion(0, 0, term.col-1, term.row-1);
-                                       tswapscreen();
-                               }
-                               if(escseq.arg[0] != 1049)
-                                       break;
-                       case 1048:
-                               tcursor(CURSOR_LOAD);
-                               break;
-                       default:
-                               goto unknown;
-                       }
-               } else {
-                       switch(escseq.arg[0]) {
-                       case 4:
-                               term.mode &= ~MODE_INSERT;
-                               break;
-                       default:
-                               goto unknown;
-                       }
-               }
+               tsetmode(csiescseq.priv, 0, csiescseq.arg, csiescseq.narg);
                break;
        case 'M': /* DL -- Delete <n> lines */
                break;
        case 'M': /* DL -- Delete <n> lines */
-               DEFAULT(escseq.arg[0], 1);
-               tdeleteline(escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tdeleteline(csiescseq.arg[0]);
                break;
        case 'X': /* ECH -- Erase <n> char */
                break;
        case 'X': /* ECH -- Erase <n> char */
-               DEFAULT(escseq.arg[0], 1);
-               tclearregion(term.c.x, term.c.y, term.c.x + escseq.arg[0], term.c.y);
+               DEFAULT(csiescseq.arg[0], 1);
+               tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0], term.c.y);
                break;
        case 'P': /* DCH -- Delete <n> char */
                break;
        case 'P': /* DCH -- Delete <n> char */
-               DEFAULT(escseq.arg[0], 1);
-               tdeletechar(escseq.arg[0]);
+               DEFAULT(csiescseq.arg[0], 1);
+               tdeletechar(csiescseq.arg[0]);
+               break;
+       case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
+               DEFAULT(csiescseq.arg[0], 1);
+               while(csiescseq.arg[0]--)
+                       tputtab(0);
                break;
                break;
-       /* XXX: (CSI n Z) CBT -- Cursor Backward Tabulation <n> tab stops */
        case 'd': /* VPA -- Move to <row> */
        case 'd': /* VPA -- Move to <row> */
-               DEFAULT(escseq.arg[0], 1);
-               tmoveto(term.c.x, escseq.arg[0]-1);
+               DEFAULT(csiescseq.arg[0], 1);
+               tmoveto(term.c.x, csiescseq.arg[0]-1);
                break;
        case 'h': /* SM -- Set terminal mode */
                break;
        case 'h': /* SM -- Set terminal mode */
-               if(escseq.priv) {
-                       switch(escseq.arg[0]) {
-                       case 1:
-                               term.mode |= MODE_APPKEYPAD;
-                               break;
-                       case 5: /* DECSCNM -- Reverve video */
-                               if(!IS_SET(MODE_REVERSE)) {
-                                       term.mode |= MODE_REVERSE;
-                                       draw();
-                               }
-                               break;
-                       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)
-                                       break;
-                       case 25:
-                               term.c.state &= ~CURSOR_HIDE;
-                               break;
-                       case 1000: /* 1000,1002: enable xterm mouse report */
-                               term.mode |= MODE_MOUSEBTN;
-                               break;
-                       case 1002:
-                               term.mode |= MODE_MOUSEMOTION;
-                               break;
-                       case 1049: /* = 1047 and 1048 */
-                       case 47:
-                       case 1047:
-                               if(IS_SET(MODE_ALTSCREEN))
-                                       tclearregion(0, 0, term.col-1, term.row-1);
-                               else
-                                       tswapscreen();
-                               if(escseq.arg[0] != 1049)
-                                       break;
-                       case 1048:
-                               tcursor(CURSOR_SAVE);
-                               break;
-                       default: goto unknown;
-                       }
-               } else {
-                       switch(escseq.arg[0]) {
-                       case 4:
-                               term.mode |= MODE_INSERT;
-                               break;
-                       default: goto unknown;
-                       }
-               };
+               tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
-               tsetattr(escseq.arg, escseq.narg);
+               tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
-               if(escseq.priv)
+               if(csiescseq.priv)
                        goto unknown;
                else {
                        goto unknown;
                else {
-                       DEFAULT(escseq.arg[0], 1);
-                       DEFAULT(escseq.arg[1], term.row);
-                       tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1);
+                       DEFAULT(csiescseq.arg[0], 1);
+                       DEFAULT(csiescseq.arg[1], term.row);
+                       tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
                        tmoveto(0, 0);
                }
                break;
                        tmoveto(0, 0);
                }
                break;
@@ -1261,50 +1511,153 @@ csihandle(void) {
 void
 csidump(void) {
        int i;
 void
 csidump(void) {
        int i;
-       printf("ESC [ %s", escseq.priv ? "? " : "");
-       if(escseq.narg)
-               for(i = 0; i < escseq.narg; i++)
-                       printf("%d ", escseq.arg[i]);
-       if(escseq.mode)
-               putchar(escseq.mode);
+       printf("ESC[");
+       for(i = 0; i < csiescseq.len; i++) {
+               uint c = csiescseq.buf[i] & 0xff;
+               if(isprint(c)) putchar(c);
+               else if(c == '\n') printf("(\\n)");
+               else if(c == '\r') printf("(\\r)");
+               else if(c == 0x1b) printf("(\\e)");
+               else printf("(%02x)", c);
+       }
        putchar('\n');
 }
 
 void
 csireset(void) {
        putchar('\n');
 }
 
 void
 csireset(void) {
-       memset(&escseq, 0, sizeof(escseq));
+       memset(&csiescseq, 0, sizeof(csiescseq));
 }
 
 void
 }
 
 void
-tputtab(void) {
-       int space = TAB - term.c.x % TAB;
-       tmoveto(term.c.x + space, term.c.y);
+strhandle(void) {
+       char *p;
+
+       /*
+        * TODO: make this being useful in case of color palette change.
+        */
+       strparse();
+
+       p = strescseq.buf;
+
+       switch(strescseq.type) {
+       case ']': /* OSC -- Operating System Command */
+               switch(p[0]) {
+               case '0':
+               case '1':
+               case '2':
+                       /*
+                        * TODO: Handle special chars in string, like umlauts.
+                        */
+                       if(p[1] == ';') {
+                               XStoreName(xw.dpy, xw.win, strescseq.buf+2);
+                       }
+                       break;
+               case ';':
+                       XStoreName(xw.dpy, xw.win, strescseq.buf+1);
+                       break;
+               case '4': /* TODO: Set color (arg0) to "rgb:%hexr/$hexg/$hexb" (arg1) */
+                       break;
+               default:
+                       fprintf(stderr, "erresc: unknown str ");
+                       strdump();
+                       break;
+               }
+               break;
+       case 'k': /* old title set compatibility */
+               XStoreName(xw.dpy, xw.win, strescseq.buf);
+               break;
+       case 'P': /* DSC -- Device Control String */
+       case '_': /* APC -- Application Program Command */
+       case '^': /* PM -- Privacy Message */
+       default:
+               fprintf(stderr, "erresc: unknown str ");
+               strdump();
+               /* die(""); */
+               break;
+       }
+}
+
+void
+strparse(void) {
+       /*
+        * TODO: Implement parsing like for CSI when required.
+        * Format: ESC type cmd ';' arg0 [';' argn] ESC \
+        */
+       return;
+}
+
+void
+strdump(void) {
+       int i;
+       printf("ESC%c", strescseq.type);
+       for(i = 0; i < strescseq.len; i++) {
+               uint c = strescseq.buf[i] & 0xff;
+               if(isprint(c)) putchar(c);
+               else if(c == '\n') printf("(\\n)");
+               else if(c == '\r') printf("(\\r)");
+               else if(c == 0x1b) printf("(\\e)");
+               else printf("(%02x)", c);
+       }
+       printf("ESC\\\n");
+}
+
+void
+strreset(void) {
+       memset(&strescseq, 0, sizeof(strescseq));
+}
+
+void
+tputtab(bool forward) {
+       uint x = term.c.x;
+
+       if(forward) {
+               if(x == term.col)
+                       return;
+               for(++x; x < term.col && !term.tabs[x]; ++x)
+                       /* nothing */ ;
+       } else {
+               if(x == 0)
+                       return;
+               for(--x; x > 0 && !term.tabs[x]; --x)
+                       /* nothing */ ;
+       }
+       tmoveto(x, term.c.y);
 }
 
 void
 tputc(char *c) {
        char ascii = *c;
 }
 
 void
 tputc(char *c) {
        char ascii = *c;
+
+       if(iofd != -1)
+               write(iofd, c, 1);
+
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
-                       escseq.buf[escseq.len++] = ascii;
-                       if(BETWEEN(ascii, 0x40, 0x7E) || escseq.len >= ESC_BUF_SIZ) {
+                       csiescseq.buf[csiescseq.len++] = ascii;
+                       if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) {
                                term.esc = 0;
                                csiparse(), csihandle();
                        }
                                term.esc = 0;
                                csiparse(), csihandle();
                        }
-                       /* 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(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
+               } else if(term.esc & ESC_STR) {
+                       switch(ascii) {
+                       case '\033':
+                               term.esc = ESC_START | ESC_STR_END;
+                               break;
+                       case '\a': /* backwards compatibility to xterm */
                                term.esc = 0;
                                term.esc = 0;
-                               term.title[term.titlelen] = '\0';
-                               XStoreName(xw.dpy, xw.win, term.title);
-                       } else {
-                               term.title[term.titlelen++] = ascii;
+                               strhandle();
+                               break;
+                       default:
+                               strescseq.buf[strescseq.len++] = ascii;
+                               if(strescseq.len+1 >= STR_BUF_SIZ) {
+                                       term.esc = 0;
+                                       strhandle();
+                               }
                        }
                        }
+               } else if(term.esc & ESC_STR_END) {
+                       term.esc = 0;
+                       if(ascii == '\\')
+                               strhandle();
                } else if(term.esc & ESC_ALTCHARSET) {
                        switch(ascii) {
                        case '0': /* Line drawing crap */
                } else if(term.esc & ESC_ALTCHARSET) {
                        switch(ascii) {
                        case '0': /* Line drawing crap */
@@ -1322,8 +1675,14 @@ tputc(char *c) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
-                       case ']':
-                               term.esc |= ESC_OSC;
+                       case 'P': /* DCS -- Device Control String */
+                       case '_': /* APC -- Application Program Command */
+                       case '^': /* PM -- Privacy Message */
+                       case ']': /* OSC -- Operating System Command */
+                       case 'k': /* old title set compatibility */
+                               strreset();
+                               strescseq.type = ascii;
+                               term.esc |= ESC_STR;
                                break;
                        case '(':
                                term.esc |= ESC_ALTCHARSET;
                                break;
                        case '(':
                                term.esc |= ESC_ALTCHARSET;
@@ -1339,6 +1698,10 @@ tputc(char *c) {
                                tnewline(1); /* always go to first col */
                                term.esc = 0;
                                break;
                                tnewline(1); /* always go to first col */
                                term.esc = 0;
                                break;
+                       case 'H': /* HTS -- Horizontal tab stop */
+                               term.tabs[term.c.x] = 1;
+                               term.esc = 0;
+                               break;
                        case 'M': /* RI -- Reverse index */
                                if(term.c.y == term.top)
                                        tscrolldown(term.top, 1);
                        case 'M': /* RI -- Reverse index */
                                if(term.c.y == term.top)
                                        tscrolldown(term.top, 1);
@@ -1349,6 +1712,7 @@ tputc(char *c) {
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
+                               xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                term.mode |= MODE_APPKEYPAD;
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                term.mode |= MODE_APPKEYPAD;
@@ -1366,16 +1730,23 @@ tputc(char *c) {
                                tcursor(CURSOR_LOAD);
                                term.esc = 0;
                                break;
                                tcursor(CURSOR_LOAD);
                                term.esc = 0;
                                break;
+                       case '\\': /* ST -- Stop */
+                               term.esc = 0;
+                               break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
-                                   (unsigned char) ascii, isprint(ascii)?ascii:'.');
+                                   (uchar) ascii, isprint(ascii)?ascii:'.');
                                term.esc = 0;
                        }
                }
        } else {
                                term.esc = 0;
                        }
                }
        } else {
+               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+                       sel.bx = -1;
                switch(ascii) {
                switch(ascii) {
+               case '\0': /* padding character, do nothing */
+                       break;
                case '\t':
                case '\t':
-                       tputtab();
+                       tputtab(1);
                        break;
                case '\b':
                        tmoveto(term.c.x-1, term.c.y);
                        break;
                case '\b':
                        tmoveto(term.c.x-1, term.c.y);
@@ -1438,13 +1809,16 @@ tresize(int col, int row) {
        }
 
        /* resize to new height */
        }
 
        /* resize to new height */
-       term.line = realloc(term.line, row * sizeof(Line));
-       term.alt  = realloc(term.alt,  row * sizeof(Line));
+       term.line = xrealloc(term.line, row * sizeof(Line));
+       term.alt  = xrealloc(term.alt,  row * sizeof(Line));
+       term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
+       term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* 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));
+               term.dirty[i] = 1;
+               term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
+               term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
                for(x = mincol; x < col; x++) {
                        term.line[i][x].state = 0;
                        term.alt[i][x].state = 0;
                for(x = mincol; x < col; x++) {
                        term.line[i][x].state = 0;
                        term.alt[i][x].state = 0;
@@ -1453,85 +1827,76 @@ tresize(int col, int row) {
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
 
        /* 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.dirty[i] = 1;
+               term.line[i] = xcalloc(col, sizeof(Glyph));
+               term.alt [i] = xcalloc(col, sizeof(Glyph));
+       }
+       if(col > term.col) {
+               bool *bp = term.tabs + term.col;
+
+               memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
+               while(--bp > term.tabs && !*bp)
+                       /* nothing */ ;
+               for(bp += TAB; bp < term.tabs + col; bp += TAB)
+                       *bp = 1;
        }
        }
-       
        /* 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);
        /* 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);
 }
 
 void
 xresize(int col, int row) {
        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;
+       xw.tw = MAX(1, 2*BORDER + col * xw.cw);
+       xw.th = MAX(1, 2*BORDER + row * xw.ch);
+
+       XftDrawChange(xw.xft_draw, xw.buf);
 }
 
 void
 xloadcols(void) {
        int i, r, g, b;
 }
 
 void
 xloadcols(void) {
        int i, r, g, b;
-       XColor color;
-       unsigned long white = WhitePixel(xw.dpy, xw.scr);
-
-       for(i = 0; i < 16; i++) {
-               if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {
+       XRenderColor xft_color = { .alpha = 0 };
+       ulong white = WhitePixel(xw.dpy, xw.scr);
+
+       /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
+       for(i = 0; i < LEN(colorname); i++) {
+               if(!colorname[i])
+                       continue;
+               if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
                } else
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
                } else
-                       dc.col[i] = color.pixel;
+                       dc.col[i] = dc.xft_col[i].pixel;
        }
 
        }
 
-       /* same colors as xterm */
-       for(r = 0; r < 6; r++)
+       /* load colors [16-255] ; same colors as xterm */
+       for(i = 16, r = 0; r < 6; r++)
                for(g = 0; g < 6; g++)
                        for(b = 0; b < 6; b++) {
                for(g = 0; g < 6; g++)
                        for(b = 0; b < 6; b++) {
-                               color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
-                               color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
-                               color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
-                               if(!XAllocColor(xw.dpy, xw.cmap, &color)) {
+                               xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
+                               xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
+                               xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
+                               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
                                        dc.col[i] = white;
                                        fprintf(stderr, "Could not allocate color %d\n", i);
                                } else
                                        dc.col[i] = white;
                                        fprintf(stderr, "Could not allocate color %d\n", i);
                                } else
-                                       dc.col[i] = color.pixel;
+                                       dc.col[i] = dc.xft_col[i].pixel;
                                i++;
                        }
 
        for(r = 0; r < 24; r++, i++) {
                                i++;
                        }
 
        for(r = 0; r < 24; r++, i++) {
-               color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-               if (!XAllocColor(xw.dpy, xw.cmap, &color)) {
+               xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else
                        dc.col[i] = white;
                        fprintf(stderr, "Could not allocate color %d\n", i);
                } else
-                       dc.col[i] = color.pixel;
+                       dc.col[i] = dc.xft_col[i].pixel;
        }
 }
 
        }
 }
 
@@ -1539,68 +1904,54 @@ void
 xclear(int x1, int y1, int x2, int y2) {
        XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
        XFillRectangle(xw.dpy, xw.buf, dc.gc,
 xclear(int x1, int y1, int x2, int y2) {
        XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
        XFillRectangle(xw.dpy, xw.buf, dc.gc,
-                      x1 * xw.cw, y1 * xw.ch,
-                      (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+                      BORDER + x1 * xw.cw, BORDER + y1 * xw.ch,
+                      (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void
 xhints(void) {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
 }
 
 void
 xhints(void) {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
-       XSizeHints size = {
-               .flags = PSize | PResizeInc | PBaseSize,
-               .height = xw.h,
-               .width = xw.w,
-               .height_inc = xw.ch,
-               .width_inc = xw.cw,
-               .base_height = 2*BORDER,
-               .base_width = 2*BORDER,
-       };
-       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
-}
-
-XFontSet
-xinitfont(char *fontstr) {
-       XFontSet set;
-       char *def, **missing;
-       int n;
-
-       missing = NULL;
-       set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
-       if(missing) {
-               while(n--)
-                       fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
-               XFreeStringList(missing);
+       XSizeHints *sizeh = NULL;
+
+       sizeh = XAllocSizeHints();
+       if(xw.isfixed == False) {
+               sizeh->flags = PSize | PResizeInc | PBaseSize;
+               sizeh->height = xw.h;
+               sizeh->width = xw.w;
+               sizeh->height_inc = xw.ch;
+               sizeh->width_inc = xw.cw;
+               sizeh->base_height = 2*BORDER;
+               sizeh->base_width = 2*BORDER;
+       } else {
+               sizeh->flags = PMaxSize | PMinSize;
+               sizeh->min_width = sizeh->max_width = xw.fw;
+               sizeh->min_height = sizeh->max_height = xw.fh;
        }
        }
-       return set;
+
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+       XFree(sizeh);
 }
 
 void
 }
 
 void
-xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {
-       XFontStruct **xfonts;
-       char **font_names;
-       int i, n;
+xinitfont(Font *f, char *fontstr) {
+       f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr);
 
 
-       *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++;
-       }
+       if(!f->xft_set)
+               die("st: can't open font %s.\n", fontstr);
+
+       f->ascent = f->xft_set->ascent;
+       f->descent = f->xft_set->descent;
+       f->lbearing = 0;
+       f->rbearing = f->xft_set->max_advance_width;
 }
 
 void
 }
 
 void
-initfonts(char *fontstr, char *bfontstr) {
-       if((dc.font.set = xinitfont(fontstr)) == NULL ||
-          (dc.bfont.set = xinitfont(bfontstr)) == NULL)
-               die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
-       xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
-           &dc.font.lbearing, &dc.font.rbearing);
-       xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
-           &dc.bfont.lbearing, &dc.bfont.rbearing);
+initfonts(char *fontstr, char *bfontstr, char *ifontstr, char *ibfontstr) {
+       xinitfont(&dc.font, fontstr);
+       xinitfont(&dc.bfont, bfontstr);
+       xinitfont(&dc.ifont, ifontstr);
+       xinitfont(&dc.ibfont, ibfontstr);
 }
 
 void
 }
 
 void
@@ -1608,13 +1959,15 @@ xinit(void) {
        XSetWindowAttributes attrs;
        Cursor cursor;
        Window parent;
        XSetWindowAttributes attrs;
        Cursor cursor;
        Window parent;
+       int sw, sh, major, minor;
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
-       
+       xw.vis = XDefaultVisual(xw.dpy, xw.scr);
+
        /* font */
        /* font */
-       initfonts(FONT, BOLDFONT);
+       initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);
 
        /* XXX: Assuming same size for bold font */
        xw.cw = dc.font.rbearing - dc.font.lbearing;
 
        /* XXX: Assuming same size for bold font */
        xw.cw = dc.font.rbearing - dc.font.lbearing;
@@ -1624,11 +1977,24 @@ xinit(void) {
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
        xloadcols();
 
        xw.cmap = XDefaultColormap(xw.dpy, 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;
+       /* adjust fixed window geometry */
+       if(xw.isfixed) {
+               sw = DisplayWidth(xw.dpy, xw.scr);
+               sh = DisplayHeight(xw.dpy, xw.scr);
+               if(xw.fx < 0)
+                       xw.fx = sw + xw.fx - xw.fw - 1;
+               if(xw.fy < 0)
+                       xw.fy = sh + xw.fy - xw.fh - 1;
+
+               xw.h = xw.fh;
+               xw.w = xw.fw;
+       } else {
+               /* window - default size */
+               xw.h = 2*BORDER + term.row * xw.ch;
+               xw.w = 2*BORDER + term.col * xw.cw;
+               xw.fx = 0;
+               xw.fy = 0;
+       }
 
        attrs.background_pixel = dc.col[DefaultBG];
        attrs.border_pixel = dc.col[DefaultBG];
 
        attrs.background_pixel = dc.col[DefaultBG];
        attrs.border_pixel = dc.col[DefaultBG];
@@ -1639,14 +2005,20 @@ xinit(void) {
        attrs.colormap = xw.cmap;
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
        attrs.colormap = xw.cmap;
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
-       xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
+       xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-                       XDefaultVisual(xw.dpy, xw.scr),
+                       xw.vis,
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        &attrs);
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        &attrs);
-       xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
 
 
+       /* double buffering */
+       if(!XdbeQueryExtension(xw.dpy, &major, &minor))
+               die("Xdbe extension is not present\n");
+       xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
+
+       /* Xft rendering context */
+       xw.xft_draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */
        xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
 
        /* input methods */
        xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
@@ -1655,7 +2027,7 @@ xinit(void) {
                                           XNFocusWindow, xw.win, NULL);
        /* gc */
        dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
                                           XNFocusWindow, xw.win, NULL);
        /* gc */
        dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
-       
+
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
        XDefineCursor(xw.dpy, xw.win, cursor);
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
        XDefineCursor(xw.dpy, xw.win, cursor);
@@ -1663,7 +2035,9 @@ xinit(void) {
                &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
                &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
-       XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+       xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+
+       xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
        XSync(xw.dpy, 0);
        XMapWindow(xw.dpy, xw.win);
        xhints();
        XSync(xw.dpy, 0);
@@ -1671,27 +2045,39 @@ xinit(void) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
-       unsigned long xfg = dc.col[base.fg], xbg = dc.col[base.bg], temp;
-       int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       int fg = base.fg, bg = base.bg, temp;
+       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       Font *font = &dc.font;
+       XGlyphInfo extents;
        int i;
        int i;
-       
+
        /* only switch default fg/bg if term is in RV mode */
        if(IS_SET(MODE_REVERSE)) {
        /* only switch default fg/bg if term is in RV mode */
        if(IS_SET(MODE_REVERSE)) {
-               if(base.fg == DefaultFG)
-                       xfg = dc.col[DefaultBG];
-               if(base.bg == DefaultBG)
-                       xbg = dc.col[DefaultFG];
+               if(fg == DefaultFG)
+                       fg = DefaultBG;
+               if(bg == DefaultBG)
+                       bg = DefaultFG;
        }
 
        if(base.mode & ATTR_REVERSE)
        }
 
        if(base.mode & ATTR_REVERSE)
-               temp = xfg, xfg = xbg, xbg = temp;
+               temp = fg, fg = bg, bg = temp;
+
+       if(base.mode & ATTR_BOLD) {
+               fg += 8;
+               font = &dc.bfont;
+       }
 
 
-       XSetBackground(xw.dpy, dc.gc, xbg);
-       XSetForeground(xw.dpy, dc.gc, xfg);
+       if(base.mode & ATTR_ITALIC)
+               font = &dc.ifont;
+       if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
+               font = &dc.ibfont;
+
+       XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
+       XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
 
        if(base.mode & ATTR_GFX) {
                for(i = 0; i < bytelen; i++) {
 
        if(base.mode & ATTR_GFX) {
                for(i = 0; i < bytelen; i++) {
-                       char c = gfx[(unsigned int)s[i] % 256];
+                       char c = gfx[(uint)s[i] % 256];
                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)
                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)
@@ -1699,9 +2085,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                }
        }
 
                }
        }
 
-       XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
-               dc.gc, winx, winy, s, bytelen);
-       
+       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
+       width = extents.xOff;
+       XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
+       XftDrawStringUtf8(xw.xft_draw, &dc.xft_col[fg], font->xft_set, winx, winy, (FcChar8 *)s, bytelen);
+
        if(base.mode & ATTR_UNDERLINE)
                XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
        if(base.mode & ATTR_UNDERLINE)
                XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
@@ -1712,10 +2100,10 @@ xdrawcursor(void) {
        static int oldy = 0;
        int sl;
        Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
        static int oldy = 0;
        int sl;
        Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
-       
+
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
-       
+
        if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
@@ -1725,20 +2113,43 @@ xdrawcursor(void) {
                xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
        } else
                xclear(oldx, oldy, oldx, oldy);
                xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
        } else
                xclear(oldx, oldy, oldx, oldy);
-       
+
        /* draw the new one */
        /* draw the new one */
-       if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
-               sl = utf8size(g.c);
+       if(!(term.c.state & CURSOR_HIDE)) {
+               if(!(xw.state & WIN_FOCUSED))
+                       g.bg = DefaultUCS;
+
                if(IS_SET(MODE_REVERSE))
                        g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
                if(IS_SET(MODE_REVERSE))
                        g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
+
+               sl = utf8size(g.c);
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
+void
+xresettitle(void) {
+       XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+}
+
+void
+redraw(void) {
+       struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+
+       xclear(0, 0, xw.w, xw.h);
+       tfulldirt();
+       draw();
+       XSync(xw.dpy, False); /* necessary for a good tput flash */
+       nanosleep(&tv, NULL);
+}
+
 void
 draw() {
 void
 draw() {
+       XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
+
        drawregion(0, 0, term.col, term.row);
        drawregion(0, 0, term.col, term.row);
+       XdbeSwapBuffers(xw.dpy, swpinfo, 1);
 }
 
 void
 }
 
 void
@@ -1746,20 +2157,26 @@ drawregion(int x1, int y1, int x2, int y2) {
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
+       bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN);
 
 
+       if((sel.alt && !alt) || (!sel.alt && alt))
+               ena_sel = 0;
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        if(!(xw.state & WIN_VISIBLE))
                return;
 
-       xclear(x1, y1, x2-1, y2-1);
        for(y = y1; y < y2; y++) {
        for(y = y1; y < y2; y++) {
+               if(!term.dirty[y])
+                       continue;
+               xclear(0, y, term.col, y);
+               term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
                base = term.line[y][0];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
-                       if(sel.bx != -1 && *(new.c) && selected(x, y))
+                       if(ena_sel && *(new.c) && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-                                       ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+                                                 ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
                                xdraws(buf, base, ox, y, ic, ib);
                                ic = ib = 0;
                        }
                                xdraws(buf, base, ox, y, ic, ib);
                                ic = ib = 0;
                        }
@@ -1778,20 +2195,15 @@ drawregion(int x1, int y1, int x2, int y2) {
                        xdraws(buf, base, ox, y, ic, ib);
        }
        xdrawcursor();
                        xdraws(buf, base, ox, y, ic, ib);
        }
        xdrawcursor();
-       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
 }
 
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
        if(xw.state & WIN_REDRAW) {
 }
 
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
        if(xw.state & WIN_REDRAW) {
-               if(!e->count) {
+               if(!e->count)
                        xw.state &= ~WIN_REDRAW;
                        xw.state &= ~WIN_REDRAW;
-                       draw();
-               }
-       } 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
 }
 
 void
@@ -1824,15 +2236,17 @@ focus(XEvent *ev) {
                xseturgency(0);
        } else
                xw.state &= ~WIN_FOCUSED;
                xseturgency(0);
        } else
                xw.state &= ~WIN_FOCUSED;
-       draw();
 }
 
 char*
 }
 
 char*
-kmap(KeySym k, unsigned int state) {
+kmap(KeySym k, uint state) {
        int i;
        int i;
-       for(i = 0; i < LEN(key); i++)
-               if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+       state &= ~Mod2Mask;
+       for(i = 0; i < LEN(key); i++) {
+               uint mask = key[i].mask;
+               if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
                        return (char*)key[i].s;
                        return (char*)key[i].s;
+       }
        return NULL;
 }
 
        return NULL;
 }
 
@@ -1847,10 +2261,12 @@ kpress(XEvent *ev) {
        int shift;
        Status status;
 
        int shift;
        Status status;
 
+       if (IS_SET(MODE_KBDLOCK))
+               return;
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
-       
+
        /* 1. custom keys from config.h */
        if((customkey = kmap(ksym, e->state)))
                ttywrite(customkey, strlen(customkey));
        /* 1. custom keys from config.h */
        if((customkey = kmap(ksym, e->state)))
                ttywrite(customkey, strlen(customkey));
@@ -1886,44 +2302,76 @@ kpress(XEvent *ev) {
                }
 }
 
                }
 }
 
+void
+cmessage(XEvent *e) {
+       /* See xembed specs
+          http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
+       if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+               if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+                       xw.state |= WIN_FOCUSED;
+                       xseturgency(0);
+               } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+                       xw.state &= ~WIN_FOCUSED;
+               }
+       }
+}
+
 void
 resize(XEvent *e) {
        int col, row;
 void
 resize(XEvent *e) {
        int col, row;
-       
+
        if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
                return;
        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;
        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();
-       ttyresize(col, row);
+
+       xclear(0, 0, xw.w, xw.h);
+       tresize(col, row);
        xresize(col, row);
        xresize(col, row);
+       ttyresize();
 }
 
 void
 run(void) {
        XEvent ev;
        fd_set rfd;
 }
 
 void
 run(void) {
        XEvent ev;
        fd_set rfd;
-       int xfd = XConnectionNumber(xw.dpy);
+       int xfd = XConnectionNumber(xw.dpy), i;
+       struct timeval drawtimeout, *tv = NULL;
 
 
-       for(;;) {
+       for(i = 0;; i++) {
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }
-               if(FD_ISSET(cmdfd, &rfd)) {
+
+               /*
+                * Stop after a certain number of reads so the user does not
+                * feel like the system is stuttering.
+                */
+               if(i < 1000 && FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                        ttyread();
-                       draw();
+
+                       /*
+                        * Just wait a bit so it isn't disturbing the
+                        * user and the system is able to write something.
+                        */
+                       drawtimeout.tv_sec = 0;
+                       drawtimeout.tv_usec = 5;
+                       tv = &drawtimeout;
+                       continue;
                }
                }
+               i = 0;
+               tv = NULL;
+
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
                        if(XFilterEvent(&ev, xw.win))
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
                        if(XFilterEvent(&ev, xw.win))
@@ -1931,13 +2379,20 @@ run(void) {
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
                }
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
                }
+
+               draw();
+               XFlush(xw.dpy);
        }
 }
 
 int
 main(int argc, char *argv[]) {
        }
 }
 
 int
 main(int argc, char *argv[]) {
-       int i;
-       
+       int i, bitm, xr, yr;
+       uint wr, hr;
+
+       xw.fw = xw.fh = xw.fx = xw.fy = 0;
+       xw.isfixed = False;
+
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
                case 't':
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
                case 't':
@@ -1949,10 +2404,34 @@ main(int argc, char *argv[]) {
                case 'w':
                        if(++i < argc) opt_embed = argv[i];
                        break;
                case 'w':
                        if(++i < argc) opt_embed = argv[i];
                        break;
-               case 'e': 
+               case 'f':
+                       if(++i < argc) opt_io = argv[i];
+                       break;
+               case 'e':
                        /* eat every remaining arguments */
                        if(++i < argc) opt_cmd = &argv[i];
                        goto run;
                        /* eat every remaining arguments */
                        if(++i < argc) opt_cmd = &argv[i];
                        goto run;
+               case 'g':
+                       if(++i >= argc)
+                               break;
+
+                       bitm = XParseGeometry(argv[i], &xr, &yr, &wr, &hr);
+                       if(bitm & XValue)
+                               xw.fx = xr;
+                       if(bitm & YValue)
+                               xw.fy = yr;
+                       if(bitm & WidthValue)
+                               xw.fw = (int)wr;
+                       if(bitm & HeightValue)
+                               xw.fh = (int)hr;
+                       if(bitm & XNegative && xw.fx == 0)
+                               xw.fx = -1;
+                       if(bitm & XNegative && xw.fy == 0)
+                               xw.fy = -1;
+
+                       if(xw.fh != 0 && xw.fw != 0)
+                               xw.isfixed = True;
+                       break;
                case 'v':
                default:
                        die(USAGE);
                case 'v':
                default:
                        die(USAGE);
@@ -1961,10 +2440,11 @@ main(int argc, char *argv[]) {
 
  run:
        setlocale(LC_CTYPE, "");
 
  run:
        setlocale(LC_CTYPE, "");
+       xinit();
        tnew(80, 24);
        ttynew();
        tnew(80, 24);
        ttynew();
-       xinit();
        selinit();
        run();
        return 0;
 }
        selinit();
        run();
        return 0;
 }
+