Add support for enabling/disabling utf

[st.git] / st.c

diff --git a/st.c b/st.c
index ac1954e..ebbd7ca 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>


@@ -6,17 +6,18 @@
 #include <locale.h>
 #include <pwd.h>
 #include <stdarg.h>
 #include <locale.h>
 #include <pwd.h>
 #include <stdarg.h>

-#include <stdbool.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>

+#include <stdint.h>

 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <termios.h>

 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>
 #include <time.h>
 #include <unistd.h>
 #include <libgen.h>


@@ -26,7 +27,9 @@
 #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 <fontconfig/fontconfig.h>

+#include <wchar.h>

 
 #include "arg.h"
 
 
 #include "arg.h"
 


@@ -34,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>


@@ -53,41 +52,56 @@ 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 STR_BUF_SIZ   ESC_BUF_SIZ
 #define STR_ARG_SIZ   ESC_ARG_SIZ
 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   ESC_BUF_SIZ
 #define STR_ARG_SIZ   ESC_ARG_SIZ

-#define DRAW_BUF_SIZ  20*1024

 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
 #define XK_ANY_MOD    UINT_MAX
 #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 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 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 VT102ID "\033[?6c"
+#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 DEFAULT(a, b)          (a) = (a) ? (a) : (b)
+#define BETWEEN(x, a, b)       ((a) <= (x) && (x) <= (b))
+#define DIVCEIL(n, d)          (((n) + ((d) - 1)) / (d))
+#define ISCONTROLC0(c)         (BETWEEN(c, 0, 0x1f) || (c) == '\177')
+#define ISCONTROLC1(c)         (BETWEEN(c, 0x80, 0x9f))
+#define ISCONTROL(c)           (ISCONTROLC0(c) || ISCONTROLC1(c))
+#define ISDELIM(u)             (utf8strchr(worddelimiters, u) != NULL)
+#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_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 TRUERED(x)             (((x) & 0xff0000) >> 8)
+#define TRUEGREEN(x)           (((x) & 0xff00))
+#define TRUEBLUE(x)            (((x) & 0xff) << 8)
+

 
 enum glyph_attribute {
 
 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_NULL       = 0,
+       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,
+       ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,

 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {


@@ -98,46 +112,65 @@ enum cursor_movement {
 enum cursor_state {
        CURSOR_DEFAULT  = 0,
        CURSOR_WRAPNEXT = 1,
 enum cursor_state {
        CURSOR_DEFAULT  = 0,
        CURSOR_WRAPNEXT = 1,

-       CURSOR_ORIGIN   = 2
+       CURSOR_ORIGIN   = 2

 };
 
 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_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_UTF8        = 1 << 21,

        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\

-                          |MODE_MOUSEMANY,
+                         |MODE_MOUSEMANY,
+};
+
+enum charset {
+       CS_GRAPHIC0,
+       CS_GRAPHIC1,
+       CS_UK,
+       CS_USA,
+       CS_MULTI,
+       CS_GER,
+       CS_FIN

 };
 
 enum escape_state {
        ESC_START      = 1,
 };
 
 enum escape_state {
        ESC_START      = 1,

-       ESC_CSI = 2,
-       ESC_STR = 4, /* DSC, OSC, PM, APC */
+       ESC_CSI        = 2,
+       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 */

+       ESC_UTF8       = 64,

 };
 
 enum window_state {
        WIN_VISIBLE = 1,
 };
 
 enum window_state {
        WIN_VISIBLE = 1,

-       WIN_REDRAW  = 2,
-       WIN_FOCUSED = 4
+       WIN_FOCUSED = 2
+};
+
+enum selection_mode {
+       SEL_IDLE = 0,
+       SEL_EMPTY = 1,
+       SEL_READY = 2

 };
 
 enum selection_type {
 };
 
 enum selection_type {


@@ -155,95 +188,106 @@ typedef unsigned int uint;
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 

+typedef uint_least32_t Rune;
+
+typedef XftDraw *Draw;
+typedef XftColor Color;
+

 typedef struct {
 typedef struct {

-       char c[UTF_SIZ];     /* character code */
-       uchar mode;  /* attribute flags */
-       ushort fg;   /* foreground  */
-       ushort bg;   /* background  */
+       Rune u;           /* character code */
+       ushort mode;      /* attribute flags */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */

 } Glyph;
 
 typedef Glyph *Line;
 
 typedef struct {
 } Glyph;
 
 typedef Glyph *Line;
 
 typedef struct {

-       Glyph attr;      /* current char attributes */
+       Glyph attr; /* current char attributes */

        int x;
        int y;
        char state;
 } TCursor;
 
 /* CSI Escape sequence structs */
        int x;
        int y;
        char state;
 } TCursor;
 
 /* CSI Escape sequence structs */

-/* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
+/* ESC '[' [[ [<priv>] <arg> [;]] <mode> [<mode>]] */

 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */

-       int len;               /* raw string length */
+       int len;               /* raw string length */

        char priv;
        int arg[ESC_ARG_SIZ];
        char priv;
        int arg[ESC_ARG_SIZ];

-       int narg;              /* nb of args */
-       char mode;
+       int narg;              /* nb of args */
+       char mode[2];

 } CSIEscape;
 
 /* STR Escape sequence structs */
 /* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
 typedef struct {
 } CSIEscape;
 
 /* STR Escape sequence structs */
 /* ESC type [[ [<priv>] <arg> [;]] <mode>] ESC '\' */
 typedef struct {

-       char type;           /* ESC type ... */
+       char type;             /* ESC type ... */

        char buf[STR_BUF_SIZ]; /* raw string */
        char buf[STR_BUF_SIZ]; /* raw string */

-       int len;               /* raw string length */
+       int len;               /* raw string length */

        char *args[STR_ARG_SIZ];
        char *args[STR_ARG_SIZ];

-       int narg;             /* nb of args */
+       int narg;              /* nb of args */

 } STREscape;
 
 /* Internal representation of the screen */
 typedef struct {
 } STREscape;
 
 /* Internal representation of the screen */
 typedef struct {

-       int row;        /* nb row */
-       int col;        /* nb col */
-       Line *line;     /* screen */
-       Line *alt;      /* alternate screen */
-       bool *dirty;    /* dirtyness of lines */
-       TCursor c;      /* cursor */
-       int top;        /* top    scroll limit */
-       int bot;        /* bottom scroll limit */
-       int mode;       /* terminal mode flags */
-       int esc;        /* escape state flags */
-       bool numlock;   /* lock numbers in keyboard */
-       bool *tabs;
+       int row;      /* nb row */
+       int col;      /* nb col */
+       Line *line;   /* screen */
+       Line *alt;    /* alternate screen */
+       int *dirty;  /* dirtyness of lines */
+       XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */
+       TCursor c;    /* cursor */
+       int top;      /* top    scroll limit */
+       int bot;      /* bottom scroll limit */
+       int mode;     /* terminal mode flags */
+       int esc;      /* escape state flags */
+       char trantbl[4]; /* charset table translation */
+       int charset;  /* current charset */
+       int icharset; /* selected charset for sequence */
+       int numlock; /* lock numbers in keyboard */
+       int *tabs;

 } Term;
 
 /* Purely graphic info */
 typedef struct {
        Display *dpy;
 } Term;
 
 /* Purely graphic info */
 typedef struct {
        Display *dpy;

-       Colourmap cmap;
+       Colormap cmap;

        Window win;
        Drawable buf;
        Window win;
        Drawable buf;

-       Atom xembed, wmdeletewin;
+       Atom xembed, wmdeletewin, netwmname, netwmpid;

        XIM xim;
        XIC xic;
        Draw draw;
        Visual *vis;
        XSetWindowAttributes attrs;
        int scr;
        XIM xim;
        XIC xic;
        Draw draw;
        Visual *vis;
        XSetWindowAttributes attrs;
        int scr;

-       bool isfixed; /* is fixed geometry? */
-       int fx, fy, fw, fh; /* fixed geometry */
+       int isfixed; /* is 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 {

-       int b;
+       uint b;

        uint mask;
        uint mask;

-       char s[ESC_BUF_SIZ];
-} Mousekey;
+       char *s;
+} MouseShortcut;

 
 typedef struct {
        KeySym k;
        uint mask;
 
 typedef struct {
        KeySym k;
        uint mask;

-       char s[ESC_BUF_SIZ];
+       char *s;

        /* three valued logic variables: 0 indifferent, 1 on, -1 off */
        /* three valued logic variables: 0 indifferent, 1 on, -1 off */

-       signed char appkey;             /* application keypad */
-       signed char appcursor;          /* application cursor */
-       signed char crlf;               /* crlf mode          */
+       signed char appkey;    /* application keypad */
+       signed char appcursor; /* application cursor */
+       signed char crlf;      /* crlf mode          */

 } Key;
 
 typedef struct {
 } Key;
 
 typedef struct {


@@ -261,32 +305,39 @@ typedef struct {
                int x, y;
        } nb, ne, ob, oe;
 
                int x, y;
        } nb, ne, ob, oe;
 

-       char *clip;
+       char *primary, *clipboard;

        Atom xtarget;
        Atom xtarget;

-       bool alt;
-       struct timeval tclick1;
-       struct timeval tclick2;
+       int alt;
+       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 *);
+static void sendbreak(const Arg *);

 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"
 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"


@@ -306,16 +357,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);
 


@@ -323,61 +375,75 @@ 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 tputc(char *, int);
+static void tputtab(int);
+static void tputc(Rune);

 static void treset(void);
 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 tsetchar(char *, Glyph *, int, int);
+static void tsetattr(int *, int);
+static void tsetchar(Rune, Glyph *, int, int);

 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetdirtattr(int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetdirtattr(int);

-static void tsetmode(bool, bool, int *, int);
+static void tsetmode(int, int, int *, int);

 static void tfulldirt(void);
 static void tfulldirt(void);

-static void techo(char *, int);
-
-static inline bool match(uint, uint);
+static void techo(Rune);
+static void tcontrolcode(uchar );
+static void tdectest(char );
+static void tdefutf8(char);
+static int32_t tdefcolor(int *, int *, int);
+static void tdeftran(char);
+static inline int match(uint, uint);

 static void ttynew(void);
 static void ttynew(void);

-static void ttyread(void);
+static size_t ttyread(void);

 static void ttyresize(void);
 static void ttyresize(void);

+static void ttysend(char *, size_t);

 static void ttywrite(const char *, size_t);
 static void ttywrite(const char *, size_t);

+static void tstrsequence(uchar);

 
 

-static void xdraws(char *, Glyph, int, int, int, int);
+static inline ushort sixd_to_16bit(int);
+static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
+static void xdrawglyph(Glyph, int, int);

 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);

+static int xgeommasktogravity(int);

 static int xloadfont(Font *, FcPattern *);
 static int xloadfont(Font *, FcPattern *);

-static void xloadfonts(char *, int);
-static int xloadfontset(Font *);
+static void xloadfonts(char *, double);

 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 xtermclear(int, int, int, int);
-static void xunloadfont(Font *f);
+static void xsetsel(char *, Time);
+static void xunloadfont(Font *);

 static void xunloadfonts(void);
 static void xresize(int, int);
 
 static void xunloadfonts(void);
 static void xresize(int, int);
 


@@ -393,26 +459,36 @@ static void focus(XEvent *);
 static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void brelease(XEvent *);
 static void bpress(XEvent *);
 static void bmotion(XEvent *);

+static void propnotify(XEvent *);

 static void selnotify(XEvent *);
 static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selnotify(XEvent *);
 static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);

-static void selsort(void);
-static inline bool selected(int, int);
-static void selcopy(void);
+static void selnormalize(void);
+static inline int selected(int, int);
+static char *getsel(void);
+static void selcopy(Time);

 static void selscroll(int, int);
 static void selscroll(int, int);

-static void selsnap(int, int *, int *, int);
-
-static int utf8decode(char *, long *);
-static int utf8encode(long *, char *);
-static int utf8size(char *);
-static int isfullutf8(char *, int);
-
-static ssize_t xwrite(int, char *, size_t);
+static void selsnap(int *, int *, int);
+static int x2col(int);
+static int y2row(int);
+static void getbuttoninfo(XEvent *);
+static void mousereport(XEvent *);
+
+static size_t utf8decode(char *, Rune *, size_t);
+static Rune utf8decodebyte(char, size_t *);
+static size_t utf8encode(Rune, char *);
+static char utf8encodebyte(Rune, size_t);
+static char *utf8strchr(char *s, Rune u);
+static size_t utf8validate(Rune *, 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 void *xcalloc(size_t, size_t);
+static char *xstrdup(char *);
+
+static void usage(void);

 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,
 
 static void (*handler[LASTEvent])(XEvent *) = {
        [KeyPress] = kpress,


@@ -426,8 +502,17 @@ 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,
        [SelectionNotify] = selnotify,

+/*
+ * PropertyNotify is only turned on when there is some INCR transfer happening
+ * for the selection retrieval.
+ */
+       [PropertyNotify] = propnotify,

        [SelectionRequest] = selrequest,
 };
 
        [SelectionRequest] = selrequest,
 };
 


@@ -440,17 +525,25 @@ static STREscape strescseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;

-static int iofd = -1;
-static char **opt_cmd = NULL;
-static char *opt_io = NULL;
-static char *opt_title = NULL;
-static char *opt_embed = NULL;
+static int iofd = 1;
+static char **opt_cmd  = NULL;

 static char *opt_class = NULL;
 static char *opt_class = NULL;

-static char *opt_font = NULL;
-static int oldbutton = 3; /* button event on startup: 3 = release */
+static char *opt_embed = NULL;
+static char *opt_font  = NULL;
+static char *opt_io    = NULL;
+static char *opt_line  = NULL;
+static char *opt_name  = NULL;
+static char *opt_title = NULL;
+static int oldbutton   = 3; /* button event on startup: 3 = release */

 
 static char *usedfont = NULL;
 
 static char *usedfont = NULL;

-static int usedfontsize = 0;
+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 Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};

 
 /* Font Ring Cache */
 enum {
 
 /* Font Ring Cache */
 enum {


@@ -462,277 +555,282 @@ enum {
 
 typedef struct {
        XftFont *font;
 
 typedef struct {
        XftFont *font;

-       long c;

        int flags;
        int flags;

+       Rune unicodep;

 } Fontcache;
 
 } Fontcache;
 

-/*
- * Fontcache is a ring buffer, with frccur as current position and frclen as
- * the current length of used elements.
- */
-
-static Fontcache frc[1024];
-static int frccur = -1, frclen = 0;
+/* Fontcache is an array now. A new font will be appended to the array. */
+static Fontcache frc[16];
+static int frclen = 0;

 
 ssize_t
 
 ssize_t

-xwrite(int fd, char *s, size_t len) {
+xwrite(int fd, const char *s, size_t len)
+{

        size_t aux = len;
        size_t aux = len;

+       ssize_t r;

 
 

-       while(len > 0) {
-               ssize_t r = write(fd, s, len);
-               if(r < 0)
+       while (len > 0) {
+               r = write(fd, s, len);
+               if (r < 0)

                        return r;
                len -= r;
                s += r;
        }
                        return r;
                len -= r;
                s += r;
        }

+

        return aux;
 }
 
 void *
        return aux;
 }
 
 void *

-xmalloc(size_t len) {
+xmalloc(size_t len)
+{

        void *p = malloc(len);
 
        void *p = malloc(len);
 

-       if(!p)
+       if (!p)

                die("Out of memory\n");
 
        return p;
 }
 
 void *
                die("Out of memory\n");
 
        return p;
 }
 
 void *

-xrealloc(void *p, size_t len) {
-       if((p = realloc(p, len)) == NULL)
+xrealloc(void *p, size_t len)
+{
+       if ((p = realloc(p, len)) == NULL)

                die("Out of memory\n");
 
        return p;
 }
 
                die("Out of memory\n");
 
        return p;
 }
 

-void *
-xcalloc(size_t nmemb, size_t size) {
-       void *p = calloc(nmemb, size);
-
-       if(!p)
+char *
+xstrdup(char *s)
+{
+       if ((s = strdup(s)) == NULL)

                die("Out of memory\n");
 
                die("Out of memory\n");
 

-       return p;
+       return s;

 }
 
 }
 

-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;
-       }
+size_t
+utf8decode(char *c, Rune *u, size_t clen)
+{
+       size_t i, j, len, type;
+       Rune udecoded;

 
 

-       for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
-               c = *s;
-               if((c & 0xC0) != 0x80) /* 10xxxxxx */
-                       goto invalid;
-               *u <<= 6;
-               *u |= c & 0x3F;
+       *u = UTF_INVALID;
+       if (!clen)
+               return 0;
+       udecoded = utf8decodebyte(c[0], &len);
+       if (!BETWEEN(len, 1, UTF_SIZ))
+               return 1;
+       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);

 
 

-       if((n == 1 && *u < 0x80) ||
-          (n == 2 && *u < 0x800) ||
-          (n == 3 && *u < 0x10000) ||
-          (*u >= 0xD800 && *u <= 0xDFFF)) {
-               goto invalid;
-       }
+       return len;
+}

 
 

-       return rtn;
-invalid:
-       *u = 0xFFFD;
+Rune
+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 rtn;
+       return 0;

 }
 
 }
 

