Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
Monotonic clock cannot jump backwards.
[st.git] / st.c
diff --git a/st.c b/st.c
index 6e7077a..c7589f4 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,4 +1,4 @@
-/* See LICENSE for licence details. */
+/* See LICENSE for license details. */
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -27,6 +27,7 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
+#include <X11/XKBlib.h>
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
@@ -36,10 +37,6 @@ 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>
@@ -55,6 +52,7 @@ char *argv0;
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
+#define UTF_INVALID   0xFFFD
 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
@@ -65,20 +63,20 @@ char *argv0;
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
-#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
-
 /* macros */
 /* macros */
-#define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
-#define LEN(a)     (sizeof(a) / sizeof(a[0]))
+#define LEN(a)     (sizeof(a) / sizeof(a)[0])
 #define DEFAULT(a, b)     (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define DEFAULT(a, b)     (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
+#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')
+#define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
+#define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
 #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)) != 0)
 #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)) != 0)
-#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
-#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)
+#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)    (1 << 24 & (x))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)    (1 << 24 & (x))
@@ -87,19 +85,19 @@ char *argv0;
 #define TRUEBLUE(x)      (((x) & 0xff) << 8)
 
 
 #define TRUEBLUE(x)      (((x) & 0xff) << 8)
 
 
-#define VT102ID "\033[?6c"
-
 enum glyph_attribute {
        ATTR_NULL      = 0,
 enum glyph_attribute {
        ATTR_NULL      = 0,
-       ATTR_REVERSE   = 1,
-       ATTR_UNDERLINE = 2,
-       ATTR_BOLD      = 4,
-       ATTR_GFX       = 8,
-       ATTR_ITALIC    = 16,
-       ATTR_BLINK     = 32,
-       ATTR_WRAP      = 64,
-       ATTR_WIDE      = 128,
-       ATTR_WDUMMY    = 256,
+       ATTR_BOLD      = 1 << 0,
+       ATTR_FAINT     = 1 << 1,
+       ATTR_ITALIC    = 1 << 2,
+       ATTR_UNDERLINE = 1 << 3,
+       ATTR_BLINK     = 1 << 4,
+       ATTR_REVERSE   = 1 << 5,
+       ATTR_INVISIBLE = 1 << 6,
+       ATTR_STRUCK    = 1 << 7,
+       ATTR_WRAP      = 1 << 8,
+       ATTR_WIDE      = 1 << 9,
+       ATTR_WDUMMY    = 1 << 10,
 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {
@@ -114,26 +112,27 @@ enum cursor_state {
 };
 
 enum term_mode {
 };
 
 enum term_mode {
-       MODE_WRAP        = 1,
-       MODE_INSERT      = 2,
-       MODE_APPKEYPAD   = 4,
-       MODE_ALTSCREEN   = 8,
-       MODE_CRLF        = 16,
-       MODE_MOUSEBTN    = 32,
-       MODE_MOUSEMOTION = 64,
-       MODE_REVERSE     = 128,
-       MODE_KBDLOCK     = 256,
-       MODE_HIDE        = 512,
-       MODE_ECHO        = 1024,
-       MODE_APPCURSOR   = 2048,
-       MODE_MOUSESGR    = 4096,
-       MODE_8BIT        = 8192,
-       MODE_BLINK       = 16384,
-       MODE_FBLINK      = 32768,
-       MODE_FOCUS       = 65536,
-       MODE_MOUSEX10    = 131072,
-       MODE_MOUSEMANY   = 262144,
-       MODE_BRCKTPASTE  = 524288,
+       MODE_WRAP        = 1 << 0,
+       MODE_INSERT      = 1 << 1,
+       MODE_APPKEYPAD   = 1 << 2,
+       MODE_ALTSCREEN   = 1 << 3,
+       MODE_CRLF        = 1 << 4,
+       MODE_MOUSEBTN    = 1 << 5,
+       MODE_MOUSEMOTION = 1 << 6,
+       MODE_REVERSE     = 1 << 7,
+       MODE_KBDLOCK     = 1 << 8,
+       MODE_HIDE        = 1 << 9,
+       MODE_ECHO        = 1 << 10,
+       MODE_APPCURSOR   = 1 << 11,
+       MODE_MOUSESGR    = 1 << 12,
+       MODE_8BIT        = 1 << 13,
+       MODE_BLINK       = 1 << 14,
+       MODE_FBLINK      = 1 << 15,
+       MODE_FOCUS       = 1 << 16,
+       MODE_MOUSEX10    = 1 << 17,
+       MODE_MOUSEMANY   = 1 << 18,
+       MODE_BRCKTPASTE  = 1 << 19,
+       MODE_PRINT       = 1 << 20,
        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };
        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };
@@ -151,7 +150,7 @@ enum charset {
 enum escape_state {
        ESC_START      = 1,
        ESC_CSI        = 2,
 enum escape_state {
        ESC_START      = 1,
        ESC_CSI        = 2,
-       ESC_STR        = 4,  /* DSC, OSC, PM, APC */
+       ESC_STR        = 4,  /* DCS, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */
@@ -178,6 +177,9 @@ typedef unsigned int uint;
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 
+typedef XftDraw *Draw;
+typedef XftColor Color;
+
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */
@@ -195,14 +197,14 @@ typedef struct {
 } TCursor;
 
 /* CSI Escape sequence structs */
 } TCursor;
 
 /* CSI Escape sequence structs */
-/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
-       char mode;
+       char mode[2];
 } CSIEscape;
 
 /* STR Escape sequence structs */
 } CSIEscape;
 
 /* STR Escape sequence structs */
@@ -237,7 +239,7 @@ typedef struct {
 /* Purely graphic info */
 typedef struct {
        Display *dpy;
 /* Purely graphic info */
 typedef struct {
        Display *dpy;
-       Colourmap cmap;
+       Colormap cmap;
        Window win;
        Drawable buf;
        Atom xembed, wmdeletewin, netwmname, netwmpid;
        Window win;
        Drawable buf;
        Atom xembed, wmdeletewin, netwmname, netwmpid;
@@ -248,12 +250,14 @@ typedef struct {
        XSetWindowAttributes attrs;
        int scr;
        bool isfixed; /* is fixed geometry? */
        XSetWindowAttributes attrs;
        int scr;
        bool isfixed; /* is fixed geometry? */
-       int fx, fy, fw, fh; /* fixed geometry */
+       int l, t; /* left and top offset */
+       int gm; /* geometry mask */
        int tw, th; /* tty width and height */
        int w, h; /* window width and height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
        int tw, th; /* tty width and height */
        int w, h; /* window width and height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
+       int cursor; /* cursor style */
 } XWindow;
 
 typedef struct {
 } XWindow;
 
 typedef struct {
@@ -287,32 +291,38 @@ typedef struct {
                int x, y;
        } nb, ne, ob, oe;
 
                int x, y;
        } nb, ne, ob, oe;
 
-       char *clip;
+       char *primary, *clipboard;
        Atom xtarget;
        bool alt;
        Atom xtarget;
        bool alt;
-       struct timeval tclick1;
-       struct timeval tclick2;
+       struct timespec tclick1;
+       struct timespec tclick2;
 } Selection;
 
 typedef union {
        int i;
 } Selection;
 
 typedef union {
        int i;
-       unsigned int ui;
+       uint ui;
        float f;
        const void *v;
 } Arg;
 
 typedef struct {
        float f;
        const void *v;
 } Arg;
 
 typedef struct {
-       unsigned int mod;
+       uint mod;
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
 } Shortcut;
 
 /* function definitions used in config.h */
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
 } Shortcut;
 
 /* function definitions used in config.h */
+static void clipcopy(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);
 static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);
+static void xzoomabs(const Arg *);
+static void xzoomreset(const Arg *);
+static void printsel(const Arg *);
+static void printscreen(const Arg *) ;
+static void toggleprinter(const Arg *);
 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"
 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"
@@ -332,16 +342,17 @@ typedef struct {
 
 /* Drawing Context */
 typedef struct {
 
 /* Drawing Context */
 typedef struct {
-       Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       Color col[MAX(LEN(colorname), 256)];
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
 
 static void die(const char *, ...);
 static void draw(void);
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
 
 static void die(const char *, ...);
 static void draw(void);
-static void redraw(int);
+static void redraw(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);
+static void stty(void);
 static void sigchld(int);
 static void run(void);
 
 static void sigchld(int);
 static void run(void);
 
@@ -349,29 +360,35 @@ static void csidump(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
+static int eschandle(uchar);
 static void strdump(void);
 static void strhandle(void);
 static void strparse(void);
 static void strreset(void);
 
 static int tattrset(int);
 static void strdump(void);
 static void strhandle(void);
 static void strparse(void);
 static void strreset(void);
 
 static int tattrset(int);
+static void tprinter(char *, size_t);
+static void tdumpsel(void);
+static void tdumpline(int);
+static void tdump(void);
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
+static int tlinelen(int);
 static void tmoveto(int, int);
 static void tmoveto(int, int);
-static void tmoveato(int x, int y);
+static void tmoveato(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tnew(int, int);
 static void tnewline(int);
-static void tputtab(bool);
+static void tputtab(int);
 static void tputc(char *, int);
 static void treset(void);
 static void tputc(char *, int);
 static void treset(void);
-static int tresize(int, int);
+static void tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
-static void tsetattr(int*, int);
+static void tsetattr(int *, int);
 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
@@ -380,8 +397,9 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
+static void tcontrolcode(uchar );
+static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);
 static int32_t tdefcolor(int *, int *, int);
-static void tselcs(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
@@ -389,7 +407,9 @@ static void ttyread(void);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
+static void tstrsequence(uchar);
 
 
+static inline ushort sixd_to_16bit(int);
 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);
@@ -397,16 +417,16 @@ static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);
+static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
-static int xloadfontset(Font *);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
-static void xsetsel(char*);
+static void xsetsel(char *, Time);
 static void xtermclear(int, int, int, int);
 static void xtermclear(int, int, int, int);
-static void xunloadfont(Font *f);
+static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xresize(int, int);
 
 static void xunloadfonts(void);
 static void xresize(int, int);
 
@@ -427,20 +447,30 @@ static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selrequest(XEvent *);
 
 static void selinit(void);
-static void selsort(void);
+static void selnormalize(void);
 static inline bool selected(int, int);
 static inline bool selected(int, int);
-static void selcopy(void);
+static char *getsel(void);
+static void selcopy(Time);
 static void selscroll(int, int);
 static void selsnap(int, int *, 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 ssize_t xwrite(int, char *, size_t);
+static int x2col(int);
+static int y2row(int);
+static void getbuttoninfo(XEvent *);
+static void mousereport(XEvent *);
+
+static size_t utf8decode(char *, long *, size_t);
+static long utf8decodebyte(char, size_t *);
+static size_t utf8encode(long, char *, size_t);
+static char utf8encodebyte(long, size_t);
+static size_t utf8len(char *);
+static size_t utf8validate(long *, size_t);
+
+static ssize_t xwrite(int, const 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 char *xstrdup(char *);
+
+static void usage(void);
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
@@ -454,7 +484,11 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
-       [SelectionClear] = selclear,
+/*
+ * Uncomment if you want the selection to disappear when you select something
+ * different in another window.
+ */
+/*     [SelectionClear] = selclear, */
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
        [SelectionNotify] = selnotify,
        [SelectionRequest] = selrequest,
 };
@@ -468,17 +502,24 @@ static STREscape strescseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
-static int iofd = -1;
+static int iofd = STDOUT_FILENO;
 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_font = 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_font = NULL;
+static char *opt_line = NULL;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;
+static double defaultfontsize = 0;
+
+static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
+static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
+static long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 /* Font Ring Cache */
 enum {
 
 /* Font Ring Cache */
 enum {
@@ -491,6 +532,7 @@ enum {
 typedef struct {
        XftFont *font;
        int flags;
 typedef struct {
        XftFont *font;
        int flags;
+       long unicodep;
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
@@ -498,7 +540,7 @@ static Fontcache frc[16];
 static int frclen = 0;
 
 ssize_t
 static int frclen = 0;
 
 ssize_t
-xwrite(int fd, char *s, size_t len) {
+xwrite(int fd, const char *s, size_t len) {
        size_t aux = len;
 
        while(len > 0) {
        size_t aux = len;
 
        while(len > 0) {
@@ -529,143 +571,93 @@ xrealloc(void *p, size_t len) {
        return p;
 }
 
        return p;
 }
 
-int
-utf8decode(char *s, long *u) {
-       uchar c;
-       int i, n, rtn;
-
-       rtn = 1;
-       c = *s;
-       if(~c & 0x80) { /* 0xxxxxxx */
-               *u = c;
-               return rtn;
-       } else if((c & 0xE0) == 0xC0) { /* 110xxxxx */
-               *u = c & 0x1F;
-               n = 1;
-       } else if((c & 0xF0) == 0xE0) { /* 1110xxxx */
-               *u = c & 0x0F;
-               n = 2;
-       } else if((c & 0xF8) == 0xF0) { /* 11110xxx */
-               *u = c & 0x07;
-               n = 3;
-       } else {
-               goto invalid;
-       }
-
-       for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
-               c = *s;
-               if((c & 0xC0) != 0x80) /* 10xxxxxx */
-                       goto invalid;
-               *u <<= 6;
-               *u |= c & 0x3F;
-       }
-
-       if((n == 1 && *u < 0x80) ||
-          (n == 2 && *u < 0x800) ||
-          (n == 3 && *u < 0x10000) ||
-          (*u >= 0xD800 && *u <= 0xDFFF)) {
-               goto invalid;
-       }
-
-       return rtn;
-invalid:
-       *u = 0xFFFD;
+char *
+xstrdup(char *s) {
+       if((s = strdup(s)) == NULL)
+               die("Out of memory\n");
 
 
-       return rtn;
+       return s;
 }
 
 }
 
-int
-utf8encode(long *u, char *s) {
-       uchar *sp;
-       ulong uc;
-       int i, n;
-
-       sp = (uchar *)s;
-       uc = *u;
-       if(uc < 0x80) {
-               *sp = uc; /* 0xxxxxxx */
+size_t
+utf8decode(char *c, long *u, size_t clen) {
+       size_t i, j, len, type;
+       long udecoded;
+
+       *u = UTF_INVALID;
+       if(!clen)
+               return 0;
+       udecoded = utf8decodebyte(c[0], &len);
+       if(!BETWEEN(len, 1, UTF_SIZ))
                return 1;
                return 1;
-       } else if(*u < 0x800) {
-               *sp = (uc >> 6) | 0xC0; /* 110xxxxx */
-               n = 1;
-       } else if(uc < 0x10000) {
-               *sp = (uc >> 12) | 0xE0; /* 1110xxxx */
-               n = 2;
-       } else if(uc <= 0x10FFFF) {
-               *sp = (uc >> 18) | 0xF0; /* 11110xxx */
-               n = 3;
-       } else {
-               goto invalid;
+       for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+               udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
+               if(type != 0)
+                       return j;
        }
        }
+       if(j < len)
+               return 0;
+       *u = udecoded;
+       utf8validate(u, len);
+       return len;
+}
 
 
-       for(i=n,++sp; i>0; --i,++sp)
-               *sp = ((uc >> 6*(i-1)) & 0x3F) | 0x80; /* 10xxxxxx */
-
-       return n+1;
-invalid:
-       /* U+FFFD */
-       *s++ = '\xEF';
-       *s++ = '\xBF';
-       *s = '\xBD';
-
-       return 3;
+long
+utf8decodebyte(char c, size_t *i) {
+       for(*i = 0; *i < LEN(utfmask); ++(*i))
+               if(((uchar)c & utfmask[*i]) == utfbyte[*i])
+                       return (uchar)c & ~utfmask[*i];
+       return 0;
 }
 
 }
 
-/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
-   UTF-8 otherwise return 0 */
-int
-isfullutf8(char *s, int b) {
-       uchar *c1, *c2, *c3;
+size_t
+utf8encode(long u, char *c, size_t clen) {
+       size_t len, i;
 
 
-       c1 = (uchar *)s;
-       c2 = (uchar *)++s;
-       c3 = (uchar *)++s;
-       if(b < 1) {
-               return 0;
-       } else if((*c1 & 0xE0) == 0xC0 && b == 1) {
-               return 0;
-       } else if((*c1 & 0xF0) == 0xE0 &&
-           ((b == 1) ||
-           ((b == 2) && (*c2 & 0xC0) == 0x80))) {
-               return 0;
-       } else if((*c1 & 0xF8) == 0xF0 &&
-           ((b == 1) ||
-           ((b == 2) && (*c2 & 0xC0) == 0x80) ||
-           ((b == 3) && (*c2 & 0xC0) == 0x80 && (*c3 & 0xC0) == 0x80))) {
+       len = utf8validate(&u, 0);
+       if(clen < len)
                return 0;
                return 0;
-       } else {
-               return 1;
+       for(i = len - 1; i != 0; --i) {
+               c[i] = utf8encodebyte(u, 0);
+               u >>= 6;
        }
        }
+       c[0] = utf8encodebyte(u, len);
+       return len;
 }
 
 }
 
-int
-utf8size(char *s) {
-       uchar c = *s;
+char
+utf8encodebyte(long u, size_t i) {
+       return utfbyte[i] | (u & ~utfmask[i]);
+}
 
 
-       if(~c & 0x80) {
-               return 1;
-       } else if((c & 0xE0) == 0xC0) {
-               return 2;
-       } else if((c & 0xF0) == 0xE0) {
-               return 3;
-       } else {
-               return 4;
-       }
+size_t
+utf8len(char *c) {
+       return utf8decode(c, &(long){0}, UTF_SIZ);
+}
+
+size_t
+utf8validate(long *u, size_t i) {
+       if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+               *u = UTF_INVALID;
+       for(i = 1; *u > utfmax[i]; ++i)
+               ;
+       return i;
 }
 
 }
 
-static void
+void
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;
-       sel.clip = NULL;
+       sel.primary = NULL;
+       sel.clipboard = NULL;
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;
 }
 
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;
 }
 
-static int
+int
 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;
 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;
@@ -673,7 +665,7 @@ x2col(int x) {
        return LIMIT(x, 0, term.col-1);
 }
 
        return LIMIT(x, 0, term.col-1);
 }
 
-static int
+int
 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;
 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;
@@ -681,9 +673,24 @@ y2row(int y) {
        return LIMIT(y, 0, term.row-1);
 }
 
        return LIMIT(y, 0, term.row-1);
 }
 
-static void
-selsort(void) {
-       if(sel.ob.y == sel.oe.y) {
+int
+tlinelen(int y) {
+       int i = term.col;
+
+       if(term.line[y][i - 1].mode & ATTR_WRAP)
+               return i;
+
+       while(i > 0 && term.line[y][i - 1].c[0] == ' ')
+               --i;
+
+       return i;
+}
+
+void
+selnormalize(void) {
+       int i;
+
+       if(sel.ob.y == sel.oe.y || sel.type == SEL_RECTANGULAR) {
                sel.nb.x = MIN(sel.ob.x, sel.oe.x);
                sel.ne.x = MAX(sel.ob.x, sel.oe.x);
        } else {
                sel.nb.x = MIN(sel.ob.x, sel.oe.x);
                sel.ne.x = MAX(sel.ob.x, sel.oe.x);
        } else {
@@ -692,27 +699,36 @@ selsort(void) {
        }
        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
        sel.ne.y = MAX(sel.ob.y, sel.oe.y);
        }
        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
        sel.ne.y = MAX(sel.ob.y, sel.oe.y);
+
+       selsnap(sel.snap, &sel.nb.x, &sel.nb.y, -1);
+       selsnap(sel.snap, &sel.ne.x, &sel.ne.y, +1);
+
+       /* expand selection over line breaks */
+       if (sel.type == SEL_RECTANGULAR)
+               return;
+       i = tlinelen(sel.nb.y);
+       if (i < sel.nb.x)
+               sel.nb.x = i;
+       if (tlinelen(sel.ne.y) <= sel.ne.x)
+               sel.ne.x = term.col - 1;
 }
 
 }
 
-static inline bool
+bool
 selected(int x, int y) {
 selected(int x, int y) {
-       if(sel.ne.y == y && sel.nb.y == y)
-               return BETWEEN(x, sel.nb.x, sel.ne.x);
+       if(sel.type == SEL_RECTANGULAR)
+               return BETWEEN(y, sel.nb.y, sel.ne.y)
+                   && BETWEEN(x, sel.nb.x, sel.ne.x);
 
 
-       if(sel.type == SEL_RECTANGULAR) {
-               return ((sel.nb.y <= y && y <= sel.ne.y)
-                       && (sel.nb.x <= x && x <= sel.ne.x));
-       }
-
-       return ((sel.nb.y < y && y < sel.ne.y)
-               || (y == sel.ne.y && x <= sel.ne.x))
-               || (y == sel.nb.y && x >= sel.nb.x
-                       && (x <= sel.ne.x || sel.nb.y != sel.ne.y));
+       return BETWEEN(y, sel.nb.y, sel.ne.y)
+           && (y != sel.nb.y || x >= sel.nb.x)
+           && (y != sel.ne.y || x <= sel.ne.x);
 }
 
 void
 selsnap(int mode, int *x, int *y, int direction) {
 }
 
 void
 selsnap(int mode, int *x, int *y, int direction) {
-       int i;
+       int newx, newy, xt, yt;
+       bool delim, prevdelim;
+       Glyph *gp, *prevgp;
 
        switch(mode) {
        case SNAP_WORD:
 
        switch(mode) {
        case SNAP_WORD:
@@ -720,37 +736,38 @@ selsnap(int mode, int *x, int *y, int direction) {
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */
+               prevgp = &term.line[*y][*x];
+               prevdelim = strchr(worddelimiters, prevgp->c[0]) != NULL;
                for(;;) {
                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 {
+                       newx = *x + direction;
+                       newy = *y;
+                       if(!BETWEEN(newx, 0, term.col - 1)) {
+                               newy += direction;
+                               newx = (newx + term.col) % term.col;
+                               if (!BETWEEN(newy, 0, term.row - 1))
                                        break;
                                        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 {
+
+                               if(direction > 0)
+                                       yt = *y, xt = *x;
+                               else
+                                       yt = newy, xt = newx;
+                               if(!(term.line[yt][xt].mode & ATTR_WRAP))
                                        break;
                                        break;
-                               }
                        }
 
                        }
 
-                       if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
-                               *x += direction;
-                               continue;
-                       }
+                       if (newx >= tlinelen(newy))
+                               break;
 
 
-                       if(strchr(worddelimiters,
-                                       term.line[*y][*x+direction].c[0])) {
+                       gp = &term.line[newy][newx];
+                       delim = strchr(worddelimiters, gp->c[0]) != NULL;
+                       if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+                                       || (delim && gp->c[0] != prevgp->c[0])))
                                break;
                                break;
-                       }
 
 
-                       *x += direction;
+                       *x = newx;
+                       *y = newy;
+                       prevgp = gp;
+                       prevdelim = delim;
                }
                break;
        case SNAP_LINE:
                }
                break;
        case SNAP_LINE:
@@ -776,40 +793,19 @@ selsnap(int mode, int *x, int *y, int direction) {
                        }
                }
                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
 getbuttoninfo(XEvent *e) {
        int type;
        }
 }
 
 void
 getbuttoninfo(XEvent *e) {
        int type;
-       uint state = e->xbutton.state &~Button1Mask;
+       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
        sel.oe.x = x2col(e->xbutton.x);
        sel.oe.y = y2row(e->xbutton.y);
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
        sel.oe.x = x2col(e->xbutton.x);
        sel.oe.y = y2row(e->xbutton.y);
-
-       if(sel.ob.y < sel.oe.y
-                       || (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
-       } else {
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
-       }
-       selsort();
+       selnormalize();
 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {
 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {
@@ -858,6 +854,8 @@ mousereport(XEvent *e) {
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;
+                       if (button == 64 || button == 65)
+                               return;
                }
        }
 
                }
        }
 
@@ -884,10 +882,10 @@ mousereport(XEvent *e) {
 
 void
 bpress(XEvent *e) {
 
 void
 bpress(XEvent *e) {
-       struct timeval now;
+       struct timespec now;
        Mousekey *mk;
 
        Mousekey *mk;
 
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -901,7 +899,7 @@ bpress(XEvent *e) {
        }
 
        if(e->xbutton.button == Button1) {
        }
 
        if(e->xbutton.button == Button1) {
-               gettimeofday(&now, NULL);
+               clock_gettime(CLOCK_MONOTONIC, &now);
 
                /* Clear previous selection, logically and visually. */
                selclear(NULL);
 
                /* Clear previous selection, logically and visually. */
                selclear(NULL);
@@ -921,9 +919,7 @@ bpress(XEvent *e) {
                } else {
                        sel.snap = 0;
                }
                } else {
                        sel.snap = 0;
                }
-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
-               selsort();
+               selnormalize();
 
                /*
                 * Draw selection, unless it's regular and we don't want to
 
                /*
                 * Draw selection, unless it's regular and we don't want to
@@ -938,67 +934,61 @@ bpress(XEvent *e) {
        }
 }
 
        }
 }
 
-void
-selcopy(void) {
+char *
+getsel(void) {
        char *str, *ptr;
        char *str, *ptr;
-       int x, y, bufsize, size, i, ex;
+       int y, bufsize, size, lastx, linelen;
        Glyph *gp, *last;
 
        Glyph *gp, *last;
 
-       if(sel.ob.x == -1) {
-               str = NULL;
-       } else {
-               bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
-               ptr = str = xmalloc(bufsize);
-
-               /* append every set & selected glyph to the selection */
-               for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
-                       gp = &term.line[y][0];
-                       last = &gp[term.col-1];
+       if(sel.ob.x == -1)
+               return NULL;
 
 
-                       while(last >= gp && !(selected(last - gp, y) &&
-                                             strcmp(last->c, " ") != 0)) {
-                               --last;
-                       }
+       bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
+       ptr = str = xmalloc(bufsize);
 
 
-                       for(x = 0; gp <= last; x++, ++gp) {
-                               if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
-                                       continue;
+       /* append every set & selected glyph to the selection */
+       for(y = sel.nb.y; y <= sel.ne.y; y++) {
+               linelen = tlinelen(y);
 
 
-                               size = utf8size(gp->c);
-                               memcpy(ptr, gp->c, size);
-                               ptr += size;
-                       }
+               if(sel.type == SEL_RECTANGULAR) {
+                       gp = &term.line[y][sel.nb.x];
+                       lastx = sel.ne.x;
+               } else {
+                       gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
+                       lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
+               }
+               last = &term.line[y][MIN(lastx, linelen-1)];
+               while(last >= gp && last->c[0] == ' ')
+                       --last;
 
 
-                       /*
-                        * 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.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP))
-                               *ptr++ = '\n';
+               for( ; gp <= last; ++gp) {
+                       if(gp->mode & ATTR_WDUMMY)
+                               continue;
 
 
-                       /*
-                        * If the last selected line expands in the selection
-                        * after the visible text '\n' is appended.
-                        */
-                       if(y == sel.ne.y) {
-                               i = term.col;
-                               while(--i > 0 && term.line[y][i].c[0] == ' ')
-                                       /* nothing */;
-                               ex = sel.ne.x;
-                               if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
-                                       ex = sel.nb.x;
-                               if(i < ex)
-                                       *ptr++ = '\n';
-                       }
+                       size = utf8len(gp->c);
+                       memcpy(ptr, gp->c, size);
+                       ptr += size;
                }
                }
-               *ptr = 0;
+
+               /*
+                * 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.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP))
+                       *ptr++ = '\n';
        }
        }
-       xsetsel(str);
+       *ptr = 0;
+       return str;
+}
+
+void
+selcopy(Time t) {
+       xsetsel(getsel(), t);
 }
 
 void
 }
 
 void
@@ -1007,18 +997,23 @@ selnotify(XEvent *e) {
        int format;
        uchar *data, *last, *repl;
        Atom type;
        int format;
        uchar *data, *last, *repl;
        Atom type;
+       XSelectionEvent *xsev;
 
        ofs = 0;
 
        ofs = 0;
+       xsev = &e->xselection;
+       if (xsev->property == None)
+           return;
        do {
        do {
-               if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
-                                       False, AnyPropertyType, &type, &format,
-                                       &nitems, &rem, &data)) {
+               if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
+                                       BUFSIZ/4, False, AnyPropertyType,
+                                       &type, &format, &nitems, &rem,
+                                       &data)) {
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
 
                /*
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
 
                /*
-                * As seen in selcopy:
+                * As seen in getsel:
                 * Line endings are inconsistent in the terminal and GUI world
                 * copy and pasting. When receiving some selection data,
                 * replace all '\n' with '\r'.
                 * Line endings are inconsistent in the terminal and GUI world
                 * copy and pasting. When receiving some selection data,
                 * replace all '\n' with '\r'.
@@ -1047,12 +1042,26 @@ selpaste(const Arg *dummy) {
                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 
+void
+clipcopy(const Arg *dummy) {
+       Atom clipboard;
+
+       if(sel.clipboard != NULL)
+               free(sel.clipboard);
+
+       if(sel.primary != NULL) {
+               sel.clipboard = xstrdup(sel.primary);
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       }
+}
+
 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+       XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard,
                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 
@@ -1068,7 +1077,8 @@ void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
-       Atom xa_targets, string;
+       Atom xa_targets, string, clipboard;
+       char *seltext;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
@@ -1076,6 +1086,9 @@ selrequest(XEvent *e) {
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;
+        if (xsre->property == None)
+            xsre->property = xsre->target;
+
        /* reject */
        xev.property = None;
 
        /* reject */
        xev.property = None;
 
@@ -1087,11 +1100,29 @@ selrequest(XEvent *e) {
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
-       } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
-               XChangeProperty(xsre->display, xsre->requestor, xsre->property,
-                               xsre->target, 8, PropModeReplace,
-                               (uchar *) sel.clip, strlen(sel.clip));
-               xev.property = xsre->property;
+       } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+               /*
+                * xith XA_STRING non ascii characters may be incorrect in the
+                * requestor. It is not our problem, use utf8.
+                */
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               if(xsre->selection == XA_PRIMARY) {
+                       seltext = sel.primary;
+               } else if(xsre->selection == clipboard) {
+                       seltext = sel.clipboard;
+               } else {
+                       fprintf(stderr,
+                               "Unhandled clipboard selection 0x%lx\n",
+                               xsre->selection);
+                       return;
+               }
+               if(seltext != NULL) {
+                       XChangeProperty(xsre->display, xsre->requestor,
+                                       xsre->property, xsre->target,
+                                       8, PropModeReplace,
+                                       (uchar *)seltext, strlen(seltext));
+                       xev.property = xsre->property;
+               }
        }
 
        /* all done, send a notification to the listener */
        }
 
        /* all done, send a notification to the listener */
@@ -1100,22 +1131,18 @@ selrequest(XEvent *e) {
 }
 
 void
 }
 
 void
-xsetsel(char *str) {
-       /* register the selection for both the clipboard and the primary */
-       Atom clipboard;
-
-       free(sel.clip);
-       sel.clip = str;
+xsetsel(char *str, Time t) {
+       free(sel.primary);
+       sel.primary = str;
 
 
-       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
+        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+            selclear(0);
 }
 
 void
 brelease(XEvent *e) {
 }
 
 void
 brelease(XEvent *e) {
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -1127,7 +1154,7 @@ brelease(XEvent *e) {
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);
-                       selcopy();
+                       selcopy(e->xbutton.time);
                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);
                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);
@@ -1138,7 +1165,7 @@ void
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 
-       if(IS_SET(MODE_MOUSE)) {
+       if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {
                mousereport(e);
                return;
        }
                mousereport(e);
                return;
        }
@@ -1169,23 +1196,40 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 void
 execsh(void) {
-       char **args;
-       char *envshell = getenv("SHELL");
-       const struct passwd *pass = getpwuid(getuid());
+       char **args, *sh, *prog;
+       const struct passwd *pw;
        char buf[sizeof(long) * 8 + 1];
 
        char buf[sizeof(long) * 8 + 1];
 
-       unsetenv("COLUMNS");
-       unsetenv("LINES");
-       unsetenv("TERMCAP");
+       errno = 0;
+       if((pw = getpwuid(getuid())) == NULL) {
+               if(errno)
+                       die("getpwuid:%s\n", strerror(errno));
+               else
+                       die("who are you?\n");
+       }
 
 
-       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);
+       if (!(sh = getenv("SHELL"))) {
+               sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;
        }
 
        }
 
+       if(opt_cmd)
+               prog = opt_cmd[0];
+       else if(utmp)
+               prog = utmp;
+       else
+               prog = sh;
+       args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
+
        snprintf(buf, sizeof(buf), "%lu", xw.win);
        snprintf(buf, sizeof(buf), "%lu", xw.win);
+
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
+       setenv("LOGNAME", pw->pw_name, 1);
+       setenv("USER", pw->pw_name, 1);
+       setenv("SHELL", sh, 1);
+       setenv("HOME", pw->pw_dir, 1);
+       setenv("TERM", termname, 1);
        setenv("WINDOWID", buf, 1);
 
        signal(SIGCHLD, SIG_DFL);
        setenv("WINDOWID", buf, 1);
 
        signal(SIGCHLD, SIG_DFL);
@@ -1195,25 +1239,45 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
-       DEFAULT(envshell, shell);
-       setenv("TERM", termname, 1);
-       args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
-       execvp(args[0], args);
-       exit(EXIT_FAILURE);
+       execvp(prog, args);
+       _exit(EXIT_FAILURE);
 }
 
 void
 sigchld(int a) {
 }
 
 void
 sigchld(int a) {
-       int stat = 0;
+       int stat, ret;
 
        if(waitpid(pid, &stat, 0) < 0)
 
        if(waitpid(pid, &stat, 0) < 0)
-               die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+               die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
 
-       if(WIFEXITED(stat)) {
-               exit(WEXITSTATUS(stat));
-       } else {
-               exit(EXIT_FAILURE);
+       ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
+       if (ret != EXIT_SUCCESS)
+               die("child finished with error '%d'\n", stat);
+       exit(EXIT_SUCCESS);
+}
+
+
+void
+stty(void)
+{
+       char cmd[_POSIX_ARG_MAX], **p, *q, *s;
+       size_t n, siz;
+
+       if((n = strlen(stty_args)) > sizeof(cmd)-1)
+               die("incorrect stty parameters\n");
+       memcpy(cmd, stty_args, n);
+       q = cmd + n;
+       siz = sizeof(cmd) - n;
+       for(p = opt_cmd; p && (s = *p); ++p) {
+               if((n = strlen(s)) > siz-1)
+                       die("stty parameter length too long\n");
+               *q++ = ' ';
+               q = memcpy(q, s, n);
+               q += n;
+               siz-= n + 1;
        }
        }
+       *q = '\0';
+       system(cmd);
 }
 
 void
 }
 
 void
@@ -1221,21 +1285,42 @@ ttynew(void) {
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 
+       if(opt_io) {
+               term.mode |= MODE_PRINT;
+               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));
+               }
+       }
+
+       if (opt_line) {
+               if((cmdfd = open(opt_line, O_RDWR)) < 0)
+                       die("open line failed: %s\n", strerror(errno));
+               close(STDIN_FILENO);
+               dup(cmdfd);
+               stty();
+               return;
+       }
+
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
-               die("openpty failed: %s\n", SERRNO);
+               die("openpty failed: %s\n", strerror(errno));
 
        switch(pid = fork()) {
        case -1:
                die("fork failed\n");
                break;
        case 0:
 
        switch(pid = fork()) {
        case -1:
                die("fork failed\n");
                break;
        case 0:
+               close(iofd);
                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
-                       die("ioctl TIOCSCTTY failed: %s\n", SERRNO);
+                       die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
                close(s);
                close(m);
                execsh();
                close(s);
                close(m);
                execsh();
@@ -1244,27 +1329,10 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
-               if(opt_io) {
-                       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));
-                       }
-               }
+               break;
        }
 }
 
        }
 }
 
