Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Select to the end of row if end of line is reached.
[st.git] / st.c
diff --git a/st.c b/st.c
index 710cf34..e2e6c57 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,10 +1,10 @@
 /* See LICENSE for licence details. */
 /* See LICENSE for licence details. */
-#define _XOPEN_SOURCE 600
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>
+#include <pwd.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -24,10 +24,19 @@
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
-#include <X11/extensions/Xdbe.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xft/Xft.h>
+#include <fontconfig/fontconfig.h>
+
+#include "arg.h"
+
+char *argv0;
+
 #define Glyph Glyph_
 #define Font Font_
 #define Glyph Glyph_
 #define Font Font_
+#define Draw XftDraw *
+#define Colour XftColor
+#define Colourmap Colormap
+#define Rectangle XRectangle
 
 #if   defined(__linux)
  #include <pty.h>
 
 #if   defined(__linux)
  #include <pty.h>
@@ -37,27 +46,25 @@
  #include <libutil.h>
 #endif
 
  #include <libutil.h>
 #endif
 
-#define USAGE \
-       "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 */
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
-#define ESC_BUF_SIZ   256
+#define UTF_SIZ       4
+#define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define ESC_ARG_SIZ   16
-#define STR_BUF_SIZ   256
-#define STR_ARG_SIZ   16
+#define STR_BUF_SIZ   ESC_BUF_SIZ
+#define STR_ARG_SIZ   ESC_ARG_SIZ
 #define DRAW_BUF_SIZ  20*1024
 #define DRAW_BUF_SIZ  20*1024
-#define UTF_SIZ       4
-#define XK_NO_MOD     UINT_MAX
-#define XK_ANY_MOD    0
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
+#define XK_SWITCH_MOD (1<<13)
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
+/* macros */
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
@@ -66,10 +73,10 @@
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
-#define IS_SET(flag) (term.mode & (flag))
+#define IS_SET(flag) ((term.mode & (flag)) != 0)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
-#define X2COL(x) (((x) - BORDER)/xw.cw)
-#define Y2ROW(y) (((y) - BORDER)/xw.ch)
+
+#define VT102ID "\033[?6c"
 
 enum glyph_attribute {
        ATTR_NULL      = 0,
 
 enum glyph_attribute {
        ATTR_NULL      = 0,
@@ -79,39 +86,38 @@ enum glyph_attribute {
        ATTR_GFX       = 8,
        ATTR_ITALIC    = 16,
        ATTR_BLINK     = 32,
        ATTR_GFX       = 8,
        ATTR_ITALIC    = 16,
        ATTR_BLINK     = 32,
+       ATTR_WRAP      = 64,
 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {
-       CURSOR_UP,
-       CURSOR_DOWN,
-       CURSOR_LEFT,
-       CURSOR_RIGHT,
        CURSOR_SAVE,
        CURSOR_LOAD
 };
 
 enum cursor_state {
        CURSOR_DEFAULT  = 0,
        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
+       CURSOR_WRAPNEXT = 1,
+       CURSOR_ORIGIN   = 2
 };
 
 enum term_mode {
 };
 
 enum term_mode {
-       MODE_WRAP       = 1,
+       MODE_WRAP        = 1,
        MODE_INSERT      = 2,
        MODE_APPKEYPAD   = 4,
        MODE_ALTSCREEN   = 8,
        MODE_INSERT      = 2,
        MODE_APPKEYPAD   = 4,
        MODE_ALTSCREEN   = 8,
-       MODE_CRLF       = 16,
+       MODE_CRLF        = 16,
        MODE_MOUSEBTN    = 32,
        MODE_MOUSEMOTION = 64,
        MODE_MOUSE       = 32|64,
        MODE_REVERSE     = 128,
        MODE_MOUSEBTN    = 32,
        MODE_MOUSEMOTION = 64,
        MODE_MOUSE       = 32|64,
        MODE_REVERSE     = 128,
-       MODE_KBDLOCK     = 256
+       MODE_KBDLOCK     = 256,
+       MODE_HIDE        = 512,
+       MODE_ECHO        = 1024,
+       MODE_APPCURSOR   = 2048,
+       MODE_MOUSESGR    = 4096,
+       MODE_8BIT        = 8192,
+       MODE_BLINK       = 16384,
+       MODE_FBLINK      = 32768,
 };
 
 enum escape_state {
 };
 
 enum escape_state {
@@ -120,6 +126,7 @@ enum escape_state {
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
+       ESC_TEST       = 32, /* Enter in test mode */
 };
 
 enum window_state {
 };
 
 enum window_state {
@@ -128,6 +135,16 @@ enum window_state {
        WIN_FOCUSED = 4
 };
 
        WIN_FOCUSED = 4
 };
 
+enum selection_type {
+       SEL_REGULAR = 1,
+       SEL_RECTANGULAR = 2
+};
+
+enum selection_snap {
+       SNAP_WORD = 1,
+       SNAP_LINE = 2
+};
+
 /* bit macro */
 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 /* bit macro */
 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
@@ -142,10 +159,9 @@ typedef struct {
        uchar mode;  /* attribute flags */
        ushort fg;   /* foreground  */
        ushort bg;   /* background  */
        uchar mode;  /* attribute flags */
        ushort fg;   /* foreground  */
        ushort bg;   /* background  */
-       uchar state; /* state flags    */
 } Glyph;
 
 } Glyph;
 
-typedef Glyph* Line;
+typedef Glyph *Line;
 
 typedef struct {
        Glyph attr;      /* current char attributes */
 
 typedef struct {
        Glyph attr;      /* current char attributes */
@@ -161,7 +177,7 @@ typedef struct {
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
-       int narg;             /* nb of args */
+       int narg;              /* nb of args */
        char mode;
 } CSIEscape;
 
        char mode;
 } CSIEscape;
 
@@ -179,51 +195,65 @@ typedef struct {
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */
-       Line* line;     /* screen */
-       Line* alt;      /* alternate screen */
-       bool* dirty;    /* dirtyness of lines */
+       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 */
+       bool numlock;   /* lock numbers in keyboard */
        bool *tabs;
 } Term;
 
 /* Purely graphic info */
 typedef struct {
        bool *tabs;
 } Term;
 
 /* Purely graphic info */
 typedef struct {
-       Display* dpy;
-       Colormap cmap;
+       Display *dpy;
+       Colourmap cmap;
        Window win;
        Window win;
-       XdbeBackBuffer buf;
-       Atom xembed;
+       Drawable buf;
+       Atom xembed, wmdeletewin;
        XIM xim;
        XIC xic;
        XIM xim;
        XIC xic;
-       XftDraw *xft_draw;
+       Draw draw;
        Visual *vis;
        int scr;
        bool isfixed; /* is fixed geometry? */
        int fx, fy, fw, fh; /* fixed geometry */
        int tw, th; /* tty width and height */
        Visual *vis;
        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, h; /* window width and height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
 } XWindow;
 
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
 } XWindow;
 
+typedef struct {
+       int b;
+       uint mask;
+       char s[ESC_BUF_SIZ];
+} Mousekey;
+
 typedef struct {
        KeySym k;
        uint mask;
        char s[ESC_BUF_SIZ];
 typedef struct {
        KeySym k;
        uint mask;
        char s[ESC_BUF_SIZ];
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;             /* application keypad */
+       signed char appcursor;          /* application cursor */
+       signed char crlf;               /* crlf mode          */
 } Key;
 
 /* TODO: use better name for vars... */
 typedef struct {
        int mode;
 } Key;
 
 /* TODO: use better name for vars... */
 typedef struct {
        int mode;
+       int type;
+       int snap;
        int bx, by;
        int ex, ey;
        int bx, by;
        int ex, ey;
-       struct {int x, y;} b, e;
+       struct {
+               int x, y;
+       } b, e;
        char *clip;
        Atom xtarget;
        bool alt;
        char *clip;
        Atom xtarget;
        bool alt;
@@ -231,27 +261,52 @@ typedef struct {
        struct timeval tclick2;
 } Selection;
 
        struct timeval tclick2;
 } Selection;
 
+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       const void *v;
+} Arg;
+
+typedef struct {
+       unsigned int mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;
+
+/* function definitions used in config.h */
+static void clippaste(const Arg *);
+static void numlock(const Arg *);
+static void selpaste(const Arg *);
+static void xzoom(const Arg *);
+
+/* Config.h for applying patches and the configuration. */
 #include "config.h"
 
 /* Font structure */
 typedef struct {
 #include "config.h"
 
 /* Font structure */
 typedef struct {
+       int height;
+       int width;
        int ascent;
        int descent;
        short lbearing;
        short rbearing;
        int ascent;
        int descent;
        short lbearing;
        short rbearing;
-       XftFont* xft_set;
+       XftFont *match;
+       FcFontSet *set;
+       FcPattern *pattern;
 } Font;
 
 /* Drawing Context */
 typedef struct {
 } Font;
 
 /* Drawing Context */
 typedef struct {
-       XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
-       GC gc;
+       Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        Font font, bfont, ifont, ibfont;
        Font font, bfont, ifont, ibfont;
+       GC gc;
 } DC;
 
 } DC;
 
-static void die(const char*, ...);
+static void die(const char *, ...);
 static void draw(void);
 static void draw(void);
-static void redraw(void);
+static void redraw(int);
 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);
@@ -266,6 +321,7 @@ static void strhandle(void);
 static void strparse(void);
 static void strreset(void);
 
 static void strparse(void);
 static void strreset(void);
 
+static int tattrset(int);
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);
@@ -273,22 +329,26 @@ static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
+static void tmoveato(int x, int y);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
-static void tputc(char*, int);
+static void tputc(char *, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int*, int);
-static void tsetchar(char*);
+static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
+static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
+static void techo(char *, int);
 
 
+static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);
@@ -297,22 +357,27 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
-static void xclearborders(void);
 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 int xsetcolorname(int, const char *);
+static int xloadfont(Font *, FcPattern *);
+static void xloadfonts(char *, int);
+static void xsettitle(char *);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xtermclear(int, int, int, int);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xtermclear(int, int, int, int);
+static void xunloadfonts(void);
 static void xresize(int, int);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
 static void xresize(int, int);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
-static char* kmap(KeySym, uint);
+static char *kmap(KeySym, uint);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);
+static void cresize(int, int);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
@@ -325,18 +390,18 @@ static void selrequest(XEvent *);
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
 static void selinit(void);
 static inline bool selected(int, int);
 static void selcopy(void);
-static void selpaste(void);
 static void selscroll(int, int);
 static void selscroll(int, int);
+static void selsnap(int, int *, int *, int);
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
 
 static int utf8decode(char *, long *);
 static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
+static ssize_t xwrite(int, char *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
-static void *xcalloc(size_t nmemb, size_t size);
-static char *smstrcat(char *, ...);
+static void *xcalloc(size_t, size_t);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
@@ -365,17 +430,59 @@ static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
-static char **opt_cmd  = NULL;
-static char *opt_io    = 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;
+static char *opt_font = NULL;
+
+static char *usedfont = NULL;
+static int usedfontsize = 0;
+
+/* Font Ring Cache */
+enum {
+       FRC_NORMAL,
+       FRC_ITALIC,
+       FRC_BOLD,
+       FRC_ITALICBOLD
+};
+
+typedef struct {
+       XftFont *font;
+       long c;
+       int flags;
+} Fontcache;
+
+/*
+ * Fontcache is a ring buffer, with frccur as current position and frclen as
+ * the current length of used elements.
+ */
+
+static Fontcache frc[1024];
+static int frccur = -1, frclen = 0;
+
+ssize_t
+xwrite(int fd, char *s, size_t len) {
+       size_t aux = len;
+
+       while(len > 0) {
+               ssize_t r = write(fd, s, len);
+               if(r < 0)
+                       return r;
+               len -= r;
+               s += r;
+       }
+       return aux;
+}
 
 void *
 xmalloc(size_t len) {
        void *p = malloc(len);
 
 void *
 xmalloc(size_t len) {
        void *p = malloc(len);
+
        if(!p)
                die("Out of memory\n");
        if(!p)
                die("Out of memory\n");
+
        return p;
 }
 
        return p;
 }
 
@@ -383,53 +490,18 @@ void *
 xrealloc(void *p, size_t len) {
        if((p = realloc(p, len)) == NULL)
                die("Out of memory\n");
 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);
        return p;
 }
 
 void *
 xcalloc(size_t nmemb, size_t size) {
        void *p = calloc(nmemb, size);
+
        if(!p)
                die("Out of memory\n");
        if(!p)
                die("Out of memory\n");
-       return p;
-}
-
-char *
-smstrcat(char *src, ...)
-{
-       va_list fmtargs;
-       char *ret, *p, *v;
-       int len, slen, flen;
-
-       len = slen = strlen(src);
-
-       va_start(fmtargs, src);
-       for(;;) {
-               v = va_arg(fmtargs, char *);
-               if(v == NULL)
-                       break;
-               len += strlen(v);
-       }
-       va_end(fmtargs);
-
-       p = ret = xmalloc(len+1);
-       memmove(p, src, slen);
-       p += slen;
-
-       va_start(fmtargs, src);
-       for(;;) {
-               v = va_arg(fmtargs, char *);
-               if(v == NULL)
-                       break;
-               flen = strlen(v);
-               memmove(p, v, flen);
-               p += flen;
-       }
-       va_end(fmtargs);
 
 
-       ret[len] = '\0';
-
-       return ret;
+       return p;
 }
 
 int
 }
 
 int