-int
-utf8encode(long *u, char *s) {
-       uchar *sp;
-       ulong uc;
-       int i, n;
-
-       sp = (uchar *)s;
-       uc = *u;
-       if(uc < 0x80) {
-               *sp = uc; /* 0xxxxxxx */
-               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;
-       }
+size_t
+utf8encode(Rune u, char *c)
+{
+       size_t len, i;

 
 

-       for(i=n,++sp; i>0; --i,++sp)
-               *sp = ((uc >> 6*(i-1)) & 0x3F) | 0x80; /* 10xxxxxx */
+       len = utf8validate(&u, 0);
+       if (len > UTF_SIZ)
+               return 0;

 
 

-       return n+1;
-invalid:
-       /* U+FFFD */
-       *s++ = '\xEF';
-       *s++ = '\xBF';
-       *s = '\xBD';
+       for (i = len - 1; i != 0; --i) {
+               c[i] = utf8encodebyte(u, 0);
+               u >>= 6;
+       }
+       c[0] = utf8encodebyte(u, len);

 
 

-       return 3;
+       return len;

 }
 
 }
 

-/* 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;
+char
+utf8encodebyte(Rune u, size_t i)
+{
+       return utfbyte[i] | (u & ~utfmask[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))) {
-               return 0;
-       } else {
-               return 1;
+char *
+utf8strchr(char *s, Rune u)
+{
+       Rune r;
+       size_t i, j, len;
+
+       len = strlen(s);
+       for (i = 0, j = 0; i < len; i += j) {
+               if (!(j = utf8decode(&s[i], &r, len - i)))
+                       break;
+               if (r == u)
+                       return &(s[i]);

        }
        }

+
+       return NULL;

 }
 
 }
 

-int
-utf8size(char *s) {
-       uchar c = *s;
+size_t
+utf8validate(Rune *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)
+               ;

 
 

-       if(~c & 0x80) {
-               return 1;
-       } else if((c & 0xE0) == 0xC0) {
-               return 2;
-       } else if((c & 0xF0) == 0xE0) {
-               return 3;
-       } else {
-               return 4;
-       }
+       return i;

 }
 
 }
 

-static void
-selinit(void) {
-       memset(&sel.tclick1, 0, sizeof(sel.tclick1));
-       memset(&sel.tclick2, 0, sizeof(sel.tclick2));
-       sel.mode = 0;
+void
+selinit(void)
+{
+       clock_gettime(CLOCK_MONOTONIC, &sel.tclick1);
+       clock_gettime(CLOCK_MONOTONIC, &sel.tclick2);
+       sel.mode = SEL_IDLE;
+       sel.snap = 0;

        sel.ob.x = -1;
        sel.ob.x = -1;

-       sel.clip = NULL;
+       sel.primary = NULL;
+       sel.clipboard = NULL;

        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);

-       if(sel.xtarget == None)
+       if (sel.xtarget == None)

                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 

-static int
-x2col(int x) {
+int
+x2col(int x)
+{

        x -= borderpx;
        x /= xw.cw;
 
        return LIMIT(x, 0, term.col-1);
 }
 
        x -= borderpx;
        x /= xw.cw;
 
        return LIMIT(x, 0, term.col-1);
 }
 

-static int
-y2row(int y) {
+int
+y2row(int y)
+{

        y -= borderpx;
        y /= xw.ch;
 
        return LIMIT(y, 0, term.row-1);
 }
 
        y -= borderpx;
        y /= xw.ch;
 
        return LIMIT(y, 0, term.row-1);
 }
 

-static void
-selsort(void) {
-       if(sel.ob.y == sel.oe.y) {
-               sel.nb.x = MIN(sel.ob.x, sel.oe.x);
-               sel.ne.x = MAX(sel.ob.x, sel.oe.x);
-       } else {
+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].u == ' ')
+               --i;
+
+       return i;
+}
+
+void
+selnormalize(void)
+{
+       int i;
+
+       if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {

                sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
                sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
                sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
                sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;

+       } else {
+               sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+               sel.ne.x = MAX(sel.ob.x, sel.oe.x);

        }
        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.nb.x, &sel.nb.y, -1);
+       selsnap(&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
-selected(int x, int y) {
-       if(sel.ne.y == y && sel.nb.y == y)
-               return BETWEEN(x, sel.nb.x, sel.ne.x);
+int
+selected(int x, int y)
+{
+       if (sel.mode == SEL_EMPTY)
+               return 0;

 
 

-       if(sel.type == SEL_RECTANGULAR) {
-               return ((sel.nb.y <= y && y <= sel.ne.y)
-                       && (sel.nb.x <= x && 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);

 
 

-       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
 }
 
 void

-selsnap(int mode, int *x, int *y, int direction) {
-       int i;
+selsnap(int *x, int *y, int direction)
+{
+       int newx, newy, xt, yt;
+       int delim, prevdelim;
+       Glyph *gp, *prevgp;

 
 

-       switch(mode) {
+       switch (sel.snap) {

        case SNAP_WORD:
                /*
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */
        case SNAP_WORD:
                /*
                 * Snap around if the word wraps around at the end or
                 * beginning of a line.
                 */

-               for(;;) {
-                       if(direction < 0 && *x <= 0) {
-                               if(*y > 0 && term.line[*y - 1][term.col-1].mode
-                                               & ATTR_WRAP) {
-                                       *y -= 1;
-                                       *x = term.col-1;
-                               } else {
+               prevgp = &term.line[*y][*x];
+               prevdelim = ISDELIM(prevgp->u);
+               for (;;) {
+                       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(strchr(worddelimiters,
-                                       term.line[*y][*x + direction].c[0])) {
+                       if (newx >= tlinelen(newy))
+                               break;
+
+                       gp = &term.line[newy][newx];
+                       delim = ISDELIM(gp->u);
+                       if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
+                                       || (delim && gp->u != prevgp->u)))

                                break;
                                break;

-                       }

 
 

-                       *x += direction;
+                       *x = newx;
+                       *y = newy;
+                       prevgp = gp;
+                       prevdelim = delim;

                }
                break;
        case SNAP_LINE:
                }
                break;
        case SNAP_LINE:


@@ -742,60 +840,40 @@ selsnap(int mode, int *x, int *y, int direction) {
                 * previous line will be selected.
                 */
                *x = (direction < 0) ? 0 : term.col - 1;
                 * previous line will be selected.
                 */
                *x = (direction < 0) ? 0 : term.col - 1;

-               if(direction < 0 && *y > 0) {
-                       for(; *y > 0; *y += direction) {
-                               if(!(term.line[*y-1][term.col-1].mode
+               if (direction < 0) {
+                       for (; *y > 0; *y += direction) {
+                               if (!(term.line[*y-1][term.col-1].mode

                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }
                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }

-               } else if(direction > 0 && *y < term.row-1) {
-                       for(; *y < term.row; *y += direction) {
-                               if(!(term.line[*y][term.col-1].mode
+               } else if (direction > 0) {
+                       for (; *y < term.row-1; *y += direction) {
+                               if (!(term.line[*y][term.col-1].mode

                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }
                }
                break;
                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }
                }
                break;

-       default:
-               /*
-                * Select the whole line when the end of line is reached.
-                */
-               if(direction > 0) {
-                       i = term.col;
-                       while(--i > 0 && term.line[*y][i].c[0] == ' ')
-                               /* nothing */;
-                       if(i > 0 && i < *x)
-                               *x = term.col - 1;
-               }
-               break;

        }
 }
 
 void
        }
 }
 
 void

-getbuttoninfo(XEvent *e) {
+getbuttoninfo(XEvent *e)
+{

        int type;
        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;
 
        sel.type = SEL_REGULAR;

-       for(type = 1; type < LEN(selmasks); ++type) {
-               if(match(selmasks[type], state)) {
+       for (type = 1; type < LEN(selmasks); ++type) {
+               if (match(selmasks[type], state)) {

                        sel.type = type;
                        break;
                }
                        sel.type = type;
                        break;
                }


@@ -803,7 +881,8 @@ getbuttoninfo(XEvent *e) {
 }
 
 void
 }
 
 void

-mousereport(XEvent *e) {
+mousereport(XEvent *e)
+{

        int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
            button = e->xbutton.button, state = e->xbutton.state,
            len;
        int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y),
            button = e->xbutton.button, state = e->xbutton.state,
            len;


@@ -811,48 +890,53 @@ mousereport(XEvent *e) {
        static int ox, oy;
 
        /* from urxvt */
        static int ox, oy;
 
        /* from urxvt */

-       if(e->xbutton.type == MotionNotify) {
-               if(x == ox && y == oy)
+       if (e->xbutton.type == MotionNotify) {
+               if (x == ox && y == oy)

                        return;
                        return;

-               if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
+               if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))

                        return;
                /* MOUSE_MOTION: no reporting if no button is pressed */
                        return;
                /* MOUSE_MOTION: no reporting if no button is pressed */

-               if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
+               if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)

                        return;
 
                button = oldbutton + 32;
                ox = x;
                oy = y;
                        return;
 
                button = oldbutton + 32;
                ox = x;
                oy = y;

-       } else if(!IS_SET(MODE_MOUSESGR)
-                       && (e->xbutton.type == ButtonRelease
-                               || button == AnyButton)) {
-               button = 3;

        } else {
        } else {

-               button -= Button1;
-               if(button >= 3)
-                       button += 64 - 3;
-               if(e->xbutton.type == ButtonPress) {
+               if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
+                       button = 3;
+               } else {
+                       button -= Button1;
+                       if (button >= 3)
+                               button += 64 - 3;
+               }
+               if (e->xbutton.type == ButtonPress) {

                        oldbutton = button;
                        ox = x;
                        oy = y;
                        oldbutton = button;
                        ox = x;
                        oy = y;

+               } else if (e->xbutton.type == ButtonRelease) {
+                       oldbutton = 3;
+                       /* MODE_MOUSEX10: no button release reporting */
+                       if (IS_SET(MODE_MOUSEX10))
+                               return;
+                       if (button == 64 || button == 65)
+                               return;

                }
        }
 
                }
        }
 

-       if(!IS_SET(MODE_MOUSEX10)) {
-               button += (state & ShiftMask   ? 4  : 0)
-                       + (state & Mod4Mask    ? 8  : 0)
-                       + (state & ControlMask ? 16 : 0);
+       if (!IS_SET(MODE_MOUSEX10)) {
+               button += ((state & ShiftMask  ) ? 4  : 0)
+                       + ((state & Mod4Mask   ) ? 8  : 0)
+                       + ((state & ControlMask) ? 16 : 0);

        }
 
        }
 

-       len = 0;
-       if(IS_SET(MODE_MOUSESGR)) {
+       if (IS_SET(MODE_MOUSESGR)) {

                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,
                                e->xbutton.type == ButtonRelease ? 'm' : 'M');
                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,
                                e->xbutton.type == ButtonRelease ? 'm' : 'M');

-       } else if(x < 223 && y < 223) {
+       } else if (x < 223 && y < 223) {

                len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
                len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",

-                               IS_SET(MODE_MOUSEX10)? button-1 : 32+button,
-                               32+x+1, 32+y+1);
+                               32+button, 32+x+1, 32+y+1);

        } else {
                return;
        }
        } else {
                return;
        }


@@ -861,31 +945,30 @@ mousereport(XEvent *e) {
 }
 
 void
 }
 
 void

-bpress(XEvent *e) {
-       struct timeval now;
-       Mousekey *mk;
+bpress(XEvent *e)
+{
+       struct timespec now;
+       MouseShortcut *ms;

 
 

-       if(IS_SET(MODE_MOUSE)) {
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {

                mousereport(e);
                return;
        }
 
                mousereport(e);
                return;
        }
 

-       for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
-               if(e->xbutton.button == mk->b
-                               && match(mk->mask, e->xbutton.state)) {
-                       ttywrite(mk->s, strlen(mk->s));
-                       if(IS_SET(MODE_ECHO))
-                               techo(mk->s, strlen(mk->s));
+       for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
+               if (e->xbutton.button == ms->b
+                               && match(ms->mask, e->xbutton.state)) {
+                       ttysend(ms->s, strlen(ms->s));

                        return;
                }
        }
 
                        return;
                }
        }
 

-       if(e->xbutton.button == Button1) {
-               gettimeofday(&now, NULL);
+       if (e->xbutton.button == Button1) {
+               clock_gettime(CLOCK_MONOTONIC, &now);

 
                /* Clear previous selection, logically and visually. */
                selclear(NULL);
 
                /* Clear previous selection, logically and visually. */
                selclear(NULL);

-               sel.mode = 1;
+               sel.mode = SEL_EMPTY;

                sel.type = SEL_REGULAR;
                sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
                sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
                sel.type = SEL_REGULAR;
                sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
                sel.oe.y = sel.ob.y = y2row(e->xbutton.y);


@@ -894,110 +977,158 @@ bpress(XEvent *e) {
                 * If the user clicks below predefined timeouts specific
                 * snapping behaviour is exposed.
                 */
                 * If the user clicks below predefined timeouts specific
                 * snapping behaviour is exposed.
                 */

-               if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {
+               if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) {

                        sel.snap = SNAP_LINE;
                        sel.snap = SNAP_LINE;

-               } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {
+               } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) {

                        sel.snap = SNAP_WORD;
                } else {
                        sel.snap = 0;
                }
                        sel.snap = SNAP_WORD;
                } 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
-                * make clicks visible
-                */
-               if(sel.snap != 0) {
-                       sel.mode++;
-                       tsetdirt(sel.nb.y, sel.ne.y);
-               }
+               if (sel.snap != 0)
+                       sel.mode = SEL_READY;
+               tsetdirt(sel.nb.y, sel.ne.y);

                sel.tclick2 = sel.tclick1;
                sel.tclick1 = now;
        }
 }
 
                sel.tclick2 = sel.tclick1;
                sel.tclick1 = now;
        }
 }
 

-void
-selcopy(void) {
+char *
+getsel(void)
+{

        char *str, *ptr;
        char *str, *ptr;

-       int x, y, bufsize, size, i, ex;
+       int y, bufsize, 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;
+       if (sel.ob.x == -1)
+               return NULL;

 
 

-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+       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))
-                                       continue;
+       /* append every set & selected glyph to the selection */
+       for (y = sel.nb.y; y <= sel.ne.y; y++) {
+               if ((linelen = tlinelen(y)) == 0) {
+                       *ptr++ = '\n';
+                       continue;
+               }

 
 

-                               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->u == ' ')
+                       --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 && !((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';
-                       }
+                       ptr += utf8encode(gp->u, ptr);

                }
                }

-               *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';
+       }
+       *ptr = 0;
+       return str;
+}
+
+void
+selcopy(Time t)
+{
+       xsetsel(getsel(), t);
+}
+
+void
+propnotify(XEvent *e)
+{
+       XPropertyEvent *xpev;
+       Atom clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+
+       xpev = &e->xproperty;
+       if (xpev->state == PropertyNewValue &&
+                       (xpev->atom == XA_PRIMARY ||
+                        xpev->atom == clipboard)) {
+               selnotify(e);

        }
        }

-       xsetsel(str);

 }
 
 void
 }
 
 void

-selnotify(XEvent *e) {
+selnotify(XEvent *e)
+{

        ulong nitems, ofs, rem;
        int format;
        uchar *data, *last, *repl;
        ulong nitems, ofs, rem;
        int format;
        uchar *data, *last, *repl;

-       Atom type;
+       Atom type, incratom, property;
+
+       incratom = XInternAtom(xw.dpy, "INCR", 0);

 
        ofs = 0;
 
        ofs = 0;

+       if (e->type == SelectionNotify) {
+               property = e->xselection.property;
+       } else if(e->type == PropertyNotify) {
+               property = e->xproperty.atom;
+       } else {
+               return;
+       }
+       if (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, 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;
                }
 

+               if (e->type == PropertyNotify && nitems == 0 && rem == 0) {
+                       /*
+                        * If there is some PropertyNotify with no data, then
+                        * this is the signal of the selection owner that all
+                        * data has been transferred. We won't need to receive
+                        * PropertyNotify events anymore.
+                        */
+                       MODBIT(xw.attrs.event_mask, 0, PropertyChangeMask);
+                       XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
+                                       &xw.attrs);
+               }
+
+               if (type == incratom) {
+                       /*
+                        * Activate the PropertyNotify events so we receive
+                        * when the selection owner does send us the next
+                        * chunk of data.
+                        */
+                       MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask);
+                       XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask,
+                                       &xw.attrs);
+
+                       /*
+                        * Deleting the property is the transfer start signal.
+                        */
+                       XDeleteProperty(xw.dpy, xw.win, (int)property);
+                       continue;
+               }
+

                /*
                /*

-                * 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'.


@@ -1005,45 +1136,76 @@ selnotify(XEvent *e) {
                 */
                repl = data;
                last = data + nitems * format / 8;
                 */
                repl = data;
                last = data + nitems * format / 8;