-void
-dump(char c) {
-       static int col;
-
-       fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
-       if(++col % 10 == 0)
-               fprintf(stderr, "\n");
-}
-
 void
 ttyread(void) {
        static char buf[BUFSIZ];
 void
 ttyread(void) {
        static char buf[BUFSIZ];
@@ -1272,19 +1340,18 @@ ttyread(void) {
        char *ptr;
        char s[UTF_SIZ];
        int charsize; /* size of utf8 char in bytes */
        char *ptr;
        char s[UTF_SIZ];
        int charsize; /* size of utf8 char in bytes */
-       long utf8c;
+       long unicodep;
        int ret;
 
        /* append read bytes to unprocessed bytes */
        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
        int ret;
 
        /* append read bytes to unprocessed bytes */
        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
-               die("Couldn't read from shell: %s\n", SERRNO);
+               die("Couldn't read from shell: %s\n", strerror(errno));
 
        /* process every complete utf8 char */
        buflen += ret;
        ptr = buf;
 
        /* process every complete utf8 char */
        buflen += ret;
        ptr = buf;
-       while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
-               charsize = utf8decode(ptr, &utf8c);
-               utf8encode(&utf8c, s);
+       while((charsize = utf8decode(ptr, &unicodep, buflen))) {
+               utf8encode(unicodep, s, UTF_SIZ);
                tputc(s, charsize);
                ptr += charsize;
                buflen -= charsize;
                tputc(s, charsize);
                ptr += charsize;
                buflen -= charsize;
@@ -1296,8 +1363,8 @@ ttyread(void) {
 
 void
 ttywrite(const char *s, size_t n) {
 
 void
 ttywrite(const char *s, size_t n) {
-       if(write(cmdfd, s, n) == -1)
-               die("write error on tty: %s\n", SERRNO);
+       if(xwrite(cmdfd, s, n) == -1)
+               die("write error on tty: %s\n", strerror(errno));
 }
 
 void
 }
 
 void
@@ -1316,7 +1383,7 @@ ttyresize(void) {
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
-               fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
+               fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));
 }
 
 int
 }
 
 int
@@ -1395,9 +1462,12 @@ treset(void) {
        memset(term.trantbl, sizeof(term.trantbl), CS_USA);
        term.charset = 0;
 
        memset(term.trantbl, sizeof(term.trantbl), CS_USA);
        term.charset = 0;
 
-       tclearregion(0, 0, term.col-1, term.row-1);
-       tmoveto(0, 0);
-       tcursor(CURSOR_SAVE);
+       for(i = 0; i < 2; i++) {
+               tmoveto(0, 0);
+               tcursor(CURSOR_SAVE);
+               tclearregion(0, 0, term.col-1, term.row-1);
+               tswapscreen();
+       }
 }
 
 void
 }
 
 void
@@ -1426,15 +1496,13 @@ tscrolldown(int orig, int n) {
 
        LIMIT(n, 0, term.bot-orig+1);
 
 
        LIMIT(n, 0, term.bot-orig+1);
 
+       tsetdirt(orig, term.bot-n);
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
-
-               term.dirty[i] = 1;
-               term.dirty[i-n] = 1;
        }
 
        selscroll(orig, n);
        }
 
        selscroll(orig, n);