@@ -451,8 +523,10 @@ utf8decode(char *s, long *u) {
        } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
                *u = c & (B2|B1|B0);
                n = 3;
        } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
                *u = c & (B2|B1|B0);
                n = 3;
-       } else
+       } else {
                goto invalid;
                goto invalid;
+       }
+
        for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
                c = *s;
                if((c & (B7|B6)) != B7) /* 10xxxxxx */
        for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
                c = *s;
                if((c & (B7|B6)) != B7) /* 10xxxxxx */
@@ -460,14 +534,18 @@ utf8decode(char *s, long *u) {
                *u <<= 6;
                *u |= c & (B5|B4|B3|B2|B1|B0);
        }
                *u <<= 6;
                *u |= c & (B5|B4|B3|B2|B1|B0);
        }
+
        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
           (n == 3 && *u < 0x10000) ||
        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
           (n == 3 && *u < 0x10000) ||
-          (*u >= 0xD800 && *u <= 0xDFFF))
+          (*u >= 0xD800 && *u <= 0xDFFF)) {
                goto invalid;
                goto invalid;
+       }
+
        return rtn;
 invalid:
        *u = 0xFFFD;
        return rtn;
 invalid:
        *u = 0xFFFD;
+
        return rtn;
 }
 
        return rtn;
 }
 
@@ -477,7 +555,7 @@ utf8encode(long *u, char *s) {
        ulong uc;
        int i, n;
 
        ulong uc;
        int i, n;
 
-       sp = (uchar*) s;
+       sp = (uchar *)s;
        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */
        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */
@@ -494,14 +572,17 @@ utf8encode(long *u, char *s) {
        } else {
                goto invalid;
        }
        } else {
                goto invalid;
        }
+
        for(i=n,++sp; i>0; --i,++sp)
                *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
        for(i=n,++sp; i>0; --i,++sp)
                *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
+
        return n+1;
 invalid:
        /* U+FFFD */
        *s++ = '\xEF';
        *s++ = '\xBF';
        *s = '\xBD';
        return n+1;
 invalid:
        /* U+FFFD */
        *s++ = '\xEF';
        *s++ = '\xBF';
        *s = '\xBD';
+
        return 3;
 }
 
        return 3;
 }
 
@@ -511,38 +592,40 @@ int
 isfullutf8(char *s, int b) {
        uchar *c1, *c2, *c3;
 
 isfullutf8(char *s, int b) {
        uchar *c1, *c2, *c3;
 
-       c1 = (uchar *) s;
-       c2 = (uchar *) ++s;
-       c3 = (uchar *) ++s;
-       if(b < 1)
+       c1 = (uchar *)s;
+       c2 = (uchar *)++s;
+       c3 = (uchar *)++s;
+       if(b < 1) {
                return 0;
                return 0;
-       else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+       } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) {
                return 0;
                return 0;
-       else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+       } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
            ((b == 1) ||
            ((b == 1) ||
-           ((b == 2) && (*c2&(B7|B6)) == B7)))
+           ((b == 2) && (*c2&(B7|B6)) == B7))) {
                return 0;
                return 0;
-       else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+       } else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
            ((b == 1) ||
            ((b == 2) && (*c2&(B7|B6)) == B7) ||
            ((b == 1) ||
            ((b == 2) && (*c2&(B7|B6)) == B7) ||
-           ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
+           ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) {
                return 0;
                return 0;
-       else
+       } else {
                return 1;
                return 1;
+       }
 }
 
 int
 utf8size(char *s) {
        uchar c = *s;
 
 }
 
 int
 utf8size(char *s) {
        uchar c = *s;
 
-       if(~c&B7)
+       if(~c&B7) {
                return 1;
                return 1;
-       else if((c&(B7|B6|B5)) == (B7|B6))
+       } else if((c&(B7|B6|B5)) == (B7|B6)) {
                return 2;
                return 2;
-       else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+       } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) {
                return 3;
                return 3;
-       else
+       } else {
                return 4;
                return 4;
+       }
 }
 
 void
 }
 
 void
@@ -557,37 +640,156 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 
+static int
+x2col(int x) {
+       x -= borderpx;
+       x /= xw.cw;
+
+       return LIMIT(x, 0, term.col-1);
+}
+
+static int
+y2row(int y) {
+       y -= borderpx;
+       y /= xw.ch;
+
+       return LIMIT(y, 0, term.row-1);
+}
+
 static inline bool
 selected(int x, int y) {
 static inline bool
 selected(int x, int y) {
+       int bx, ex;
+
        if(sel.ey == y && sel.by == y) {
        if(sel.ey == y && sel.by == y) {
-               int bx = MIN(sel.bx, sel.ex);
-               int ex = MAX(sel.bx, sel.ex);
+               bx = MIN(sel.bx, sel.ex);
+               ex = MAX(sel.bx, sel.ex);
+
                return BETWEEN(x, bx, ex);
        }
                return BETWEEN(x, bx, ex);
        }
-       return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
-               || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
+
+       if(sel.type == SEL_RECTANGULAR) {
+               return ((sel.b.y <= y && y <= sel.e.y)
+                       && (sel.b.x <= x && x <= sel.e.x));
+       }
+       return ((sel.b.y < y && y < sel.e.y)
+               || (y == sel.e.y && x <= sel.e.x))
+               || (y == sel.b.y && x >= sel.b.x
+                       && (x <= sel.e.x || sel.b.y != sel.e.y));
+}
+
+void
+selsnap(int mode, int *x, int *y, int direction) {
+       int i;
+
+       switch(mode) {
+       case SNAP_WORD:
+               /*
+                * Snap around if the word wraps around at the end or
+                * beginning of a line.
+                */
+               for(;;) {
+                       if(direction < 0 && *x <= 0) {
+                               if(*y > 0 && term.line[*y - 1][term.col-1].mode
+                                               & ATTR_WRAP) {
+                                       *y -= 1;
+                                       *x = term.col-1;
+                               } else {
+                                       break;
+                               }
+                       }
+                       if(direction > 0 && *x >= term.col-1) {
+                               if(*y < term.row-1 && term.line[*y][*x].mode
+                                               & ATTR_WRAP) {
+                                       *y += 1;
+                                       *x = 0;
+                               } else {
+                                       break;
+                               }
+                       }
+
+                       if(term.line[*y][*x + direction].c[0] == ' ')
+                               break;
+
+                       *x += direction;
+               }
+               break;
+       case SNAP_LINE:
+               /*
+                * Snap around if the the previous line or the current one
+                * has set ATTR_WRAP at its end. Then the whole next or
+                * previous line will be selected.
+                */
+               *x = (direction < 0) ? 0 : term.col - 1;
+               if(direction < 0 && *y > 0) {
+                       for(; *y > 0; *y += direction) {
+                               if(!(term.line[*y-1][term.col-1].mode
+                                               & ATTR_WRAP)) {
+                                       break;
+                               }
+                       }
+               } else if(direction > 0 && *y < term.row-1) {
+                       for(; *y < term.row; *y += direction) {
+                               if(!(term.line[*y][term.col-1].mode
+                                               & ATTR_WRAP)) {
+                                       break;
+                               }
+                       }
+               }
+               break;
+       default:
+               /*
+                * Select the whole line when the end of line is reached.
+                */
+               if(direction > 0) {
+                       i = term.col;
+                       while(--i > 0 && term.line[*y][i].c[0] == ' ')
+                               /* nothing */;
+                       if(i > 0 && i < *x)
+                               *x = term.col - 1;
+               }
+               break;
+       }
 }
 
 void
 }
 
 void
-getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b)
-               *b = e->xbutton.button;
+getbuttoninfo(XEvent *e) {
+       int type;
+       uint state = e->xbutton.state &~Button1Mask;
+
+       sel.alt = IS_SET(MODE_ALTSCREEN);
+
+       sel.ex = x2col(e->xbutton.x);
+       sel.ey = y2row(e->xbutton.y);
+
+       if (sel.by < sel.ey
+                       || (sel.by == sel.ey && sel.bx < sel.ex)) {
+               selsnap(sel.snap, &sel.bx, &sel.by, -1);
+               selsnap(sel.snap, &sel.ex, &sel.ey, +1);
+       } else {
+               selsnap(sel.snap, &sel.ex, &sel.ey, -1);
+               selsnap(sel.snap, &sel.bx, &sel.by, +1);
+       }
 
 
-       *x = X2COL(e->xbutton.x);
-       *y = Y2ROW(e->xbutton.y);
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.e.y = MAX(sel.by, sel.ey);
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.e.y = MAX(sel.by, sel.ey);
+
+       sel.type = SEL_REGULAR;
+       for(type = 1; type < LEN(selmasks); ++type) {
+               if(match(selmasks[type], state)) {
+                       sel.type = type;
+                       break;
+               }
+       }
 }
 
 void
 mousereport(XEvent *e) {
 }
 
 void
 mousereport(XEvent *e) {
-       int x = X2COL(e->xbutton.x);
-       int y = Y2ROW(e->xbutton.y);
-       int button = e->xbutton.button;
-       int state = e->xbutton.state;
-       char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
+       int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
+           button = e->xbutton.button, state = e->xbutton.state,
+           len;
+       char buf[40];
        static int ob, ox, oy;
 
        /* from urxvt */
        static int ob, ox, oy;
 
        /* from urxvt */
@@ -596,7 +798,9 @@ mousereport(XEvent *e) {
                        return;
                button = ob + 32;
                ox = x, oy = y;
                        return;
                button = ob + 32;
                ox = x, oy = y;
-       } else if(e->xbutton.type == ButtonRelease || button == AnyButton) {
+       } else if(!IS_SET(MODE_MOUSESGR)
+                       && (e->xbutton.type == ButtonRelease
+                               || button == AnyButton)) {
                button = 3;
        } else {
                button -= Button1;
                button = 3;
        } else {
                button -= Button1;
@@ -608,62 +812,135 @@ mousereport(XEvent *e) {
                }
        }
 
                }
        }
 
-       buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+       button += (state & ShiftMask   ? 4  : 0)
                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
 
                + (state & Mod4Mask    ? 8  : 0)
                + (state & ControlMask ? 16 : 0);
 
-       ttywrite(buf, sizeof(buf));
+       len = 0;
+       if(IS_SET(MODE_MOUSESGR)) {
+               len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
+                               button, x+1, y+1,
+                               e->xbutton.type == ButtonRelease ? 'm' : 'M');
+       } else if(x < 223 && y < 223) {
+               len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
+                               32+button, 32+x+1, 32+y+1);
+       } else {
+               return;
+       }
+
+       ttywrite(buf, len);
 }
 
 void
 bpress(XEvent *e) {
 }
 
 void
 bpress(XEvent *e) {
-       if(IS_SET(MODE_MOUSE))
+       struct timeval now;
+       Mousekey *mk;
+
+       if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                mousereport(e);
-       else if(e->xbutton.button == Button1) {
+               return;
+       }
+
+       for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
+               if(e->xbutton.button == mk->b
+                               && match(mk->mask, e->xbutton.state)) {
+                       ttywrite(mk->s, strlen(mk->s));
+                       if(IS_SET(MODE_ECHO))
+                               techo(mk->s, strlen(mk->s));
+                       return;
+               }
+       }
+
+       if(e->xbutton.button == Button1) {
+               gettimeofday(&now, NULL);
+
+               /* Clear previous selection, logically and visually. */
                if(sel.bx != -1) {
                        sel.bx = -1;
                        tsetdirt(sel.b.y, sel.e.y);
                        draw();
                }
                sel.mode = 1;
                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.type = SEL_REGULAR;
+               sel.ex = sel.bx = x2col(e->xbutton.x);
+               sel.ey = sel.by = y2row(e->xbutton.y);
+
+               /*
+                * If the user clicks below predefined timeouts specific
+                * snapping behaviour is exposed.
+                */
+               if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+                       sel.snap = SNAP_LINE;
+               } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+                       sel.snap = SNAP_WORD;
+               } else {
+                       sel.snap = 0;
+               }
+               selsnap(sel.snap, &sel.bx, &sel.by, -1);
+               selsnap(sel.snap, &sel.ex, &sel.ey, +1);
+               sel.b.x = sel.bx;
+               sel.b.y = sel.by;
+               sel.e.x = sel.ex;
+               sel.e.y = sel.ey;
+
+               /*
+                * Draw selection, unless it's regular and we don't want to
+                * make clicks visible
+                */
+               if(sel.snap != 0) {
+                       sel.mode++;
+                       tsetdirt(sel.b.y, sel.e.y);
+                       draw();
+               }
+               sel.tclick2 = sel.tclick1;
+               sel.tclick1 = now;
        }
 }
 
 void
 selcopy(void) {
        char *str, *ptr;
        }
 }
 
 void
 selcopy(void) {
        char *str, *ptr;
-       int x, y, bufsize, is_selected = 0;
+       int x, y, bufsize, size;
+       Glyph *gp, *last;
 
 
-       if(sel.bx == -1)
+       if(sel.bx == -1) {
                str = NULL;
                str = NULL;
-
-       else {
+       } else {
                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 */
                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(x = 0; x < term.col; x++) {
-                               int size;
-                               char *p;
-                               Glyph *gp = &term.line[y][x];
+               for(y = sel.b.y; y < sel.e.y + 1; y++) {
+                       gp = &term.line[y][0];
+                       last = gp + term.col;
 
 
-                               if(!(is_selected = selected(x, y)))
+                       while(--last >= gp && !(selected(last - gp, y) && \
+                                               strcmp(last->c, " ") != 0))
+                               /* nothing */;
+
+                       for(x = 0; gp <= last; x++, ++gp) {
+                               if(!selected(x, y))
                                        continue;
                                        continue;
-                               p = (gp->state & GLYPH_SET) ? gp->c : " ";
-                               size = utf8size(p);
-                               memcpy(ptr, p, size);
+
+                               size = utf8size(gp->c);
+                               memcpy(ptr, gp->c, size);
                                ptr += size;
                        }
                                ptr += size;
                        }
-                       /* \n at the end of every selected line except for the last one */
-                       if(is_selected && y < sel.e.y)
+
+                       /*
+                        * Copy and pasting of line endings is inconsistent
+                        * in the inconsistent terminal and GUI world.
+                        * The best solution seems like to produce '\n' when
+                        * something is copied from st and convert '\n' to
+                        * '\r', when something to be pasted is received by
+                        * st.
+                        * FIXME: Fix the computer world.
+                        */
+                       if(y < sel.e.y && !((gp-1)->mode & ATTR_WRAP))
                                *ptr++ = '\n';
                }
                *ptr = 0;
        }
                                *ptr++ = '\n';
                }
                *ptr = 0;
        }