-               while((repl = memchr(repl, '\n', last - repl))) {
+               while ((repl = memchr(repl, '\n', last - repl))) {

                        *repl++ = '\r';
                }
 
                        *repl++ = '\r';
                }
 

-               ttywrite((const char *)data, nitems * format / 8);
+               if (IS_SET(MODE_BRCKTPASTE) && ofs == 0)
+                       ttywrite("\033[200~", 6);
+               ttysend((char *)data, nitems * format / 8);
+               if (IS_SET(MODE_BRCKTPASTE) && rem == 0)
+                       ttywrite("\033[201~", 6);

                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;
                XFree(data);
                /* number of 32-bit chunks returned */
                ofs += nitems * format / 32;

-       } while(rem > 0);
+       } while (rem > 0);
+
+       /*
+        * Deleting the property again tells the selection owner to send the
+        * next data chunk in the property.
+        */
+       XDeleteProperty(xw.dpy, xw.win, (int)property);

 }
 
 void
 }
 
 void

-selpaste(const Arg *dummy) {
+selpaste(const Arg *dummy)
+{

        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
                        xw.win, CurrentTime);
 }
 
 void
        XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
                        xw.win, CurrentTime);
 }
 
 void

-clippaste(const Arg *dummy) {
+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);
        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);
 }
 
 void
                        xw.win, CurrentTime);
 }
 
 void

-selclear(XEvent *e) {
-       if(sel.ob.x == -1)
+selclear(XEvent *e)
+{
+       if (sel.ob.x == -1)

                return;
                return;

+       sel.mode = SEL_IDLE;

        sel.ob.x = -1;
        tsetdirt(sel.nb.y, sel.ne.y);
 }
 
 void
        sel.ob.x = -1;
        tsetdirt(sel.nb.y, sel.ne.y);
 }
 
 void

-selrequest(XEvent *e) {
+selrequest(XEvent *e)
+{

        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
        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;


@@ -1051,116 +1213,153 @@ 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;
 
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
        /* reject */
        xev.property = None;
 
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);

-       if(xsre->target == xa_targets) {
+       if (xsre->target == xa_targets) {

                /* respond with the supported type */
                string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
                /* respond with the supported type */
                string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, 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 */

-       if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev))
+       if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev))

                fprintf(stderr, "Error sending SelectionNotify event\n");
 }
 
 void
                fprintf(stderr, "Error sending SelectionNotify event\n");
 }
 
 void

-xsetsel(char *str) {
-       /* register the selection for both the clipboard and the primary */
-       Atom clipboard;
-
-       free(sel.clip);
-       sel.clip = str;
-
-       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+xsetsel(char *str, Time t)
+{
+       free(sel.primary);
+       sel.primary = str;
+
+       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
+       if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+               selclear(0);

 }
 
 void
 }
 
 void

-brelease(XEvent *e) {
-       if(IS_SET(MODE_MOUSE)) {
+brelease(XEvent *e)
+{
+       if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) {

                mousereport(e);
                return;
        }
 
                mousereport(e);
                return;
        }
 

-       if(e->xbutton.button == Button2) {
+       if (e->xbutton.button == Button2) {

                selpaste(NULL);
                selpaste(NULL);

-       } else if(e->xbutton.button == Button1) {
-               if(sel.mode < 2) {
-                       selclear(NULL);
-               } else {
+       } else if (e->xbutton.button == Button1) {
+               if (sel.mode == SEL_READY) {

                        getbuttoninfo(e);
                        getbuttoninfo(e);

-                       selcopy();
-               }
-               sel.mode = 0;
+                       selcopy(e->xbutton.time);
+               } else
+                       selclear(NULL);
+               sel.mode = SEL_IDLE;

                tsetdirt(sel.nb.y, sel.ne.y);
        }
 }
 
 void
                tsetdirt(sel.nb.y, sel.ne.y);
        }
 }
 
 void

-bmotion(XEvent *e) {
+bmotion(XEvent *e)
+{

        int oldey, oldex, oldsby, oldsey;
 
        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;
        }
 

-       if(!sel.mode)
+       if (!sel.mode)

                return;
 
                return;
 

-       sel.mode++;
+       sel.mode = SEL_READY;

        oldey = sel.oe.y;
        oldex = sel.oe.x;
        oldsby = sel.nb.y;
        oldsey = sel.ne.y;
        getbuttoninfo(e);
 
        oldey = sel.oe.y;
        oldex = sel.oe.x;
        oldsby = sel.nb.y;
        oldsey = sel.ne.y;
        getbuttoninfo(e);
 

-       if(oldey != sel.oe.y || oldex != sel.oe.x)
+       if (oldey != sel.oe.y || oldex != sel.oe.x)

                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
 
 void
                tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey));
 }
 
 void

-die(const char *errstr, ...) {
+die(const char *errstr, ...)
+{

        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);
        va_list ap;
 
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
        va_end(ap);

-       exit(EXIT_FAILURE);
+       exit(1);

 }
 
 void
 }
 
 void

-execsh(void) {
-       char **args;
-       char *envshell = getenv("SHELL");
-       const struct passwd *pass = getpwuid(getuid());
+execsh(void)
+{
+       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");
-
-       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);
+       errno = 0;
+       if ((pw = getpwuid(getuid())) == NULL) {
+               if (errno)
+                       die("getpwuid:%s\n", strerror(errno));
+               else
+                       die("who are you?\n");

        }
 
        }
 

+       if ((sh = getenv("SHELL")) == NULL)
+               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);


@@ -1170,47 +1369,92 @@ 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(1);

 }
 
 void
 }
 
 void

-sigchld(int a) {
-       int stat = 0;
+sigchld(int a)
+{
+       int stat;
+       pid_t p;

 
 

-       if(waitpid(pid, &stat, 0) < 0)
-               die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+       if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
+               die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));

 
 

-       if(WIFEXITED(stat)) {
-               exit(WEXITSTATUS(stat));
-       } else {
-               exit(EXIT_FAILURE);
+       if (pid != p)
+               return;
+
+       if (!WIFEXITED(stat) || WEXITSTATUS(stat))
+               die("child finished with error '%d'\n", stat);
+       exit(0);
+}
+
+
+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++ = ' ';
+               memcpy(q, s, n);
+               q += n;
+               siz -= n + 1;

        }
        }

+       *q = '\0';
+       if (system(cmd) != 0)
+           perror("Couldn't call stty");

 }
 
 void
 }
 
 void

-ttynew(void) {
+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, "-")) ?
+                         1 : 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));
+               dup2(cmdfd, 0);
+               stty();
+               return;
+       }
+

        /* seems to work fine on linux, openbsd and freebsd */
        /* seems to work fine on linux, openbsd and freebsd */

-       if(openpty(&m, &s, NULL, NULL, &w) < 0)
-               die("openpty failed: %s\n", SERRNO);
+       if (openpty(&m, &s, NULL, NULL, &w) < 0)
+               die("openpty failed: %s\n", strerror(errno));

 
 

-       switch(pid = fork()) {
+       switch (pid = fork()) {

        case -1:
                die("fork failed\n");
                break;
        case 0:
        case -1:
                die("fork failed\n");
                break;
        case 0:

+               close(iofd);

                setsid(); /* create a new process group */
                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);
+               dup2(s, 0);
+               dup2(s, 1);
+               dup2(s, 2);
+               if (ioctl(s, TIOCSCTTY, NULL) < 0)
+                       die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));

                close(s);
                close(m);
                execsh();
                close(s);
                close(m);
                execsh();


@@ -1219,81 +1463,155 @@ 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) {
+size_t
+ttyread(void)
+{

        static char buf[BUFSIZ];
        static int buflen = 0;
        char *ptr;
        static char buf[BUFSIZ];
        static int buflen = 0;
        char *ptr;

-       char s[UTF_SIZ];

        int charsize; /* size of utf8 char in bytes */
        int charsize; /* size of utf8 char in bytes */

-       long utf8c;
+       Rune unicodep;

        int ret;
 
        /* append read bytes to unprocessed bytes */
        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);
+       if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
+               die("Couldn't read from shell: %s\n", strerror(errno));

 
 

-       /* process every complete utf8 char */

        buflen += ret;
        ptr = buf;
        buflen += ret;
        ptr = buf;

-       while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
-               charsize = utf8decode(ptr, &utf8c);
-               utf8encode(&utf8c, s);
-               tputc(s, charsize);
-               ptr += charsize;
-               buflen -= charsize;
-       }

 
 

+       for (;;) {
+               if (IS_SET(MODE_UTF8)) {
+                       /* process a complete utf8 char */
+                       charsize = utf8decode(ptr, &unicodep, buflen);
+                       if (charsize == 0)
+                               break;
+                       tputc(unicodep);
+                       ptr += charsize;
+                       buflen -= charsize;
+
+               } else {
+                       if (buflen <= 0)
+                               break;
+                       tputc(*ptr++ & 0xFF);
+                       buflen--;
+               }
+       }

        /* keep any uncomplete utf8 char for the next call */
        /* keep any uncomplete utf8 char for the next call */

-       memmove(buf, ptr, buflen);
+       if (buflen > 0)
+               memmove(buf, ptr, buflen);
+
+       return ret;
+}
+
+void
+ttywrite(const char *s, size_t n)
+{
+       fd_set wfd, rfd;
+       ssize_t r;
+       size_t lim = 256;
+
+       /*
+        * Remember that we are using a pty, which might be a modem line.
+        * Writing too much will clog the line. That's why we are doing this
+        * dance.
+        * FIXME: Migrate the world to Plan 9.
+        */
+       while (n > 0) {
+               FD_ZERO(&wfd);
+               FD_ZERO(&rfd);
+               FD_SET(cmdfd, &wfd);
+               FD_SET(cmdfd, &rfd);
+
+               /* Check if we can write. */
+               if (pselect(cmdfd+1, &rfd, &wfd, NULL, NULL, NULL) < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       die("select failed: %s\n", strerror(errno));
+               }
+               if (FD_ISSET(cmdfd, &wfd)) {
+                       /*
+                        * Only write the bytes written by ttywrite() or the
+                        * default of 256. This seems to be a reasonable value
+                        * for a serial line. Bigger values might clog the I/O.
+                        */
+                       if ((r = write(cmdfd, s, (n < lim)? n : lim)) < 0)
+                               goto write_error;
+                       if (r < n) {
+                               /*
+                                * We weren't able to write out everything.
+                                * This means the buffer is getting full
+                                * again. Empty it.
+                                */
+                               if (n < lim)
+                                       lim = ttyread();
+                               n -= r;
+                               s += r;
+                       } else {
+                               /* All bytes have been written. */
+                               break;
+                       }
+               }
+               if (FD_ISSET(cmdfd, &rfd))
+                       lim = ttyread();
+       }
+       return;
+
+write_error:
+       die("write error on tty: %s\n", strerror(errno));

 }
 
 void
 }
 
 void

-ttywrite(const char *s, size_t n) {
-       if(write(cmdfd, s, n) == -1)
-               die("write error on tty: %s\n", SERRNO);
+ttysend(char *s, size_t n)
+{
+       int len;
+       char *t, *lim;
+       Rune u;
+
+       ttywrite(s, n);
+       if (!IS_SET(MODE_ECHO))
+               return;
+
+       lim = &s[n];
+       for (t = s; t < lim; t += len) {
+               if (IS_SET(MODE_UTF8)) {
+                       len = utf8decode(t, &u, n);
+               } else {
+                       u = *t & 0xFF;
+                       len = 1;
+               }
+               if (len <= 0)
+                       break;
+               techo(u);
+               n -= len;
+       }

 }
 
 void
 }
 
 void

-ttyresize(void) {
+ttyresize(void)
+{

        struct winsize w;
 
        w.ws_row = term.row;
        w.ws_col = term.col;
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
        struct winsize w;
 
        w.ws_row = term.row;
        w.ws_col = term.col;
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;

-       if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
-               fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
+       if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
+               fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));

 }
 
 int
 }
 
 int