@@ -1444,17 +1512,16 @@ void
 tscrollup(int orig, int n) {
        int i;
        Line temp;
 tscrollup(int orig, int n) {
        int i;
        Line temp;
+
        LIMIT(n, 0, term.bot-orig+1);
 
        tclearregion(0, orig, term.col-1, orig+n-1);
        LIMIT(n, 0, term.bot-orig+1);
 
        tclearregion(0, orig, term.col-1, orig+n-1);
+       tsetdirt(orig+n, term.bot);
 
        for(i = orig; i <= term.bot-n; i++) {
 
        for(i = orig; i <= term.bot-n; i++) {
-                temp = term.line[i];
-                term.line[i] = term.line[i+n];
-                term.line[i+n] = temp;
-
-                term.dirty[i] = 1;
-                term.dirty[i+n] = 1;
+               temp = term.line[i];
+               term.line[i] = term.line[i+n];
+               term.line[i+n] = temp;
        }
 
        selscroll(orig, -n);
        }
 
        selscroll(orig, -n);
@@ -1485,7 +1552,7 @@ selscroll(int orig, int n) {
                                sel.oe.x = term.col;
                        }
                }
                                sel.oe.x = term.col;
                        }
                }
-               selsort();
+               selnormalize();
        }
 }
 
        }
 }
 