-       sel.alt = IS_SET(MODE_ALTSCREEN);
        xsetsel(str);
 }
 
        xsetsel(str);
 }
 
@@ -671,7 +948,7 @@ void
 selnotify(XEvent *e) {
        ulong nitems, ofs, rem;
        int format;
 selnotify(XEvent *e) {
        ulong nitems, ofs, rem;
        int format;
-       uchar *data;
+       uchar *data, *last, *repl;
        Atom type;
 
        ofs = 0;
        Atom type;
 
        ofs = 0;
@@ -682,7 +959,21 @@ selnotify(XEvent *e) {
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
-               ttywrite((const char *) data, nitems * format / 8);
+
+               /*
+                * As seen in selcopy:
+                * Line endings are inconsistent in the terminal and GUI world
+                * copy and pasting. When receiving some selection data,
+                * replace all '\n' with '\r'.
+                * FIXME: Fix the computer world.
+                */
+               repl = data;
+               last = data + nitems * format / 8;
+               while((repl = memchr(repl, '\n', last - repl))) {
+                       *repl++ = '\r';
+               }
+
+               ttywrite((const char *)data, nitems * format / 8);
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
@@ -690,11 +981,22 @@ selnotify(XEvent *e) {
 }
 
 void
 }
 
 void
-selpaste() {
-       XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
+selpaste(const Arg *dummy) {
+       XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);
+}
+
+void
+clippaste(const Arg *dummy) {
+       Atom clipboard;
+
+       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+       XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);
 }
 
 }
 
-void selclear(XEvent *e) {
+void
+selclear(XEvent *e) {
        if(sel.bx == -1)
                return;
        sel.bx = -1;
        if(sel.bx == -1)
                return;
        sel.bx = -1;
@@ -705,7 +1007,7 @@ void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
-       Atom xa_targets;
+       Atom xa_targets, string;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
@@ -719,7 +1021,7 @@ selrequest(XEvent *e) {
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
        if(xsre->target == xa_targets) {
                /* respond with the supported type */
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
        if(xsre->target == xa_targets) {
                /* respond with the supported type */
-               Atom string = sel.xtarget;
+               string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
@@ -756,57 +1058,42 @@ brelease(XEvent *e) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
-       if(e->xbutton.button == Button2)
-               selpaste();
-       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;
+
+       if(e->xbutton.button == Button2) {
+               selpaste(NULL);
+       } else if(e->xbutton.button == Button1) {
+               if(sel.mode < 2) {
                        sel.bx = -1;
                        sel.bx = -1;
-                       gettimeofday(&now, NULL);
-
-                       if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
-                               /* triple click on the line */
-                               sel.b.x = sel.bx = 0;
-                               sel.e.x = sel.ex = term.col;
-                               sel.b.y = sel.e.y = sel.ey;
-                               selcopy();
-                       } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
-                               /* double click to select word */
-                               sel.bx = sel.ex;
-                               while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
-                                         term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--;
-                               sel.b.x = sel.bx;
-                               while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
-                                         term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++;
-                               sel.e.x = sel.ex;
-                               sel.b.y = sel.e.y = sel.ey;
-                               selcopy();
-                       }
-               } else
+               } else {
+                       getbuttoninfo(e);
                        selcopy();
                        selcopy();
+               }
+               sel.mode = 0;
+               term.dirty[sel.ey] = 1;
        }
        }
-       memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
-       gettimeofday(&sel.tclick1, NULL);
 }
 
 void
 bmotion(XEvent *e) {
 }
 
 void
 bmotion(XEvent *e) {
+       int oldey, oldex, oldsby, oldsey;
+
        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }
        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }
-       if(sel.mode) {
-               int oldey = sel.ey, oldex = sel.ex;
-               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
 
-               if(oldey != sel.ey || oldex != sel.ex) {
-                       int starty = MIN(oldey, sel.ey);
-                       int endy = MAX(oldey, sel.ey);
-                       tsetdirt(starty, endy);
-               }
+       if(!sel.mode)
+               return;
+
+       sel.mode++;
+       oldey = sel.ey;
+       oldex = sel.ex;
+       oldsby = sel.b.y;
+       oldsey = sel.e.y;
+       getbuttoninfo(e);
+
+       if(oldey != sel.ey || oldex != sel.ex) {
+               tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey));
        }
 }
 
        }
 }
 
@@ -824,11 +1111,23 @@ void
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
+       const struct passwd *pass = getpwuid(getuid());
+       char buf[sizeof(long) * 8 + 1];
 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 
 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 
+       if(pass) {
+               setenv("LOGNAME", pass->pw_name, 1);
+               setenv("USER", pass->pw_name, 1);
+               setenv("SHELL", pass->pw_shell, 0);
+               setenv("HOME", pass->pw_dir, 0);
+       }
+
+       snprintf(buf, sizeof(buf), "%lu", xw.win);
+       setenv("WINDOWID", buf, 1);
+
        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);
@@ -836,9 +1135,9 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, 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};
+       DEFAULT(envshell, shell);
+       setenv("TERM", termname, 1);
+       args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }
        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }
@@ -846,20 +1145,23 @@ execsh(void) {
 void
 sigchld(int a) {
        int stat = 0;
 void
 sigchld(int a) {
        int stat = 0;
+
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
-       if(WIFEXITED(stat))
+
+       if(WIFEXITED(stat)) {
                exit(WEXITSTATUS(stat));
                exit(WEXITSTATUS(stat));
-       else
+       } else {
                exit(EXIT_FAILURE);
                exit(EXIT_FAILURE);
+       }
 }
 
 void
 ttynew(void) {
        int m, s;
 }
 
 void
 ttynew(void) {
        int m, s;
+       struct winsize w = {term.row, term.col, 0, 0};
 
        /* seems to work fine on linux, openbsd and freebsd */
 
        /* seems to work fine on linux, openbsd and freebsd */
-       struct winsize w = {term.row, term.col, 0, 0};
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", SERRNO);
 
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", SERRNO);
 
@@ -883,13 +1185,12 @@ ttynew(void) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {
                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));
-                               }
+                       iofd = (!strcmp(opt_io, "-")) ?
+                                 STDOUT_FILENO :
+                                 open(opt_io, O_WRONLY | O_CREAT, 0666);
+                       if(iofd < 0) {
+                               fprintf(stderr, "Error opening %s:%s\n",
+                                       opt_io, strerror(errno));
                        }
                }
        }
                        }
                }
        }
@@ -898,6 +1199,7 @@ ttynew(void) {
 void
 dump(char c) {
        static int col;
 void
 dump(char c) {
        static int col;
+
        fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
        if(++col % 10 == 0)
                fprintf(stderr, "\n");
        fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
        if(++col % 10 == 0)
                fprintf(stderr, "\n");
@@ -924,7 +1226,7 @@ ttyread(void) {
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
                tputc(s, charsize);
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
                tputc(s, charsize);
-               ptr    += charsize;
+               ptr += charsize;
                buflen -= charsize;
        }
 
                buflen -= charsize;
        }
 
@@ -950,9 +1252,22 @@ ttyresize(void) {
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
+int
+tattrset(int attr) {
+       int i, j;
+
+       for(i = 0; i < term.row-1; i++) {
+               for(j = 0; j < term.col-1; j++) {
+                       if(term.line[i][j].mode & attr)
+                               return 1;
+               }
+       }
+
+       return 0;
+}
+
 void
 void
-tsetdirt(int top, int bot)
-{
+tsetdirt(int top, int bot) {
        int i;
 
        LIMIT(top, 0, term.row-1);
        int i;
 
        LIMIT(top, 0, term.row-1);
@@ -963,8 +1278,21 @@ tsetdirt(int top, int bot)
 }
 
 void
 }
 
 void
-tfulldirt(void)
-{
+tsetdirtattr(int attr) {
+       int i, j;
+
+       for(i = 0; i < term.row-1; i++) {
+               for(j = 0; j < term.col-1; j++) {
+                       if(term.line[i][j].mode & attr) {
+                               tsetdirt(i, i);
+                               break;
+                       }
+               }
+       }
+}
+
+void
+tfulldirt(void) {
        tsetdirt(0, term.row-1);
 }
 
        tsetdirt(0, term.row-1);
 }
 
@@ -972,52 +1300,49 @@ void
 tcursor(int mode) {
        static TCursor c;
 
 tcursor(int mode) {
        static TCursor c;
 
-       if(mode == CURSOR_SAVE)
+       if(mode == CURSOR_SAVE) {
                c = term.c;
                c = term.c;
-       else if(mode == CURSOR_LOAD)
-               term.c = c, tmoveto(c.x, c.y);
+       } else if(mode == CURSOR_LOAD) {
+               term.c = c;
+               tmoveto(c.x, c.y);
+       }
 }
 
 void
 treset(void) {
        uint i;
 }
 
 void
 treset(void) {
        uint i;
+
        term.c = (TCursor){{
                .mode = ATTR_NULL,
        term.c = (TCursor){{
                .mode = ATTR_NULL,
-               .fg = DefaultFG,
-               .bg = DefaultBG
+               .fg = defaultfg,
+               .bg = defaultbg
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
-       for(i = TAB; i < term.col; i += TAB)
+       for(i = tabspaces; i < term.col; i += tabspaces)
                term.tabs[i] = 1;
                term.tabs[i] = 1;
-       term.top = 0, term.bot = term.row - 1;
+       term.top = 0;
+       term.bot = term.row - 1;
        term.mode = MODE_WRAP;
 
        tclearregion(0, 0, term.col-1, term.row-1);
        term.mode = MODE_WRAP;
 
        tclearregion(0, 0, term.col-1, term.row-1);
+       tmoveto(0, 0);
+       tcursor(CURSOR_SAVE);
 }
 
 void
 tnew(int col, int row) {
 }
 
 void
 tnew(int col, int row) {
-       /* set screen size */
-       term.row = row, term.col = col;
-       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++) {
-               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 */
+       memset(&term, 0, sizeof(Term));
+       tresize(col, row);
+       term.numlock = 1;
+
        treset();
 }
 
 void
 tswapscreen(void) {
        treset();
 }
 
 void
 tswapscreen(void) {
-       Line* tmp = term.line;
+       Line *tmp = term.line;
+
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
@@ -1075,13 +1400,20 @@ selscroll(int orig, int n) {
                        sel.bx = -1;
                        return;
                }
                        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;
+               if(sel.type == SEL_RECTANGULAR) {
+                       if(sel.by < term.top)
+                               sel.by = term.top;
+                       if(sel.ey > term.bot)
+                               sel.ey = term.bot;
+               } else {
+                       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;
                }
                sel.b.y = sel.by, sel.b.x = sel.bx;
                sel.e.y = sel.ey, sel.e.x = sel.ex;
@@ -1091,73 +1423,93 @@ selscroll(int orig, int n) {
 void
 tnewline(int first_col) {
        int y = term.c.y;
 void
 tnewline(int first_col) {
        int y = term.c.y;
-       if(y == term.bot)
+
+       if(y == term.bot) {
                tscrollup(term.top, 1);
                tscrollup(term.top, 1);
-       else
+       } else {
                y++;
                y++;
+       }
        tmoveto(first_col ? 0 : term.c.x, y);
 }
 
 void
 csiparse(void) {
        tmoveto(first_col ? 0 : term.c.x, y);
 }
 
 void
 csiparse(void) {
-       /* int noarg = 1; */
-       char *p = csiescseq.buf;
+       char *p = csiescseq.buf, *np;
+       long int v;
 
        csiescseq.narg = 0;
 
        csiescseq.narg = 0;
-       if(*p == '?')
-               csiescseq.priv = 1, p++;
+       if(*p == '?') {
+               csiescseq.priv = 1;
+               p++;
+       }
 
 
+       csiescseq.buf[csiescseq.len] = '\0';
        while(p < csiescseq.buf+csiescseq.len) {
        while(p < csiescseq.buf+csiescseq.len) {
-               while(isdigit(*p)) {
-                       csiescseq.arg[csiescseq.narg] *= 10;
-                       csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
-               }
-               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ)
-                       csiescseq.narg++, p++;
-               else {
-                       csiescseq.mode = *p;
-                       csiescseq.narg++;
-                       return;
-               }
+               np = NULL;
+               v = strtol(p, &np, 10);
+               if(np == p)
+                       v = 0;
+               if(v == LONG_MAX || v == LONG_MIN)
+                       v = -1;
+               csiescseq.arg[csiescseq.narg++] = v;
+               p = np;
+               if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+                       break;
+               p++;
        }
        }
+       csiescseq.mode = *p;
+}
+
+/* for absolute user moves, when decom is set */
+void
+tmoveato(int x, int y) {
+       tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
 }
 
 void
 tmoveto(int x, int y) {
 }
 
 void
 tmoveto(int x, int y) {
+       int miny, maxy;
+
+       if(term.c.state & CURSOR_ORIGIN) {
+               miny = term.top;
+               maxy = term.bot;
+       } else {
+               miny = 0;
+               maxy = term.row - 1;
+       }
        LIMIT(x, 0, term.col-1);
        LIMIT(x, 0, term.col-1);
-       LIMIT(y, 0, term.row-1);
+       LIMIT(y, miny, maxy);
        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.x = x;
        term.c.y = y;
 }
 
 void
        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.x = x;
        term.c.y = y;
 }
 
 void
-tsetchar(char *c) {
+tsetchar(char *c, Glyph *attr, int x, int y) {
+       static char *vt100_0[62] = { /* 0x41 - 0x7e */
+               "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+               0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+               0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+               0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+               "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+               "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+               "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+               "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+       };
+
        /*
         * The table is proudly stolen from rxvt.
         */
        /*
         * The table is proudly stolen from rxvt.
         */
-       if(term.c.attr.mode & ATTR_GFX) {
-               char *vt100_0[62] = { /* 0x41 - 0x7e */
-                       "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
-                       0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
-                       0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
-                       0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
-                       "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
-                       "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
-                       "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
-                       "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
-               };
-
+       if(attr->mode & ATTR_GFX) {
                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 
                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 
-       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.dirty[y] = 1;
+       term.line[y][x] = *attr;
+       memcpy(term.line[y][x].c, c, UTF_SIZ);
 }
 
 void
 }
 
 void
@@ -1176,8 +1528,12 @@ tclearregion(int x1, int y1, int x2, int y2) {
 
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
 
        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++) {
+                       if(selected(x, y))
+                               selclear(NULL);
+                       term.line[y][x] = term.c.attr;
+                       memcpy(term.line[y][x].c, " ", 2);
+               }
        }
 }
 
        }
 }
 
@@ -1193,7 +1549,9 @@ tdeletechar(int n) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
+
+       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
+                       size * sizeof(Glyph));
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
@@ -1209,7 +1567,9 @@ tinsertblank(int n) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph));
+
+       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
+                       size * sizeof(Glyph));
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
@@ -1236,21 +1596,23 @@ 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 \
-                                       | ATTR_ITALIC | ATTR_BLINK);
-                       term.c.attr.fg = DefaultFG;
-                       term.c.attr.bg = DefaultBG;
+                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE \
+                                       | ATTR_BOLD | ATTR_ITALIC \
+                                       | ATTR_BLINK);
+                       term.c.attr.fg = defaultfg;
+                       term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
-               case 3: /* enter standout (highlight) */
+               case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 4:
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
-               case 5:
+               case 5: /* slow blink */
+               case 6: /* rapid blink */
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
@@ -1260,13 +1622,14 @@ tsetattr(int *attr, int l) {
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
-               case 23: /* leave standout (highlight) mode */
+               case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 24:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
+               case 26:
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
@@ -1275,42 +1638,55 @@ tsetattr(int *attr, int l) {
                case 38:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
                case 38:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
-                               if(BETWEEN(attr[i], 0, 255))
+                               if(BETWEEN(attr[i], 0, 255)) {
                                        term.c.attr.fg = attr[i];
                                        term.c.attr.fg = attr[i];
-                               else
-                                       fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
+                               } else {
+                                       fprintf(stderr,
+                                               "erresc: bad fgcolor %d\n",
+                                               attr[i]);
+                               }
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(38): gfx attr %d unknown\n",
+                                       attr[i]);
                        }
                        }
-                       else
-                               fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]);
                        break;
                case 39:
                        break;
                case 39:
-                       term.c.attr.fg = DefaultFG;
+                       term.c.attr.fg = defaultfg;
                        break;
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
                        break;
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
-                               if(BETWEEN(attr[i], 0, 255))
+                               if(BETWEEN(attr[i], 0, 255)) {
                                        term.c.attr.bg = attr[i];
                                        term.c.attr.bg = attr[i];
-                               else
-                                       fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
+                               } else {
+                                       fprintf(stderr,
+                                               "erresc: bad bgcolor %d\n",
+                                               attr[i]);
+                               }
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(48): gfx attr %d unknown\n",
+                                       attr[i]);
                        }
                        }
-                       else
-                               fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]);
                        break;
                case 49:
                        break;
                case 49:
-                       term.c.attr.bg = DefaultBG;
+                       term.c.attr.bg = defaultbg;
                        break;
                default:
                        break;
                default:
-                       if(BETWEEN(attr[i], 30, 37))
+                       if(BETWEEN(attr[i], 30, 37)) {
                                term.c.attr.fg = attr[i] - 30;
                                term.c.attr.fg = attr[i] - 30;
-                       else if(BETWEEN(attr[i], 40, 47))
+                       } else if(BETWEEN(attr[i], 40, 47)) {
                                term.c.attr.bg = attr[i] - 40;
                                term.c.attr.bg = attr[i] - 40;
-                       else if(BETWEEN(attr[i], 90, 97))
+                       } else if(BETWEEN(attr[i], 90, 97)) {
                                term.c.attr.fg = attr[i] - 90 + 8;
                                term.c.attr.fg = attr[i] - 90 + 8;
-                       else if(BETWEEN(attr[i], 100, 107))
+                       } else if(BETWEEN(attr[i], 100, 107)) {
                                term.c.attr.bg = attr[i] - 100 + 8;
                                term.c.attr.bg = attr[i] - 100 + 8;
-                       else
-                               fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(default): gfx attr %d unknown\n",
+                                       attr[i]), csidump();
+                       }
                        break;
                }
        }
                        break;
                }
        }
@@ -1336,61 +1712,75 @@ tsetscroll(int t, int b) {
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
+       bool alt;
 
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
                                break;
                        case 1: /* DECCKM -- Cursor key */
 
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
                                break;
                        case 1: /* DECCKM -- Cursor key */
-                               MODBIT(term.mode, set, MODE_APPKEYPAD);
+                               MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                                break;
-                       case 5: /* DECSCNM -- Reverve video */
+                       case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
-                                       redraw();
+                                       redraw(REDRAW_TIMEOUT);
                                break;
                                break;
-                       case 6: /* XXX: DECOM -- Origin */
+                       case 6: /* DECOM -- Origin */
+                               MODBIT(term.c.state, set, CURSOR_ORIGIN);
+                               tmoveato(0, 0);
                                break;
                        case 7: /* DECAWM -- Auto wrap */
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
                                break;
                        case 7: /* DECAWM -- Auto wrap */
                                MODBIT(term.mode, set, MODE_WRAP);
                                break;
-                       case 8: /* XXX: DECARM -- Auto repeat */
-                               break;
                        case 0:  /* Error (IGNORED) */
                        case 0:  /* Error (IGNORED) */
+                       case 2:  /* DECANM -- ANSI/VT52 (IGNORED) */
+                       case 3:  /* DECCOLM -- Column  (IGNORED) */
+                       case 4:  /* DECSCLM -- Scroll (IGNORED) */
+                       case 8:  /* DECARM -- Auto repeat (IGNORED) */
+                       case 18: /* DECPFF -- Printer feed (IGNORED) */
+                       case 19: /* DECPEX -- Printer extent (IGNORED) */
+                       case 42: /* DECNRCM -- National characters (IGNORED) */
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
-                       case 25:
-                               MODBIT(term.c.state, !set, CURSOR_HIDE);
+                       case 25: /* DECTCEM -- Text Cursor Enable Mode */
+                               MODBIT(term.mode, !set, MODE_HIDE);
                                break;
                        case 1000: /* 1000,1002: enable xterm mouse report */
                                MODBIT(term.mode, set, MODE_MOUSEBTN);
                                break;
                        case 1000: /* 1000,1002: enable xterm mouse report */
                                MODBIT(term.mode, set, MODE_MOUSEBTN);
+                               MODBIT(term.mode, 0, MODE_MOUSEMOTION);
                                break;
                        case 1002:
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);
                                break;
                        case 1002:
                                MODBIT(term.mode, set, MODE_MOUSEMOTION);
+                               MODBIT(term.mode, 0, MODE_MOUSEBTN);
+                               break;
+                       case 1006:
+                               MODBIT(term.mode, set, MODE_MOUSESGR);
+                               break;
+                       case 1034:
+                               MODBIT(term.mode, set, MODE_8BIT);
                                break;
                        case 1049: /* = 1047 and 1048 */
                        case 47:
                        case 1047:
                                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 (!allowaltscreen)
+                                       break;
+
+                               alt = IS_SET(MODE_ALTSCREEN);
+                               if(alt) {
+                                       tclearregion(0, 0, term.col-1,
+                                                       term.row-1);
                                }
                                }
+                               if(set ^ alt)           /* set is always 1 or 0 */
+                                       tswapscreen();
                                if(*args != 1049)
                                        break;
                                if(*args != 1049)
                                        break;
-                               /* pass through */
+                               /* FALLTRU */
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        default:
-                       /* case 2:  DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
-                       /* case 3:  DECCOLM -- Column  (NOT SUPPORTED) */
-                       /* case 4:  DECSCLM -- Scroll (NOT SUPPORTED) */
-                       /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
-                       /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
-                       /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);
                                fprintf(stderr,
                                        "erresc: unknown private set/reset mode %d\n",
                                        *args);
@@ -1406,7 +1796,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 4:  /* IRM -- Insertion-replacement */
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
                        case 4:  /* IRM -- Insertion-replacement */
                                MODBIT(term.mode, set, MODE_INSERT);
                                break;
-                       case 12: /* XXX: SRM -- Send/Receive */
+                       case 12: /* SRM -- Send/Receive */
+                               MODBIT(term.mode, !set, MODE_ECHO);
                                break;
                        case 20: /* LNM -- Linefeed/new line */
                                MODBIT(term.mode, set, MODE_CRLF);
                                break;
                        case 20: /* LNM -- Linefeed/new line */
                                MODBIT(term.mode, set, MODE_CRLF);
@@ -1437,16 +1828,20 @@ csihandle(void) {
                tinsertblank(csiescseq.arg[0]);
                break;
        case 'A': /* CUU -- Cursor <n> Up */
                tinsertblank(csiescseq.arg[0]);
                break;
        case 'A': /* CUU -- Cursor <n> Up */
-       case 'e':
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
                break;
        case 'B': /* CUD -- Cursor <n> Down */
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y-csiescseq.arg[0]);
                break;
        case 'B': /* CUD -- Cursor <n> Down */
+       case 'e': /* VPR --Cursor <n> Down */
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
+       case 'c': /* DA -- Device Attributes */
+               if(csiescseq.arg[0] == 0)
+                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+               break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'C': /* CUF -- Cursor <n> Forward */
-       case 'a':
+       case 'a': /* HPR -- Cursor <n> Forward */
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
                break;
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x+csiescseq.arg[0], term.c.y);
                break;