-tattrset(int attr) {
+tattrset(int attr)
+{

        int i, j;
 
        int i, j;
 

-       for(i = 0; i < term.row-1; i++) {
-               for(j = 0; j < term.col-1; j++) {
-                       if(term.line[i][j].mode & attr)
+       for (i = 0; i < term.row-1; i++) {
+               for (j = 0; j < term.col-1; j++) {
+                       if (term.line[i][j].mode & attr)

                                return 1;
                }
        }
                                return 1;
                }
        }


@@ -1302,23 +1620,25 @@ tattrset(int attr) {
 }
 
 void
 }
 
 void

-tsetdirt(int top, int bot) {
+tsetdirt(int top, int bot)
+{

        int i;
 
        LIMIT(top, 0, term.row-1);
        LIMIT(bot, 0, term.row-1);
 
        int i;
 
        LIMIT(top, 0, term.row-1);
        LIMIT(bot, 0, term.row-1);
 

-       for(i = top; i <= bot; i++)
+       for (i = top; i <= bot; i++)

                term.dirty[i] = 1;
 }
 
 void
                term.dirty[i] = 1;
 }
 
 void

-tsetdirtattr(int attr) {
+tsetdirtattr(int attr)
+{

        int i, j;
 
        int i, j;
 

-       for(i = 0; i < term.row-1; i++) {
-               for(j = 0; j < term.col-1; j++) {
-                       if(term.line[i][j].mode & attr) {
+       for (i = 0; i < term.row-1; i++) {
+               for (j = 0; j < term.col-1; j++) {
+                       if (term.line[i][j].mode & attr) {

                                tsetdirt(i, i);
                                break;
                        }
                                tsetdirt(i, i);
                                break;
                        }


@@ -1327,24 +1647,28 @@ tsetdirtattr(int attr) {
 }
 
 void
 }
 
 void

-tfulldirt(void) {
+tfulldirt(void)
+{

        tsetdirt(0, term.row-1);
 }
 
 void
        tsetdirt(0, term.row-1);
 }
 
 void

-tcursor(int mode) {
-       static TCursor c;
-
-       if(mode == CURSOR_SAVE) {
-               c = term.c;
-       } else if(mode == CURSOR_LOAD) {
-               term.c = c;
-               tmoveto(c.x, c.y);
+tcursor(int mode)
+{
+       static TCursor c[2];
+       int alt = IS_SET(MODE_ALTSCREEN);
+
+       if (mode == CURSOR_SAVE) {
+               c[alt] = term.c;
+       } else if (mode == CURSOR_LOAD) {
+               term.c = c[alt];
+               tmoveto(c[alt].x, c[alt].y);

        }
 }
 
 void
        }
 }
 
 void

-treset(void) {
+treset(void)
+{

        uint i;
 
        term.c = (TCursor){{
        uint i;
 
        term.c = (TCursor){{


@@ -1354,20 +1678,26 @@ treset(void) {
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
 
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));

-       for(i = tabspaces; i < term.col; i += tabspaces)
+       for (i = tabspaces; i < term.col; i += tabspaces)

                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;
                term.tabs[i] = 1;
        term.top = 0;
        term.bot = term.row - 1;

-       term.mode = MODE_WRAP;
+       term.mode = MODE_WRAP|MODE_UTF8;
+       memset(term.trantbl, CS_USA, sizeof(term.trantbl));
+       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

-tnew(int col, int row) {
-       memset(&term, 0, sizeof(Term));
+tnew(int col, int row)
+{
+       term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } };

        tresize(col, row);
        term.numlock = 1;
 
        tresize(col, row);
        term.numlock = 1;
 


@@ -1375,7 +1705,8 @@ tnew(int col, int row) {
 }
 
 void
 }
 
 void

-tswapscreen(void) {
+tswapscreen(void)
+{

        Line *tmp = term.line;
 
        term.line = term.alt;
        Line *tmp = term.line;
 
        term.line = term.alt;


@@ -1385,80 +1716,81 @@ tswapscreen(void) {
 }
 
 void
 }
 
 void

-tscrolldown(int orig, int n) {
+tscrolldown(int orig, int n)
+{

        int i;
        Line temp;
 
        LIMIT(n, 0, term.bot-orig+1);
 
        int i;
        Line temp;
 
        LIMIT(n, 0, term.bot-orig+1);
 

+       tsetdirt(orig, term.bot-n);

        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 

-       for(i = term.bot; i >= orig+n; i--) {
+       for (i = term.bot; i >= orig+n; i--) {

                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;

-
-               term.dirty[i] = 1;
-               term.dirty[i-n] = 1;

        }
 
        selscroll(orig, n);
 }
 
 void
        }
 
        selscroll(orig, n);
 }
 
 void

-tscrollup(int orig, int n) {
+tscrollup(int orig, int n)
+{

        int i;
        Line temp;
        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++) {
-                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;
+       for (i = orig; i <= term.bot-n; i++) {
+               temp = term.line[i];
+               term.line[i] = term.line[i+n];
+               term.line[i+n] = temp;

        }
 
        selscroll(orig, -n);
 }
 
 void
        }
 
        selscroll(orig, -n);
 }
 
 void

-selscroll(int orig, int n) {
-       if(sel.ob.x == -1)
+selscroll(int orig, int n)
+{
+       if (sel.ob.x == -1)

                return;
 
                return;
 

-       if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
-               if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {
+       if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) {
+               if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) {

                        selclear(NULL);
                        return;
                }
                        selclear(NULL);
                        return;
                }

-               if(sel.type == SEL_RECTANGULAR) {
-                       if(sel.ob.y < term.top)
+               if (sel.type == SEL_RECTANGULAR) {
+                       if (sel.ob.y < term.top)

                                sel.ob.y = term.top;
                                sel.ob.y = term.top;

-                       if(sel.oe.y > term.bot)
+                       if (sel.oe.y > term.bot)

                                sel.oe.y = term.bot;
                } else {
                                sel.oe.y = term.bot;
                } else {

-                       if(sel.ob.y < term.top) {
+                       if (sel.ob.y < term.top) {

                                sel.ob.y = term.top;
                                sel.ob.x = 0;
                        }
                                sel.ob.y = term.top;
                                sel.ob.x = 0;
                        }

-                       if(sel.oe.y > term.bot) {
+                       if (sel.oe.y > term.bot) {

                                sel.oe.y = term.bot;
                                sel.oe.x = term.col;
                        }
                }
                                sel.oe.y = term.bot;
                                sel.oe.x = term.col;
                        }
                }

-               selsort();
+               selnormalize();

        }
 }
 
 void
        }
 }
 
 void

-tnewline(int first_col) {
+tnewline(int first_col)
+{

        int y = term.c.y;
 
        int y = term.c.y;
 

-       if(y == term.bot) {
+       if (y == term.bot) {

                tscrollup(term.top, 1);
        } else {
                y++;
                tscrollup(term.top, 1);
        } else {
                y++;


@@ -1467,59 +1799,62 @@ tnewline(int first_col) {
 }
 
 void
 }
 
 void

-csiparse(void) {
+csiparse(void)
+{

        char *p = csiescseq.buf, *np;
        long int v;
 
        csiescseq.narg = 0;
        char *p = csiescseq.buf, *np;
        long int v;
 
        csiescseq.narg = 0;

-       if(*p == '?') {
+       if (*p == '?') {

                csiescseq.priv = 1;
                p++;
        }
 
        csiescseq.buf[csiescseq.len] = '\0';
                csiescseq.priv = 1;
                p++;
        }
 
        csiescseq.buf[csiescseq.len] = '\0';

-       while(p < csiescseq.buf+csiescseq.len) {
+       while (p < csiescseq.buf+csiescseq.len) {

                np = NULL;
                v = strtol(p, &np, 10);
                np = NULL;
                v = strtol(p, &np, 10);

-               if(np == p)
+               if (np == p)

                        v = 0;
                        v = 0;

-               if(v == LONG_MAX || v == LONG_MIN)
+               if (v == LONG_MAX || v == LONG_MIN)

                        v = -1;
                csiescseq.arg[csiescseq.narg++] = v;
                p = np;
                        v = -1;
                csiescseq.arg[csiescseq.narg++] = v;
                p = np;

-               if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ)
+               if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ)

                        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 */
 void
 }
 
 /* for absolute user moves, when decom is set */
 void

-tmoveato(int x, int y) {
+tmoveato(int x, int y)
+{

        tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
 }
 
 void
        tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0));
 }
 
 void

-tmoveto(int x, int y) {
+tmoveto(int x, int y)
+{

        int miny, maxy;
 
        int miny, maxy;
 

-       if(term.c.state & CURSOR_ORIGIN) {
+       if (term.c.state & CURSOR_ORIGIN) {

                miny = term.top;
                maxy = term.bot;
        } else {
                miny = 0;
                maxy = term.row - 1;
        }
                miny = term.top;
                maxy = term.bot;
        } else {
                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

-tsetchar(char *c, Glyph *attr, int x, int y) {
+tsetchar(Rune u, Glyph *attr, int x, int y)
+{

        static char *vt100_0[62] = { /* 0x41 - 0x7e */
                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
        static char *vt100_0[62] = { /* 0x41 - 0x7e */
                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */


@@ -1534,25 +1869,34 @@ 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]) {
-                       c = vt100_0[c[0] - 0x41];
+       if (term.trantbl[term.charset] == CS_GRAPHIC0 &&
+          BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41])
+               utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ);
+
+       if (term.line[y][x].mode & ATTR_WIDE) {
+               if (x+1 < term.col) {
+                       term.line[y][x+1].u = ' ';
+                       term.line[y][x+1].mode &= ~ATTR_WDUMMY;

                }
                }

+       } else if (term.line[y][x].mode & ATTR_WDUMMY) {
+               term.line[y][x-1].u = ' ';
+               term.line[y][x-1].mode &= ~ATTR_WIDE;

        }
 
        term.dirty[y] = 1;
        term.line[y][x] = *attr;
        }
 
        term.dirty[y] = 1;
        term.line[y][x] = *attr;

-       memcpy(term.line[y][x].c, c, UTF_SIZ);
+       term.line[y][x].u = u;

 }
 
 void
 }
 
 void

-tclearregion(int x1, int y1, int x2, int y2) {
+tclearregion(int x1, int y1, int x2, int y2)
+{

        int x, y, temp;
        int x, y, temp;

+       Glyph *gp;

 
 

-       if(x1 > x2)
+       if (x1 > x2)

                temp = x1, x1 = x2, x2 = temp;
                temp = x1, x1 = x2, x2 = temp;

-       if(y1 > y2)
+       if (y1 > y2)

                temp = y1, y1 = y2, y2 = temp;
 
        LIMIT(x1, 0, term.col-1);
                temp = y1, y1 = y2, y2 = temp;
 
        LIMIT(x1, 0, term.col-1);


@@ -1560,85 +1904,145 @@ tclearregion(int x1, int y1, int x2, int y2) {
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 

-       for(y = y1; y <= y2; y++) {
+       for (y = y1; y <= y2; y++) {

                term.dirty[y] = 1;
                term.dirty[y] = 1;

-               for(x = x1; x <= x2; x++) {
-                       if(selected(x, y))
+               for (x = x1; x <= x2; x++) {
+                       gp = &term.line[y][x];
+                       if (selected(x, y))

                                selclear(NULL);
                                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;
+                       gp->u = ' ';

                }
        }
 }
 
 void
                }
        }
 }
 
 void

-tdeletechar(int n) {
-       int src = term.c.x + n;
-       int dst = term.c.x;
-       int size = term.col - src;
+tdeletechar(int n)
+{
+       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
        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;
+tinsertblank(int n)
+{
+       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
        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);
+tinsertblankline(int n)
+{
+       if (BETWEEN(term.c.y, term.top, term.bot))
+               tscrolldown(term.c.y, n);

 }
 
 void
 }
 
 void

-tdeleteline(int n) {
-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
+tdeleteline(int n)
+{
+       if (BETWEEN(term.c.y, term.top, term.bot))
+               tscrollup(term.c.y, n);
+}
+
+int32_t
+tdefcolor(int *attr, int *npar, int l)
+{
+       int32_t idx = -1;
+       uint r, g, b;
+
+       switch (attr[*npar + 1]) {
+       case 2: /* direct color in RGB space */
+               if (*npar + 4 >= l) {
+                       fprintf(stderr,
+                               "erresc(38): Incorrect number of parameters (%d)\n",
+                               *npar);
+                       break;
+               }
+               r = attr[*npar + 2];
+               g = attr[*npar + 3];
+               b = attr[*npar + 4];
+               *npar += 4;
+               if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
+                       fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
+                               r, g, b);
+               else
+                       idx = TRUECOLOR(r, g, b);
+               break;
+       case 5: /* indexed color */
+               if (*npar + 2 >= l) {
+                       fprintf(stderr,
+                               "erresc(38): Incorrect number of parameters (%d)\n",
+                               *npar);
+                       break;
+               }
+               *npar += 2;
+               if (!BETWEEN(attr[*npar], 0, 255))
+                       fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]);
+               else
+                       idx = attr[*npar];
+               break;
+       case 0: /* implemented defined (only foreground) */
+       case 1: /* transparent */
+       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]);
+               break;
+       }

 
 

-       tscrollup(term.c.y, n);
+       return idx;

 }
 
 void
 }
 
 void

-tsetattr(int *attr, int l) {
+tsetattr(int *attr, int l)
+{

        int i;
        int i;

+       int32_t idx;

 
 

-       for(i = 0; i < l; i++) {
-               switch(attr[i]) {
+       for (i = 0; i < l; i++) {
+               switch (attr[i]) {

                case 0:
                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;


@@ -1646,15 +2050,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;


@@ -1663,58 +2073,39 @@ 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:
                case 38:

-                       if(i + 2 < l && attr[i + 1] == 5) {
-                               i += 2;
-                               if(BETWEEN(attr[i], 0, 255)) {
-                                       term.c.attr.fg = attr[i];
-                               } else {
-                                       fprintf(stderr,
-                                               "erresc: bad fgcolor %d\n",
-                                               attr[i]);
-                               }
-                       } else {
-                               fprintf(stderr,
-                                       "erresc(38): gfx attr %d unknown\n",
-                                       attr[i]);
-                       }
+                       if ((idx = tdefcolor(attr, &i, l)) >= 0)
+                               term.c.attr.fg = idx;

                        break;
                case 39:
                        term.c.attr.fg = defaultfg;
                        break;
                case 48:
                        break;
                case 39:
                        term.c.attr.fg = defaultfg;
                        break;
                case 48:

-                       if(i + 2 < l && attr[i + 1] == 5) {
-                               i += 2;
-                               if(BETWEEN(attr[i], 0, 255)) {
-                                       term.c.attr.bg = attr[i];
-                               } else {
-                                       fprintf(stderr,
-                                               "erresc: bad bgcolor %d\n",
-                                               attr[i]);
-                               }
-                       } else {
-                               fprintf(stderr,
-                                       "erresc(48): gfx attr %d unknown\n",
-                                       attr[i]);
-                       }
+                       if ((idx = tdefcolor(attr, &i, l)) >= 0)
+                               term.c.attr.bg = idx;

                        break;
                case 49:
                        term.c.attr.bg = defaultbg;
                        break;
                default:
                        break;
                case 49:
                        term.c.attr.bg = defaultbg;
                        break;
                default:

-                       if(BETWEEN(attr[i], 30, 37)) {
+                       if (BETWEEN(attr[i], 30, 37)) {

                                term.c.attr.fg = attr[i] - 30;
                                term.c.attr.fg = attr[i] - 30;

-                       } else if(BETWEEN(attr[i], 40, 47)) {
+                       } else if (BETWEEN(attr[i], 40, 47)) {

                                term.c.attr.bg = attr[i] - 40;
                                term.c.attr.bg = attr[i] - 40;

-                       } else if(BETWEEN(attr[i], 90, 97)) {
+                       } else if (BETWEEN(attr[i], 90, 97)) {

                                term.c.attr.fg = attr[i] - 90 + 8;
                                term.c.attr.fg = attr[i] - 90 + 8;

-                       } else if(BETWEEN(attr[i], 100, 107)) {
+                       } else if (BETWEEN(attr[i], 100, 107)) {

                                term.c.attr.bg = attr[i] - 100 + 8;
                        } else {
                                fprintf(stderr,
                                term.c.attr.bg = attr[i] - 100 + 8;
                        } else {
                                fprintf(stderr,


@@ -1727,12 +2118,13 @@ tsetattr(int *attr, int l) {
 }
 
 void
 }
 
 void

-tsetscroll(int t, int b) {
+tsetscroll(int t, int b)
+{

        int temp;
 
        LIMIT(t, 0, term.row-1);
        LIMIT(b, 0, term.row-1);
        int temp;
 
        LIMIT(t, 0, term.row-1);
        LIMIT(b, 0, term.row-1);

-       if(t > b) {
+       if (t > b) {

                temp = t;
                t = b;
                b = temp;
                temp = t;
                t = b;
                b = temp;


@@ -1741,25 +2133,23 @@ tsetscroll(int t, int b) {
        term.bot = b;
 }
 
        term.bot = b;
 }
 

-#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-

 void
 void

-tsetmode(bool priv, bool set, int *args, int narg) {
+tsetmode(int priv, int set, int *args, int narg)
+{

        int *lim, mode;
        int *lim, mode;

-       bool alt;
+       int alt;

 
 

-       for(lim = args + narg; args < lim; ++args) {
-               if(priv) {
-                       switch(*args) {
-                               break;
+       for (lim = args + narg; args < lim; ++args) {
+               if (priv) {
+                       switch (*args) {

                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 5: /* DECSCNM -- Reverse video */
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);

-                               if(mode != term.mode)
-                                       redraw(REDRAW_TIMEOUT);
+                               if (mode != term.mode)
+                                       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);


@@ -1810,25 +2200,31 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1034:
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;
                        case 1034:
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;

-                       case 1049: /* = 1047 and 1048 */
-                       case 47:
+                       case 1049: /* swap screen & set/restore cursor as xterm */
+                               if (!allowaltscreen)
+                                       break;
+                               tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
+                               /* FALLTHROUGH */
+                       case 47: /* swap screen */

                        case 1047:
                                if (!allowaltscreen)
                                        break;
                        case 1047:
                                if (!allowaltscreen)
                                        break;

-

                                alt = IS_SET(MODE_ALTSCREEN);
                                alt = IS_SET(MODE_ALTSCREEN);

-                               if(alt) {
+                               if (alt) {

                                        tclearregion(0, 0, term.col-1,
                                                        term.row-1);
                                }
                                        tclearregion(0, 0, term.col-1,
                                                        term.row-1);
                                }

-                               if(set ^ alt)           /* set is always 1 or 0 */
+                               if (set ^ alt) /* set is always 1 or 0 */

                                        tswapscreen();
                                        tswapscreen();

-                               if(*args != 1049)
+                               if (*args != 1049)

                                        break;
                                        break;

-                               /* FALLTRU */
+                               /* FALLTHROUGH */

                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;

+                       case 2004: /* 2004: bracketed paste mode */
+                               MODBIT(term.mode, set, MODE_BRCKTPASTE);
+                               break;

                        /* Not implemented mouse modes. See comments there. */
                        case 1001: /* mouse highlight mode; can hang the
                                      terminal by design when implemented. */
                        /* Not implemented mouse modes. See comments there. */
                        case 1001: /* mouse highlight mode; can hang the
                                      terminal by design when implemented. */


@@ -1845,7 +2241,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                break;
                        }
                } else {
                                break;
                        }
                } else {

-                       switch(*args) {
+                       switch (*args) {

                        case 0:  /* Error (IGNORED) */
                                break;
                        case 2:  /* KAM -- keyboard action */
                        case 0:  /* Error (IGNORED) */
                                break;
                        case 2:  /* KAM -- keyboard action */


@@ -1871,8 +2267,12 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 }
 
 void
 }
 
 void

-csihandle(void) {
-       switch(csiescseq.mode) {
+csihandle(void)
+{
+       char buf[40];
+       int len;
+
+       switch (csiescseq.mode[0]) {

        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");
        default:
        unknown:
                fprintf(stderr, "erresc: unknown csi ");


@@ -1892,9 +2292,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 */
        case 'c': /* DA -- Device Attributes */

-               if(csiescseq.arg[0] == 0)
-                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+               if (csiescseq.arg[0] == 0)
+                       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 */


@@ -1914,7 +2333,7 @@ csihandle(void) {
                tmoveto(0, term.c.y-csiescseq.arg[0]);
                break;
        case 'g': /* TBC -- Tabulation clear */
                tmoveto(0, term.c.y-csiescseq.arg[0]);
                break;
        case 'g': /* TBC -- Tabulation clear */

-               switch(csiescseq.arg[0]) {
+               switch (csiescseq.arg[0]) {

                case 0: /* clear current tab stop */
                        term.tabs[term.c.x] = 0;
                        break;
                case 0: /* clear current tab stop */
                        term.tabs[term.c.x] = 0;
                        break;


@@ -1938,21 +2357,20 @@ 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);

-               switch(csiescseq.arg[0]) {
+               switch (csiescseq.arg[0]) {

                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);

-                       if(term.c.y < term.row-1) {
+                       if (term.c.y < term.row-1) {

                                tclearregion(0, term.c.y+1, term.col-1,
                                                term.row-1);
                        }
                        break;
                case 1: /* above */
                                tclearregion(0, term.c.y+1, term.col-1,
                                                term.row-1);
                        }
                        break;
                case 1: /* above */

-                       if(term.c.y > 1)
+                       if (term.c.y > 1)

                                tclearregion(0, 0, term.col-1, term.c.y-1);
                        tclearregion(0, term.c.y, term.c.x, term.c.y);
                        break;
                                tclearregion(0, 0, term.col-1, term.c.y-1);
                        tclearregion(0, term.c.y, term.c.x, term.c.y);
                        break;


@@ -1964,7 +2382,7 @@ csihandle(void) {
                }
                break;
        case 'K': /* EL -- Clear line */
                }
                break;
        case 'K': /* EL -- Clear line */

-               switch(csiescseq.arg[0]) {
+               switch (csiescseq.arg[0]) {

                case 0: /* right */
                        tclearregion(term.c.x, term.c.y, term.col-1,
                                        term.c.y);
                case 0: /* right */
                        tclearregion(term.c.x, term.c.y, term.col-1,
                                        term.c.y);


@@ -2007,8 +2425,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);


@@ -2020,8 +2437,15 @@ csihandle(void) {
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;

+       case 'n': /* DSR – Device Status Report (cursor position) */
+               if (csiescseq.arg[0] == 6) {
+                       len = snprintf(buf, sizeof(buf),"\033[%i;%iR",
+                                       term.c.y+1, term.c.x+1);
+                       ttywrite(buf, len);
+               }
+               break;

        case 'r': /* DECSTBM -- Set Scrolling Region */
        case 'r': /* DECSTBM -- Set Scrolling Region */

-               if(csiescseq.priv) {
+               if (csiescseq.priv) {

                        goto unknown;
                } else {
                        DEFAULT(csiescseq.arg[0], 1);
                        goto unknown;
                } else {
                        DEFAULT(csiescseq.arg[0], 1);


@@ -2036,24 +2460,38 @@ 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;

        }
 }
 
 void
        }
 }
 
 void

-csidump(void) {
+csidump(void)
+{

        int i;
        uint c;
 
        printf("ESC[");
        int i;
        uint c;
 
        printf("ESC[");

-       for(i = 0; i < csiescseq.len; i++) {
+       for (i = 0; i < csiescseq.len; i++) {

                c = csiescseq.buf[i] & 0xff;
                c = csiescseq.buf[i] & 0xff;

-               if(isprint(c)) {
+               if (isprint(c)) {

                        putchar(c);
                        putchar(c);

-               } else if(c == '\n') {
+               } else if (c == '\n') {

                        printf("(\\n)");
                        printf("(\\n)");

-               } else if(c == '\r') {
+               } else if (c == '\r') {

                        printf("(\\r)");
                        printf("(\\r)");

-               } else if(c == 0x1b) {
+               } else if (c == 0x1b) {

                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);
                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);


@@ -2063,91 +2501,102 @@ csidump(void) {
 }
 
 void
 }
 
 void

-csireset(void) {
+csireset(void)
+{

        memset(&csiescseq, 0, sizeof(csiescseq));
 }
 
 void
        memset(&csiescseq, 0, sizeof(csiescseq));
 }
 
 void

-strhandle(void) {
+strhandle(void)
+{

        char *p = NULL;
        char *p = NULL;

-       int i, j, narg;
+       int j, narg, par;

 
 

+       term.esc &= ~(ESC_STR_END|ESC_STR);

        strparse();
        strparse();

-       narg = strescseq.narg;
+       par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;

 
 

-       switch(strescseq.type) {
+       switch (strescseq.type) {

        case ']': /* OSC -- Operating System Command */
        case ']': /* OSC -- Operating System Command */

-               switch(i = atoi(strescseq.args[0])) {
+               switch (par) {

                case 0:
                case 1:
                case 2:
                case 0:
                case 1:
                case 2:

-                       if(narg > 1)
+                       if (narg > 1)

                                xsettitle(strescseq.args[1]);
                                xsettitle(strescseq.args[1]);

-                       break;
+                       return;

                case 4: /* color set */
                case 4: /* color set */

-                       if(narg < 3)
+                       if (narg < 3)

                                break;
                        p = strescseq.args[2];
                                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();

                        }
                        }

-                       break;
-               default:
-                       fprintf(stderr, "erresc: unknown str ");
-                       strdump();
-                       break;
+                       return;

                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);
                }
                break;
        case 'k': /* old title set compatibility */
                xsettitle(strescseq.args[0]);

-               break;
-       case 'P': /* DSC -- Device Control String */
+               return;
+       case 'P': /* DCS -- Device Control String */

        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */
        case '_': /* APC -- Application Program Command */
        case '^': /* PM -- Privacy Message */

-       default:
-               fprintf(stderr, "erresc: unknown str ");
-               strdump();
-               /* die(""); */
-               break;
+               return;

        }
        }

+
+       fprintf(stderr, "erresc: unknown str ");
+       strdump();

 }
 
 void
 }
 
 void

-strparse(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

-strdump(void) {
+strdump(void)
+{

        int i;
        uint c;
 
        printf("ESC%c", strescseq.type);
        int i;
        uint c;
 
        printf("ESC%c", strescseq.type);

-       for(i = 0; i < strescseq.len; i++) {
+       for (i = 0; i < strescseq.len; i++) {

                c = strescseq.buf[i] & 0xff;
                c = strescseq.buf[i] & 0xff;

-               if(c == '\0') {
+               if (c == '\0') {

                        return;
                        return;

-               } else if(isprint(c)) {
+               } else if (isprint(c)) {

                        putchar(c);
                        putchar(c);

-               } else if(c == '\n') {
+               } else if (c == '\n') {

                        printf("(\\n)");
                        printf("(\\n)");

-               } else if(c == '\r') {
+               } else if (c == '\r') {

                        printf("(\\r)");
                        printf("(\\r)");

-               } else if(c == 0x1b) {
+               } else if (c == 0x1b) {

                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);
                        printf("(\\e)");
                } else {
                        printf("(%02x)", c);


@@ -2157,98 +2606,413 @@ strdump(void) {
 }
 
 void
 }
 
 void

-strreset(void) {
+strreset(void)
+{

        memset(&strescseq, 0, sizeof(strescseq));
 }
 
 void
        memset(&strescseq, 0, sizeof(strescseq));
 }
 
 void

-tputtab(bool forward) {
+sendbreak(const Arg *arg)
+{
+       if (tcsendbreak(cmdfd, 0))
+               perror("Error sending break");
+}
+
+void
+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)
+{
+       char buf[UTF_SIZ];
+       Glyph *bp, *end;
+
+       bp = &term.line[n][0];
+       end = &bp[MIN(tlinelen(n), term.col) - 1];
+       if (bp != end || bp->u != ' ') {
+               for ( ;bp <= end; ++bp)
+                       tprinter(buf, utf8encode(bp->u, buf));
+       }
+       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 */ ;
+       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 */ ;
+       }
+       term.c.x = LIMIT(x, 0, term.col-1);
+}
+
+void
+techo(Rune u)
+{
+       if (ISCONTROL(u)) { /* control code */
+               if (u & 0x80) {
+                       u &= 0x7f;
+                       tputc('^');
+                       tputc('[');
+               } else if (u != '\n' && u != '\r' && u != '\t') {
+                       u ^= 0x40;
+                       tputc('^');
+               }
+       }
+       tputc(u);
+}
+
+void
+tdefutf8(char ascii)
+{
+       if (ascii == 'G')
+               term.mode |= MODE_UTF8;
+       else if (ascii == '@')
+               term.mode &= ~MODE_UTF8;
+}
+
+void
+tdeftran(char ascii)
+{
+       static char cs[] = "0B";
+       static int vcs[] = {CS_GRAPHIC0, CS_USA};
+       char *p;
+
+       if ((p = strchr(cs, ascii)) == NULL) {
+               fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);

        } else {
        } else {

-               if(x == 0)
-                       return;
-               for(--x; x > 0 && !term.tabs[x]; --x)
-                       /* nothing */ ;
+               term.trantbl[term.icharset] = vcs[p - cs];

        }
        }

-       tmoveto(x, term.c.y);

 }
 
 void
 }
 
 void

-techo(char *buf, int len) {
-       for(; len > 0; buf++, len--) {
-               char c = *buf;
+tdectest(char c)
+{
+       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);
+               }
+       }
+}

 
 

-               if(c == '\033') {               /* escape */
-                       tputc("^", 1);
-                       tputc("[", 1);
-               } else if(c < '\x20') { /* control code */
-                       if(c != '\n' && c != '\r' && c != '\t') {
-                               c |= '\x40';
-                               tputc("^", 1);
-                       }
-                       tputc(&c, 1);
+void
+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;
+}
+
+void
+tcontrolcode(uchar ascii)
+{
+       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 {
                } else {

-                       break;
+                       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('?', &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 0x80:   /* TODO: PAD */
+       case 0x81:   /* TODO: HOP */
+       case 0x82:   /* TODO: BPH */
+       case 0x83:   /* TODO: NBH */
+       case 0x84:   /* TODO: IND */
+               break;
+       case 0x85:   /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 0x86:   /* TODO: SSA */
+       case 0x87:   /* TODO: ESA */
+               break;
+       case 0x88:   /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;
+       case 0x89:   /* TODO: HTJ */
+       case 0x8a:   /* TODO: VTS */
+       case 0x8b:   /* TODO: PLD */
+       case 0x8c:   /* TODO: PLU */
+       case 0x8d:   /* TODO: RI */
+       case 0x8e:   /* TODO: SS2 */
+       case 0x8f:   /* TODO: SS3 */
+       case 0x91:   /* TODO: PU1 */
+       case 0x92:   /* TODO: PU2 */
+       case 0x93:   /* TODO: STS */
+       case 0x94:   /* TODO: CCH */
+       case 0x95:   /* TODO: MW */
+       case 0x96:   /* TODO: SPA */
+       case 0x97:   /* TODO: EPA */
+       case 0x98:   /* TODO: SOS */
+       case 0x99:   /* TODO: SGCI */
+               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 0x9d:   /* OSC -- Operating System Command */
+       case 0x9e:   /* PM -- Privacy Message */
+       case 0x9f:   /* APC -- Application Program Command */
+               tstrsequence(ascii);
+               return;

        }
        }

-       if(len)
-               tputc(buf, len);
+       /* only CAN, SUB, \a and C1 chars interrupt a sequence */
+       term.esc &= ~(ESC_STR_END|ESC_STR);

 }
 
 }
 

-void
-tputc(char *c, int len) {
-       uchar ascii = *c;
-       bool control = ascii < '\x20' || ascii == 0177;
+/*
+ * 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 '%':
+               term.esc |= ESC_UTF8;
+               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;
+}

 
 

-       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
+tputc(Rune u)
+{
+       char c[UTF_SIZ];
+       int control;
+       int width, len;
+       Glyph *gp;
+
+       control = ISCONTROL(u);
+       if (!IS_SET(MODE_UTF8)) {
+               c[0] = u;
+               width = len = 1;
+       } else {
+               len = utf8encode(u, c);
+               if (!control && (width = wcwidth(u)) == -1) {
+                       memcpy(c, "\357\277\275", 4); /* UTF_INVALID */
+                       width = 1;

                }
        }
 
                }
        }
 

+       if (IS_SET(MODE_PRINT))
+               tprinter(c, len);
+

        /*
        /*

-        * 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) {
-               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 (term.esc & ESC_STR) {
+               if (u == '\a' || u == 030 || u == 032 || u == 033 ||
+                  ISCONTROLC1(u)) {
+                       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;

        }
 
        /*
        }
 
        /*


@@ -2256,241 +3020,112 @@ tputc(char *c, int len) {
         * because they can be embedded inside a control sequence, and
         * they must not cause conflicts with sequences.
         */
         * because they can be embedded inside a control sequence, and
         * they must not cause conflicts with sequences.
         */

-       if(control) {
-               switch(ascii) {
-               case '\t':      /* HT */
-                       tputtab(1);
-                       return;
-               case '\b':      /* BS */
-                       tmoveto(term.c.x-1, term.c.y);
-                       return;
-               case '\r':      /* CR */
-                       tmoveto(0, term.c.y);
-                       return;
-               case '\f':      /* LF */
-               case '\v':      /* VT */
-               case '\n':      /* LF */
-                       /* go to first col if the mode is set */
-                       tnewline(IS_SET(MODE_CRLF));
-                       return;
-               case '\a':      /* BEL */
-                       if(!(xw.state & WIN_FOCUSED))
-                               xseturgency(1);
-                       return;
-               case '\033':    /* ESC */
-                       csireset();
-                       term.esc = ESC_START;
-                       return;
-               case '\016':    /* SO */
-               case '\017':    /* SI */
-                       /*
-                        * Different charsets are hard to handle. Applications
-                        * should use the right alt charset escapes for the
-                        * only reason they still exist: line drawing. The
-                        * rest is incompatible history st should not support.
-                        */
-                       return;
-               case '\032':    /* SUB */
-               case '\030':    /* CAN */
-                       csireset();
-                       return;
-               case '\005':    /* ENQ (IGNORED) */
-               case '\000':    /* NUL (IGNORED) */
-               case '\021':    /* XON (IGNORED) */
-               case '\023':    /* XOFF (IGNORED) */
-               case 0177:      /* DEL (IGNORED) */
-                       return;
-               }
-       } else if(term.esc & ESC_START) {
-               if(term.esc & ESC_CSI) {
-                       csiescseq.buf[csiescseq.len++] = ascii;
-                       if(BETWEEN(ascii, 0x40, 0x7E)
+       if (control) {
+               tcontrolcode(u);
+               /*
+                * control codes are not shown ever
+                */
+               return;
+       } else if (term.esc & ESC_START) {
+               if (term.esc & ESC_CSI) {
+                       csiescseq.buf[csiescseq.len++] = u;
+                       if (BETWEEN(u, 0x40, 0x7E)

                                        || csiescseq.len >= \
                                        sizeof(csiescseq.buf)-1) {
                                term.esc = 0;
                                csiparse();
                                csihandle();
                        }
                                        || csiescseq.len >= \
                                        sizeof(csiescseq.buf)-1) {
                                term.esc = 0;
                                csiparse();
                                csihandle();
                        }

-               } else if(term.esc & ESC_STR_END) {
-                       term.esc = 0;
-                       if(ascii == '\\')
-                               strhandle();
-               } else if(term.esc & ESC_ALTCHARSET) {
-                       switch(ascii) {
-                       case '0': /* Line drawing set */
-                               term.c.attr.mode |= ATTR_GFX;
-                               break;
-                       case 'B': /* USASCII */
-                               term.c.attr.mode &= ~ATTR_GFX;
-                               break;
-                       case 'A': /* UK (IGNORED) */
-                       case '<': /* multinational charset (IGNORED) */
-                       case '5': /* Finnish (IGNORED) */
-                       case 'C': /* Finnish (IGNORED) */
-                       case 'K': /* German (IGNORED) */
-                               break;
-                       default:
-                               fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
-                       }
-                       term.esc = 0;
-               } else if(term.esc & ESC_TEST) {
-                       if(ascii == '8') { /* DEC screen alignment test. */
-                               char E[UTF_SIZ] = "E";
-                               int x, y;
-
-                               for(x = 0; x < term.col; ++x) {
-                                       for(y = 0; y < term.row; ++y)
-                                               tsetchar(E, &term.c.attr, x, y);
-                               }
-                       }
-                       term.esc = 0;
+                       return;
+               } else if (term.esc & ESC_UTF8) {
+                       tdefutf8(u);
+               } else if (term.esc & ESC_ALTCHARSET) {
+                       tdeftran(u);
+               } else if (term.esc & ESC_TEST) {
+                       tdectest(u);

                } 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 */
-                               term.esc |= ESC_ALTCHARSET;
-                               break;
-                       case ')': /* set secondary charset G1 (IGNORED) */
-                       case '*': /* set tertiary charset G2 (IGNORED) */
-                       case '+': /* set quaternary charset G3 (IGNORED) */
-                               term.esc = 0;
-                               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();
-                               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(u))
+                               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))
+       if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))

                selclear(NULL);
                selclear(NULL);

-       if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
-               term.line[term.c.y][term.c.x].mode |= ATTR_WRAP;
+
+       gp = &term.line[term.c.y][term.c.x];
+       if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
+               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) {
+               tnewline(1);
+               gp = &term.line[term.c.y][term.c.x];

        }
 
        }
 

-       tsetchar(c, &term.c.attr, term.c.x, term.c.y);
-       if(term.c.x+1 < term.col) {
-               tmoveto(term.c.x+1, term.c.y);
+       tsetchar(u, &term.c.attr, term.c.x, term.c.y);
+
+       if (width == 2) {
+               gp->mode |= ATTR_WIDE;
+               if (term.c.x+1 < term.col) {
+                       gp[1].u = '\0';
+                       gp[1].mode = ATTR_WDUMMY;
+               }
+       }
+       if (term.c.x+width < term.col) {
+               tmoveto(term.c.x+width, term.c.y);

        } else {
                term.c.state |= CURSOR_WRAPNEXT;
        }
 }
 
        } else {
                term.c.state |= CURSOR_WRAPNEXT;
        }
 }
 

-int
-tresize(int col, int row) {
+void
+tresize(int col, int row)
+{

        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int i;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);

-       int slide = term.c.y - row + 1;
-       bool *bp;
-       Line *orig;
+       int *bp;
+       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++) {
+       for (i += row; i < term.row; i++) {

                free(term.line[i]);
                free(term.alt[i]);
        }
 
                free(term.line[i]);
                free(term.alt[i]);
        }
 

+       /* resize to new width */
+       term.specbuf = xrealloc(term.specbuf, col * sizeof(XftGlyphFontSpec));
+

        /* resize to new height */
        term.line = xrealloc(term.line, row * sizeof(Line));
        term.alt  = xrealloc(term.alt,  row * sizeof(Line));
        /* resize to new height */
        term.line = xrealloc(term.line, row * sizeof(Line));
        term.alt  = xrealloc(term.alt,  row * sizeof(Line));


@@ -2498,25 +3133,23 @@ tresize(int col, int row) {
        term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
        /* resize each row to new width, zero-pad if needed */
        term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
        /* resize each row to new width, zero-pad if needed */

-       for(i = 0; i < minrow; i++) {
-               term.dirty[i] = 1;
+       for (i = 0; i < minrow; 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 */
                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] = xcalloc(col, sizeof(Glyph));
-               term.alt [i] = xcalloc(col, sizeof(Glyph));
+       for (/* i == minrow */; i < row; i++) {
+               term.line[i] = xmalloc(col * sizeof(Glyph));
+               term.alt[i] = xmalloc(col * sizeof(Glyph));

        }
        }

-       if(col > term.col) {
+       if (col > term.col) {

                bp = term.tabs + term.col;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                bp = term.tabs + term.col;
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));

-               while(--bp > term.tabs && !*bp)
+               while (--bp > term.tabs && !*bp)

                        /* nothing */ ;
                        /* nothing */ ;

-               for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces)
+               for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces)

                        *bp = 1;
        }
        /* update terminal size */
                        *bp = 1;
        }
        /* update terminal size */


@@ -2526,23 +3159,24 @@ 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 {
-               if(mincol < col && 0 < minrow) {
+       /* 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);
                }
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }

-               if(0 < col && minrow < row) {
+               if (0 < col && minrow < 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

-xresize(int col, int row) {
+xresize(int col, int row)
+{

        xw.tw = MAX(1, col * xw.cw);
        xw.th = MAX(1, row * xw.ch);
 
        xw.tw = MAX(1, col * xw.cw);
        xw.th = MAX(1, row * xw.ch);
 


@@ -2553,140 +3187,156 @@ xresize(int col, int row) {
        xclear(0, 0, xw.w, xw.h);
 }
 
        xclear(0, 0, xw.w, xw.h);
 }
 

-static inline ushort
-sixd_to_16bit(int x) {
+ushort
+sixd_to_16bit(int x)
+{

        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 

-void
-xloadcols(void) {
-       int i, r, g, b;
+int
+xloadcolor(int i, const char *name, Color *ncolor)
+{

        XRenderColor color = { .alpha = 0xffff };
 
        XRenderColor color = { .alpha = 0xffff };
 

-       /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
-       for(i = 0; i < LEN(colorname); i++) {
-               if(!colorname[i])
-                       continue;
-               if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.col[i])) {
-                       die("Could not allocate color '%s'\n", colorname[i]);
-               }
+       if (!name) {
+               if (BETWEEN(i, 16, 255)) { /* 256 color */
+                       if (i < 6*6*6+16) { /* same colors as xterm */
+                               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 );
+                       } else { /* greyscale */
+                               color.red = 0x0808 + 0x0a0a * (i - (6*6*6+16));
+                               color.green = color.blue = color.red;
+                       }
+                       return XftColorAllocValue(xw.dpy, xw.vis,
+                                                 xw.cmap, &color, ncolor);
+               } else
+                       name = colorname[i];

        }
 
        }
 

-       /* load colors [16-255] ; same colors as xterm */
-       for(i = 16, r = 0; r < 6; r++) {
-               for(g = 0; g < 6; g++) {
-                       for(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++;
-                       }
-               }
+       return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
+}
+
+void
+xloadcols(void)
+{
+       int i;
+       static int loaded;
+       Color *cp;
+
+       if (loaded) {
+               for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp)
+                       XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);

        }
 
        }
 

-       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])) {
-                       die("Could not allocate color %d\n", i);
+       for (i = 0; i < LEN(dc.col); i++)
+               if (!xloadcolor(i, NULL, &dc.col[i])) {
+                       if (colorname[i])
+                               die("Could not allocate color '%s'\n", colorname[i]);
+                       else
+                               die("Could not allocate color %d\n", i);

                }
                }

-       }
+       loaded = 1;

 }
 
 int
 }
 
 int

-xsetcolorname(int x, const char *name) {
-       XRenderColor color = { .alpha = 0xffff };
-       Colour colour;
-       if (x < 0 || x > LEN(colorname))
-               return -1;
-       if(!name) {
-               if(16 <= x && x < 16 + 216) {
-                       int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6;
-                       color.red = sixd_to_16bit(r);
-                       color.green = sixd_to_16bit(g);
-                       color.blue = sixd_to_16bit(b);
-                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
-                               return 0; /* something went wrong */
-                       dc.col[x] = colour;
-                       return 1;
-               } else if (16 + 216 <= x && x < 256) {
-                       color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216));
-                       if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour))
-                               return 0; /* something went wrong */
-                       dc.col[x] = colour;
-                       return 1;
-               } else {
-                       name = colorname[x];
-               }
-       }
-       if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, &colour))
-               return 0;
-       dc.col[x] = colour;
-       return 1;
-}
+xsetcolorname(int x, const char *name)
+{
+       Color ncolor;

 
 

-void
-xtermclear(int col1, int row1, int col2, int row2) {
-       XftDrawRect(xw.draw,
-                       &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
-                       borderpx + col1 * xw.cw,
-                       borderpx + row1 * xw.ch,
-                       (col2-col1+1) * xw.cw,
-                       (row2-row1+1) * xw.ch);
+       if (!BETWEEN(x, 0, LEN(dc.col)))
+               return 1;
+
+
+       if (!xloadcolor(x, name, &ncolor))
+               return 1;
+
+       XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]);
+       dc.col[x] = ncolor;
+
+       return 0;

 }
 
 /*
  * Absolute coordinates.
  */
 void
 }
 
 /*
  * Absolute coordinates.
  */
 void