@@ -1526,7 +1593,8 @@ csiparse(void) {
                        break;
                p++;
        }
                        break;
                p++;
        }
-       csiescseq.mode = *p;
+       csiescseq.mode[0] = *p++;
+       csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';
 }
 
 /* for absolute user moves, when decom is set */
 }
 
 /* for absolute user moves, when decom is set */
@@ -1546,11 +1614,9 @@ tmoveto(int x, int y) {
                miny = 0;
                maxy = term.row - 1;
        }
                miny = 0;
                maxy = term.row - 1;
        }
-       LIMIT(x, 0, term.col-1);
-       LIMIT(y, miny, maxy);
        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.state &= ~CURSOR_WRAPNEXT;
-       term.c.x = x;
-       term.c.y = y;
+       term.c.x = LIMIT(x, 0, term.col-1);
+       term.c.y = LIMIT(y, miny, maxy);
 }
 
 void
 }
 
 void
@@ -1569,9 +1635,8 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
        /*
         * The table is proudly stolen from rxvt.
         */
        /*
         * The table is proudly stolen from rxvt.
         */
-       if(attr->mode & ATTR_GFX) {
-               if(c[0] >= 0x41 && c[0] <= 0x7e
-                               && vt100_0[c[0] - 0x41]) {
+       if(term.trantbl[term.charset] == CS_GRAPHIC0) {
+               if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
                        c = vt100_0[c[0] - 0x41];
                }
        }
@@ -1594,6 +1659,7 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
 void
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;
 void
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;
+       Glyph *gp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
@@ -1608,64 +1674,59 @@ tclearregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {
+                       gp = &term.line[y][x];
                        if(selected(x, y))
                                selclear(NULL);
                        if(selected(x, y))
                                selclear(NULL);
-                       term.line[y][x] = term.c.attr;
-                       memcpy(term.line[y][x].c, " ", 2);
+                       gp->fg = term.c.attr.fg;
+                       gp->bg = term.c.attr.bg;
+                       gp->mode = 0;
+                       memcpy(gp->c, " ", 2);
                }
        }
 }
 
 void
 tdeletechar(int n) {
                }
        }
 }
 
 void
 tdeletechar(int n) {
-       int src = term.c.x + n;
-       int dst = term.c.x;
-       int size = term.col - src;
+       int dst, src, size;
+       Glyph *line;
 
 
-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);
 
 
-       if(src >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x;
+       src = term.c.x + n;
+       size = term.col - src;
+       line = term.line[term.c.y];
 
 
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
-       int src = term.c.x;
-       int dst = src + n;
-       int size = term.col - dst;
+       int dst, src, size;
+       Glyph *line;
 
 
-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);
 
 
-       if(dst >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x + n;
+       src = term.c.x;
+       size = term.col - dst;
+       line = term.line[term.c.y];
 
 
-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 tinsertblankline(int n) {
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 tinsertblankline(int n) {
-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrolldown(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrolldown(term.c.y, n);
 }
 
 void
 tdeleteline(int n) {
 }
 
 void
 tdeleteline(int n) {
-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrollup(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrollup(term.c.y, n);
 }
 
 int32_t
 }
 
 int32_t
@@ -1674,7 +1735,7 @@ tdefcolor(int *attr, int *npar, int l) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {
-       case 2: /* direct colour in RGB space */
+       case 2: /* direct color in RGB space */
                if (*npar + 4 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
                if (*npar + 4 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
@@ -1691,7 +1752,7 @@ tdefcolor(int *attr, int *npar, int l) {
                else
                        idx = TRUECOLOR(r, g, b);
                break;
                else
                        idx = TRUECOLOR(r, g, b);
                break;
-       case 5: /* indexed colour */
+       case 5: /* indexed color */
                if (*npar + 2 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
                if (*npar + 2 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
@@ -1706,11 +1767,12 @@ tdefcolor(int *attr, int *npar, int l) {
                break;
        case 0: /* implemented defined (only foreground) */
        case 1: /* transparent */
                break;
        case 0: /* implemented defined (only foreground) */
        case 1: /* transparent */
-       case 3: /* direct colour in CMY space */
-       case 4: /* direct colour in CMYK space */
+       case 3: /* direct color in CMY space */
+       case 4: /* direct color in CMYK space */
        default:
                fprintf(stderr,
                        "erresc(38): gfx attr %d unknown\n", attr[*npar]);
        default:
                fprintf(stderr,
                        "erresc(38): gfx attr %d unknown\n", attr[*npar]);
+               break;
        }
 
        return idx;
        }
 
        return idx;
@@ -1724,15 +1786,24 @@ 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.mode &= ~(
+                               ATTR_BOLD       |
+                               ATTR_FAINT      |
+                               ATTR_ITALIC     |
+                               ATTR_UNDERLINE  |
+                               ATTR_BLINK      |
+                               ATTR_REVERSE    |
+                               ATTR_INVISIBLE  |
+                               ATTR_STRUCK     );
                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
+               case 2:
+                       term.c.attr.mode |= ATTR_FAINT;
+                       break;
                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
@@ -1740,15 +1811,21 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */
+                       /* FALLTHROUGH */
                case 6: /* rapid blink */
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 6: /* rapid blink */
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
-               case 21:
+               case 8:
+                       term.c.attr.mode |= ATTR_INVISIBLE;
+                       break;
+               case 9:
+                       term.c.attr.mode |= ATTR_STRUCK;
+                       break;
                case 22:
                case 22:
-                       term.c.attr.mode &= ~ATTR_BOLD;
+                       term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
@@ -1757,12 +1834,17 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
                        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_REVERSE;
                        break;
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
+               case 28:
+                       term.c.attr.mode &= ~ATTR_INVISIBLE;
+                       break;
+               case 29:
+                       term.c.attr.mode &= ~ATTR_STRUCK;
+                       break;
                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;
                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;
@@ -1811,8 +1893,6 @@ tsetscroll(int t, int b) {
        term.bot = b;
 }
 
        term.bot = b;
 }
 
-#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
@@ -1821,7 +1901,6 @@ tsetmode(bool priv, bool set, int *args, int narg) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
-                               break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
@@ -1829,7 +1908,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                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_TIMEOUT);
+                                       redraw();
                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
@@ -1881,7 +1960,10 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;
                        case 1049: /* swap screen & set/restore cursor as xterm */
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;
                        case 1049: /* swap screen & set/restore cursor as xterm */
+                               if (!allowaltscreen)
+                                       break;
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+                               /* FALLTHROUGH */
                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)
                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)
@@ -1895,7 +1977,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                        tswapscreen();
                                if(*args != 1049)
                                        break;
                                        tswapscreen();
                                if(*args != 1049)
                                        break;
-                               /* FALLTRU */
+                               /* FALLTHROUGH */
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
@@ -1948,7 +2030,7 @@ csihandle(void) {
        char buf[40];
        int len;
 
        char buf[40];
        int len;
 
-       switch(csiescseq.mode) {
+       switch(csiescseq.mode[0]) {
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
@@ -1968,9 +2050,28 @@ csihandle(void) {
                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 'i': /* MC -- Media Copy */
+               switch(csiescseq.arg[0]) {
+               case 0:
+                       tdump();
+                       break;
+               case 1:
+                       tdumpline(term.c.y);
+                       break;
+               case 2:
+                       tdumpsel();
+                       break;
+               case 4:
+                       term.mode &= ~MODE_PRINT;
+                       break;
+               case 5:
+                       term.mode |= MODE_PRINT;
+                       break;
+               }
+               break;
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
-                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+                       ttywrite(vtiden, sizeof(vtiden) - 1);
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
@@ -2014,8 +2115,7 @@ csihandle(void) {
                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);
-               while(csiescseq.arg[0]--)
-                       tputtab(1);
+               tputtab(csiescseq.arg[0]);
                break;
        case 'J': /* ED -- Clear screen */
                selclear(NULL);
                break;
        case 'J': /* ED -- Clear screen */
                selclear(NULL);
@@ -2083,8 +2183,7 @@ csihandle(void) {
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
-               while(csiescseq.arg[0]--)
-                       tputtab(0);
+               tputtab(-csiescseq.arg[0]);
                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);
@@ -2101,8 +2200,8 @@ csihandle(void) {
                        len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
                                        term.c.y+1, term.c.x+1);
                        ttywrite(buf, len);
                        len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
                                        term.c.y+1, term.c.x+1);
                        ttywrite(buf, len);
-                       break;
                }
                }
+               break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                if(csiescseq.priv) {
                        goto unknown;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                if(csiescseq.priv) {
                        goto unknown;
@@ -2119,6 +2218,19 @@ csihandle(void) {
        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
                tcursor(CURSOR_LOAD);
                break;
        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
                tcursor(CURSOR_LOAD);
                break;
+       case ' ':
+               switch (csiescseq.mode[1]) {
+                       case 'q': /* DECSCUSR -- Set Cursor Style */
+                               DEFAULT(csiescseq.arg[0], 1);
+                               if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
+                                       goto unknown;
+                               }
+                               xw.cursor = csiescseq.arg[0];
+                               break;
+                       default:
+                               goto unknown;
+               }
+               break;
        }
 }
 
        }
 }
 
@@ -2155,6 +2267,7 @@ strhandle(void) {
        char *p = NULL;
        int j, narg, par;
 
        char *p = NULL;
        int j, narg, par;
 
+       term.esc &= ~(ESC_STR_END|ESC_STR);
        strparse();
        narg = strescseq.narg;
        par = atoi(strescseq.args[0]);
        strparse();
        narg = strescseq.narg;
        par = atoi(strescseq.args[0]);
@@ -2172,17 +2285,17 @@ strhandle(void) {
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];
-                       /* fall through */
+                       /* FALLTHROUGH */
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
-                       if (!xsetcolorname(j, p)) {
+                       if(xsetcolorname(j, p)) {
                                fprintf(stderr, "erresc: invalid color %s\n", p);
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */
                                fprintf(stderr, "erresc: invalid color %s\n", p);
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */
-                               redraw(0);
+                               redraw();
                        }
                        return;
                }
                        }
                        return;
                }
@@ -2190,7 +2303,7 @@ strhandle(void) {
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
                return;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
                return;
-       case 'P': /* DSC -- Device Control String */
+       case 'P': /* DCS -- Device Control String */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
                return;
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
                return;
@@ -2202,12 +2315,23 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {
+       int c;
        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';
        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, ";");
+
+       if(*p == '\0')
+               return;
+
+       while(strescseq.narg < STR_ARG_SIZ) {
+               strescseq.args[strescseq.narg++] = p;
+               while((c = *p) != ';' && c != '\0')
+                       ++p;
+               if(c == '\0')
+                       return;
+               *p++ = '\0';
+       }
 }
 
 void
 }
 
 void
@@ -2241,21 +2365,75 @@ strreset(void) {
 }
 
 void
 }
 
 void