@@ -1463,7 +1858,7 @@ csihandle(void) {
                tmoveto(0, term.c.y-csiescseq.arg[0]);
                break;
        case 'g': /* TBC -- Tabulation clear */
                tmoveto(0, term.c.y-csiescseq.arg[0]);
                break;
        case 'g': /* TBC -- Tabulation clear */
-               switch (csiescseq.arg[0]) {
+               switch(csiescseq.arg[0]) {
                case 0: /* clear current tab stop */
                        term.tabs[term.c.x] = 0;
                        break;
                case 0: /* clear current tab stop */
                        term.tabs[term.c.x] = 0;
                        break;
@@ -1483,7 +1878,7 @@ csihandle(void) {
        case 'f': /* HVP */
                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[1], 1);
        case 'f': /* HVP */
                DEFAULT(csiescseq.arg[0], 1);
                DEFAULT(csiescseq.arg[1], 1);
-               tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
+               tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1);
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
@@ -1495,8 +1890,10 @@ csihandle(void) {
                switch(csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch(csiescseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-                       if(term.c.y < term.row-1)
-                               tclearregion(0, term.c.y+1, term.col-1, term.row-1);
+                       if(term.c.y < term.row-1) {
+                               tclearregion(0, term.c.y+1, term.col-1,
+                                               term.row-1);
+                       }
                        break;
                case 1: /* above */
                        if(term.c.y > 1)
                        break;
                case 1: /* above */
                        if(term.c.y > 1)
@@ -1513,7 +1910,8 @@ csihandle(void) {
        case 'K': /* EL -- Clear line */
                switch(csiescseq.arg[0]) {
                case 0: /* right */
        case 'K': /* EL -- Clear line */
                switch(csiescseq.arg[0]) {
                case 0: /* right */
-                       tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
+                       tclearregion(term.c.x, term.c.y, term.col-1,
+                                       term.c.y);
                        break;
                case 1: /* left */
                        tclearregion(0, term.c.y, term.c.x, term.c.y);
                        break;
                case 1: /* left */
                        tclearregion(0, term.c.y, term.c.x, term.c.y);
@@ -1544,7 +1942,8 @@ csihandle(void) {
                break;
        case 'X': /* ECH -- Erase <n> char */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'X': /* ECH -- Erase <n> char */
                DEFAULT(csiescseq.arg[0], 1);
-               tclearregion(term.c.x, term.c.y, term.c.x + csiescseq.arg[0], term.c.y);
+               tclearregion(term.c.x, term.c.y,
+                               term.c.x + csiescseq.arg[0] - 1, term.c.y);
                break;
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(csiescseq.arg[0], 1);
@@ -1557,7 +1956,7 @@ csihandle(void) {
                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);
-               tmoveto(term.c.x, csiescseq.arg[0]-1);
+               tmoveato(term.c.x, csiescseq.arg[0]-1);
                break;
        case 'h': /* SM -- Set terminal mode */
                tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
                break;
        case 'h': /* SM -- Set terminal mode */
                tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg);
@@ -1566,13 +1965,13 @@ csihandle(void) {
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
-               if(csiescseq.priv)
+               if(csiescseq.priv) {
                        goto unknown;
                        goto unknown;
-               else {
+               } else {
                        DEFAULT(csiescseq.arg[0], 1);
                        DEFAULT(csiescseq.arg[1], term.row);
                        tsetscroll(csiescseq.arg[0]-1, csiescseq.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);
+                       tmoveato(0, 0);
                }
                break;
        case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
                }
                break;
        case 's': /* DECSC -- Save cursor position (ANSI.SYS) */
@@ -1587,14 +1986,22 @@ csihandle(void) {
 void
 csidump(void) {
        int i;
 void
 csidump(void) {
        int i;
+       uint c;
+
        printf("ESC[");
        for(i = 0; i < csiescseq.len; i++) {
        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);
+               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');
 }
        }
        putchar('\n');
 }
@@ -1606,32 +2013,37 @@ csireset(void) {
 
 void
 strhandle(void) {
 
 void
 strhandle(void) {
-       char *p;
+       char *p = NULL;
+       int i, j, narg;
 
 
-       /*
-        * TODO: make this being useful in case of color palette change.
-        */
        strparse();
        strparse();
-
-       p = strescseq.buf;
+       narg = strescseq.narg;
 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */
 
        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);
+               switch(i = atoi(strescseq.args[0])) {
+               case 0:
+               case 1:
+               case 2:
+                       if(narg > 1)
+                               xsettitle(strescseq.args[1]);
                        break;
                        break;
-               case '4': /* TODO: Set color (arg0) to "rgb:%hexr/$hexg/$hexb" (arg1) */
+               case 4: /* color set */
+                       if(narg < 3)
+                               break;
+                       p = strescseq.args[2];
+                       /* fall through */
+               case 104: /* color reset, here p = NULL */
+                       j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
+                       if (!xsetcolorname(j, p)) {
+                               fprintf(stderr, "erresc: invalid color %s\n", p);
+                       } else {
+                               /*
+                                * TODO if defaultbg color is changed, borders
+                                * are dirty
+                                */
+                               redraw(0);
+                       }
                        break;
                default:
                        fprintf(stderr, "erresc: unknown str ");
                        break;
                default:
                        fprintf(stderr, "erresc: unknown str ");
@@ -1640,7 +2052,7 @@ strhandle(void) {
                }
                break;
        case 'k': /* old title set compatibility */
                }
                break;
        case 'k': /* old title set compatibility */
-               XStoreName(xw.dpy, xw.win, strescseq.buf);
+               xsettitle(strescseq.args[0]);
                break;
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
                break;
        case 'P': /* DSC -- Device Control String */
        case '_': /* APC -- Application Program Command */
@@ -1655,24 +2067,35 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {
-       /*
-        * TODO: Implement parsing like for CSI when required.
-        * Format: ESC type cmd ';' arg0 [';' argn] ESC \
-        */
-       return;
+       char *p = strescseq.buf;
+
+       strescseq.narg = 0;
+       strescseq.buf[strescseq.len] = '\0';
+       while(p && strescseq.narg < STR_ARG_SIZ)
+               strescseq.args[strescseq.narg++] = strsep(&p, ";");
 }
 
 void
 strdump(void) {
        int i;
 }
 
 void
 strdump(void) {
        int i;
+       uint c;
+
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; 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);
+               c = strescseq.buf[i] & 0xff;
+               if(c == '\0') {
+                       return;
+               } else if(isprint(c)) {
+                       putchar(c);
+               } else if(c == '\n') {
+                       printf("(\\n)");
+               } else if(c == '\r') {
+                       printf("(\\r)");
+               } else if(c == 0x1b) {
+                       printf("(\\e)");
+               } else {
+                       printf("(%02x)", c);
+               }
        }
        printf("ESC\\\n");
 }
        }
        printf("ESC\\\n");
 }
@@ -1700,64 +2123,137 @@ tputtab(bool forward) {
        tmoveto(x, term.c.y);
 }
 
        tmoveto(x, term.c.y);
 }
 
+void
+techo(char *buf, int len) {
+       for(; len > 0; buf++, len--) {
+               char c = *buf;
+
+               if(c == '\033') {               /* escape */
+                       tputc("^", 1);
+                       tputc("[", 1);
+               } else if(c < '\x20') { /* control code */
+                       if(c != '\n' && c != '\r' && c != '\t') {
+                               c |= '\x40';
+                               tputc("^", 1);
+                       }
+                       tputc(&c, 1);
+               } else {
+                       break;
+               }
+       }
+       if(len)
+               tputc(buf, len);
+}
+
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
+       bool control = ascii < '\x20' || ascii == 0177;
+
+       if(iofd != -1) {
+               if(xwrite(iofd, c, len) < 0) {
+                       fprintf(stderr, "Error writing in %s:%s\n",
+                               opt_io, strerror(errno));
+                       close(iofd);
+                       iofd = -1;
+               }
+       }
 
 
-       if(iofd != -1)
-               write(iofd, c, len);
-
-       switch(ascii) {
-       case '\t':
-               tputtab(1);
-               return;
-       case '\b':
-               tmoveto(term.c.x-1, term.c.y);
-               return;
-       case '\r':
-               tmoveto(0, term.c.y);
-               return;
-       case '\f':
-       case '\v':
-       case '\n':
-               /* go to first col if the mode is set */
-               tnewline(IS_SET(MODE_CRLF));
-               return;
-       case '\a':
-               if(term.esc & ESC_STR)
+       /*
+        * STR sequences must be checked before anything else
+        * because it can use some control codes as part of the sequence.
+        */
+       if(term.esc & ESC_STR) {
+               switch(ascii) {
+               case '\033':
+                       term.esc = ESC_START | ESC_STR_END;
                        break;
                        break;
-
-               if(!(xw.state & WIN_FOCUSED))
-                       xseturgency(1);
-               return;
-       case '\033':
-               csireset();
-               term.esc = ESC_START;
+               case '\a': /* backwards compatibility to xterm */
+                       term.esc = 0;
+                       strhandle();
+                       break;
+               default:
+                       if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
+                               memmove(&strescseq.buf[strescseq.len], c, len);
+                               strescseq.len += len;
+                       } else {
+                       /*
+                        * Here is a bug in terminals. If the user never sends
+                        * some code to stop the str or esc command, then st
+                        * will stop responding. But this is better than
+                        * silently failing with unknown characters. At least
+                        * then users will report back.
+                        *
+                        * In the case users ever get fixed, here is the code:
+                        */
+                       /*
+                        * term.esc = 0;
+                        * strhandle();
+                        */
+                       }
+               }
                return;
        }
 
                return;
        }
 
-       if(term.esc & ESC_START) {
+       /*
+        * Actions of control codes must be performed as soon they arrive
+        * because they can be embedded inside a control sequence, and
+        * they must not cause conflicts with sequences.
+        */
+       if(control) {
+               switch(ascii) {
+               case '\t':      /* HT */
+                       tputtab(1);
+                       return;
+               case '\b':      /* BS */
+                       tmoveto(term.c.x-1, term.c.y);
+                       return;
+               case '\r':      /* CR */
+                       tmoveto(0, term.c.y);
+                       return;
+               case '\f':      /* LF */
+               case '\v':      /* VT */
+               case '\n':      /* LF */
+                       /* go to first col if the mode is set */
+                       tnewline(IS_SET(MODE_CRLF));
+                       return;
+               case '\a':      /* BEL */
+                       if(!(xw.state & WIN_FOCUSED))
+                               xseturgency(1);
+                       return;
+               case '\033':    /* ESC */
+                       csireset();
+                       term.esc = ESC_START;
+                       return;
+               case '\016':    /* SO */
+               case '\017':    /* SI */
+                       /*
+                        * Different charsets are hard to handle. Applications
+                        * should use the right alt charset escapes for the
+                        * only reason they still exist: line drawing. The
+                        * rest is incompatible history st should not support.
+                        */
+                       return;
+               case '\032':    /* SUB */
+               case '\030':    /* CAN */
+                       csireset();
+                       return;
+               case '\005':    /* ENQ (IGNORED) */
+               case '\000':    /* NUL (IGNORED) */
+               case '\021':    /* XON (IGNORED) */
+               case '\023':    /* XOFF (IGNORED) */
+               case 0177:      /* DEL (IGNORED) */
+                       return;
+               }
+       } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
-                       if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) {
+                       if(BETWEEN(ascii, 0x40, 0x7E)
+                                       || csiescseq.len >= \
+                                       sizeof(csiescseq.buf)-1) {
                                term.esc = 0;
                                term.esc = 0;
-                               csiparse(), csihandle();
-                       }
-               } 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;
-                               strhandle();
-                               break;
-                       default:
-                               strescseq.buf[strescseq.len++] = ascii;
-                               if(strescseq.len+1 >= STR_BUF_SIZ) {
-                                       term.esc = 0;
-                                       strhandle();
-                               }
+                               csiparse();
+                               csihandle();
                        }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;
                        }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;
@@ -1781,11 +2277,25 @@ tputc(char *c, int len) {
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;
+               } else if(term.esc & ESC_TEST) {
+                       if(ascii == '8') { /* DEC screen alignment test. */
+                               char E[UTF_SIZ] = "E";
+                               int x, y;
+
+                               for(x = 0; x < term.col; ++x) {
+                                       for(y = 0; y < term.row; ++y)
+                                               tsetchar(E, &term.c.attr, x, y);
+                               }
+                       }
+                       term.esc = 0;
                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
+                       case '#':
+                               term.esc |= ESC_TEST;
+                               break;
                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */
                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */
@@ -1804,10 +2314,11 @@ tputc(char *c, int len) {
                                term.esc = 0;
                                break;
                        case 'D': /* IND -- Linefeed */
                                term.esc = 0;
                                break;
                        case 'D': /* IND -- Linefeed */
-                               if(term.c.y == term.bot)
+                               if(term.c.y == term.bot) {
                                        tscrollup(term.top, 1);
                                        tscrollup(term.top, 1);
-                               else
+                               } else {
                                        tmoveto(term.c.x, term.c.y+1);
                                        tmoveto(term.c.x, term.c.y+1);
+                               }
                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */
                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */
@@ -1819,16 +2330,20 @@ tputc(char *c, int len) {
                                term.esc = 0;
                                break;
                        case 'M': /* RI -- Reverse index */
                                term.esc = 0;
                                break;
                        case 'M': /* RI -- Reverse index */
-                               if(term.c.y == term.top)
+                               if(term.c.y == term.top) {
                                        tscrolldown(term.top, 1);
                                        tscrolldown(term.top, 1);
-                               else
+                               } else {
                                        tmoveto(term.c.x, term.c.y-1);
                                        tmoveto(term.c.x, term.c.y-1);
+                               }
+                               term.esc = 0;
+                               break;
+                       case 'Z': /* DECID -- Identify Terminal */
+                               ttywrite(VT102ID, sizeof(VT102ID) - 1);
                                term.esc = 0;
                                break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                                term.esc = 0;
                                break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
-                               xclearborders();
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
@@ -1852,31 +2367,50 @@ tputc(char *c, int len) {
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
-                                   (uchar) ascii, isprint(ascii)?ascii:'.');
+                                       (uchar) ascii, isprint(ascii)? ascii:'.');
                                term.esc = 0;
                        }
                }
                                term.esc = 0;
                        }
                }
+               /*
+                * All characters which form part of a sequence are not
+                * printed
+                */
+               return;
+       }
+       /*
+        * Display control codes only if we are in graphic mode
+        */
+       if(control && !(term.c.attr.mode & ATTR_GFX))
+               return;
+       if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+               sel.bx = -1;
+       if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+               term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+               tnewline(1);
+       }
+
+       if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col) {
+               memmove(&term.line[term.c.y][term.c.x+1],
+                       &term.line[term.c.y][term.c.x],
+                       (term.col - term.c.x - 1) * sizeof(Glyph));
+       }
+
+       tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+       if(term.c.x+1 < term.col) {
+               tmoveto(term.c.x+1, term.c.y);
        } else {
        } else {
-               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
-                       sel.bx = -1;
-               if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
-                       if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-                               tnewline(1); /* always go to first col */
-                       tsetchar(c);
-                       if(term.c.x+1 < term.col)
-                               tmoveto(term.c.x+1, term.c.y);
-                       else
-                               term.c.state |= CURSOR_WRAPNEXT;
-               }
+               term.c.state |= CURSOR_WRAPNEXT;
        }
 }
 
 int
 tresize(int col, int row) {
        }
 }
 
 int
 tresize(int col, int row) {
-       int i, x;
+       int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int slide = term.c.y - row + 1;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int slide = term.c.y - row + 1;
+       bool *bp;
+       Line *orig;
 
        if(col < 1 || row < 1)
                return 0;
 
        if(col < 1 || row < 1)
                return 0;
@@ -1884,9 +2418,11 @@ tresize(int col, int row) {
        /* free unneeded rows */
        i = 0;
        if(slide > 0) {
        /* free unneeded rows */
        i = 0;
        if(slide > 0) {
-               /* slide screen to keep cursor where we expect it -
+               /*
+                * slide screen to keep cursor where we expect it -
                 * tscrollup would work here, but we can optimize to
                 * tscrollup would work here, but we can optimize to
-                * memmove because we're freeing the earlier lines */
+                * memmove because we're freeing the earlier lines
+                */
                for(/* i = 0 */; i < slide; i++) {
                        free(term.line[i]);
                        free(term.alt[i]);
                for(/* i = 0 */; i < slide; i++) {
                        free(term.line[i]);
                        free(term.alt[i]);
@@ -1910,10 +2446,6 @@ tresize(int col, int row) {
                term.dirty[i] = 1;
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(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;
-               }
        }
 
        /* allocate any new rows */
        }
 
        /* allocate any new rows */
@@ -1923,74 +2455,129 @@ tresize(int col, int row) {
                term.alt [i] = xcalloc(col, sizeof(Glyph));
        }
        if(col > term.col) {
                term.alt [i] = xcalloc(col, sizeof(Glyph));
        }
        if(col > term.col) {
-               bool *bp = term.tabs + term.col;
+               bp = term.tabs + term.col;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)
                        /* nothing */ ;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)
                        /* nothing */ ;
-               for(bp += TAB; bp < term.tabs + col; bp += TAB)
+               for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
                        *bp = 1;
        }
        /* update terminal size */
                        *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);
+       term.col = col;
+       term.row = row;
        /* reset scrolling region */
        tsetscroll(0, row-1);
        /* reset scrolling region */
        tsetscroll(0, row-1);
+       /* make use of the LIMIT in tmoveto */
+       tmoveto(term.c.x, term.c.y);
+       /* Clearing both screens */
+       orig = term.line;
+       do {
+               if(mincol < col && 0 < minrow) {
+                       tclearregion(mincol, 0, col - 1, minrow - 1);
+               }
+               if(0 < col && minrow < row) {
+                       tclearregion(0, minrow, col - 1, row - 1);
+               }
+               tswapscreen();
+       } while(orig != term.line);
 
        return (slide > 0);
 }
 
 void
 xresize(int col, int row) {
 
        return (slide > 0);
 }
 
 void
 xresize(int col, int row) {
-       xw.tw = MAX(1, 2*BORDER + col * xw.cw);
-       xw.th = MAX(1, 2*BORDER + row * xw.ch);
+       xw.tw = MAX(1, col * xw.cw);
+       xw.th = MAX(1, row * xw.ch);
 
 
-       XftDrawChange(xw.xft_draw, xw.buf);
+       XFreePixmap(xw.dpy, xw.buf);
+       xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+                       DefaultDepth(xw.dpy, xw.scr));
+       XftDrawChange(xw.draw, xw.buf);
+       xclear(0, 0, xw.w, xw.h);
+}
+
+static inline ushort
+sixd_to_16bit(int x) {
+       return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
 void
 xloadcols(void) {
        int i, r, g, b;
 }
 
 void
 xloadcols(void) {
        int i, r, g, b;
-       XRenderColor xft_color = { .alpha = 0 };
+       XRenderColor color = { .alpha = 0xffff };
 
        /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
 
        /* 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])) {
+               if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
                        die("Could not allocate color '%s'\n", colorname[i]);
                }
        }
 
        /* load colors [16-255] ; same colors as xterm */
                        die("Could not allocate color '%s'\n", colorname[i]);
                }
        }
 
        /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++)