-xclear(int x1, int y1, int x2, int y2) {
+xclear(int x1, int y1, int x2, int y2)
+{

        XftDrawRect(xw.draw,
                        &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
                        x1, y1, x2-x1, y2-y1);
 }
 
 void
        XftDrawRect(xw.draw,
                        &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
                        x1, y1, x2-x1, y2-y1);
 }
 
 void

-xhints(void) {
-       XClassHint class = {opt_class ? opt_class : termname, termname};
+xhints(void)
+{
+       XClassHint class = {opt_name ? opt_name : termname,
+                           opt_class ? opt_class : termname};

        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints *sizeh = NULL;
 
        sizeh = XAllocSizeHints();
        XWMHints wm = {.flags = InputHint, .input = 1};
        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) {
+               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);
 }
 
 int
        XFree(sizeh);
 }
 
 int

-xloadfont(Font *f, FcPattern *pattern) {
+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;
        FcResult result;
        FcPattern *match;
        FcResult result;

+       XGlyphInfo extents;

 
 

-       match = FcFontMatch(NULL, pattern, &result);
-       if(!match)
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
+       if (!match)

                return 1;
 
                return 1;
 

-       if(!(f->match = XftFontOpenPattern(xw.dpy, match))) {
+       if (!(f->match = XftFontOpenPattern(xw.dpy, match))) {

                FcPatternDestroy(match);
                return 1;
        }
 
                FcPatternDestroy(match);
                return 1;
        }
 

+       XftTextExtentsUtf8(xw.dpy, f->match,
+               (const FcChar8 *) ascii_printable,
+               strlen(ascii_printable), &extents);
+

        f->set = NULL;
        f->pattern = FcPatternDuplicate(pattern);
 
        f->set = NULL;
        f->pattern = FcPatternDuplicate(pattern);
 


@@ -2696,34 +3346,39 @@ xloadfont(Font *f, FcPattern *pattern) {
        f->rbearing = f->match->max_advance_width;
 
        f->height = f->ascent + f->descent;
        f->rbearing = f->match->max_advance_width;
 
        f->height = f->ascent + f->descent;

-       f->width = f->lbearing + f->rbearing;
+       f->width = DIVCEIL(extents.xOff, strlen(ascii_printable));

 
        return 0;
 }
 
 void
 
        return 0;
 }
 
 void