-tputtab(bool forward) {
+tprinter(char *s, size_t len) {
+       if(iofd != -1 && xwrite(iofd, s, len) < 0) {
+               fprintf(stderr, "Error writing in %s:%s\n",
+                       opt_io, strerror(errno));
+               close(iofd);
+               iofd = -1;
+       }
+}
+
+void
+toggleprinter(const Arg *arg) {
+       term.mode ^= MODE_PRINT;
+}
+
+void
+printscreen(const Arg *arg) {
+       tdump();
+}
+
+void
+printsel(const Arg *arg) {
+       tdumpsel();
+}
+
+void
+tdumpsel(void) {
+       char *ptr;
+
+       if((ptr = getsel())) {
+               tprinter(ptr, strlen(ptr));
+               free(ptr);
+       }
+}
+
+void
+tdumpline(int n) {
+       Glyph *bp, *end;
+
+       bp = &term.line[n][0];
+       end = &bp[MIN(tlinelen(n), term.col) - 1];
+       if(bp != end || bp->c[0] != ' ') {
+               for( ;bp <= end; ++bp)
+                       tprinter(bp->c, utf8len(bp->c));
+       }
+       tprinter("\n", 1);
+}
+
+void
+tdump(void) {
+       int i;
+
+       for(i = 0; i < term.row; ++i)
+               tdumpline(i);
+}
+
+void
+tputtab(int n) {
        uint x = term.c.x;
 
        uint x = term.c.x;
 
-       if(forward) {
-               if(x == term.col)
-                       return;
-               for(++x; x < term.col && !term.tabs[x]; ++x)
-                       /* nothing */ ;
-       } else {
-               if(x == 0)
-                       return;
-               for(--x; x > 0 && !term.tabs[x]; --x)
-                       /* nothing */ ;
+       if(n > 0) {
+               while(x < term.col && n--)
+                       for(++x; x < term.col && !term.tabs[x]; ++x)
+                               /* nothing */ ;
+       } else if(n < 0) {
+               while(x > 0 && n++)
+                       for(--x; x > 0 && !term.tabs[x]; --x)
+                               /* nothing */ ;
        }
        }
-       tmoveto(x, term.c.y);
+       term.c.x = LIMIT(x, 0, term.col-1);
 }
 
 void
 }
 
 void
@@ -2263,12 +2441,13 @@ techo(char *buf, int len) {
        for(; len > 0; buf++, len--) {
                char c = *buf;
 
        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';
+               if(ISCONTROL((uchar) c)) { /* control code */
+                       if(c & 0x80) {
+                               c &= 0x7f;
+                               tputc("^", 1);
+                               tputc("[", 1);
+                       } else if(c != '\n' && c != '\r' && c != '\t') {
+                               c ^= 0x40;
                                tputc("^", 1);
                        }
                        tputc(&c, 1);
                                tputc("^", 1);
                        }
                        tputc(&c, 1);
@@ -2282,88 +2461,274 @@ techo(char *buf, int len) {
 
 void
 tdeftran(char ascii) {
 
 void
 tdeftran(char ascii) {
-       char c, (*bp)[2];
-       static char tbl[][2] = {
-               {'0', CS_GRAPHIC0}, {'1', CS_GRAPHIC1}, {'A', CS_UK},
-               {'B', CS_USA},      {'<', CS_MULTI},    {'K', CS_GER},
-               {'5', CS_FIN},      {'C', CS_FIN},
-               {0, 0}
-       };
+       static char cs[] = "0B";
+       static int vcs[] = {CS_GRAPHIC0, CS_USA};
+       char *p;
 
 
-       for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp)
-               /* nothing */;
-
-       if (c == 0)
+       if((p = strchr(cs, ascii)) == NULL) {
                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
-       else
-               term.trantbl[term.icharset] = (*bp)[1];
+       } else {
+               term.trantbl[term.icharset] = vcs[p - cs];
+       }
 }
 
 void
 }
 
 void
-tselcs(void) {
-       if (term.trantbl[term.charset] == CS_GRAPHIC0)
-               term.c.attr.mode |= ATTR_GFX;
-       else
-               term.c.attr.mode &= ~ATTR_GFX;
+tdectest(char c) {
+       static char E[UTF_SIZ] = "E";
+       int x, y;
+
+       if(c == '8') { /* DEC screen alignment test. */
+               for(x = 0; x < term.col; ++x) {
+                       for(y = 0; y < term.row; ++y)
+                               tsetchar(E, &term.c.attr, x, y);
+               }
+       }
 }
 
 void
 }
 
 void
-tputc(char *c, int len) {
-       uchar ascii = *c;
-       bool control = ascii < '\x20' || ascii == 0177;
-       long u8char;
-       int width;
-
-       if(len == 1) {
-               width = 1;
-       } else {
-               utf8decode(c, &u8char);
-               width = wcwidth(u8char);
-       }
+tstrsequence(uchar c) {
+       switch (c) {
+       case 0x90:   /* DCS -- Device Control String */
+               c = 'P';
+               break;
+       case 0x9f:   /* APC -- Application Program Command */
+               c = '_';
+               break;
+       case 0x9e:   /* PM -- Privacy Message */
+               c = '^';
+               break;
+       case 0x9d:   /* OSC -- Operating System Command */
+               c = ']';
+               break;
+       }
+       strreset();
+       strescseq.type = c;
+       term.esc |= ESC_STR;
+       return;
+}
 
 
-       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;
+void
+tcontrolcode(uchar ascii) {
+       static char question[UTF_SIZ] = "?";
+
+       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(term.esc & ESC_STR_END) {
+                       /* backwards compatibility to xterm */
+                       strhandle();
+               } else {
+                       if(!(xw.state & WIN_FOCUSED))
+                               xseturgency(1);
+                       if (bellvolume)
+                               XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL);
                }
                }
+               break;
+       case '\033': /* ESC */
+               csireset();
+               term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
+               term.esc |= ESC_START;
+               return;
+       case '\016': /* SO (LS1 -- Locking shift 1) */
+       case '\017': /* SI (LS0 -- Locking shift 0) */
+               term.charset = 1 - (ascii - '\016');
+               return;
+       case '\032': /* SUB */
+               tsetchar(question, &term.c.attr, term.c.x, term.c.y);
+       case '\030': /* CAN */
+               csireset();
+               break;
+       case '\005': /* ENQ (IGNORED) */
+       case '\000': /* NUL (IGNORED) */
+       case '\021': /* XON (IGNORED) */
+       case '\023': /* XOFF (IGNORED) */
+       case 0177:   /* DEL (IGNORED) */
+               return;
+       case 0x84:   /* TODO: IND */
+               break;
+       case 0x85:   /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 0x88:   /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;
+       case 0x8d:   /* TODO: RI */
+       case 0x8e:   /* TODO: SS2 */
+       case 0x8f:   /* TODO: SS3 */
+       case 0x98:   /* TODO: SOS */
+               break;
+       case 0x9a:   /* DECID -- Identify Terminal */
+               ttywrite(vtiden, sizeof(vtiden) - 1);
+               break;
+       case 0x9b:   /* TODO: CSI */
+       case 0x9c:   /* TODO: ST */
+               break;
+       case 0x90:   /* DCS -- Device Control String */
+       case 0x9f:   /* APC -- Application Program Command */
+       case 0x9e:   /* PM -- Privacy Message */
+       case 0x9d:   /* OSC -- Operating System Command */
+               tstrsequence(ascii);
+               return;
        }
        }
+       /* only CAN, SUB, \a and C1 chars interrupt a sequence */
+       term.esc &= ~(ESC_STR_END|ESC_STR);
+       return;
+}
+
+/*
+ * returns 1 when the sequence is finished and it hasn't to read
+ * more characters for this sequence, otherwise 0
+ */
+int
+eschandle(uchar ascii) {
+       switch(ascii) {
+       case '[':
+               term.esc |= ESC_CSI;
+               return 0;
+       case '#':
+               term.esc |= ESC_TEST;
+               return 0;
+       case 'P': /* DCS -- Device Control String */
+       case '_': /* APC -- Application Program Command */
+       case '^': /* PM -- Privacy Message */
+       case ']': /* OSC -- Operating System Command */
+       case 'k': /* old title set compatibility */
+               tstrsequence(ascii);
+               return 0;
+       case 'n': /* LS2 -- Locking shift 2 */
+       case 'o': /* LS3 -- Locking shift 3 */
+               term.charset = 2 + (ascii - 'n');
+               break;
+       case '(': /* GZD4 -- set primary charset G0 */
+       case ')': /* G1D4 -- set secondary charset G1 */
+       case '*': /* G2D4 -- set tertiary charset G2 */
+       case '+': /* G3D4 -- set quaternary charset G3 */
+               term.icharset = ascii - '(';
+               term.esc |= ESC_ALTCHARSET;
+               return 0;
+       case 'D': /* IND -- Linefeed */
+               if(term.c.y == term.bot) {
+                       tscrollup(term.top, 1);
+               } else {
+                       tmoveto(term.c.x, term.c.y+1);
+               }
+               break;
+       case 'E': /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 'H': /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;
+       case 'M': /* RI -- Reverse index */
+               if(term.c.y == term.top) {
+                       tscrolldown(term.top, 1);
+               } else {
+                       tmoveto(term.c.x, term.c.y-1);
+               }
+               break;
+       case 'Z': /* DECID -- Identify Terminal */
+               ttywrite(vtiden, sizeof(vtiden) - 1);
+               break;
+       case 'c': /* RIS -- Reset to inital state */
+               treset();
+               xresettitle();
+               xloadcols();
+               break;
+       case '=': /* DECPAM -- Application keypad */
+               term.mode |= MODE_APPKEYPAD;
+               break;
+       case '>': /* DECPNM -- Normal keypad */
+               term.mode &= ~MODE_APPKEYPAD;
+               break;
+       case '7': /* DECSC -- Save Cursor */
+               tcursor(CURSOR_SAVE);
+               break;
+       case '8': /* DECRC -- Restore Cursor */
+               tcursor(CURSOR_LOAD);
+               break;
+       case '\\': /* ST -- String Terminator */
+               if(term.esc & ESC_STR_END)
+                       strhandle();
+               break;
+       default:
+               fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+                       (uchar) ascii, isprint(ascii)? ascii:'.');
+               break;
+       }
+       return 1;
+}
+
+void
+tputc(char *c, int len) {
+       uchar ascii;
+       bool control;
+       long unicodep;
+       int width;
+       Glyph *gp;
+
+       if(len == 1) {
+               width = 1;
+               unicodep = ascii = *c;
+       } else {
+               utf8decode(c, &unicodep, UTF_SIZ);
+               if ((width = wcwidth(unicodep)) == -1) {
+                       c = "\357\277\275";     /* UTF_INVALID */
+                       width = 1;
+               }
+               ascii = unicodep;
+       }
+
+       if(IS_SET(MODE_PRINT))
+               tprinter(c, len);
+       control = ISCONTROL(unicodep);
 
        /*
 
        /*
-        * STR sequences must be checked before anything else
-        * because it can use some control codes as part of the sequence.
+        * STR sequence must be checked before anything else
+        * because it uses all following characters until it
+        * receives a ESC, a SUB, a ST or any other C1 control
+        * character.
         */
        if(term.esc & ESC_STR) {
         */
        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:
-                       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();
-                        */
-                       }
+               if(len == 1 &&
+                  (ascii == '\a' || ascii == 030 ||
+                   ascii == 032  || ascii == 033 ||
+                   ISCONTROLC1(unicodep))) {
+                       term.esc &= ~(ESC_START|ESC_STR);
+                       term.esc |= ESC_STR_END;
+               } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
+                       memmove(&strescseq.buf[strescseq.len], c, len);
+                       strescseq.len += len;
+                       return;
+               } 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;
        }
 
        /*
        }
 
        /*
@@ -2372,51 +2737,11 @@ tputc(char *c, int len) {
         * they must not cause conflicts with sequences.
         */
        if(control) {
         * 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);