-               for(g = 0; g < 6; g++)
+       for(i = 16, r = 0; r < 6; r++) {
+               for(g = 0; g < 6; g++) {
                        for(b = 0; b < 6; b++) {
                        for(b = 0; b < 6; b++) {
-                               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])) {
+                               color.red = sixd_to_16bit(r);
+                               color.green = sixd_to_16bit(g);
+                               color.blue = sixd_to_16bit(b);
+                               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i])) {
                                        die("Could not allocate color %d\n", i);
                                }
                                i++;
                        }
                                        die("Could not allocate color %d\n", i);
                                }
                                i++;
                        }
+               }
+       }
 
        for(r = 0; r < 24; r++, i++) {
 
        for(r = 0; r < 24; r++, i++) {
-               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.xft_col[i] = dc.xft_col[256];
-                       fprintf(stderr, "Could not allocate color %d\n", i);
+               color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
+                                       &dc.col[i])) {
+                       die("Could not allocate color %d\n", i);
                }
        }
 }
 
                }
        }
 }
 
+int
+xsetcolorname(int x, const char *name) {
+       XRenderColor color = { .alpha = 0xffff };
+       Colour colour;
+       if (x < 0 || x > LEN(colorname))
+               return -1;
+       if(!name) {
+               if(16 <= x && x < 16 + 216) {
+                       int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
+                       color.red = sixd_to_16bit(r);
+                       color.green = sixd_to_16bit(g);
+                       color.blue = sixd_to_16bit(b);
+                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+                               return 0; /* something went wrong */
+                       dc.col[x] = colour;
+                       return 1;
+               } else if (16 + 216 <= x && x < 256) {
+                       color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
+                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
+                               return 0; /* something went wrong */
+                       dc.col[x] = colour;
+                       return 1;
+               } else {
+                       name = colorname[x];
+               }
+       }
+       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
+               return 0;
+       dc.col[x] = colour;
+       return 1;
+}
+
 void
 xtermclear(int col1, int row1, int col2, int row2) {
 void
 xtermclear(int col1, int row1, int col2, int row2) {
-       XftDrawRect(xw.xft_draw,
-                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
-                       BORDER + col1 * xw.cw,
-                       BORDER + row1 * xw.ch,
+       XftDrawRect(xw.draw,
+                       &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+                       borderpx + col1 * xw.cw,
+                       borderpx + row1 * xw.ch,
                        (col2-col1+1) * xw.cw,
                        (row2-row1+1) * xw.ch);
 }
                        (col2-col1+1) * xw.cw,
                        (row2-row1+1) * xw.ch);
 }
@@ -2000,26 +2587,14 @@ xtermclear(int col1, int row1, int col2, int row2) {
  */
 void
 xclear(int x1, int y1, int x2, int y2) {
  */
 void
 xclear(int x1, int y1, int x2, int y2) {
-       XftDrawRect(xw.xft_draw,
-                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+       XftDrawRect(xw.draw,
+                       &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
                        x1, y1, x2-x1, y2-y1);
 }
 
                        x1, y1, x2-x1, y2-y1);
 }
 
-void
-xclearborders(void) {
-       /* top and left border */
-       xclear(0, 0, BORDER, xw.h);
-       xclear(0, 0, xw.w, BORDER);
-
-       /* lower and right border */
-       xclear(BORDER, xw.th - 1, xw.w, xw.h);
-       /* Will just draw what hasn't been drawn by the previous call. */
-       xclear(xw.tw - 1, BORDER, xw.w, xw.h - xw.th - 2);
-}
-
 void
 xhints(void) {
 void
 xhints(void) {
-       XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
+       XClassHint class = {opt_class ? opt_class : termname, termname};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints *sizeh = NULL;
 
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints *sizeh = NULL;
 
@@ -2030,8 +2605,8 @@ xhints(void) {
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;
-               sizeh->base_height = 2*BORDER;
-               sizeh->base_width = 2*BORDER;
+               sizeh->base_height = 2 * borderpx;
+               sizeh->base_width = 2 * borderpx;
        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;
        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;
@@ -2042,44 +2617,144 @@ xhints(void) {
        XFree(sizeh);
 }
 
        XFree(sizeh);
 }
 
-void
-xinitfont(Font *f, char *fontstr) {
-       f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr);
+int
+xloadfont(Font *f, FcPattern *pattern) {
+       FcPattern *match;
+       FcResult result;
+
+       match = FcFontMatch(NULL, pattern, &result);
+       if(!match)
+               return 1;
+
+       if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) {
+               FcPatternDestroy(match);
+               return 1;
+       }
 
 
-       if(!f->xft_set)
-               die("st: can't open font %s.\n", fontstr);
+       if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+               FcPatternDestroy(match);
+               return 1;
+       }
+
+       f->pattern = FcPatternDuplicate(pattern);
 
 
-       f->ascent = f->xft_set->ascent;
-       f->descent = f->xft_set->descent;
+       f->ascent = f->match->ascent;
+       f->descent = f->match->descent;
        f->lbearing = 0;
        f->lbearing = 0;
-       f->rbearing = f->xft_set->max_advance_width;
+       f->rbearing = f->match->max_advance_width;
+
+       f->height = f->ascent + f->descent;
+       f->width = f->lbearing + f->rbearing;
+
+       return 0;
 }
 
 void
 }
 
 void