-xloadfonts(char *fontstr, int fontsize) {
+xloadfonts(char *fontstr, double fontsize)
+{

        FcPattern *pattern;
        FcPattern *pattern;

-       FcResult result;

        double fontval;
        double fontval;

+       float ceilf(float);

 
 

-       if(fontstr[0] == '-') {
+       if (fontstr[0] == '-') {

                pattern = XftXlfdParse(fontstr, False, False);
        } else {
                pattern = FcNameParse((FcChar8 *)fontstr);
        }
 
                pattern = XftXlfdParse(fontstr, False, False);
        } else {
                pattern = FcNameParse((FcChar8 *)fontstr);
        }
 

-       if(!pattern)
+       if (!pattern)

                die("st: can't open font %s\n", fontstr);
 
                die("st: can't open font %s\n", fontstr);
 

-       if(fontsize > 0) {
+       if (fontsize > 1) {

                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_PIXEL_SIZE);

+               FcPatternDel(pattern, FC_SIZE);

                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                usedfontsize = fontsize;
        } else {
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                usedfontsize = fontsize;
        } else {

-               result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
-               if(result == FcResultMatch) {
-                       usedfontsize = (int)fontval;
+               if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
+                               FcResultMatch) {
+                       usedfontsize = fontval;
+               } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
+                               FcResultMatch) {
+                       usedfontsize = -1;

                } else {
                        /*
                         * Default font size is 12, if none given. This is to
                } else {
                        /*
                         * Default font size is 12, if none given. This is to


@@ -2732,68 +3387,57 @@ xloadfonts(char *fontstr, int fontsize) {
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }

+               defaultfontsize = usedfontsize;

        }
 
        }
 

-       FcConfigSubstitute(0, pattern, FcMatchPattern);
-       FcDefaultSubstitute(pattern);
-
-       if(xloadfont(&dc.font, pattern))
+       if (xloadfont(&dc.font, pattern))

                die("st: can't open font %s\n", fontstr);
 
                die("st: can't open font %s\n", fontstr);
 

+       if (usedfontsize < 0) {
+               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 = dc.font.width;
-       xw.ch = dc.font.height;
+       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);

-       if(xloadfont(&dc.ifont, pattern))
+       if (xloadfont(&dc.ifont, pattern))

                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_WEIGHT);
        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_WEIGHT);
        FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);

-       if(xloadfont(&dc.ibfont, pattern))
+       if (xloadfont(&dc.ibfont, pattern))

                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
                die("st: can't open font %s\n", fontstr);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);

-       if(xloadfont(&dc.bfont, pattern))
+       if (xloadfont(&dc.bfont, pattern))

                die("st: can't open font %s\n", fontstr);
 
        FcPatternDestroy(pattern);
 }
 
                die("st: can't open font %s\n", fontstr);
 
        FcPatternDestroy(pattern);
 }
 

-int
-xloadfontset(Font *f) {
-       FcResult result;
-
-       if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result)))
-               return 1;
-       return 0;
-}
-

 void
 void

-xunloadfont(Font *f) {
+xunloadfont(Font *f)
+{

        XftFontClose(xw.dpy, f->match);
        FcPatternDestroy(f->pattern);
        XftFontClose(xw.dpy, f->match);
        FcPatternDestroy(f->pattern);

-       if(f->set)
+       if (f->set)

                FcFontSetDestroy(f->set);
 }
 
 void
                FcFontSetDestroy(f->set);
 }
 
 void

-xunloadfonts(void) {
-       int i, ip;
-
-       /*
-        * Free the loaded fonts in the font cache. This is done backwards
-        * from the frccur.
-        */
-       for(i = 0, ip = frccur; i < frclen; i++, ip--) {
-               if(ip < 0)
-                       ip = LEN(frc) - 1;
-               XftFontClose(xw.dpy, frc[ip].font);
-       }
-       frccur = -1;
-       frclen = 0;
+xunloadfonts(void)
+{
+       /* Free the loaded fonts in the font cache.  */
+       while (frclen > 0)
+               XftFontClose(xw.dpy, frc[--frclen].font);

 
        xunloadfont(&dc.font);
        xunloadfont(&dc.bfont);
 
        xunloadfont(&dc.font);
        xunloadfont(&dc.bfont);


@@ -2802,27 +3446,52 @@ xunloadfonts(void) {
 }
 
 void
 }
 
 void

-xzoom(const Arg *arg) {
+xzoom(const Arg *arg)
+{
+       Arg larg;
+
+       larg.f = usedfontsize + arg->f;
+       xzoomabs(&larg);
+}
+
+void
+xzoomabs(const Arg *arg)
+{

        xunloadfonts();
        xunloadfonts();

-       xloadfonts(usedfont, usedfontsize + arg->i);
+       xloadfonts(usedfont, arg->f);

        cresize(0, 0);
        cresize(0, 0);

-       redraw(0);
+       ttyresize();
+       redraw();
+       xhints();
+}
+
+void
+xzoomreset(const Arg *arg)
+{
+       Arg larg;
+
+       if (defaultfontsize > 0) {
+               larg.f = defaultfontsize;
+               xzoomabs(&larg);
+       }

 }
 
 void
 }
 
 void

-xinit(void) {
+xinit(void)
+{

        XGCValues gcvalues;
        Cursor cursor;
        Window parent;
        XGCValues gcvalues;
        Cursor cursor;
        Window parent;

-       int sw, sh;
+       pid_t thispid = getpid();
+       XColor xmousefg, xmousebg;

 
 

-       if(!(xw.dpy = XOpenDisplay(NULL)))
+       if (!(xw.dpy = XOpenDisplay(NULL)))

                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
                die("Can't open display\n");
        xw.scr = XDefaultScreen(xw.dpy);
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */

-       if(!FcInit())
+       if (!FcInit())

                die("Could not init fontconfig.\n");
 
        usedfont = (opt_font == NULL)? font : opt_font;
                die("Could not init fontconfig.\n");
 
        usedfont = (opt_font == NULL)? font : opt_font;


@@ -2833,23 +3502,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 += DisplayHeight(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;


@@ -2860,9 +3518,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);


@@ -2880,11 +3538,11 @@ xinit(void) {
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */
        xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
 
        /* input methods */

-       if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+       if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {

                XSetLocaleModifiers("@im=local");
                XSetLocaleModifiers("@im=local");

-               if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
+               if ((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {

                        XSetLocaleModifiers("@im=");
                        XSetLocaleModifiers("@im=");

-                       if((xw.xim = XOpenIM(xw.dpy,
+                       if ((xw.xim = XOpenIM(xw.dpy,

                                        NULL, NULL, NULL)) == NULL) {
                                die("XOpenIM failed. Could not open input"
                                        " device.\n");
                                        NULL, NULL, NULL)) == NULL) {
                                die("XOpenIM failed. Could not open input"
                                        " device.\n");


@@ -2894,128 +3552,278 @@ xinit(void) {
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);

-       if(xw.xic == NULL)
+       if (xw.xic == NULL)

                die("XCreateIC failed. Could not obtain input method.\n");
 
        /* white cursor, black outline */
                die("XCreateIC failed. Could not obtain input method.\n");
 
        /* white cursor, black outline */

-       cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+       cursor = XCreateFontCursor(xw.dpy, mouseshape);

        XDefineCursor(xw.dpy, xw.win, cursor);
        XDefineCursor(xw.dpy, xw.win, cursor);

-       XRecolorCursor(xw.dpy, cursor,
-               &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
-               &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+
+       if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
+               xmousefg.red   = 0xffff;
+               xmousefg.green = 0xffff;
+               xmousefg.blue  = 0xffff;
+       }
+
+       if (XParseColor(xw.dpy, xw.cmap, colorname[mousebg], &xmousebg) == 0) {
+               xmousebg.red   = 0x0000;
+               xmousebg.green = 0x0000;
+               xmousebg.blue  = 0x0000;
+       }
+
+       XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);

 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);

+       xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);

        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 

+       xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+       XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+                       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;
-       int frp, frcflags;
-       int u8fl, u8fblen, u8cblen, doesexist;
-       char *u8c, *u8fs;
-       long u8char;
+int
+xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
+{
+       float winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, xp, yp;
+       ushort mode, prevmode = USHRT_MAX;

        Font *font = &dc.font;
        Font *font = &dc.font;

+       int frcflags = FRC_NORMAL;
+       float runewidth = xw.cw;
+       Rune rune;
+       FT_UInt glyphidx;

        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;

-       Colour *fg, *bg, *temp, revfg, revbg;
-       XRenderColor colfg, colbg;
-       Rectangle r;
+       int i, f, numspecs = 0;
+
+       for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
+               /* Fetch rune and mode for current glyph. */
+               rune = glyphs[i].u;
+               mode = glyphs[i].mode;
+
+               /* Skip dummy wide-character spacing. */
+               if (mode == ATTR_WDUMMY)
+                       continue;
+
+               /* Determine font for glyph if different from previous glyph. */
+               if (prevmode != mode) {
+                       prevmode = mode;
+                       font = &dc.font;
+                       frcflags = FRC_NORMAL;
+                       runewidth = xw.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
+                       if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
+                               font = &dc.ibfont;
+                               frcflags = FRC_ITALICBOLD;
+                       } else if (mode & ATTR_ITALIC) {
+                               font = &dc.ifont;
+                               frcflags = FRC_ITALIC;
+                       } else if (mode & ATTR_BOLD) {
+                               font = &dc.bfont;
+                               frcflags = FRC_BOLD;
+                       }
+                       yp = winy + font->ascent;
+               }
+
+               /* Lookup character index with default font. */
+               glyphidx = XftCharIndex(xw.dpy, font->match, rune);
+               if (glyphidx) {
+                       specs[numspecs].font = font->match;
+                       specs[numspecs].glyph = glyphidx;
+                       specs[numspecs].x = (short)xp;
+                       specs[numspecs].y = (short)yp;
+                       xp += runewidth;
+                       numspecs++;
+                       continue;
+               }
+
+               /* Fallback on font cache, search the font cache for match. */
+               for (f = 0; f < frclen; f++) {
+                       glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
+                       /* Everything correct. */
+                       if (glyphidx && frc[f].flags == frcflags)
+                               break;
+                       /* We got a default font for a not found glyph. */
+                       if (!glyphidx && frc[f].flags == frcflags
+                                       && frc[f].unicodep == rune) {
+                               break;
+                       }
+               }
+
+               /* Nothing was found. Use fontconfig to find matching font. */
+               if (f >= frclen) {
+                       if (!font->set)
+                               font->set = FcFontSort(0, font->pattern,
+                                                      1, 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.
+                        *
+                        * Xft and fontconfig are design failures.
+                        */
+                       fcpattern = FcPatternDuplicate(font->pattern);
+                       fccharset = FcCharSetCreate();
+
+                       FcCharSetAddChar(fccharset, rune);
+                       FcPatternAddCharSet(fcpattern, FC_CHARSET,
+                                       fccharset);
+                       FcPatternAddBool(fcpattern, FC_SCALABLE, 1);

 
 

-       frcflags = FRC_NORMAL;
+                       FcConfigSubstitute(0, fcpattern,
+                                       FcMatchPattern);
+                       FcDefaultSubstitute(fcpattern);

 
 

-       if(base.mode & ATTR_ITALIC) {
-               if(base.fg == defaultfg)
+                       fontpattern = FcFontSetMatch(0, fcsets, 1,
+                                       fcpattern, &fcres);
+
+                       /*
+                        * Overwrite or create the new cache entry.
+                        */
+                       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].unicodep = rune;
+
+                       glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
+
+                       f = frclen;
+                       frclen++;
+
+                       FcPatternDestroy(fcpattern);
+                       FcCharSetDestroy(fccharset);
+               }
+
+               specs[numspecs].font = frc[f].font;
+               specs[numspecs].glyph = glyphidx;
+               specs[numspecs].x = (short)xp;
+               specs[numspecs].y = (short)yp;
+               xp += runewidth;
+               numspecs++;
+       }
+
+       return numspecs;
+}
+
+void
+xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
+{
+       int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
+       int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
+           width = charlen * xw.cw;
+       Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
+       XRenderColor colfg, colbg;
+       XRectangle r;
+
+       /* Determine foreground and background colors based on mode. */
+       if (base.fg == defaultfg) {
+               if (base.mode & ATTR_ITALIC)

                        base.fg = defaultitalic;
                        base.fg = defaultitalic;

-               font = &dc.ifont;
-               frcflags = FRC_ITALIC;
-       } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) {
-               if(base.fg == defaultfg)
+               else if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD))

                        base.fg = defaultitalic;
                        base.fg = defaultitalic;

-               font = &dc.ibfont;
-               frcflags = FRC_ITALICBOLD;
-       } else if(base.mode & ATTR_UNDERLINE) {
-               if(base.fg == defaultfg)
+               else if (base.mode & ATTR_UNDERLINE)

                        base.fg = defaultunderline;
        }
                        base.fg = defaultunderline;
        }

-       fg = &dc.col[base.fg];
-       bg = &dc.col[base.bg];

 
 

-       if(base.mode & ATTR_BOLD) {
-               if(BETWEEN(base.fg, 0, 7)) {
-                       /* basic system colors */
-                       fg = &dc.col[base.fg + 8];
-               } else if(BETWEEN(base.fg, 16, 195)) {
-                       /* 256 colors */
-                       fg = &dc.col[base.fg + 36];
-               } else if(BETWEEN(base.fg, 232, 251)) {
-                       /* greyscale */
-                       fg = &dc.col[base.fg + 4];
-               }
-               /*
-                * Those ranges will not be brightened:
-                *      8 - 15 – bright system colors
-                *      196 - 231 – highest 256 color cube
-                *      252 - 255 – brightest colors in greyscale
-                */
-               font = &dc.bfont;
-               frcflags = FRC_BOLD;
+       if (IS_TRUECOL(base.fg)) {
+               colfg.alpha = 0xffff;
+               colfg.red = TRUERED(base.fg);
+               colfg.green = TRUEGREEN(base.fg);
+               colfg.blue = TRUEBLUE(base.fg);
+               XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg);
+               fg = &truefg;
+       } else {
+               fg = &dc.col[base.fg];

        }
 
        }
 

-       if(IS_SET(MODE_REVERSE)) {
-               if(fg == &dc.col[defaultfg]) {
+       if (IS_TRUECOL(base.bg)) {
+               colbg.alpha = 0xffff;
+               colbg.green = TRUEGREEN(base.bg);
+               colbg.red = TRUERED(base.bg);
+               colbg.blue = TRUEBLUE(base.bg);
+               XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg);
+               bg = &truebg;
+       } else {
+               bg = &dc.col[base.bg];
+       }
+
+       /* Change basic system colors [0-7] to bright system colors [8-15] */
+       if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+               fg = &dc.col[base.fg + 8];
+
+       if (IS_SET(MODE_REVERSE)) {
+               if (fg == &dc.col[defaultfg]) {

                        fg = &dc.col[defaultbg];
                } else {
                        colfg.red = ~fg->color.red;
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;
                        fg = &dc.col[defaultbg];
                } else {
                        colfg.red = ~fg->color.red;
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;

-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg,
+                                       &revfg);

                        fg = &revfg;
                }
 
                        fg = &revfg;
                }
 

-               if(bg == &dc.col[defaultbg]) {
+               if (bg == &dc.col[defaultbg]) {

                        bg = &dc.col[defaultfg];
                } else {
                        colbg.red = ~bg->color.red;
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;
                        bg = &dc.col[defaultfg];
                } else {
                        colbg.red = ~bg->color.red;
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;

-                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg,
+                                       &revbg);

                        bg = &revbg;
                }
        }
 
                        bg = &revbg;
                }
        }
 

-       if(base.mode & ATTR_REVERSE) {
+       if (base.mode & ATTR_REVERSE) {

                temp = fg;
                fg = bg;
                bg = temp;
        }
 
                temp = fg;
                fg = bg;
                bg = temp;
        }
 

-       if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
+       if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) {
+               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_INVISIBLE)

                fg = bg;
 
        /* Intelligent cleaning up of the borders. */
                fg = bg;
 
        /* Intelligent cleaning up of the borders. */