-                       if (bellvolume)
-                               XBell(xw.dpy, bellvolume);
-                       return;
-               case '\033': /* ESC */
-                       csireset();
-                       term.esc = ESC_START;
-                       return;
-               case '\016': /* SO */
-                       term.charset = 0;
-                       tselcs();
-                       return;
-               case '\017': /* SI */
-                       term.charset = 1;
-                       tselcs();
-                       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;
-               }
+               tcontrolcode(ascii);
+               /*
+                * control codes are not shown ever
+                */
+               return;
        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
@@ -2427,142 +2752,48 @@ tputc(char *c, int len) {
                                csiparse();
                                csihandle();
                        }
                                csiparse();
                                csihandle();
                        }
-               } else if(term.esc & ESC_STR_END) {
-                       term.esc = 0;
-                       if(ascii == '\\')
-                               strhandle();
+                       return;
                } else if(term.esc & ESC_ALTCHARSET) {
                        tdeftran(ascii);
                } else if(term.esc & ESC_ALTCHARSET) {
                        tdeftran(ascii);
-                       tselcs();
-                       term.esc = 0;
                } else if(term.esc & ESC_TEST) {
                } 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;
+                       tdectest(ascii);
                } else {
                } 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 ']': /* OSC -- Operating System Command */
-                       case 'k': /* old title set compatibility */
-                               strreset();
-                               strescseq.type = ascii;
-                               term.esc |= ESC_STR;
-                               break;
-                       case '(': /* set primary charset G0 */
-                       case ')': /* set secondary charset G1 */
-                       case '*': /* set tertiary charset G2 */
-                       case '+': /* set quaternary charset G3 */
-                               term.icharset = ascii - '(';
-                               term.esc |= ESC_ALTCHARSET;
-                               break;
-                       case 'D': /* IND -- Linefeed */
-                               if(term.c.y == term.bot) {
-                                       tscrollup(term.top, 1);
-                               } else {
-                                       tmoveto(term.c.x, term.c.y+1);
-                               }
-                               term.esc = 0;
-                               break;
-                       case 'E': /* NEL -- Next line */
-                               tnewline(1); /* always go to first col */
-                               term.esc = 0;
-                               break;
-                       case 'H': /* HTS -- Horizontal tab stop */
-                               term.tabs[term.c.x] = 1;
-                               term.esc = 0;
-                               break;
-                       case 'M': /* RI -- Reverse index */
-                               if(term.c.y == term.top) {
-                                       tscrolldown(term.top, 1);
-                               } else {
-                                       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;
-                               xresettitle();
-                               xloadcols();
-                               break;
-                       case '=': /* DECPAM -- Application keypad */
-                               term.mode |= MODE_APPKEYPAD;
-                               term.esc = 0;
-                               break;
-                       case '>': /* DECPNM -- Normal keypad */
-                               term.mode &= ~MODE_APPKEYPAD;
-                               term.esc = 0;
-                               break;
-                       case '7': /* DECSC -- Save Cursor */
-                               tcursor(CURSOR_SAVE);
-                               term.esc = 0;
-                               break;
-                       case '8': /* DECRC -- Restore Cursor */
-                               tcursor(CURSOR_LOAD);
-                               term.esc = 0;
-                               break;
-                       case '\\': /* ST -- Stop */
-                               term.esc = 0;
-                               break;
-                       default:
-                               fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
-                                       (uchar) ascii, isprint(ascii)? ascii:'.');
-                               term.esc = 0;
-                       }
+                       if (!eschandle(ascii))
+                               return;
+                       /* sequence already finished */
                }
                }
+               term.esc = 0;
                /*
                 * All characters which form part of a sequence are not
                 * printed
                 */
                return;
        }
                /*
                 * 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.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
+
+       gp = &term.line[term.c.y][term.c.x];
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
-               term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+               gp->mode |= ATTR_WRAP;
                tnewline(1);
                tnewline(1);
+               gp = &term.line[term.c.y][term.c.x];
        }
 
        }
 
-       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));
-       }
+       if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
+               memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));
 
 
-       if(term.c.x+width > term.col)
+       if(term.c.x+width > term.col) {
                tnewline(1);
                tnewline(1);
+               gp = &term.line[term.c.y][term.c.x];
+       }
 
        tsetchar(c, &term.c.attr, term.c.x, term.c.y);
 
        if(width == 2) {
 
        tsetchar(c, &term.c.attr, term.c.x, term.c.y);
 
        if(width == 2) {
-               term.line[term.c.y][term.c.x].mode |= ATTR_WIDE;
+               gp->mode |= ATTR_WIDE;
                if(term.c.x+1 < term.col) {
                if(term.c.x+1 < term.col) {
-                       term.line[term.c.y][term.c.x+1].c[0] = '\0';
-                       term.line[term.c.y][term.c.x+1].mode = ATTR_WDUMMY;
+                       gp[1].c[0] = '\0';
+                       gp[1].mode = ATTR_WDUMMY;
                }
        }
        if(term.c.x+width < term.col) {
                }
        }
        if(term.c.x+width < term.col) {
@@ -2572,32 +2803,33 @@ tputc(char *c, int len) {
        }
 }
 
        }
 }
 
-int
+void
 tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
 tresize(int col, int row) {
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
-       int slide = term.c.y - row + 1;
        bool *bp;
        bool *bp;
-       Line *orig;
+       TCursor c;
 
 
-       if(col < 1 || row < 1)
-               return 0;
+       if(col < 1 || row < 1) {
+               fprintf(stderr,
+                       "tresize: error resizing to %dx%d\n", col, row);
+               return;
+       }
 
 
-       /* free unneeded rows */
-       i = 0;
-       if(slide > 0) {
-               /*
-                * slide screen to keep cursor where we expect it -
-                * tscrollup would work here, but we can optimize to
-                * memmove because we're freeing the earlier lines
-                */
-               for(/* i = 0 */; i < slide; i++) {
-                       free(term.line[i]);
-                       free(term.alt[i]);
-               }
-               memmove(term.line, term.line + slide, row * sizeof(Line));
-               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       /*
+        * slide screen to keep cursor where we expect it -
+        * tscrollup would work here, but we can optimize to
+        * memmove because we're freeing the earlier lines
+        */
+       for(i = 0; i <= term.c.y - row; i++) {
+               free(term.line[i]);
+               free(term.alt[i]);
+       }
+       /* ensure that both src and dst are not NULL */
+       if (i > 0) {
+               memmove(term.line, term.line + i, row * sizeof(Line));
+               memmove(term.alt, term.alt + i, row * sizeof(Line));
        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);
        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);
@@ -2612,14 +2844,12 @@ tresize(int col, int row) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
-               term.dirty[i] = 1;
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
-               term.dirty[i] = 1;
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }
@@ -2639,9 +2869,9 @@ tresize(int col, int row) {
        tsetscroll(0, row-1);
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        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 {
+       /* Clearing both screens (it makes dirty all lines) */
+       c = term.c;
+       for(i = 0; i < 2; i++) {
                if(mincol < col && 0 < minrow) {
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }
                if(mincol < col && 0 < minrow) {
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }
@@ -2649,9 +2879,9 @@ tresize(int col, int row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }
                tswapscreen();
                        tclearregion(0, minrow, col - 1, row - 1);
                }
                tswapscreen();
-       } while(orig != term.line);
-
-       return (slide > 0);
+               tcursor(CURSOR_LOAD);
+       }
+       term.c = c;
 }
 
 void
 }
 
 void
@@ -2666,24 +2896,24 @@ xresize(int col, int row) {
        xclear(0, 0, xw.w, xw.h);
 }
 
        xclear(0, 0, xw.w, xw.h);
 }
 
-static inline ushort
+ushort
 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
 void
 xloadcols(void) {
 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
 void
 xloadcols(void) {
-       int i, r, g, b;
+       int i;
        XRenderColor color = { .alpha = 0xffff };
        static bool loaded;
        XRenderColor color = { .alpha = 0xffff };
        static bool loaded;
-       Colour *cp;
+       Color *cp;
 
        if(loaded) {
                for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 
 
        if(loaded) {
                for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 
-       /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
+       /* load colors [0-15] and [256-LEN(colorname)] (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
@@ -2692,27 +2922,20 @@ xloadcols(void) {
                }
        }
 
                }
        }
 
-       /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++) {
-               for(g = 0; g < 6; g++) {
-                       for(b = 0; b < 6; b++) {
-                               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++;
-                       }
-               }
+       /* load colors [16-231] ; same colors as xterm */
+       for(i = 16; i < 6*6*6+16; i++) {
+               color.red   = sixd_to_16bit( ((i-16)/36)%6 );
+               color.green = sixd_to_16bit( ((i-16)/6) %6 );
+               color.blue  = sixd_to_16bit( ((i-16)/1) %6 );
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
+                       die("Could not allocate color %d\n", i);
        }
 
        }
 
-       for(r = 0; r < 24; r++, i++) {
-               color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
-               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color,
-                                       &dc.col[i])) {
+       /* load colors [232-255] ; grayscale */
+       for(; i < 256; i++) {
+               color.red = color.green = color.blue = 0x0808 + 0x0a0a * (i-(6*6*6+16));
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &dc.col[i]))
                        die("Could not allocate color %d\n", i);
                        die("Could not allocate color %d\n", i);
-               }
        }
        loaded = true;
 }
        }
        loaded = true;
 }
@@ -2720,33 +2943,45 @@ xloadcols(void) {
 int
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
 int
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
-       Colour colour;
-       if (x < 0 || x > LEN(colorname))
-               return -1;
+       Color ncolor;
+
+       if(!BETWEEN(x, 0, LEN(colorname)))
+               return 1;
+
        if(!name) {
        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 {
+               if(BETWEEN(x, 16, 16 + 215)) { /* 256 color */
+                       color.red   = sixd_to_16bit( ((x-16)/36)%6 );
+                       color.green = sixd_to_16bit( ((x-16)/6) %6 );
+                       color.blue  = sixd_to_16bit( ((x-16)/1) %6 );
+                       if(!XftColorAllocValue(xw.dpy, xw.vis,
+                                               xw.cmap, &color, &ncolor)) {
+                               return 1;
+                       }
+
+                       XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
+                       dc.col[x] = ncolor;
+                       return 0;
+               } else if(BETWEEN(x, 16 + 216, 255)) { /* greyscale */
+                       color.red = color.green = color.blue = \
+                                   0x0808 + 0x0a0a * (x - (16 + 216));
+                       if(!XftColorAllocValue(xw.dpy, xw.vis,
+                                               xw.cmap, &color, &ncolor)) {
+                               return 1;
+                       }
+
+                       XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
+                       dc.col[x] = ncolor;
+                       return 0;
+               } else { /* system colors */
                        name = colorname[x];
                }
        }
                        name = colorname[x];
                }
        }
-       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
-               return 0;
-       dc.col[x] = colour;
-       return 1;
+       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &ncolor))
+               return 1;
+
+       XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
+       dc.col[x] = ncolor;
+       return 0;
 }
 
 void
 }
 
 void
@@ -2776,24 +3011,44 @@ xhints(void) {
        XSizeHints *sizeh = NULL;
 
        sizeh = XAllocSizeHints();
        XSizeHints *sizeh = NULL;
 
        sizeh = XAllocSizeHints();
-       if(xw.isfixed == False) {
-               sizeh->flags = PSize | PResizeInc | PBaseSize;
-               sizeh->height = xw.h;
-               sizeh->width = xw.w;
-               sizeh->height_inc = xw.ch;
-               sizeh->width_inc = xw.cw;
-               sizeh->base_height = 2 * borderpx;
-               sizeh->base_width = 2 * borderpx;
-       } else {
-               sizeh->flags = PMaxSize | PMinSize;
-               sizeh->min_width = sizeh->max_width = xw.fw;
-               sizeh->min_height = sizeh->max_height = xw.fh;
+
+       sizeh->flags = PSize | PResizeInc | PBaseSize;
+       sizeh->height = xw.h;
+       sizeh->width = xw.w;
+       sizeh->height_inc = xw.ch;
+       sizeh->width_inc = xw.cw;
+       sizeh->base_height = 2 * borderpx;
+       sizeh->base_width = 2 * borderpx;
+       if(xw.isfixed == True) {
+               sizeh->flags |= PMaxSize | PMinSize;
+               sizeh->min_width = sizeh->max_width = xw.w;
+               sizeh->min_height = sizeh->max_height = xw.h;
+       }
+       if(xw.gm & (XValue|YValue)) {
+               sizeh->flags |= USPosition | PWinGravity;
+               sizeh->x = xw.l;
+               sizeh->y = xw.t;
+               sizeh->win_gravity = xgeommasktogravity(xw.gm);
        }
 
        }
 
-       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
+                       &class);
        XFree(sizeh);
 }
 
        XFree(sizeh);
 }
 