-initfonts(char *fontstr) {
-       char *fstr;
+xloadfonts(char *fontstr, int fontsize) {
+       FcPattern *pattern;
+       FcResult result;
+       double fontval;
 
 
-       xinitfont(&dc.font, fontstr);
+       if(fontstr[0] == '-') {
+               pattern = XftXlfdParse(fontstr, False, False);
+       } else {
+               pattern = FcNameParse((FcChar8 *)fontstr);
+       }
 
 
-       fstr = smstrcat(fontstr, ":weight=bold", NULL);
-       xinitfont(&dc.bfont, fstr);
-       free(fstr);
+       if(!pattern)
+               die("st: can't open font %s\n", fontstr);
 
 
-       fstr = smstrcat(fontstr, ":slant=italic,oblique", NULL);
-       xinitfont(&dc.ifont, fstr);
-       free(fstr);
+       if(fontsize > 0) {
+               FcPatternDel(pattern, FC_PIXEL_SIZE);
+               FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
+               usedfontsize = fontsize;
+       } else {
+               result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
+               if(result == FcResultMatch) {
+                       usedfontsize = (int)fontval;
+               } else {
+                       /*
+                        * Default font size is 12, if none given. This is to
+                        * have a known usedfontsize value.
+                        */
+                       FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
+                       usedfontsize = 12;
+               }
+       }
+
+       FcConfigSubstitute(0, pattern, FcMatchPattern);
+       FcDefaultSubstitute(pattern);
+
+       if(xloadfont(&dc.font, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       /* Setting character width and height. */
+       xw.cw = dc.font.width;
+       xw.ch = dc.font.height;
+
+       FcPatternDel(pattern, FC_SLANT);
+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+       if(xloadfont(&dc.ifont, pattern))
+               die("st: can't open font %s\n", fontstr);
 
 
-       fstr = smstrcat(fontstr, ":weight=bold:slant=italic,oblique", NULL);
-       xinitfont(&dc.ibfont, fstr);
-       free(fstr);
+       FcPatternDel(pattern, FC_WEIGHT);
+       FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+       if(xloadfont(&dc.ibfont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDel(pattern, FC_SLANT);
+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
+       if(xloadfont(&dc.bfont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDestroy(pattern);
+}
+
+void
+xunloadfonts(void) {
+       int i, ip;
+
+       /*
+        * Free the loaded fonts in the font cache. This is done backwards
+        * from the frccur.
+        */
+       for(i = 0, ip = frccur; i < frclen; i++, ip--) {
+               if(ip < 0)
+                       ip = LEN(frc) - 1;
+               XftFontClose(xw.dpy, frc[ip].font);
+       }
+       frccur = -1;
+       frclen = 0;
+
+       XftFontClose(xw.dpy, dc.font.match);
+       FcPatternDestroy(dc.font.pattern);
+       FcFontSetDestroy(dc.font.set);
+       XftFontClose(xw.dpy, dc.bfont.match);
+       FcPatternDestroy(dc.bfont.pattern);
+       FcFontSetDestroy(dc.bfont.set);
+       XftFontClose(xw.dpy, dc.ifont.match);
+       FcPatternDestroy(dc.ifont.pattern);
+       FcFontSetDestroy(dc.ifont.set);
+       XftFontClose(xw.dpy, dc.ibfont.match);
+       FcPatternDestroy(dc.ibfont.pattern);
+       FcFontSetDestroy(dc.ibfont.set);
+}
+
+void
+xzoom(const Arg *arg) {
+       xunloadfonts();
+       xloadfonts(usedfont, usedfontsize + arg->i);
+       cresize(0, 0);
+       redraw(0);
 }
 
 void
 xinit(void) {
        XSetWindowAttributes attrs;
 }
 
 void
 xinit(void) {
        XSetWindowAttributes attrs;
+       XGCValues gcvalues;
        Cursor cursor;
        Window parent;
        Cursor cursor;
        Window parent;
-       int sw, sh, major, minor;
+       int sw, sh;
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
@@ -2087,11 +2762,11 @@ xinit(void) {
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
-       initfonts(FONT);
+       if(!FcInit())
+               die("Could not init fontconfig.\n");
 
 
-       /* XXX: Assuming same size for bold font */
-       xw.cw = dc.font.rbearing - dc.font.lbearing;
-       xw.ch = dc.font.ascent + dc.font.descent;
+       usedfont = (opt_font == NULL)? font : opt_font;
+       xloadfonts(usedfont, 0);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
@@ -2110,21 +2785,23 @@ xinit(void) {
                xw.w = xw.fw;
        } else {
                /* window - default size */
                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.h = 2 * borderpx + term.row * xw.ch;
+               xw.w = 2 * borderpx + term.col * xw.cw;
                xw.fx = 0;
                xw.fy = 0;
        }
 
                xw.fx = 0;
                xw.fy = 0;
        }
 
-       attrs.background_pixel = dc.xft_col[DefaultBG].pixel;
-       attrs.border_pixel = dc.xft_col[DefaultBG].pixel;
+       /* Events */
+       attrs.background_pixel = dc.col[defaultbg].pixel;
+       attrs.border_pixel = dc.col[defaultbg].pixel;
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        attrs.colormap = xw.cmap;
 
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        attrs.colormap = xw.cmap;
 
-       parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+       parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
+                       XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis,
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis,
@@ -2132,21 +2809,35 @@ xinit(void) {
                        | CWColormap,
                        &attrs);
 
                        | CWColormap,
                        &attrs);
 
-       /* double buffering */
-       if(!XdbeQueryExtension(xw.dpy, &major, &minor))
-               die("Xdbe extension is not present\n");
-       xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
+       memset(&gcvalues, 0, sizeof(gcvalues));
+       gcvalues.graphics_exposures = False;
+       dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+                       &gcvalues);
+       xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.w, xw.h,
+                       DefaultDepth(xw.dpy, xw.scr));
+       XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
+       XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
 
        /* Xft rendering context */
 
        /* Xft rendering context */
-       xw.xft_draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
+       xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */
 
        /* input methods */
-       xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
+       if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+               XSetLocaleModifiers("@im=local");
+               if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+                       XSetLocaleModifiers("@im=");
+                       if((xw.xim = XOpenIM(xw.dpy,
+                                       NULL, NULL, NULL)) == NULL) {
+                               die("XOpenIM failed. Could not open input"
+                                       " device.\n");
+                       }
+               }
+       }
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);
-       /* gc */
-       dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);
+       if(xw.xic == NULL)
+               die("XCreateIC failed. Could not obtain input method.\n");
 
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
 
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
@@ -2156,6 +2847,8 @@ xinit(void) {
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+       xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+       XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
@@ -2165,99 +2858,326 @@ 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) {
-       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;
+       int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
+           width = charlen * xw.cw, xp, i;
+       int frp, frcflags;
+       int u8fl, u8fblen, u8cblen, doesexist;
+       char *u8c, *u8fs;
+       long u8char;
        Font *font = &dc.font;
        Font *font = &dc.font;
-       XGlyphInfo extents;
+       FcResult fcres;
+       FcPattern *fcpattern, *fontpattern;
+       FcFontSet *fcsets[] = { NULL };
+       FcCharSet *fccharset;
+       Colour *fg, *bg, *temp, revfg, revbg;
+       XRenderColor colfg, colbg;
+       Rectangle r;
+
+       frcflags = FRC_NORMAL;
+
+       if(base.mode & ATTR_ITALIC) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultitalic;
+               font = &dc.ifont;
+               frcflags = FRC_ITALIC;
+       } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultitalic;
+               font = &dc.ibfont;
+               frcflags = FRC_ITALICBOLD;
+       } else if(base.mode & ATTR_UNDERLINE) {
+               if(base.fg == defaultfg)
+                       base.fg = defaultunderline;
+       }
+       fg = &dc.col[base.fg];
+       bg = &dc.col[base.bg];
+
+       if(base.mode & ATTR_BOLD) {
+               if(BETWEEN(base.fg, 0, 7)) {
+                       /* basic system colors */
+                       fg = &dc.col[base.fg + 8];
+               } else if(BETWEEN(base.fg, 16, 195)) {
+                       /* 256 colors */
+                       fg = &dc.col[base.fg + 36];
+               } else if(BETWEEN(base.fg, 232, 251)) {
+                       /* greyscale */
+                       fg = &dc.col[base.fg + 4];
+               }
+               /*
+                * Those ranges will not be brightened:
+                *      8 - 15 – bright system colors
+                *      196 - 231 – highest 256 color cube
+                *      252 - 255 – brightest colors in greyscale
+                */
+               font = &dc.bfont;
+               frcflags = FRC_BOLD;
+       }
 
 
-       /* only switch default fg/bg if term is in RV mode */
        if(IS_SET(MODE_REVERSE)) {
        if(IS_SET(MODE_REVERSE)) {
-               if(fg == DefaultFG)
-                       fg = DefaultBG;
-               if(bg == DefaultBG)
-                       bg = DefaultFG;
+               if(fg == &dc.col[defaultfg]) {
+                       fg = &dc.col[defaultbg];
+               } else {
+                       colfg.red = ~fg->color.red;
+                       colfg.green = ~fg->color.green;
+                       colfg.blue = ~fg->color.blue;
+                       colfg.alpha = fg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       fg = &revfg;
+               }
+
+               if(bg == &dc.col[defaultbg]) {
+                       bg = &dc.col[defaultfg];
+               } else {
+                       colbg.red = ~bg->color.red;
+                       colbg.green = ~bg->color.green;
+                       colbg.blue = ~bg->color.blue;
+                       colbg.alpha = bg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       bg = &revbg;
+               }
        }
 
        }
 
-       if(base.mode & ATTR_REVERSE)
-               temp = fg, fg = bg, bg = temp;
+       if(base.mode & ATTR_REVERSE) {
+               temp = fg;
+               fg = bg;
+               bg = temp;
+       }
 
 
-       if(base.mode & ATTR_BOLD) {
-               fg += 8;
-               font = &dc.bfont;
+       if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+               fg = bg;
+
+       /* Intelligent cleaning up of the borders. */
+       if(x == 0) {
+               xclear(0, (y == 0)? 0 : winy, borderpx,
+                       winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
+       }
+       if(x + charlen >= term.col) {
+               xclear(winx + width, (y == 0)? 0 : winy, xw.w,
+                       ((y >= term.row-1)? xw.h : (winy + xw.ch)));
        }
        }
+       if(y == 0)
+               xclear(winx, 0, winx + width, borderpx);
+       if(y == term.row-1)
+               xclear(winx, winy + xw.ch, winx + width, xw.h);
+
+       /* Clean up the region we want to draw to. */
+       XftDrawRect(xw.draw, bg, winx, winy, width, xw.ch);
+
+       /* Set the clip region because Xft is sometimes dirty. */
+       r.x = 0;
+       r.y = 0;
+       r.height = xw.ch;
+       r.width = width;
+       XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
+
+       fcsets[0] = font->set;
+       for(xp = winx; bytelen > 0;) {
+               /*
+                * Search for the range in the to be printed string of glyphs
+                * that are in the main font. Then print that range. If
+                * some glyph is found that is not in the font, do the
+                * fallback dance.
+                */
+               u8fs = s;
+               u8fblen = 0;
+               u8fl = 0;
+               for(;;) {
+                       u8c = s;
+                       u8cblen = utf8decode(s, &u8char);
+                       s += u8cblen;
+                       bytelen -= u8cblen;
+
+                       doesexist = XftCharIndex(xw.dpy, font->match, u8char);
+                       if(!doesexist || bytelen <= 0) {
+                               if(bytelen <= 0) {
+                                       if(doesexist) {
+                                               u8fl++;
+                                               u8fblen += u8cblen;
+                                       }
+                               }
 
 
-       if(base.mode & ATTR_ITALIC)
-               font = &dc.ifont;
-       if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
-               font = &dc.ibfont;
+                               if(u8fl > 0) {
+                                       XftDrawStringUtf8(xw.draw, fg,
+                                                       font->match, xp,
+                                                       winy + font->ascent,
+                                                       (FcChar8 *)u8fs,
+                                                       u8fblen);
+                                       xp += font->width * u8fl;
 
 
-       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);
+                               }
+                               break;
+                       }
+
+                       u8fl++;
+                       u8fblen += u8cblen;
+               }
+               if(doesexist)
+                       break;
+
+               frp = frccur;
+               /* Search the font cache. */
+               for(i = 0; i < frclen; i++, frp--) {
+                       if(frp <= 0)
+                               frp = LEN(frc) - 1;
+
+                       if(frc[frp].c == u8char
+                                       && frc[frp].flags == frcflags) {
+                               break;
+                       }
+               }
+
+               /* Nothing was found. */
+               if(i >= frclen) {
+                       /*
+                        * Nothing was found in the cache. Now use
+                        * some dozen of Fontconfig calls to get the
+                        * font for one single character.
+                        */
+                       fcpattern = FcPatternDuplicate(font->pattern);
+                       fccharset = FcCharSetCreate();
+
+                       FcCharSetAddChar(fccharset, u8char);
+                       FcPatternAddCharSet(fcpattern, FC_CHARSET,
+                                       fccharset);
+                       FcPatternAddBool(fcpattern, FC_SCALABLE,
+                                       FcTrue);
+
+                       FcConfigSubstitute(0, fcpattern,
+                                       FcMatchPattern);
+                       FcDefaultSubstitute(fcpattern);
+
+                       fontpattern = FcFontSetMatch(0, fcsets,
+                                       FcTrue, fcpattern, &fcres);
+
+                       /*
+                        * Overwrite or create the new cache entry.
+                        */
+                       frccur++;
+                       frclen++;
+                       if(frccur >= LEN(frc))
+                               frccur = 0;
+                       if(frclen > LEN(frc)) {
+                               frclen = LEN(frc);
+                               XftFontClose(xw.dpy, frc[frccur].font);
+                       }
+
+                       frc[frccur].font = XftFontOpenPattern(xw.dpy,
+                                       fontpattern);
+                       frc[frccur].c = u8char;
+                       frc[frccur].flags = frcflags;
+
+                       FcPatternDestroy(fcpattern);
+                       FcCharSetDestroy(fccharset);
+
+                       frp = frccur;
+               }
+
+               XftDrawStringUtf8(xw.draw, fg, frc[frp].font,
+                               xp, winy + frc[frp].font->ascent,
+                               (FcChar8 *)u8c, u8cblen);
+
+               xp += font->width;
+       }
+
+       /*
+       XftDrawStringUtf8(xw.draw, fg, font->set, winx,
+                       winy + font->ascent, (FcChar8 *)s, bytelen);
+       */
 
        if(base.mode & ATTR_UNDERLINE) {
 
        if(base.mode & ATTR_UNDERLINE) {
-               XftDrawRect(xw.xft_draw, &dc.xft_col[fg], winx, winy+1,
+               XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }
                                width, 1);
        }
+
+       /* Reset clip to none. */
+       XftDrawSetClip(xw.draw, 0);
 }
 
 void
 xdrawcursor(void) {
 }
 
 void
 xdrawcursor(void) {
-       static int oldx = 0;
-       static int oldy = 0;
+       static int oldx = 0, oldy = 0;
        int sl;
        int sl;
-       Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
+       Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
 
        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);
+       memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        /* remove the old cursor */
 
        /* remove the old cursor */
-       if(term.line[oldy][oldx].state & GLYPH_SET) {
-               sl = utf8size(term.line[oldy][oldx].c);
-               xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
-       } else
-               xtermclear(oldx, oldy, oldx, oldy);
+       sl = utf8size(term.line[oldy][oldx].c);
+       xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
+                       oldy, 1, sl);
 
        /* draw the new one */
 
        /* draw the new one */
-       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_HIDE))) {
+               if(xw.state & WIN_FOCUSED) {
+                       if(IS_SET(MODE_REVERSE)) {
+                               g.mode |= ATTR_REVERSE;
+                               g.fg = defaultcs;
+                               g.bg = defaultfg;
+                       }
 
 
-               sl = utf8size(g.c);
-               xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
+                       sl = utf8size(g.c);
+                       xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
+               } else {
+                       XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + term.c.y * xw.ch,
+                                       xw.cw - 1, 1);
+                       XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + term.c.y * xw.ch,
+                                       1, xw.ch - 1);
+                       XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                       borderpx + (term.c.x + 1) * xw.cw - 1,
+                                       borderpx + term.c.y * xw.ch,
+                                       1, xw.ch - 1);
+                       XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + (term.c.y + 1) * xw.ch - 1,
+                                       xw.cw, 1);
+               }
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
+
+void
+xsettitle(char *p) {
+       XTextProperty prop;
+
+       Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+                       &prop);
+       XSetWMName(xw.dpy, xw.win, &prop);
+}
+
 void
 xresettitle(void) {
 void
 xresettitle(void) {
-       XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+       xsettitle(opt_title ? opt_title : "st");
 }
 
 void
 }
 
 void
-redraw(void) {
-       struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
+redraw(int timeout) {
+       struct timespec tv = {0, timeout * 1000};
 
 
-       xclearborders();
        tfulldirt();
        draw();
        tfulldirt();
        draw();
-       XSync(xw.dpy, False); /* necessary for a good tput flash */
-       nanosleep(&tv, NULL);
+
+       if(timeout > 0) {
+               nanosleep(&tv, NULL);
+               XSync(xw.dpy, False); /* necessary for a good tput flash */
+       }
 }
 
 void
 draw(void) {
 }
 
 void
 draw(void) {
-       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);
+       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
+                       xw.h, 0, 0);
+       XSetForeground(xw.dpy, dc.gc,
+                       dc.col[IS_SET(MODE_REVERSE)?
+                               defaultfg : defaultbg].pixel);
 }
 
 void
 }
 
 void