-       if(x == 0) {
+       if (x == 0) {

                xclear(0, (y == 0)? 0 : winy, borderpx,
                        winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
        }
                xclear(0, (y == 0)? 0 : winy, borderpx,
                        winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
        }

-       if(x + charlen >= term.col) {
+       if (x + charlen >= term.col) {

                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
                        ((y >= term.row-1)? xw.h : (winy + xw.ch)));
        }
                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
                        ((y >= term.row-1)? xw.h : (winy + xw.ch)));
        }

-       if(y == 0)
+       if (y == 0)

                xclear(winx, 0, winx + width, borderpx);
                xclear(winx, 0, winx + width, borderpx);

-       if(y == term.row-1)
+       if (y == term.row-1)

                xclear(winx, winy + xw.ch, winx + width, xw.h);
 
        /* Clean up the region we want to draw to. */
                xclear(winx, winy + xw.ch, winx + width, xw.h);
 
        /* Clean up the region we want to draw to. */


@@ -3028,125 +3836,17 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        r.width = width;
        XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
 
        r.width = width;
        XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
 

-       for(xp = winx; bytelen > 0;) {
-               /*
-                * Search for the range in the to be printed string of glyphs
-                * that are in the main font. Then print that range. If
-                * some glyph is found that is not in the font, do the
-                * fallback dance.
-                */
-               u8fs = s;
-               u8fblen = 0;
-               u8fl = 0;
-               for(;;) {
-                       u8c = s;
-                       u8cblen = utf8decode(s, &u8char);
-                       s += u8cblen;
-                       bytelen -= u8cblen;
-
-                       doesexist = XftCharIndex(xw.dpy, font->match, u8char);
-                       if(!doesexist || bytelen <= 0) {
-                               if(bytelen <= 0) {
-                                       if(doesexist) {
-                                               u8fl++;
-                                               u8fblen += u8cblen;
-                                       }
-                               }
-
-                               if(u8fl > 0) {
-                                       XftDrawStringUtf8(xw.draw, fg,
-                                                       font->match, xp,
-                                                       winy + font->ascent,
-                                                       (FcChar8 *)u8fs,
-                                                       u8fblen);
-                                       xp += font->width * u8fl;
-
-                               }
-                               break;
-                       }
-
-                       u8fl++;
-                       u8fblen += u8cblen;
-               }
-               if(doesexist)
-                       break;
-
-               frp = frccur;
-               /* Search the font cache. */
-               for(i = 0; i < frclen; i++, frp--) {
-                       if(frp <= 0)
-                               frp = LEN(frc) - 1;
-
-                       if(frc[frp].c == u8char
-                                       && frc[frp].flags == frcflags) {
-                               break;
-                       }
-               }
-
-               /* Nothing was found. */
-               if(i >= frclen) {
-                       if(!font->set)
-                               xloadfontset(font);
-                       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.
-                        */
-                       fcpattern = FcPatternDuplicate(font->pattern);
-                       fccharset = FcCharSetCreate();
-
-                       FcCharSetAddChar(fccharset, u8char);
-                       FcPatternAddCharSet(fcpattern, FC_CHARSET,
-                                       fccharset);
-                       FcPatternAddBool(fcpattern, FC_SCALABLE,
-                                       FcTrue);
-
-                       FcConfigSubstitute(0, fcpattern,
-                                       FcMatchPattern);
-                       FcDefaultSubstitute(fcpattern);
-
-                       fontpattern = FcFontSetMatch(0, fcsets,
-                                       FcTrue, fcpattern, &fcres);
-
-                       /*
-                        * Overwrite or create the new cache entry.
-                        */
-                       frccur++;
-                       frclen++;
-                       if(frccur >= LEN(frc))
-                               frccur = 0;
-                       if(frclen > LEN(frc)) {
-                               frclen = LEN(frc);
-                               XftFontClose(xw.dpy, frc[frccur].font);
-                       }
-
-                       frc[frccur].font = XftFontOpenPattern(xw.dpy,
-                                       fontpattern);
-                       frc[frccur].c = u8char;
-                       frc[frccur].flags = frcflags;
-
-                       FcPatternDestroy(fcpattern);
-                       FcCharSetDestroy(fccharset);
-
-                       frp = frccur;
-               }
-
-               XftDrawStringUtf8(xw.draw, fg, frc[frp].font,
-                               xp, winy + frc[frp].font->ascent,
-                               (FcChar8 *)u8c, u8cblen);
+       /* Render the glyphs. */
+       XftDrawGlyphFontSpec(xw.draw, fg, specs, len);

 
 

-               xp += font->width;
+       /* Render underline and strikethrough. */
+       if (base.mode & ATTR_UNDERLINE) {
+               XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
+                               width, 1);

        }
 
        }
 

-       /*
-       XftDrawStringUtf8(xw.draw, fg, font->set, winx,
-                       winy + font->ascent, (FcChar8 *)s, bytelen);
-       */
-
-       if(base.mode & ATTR_UNDERLINE) {
-               XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1,
+       if (base.mode & ATTR_STRUCK) {
+               XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,

                                width, 1);
        }
 
                                width, 1);
        }
 


@@ -3155,84 +3855,146 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 }
 
 void
 }
 
 void

-xdrawcursor(void) {
+xdrawglyph(Glyph g, int x, int y)
+{
+       int numspecs;
+       XftGlyphFontSpec spec;
+
+       numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
+       xdrawglyphfontspecs(&spec, g, numspecs, x, y);
+}
+
+void
+xdrawcursor(void)
+{

        static int oldx = 0, oldy = 0;
        static int oldx = 0, oldy = 0;

-       int sl;
-       Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
+       int curx;
+       Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}, og;
+       int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
+       Color drawcol;

 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
 
 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
 

-       memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
+       curx = term.c.x;
+
+       /* adjust position if in dummy */
+       if (term.line[oldy][oldx].mode & ATTR_WDUMMY)
+               oldx--;
+       if (term.line[term.c.y][curx].mode & ATTR_WDUMMY)
+               curx--;

 
        /* remove the old cursor */
 
        /* remove the old cursor */

-       sl = utf8size(term.line[oldy][oldx].c);
-       xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
-                       oldy, 1, sl);
+       og = term.line[oldy][oldx];
+       if (ena_sel && selected(oldx, oldy))
+               og.mode ^= ATTR_REVERSE;
+       xdrawglyph(og, oldx, oldy);

 
 

-       /* 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;
-                       }
+       g.u = term.line[term.c.y][term.c.x].u;

 
 

-                       sl = utf8size(g.c);
-                       xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
+       /*
+        * Select the right color for the right mode.
+        */
+       if (IS_SET(MODE_REVERSE)) {
+               g.mode |= ATTR_REVERSE;
+               g.bg = defaultfg;
+               if (ena_sel && selected(term.c.x, term.c.y)) {
+                       drawcol = dc.col[defaultcs];
+                       g.fg = defaultrcs;

                } else {
                } else {

-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + term.c.x * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       xw.cw - 1, 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + term.c.x * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + (term.c.x + 1) * xw.cw - 1,
+                       drawcol = dc.col[defaultrcs];
+                       g.fg = defaultcs;
+               }
+       } else {
+               if (ena_sel && selected(term.c.x, term.c.y)) {
+                       drawcol = dc.col[defaultrcs];
+                       g.fg = defaultfg;
+                       g.bg = defaultrcs;
+               } else {
+                       drawcol = dc.col[defaultcs];
+               }
+       }
+
+       if (IS_SET(MODE_HIDE))
+               return;
+
+       /* draw the new one */
+       if (xw.state & WIN_FOCUSED) {
+               switch (xw.cursor) {
+               case 7: /* st extension: snowman */
+                       utf8decode("☃", &g.u, UTF_SIZ);
+               case 0: /* Blinking Block */
+               case 1: /* Blinking Block (Default) */
+               case 2: /* Steady Block */
+                       g.mode |= term.line[term.c.y][curx].mode & ATTR_WIDE;
+                       xdrawglyph(g, term.c.x, term.c.y);
+                       break;
+               case 3: /* Blinking Underline */
+               case 4: /* Steady Underline */
+                       XftDrawRect(xw.draw, &drawcol,
+                                       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, &drawcol,
+                                       borderpx + curx * xw.cw,

                                        borderpx + term.c.y * xw.ch,
                                        borderpx + term.c.y * xw.ch,

-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + term.c.x * xw.cw,
-                                       borderpx + (term.c.y + 1) * xw.ch - 1,
-                                       xw.cw, 1);
+                                       cursorthickness, xw.ch);
+                       break;

                }
                }

-               oldx = term.c.x, oldy = term.c.y;
+       } else {
+               XftDrawRect(xw.draw, &drawcol,
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               xw.cw - 1, 1);
+               XftDrawRect(xw.draw, &drawcol,
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &drawcol,
+                               borderpx + (curx + 1) * xw.cw - 1,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &drawcol,
+                               borderpx + curx * xw.cw,
+                               borderpx + (term.c.y + 1) * xw.ch - 1,
+                               xw.cw, 1);

        }
        }

+       oldx = curx, oldy = term.c.y;

 }
 
 
 void
 }
 
 
 void

-xsettitle(char *p) {
+xsettitle(char *p)
+{

        XTextProperty prop;
 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);
        XTextProperty prop;
 
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);

+       XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
+       XFree(prop.value);

 }
 
 void
 }
 
 void

-xresettitle(void) {
+xresettitle(void)
+{

        xsettitle(opt_title ? opt_title : "st");
 }
 
 void
        xsettitle(opt_title ? opt_title : "st");
 }
 
 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
 }
 
 void

-draw(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);
        drawregion(0, 0, term.col, term.row);
        XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w,
                        xw.h, 0, 0);


@@ -3242,174 +4004,154 @@ draw(void) {
 }
 
 void
 }
 
 void