+int
+xgeommasktogravity(int mask) {
+       switch(mask & (XNegative|YNegative)) {
+       case 0:
+               return NorthWestGravity;
+       case XNegative:
+               return NorthEastGravity;
+       case YNegative:
+               return SouthWestGravity;
+       }
+       return SouthEastGravity;
+}
+
 int
 xloadfont(Font *f, FcPattern *pattern) {
        FcPattern *match;
 int
 xloadfont(Font *f, FcPattern *pattern) {
        FcPattern *match;
@@ -2827,6 +3082,7 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;
+       float ceilf(float);
 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
@@ -2837,7 +3093,7 @@ xloadfonts(char *fontstr, double fontsize) {
        if(!pattern)
                die("st: can't open font %s\n", fontstr);
 
        if(!pattern)
                die("st: can't open font %s\n", fontstr);
 
-       if(fontsize > 0) {
+       if(fontsize > 1) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
@@ -2857,6 +3113,7 @@ xloadfonts(char *fontstr, double fontsize) {
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }
+               defaultfontsize = usedfontsize;
        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);
        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);
@@ -2869,11 +3126,13 @@ xloadfonts(char *fontstr, double fontsize) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;
+               if(fontsize == 0)
+                       defaultfontsize = fontval;
        }
 
        /* Setting character width and height. */
        }
 
        /* Setting character width and height. */
-       xw.cw = CEIL(dc.font.width * cwscale);
-       xw.ch = CEIL(dc.font.height * chscale);
+       xw.cw = ceilf(dc.font.width * cwscale);
+       xw.ch = ceilf(dc.font.height * chscale);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
@@ -2893,15 +3152,6 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPatternDestroy(pattern);
 }
 
        FcPatternDestroy(pattern);
 }
 
-int
-xloadfontset(Font *f) {
-       FcResult result;
-
-       if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
-               return 1;
-       return 0;
-}
-
 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);
 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);
@@ -2912,13 +3162,9 @@ xunloadfont(Font *f) {
 
 void
 xunloadfonts(void) {
 
 void
 xunloadfonts(void) {
-       int i;
-
        /* Free the loaded fonts in the font cache.  */
        /* Free the loaded fonts in the font cache.  */
-       for(i = 0; i < frclen; i++) {
-               XftFontClose(xw.dpy, frc[i].font);
-       }
-       frclen = 0;
+       while(frclen > 0)
+               XftFontClose(xw.dpy, frc[--frclen].font);
 
        xunloadfont(&dc.font);
        xunloadfont(&dc.bfont);
 
        xunloadfont(&dc.font);
        xunloadfont(&dc.bfont);
@@ -2928,10 +3174,29 @@ xunloadfonts(void) {
 
 void
 xzoom(const Arg *arg) {
 
 void
 xzoom(const Arg *arg) {
+       Arg larg;
+
+       larg.i = usedfontsize + arg->i;
+       xzoomabs(&larg);
+}
+
+void
+xzoomabs(const Arg *arg) {
        xunloadfonts();
        xunloadfonts();
-       xloadfonts(usedfont, usedfontsize + arg->i);
+       xloadfonts(usedfont, arg->i);
        cresize(0, 0);
        cresize(0, 0);
-       redraw(0);
+       redraw();
+       xhints();
+}
+
+void
+xzoomreset(const Arg *arg) {
+       Arg larg;
+
+       if(defaultfontsize > 0) {
+               larg.i = defaultfontsize;
+               xzoomabs(&larg);
+       }
 }
 
 void
 }
 
 void
@@ -2939,7 +3204,6 @@ xinit(void) {
        XGCValues gcvalues;
        Cursor cursor;
        Window parent;
        XGCValues gcvalues;
        Cursor cursor;
        Window parent;
-       int sw, sh;
        pid_t thispid = getpid();
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
        pid_t thispid = getpid();
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
@@ -2959,23 +3223,12 @@ xinit(void) {
        xloadcols();
 
        /* adjust fixed window geometry */
        xloadcols();
 
        /* adjust fixed window geometry */
-       if(xw.isfixed) {
-               sw = DisplayWidth(xw.dpy, xw.scr);
-               sh = DisplayHeight(xw.dpy, xw.scr);
-               if(xw.fx < 0)
-                       xw.fx = sw + xw.fx - xw.fw - 1;
-               if(xw.fy < 0)
-                       xw.fy = sh + xw.fy - xw.fh - 1;
-
-               xw.h = xw.fh;
-               xw.w = xw.fw;
-       } else {
-               /* window - default size */
-               xw.h = 2 * borderpx + term.row * xw.ch;
-               xw.w = 2 * borderpx + term.col * xw.cw;
-               xw.fx = 0;
-               xw.fy = 0;
-       }
+       xw.w = 2 * borderpx + term.col * xw.cw;
+       xw.h = 2 * borderpx + term.row * xw.ch;
+       if(xw.gm & XNegative)
+               xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2;
+       if(xw.gm & YNegative)
+               xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2;
 
        /* Events */
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;
 
        /* Events */
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;
@@ -2986,9 +3239,9 @@ xinit(void) {
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        xw.attrs.colormap = xw.cmap;
 
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        xw.attrs.colormap = xw.cmap;
 
-       parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
-                       XRootWindow(xw.dpy, xw.scr);
-       xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
+       if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+               parent = XRootWindow(xw.dpy, xw.scr);
+       xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
                        | CWEventMask | CWColormap, &xw.attrs);
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
                        | CWEventMask | CWColormap, &xw.attrs);
@@ -3037,30 +3290,30 @@ xinit(void) {
 
        xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
 
        xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
        XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
-                       PropModeReplace, (unsigned char *)&thispid, 1);
+                       PropModeReplace, (uchar *)&thispid, 1);
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
 
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
-       XSync(xw.dpy, 0);
+       XSync(xw.dpy, False);
 }
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
            width = charlen * xw.cw, xp, i;
 }
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
            width = charlen * xw.cw, xp, i;
-       int frcflags;
+       int frcflags, charexists;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
-       long u8char;
+       long unicodep;
        Font *font = &dc.font;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;
        Font *font = &dc.font;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;
-       Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
+       Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
        XRenderColor colfg, colbg;
        XRenderColor colfg, colbg;
-       Rectangle r;
+       XRectangle r;
        int oneatatime;
 
        frcflags = FRC_NORMAL;
        int oneatatime;
 
        frcflags = FRC_NORMAL;
@@ -3079,6 +3332,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                if(base.fg == defaultfg)
                        base.fg = defaultunderline;
        }
                if(base.fg == defaultfg)
                        base.fg = defaultunderline;
        }
+
        if(IS_TRUECOL(base.fg)) {
                colfg.alpha = 0xffff;
                colfg.red = TRUERED(base.fg);
        if(IS_TRUECOL(base.fg)) {
                colfg.alpha = 0xffff;
                colfg.red = TRUERED(base.fg);
@@ -3101,27 +3355,21 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                bg = &dc.col[base.bg];
        }
 
                bg = &dc.col[base.bg];
        }
 
-
-
        if(base.mode & ATTR_BOLD) {
        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
+                * change basic system colors [0-7]
+                * to bright system colors [8-15]
                 */
                 */
-               font = &dc.bfont;
-               frcflags = FRC_BOLD;
+               if(BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT))
+                       fg = &dc.col[base.fg + 8];
+
+               if(base.mode & ATTR_ITALIC) {
+                       font = &dc.ibfont;
+                       frcflags = FRC_ITALICBOLD;
+               } else {
+                       font = &dc.bfont;
+                       frcflags = FRC_BOLD;
+               }
        }
 
        if(IS_SET(MODE_REVERSE)) {
        }
 
        if(IS_SET(MODE_REVERSE)) {
@@ -3132,7 +3380,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;
-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
+                                       &revfg);
                        fg = &revfg;
                }
 
                        fg = &revfg;
                }
 
@@ -3143,7 +3392,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;
-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
+                                       &revbg);
                        bg = &revbg;
                }
        }
                        bg = &revbg;
                }
        }
@@ -3154,9 +3404,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                bg = temp;
        }
 
                bg = temp;
        }
 
+       if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
+               colfg.red = fg->color.red / 2;
+               colfg.green = fg->color.green / 2;
+               colfg.blue = fg->color.blue / 2;
+               XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+               fg = &revfg;
+       }
+
        if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 
        if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 
+       if(base.mode & ATTR_INVISIBLE)
+               fg = bg;
+
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
@@ -3194,44 +3455,43 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                oneatatime = font->width != xw.cw;
                for(;;) {
                        u8c = s;
                oneatatime = font->width != xw.cw;
                for(;;) {
                        u8c = s;
-                       u8cblen = utf8decode(s, &u8char);
+                       u8cblen = utf8decode(s, &unicodep, UTF_SIZ);
                        s += u8cblen;
                        bytelen -= u8cblen;
 
                        s += u8cblen;
                        bytelen -= u8cblen;
 
-                       doesexist = XftCharExists(xw.dpy, font->match, u8char);
-                       if(oneatatime || !doesexist || bytelen <= 0) {
-                               if(oneatatime || bytelen <= 0) {
-                                       if(doesexist) {
-                                               u8fl++;
-                                               u8fblen += u8cblen;
-                                       }
-                               }
-
-                               if(u8fl > 0) {
-                                       XftDrawStringUtf8(xw.draw, fg,
-                                                       font->match, xp,
-                                                       winy + font->ascent,
-                                                       (FcChar8 *)u8fs,
-                                                       u8fblen);
-                                       xp += xw.cw * u8fl;
-
-                               }
-                               break;
+                       doesexist = XftCharExists(xw.dpy, font->match, unicodep);
+                       if(doesexist) {
+                                       u8fl++;
+                                       u8fblen += u8cblen;
+                                       if(!oneatatime && bytelen > 0)
+                                                       continue;
                        }
 
                        }
 
-                       u8fl++;
-                       u8fblen += u8cblen;
+                       if(u8fl > 0) {
+                               XftDrawStringUtf8(xw.draw, fg,
+                                               font->match, xp,
+                                               winy + font->ascent,
+                                               (FcChar8 *)u8fs,
+                                               u8fblen);
+                               xp += xw.cw * u8fl;
+                       }
+                       break;
                }
                if(doesexist) {
                }
                if(doesexist) {
-                       if (oneatatime)
+                       if(oneatatime)
                                continue;
                        break;
                }
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {
                                continue;
                        break;
                }
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {
-                       if(XftCharExists(xw.dpy, frc[i].font, u8char)
-                                       && frc[i].flags == frcflags) {
+                       charexists = XftCharExists(xw.dpy, frc[i].font, unicodep);
+                       /* Everything correct. */
+                       if(charexists && frc[i].flags == frcflags)
+                               break;
+                       /* We got a default font for a not found glyph. */
+                       if(!charexists && frc[i].flags == frcflags \
+                                       && frc[i].unicodep == unicodep) {
                                break;
                        }
                }
                                break;
                        }
                }
@@ -3239,18 +3499,21 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
-                               xloadfontset(font);
+                               font->set = FcFontSort(0, font->pattern,
+                                                      FcTrue, 0, &fcres);
                        fcsets[0] = font->set;
 
                        /*
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                         * font for one single character.
                        fcsets[0] = font->set;
 
                        /*
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                         * font for one single character.
+                        *
+                        * Xft and fontconfig are design failures.
                         */
                        fcpattern = FcPatternDuplicate(font->pattern);
                        fccharset = FcCharSetCreate();
 
                         */
                        fcpattern = FcPatternDuplicate(font->pattern);
                        fccharset = FcCharSetCreate();
 