@@ -2265,39 +3185,40 @@ 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);
+       bool ena_sel = sel.bx != -1;
 
 
-       if((sel.alt && !alt) || (!sel.alt && alt))
+       if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
                ena_sel = 0;
                ena_sel = 0;
+
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;
+
                xtermclear(0, y, term.col, y);
                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
                xtermclear(0, y, term.col, y);
                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
-                       if(ena_sel && *(new.c) && selected(x, y))
+                       if(ena_sel && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
                                new.mode ^= ATTR_REVERSE;
-                       if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-                                                 ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+                       if(ib > 0 && (ATTRCMP(base, new)
+                                       || 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;
                        }
-                       if(new.state & GLYPH_SET) {
-                               if(ib == 0) {
-                                       ox = x;
-                                       base = new;
-                               }
-                               sl = utf8size(new.c);
-                               memcpy(buf+ib, new.c, sl);
-                               ib += sl;
-                               ++ic;
+                       if(ib == 0) {
+                               ox = x;
+                               base = new;
                        }
                        }
+
+                       sl = utf8size(new.c);
+                       memcpy(buf+ib, new.c, sl);
+                       ib += sl;
+                       ++ic;
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);
@@ -2308,20 +3229,24 @@ drawregion(int x1, int y1, int x2, int y2) {
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
+
        if(xw.state & WIN_REDRAW) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
        if(xw.state & WIN_REDRAW) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
+       redraw(0);
 }
 
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
 }
 
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
-       if(e->state == VisibilityFullyObscured)
+
+       if(e->state == VisibilityFullyObscured) {
                xw.state &= ~WIN_VISIBLE;
                xw.state &= ~WIN_VISIBLE;
-       else if(!(xw.state & WIN_VISIBLE))
+       } else if(!(xw.state & WIN_VISIBLE)) {
                /* need a full redraw for next Expose, not just a buf copy */
                xw.state |= WIN_VISIBLE | WIN_REDRAW;
                /* need a full redraw for next Expose, not just a buf copy */
                xw.state |= WIN_VISIBLE | WIN_REDRAW;
+       }
 }
 
 void
 }
 
 void
@@ -2332,6 +3257,7 @@ unmap(XEvent *ev) {
 void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
+
        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
@@ -2339,22 +3265,87 @@ xseturgency(int add) {
 
 void
 focus(XEvent *ev) {
 
 void
 focus(XEvent *ev) {
+       XFocusChangeEvent *e = &ev->xfocus;
+
+       if(e->mode == NotifyGrab)
+               return;
+
        if(ev->type == FocusIn) {
        if(ev->type == FocusIn) {
+               XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
-       } else
+       } else {
+               XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;
                xw.state &= ~WIN_FOCUSED;
+       }
+}
+
+inline bool
+match(uint mask, uint state) {
+       state &= ~(ignoremod);
+
+       if(mask == XK_NO_MOD && state)
+               return false;
+       if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
+               return false;
+       if((state & mask) != state)
+               return false;
+       return true;
+}
+
+void
+numlock(const Arg *dummy) {
+       term.numlock ^= 1;
 }
 
 char*
 kmap(KeySym k, uint state) {
 }
 
 char*
 kmap(KeySym k, uint state) {
+       uint mask;
+       Key *kp;
        int i;
        int i;
-       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;
+
+       /* Check for mapped keys out of X11 function keys. */
+       for(i = 0; i < LEN(mappedkeys); i++) {
+               if(mappedkeys[i] == k)
+                       break;
+       }
+       if(i == LEN(mappedkeys)) {
+               if((k & 0xFFFF) < 0xFD00)
+                       return NULL;
+       }
+
+       for(kp = key; kp < key + LEN(key); kp++) {
+               mask = kp->mask;
+
+               if(kp->k != k)
+                       continue;
+
+               if(!match(mask, state))
+                       continue;
+
+               if(kp->appkey > 0) {
+                       if(!IS_SET(MODE_APPKEYPAD))
+                               continue;
+                       if(term.numlock && kp->appkey == 2)
+                               continue;
+               } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+                       continue;
+               }
+
+               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
+                               (kp->appcursor > 0
+                                && !IS_SET(MODE_APPCURSOR))) {
+                       continue;
+               }
+
+               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
+                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+                       continue;
+               }
+
+               return kp->s;
        }
        }
+
        return NULL;
 }
 
        return NULL;
 }
 
@@ -2362,58 +3353,63 @@ void
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
-       char buf[32];
-       char *customkey;
-       int len;
-       int meta;
-       int shift;
+       char xstr[31], buf[32], *customkey, *cp = buf;
+       int len, ret;
+       long c;
        Status status;
        Status status;
+       Shortcut *bp;
 
 
-       if (IS_SET(MODE_KBDLOCK))
+       if(IS_SET(MODE_KBDLOCK))
                return;
                return;
-       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));
-       /* 2. hardcoded (overrides X lookup) */
-       else
-               switch(ksym) {
-               case XK_Up:
-               case XK_Down:
-               case XK_Left:
-               case XK_Right:
-                       /* XXX: shift up/down doesn't work */
-                       sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
-                       ttywrite(buf, 3);
-                       break;
-               case XK_Insert:
-                       if(shift)
-                               selpaste();
-                       break;
-               case XK_Return:
-                       if(IS_SET(MODE_CRLF))
-                               ttywrite("\r\n", 2);
-                       else
-                               ttywrite("\r", 1);
-                       break;
-                       /* 3. X lookup  */
-               default:
-                       if(len > 0) {
-                               if(meta && len == 1)
-                                       ttywrite("\033", 1);
-                               ttywrite(buf, len);
+
+       len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
+       e->state &= ~Mod2Mask;
+       /* 1. shortcuts */
+       for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+               if(ksym == bp->keysym && match(bp->mod, e->state)) {
+                       bp->func(&(bp->arg));
+                       return;
+               }
+       }
+
+       /* 2. custom keys from config.h */
+       if((customkey = kmap(ksym, e->state))) {
+               len = strlen(customkey);
+               memcpy(buf, customkey, len);
+       /* 3. hardcoded (overrides X lookup) */
+       } else {
+               if(len == 0)
+                       return;
+
+               if(len == 1 && e->state & Mod1Mask) {
+                       if(IS_SET(MODE_8BIT)) {
+                               if(*xstr < 0177) {
+                                       c = *xstr | B7;
+                                       ret = utf8encode(&c, cp);
+                                       cp += ret;
+                                       len = 0;
+                               }
+                       } else {
+                               *cp++ = '\033';
                        }
                        }
-                       break;
                }
                }
+
+               memcpy(cp, xstr, len);
+               len = cp - buf + len;
+       }
+
+       ttywrite(buf, len);
+       if(IS_SET(MODE_ECHO))
+               techo(buf, len);
 }
 
 }
 
+
 void
 cmessage(XEvent *e) {
 void
 cmessage(XEvent *e) {
-       /* See xembed specs
-          http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
+       /*
+        * 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;
        if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
                if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
                        xw.state |= WIN_FOCUSED;
@@ -2421,138 +3417,196 @@ cmessage(XEvent *e) {
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
+       } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+               /* Send SIGHUP to shell */
+               kill(pid, SIGHUP);
+               exit(EXIT_SUCCESS);
        }
 }
 
 void
        }
 }
 
 void
-resize(XEvent *e) {
+cresize(int width, int height) {
        int col, row;
 
        int col, row;
 
-       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
-               return;
+       if(width != 0)
+               xw.w = width;
+       if(height != 0)
+               xw.h = height;
 
 
-       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;
+       col = (xw.w - 2 * borderpx) / xw.cw;
+       row = (xw.h - 2 * borderpx) / xw.ch;
 
        tresize(col, row);
        xresize(col, row);
 
        tresize(col, row);
        xresize(col, row);
-       xclearborders();
        ttyresize();
 }
 
        ttyresize();
 }
 
+void
+resize(XEvent *e) {
+       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+               return;
+
+       cresize(e->xconfigure.width, e->xconfigure.height);
+}
+
 void
 run(void) {
        XEvent ev;
        fd_set rfd;
 void
 run(void) {
        XEvent ev;
        fd_set rfd;
-       int xfd = XConnectionNumber(xw.dpy), i;
-       struct timeval drawtimeout, *tv = NULL;
+       int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
+       struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+
+       gettimeofday(&lastblink, NULL);
+       gettimeofday(&last, NULL);
 
 
-       for(i = 0;; i++) {
+       for(xev = actionfps;;) {
                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, tv) < 0) {
+
+               switch(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
+               case -1:
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
-               }
-
-               /*
-                * 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();
+               default:
+                       if(FD_ISSET(cmdfd, &rfd)) {
+                               ttyread();
+                               if(blinktimeout) {
+                                       blinkset = tattrset(ATTR_BLINK);
+                                       if(!blinkset && term.mode & ATTR_BLINK)
+                                               term.mode &= ~(MODE_BLINK);
+                               }
+                       }
 
 
-                       /*
-                        * 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;
+                       if(FD_ISSET(xfd, &rfd))
+                               xev = actionfps;
+                       break;
                }
                }
-               i = 0;
-               tv = NULL;
-
-               while(XPending(xw.dpy)) {
-                       XNextEvent(xw.dpy, &ev);
-                       if(XFilterEvent(&ev, xw.win))
-                               continue;
-                       if(handler[ev.type])
-                               (handler[ev.type])(&ev);
+               gettimeofday(&now, NULL);
+               drawtimeout.tv_sec = 0;
+               drawtimeout.tv_usec = (1000/xfps) * 1000;
+               tv = &drawtimeout;
+
+               dodraw = 0;
+               if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+                       tsetdirtattr(ATTR_BLINK);
+                       term.mode ^= MODE_BLINK;
+                       gettimeofday(&lastblink, NULL);
+                       dodraw = 1;
+               }
+               if(TIMEDIFF(now, last) \
+                               > (xev? (1000/xfps) : (1000/actionfps))) {
+                       dodraw = 1;
+                       last = now;
                }
 
                }
 
-               draw();
-               XFlush(xw.dpy);
+               if(dodraw) {
+                       while(XPending(xw.dpy)) {
+                               XNextEvent(xw.dpy, &ev);
+                               if(XFilterEvent(&ev, None))
+                                       continue;
+                               if(handler[ev.type])
+                                       (handler[ev.type])(&ev);
+                       }
+
+                       draw();
+                       XFlush(xw.dpy);
+
+                       if(xev && !FD_ISSET(xfd, &rfd))
+                               xev--;
+                       if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+                               if(blinkset) {
+                                       if(TIMEDIFF(now, lastblink) \
+                                                       > blinktimeout) {
+                                               drawtimeout.tv_usec = 1;
+                                       } else {
+                                               drawtimeout.tv_usec = (1000 * \
+                                                       (blinktimeout - \
+                                                       TIMEDIFF(now,
+                                                               lastblink)));
+                                       }
+                               } else {
+                                       tv = NULL;
+                               }
+                       }
+               }
        }
 }
 
        }
 }
 
+void
+usage(void) {
+       die("%s " VERSION " (c) 2010-2013 st engineers\n" \
+       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+       " [-t title] [-w windowid] [-e command ...]\n", argv0);
+}
+
 int
 main(int argc, char *argv[]) {
 int
 main(int argc, char *argv[]) {
-       int i, bitm, xr, yr;
+       int bitm, xr, yr;
        uint wr, hr;
 
        xw.fw = xw.fh = xw.fx = xw.fy = 0;
        xw.isfixed = False;
 
        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':
-                       if(++i < argc) opt_title = argv[i];
-                       break;
-               case 'c':
-                       if(++i < argc) opt_class = argv[i];
-                       break;
-               case 'w':
-                       if(++i < argc) opt_embed = argv[i];
-                       break;
-               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;
-               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);
-               }
-       }
+       ARGBEGIN {
+       case 'a':
+               allowaltscreen = false;
+               break;
+       case 'c':
+               opt_class = EARGF(usage());
+               break;
+       case 'e':
+               /* eat all remaining arguments */
+               if(argc > 1)
+                       opt_cmd = &argv[1];
+               goto run;
+       case 'f':
+               opt_font = EARGF(usage());
+               break;
+       case 'g':
+               bitm = XParseGeometry(EARGF(usage()), &xr, &yr, &wr, &hr);
+               if(bitm & XValue)
+                       xw.fx = xr;
+               if(bitm & YValue)
+                       xw.fy = yr;
+               if(bitm & WidthValue)
+                       xw.fw = (int)wr;
+               if(bitm & HeightValue)
+                       xw.fh = (int)hr;
+               if(bitm & XNegative && xw.fx == 0)
+                       xw.fx = -1;
+               if(bitm & XNegative && xw.fy == 0)
+                       xw.fy = -1;
+
+               if(xw.fh != 0 && xw.fw != 0)
+                       xw.isfixed = True;
+               break;
+       case 'o':
+               opt_io = EARGF(usage());
+               break;
+       case 't':
+               opt_title = EARGF(usage());
+               break;
+       case 'w':
+               opt_embed = EARGF(usage());
+               break;
+       case 'v':
+       default:
+               usage();
+       } ARGEND;
 
 
- run:
+run:
        setlocale(LC_CTYPE, "");
        setlocale(LC_CTYPE, "");
+       XSetLocaleModifiers("");
        tnew(80, 24);
        tnew(80, 24);
-       ttynew();
        xinit();
        xinit();
+       ttynew();
        selinit();
        selinit();
+       if(xw.isfixed)
+               cresize(xw.h, xw.w);
        run();
        run();
+
        return 0;
 }
 
        return 0;
 }