-drawregion(int x1, int y1, int x2, int y2) {
-       int ic, ib, x, y, ox, sl;
+drawregion(int x1, int y1, int x2, int y2)
+{
+       int i, x, y, ox, numspecs;

        Glyph base, new;
        Glyph base, new;

-       char buf[DRAW_BUF_SIZ];
-       bool ena_sel = sel.ob.x != -1;
-
-       if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
-               ena_sel = 0;
+       XftGlyphFontSpec *specs;
+       int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);

 
 

-       if(!(xw.state & WIN_VISIBLE))
+       if (!(xw.state & WIN_VISIBLE))

                return;
 
                return;
 

-       for(y = y1; y < y2; y++) {
-               if(!term.dirty[y])
+       for (y = y1; y < y2; y++) {
+               if (!term.dirty[y])

                        continue;
 
                        continue;
 

-               xtermclear(0, y, term.col, y);

                term.dirty[y] = 0;
                term.dirty[y] = 0;

-               base = term.line[y][0];
-               ic = ib = ox = 0;
-               for(x = x1; x < x2; x++) {
+
+               specs = term.specbuf;
+               numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y);
+
+               i = ox = 0;
+               for (x = x1; x < x2 && i < numspecs; x++) {

                        new = term.line[y][x];
                        new = term.line[y][x];

-                       if(ena_sel && selected(x, y))
+                       if (new.mode == ATTR_WDUMMY)
+                               continue;
+                       if (ena_sel && selected(x, y))

                                new.mode ^= ATTR_REVERSE;
                                new.mode ^= ATTR_REVERSE;

-                       if(ib > 0 && (ATTRCMP(base, new)
-                                       || ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
-                               xdraws(buf, base, ox, y, ic, ib);
-                               ic = ib = 0;
+                       if (i > 0 && ATTRCMP(base, new)) {
+                               xdrawglyphfontspecs(specs, base, i, ox, y);
+                               specs += i;
+                               numspecs -= i;
+                               i = 0;

                        }
                        }

-                       if(ib == 0) {
+                       if (i == 0) {

                                ox = x;
                                base = new;
                        }
                                ox = x;
                                base = new;
                        }

-
-                       sl = utf8size(new.c);
-                       memcpy(buf+ib, new.c, sl);
-                       ib += sl;
-                       ++ic;
+                       i++;

                }
                }

-               if(ib > 0)
-                       xdraws(buf, base, ox, y, ic, ib);
+               if (i > 0)
+                       xdrawglyphfontspecs(specs, base, i, ox, y);

        }
        xdrawcursor();
 }
 
 void
        }
        xdrawcursor();
 }
 
 void

-expose(XEvent *ev) {
-       XExposeEvent *e = &ev->xexpose;
-
-       if(xw.state & WIN_REDRAW) {
-               if(!e->count)
-                       xw.state &= ~WIN_REDRAW;
-       }
-       redraw(0);
+expose(XEvent *ev)
+{
+       redraw();

 }
 
 void
 }
 
 void

-visibility(XEvent *ev) {
+visibility(XEvent *ev)
+{

        XVisibilityEvent *e = &ev->xvisibility;
 
        XVisibilityEvent *e = &ev->xvisibility;
 

-       if(e->state == VisibilityFullyObscured) {
-               xw.state &= ~WIN_VISIBLE;
-       } else if(!(xw.state & WIN_VISIBLE)) {
-               /* need a full redraw for next Expose, not just a buf copy */
-               xw.state |= WIN_VISIBLE | WIN_REDRAW;
-       }
+       MODBIT(xw.state, e->state != VisibilityFullyObscured, WIN_VISIBLE);

 }
 
 void
 }
 
 void

-unmap(XEvent *ev) {
+unmap(XEvent *ev)
+{

        xw.state &= ~WIN_VISIBLE;
 }
 
 void
        xw.state &= ~WIN_VISIBLE;
 }
 
 void

-xsetpointermotion(int set) {
+xsetpointermotion(int set)
+{

        MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
        XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
 
 void
        MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
        XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
 
 void

-xseturgency(int add) {
+xseturgency(int add)
+{

        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 
        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);
 }
 
 void
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
 }
 
 void

-focus(XEvent *ev) {
+focus(XEvent *ev)
+{

        XFocusChangeEvent *e = &ev->xfocus;
 
        XFocusChangeEvent *e = &ev->xfocus;
 

-       if(e->mode == NotifyGrab)
+       if (e->mode == NotifyGrab)

                return;
 
                return;
 

-       if(ev->type == FocusIn) {
+       if (ev->type == FocusIn) {

                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);
                XSetICFocus(xw.xic);
                xw.state |= WIN_FOCUSED;
                xseturgency(0);

-               if(IS_SET(MODE_FOCUS))
+               if (IS_SET(MODE_FOCUS))

                        ttywrite("\033[I", 3);
        } else {
                XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;
                        ttywrite("\033[I", 3);
        } else {
                XUnsetICFocus(xw.xic);
                xw.state &= ~WIN_FOCUSED;

-               if(IS_SET(MODE_FOCUS))
+               if (IS_SET(MODE_FOCUS))

                        ttywrite("\033[O", 3);
        }
 }
 
                        ttywrite("\033[O", 3);
        }
 }
 

-static inline bool
-match(uint mask, uint state) {
-       state &= ~ignoremod;
-
-       if(mask == XK_NO_MOD && state)
-               return false;
-       if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
-               return false;
-       if(mask == XK_ANY_MOD)
-               return true;
-       return state == mask;
+int
+match(uint mask, uint state)
+{
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);

 }
 
 void
 }
 
 void

-numlock(const Arg *dummy) {
+numlock(const Arg *dummy)
+{

        term.numlock ^= 1;
 }
 
 char*
        term.numlock ^= 1;
 }
 
 char*

-kmap(KeySym k, uint state) {
+kmap(KeySym k, uint state)
+{

        Key *kp;
        int i;
 
        /* Check for mapped keys out of X11 function keys. */
        Key *kp;
        int i;
 
        /* Check for mapped keys out of X11 function keys. */

-       for(i = 0; i < LEN(mappedkeys); i++) {
-               if(mappedkeys[i] == k)
+       for (i = 0; i < LEN(mappedkeys); i++) {
+               if (mappedkeys[i] == k)

                        break;
        }
                        break;
        }

-       if(i == LEN(mappedkeys)) {
-               if((k & 0xFFFF) < 0xFD00)
+       if (i == LEN(mappedkeys)) {
+               if ((k & 0xFFFF) < 0xFD00)

                        return NULL;
        }
 
                        return NULL;
        }
 

-       for(kp = key; kp < key + LEN(key); kp++) {
-               if(kp->k != k)
+       for (kp = key; kp < key + LEN(key); kp++) {
+               if (kp->k != k)

                        continue;
 
                        continue;
 

-               if(!match(kp->mask, state))
+               if (!match(kp->mask, state))

                        continue;
 
                        continue;
 

-               if(kp->appkey > 0) {
-                       if(!IS_SET(MODE_APPKEYPAD))
-                               continue;
-                       if(term.numlock && kp->appkey == 2)
-                               continue;
-               } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+               if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                       continue;
+               if (term.numlock && kp->appkey == 2)

                        continue;
                        continue;

-               }

 
 

-               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-                               (kp->appcursor > 0
-                                && !IS_SET(MODE_APPCURSOR))) {
+               if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)

                        continue;
                        continue;

-               }

 
 

-               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
-                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+               if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)

                        continue;
                        continue;

-               }

 
                return kp->s;
        }
 
                return kp->s;
        }


@@ -3418,87 +4160,82 @@ kmap(KeySym k, uint state) {
 }
 
 void
 }
 
 void

-kpress(XEvent *ev) {
+kpress(XEvent *ev)
+{

        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;

-       char xstr[31], buf[32], *customkey, *cp = buf;
-       int len, ret;
-       long c;
+       char buf[32], *customkey;
+       int len;
+       Rune c;

        Status status;
        Shortcut *bp;
 
        Status status;
        Shortcut *bp;
 

-       if(IS_SET(MODE_KBDLOCK))
+       if (IS_SET(MODE_KBDLOCK))

                return;
 
                return;
 

-       len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
-       e->state &= ~Mod2Mask;
+       len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);

        /* 1. shortcuts */
        /* 1. shortcuts */

-       for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
-               if(ksym == bp->keysym && match(bp->mod, e->state)) {
+       for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
+               if (ksym == bp->keysym && match(bp->mod, e->state)) {

                        bp->func(&(bp->arg));
                        return;
                }
        }
 
        /* 2. custom keys from config.h */
                        bp->func(&(bp->arg));
                        return;
                }
        }
 
        /* 2. custom keys from config.h */

-       if((customkey = kmap(ksym, e->state))) {
-               len = strlen(customkey);
-               memcpy(buf, customkey, len);
-       /* 3. hardcoded (overrides X lookup) */
-       } else {
-               if(len == 0)
-                       return;
+       if ((customkey = kmap(ksym, e->state))) {
+               ttysend(customkey, strlen(customkey));
+               return;
+       }

 
 

-               if(len == 1 && e->state & Mod1Mask) {
-                       if(IS_SET(MODE_8BIT)) {
-                               if(*xstr < 0177) {
-                                       c = *xstr | 0x80;
-                                       ret = utf8encode(&c, cp);
-                                       cp += ret;
-                                       len = 0;
-                               }
-                       } else {
-                               *cp++ = '\033';
+       /* 3. composed string from input method */
+       if (len == 0)
+               return;
+       if (len == 1 && e->state & Mod1Mask) {
+               if (IS_SET(MODE_8BIT)) {
+                       if (*buf < 0177) {
+                               c = *buf | 0x80;
+                               len = utf8encode(c, buf);

                        }
                        }

+               } else {
+                       buf[1] = buf[0];
+                       buf[0] = '\033';
+                       len = 2;

                }
                }

-
-               memcpy(cp, xstr, len);
-               len = cp - buf + len;

        }
        }

-
-       ttywrite(buf, len);
-       if(IS_SET(MODE_ECHO))
-               techo(buf, len);
+       ttysend(buf, len);

 }
 
 
 void
 }
 
 
 void

-cmessage(XEvent *e) {
+cmessage(XEvent *e)
+{

        /*
         * See xembed specs
         *  http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
         */
        /*
         * See xembed specs
         *  http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html
         */

-       if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
-               if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+       if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+               if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {

                        xw.state |= WIN_FOCUSED;
                        xseturgency(0);
                        xw.state |= WIN_FOCUSED;
                        xseturgency(0);

-               } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+               } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {

                        xw.state &= ~WIN_FOCUSED;
                }
                        xw.state &= ~WIN_FOCUSED;
                }

-       } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+       } else if (e->xclient.data.l[0] == xw.wmdeletewin) {

                /* Send SIGHUP to shell */
                kill(pid, SIGHUP);
                /* Send SIGHUP to shell */
                kill(pid, SIGHUP);

-               exit(EXIT_SUCCESS);
+               exit(0);

        }
 }
 
 void
        }
 }
 
 void

-cresize(int width, int height) {
+cresize(int width, int height)
+{

        int col, row;
 
        int col, row;
 

-       if(width != 0)
+       if (width != 0)

                xw.w = width;
                xw.w = width;

-       if(height != 0)
+       if (height != 0)

                xw.h = height;
 
        col = (xw.w - 2 * borderpx) / xw.cw;
                xw.h = height;
 
        col = (xw.w - 2 * borderpx) / xw.cw;


@@ -3506,92 +4243,119 @@ cresize(int width, int height) {
 
        tresize(col, row);
        xresize(col, row);
 
        tresize(col, row);
        xresize(col, row);

-       ttyresize();

 }
 
 void
 }
 
 void

-resize(XEvent *e) {
-       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+resize(XEvent *e)
+{
+       if (e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)

                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);
                return;
 
        cresize(e->xconfigure.width, e->xconfigure.height);

+       ttyresize();

 }
 
 void
 }
 
 void

-run(void) {
+run(void)
+{

        XEvent ev;
        XEvent ev;

+       int w = xw.w, h = xw.h;

        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
        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 */
+       do {
+               XNextEvent(xw.dpy, &ev);
+               /*
+                * This XFilterEvent call is required because of XOpenIM. It
+                * does filter out the key event and some client message for
+                * the input method too.
+                */
+               if (XFilterEvent(&ev, None))
+                       continue;
+               if (ev.type == ConfigureNotify) {
+                       w = ev.xconfigure.width;
+                       h = ev.xconfigure.height;
+               }
+       } while (ev.type != MapNotify);
+
+       cresize(w, h);
+       ttynew();
+       ttyresize();

 
 

-       gettimeofday(&lastblink, NULL);
-       gettimeofday(&last, NULL);
+       clock_gettime(CLOCK_MONOTONIC, &last);
+       lastblink = last;

 
 

-       for(xev = actionfps;;) {
+       for (xev = actionfps;;) {

                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
 
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
 

-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
-                       if(errno == EINTR)
+               if (pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) {
+                       if (errno == EINTR)

                                continue;
                                continue;

-                       die("select failed: %s\n", SERRNO);
+                       die("select failed: %s\n", strerror(errno));

                }
                }

-               if(FD_ISSET(cmdfd, &rfd)) {
+               if (FD_ISSET(cmdfd, &rfd)) {

                        ttyread();
                        ttyread();

-                       if(blinktimeout) {
+                       if (blinktimeout) {

                                blinkset = tattrset(ATTR_BLINK);
                                blinkset = tattrset(ATTR_BLINK);

-                               if(!blinkset && term.mode & ATTR_BLINK)
-                                       term.mode &= ~(MODE_BLINK);
+                               if (!blinkset)
+                                       MODBIT(term.mode, 0, MODE_BLINK);

                        }
                }
 
                        }
                }
 

-               if(FD_ISSET(xfd, &rfd))
+               if (FD_ISSET(xfd, &rfd))

                        xev = actionfps;
 
                        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 * 1E6)/ xfps;

                tv = &drawtimeout;
 
                dodraw = 0;
                tv = &drawtimeout;
 
                dodraw = 0;

-               if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
+               if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {

                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;

-                       gettimeofday(&lastblink, NULL);
+                       lastblink = now;

                        dodraw = 1;
                }
                        dodraw = 1;
                }

-               if(TIMEDIFF(now, last) \
-                               > (xev? (1000/xfps) : (1000/actionfps))) {
+               deltatime = TIMEDIFF(now, last);
+               if (deltatime > 1000 / (xev ? xfps : actionfps)) {

                        dodraw = 1;
                        last = now;
                }
 
                        dodraw = 1;
                        last = now;
                }
 

-               if(dodraw) {
-                       while(XPending(xw.dpy)) {
+               if (dodraw) {
+                       while (XPending(xw.dpy)) {

                                XNextEvent(xw.dpy, &ev);
                                XNextEvent(xw.dpy, &ev);

-                               if(XFilterEvent(&ev, None))
+                               if (XFilterEvent(&ev, None))

                                        continue;
                                        continue;

-                               if(handler[ev.type])
+                               if (handler[ev.type])

                                        (handler[ev.type])(&ev);
                        }
 
                        draw();
                        XFlush(xw.dpy);
 
                                        (handler[ev.type])(&ev);
                        }
 
                        draw();
                        XFlush(xw.dpy);
 

-                       if(xev && !FD_ISSET(xfd, &rfd))
+                       if (xev && !FD_ISSET(xfd, &rfd))

                                xev--;
                                xev--;

-                       if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
-                               if(blinkset) {
-                                       if(TIMEDIFF(now, lastblink) \
+                       if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) {
+                               if (blinkset) {
+                                       if (TIMEDIFF(now, lastblink) \

                                                        > blinktimeout) {
                                                        > 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;
                                }


@@ -3601,82 +4365,83 @@ run(void) {
 }
 
 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);
+usage(void)
+{
+       die("usage: %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid]"
+           " [[-e] command [args ...]]\n"
+           "       %s [-aiv] [-c class] [-f font] [-g geometry]"
+           " [-n name] [-o file]\n"
+           "          [-T title] [-t title] [-w windowid] -l line"
+           " [stty_args ...]\n", argv0, argv0);

 }
 
 int
 }
 
 int

-main(int argc, char *argv[]) {
-       int bitm, xr, yr;
-       uint wr, hr;
-       char *titles;
+main(int argc, char *argv[])
+{
+       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 = cursorshape;

 
        ARGBEGIN {
        case 'a':
 
        ARGBEGIN {
        case 'a':

-               allowaltscreen = false;
+               allowaltscreen = 0;

                break;
        case 'c':
                opt_class = EARGF(usage());
                break;
        case 'e':
                break;
        case 'c':
                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 > 0)
+                       --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 & XNegative && 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 = 1;

                break;
        case 'o':
                opt_io = EARGF(usage());
                break;
                break;
        case 'o':
                opt_io = EARGF(usage());
                break;

+       case 'l':
+               opt_line = EARGF(usage());
+               break;
+       case 'n':
+               opt_name = EARGF(usage());
+               break;

        case 't':
        case 't':

+       case 'T':

                opt_title = EARGF(usage());
                break;
        case 'w':
                opt_embed = EARGF(usage());
                break;
        case 'v':
                opt_title = EARGF(usage());
                break;
        case 'w':
                opt_embed = EARGF(usage());
                break;
        case 'v':

+               die("%s " VERSION " (c) 2010-2016 st engineers\n", argv0);
+               break;

        default:
                usage();
        } ARGEND;
 
 run:
        default:
                usage();
        } ARGEND;
 
 run:

+       if (argc > 0) {
+               /* eat all remaining arguments */
+               opt_cmd = argv;
+               if (!opt_title && !opt_line)
+                       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();
        xinit();

-       ttynew();

        selinit();
        selinit();

-       if(xw.isfixed)
-               cresize(xw.h, xw.w);

        run();
 
        return 0;
        run();
 
        return 0;