-                       FcCharSetAddChar(fccharset, u8char);
+                       FcCharSetAddChar(fccharset, unicodep);
                        FcPatternAddCharSet(fcpattern, FC_CHARSET,
                                        fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE,
                        FcPatternAddCharSet(fcpattern, FC_CHARSET,
                                        fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE,
@@ -3260,8 +3523,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 
-                       fontpattern = FcFontSetMatch(0, fcsets,
-                                       FcTrue, fcpattern, &fcres);
+                       fontpattern = FcFontSetMatch(0, fcsets, 1,
+                                       fcpattern, &fcres);
 
                        /*
                         * Overwrite or create the new cache entry.
 
                        /*
                         * Overwrite or create the new cache entry.
@@ -3269,11 +3532,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);
+                               frc[frclen].unicodep = 0;
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;
+                       frc[frclen].unicodep = unicodep;
 
                        i = frclen;
                        frclen++;
 
                        i = frclen;
                        frclen++;
@@ -3286,9 +3551,15 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                xp, winy + frc[i].font->ascent,
                                (FcChar8 *)u8c, u8cblen);
 
                                xp, winy + frc[i].font->ascent,
                                (FcChar8 *)u8c, u8cblen);
 
-               xp += xw.cw * wcwidth(u8char);
+               xp += xw.cw * wcwidth(unicodep);
        }
 
        }
 
+       /*
+        * This is how the loop above actually should be. Why does the
+        * application have to care about font details?
+        *
+        * I have to repeat: Xft and Fontconfig are design failures.
+        */
        /*
        XftDrawStringUtf8(xw.draw, fg, font->set, winx,
                        winy + font->ascent, (FcChar8 *)s, bytelen);
        /*
        XftDrawStringUtf8(xw.draw, fg, font->set, winx,
                        winy + font->ascent, (FcChar8 *)s, bytelen);
@@ -3298,8 +3569,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }
                XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
                                width, 1);
        }
-       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, winx, winy, width,
-                       CEIL((font->ascent + font->descent) * chscale), winx, winy);
+
+       if(base.mode & ATTR_STRUCK) {
+               XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3,
+                               width, 1);
+       }
 
        /* Reset clip to none. */
        XftDrawSetClip(xw.draw, 0);
 
        /* Reset clip to none. */
        XftDrawSetClip(xw.draw, 0);
@@ -3325,44 +3599,65 @@ xdrawcursor(void) {
        memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        /* remove the old cursor */
        memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        /* remove the old cursor */
-       sl = utf8size(term.line[oldy][oldx].c);
+       sl = utf8len(term.line[oldy][oldx].c);
        width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
                        oldy, width, sl);
 
        width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
                        oldy, width, sl);
 
+       if(IS_SET(MODE_HIDE))
+               return;
+
        /* draw the new one */
        /* draw the new one */
-       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;
-                       }
+       if(xw.state & WIN_FOCUSED) {
+               switch (xw.cursor) {
+                       case 0: /* Blinking Block */
+                       case 1: /* Blinking Block (Default) */
+                       case 2: /* Steady Block */
+                               if(IS_SET(MODE_REVERSE)) {
+                                               g.mode |= ATTR_REVERSE;
+                                               g.fg = defaultcs;
+                                               g.bg = defaultfg;
+                                       }
 
 
-                       sl = utf8size(g.c);
-                       width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
-                               ? 2 : 1;
-                       xdraws(g.c, g, term.c.x, term.c.y, width, sl);
-               } else {
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       xw.cw - 1, 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + (curx + 1) * xw.cw - 1,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + (term.c.y + 1) * xw.ch - 1,
-                                       xw.cw, 1);
+                               sl = utf8len(g.c);
+                               width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
+                                       ? 2 : 1;
+                               xdraws(g.c, g, term.c.x, term.c.y, width, sl);
+                               break;
+                       case 3: /* Blinking Underline */
+                       case 4: /* Steady Underline */
+                               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                               borderpx + curx * xw.cw,
+                                               borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+                                               xw.cw, cursorthickness);
+                               break;
+                       case 5: /* Blinking bar */
+                       case 6: /* Steady bar */
+                               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);
+                               break;
                }
                }
-               oldx = curx, oldy = term.c.y;
+       } else {
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               xw.cw - 1, 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + (curx + 1) * xw.cw - 1,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + (term.c.y + 1) * xw.ch - 1,
+                               xw.cw, 1);
        }
        }
+       oldx = curx, oldy = term.c.y;
 }
 
 
 }
 
 
@@ -3383,21 +3678,16 @@ xresettitle(void) {
 }
 
 void
 }
 
 void
-redraw(int timeout) {
-       struct timespec tv = {0, timeout * 1000};
-
+redraw(void) {
        tfulldirt();
        draw();
        tfulldirt();
        draw();
-
-       if(timeout > 0) {
-               nanosleep(&tv, NULL);
-               XSync(xw.dpy, False); /* necessary for a good tput flash */
-       }
 }
 
 void
 draw(void) {
        drawregion(0, 0, term.col, term.row);
 }
 
 void
 draw(void) {
        drawregion(0, 0, term.col, term.row);
+       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);
        XSetForeground(xw.dpy, dc.gc,
                        dc.col[IS_SET(MODE_REVERSE)?
                                defaultfg : defaultbg].pixel);
@@ -3408,11 +3698,8 @@ 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.ob.x != -1;
-       long u8char;
-
-       if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
-               ena_sel = 0;
+       bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
+       long unicodep;
 
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        if(!(xw.state & WIN_VISIBLE))
                return;
@@ -3441,7 +3728,7 @@ drawregion(int x1, int y1, int x2, int y2) {
                                base = new;
                        }
 
                                base = new;
                        }
 
-                       sl = utf8decode(new.c, &u8char);
+                       sl = utf8decode(new.c, &unicodep, UTF_SIZ);
                        memcpy(buf+ib, new.c, sl);
                        ib += sl;
                        ic += (new.mode & ATTR_WIDE)? 2 : 1;
                        memcpy(buf+ib, new.c, sl);
                        ib += sl;
                        ic += (new.mode & ATTR_WIDE)? 2 : 1;
@@ -3460,7 +3747,7 @@ expose(XEvent *ev) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        }
-       redraw(0);
+       redraw();
 }
 
 void
 }
 
 void
@@ -3490,7 +3777,7 @@ void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 
-       h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
+       MODBIT(h->flags, add, XUrgencyHint);
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
 }
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
 }
@@ -3516,7 +3803,7 @@ focus(XEvent *ev) {
        }
 }
 
        }
 }
 
-static inline bool
+bool
 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
@@ -3600,7 +3887,7 @@ kpress(XEvent *ev) {
                if(IS_SET(MODE_8BIT)) {
                        if(*buf < 0177) {
                                c = *buf | 0x80;
                if(IS_SET(MODE_8BIT)) {
                        if(*buf < 0177) {
                                c = *buf | 0x80;
-                               len = utf8encode(&c, buf);
+                               len = utf8encode(c, buf, UTF_SIZ);
                        }
                } else {
                        buf[1] = buf[0];
                        }
                } else {
                        buf[1] = buf[0];
@@ -3663,39 +3950,33 @@ run(void) {
        int w = xw.w, h = xw.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
        int w = xw.w, h = xw.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
-       struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+       struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
+       long deltatime;
 
        /* Waiting for window mapping */
 
        /* Waiting for window mapping */
-       while(1) {
+       do {
                XNextEvent(xw.dpy, &ev);
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                XNextEvent(xw.dpy, &ev);
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
-               } else if(ev.type == MapNotify) {
-                       break;
                }
                }
-       }
+       } while(ev.type != MapNotify);
 
        ttynew();
 
        ttynew();
-       if(!xw.isfixed)
-               cresize(w, h);
-       else
-               cresize(xw.fw, xw.fh);
+       cresize(w, h);
 
 
-       gettimeofday(&lastblink, NULL);
-       gettimeofday(&last, NULL);
+       clock_gettime(CLOCK_MONOTONIC, &last);
+       lastblink = last;
 
        for(xev = actionfps;;) {
 
        for(xev = actionfps;;) {
-               long deltatime;
-
                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) {
+               if(pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
                        if(errno == EINTR)
                                continue;
                        if(errno == EINTR)
                                continue;
-                       die("select failed: %s\n", SERRNO);
+                       die("select failed: %s\n", strerror(errno));
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
@@ -3709,21 +3990,20 @@ run(void) {
                if(FD_ISSET(xfd, &rfd))
                        xev = actionfps;
 
                if(FD_ISSET(xfd, &rfd))
                        xev = actionfps;
 
-               gettimeofday(&now, NULL);
+               clock_gettime(CLOCK_MONOTONIC, &now);
                drawtimeout.tv_sec = 0;
                drawtimeout.tv_sec = 0;
-               drawtimeout.tv_usec = (1000/xfps) * 1000;
+               drawtimeout.tv_nsec = (1000/xfps) * 1E6;
                tv = &drawtimeout;
 
                dodraw = 0;
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
                tv = &drawtimeout;
 
                dodraw = 0;
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
-                       gettimeofday(&lastblink, NULL);
+                       lastblink = now;
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
-               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
-                               || deltatime < 0) {
+               if(deltatime > 1000 / (xev ? xfps : actionfps)) {
                        dodraw = 1;
                        last = now;
                }
                        dodraw = 1;
                        last = now;
                }
@@ -3746,13 +4026,16 @@ run(void) {
                                if(blinkset) {
                                        if(TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {
                                if(blinkset) {
                                        if(TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {
-                                               drawtimeout.tv_usec = 1;
+                                               drawtimeout.tv_nsec = 1000;
                                        } else {
                                        } else {
-                                               drawtimeout.tv_usec = (1000 * \
+                                               drawtimeout.tv_nsec = (1E6 * \
                                                        (blinktimeout - \
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }
                                                        (blinktimeout - \
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }
+                                       drawtimeout.tv_sec = \
+                                           drawtimeout.tv_nsec / 1E9;
+                                       drawtimeout.tv_nsec %= (long)1E9;
                                } else {
                                        tv = NULL;
                                }
                                } else {
                                        tv = NULL;
                                }
@@ -3763,19 +4046,21 @@ run(void) {
 
 void
 usage(void) {
 
 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);
+       die("%s " VERSION " (c) 2010-2015 st engineers\n"
+       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n"
+       "       st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n",
+       argv0);
 }
 
 int
 main(int argc, char *argv[]) {
 }
 
 int
 main(int argc, char *argv[]) {
-       int bitm, xr, yr;
-       uint wr, hr;
-       char *titles;
+       uint cols = 80, rows = 24;
 
 
-       xw.fw = xw.fh = xw.fx = xw.fy = 0;
+       xw.l = xw.t = 0;
        xw.isfixed = False;
        xw.isfixed = False;
+       xw.cursor = 0;
 
        ARGBEGIN {
        case 'a':
 
        ARGBEGIN {
        case 'a':
@@ -3785,39 +4070,25 @@ main(int argc, char *argv[]) {
                opt_class = EARGF(usage());
                break;
        case 'e':
                opt_class = EARGF(usage());
                break;
        case 'e':
-               /* eat all remaining arguments */
-               if(argc > 1) {
-                       opt_cmd = &argv[1];
-                       if(argv[1] != NULL && opt_title == NULL) {
-                               titles = strdup(argv[1]);
-                               opt_title = basename(titles);
-                       }
-               }
+               if(argc > 1)
+                       --argc, ++argv;
                goto run;
        case 'f':
                opt_font = EARGF(usage());
                break;
        case 'g':
                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 & YNegative && xw.fy == 0)
-                       xw.fy = -1;
-
-               if(xw.fh != 0 && xw.fw != 0)
-                       xw.isfixed = True;
+               xw.gm = XParseGeometry(EARGF(usage()),
+                               &xw.l, &xw.t, &cols, &rows);
+               break;
+       case 'i':
+               xw.isfixed = True;
                break;
        case 'o':
                opt_io = EARGF(usage());
                break;
                break;
        case 'o':
                opt_io = EARGF(usage());
                break;
+       case 'l':
+               opt_line = EARGF(usage());
+               break;
        case 't':
                opt_title = EARGF(usage());
                break;
        case 't':
                opt_title = EARGF(usage());
                break;
@@ -3830,9 +4101,15 @@ main(int argc, char *argv[]) {
        } ARGEND;
 
 run:
        } ARGEND;
 
 run:
+       if(argc > 0) {
+               /* eat all remaining arguments */
+               opt_cmd = argv;
+               if(!opt_title)
+                       opt_title = basename(xstrdup(argv[0]));
+       }
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
-       tnew(80, 24);
+       tnew(MAX(cols, 1), MAX(rows, 1));
        xinit();
        selinit();
        run();
        xinit();
        selinit();
        run();