Remove first argument of selsnap.

[st.git] / st.c

diff --git a/st.c b/st.c
index fb206a3..87f3ed2 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1,4 +1,4 @@
-/* See LICENSE for licence details. */
+/* See LICENSE for license details. */

 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -27,6 +27,7 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>

+#include <X11/XKBlib.h>

 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 
 #include <fontconfig/fontconfig.h>
 #include <wchar.h>
 


@@ -62,22 +63,20 @@ char *argv0;
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 
 #define XK_NO_MOD     0
 #define XK_SWITCH_MOD (1<<13)
 

-#define REDRAW_TIMEOUT (80*1000) /* 80 ms */
-

 /* macros */
 #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))
 /* macros */
 #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 ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f))
+#define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177')

 #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c))

+#define ISDELIM(u) (BETWEEN(u, 0, 127) && strchr(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 LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) ((term.mode & (flag)) != 0)

-#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
-#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))
+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)

 #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))


@@ -87,19 +86,19 @@ char *argv0;
 #define TRUEBLUE(x)      (((x) & 0xff) << 8)
 
 
 #define TRUEBLUE(x)      (((x) & 0xff) << 8)
 
 

-#define VT102ID "\033[?6c"
-

 enum glyph_attribute {
        ATTR_NULL      = 0,
 enum glyph_attribute {
        ATTR_NULL      = 0,

-       ATTR_REVERSE   = 1,
-       ATTR_UNDERLINE = 2,
-       ATTR_BOLD      = 4,
-       ATTR_GFX       = 8,
-       ATTR_ITALIC    = 16,
-       ATTR_BLINK     = 32,
-       ATTR_WRAP      = 64,
-       ATTR_WIDE      = 128,
-       ATTR_WDUMMY    = 256,
+       ATTR_BOLD      = 1 << 0,
+       ATTR_FAINT     = 1 << 1,
+       ATTR_ITALIC    = 1 << 2,
+       ATTR_UNDERLINE = 1 << 3,
+       ATTR_BLINK     = 1 << 4,
+       ATTR_REVERSE   = 1 << 5,
+       ATTR_INVISIBLE = 1 << 6,
+       ATTR_STRUCK    = 1 << 7,
+       ATTR_WRAP      = 1 << 8,
+       ATTR_WIDE      = 1 << 9,
+       ATTR_WDUMMY    = 1 << 10,

 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {


@@ -114,27 +113,27 @@ enum cursor_state {
 };
 
 enum term_mode {
 };
 
 enum term_mode {

-       MODE_WRAP        = 1,
-       MODE_INSERT      = 2,
-       MODE_APPKEYPAD   = 4,
-       MODE_ALTSCREEN   = 8,
-       MODE_CRLF        = 16,
-       MODE_MOUSEBTN    = 32,
-       MODE_MOUSEMOTION = 64,
-       MODE_REVERSE     = 128,
-       MODE_KBDLOCK     = 256,
-       MODE_HIDE        = 512,
-       MODE_ECHO        = 1024,
-       MODE_APPCURSOR   = 2048,
-       MODE_MOUSESGR    = 4096,
-       MODE_8BIT        = 8192,
-       MODE_BLINK       = 16384,
-       MODE_FBLINK      = 32768,
-       MODE_FOCUS       = 65536,
-       MODE_MOUSEX10    = 131072,
-       MODE_MOUSEMANY   = 262144,
-       MODE_BRCKTPASTE  = 524288,
-       MODE_PRINT       = 1048576,
+       MODE_WRAP        = 1 << 0,
+       MODE_INSERT      = 1 << 1,
+       MODE_APPKEYPAD   = 1 << 2,
+       MODE_ALTSCREEN   = 1 << 3,
+       MODE_CRLF        = 1 << 4,
+       MODE_MOUSEBTN    = 1 << 5,
+       MODE_MOUSEMOTION = 1 << 6,
+       MODE_REVERSE     = 1 << 7,
+       MODE_KBDLOCK     = 1 << 8,
+       MODE_HIDE        = 1 << 9,
+       MODE_ECHO        = 1 << 10,
+       MODE_APPCURSOR   = 1 << 11,
+       MODE_MOUSESGR    = 1 << 12,
+       MODE_8BIT        = 1 << 13,
+       MODE_BLINK       = 1 << 14,
+       MODE_FBLINK      = 1 << 15,
+       MODE_FOCUS       = 1 << 16,
+       MODE_MOUSEX10    = 1 << 17,
+       MODE_MOUSEMANY   = 1 << 18,
+       MODE_BRCKTPASTE  = 1 << 19,
+       MODE_PRINT       = 1 << 20,

        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };
        MODE_MOUSE       = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\
                          |MODE_MOUSEMANY,
 };


@@ -160,8 +159,7 @@ enum escape_state {
 
 enum window_state {
        WIN_VISIBLE = 1,
 
 enum window_state {
        WIN_VISIBLE = 1,

-       WIN_REDRAW  = 2,
-       WIN_FOCUSED = 4
+       WIN_FOCUSED = 2

 };
 
 enum selection_type {
 };
 
 enum selection_type {


@@ -180,14 +178,13 @@ typedef unsigned long ulong;
 typedef unsigned short ushort;
 
 typedef XftDraw *Draw;
 typedef unsigned short ushort;
 
 typedef XftDraw *Draw;

-typedef XftColor Colour;
-typedef Colormap Colourmap;
+typedef XftColor Color;

 
 typedef struct {
 
 typedef struct {

-       char c[UTF_SIZ]; /* character code */
+       long u;           /* character code */

        ushort mode;      /* attribute flags */
        ushort mode;      /* attribute flags */

-       uint32_t fg;      /* foreground  */
-       uint32_t bg;      /* background  */
+       ushort fg;        /* foreground  */
+       ushort bg;        /* background  */

 } Glyph;
 
 typedef Glyph *Line;
 } Glyph;
 
 typedef Glyph *Line;


@@ -200,14 +197,14 @@ typedef struct {
 } TCursor;
 
 /* CSI Escape sequence structs */
 } TCursor;
 
 /* CSI Escape sequence structs */

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

 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
        int narg;              /* nb of args */

-       char mode;
+       char mode[2];

 } CSIEscape;
 
 /* STR Escape sequence structs */
 } CSIEscape;
 
 /* STR Escape sequence structs */


@@ -242,7 +239,7 @@ typedef struct {
 /* Purely graphic info */
 typedef struct {
        Display *dpy;
 /* Purely graphic info */
 typedef struct {
        Display *dpy;

-       Colourmap cmap;
+       Colormap cmap;

        Window win;
        Drawable buf;
        Atom xembed, wmdeletewin, netwmname, netwmpid;
        Window win;
        Drawable buf;
        Atom xembed, wmdeletewin, netwmname, netwmpid;


@@ -260,6 +257,7 @@ typedef struct {
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */

+       int cursor; /* cursor style */

 } XWindow;
 
 typedef struct {
 } XWindow;
 
 typedef struct {


@@ -293,11 +291,11 @@ typedef struct {
                int x, y;
        } nb, ne, ob, oe;
 
                int x, y;
        } nb, ne, ob, oe;
 

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

        Atom xtarget;
        bool alt;
        Atom xtarget;
        bool alt;

-       struct timeval tclick1;
-       struct timeval tclick2;
+       struct timespec tclick1;
+       struct timespec tclick2;

 } Selection;
 
 typedef union {
 } Selection;
 
 typedef union {


@@ -315,10 +313,13 @@ typedef struct {
 } Shortcut;
 
 /* function definitions used in config.h */
 } 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 printsel(const Arg *);
 static void printscreen(const Arg *) ;
 static void toggleprinter(const Arg *);


@@ -341,16 +342,17 @@ typedef struct {
 
 /* Drawing Context */
 typedef struct {
 
 /* Drawing Context */
 typedef struct {

-       Colour col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       Color col[MAX(LEN(colorname), 256)];

        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
 
 static void die(const char *, ...);
 static void draw(void);
        Font font, bfont, ifont, ibfont;
        GC gc;
 } DC;
 
 static void die(const char *, ...);
 static void draw(void);

-static void redraw(int);
+static void redraw(void);

 static void drawregion(int, int, int, int);
 static void execsh(void);
 static void drawregion(int, int, int, int);
 static void execsh(void);

+static void stty(void);

 static void sigchld(int);
 static void run(void);
 
 static void sigchld(int);
 static void run(void);
 


@@ -358,6 +360,7 @@ 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 strdump(void);
 static void strhandle(void);
 static void strparse(void);


@@ -374,29 +377,29 @@ static void tdeletechar(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);

+static int tlinelen(int);

 static void tmoveto(int, int);
 static void tmoveato(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(int);
 static void tmoveto(int, int);
 static void tmoveato(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(int);

-static void tputc(char *, int);
+static void tputc(long);

 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 tsetattr(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 tsetchar(long, Glyph *, int, int);

 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);

-static void techo(char *, int);
-static bool tcontrolcode(uchar );
+static void techo(long);
+static void tcontrolcode(uchar );

 static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);
 static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);

-static void tselcs(void);

 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);


@@ -404,8 +407,11 @@ static void ttyread(void);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
 static void ttyresize(void);
 static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);

+static void tstrsequence(uchar);

 
 

+static inline ushort sixd_to_16bit(int);

 static void xdraws(char *, Glyph, int, int, int, int);
 static void xdraws(char *, Glyph, int, 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 xhints(void);
 static void xclear(int, int, int, int);
 static void xdrawcursor(void);


@@ -415,12 +421,11 @@ static int xsetcolorname(int, const char *);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);
 static int xgeommasktogravity(int);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(char *, double);

-static int xloadfontset(Font *);

 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);

-static void xsetsel(char *);
+static void xsetsel(char *, Time);

 static void xtermclear(int, int, int, int);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xtermclear(int, int, int, int);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);


@@ -443,18 +448,21 @@ static void selclear(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selrequest(XEvent *);
 
 static void selinit(void);

-static void selsort(void);
+static void selnormalize(void);

 static inline bool selected(int, int);
 static char *getsel(void);
 static inline bool selected(int, int);
 static char *getsel(void);

-static void selcopy(void);
+static void selcopy(Time);

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

-static void selsnap(int, int *, int *, int);
+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 *, long *, size_t);
 static long utf8decodebyte(char, size_t *);
 
 static size_t utf8decode(char *, long *, size_t);
 static long utf8decodebyte(char, size_t *);

-static size_t utf8encode(long, char *, size_t);
+static size_t utf8encode(long, char *);

 static char utf8encodebyte(long, size_t);
 static char utf8encodebyte(long, size_t);

-static size_t utf8len(char *);

 static size_t utf8validate(long *, size_t);
 
 static ssize_t xwrite(int, const char *, size_t);
 static size_t utf8validate(long *, size_t);
 
 static ssize_t xwrite(int, const char *, size_t);


@@ -462,6 +470,8 @@ static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static char *xstrdup(char *);
 
 static void *xrealloc(void *, size_t);
 static char *xstrdup(char *);
 

+static void usage(void);
+

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


@@ -474,7 +484,11 @@ static void (*handler[LASTEvent])(XEvent *) = {
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,
        [MotionNotify] = bmotion,
        [ButtonPress] = bpress,
        [ButtonRelease] = brelease,

-       [SelectionClear] = selclear,
+/*
+ * Uncomment if you want the selection to disappear when you select something
+ * different in another window.
+ */
+/*     [SelectionClear] = selclear, */

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


@@ -495,10 +509,12 @@ static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;

+static char *opt_line = NULL;

 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static double usedfontsize = 0;

+static double defaultfontsize = 0;

 
 static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
 
 static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};


@@ -516,6 +532,7 @@ enum {
 typedef struct {
        XftFont *font;
        int flags;
 typedef struct {
        XftFont *font;
        int flags;

+       long unicodep;

 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */


@@ -594,11 +611,11 @@ utf8decodebyte(char c, size_t *i) {
 }
 
 size_t
 }
 
 size_t

-utf8encode(long u, char *c, size_t clen) {
+utf8encode(long u, char *c) {

        size_t len, i;
 
        len = utf8validate(&u, 0);
        size_t len, i;
 
        len = utf8validate(&u, 0);

-       if(clen < len)
+       if(len > UTF_SIZ)

                return 0;
        for(i = len - 1; i != 0; --i) {
                c[i] = utf8encodebyte(u, 0);
                return 0;
        for(i = len - 1; i != 0; --i) {
                c[i] = utf8encodebyte(u, 0);


@@ -613,11 +630,6 @@ utf8encodebyte(long u, size_t i) {
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 

-size_t
-utf8len(char *c) {
-       return utf8decode(c, &(long){0}, UTF_SIZ);
-}
-

 size_t
 utf8validate(long *u, size_t i) {
        if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
 size_t
 utf8validate(long *u, size_t i) {
        if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))


@@ -627,19 +639,20 @@ utf8validate(long *u, size_t i) {
        return i;
 }
 
        return i;
 }
 

-static void
+void

 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
        sel.mode = 0;
        sel.ob.x = -1;

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

        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;
 }
 
        sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
        if(sel.xtarget == None)
                sel.xtarget = XA_STRING;
 }
 

-static int
+int

 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;
 x2col(int x) {
        x -= borderpx;
        x /= xw.cw;


@@ -647,7 +660,7 @@ x2col(int x) {
        return LIMIT(x, 0, term.col-1);
 }
 
        return LIMIT(x, 0, term.col-1);
 }
 

-static int
+int

 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;
 y2row(int y) {
        y -= borderpx;
        y /= xw.ch;


@@ -655,9 +668,24 @@ y2row(int y) {
        return LIMIT(y, 0, term.row-1);
 }
 
        return LIMIT(y, 0, term.row-1);
 }
 

-static void
-selsort(void) {
-       if(sel.ob.y == sel.oe.y) {
+int
+tlinelen(int y) {
+       int i = term.col;
+
+       if(term.line[y][i - 1].mode & ATTR_WRAP)
+               return i;
+
+       while(i > 0 && term.line[y][i - 1].u == ' ')
+               --i;
+
+       return i;
+}
+
+void
+selnormalize(void) {
+       int i;
+
+       if(sel.ob.y == sel.oe.y || sel.type == SEL_RECTANGULAR) {

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


@@ -666,65 +694,75 @@ selsort(void) {
        }
        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
        sel.ne.y = MAX(sel.ob.y, sel.oe.y);
        }
        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
        sel.ne.y = MAX(sel.ob.y, sel.oe.y);

+
+       selsnap(&sel.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
+bool

 selected(int x, int y) {
 selected(int x, int y) {

-       if(sel.ne.y == y && sel.nb.y == y)
-               return BETWEEN(x, sel.nb.x, sel.ne.x);
+       if(sel.type == SEL_RECTANGULAR)
+               return BETWEEN(y, sel.nb.y, sel.ne.y)
+                   && BETWEEN(x, sel.nb.x, sel.ne.x);

 
 

-       if(sel.type == SEL_RECTANGULAR) {
-               return ((sel.nb.y <= y && y <= sel.ne.y)
-                       && (sel.nb.x <= x && x <= sel.ne.x));
-       }
-
-       return ((sel.nb.y < y && y < sel.ne.y)
-               || (y == sel.ne.y && x <= sel.ne.x))
-               || (y == sel.nb.y && x >= sel.nb.x
-                       && (x <= sel.ne.x || sel.nb.y != sel.ne.y));
+       return BETWEEN(y, sel.nb.y, sel.ne.y)
+           && (y != sel.nb.y || x >= sel.nb.x)
+           && (y != sel.ne.y || x <= sel.ne.x);

 }
 
 void
 }
 
 void

-selsnap(int mode, int *x, int *y, int direction) {
-       int i;
+selsnap(int *x, int *y, int direction) {
+       int newx, newy, xt, yt;
+       bool 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.
                 */

+               prevgp = &term.line[*y][*x];
+               prevdelim = ISDELIM(prevgp->u);

                for(;;) {
                for(;;) {

-                       if(direction < 0 && *x <= 0) {
-                               if(*y > 0 && term.line[*y - 1][term.col-1].mode
-                                               & ATTR_WRAP) {
-                                       *y -= 1;
-                                       *x = term.col-1;
-                               } else {
+                       newx = *x + direction;
+                       newy = *y;
+                       if(!BETWEEN(newx, 0, term.col - 1)) {
+                               newy += direction;
+                               newx = (newx + term.col) % term.col;
+                               if (!BETWEEN(newy, 0, term.row - 1))

                                        break;
                                        break;

-                               }
-                       }
-                       if(direction > 0 && *x >= term.col-1) {
-                               if(*y < term.row-1 && term.line[*y][*x].mode
-                                               & ATTR_WRAP) {
-                                       *y += 1;
-                                       *x = 0;
-                               } else {
+
+                               if(direction > 0)
+                                       yt = *y, xt = *x;
+                               else
+                                       yt = newy, xt = newx;
+                               if(!(term.line[yt][xt].mode & ATTR_WRAP))

                                        break;
                                        break;

-                               }

                        }
 
                        }
 

-                       if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
-                               *x += direction;
-                               continue;
-                       }
+                       if (newx >= tlinelen(newy))
+                               break;

 
 

-                       if(strchr(worddelimiters,
-                                       term.line[*y][*x+direction].c[0])) {
+                       gp = &term.line[newy][newx];
+                       delim = 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:


@@ -750,40 +788,19 @@ selsnap(int mode, int *x, int *y, int direction) {
                        }
                }
                break;
                        }
                }
                break;

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

        }
 }
 
 void
 getbuttoninfo(XEvent *e) {
        int type;
        }
 }
 
 void
 getbuttoninfo(XEvent *e) {
        int type;

-       uint state = e->xbutton.state &~Button1Mask;
+       uint state = e->xbutton.state & ~(Button1Mask | forceselmod);

 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
        sel.oe.x = x2col(e->xbutton.x);
        sel.oe.y = y2row(e->xbutton.y);
 
        sel.alt = IS_SET(MODE_ALTSCREEN);
 
        sel.oe.x = x2col(e->xbutton.x);
        sel.oe.y = y2row(e->xbutton.y);

-
-       if(sel.ob.y < sel.oe.y
-                       || (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) {
-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
-       } else {
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1);
-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1);
-       }
-       selsort();
+       selnormalize();

 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {
 
        sel.type = SEL_REGULAR;
        for(type = 1; type < LEN(selmasks); ++type) {


@@ -832,16 +849,17 @@ mousereport(XEvent *e) {
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;
                        /* MODE_MOUSEX10: no button release reporting */
                        if(IS_SET(MODE_MOUSEX10))
                                return;

+                       if (button == 64 || button == 65)
+                               return;

                }
        }
 
        if(!IS_SET(MODE_MOUSEX10)) {
                }
        }
 
        if(!IS_SET(MODE_MOUSEX10)) {

-               button += (state & ShiftMask   ? 4  : 0)
-                       + (state & Mod4Mask    ? 8  : 0)
-                       + (state & ControlMask ? 16 : 0);
+               button += ((state & ShiftMask  ) ? 4  : 0)
+                       + ((state & Mod4Mask   ) ? 8  : 0)
+                       + ((state & ControlMask) ? 16 : 0);

        }
 
        }
 

-       len = 0;

        if(IS_SET(MODE_MOUSESGR)) {
                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,
        if(IS_SET(MODE_MOUSESGR)) {
                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,


@@ -858,10 +876,10 @@ mousereport(XEvent *e) {
 
 void
 bpress(XEvent *e) {
 
 void
 bpress(XEvent *e) {

-       struct timeval now;
+       struct timespec now;

        Mousekey *mk;
 
        Mousekey *mk;
 

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

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


@@ -875,7 +893,7 @@ bpress(XEvent *e) {
        }
 
        if(e->xbutton.button == Button1) {
        }
 
        if(e->xbutton.button == Button1) {

-               gettimeofday(&now, NULL);
+               clock_gettime(CLOCK_MONOTONIC, &now);

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


@@ -895,9 +913,7 @@ bpress(XEvent *e) {
                } else {
                        sel.snap = 0;
                }
                } else {
                        sel.snap = 0;
                }

-               selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1);
-               selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1);
-               selsort();
+               selnormalize();

 
                /*
                 * Draw selection, unless it's regular and we don't want to
 
                /*
                 * Draw selection, unless it's regular and we don't want to


@@ -915,69 +931,56 @@ bpress(XEvent *e) {
 char *
 getsel(void) {
        char *str, *ptr;
 char *
 getsel(void) {
        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);
+       if(sel.ob.x == -1)
+               return NULL;

 
 

-               /* append every set & selected glyph to the selection */
-               for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
-                       gp = &term.line[y][0];
-                       last = &gp[term.col-1];
+       bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ;
+       ptr = str = xmalloc(bufsize);

 
 

-                       while(last >= gp && !(selected(last - gp, y) &&
-                                             strcmp(last->c, " ") != 0)) {
-                               --last;
-                       }
+       /* append every set & selected glyph to the selection */
+       for(y = sel.nb.y; y <= sel.ne.y; y++) {
+               linelen = tlinelen(y);

 
 

-                       for(x = 0; gp <= last; x++, ++gp) {
-                               if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))
-                                       continue;
-
-                               size = utf8len(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 && x > 0 && !((gp-1)->mode & ATTR_WRAP))
-                               *ptr++ = '\n';
+               for( ; gp <= last; ++gp) {
+                       if(gp->mode & ATTR_WDUMMY)
+                               continue;

 
 

-                       /*
-                        * If the last selected line expands in the selection
-                        * after the visible text '\n' is appended.
-                        */
-                       if(y == sel.ne.y) {
-                               i = term.col;
-                               while(--i > 0 && term.line[y][i].c[0] == ' ')
-                                       /* nothing */;
-                               ex = sel.ne.x;
-                               if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x)
-                                       ex = sel.nb.x;
-                               if(i < ex)
-                                       *ptr++ = '\n';
-                       }
+                       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
        return str;
 }
 
 void

-selcopy(void) {
-       xsetsel(getsel());
+selcopy(Time t) {
+       xsetsel(getsel(), t);

 }
 
 void
 }
 
 void


@@ -986,12 +989,17 @@ selnotify(XEvent *e) {
        int format;
        uchar *data, *last, *repl;
        Atom type;
        int format;
        uchar *data, *last, *repl;
        Atom type;

+       XSelectionEvent *xsev;

 
        ofs = 0;
 
        ofs = 0;

+       xsev = &e->xselection;
+       if (xsev->property == None)
+           return;

        do {
        do {

-               if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
-                                       False, AnyPropertyType, &type, &format,
-                                       &nitems, &rem, &data)) {
+               if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
+                                       BUFSIZ/4, False, AnyPropertyType,
+                                       &type, &format, &nitems, &rem,
+                                       &data)) {

                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }
                        fprintf(stderr, "Clipboard allocation failed\n");
                        return;
                }


@@ -1026,12 +1034,26 @@ selpaste(const Arg *dummy) {
                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 

+void
+clipcopy(const Arg *dummy) {
+       Atom clipboard;
+
+       if(sel.clipboard != NULL)
+               free(sel.clipboard);
+
+       if(sel.primary != NULL) {
+               sel.clipboard = xstrdup(sel.primary);
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       }
+}
+

 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
 void
 clippaste(const Arg *dummy) {
        Atom clipboard;
 
        clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);

-       XConvertSelection(xw.dpy, clipboard, sel.xtarget, XA_PRIMARY,
+       XConvertSelection(xw.dpy, clipboard, sel.xtarget, clipboard,

                        xw.win, CurrentTime);
 }
 
                        xw.win, CurrentTime);
 }
 


@@ -1047,7 +1069,8 @@ void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;

-       Atom xa_targets, string;
+       Atom xa_targets, string, clipboard;
+       char *seltext;

 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;
 
        xsre = (XSelectionRequestEvent *) e;
        xev.type = SelectionNotify;


@@ -1055,6 +1078,9 @@ selrequest(XEvent *e) {
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;

+        if (xsre->property == None)
+            xsre->property = xsre->target;
+

        /* reject */
        xev.property = None;
 
        /* reject */
        xev.property = None;
 


@@ -1066,11 +1092,29 @@ selrequest(XEvent *e) {
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                xev.property = xsre->property;

-       } else if(xsre->target == sel.xtarget && sel.clip != NULL) {
-               XChangeProperty(xsre->display, xsre->requestor, xsre->property,
-                               xsre->target, 8, PropModeReplace,
-                               (uchar *) sel.clip, strlen(sel.clip));
-               xev.property = xsre->property;
+       } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) {
+               /*
+                * xith XA_STRING non ascii characters may be incorrect in the
+                * requestor. It is not our problem, use utf8.
+                */
+               clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+               if(xsre->selection == XA_PRIMARY) {
+                       seltext = sel.primary;
+               } else if(xsre->selection == clipboard) {
+                       seltext = sel.clipboard;
+               } else {
+                       fprintf(stderr,
+                               "Unhandled clipboard selection 0x%lx\n",
+                               xsre->selection);
+                       return;
+               }
+               if(seltext != NULL) {
+                       XChangeProperty(xsre->display, xsre->requestor,
+                                       xsre->property, xsre->target,
+                                       8, PropModeReplace,
+                                       (uchar *)seltext, strlen(seltext));
+                       xev.property = xsre->property;
+               }

        }
 
        /* all done, send a notification to the listener */
        }
 
        /* all done, send a notification to the listener */


@@ -1079,22 +1123,18 @@ selrequest(XEvent *e) {
 }
 
 void
 }
 
 void

-xsetsel(char *str) {
-       /* register the selection for both the clipboard and the primary */
-       Atom clipboard;
-
-       free(sel.clip);
-       sel.clip = str;
+xsetsel(char *str, Time t) {
+       free(sel.primary);
+       sel.primary = str;

 
 

-       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);
-
-       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
-       XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);
+       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
+        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+            selclear(0);

 }
 
 void
 brelease(XEvent *e) {
 }
 
 void
 brelease(XEvent *e) {

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

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


@@ -1106,7 +1146,7 @@ brelease(XEvent *e) {
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);
                        selclear(NULL);
                } else {
                        getbuttoninfo(e);

-                       selcopy();
+                       selcopy(e->xbutton.time);

                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);
                }
                sel.mode = 0;
                tsetdirt(sel.nb.y, sel.ne.y);


@@ -1117,7 +1157,7 @@ void
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 
 bmotion(XEvent *e) {
        int oldey, oldex, oldsby, oldsey;
 

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

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


@@ -1148,23 +1188,40 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 void
 execsh(void) {

-       char **args;
-       char *envshell = getenv("SHELL");
-       const struct passwd *pass = getpwuid(getuid());
+       char **args, *sh, *prog;
+       const struct passwd *pw;

        char buf[sizeof(long) * 8 + 1];
 
        char buf[sizeof(long) * 8 + 1];
 

-       unsetenv("COLUMNS");
-       unsetenv("LINES");
-       unsetenv("TERMCAP");
+       errno = 0;
+       if((pw = getpwuid(getuid())) == NULL) {
+               if(errno)
+                       die("getpwuid:%s\n", strerror(errno));
+               else
+                       die("who are you?\n");
+       }

 
 

-       if(pass) {
-               setenv("LOGNAME", pass->pw_name, 1);
-               setenv("USER", pass->pw_name, 1);
-               setenv("SHELL", pass->pw_shell, 0);
-               setenv("HOME", pass->pw_dir, 0);
+       if (!(sh = getenv("SHELL"))) {
+               sh = (pw->pw_shell[0]) ? pw->pw_shell : shell;

        }
 
        }
 

+       if(opt_cmd)
+               prog = opt_cmd[0];
+       else if(utmp)
+               prog = utmp;
+       else
+               prog = sh;
+       args = (opt_cmd) ? opt_cmd : (char *[]) {prog, NULL};
+

        snprintf(buf, sizeof(buf), "%lu", xw.win);
        snprintf(buf, sizeof(buf), "%lu", xw.win);

+
+       unsetenv("COLUMNS");
+       unsetenv("LINES");
+       unsetenv("TERMCAP");
+       setenv("LOGNAME", pw->pw_name, 1);
+       setenv("USER", pw->pw_name, 1);
+       setenv("SHELL", sh, 1);
+       setenv("HOME", pw->pw_dir, 1);
+       setenv("TERM", termname, 1);

        setenv("WINDOWID", buf, 1);
 
        signal(SIGCHLD, SIG_DFL);
        setenv("WINDOWID", buf, 1);
 
        signal(SIGCHLD, SIG_DFL);


@@ -1174,25 +1231,50 @@ execsh(void) {
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 
        signal(SIGTERM, SIG_DFL);
        signal(SIGALRM, SIG_DFL);
 

-       DEFAULT(envshell, shell);
-       setenv("TERM", termname, 1);
-       args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};
-       execvp(args[0], args);
-       exit(EXIT_FAILURE);
+       execvp(prog, args);
+       _exit(EXIT_FAILURE);

 }
 
 void
 sigchld(int a) {
 }
 
 void
 sigchld(int a) {

-       int stat = 0;
+       int stat, ret;
+       pid_t p;

 
 

-       if(waitpid(pid, &stat, 0) < 0)
+       if((p = waitpid(pid, &stat, WNOHANG)) < 0)

                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
                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;
+
+       ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
+       if (ret != EXIT_SUCCESS)
+               die("child finished with error '%d'\n", stat);
+       exit(EXIT_SUCCESS);
+}
+
+
+void
+stty(void)
+{
+       char cmd[_POSIX_ARG_MAX], **p, *q, *s;
+       size_t n, siz;
+
+       if((n = strlen(stty_args)) > sizeof(cmd)-1)
+               die("incorrect stty parameters\n");
+       memcpy(cmd, stty_args, n);
+       q = cmd + n;
+       siz = sizeof(cmd) - n;
+       for(p = opt_cmd; p && (s = *p); ++p) {
+               if((n = strlen(s)) > siz-1)
+                       die("stty parameter length too long\n");
+               *q++ = ' ';
+               q = memcpy(q, s, n);
+               q += n;
+               siz-= n + 1;

        }
        }

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

 }
 
 void
 }
 
 void


@@ -1200,6 +1282,26 @@ ttynew(void) {
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 
        int m, s;
        struct winsize w = {term.row, term.col, 0, 0};
 

+       if(opt_io) {
+               term.mode |= MODE_PRINT;
+               iofd = (!strcmp(opt_io, "-")) ?
+                         STDOUT_FILENO :
+                         open(opt_io, O_WRONLY | O_CREAT, 0666);
+               if(iofd < 0) {
+                       fprintf(stderr, "Error opening %s:%s\n",
+                               opt_io, strerror(errno));
+               }
+       }
+
+       if (opt_line) {
+               if((cmdfd = open(opt_line, O_RDWR)) < 0)
+                       die("open line failed: %s\n", strerror(errno));
+               close(STDIN_FILENO);
+               dup(cmdfd);
+               stty();
+               return;
+       }
+

        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", strerror(errno));
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
                die("openpty failed: %s\n", strerror(errno));


@@ -1209,6 +1311,7 @@ ttynew(void) {
                die("fork failed\n");
                break;
        case 0:
                die("fork failed\n");
                break;
        case 0:

+               close(iofd);

                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);
                setsid(); /* create a new process group */
                dup2(s, STDIN_FILENO);
                dup2(s, STDOUT_FILENO);


@@ -1223,35 +1326,15 @@ ttynew(void) {
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                close(s);
                cmdfd = m;
                signal(SIGCHLD, sigchld);

-               if(opt_io) {
-                       term.mode |= MODE_PRINT;
-                       iofd = (!strcmp(opt_io, "-")) ?
-                                 STDOUT_FILENO :
-                                 open(opt_io, O_WRONLY | O_CREAT, 0666);
-                       if(iofd < 0) {
-                               fprintf(stderr, "Error opening %s:%s\n",
-                                       opt_io, strerror(errno));
-                       }
-               }

                break;
        }
 }
 
                break;
        }
 }
 

-void
-dump(char c) {
-       static int col;
-
-       fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
-       if(++col % 10 == 0)
-               fprintf(stderr, "\n");
-}
-

 void
 ttyread(void) {
        static char buf[BUFSIZ];
        static int buflen = 0;
        char *ptr;
 void
 ttyread(void) {
        static char buf[BUFSIZ];
        static int buflen = 0;
        char *ptr;

-       char s[UTF_SIZ];

        int charsize; /* size of utf8 char in bytes */
        long unicodep;
        int ret;
        int charsize; /* size of utf8 char in bytes */
        long unicodep;
        int ret;


@@ -1264,8 +1347,7 @@ ttyread(void) {
        buflen += ret;
        ptr = buf;
        while((charsize = utf8decode(ptr, &unicodep, buflen))) {
        buflen += ret;
        ptr = buf;
        while((charsize = utf8decode(ptr, &unicodep, buflen))) {

-               utf8encode(unicodep, s, UTF_SIZ);
-               tputc(s, charsize);
+               tputc(unicodep);

                ptr += charsize;
                buflen -= charsize;
        }
                ptr += charsize;
                buflen -= charsize;
        }


@@ -1282,9 +1364,16 @@ ttywrite(const char *s, size_t n) {
 
 void
 ttysend(char *s, size_t n) {
 
 void
 ttysend(char *s, size_t n) {

+       int len;
+       long u;
+

        ttywrite(s, n);
        if(IS_SET(MODE_ECHO))
        ttywrite(s, n);
        if(IS_SET(MODE_ECHO))

-               techo(s, n);
+               while((len = utf8decode(s, &u, n)) > 0) {
+                       techo(u);
+                       n -= len;
+                       s += len;
+               }

 }
 
 void
 }
 
 void


@@ -1372,12 +1461,15 @@ treset(void) {
        term.top = 0;
        term.bot = term.row - 1;
        term.mode = MODE_WRAP;
        term.top = 0;
        term.bot = term.row - 1;
        term.mode = MODE_WRAP;

-       memset(term.trantbl, sizeof(term.trantbl), CS_USA);
+       memset(term.trantbl, CS_USA, sizeof(term.trantbl));

        term.charset = 0;
 
        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


@@ -1462,7 +1554,7 @@ selscroll(int orig, int n) {
                                sel.oe.x = term.col;
                        }
                }
                                sel.oe.x = term.col;
                        }
                }

-               selsort();
+               selnormalize();

        }
 }
 
        }
 }
 


@@ -1503,7 +1595,8 @@ csiparse(void) {
                        break;
                p++;
        }
                        break;
                p++;
        }

-       csiescseq.mode = *p;
+       csiescseq.mode[0] = *p++;
+       csiescseq.mode[1] = (p < csiescseq.buf+csiescseq.len) ? *p : '\0';

 }
 
 /* for absolute user moves, when decom is set */
 }
 
 /* for absolute user moves, when decom is set */


@@ -1523,15 +1616,13 @@ tmoveto(int x, int y) {
                miny = 0;
                maxy = term.row - 1;
        }
                miny = 0;
                maxy = term.row - 1;
        }

-       LIMIT(x, 0, term.col-1);
-       LIMIT(y, miny, maxy);

        term.c.state &= ~CURSOR_WRAPNEXT;
        term.c.state &= ~CURSOR_WRAPNEXT;

-       term.c.x = x;
-       term.c.y = y;
+       term.c.x = LIMIT(x, 0, term.col-1);
+       term.c.y = LIMIT(y, miny, maxy);

 }
 
 void
 }
 
 void

-tsetchar(char *c, Glyph *attr, int x, int y) {
+tsetchar(long 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 */


@@ -1546,30 +1637,29 @@ 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(BETWEEN(c[0], 0x41, 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) {
 
        if(term.line[y][x].mode & ATTR_WIDE) {
                if(x+1 < term.col) {

-                       term.line[y][x+1].c[0] = ' ';
+                       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].mode &= ~ATTR_WDUMMY;
                }
        } else if(term.line[y][x].mode & ATTR_WDUMMY) {

-               term.line[y][x-1].c[0] = ' ';
+               term.line[y][x-1].u = ' ';

                term.line[y][x-1].mode &= ~ATTR_WIDE;
        }
 
        term.dirty[y] = 1;
        term.line[y][x] = *attr;
                term.line[y][x-1].mode &= ~ATTR_WIDE;
        }
 
        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
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
        int x, y, temp;

+       Glyph *gp;

 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;
 
        if(x1 > x2)
                temp = x1, x1 = x2, x2 = temp;


@@ -1584,10 +1674,13 @@ tclearregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {
        for(y = y1; y <= y2; y++) {
                term.dirty[y] = 1;
                for(x = x1; x <= x2; x++) {

+                       gp = &term.line[y][x];

                        if(selected(x, y))
                                selclear(NULL);
                        if(selected(x, y))
                                selclear(NULL);

-                       term.line[y][x] = term.c.attr;
-                       memcpy(term.line[y][x].c, " ", 2);
+                       gp->fg = term.c.attr.fg;
+                       gp->bg = term.c.attr.bg;
+                       gp->mode = 0;
+                       gp->u = ' ';

                }
        }
 }
                }
        }
 }


@@ -1642,7 +1735,7 @@ tdefcolor(int *attr, int *npar, int l) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {

-       case 2: /* direct colour in RGB space */
+       case 2: /* direct color in RGB space */

                if (*npar + 4 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
                if (*npar + 4 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",


@@ -1654,12 +1747,12 @@ tdefcolor(int *attr, int *npar, int l) {
                b = attr[*npar + 4];
                *npar += 4;
                if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
                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 (%d,%d,%d)\n",
+                       fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",

                                r, g, b);
                else
                        idx = TRUECOLOR(r, g, b);
                break;
                                r, g, b);
                else
                        idx = TRUECOLOR(r, g, b);
                break;

-       case 5: /* indexed colour */
+       case 5: /* indexed color */

                if (*npar + 2 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",
                if (*npar + 2 >= l) {
                        fprintf(stderr,
                                "erresc(38): Incorrect number of parameters (%d)\n",


@@ -1674,8 +1767,8 @@ tdefcolor(int *attr, int *npar, int l) {
                break;
        case 0: /* implemented defined (only foreground) */
        case 1: /* transparent */
                break;
        case 0: /* implemented defined (only foreground) */
        case 1: /* transparent */

-       case 3: /* direct colour in CMY space */
-       case 4: /* direct colour in CMYK space */
+       case 3: /* direct color in CMY space */
+       case 4: /* direct color in CMYK space */

        default:
                fprintf(stderr,
                        "erresc(38): gfx attr %d unknown\n", attr[*npar]);
        default:
                fprintf(stderr,
                        "erresc(38): gfx attr %d unknown\n", attr[*npar]);


@@ -1693,15 +1786,24 @@ tsetattr(int *attr, int l) {
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:

-                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE \
-                                       | ATTR_BOLD | ATTR_ITALIC \
-                                       | ATTR_BLINK);
+                       term.c.attr.mode &= ~(
+                               ATTR_BOLD       |
+                               ATTR_FAINT      |
+                               ATTR_ITALIC     |
+                               ATTR_UNDERLINE  |
+                               ATTR_BLINK      |
+                               ATTR_REVERSE    |
+                               ATTR_INVISIBLE  |
+                               ATTR_STRUCK     );

                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;

+               case 2:
+                       term.c.attr.mode |= ATTR_FAINT;
+                       break;

                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;


@@ -1709,15 +1811,21 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */

+                       /* FALLTHROUGH */

                case 6: /* rapid blink */
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 6: /* rapid blink */
                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;

-               case 21:
+               case 8:
+                       term.c.attr.mode |= ATTR_INVISIBLE;
+                       break;
+               case 9:
+                       term.c.attr.mode |= ATTR_STRUCK;
+                       break;

                case 22:
                case 22:

-                       term.c.attr.mode &= ~ATTR_BOLD;
+                       term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);

                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;


@@ -1726,12 +1834,17 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:

-               case 26:

                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;

+               case 28:
+                       term.c.attr.mode &= ~ATTR_INVISIBLE;
+                       break;
+               case 29:
+                       term.c.attr.mode &= ~ATTR_STRUCK;
+                       break;

                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;
                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;


@@ -1795,7 +1908,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)
                                mode = term.mode;
                                MODBIT(term.mode, set, MODE_REVERSE);
                                if(mode != term.mode)

-                                       redraw(REDRAW_TIMEOUT);
+                                       redraw();

                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);
                                break;
                        case 6: /* DECOM -- Origin */
                                MODBIT(term.c.state, set, CURSOR_ORIGIN);


@@ -1850,7 +1963,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if (!allowaltscreen)
                                        break;
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                if (!allowaltscreen)
                                        break;
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);

-                               /* FALLTHRU */
+                               /* FALLTHROUGH */

                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)
                        case 47: /* swap screen */
                        case 1047:
                                if (!allowaltscreen)


@@ -1864,7 +1977,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                        tswapscreen();
                                if(*args != 1049)
                                        break;
                                        tswapscreen();
                                if(*args != 1049)
                                        break;

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

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


@@ -1917,7 +2030,7 @@ csihandle(void) {
        char buf[40];
        int len;
 
        char buf[40];
        int len;
 

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

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


@@ -1958,7 +2071,7 @@ csihandle(void) {
                break;
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
                break;
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)

-                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+                       ttywrite(vtiden, sizeof(vtiden) - 1);

                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */
                break;
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a': /* HPR -- Cursor <n> Forward */


@@ -2105,6 +2218,19 @@ csihandle(void) {
        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
                tcursor(CURSOR_LOAD);
                break;
        case 'u': /* DECRC -- Restore cursor position (ANSI.SYS) */
                tcursor(CURSOR_LOAD);
                break;

+       case ' ':
+               switch (csiescseq.mode[1]) {
+                       case 'q': /* DECSCUSR -- Set Cursor Style */
+                               DEFAULT(csiescseq.arg[0], 1);
+                               if (!BETWEEN(csiescseq.arg[0], 0, 6)) {
+                                       goto unknown;
+                               }
+                               xw.cursor = csiescseq.arg[0];
+                               break;
+                       default:
+                               goto unknown;
+               }
+               break;

        }
 }
 
        }
 }
 


@@ -2143,8 +2269,7 @@ strhandle(void) {
 
        term.esc &= ~(ESC_STR_END|ESC_STR);
        strparse();
 
        term.esc &= ~(ESC_STR_END|ESC_STR);
        strparse();

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

 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */
 
        switch(strescseq.type) {
        case ']': /* OSC -- Operating System Command */


@@ -2159,17 +2284,17 @@ strhandle(void) {
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];
                        if(narg < 3)
                                break;
                        p = strescseq.args[2];

-                       /* fall through */
+                       /* FALLTHROUGH */

                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;

-                       if (!xsetcolorname(j, p)) {
+                       if(xsetcolorname(j, p)) {

                                fprintf(stderr, "erresc: invalid color %s\n", p);
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */
                                fprintf(stderr, "erresc: invalid color %s\n", p);
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                                 * are dirty
                                 */

-                               redraw(0);
+                               redraw();

                        }
                        return;
                }
                        }
                        return;
                }


@@ -2189,12 +2314,23 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {

+       int c;

        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';
        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';

-       while(p && strescseq.narg < STR_ARG_SIZ)
-               strescseq.args[strescseq.narg++] = strsep(&p, ";");
+
+       if(*p == '\0')
+               return;
+
+       while(strescseq.narg < STR_ARG_SIZ) {
+               strescseq.args[strescseq.narg++] = p;
+               while((c = *p) != ';' && c != '\0')
+                       ++p;
+               if(c == '\0')
+                       return;
+               *p++ = '\0';
+       }

 }
 
 void
 }
 
 void


@@ -2264,15 +2400,14 @@ tdumpsel(void) {
 
 void
 tdumpline(int n) {
 
 void
 tdumpline(int n) {

+       char buf[UTF_SIZ];

        Glyph *bp, *end;
 
        bp = &term.line[n][0];
        Glyph *bp, *end;
 
        bp = &term.line[n][0];

-       end = &bp[term.col-1];
-       while(end > bp && !strcmp(" ", end->c))
-               --end;
-       if(bp != end || strcmp(bp->c, " ")) {
+       end = &bp[MIN(tlinelen(n), term.col) - 1];
+       if(bp != end || bp->u != ' ') {

                for( ;bp <= end; ++bp)
                for( ;bp <= end; ++bp)

-                       tprinter(bp->c, strlen(bp->c));
+                       tprinter(buf, utf8encode(bp->u, buf));

        }
        tprinter("\n", 1);
 }
        }
        tprinter("\n", 1);
 }


@@ -2298,78 +2433,88 @@ tputtab(int n) {
                        for(--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }
                        for(--x; x > 0 && !term.tabs[x]; --x)
                                /* nothing */ ;
        }

-       tmoveto(x, term.c.y);
+       term.c.x = LIMIT(x, 0, term.col-1);

 }
 
 void
 }
 
 void

-techo(char *buf, int len) {
-       for(; len > 0; buf++, len--) {
-               char c = *buf;
-
-               if(ISCONTROL(c)) { /* control code */
-                       if(c & 0x80) {
-                               c &= 0x7f;
-                               tputc("^", 1);
-                               tputc("[", 1);
-                       } else if(c != '\n' && c != '\r' && c != '\t') {
-                               c ^= '\x40';
-                               tputc("^", 1);
-                       }
-                       tputc(&c, 1);
-               } else {
-                       break;
+techo(long u) {
+       if(ISCONTROL(u)) { /* control code */
+               if(u & 0x80) {
+                       u &= 0x7f;
+                       tputc('^');
+                       tputc('[');
+               } else if(u != '\n' && u != '\r' && u != '\t') {
+                       u ^= 0x40;
+                       tputc('^');

                }
        }
                }
        }

-       if(len)
-               tputc(buf, len);
+       tputc(u);

 }
 
 void
 tdeftran(char ascii) {
 }
 
 void
 tdeftran(char ascii) {

-       char c, (*bp)[2];
-       static char tbl[][2] = {
-               {'0', CS_GRAPHIC0}, {'1', CS_GRAPHIC1}, {'A', CS_UK},
-               {'B', CS_USA},      {'<', CS_MULTI},    {'K', CS_GER},
-               {'5', CS_FIN},      {'C', CS_FIN},
-               {0, 0}
-       };
-
-       for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp)
-               /* nothing */;
+       static char cs[] = "0B";
+       static int vcs[] = {CS_GRAPHIC0, CS_USA};
+       char *p;

 
 

-       if (c == 0)
+       if((p = strchr(cs, ascii)) == NULL) {

                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);

-       else
-               term.trantbl[term.icharset] = (*bp)[1];
+       } else {
+               term.trantbl[term.icharset] = vcs[p - cs];
+       }

 }
 
 void
 }
 
 void

-tselcs(void) {
-       MODBIT(term.c.attr.mode,
-              term.trantbl[term.charset] == CS_GRAPHIC0,
-              ATTR_GFX);
+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);
+               }
+       }

 }
 
 }
 

-bool
-tcontrolcode(uchar ascii) {
-       static char question[UTF_SIZ] = "?";
+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);
        switch(ascii) {
        case '\t':   /* HT */
                tputtab(1);

-               break;
+               return;

        case '\b':   /* BS */
                tmoveto(term.c.x-1, term.c.y);
        case '\b':   /* BS */
                tmoveto(term.c.x-1, term.c.y);

-               break;
+               return;

        case '\r':   /* CR */
                tmoveto(0, term.c.y);
        case '\r':   /* CR */
                tmoveto(0, term.c.y);

-               break;
+               return;

        case '\f':   /* LF */
        case '\v':   /* VT */
        case '\n':   /* LF */
                /* go to first col if the mode is set */
                tnewline(IS_SET(MODE_CRLF));
        case '\f':   /* LF */
        case '\v':   /* VT */
        case '\n':   /* LF */
                /* go to first col if the mode is set */
                tnewline(IS_SET(MODE_CRLF));

-               break;
+               return;

        case '\a':   /* BEL */
                if(term.esc & ESC_STR_END) {
                        /* backwards compatibility to xterm */
        case '\a':   /* BEL */
                if(term.esc & ESC_STR_END) {
                        /* backwards compatibility to xterm */


@@ -2378,24 +2523,20 @@ tcontrolcode(uchar ascii) {
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                        if (bellvolume)

-                               XBell(xw.dpy, 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;
                }
                break;
        case '\033': /* ESC */
                csireset();
                term.esc &= ~(ESC_CSI|ESC_ALTCHARSET|ESC_TEST);
                term.esc |= ESC_START;

-               return 1;
-       case '\016': /* SO */
-               term.charset = 0;
-               tselcs();
-               break;
-       case '\017': /* SI */
-               term.charset = 1;
-               tselcs();
-               break;
+               return;
+       case '\016': /* SO (LS1 -- Locking shift 1) */
+       case '\017': /* SI (LS0 -- Locking shift 0) */
+               term.charset = 1 - (ascii - '\016');
+               return;

        case '\032': /* SUB */
        case '\032': /* SUB */

-               tsetchar(question, &term.c.attr, term.c.x, term.c.y);
+               tsetchar('?', &term.c.attr, term.c.x, term.c.y);

        case '\030': /* CAN */
                csireset();
                break;
        case '\030': /* CAN */
                csireset();
                break;


@@ -2404,62 +2545,136 @@ tcontrolcode(uchar ascii) {
        case '\021': /* XON (IGNORED) */
        case '\023': /* XOFF (IGNORED) */
        case 0177:   /* DEL (IGNORED) */
        case '\021': /* XON (IGNORED) */
        case '\023': /* XOFF (IGNORED) */
        case 0177:   /* DEL (IGNORED) */

+               return;

        case 0x84:   /* TODO: IND */
        case 0x84:   /* TODO: IND */

-       case 0x85:   /* TODO: NEL */
-       case 0x88:   /* TODO: HTS */
+               break;
+       case 0x85:   /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 0x88:   /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;

        case 0x8d:   /* TODO: RI */
        case 0x8e:   /* TODO: SS2 */
        case 0x8f:   /* TODO: SS3 */
        case 0x8d:   /* TODO: RI */
        case 0x8e:   /* TODO: SS2 */
        case 0x8f:   /* TODO: SS3 */

-       case 0x90:   /* TODO: DCS */

        case 0x98:   /* TODO: SOS */
        case 0x98:   /* TODO: SOS */

-       case 0x9a:   /* TODO: DECID */
+               break;
+       case 0x9a:   /* DECID -- Identify Terminal */
+               ttywrite(vtiden, sizeof(vtiden) - 1);
+               break;

        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */
        case 0x9b:   /* TODO: CSI */
        case 0x9c:   /* TODO: ST */

-       case 0x9d:   /* TODO: OSC */
-       case 0x9e:   /* TODO: PM */
-       case 0x9f:   /* TODO: APC */

                break;
                break;

-       default:
-               return 0;
+       case 0x90:   /* DCS -- Device Control String */
+       case 0x9f:   /* APC -- Application Program Command */
+       case 0x9e:   /* PM -- Privacy Message */
+       case 0x9d:   /* OSC -- Operating System Command */
+               tstrsequence(ascii);
+               return;

        }
        }

+       /* only CAN, SUB, \a and C1 chars interrupt a sequence */

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

-       return 1;

 }
 
 }
 

-void
-tdectest(char c) {
-       static char E[UTF_SIZ] = "E";
-       int x, y;
-
-       if(c == '8') { /* DEC screen alignment test. */
-               for(x = 0; x < term.col; ++x) {
-                       for(y = 0; y < term.row; ++y)
-                               tsetchar(E, &term.c.attr, x, y);
+/*
+ * returns 1 when the sequence is finished and it hasn't to read
+ * more characters for this sequence, otherwise 0
+ */
+int
+eschandle(uchar ascii) {
+       switch(ascii) {
+       case '[':
+               term.esc |= ESC_CSI;
+               return 0;
+       case '#':
+               term.esc |= ESC_TEST;
+               return 0;
+       case 'P': /* DCS -- Device Control String */
+       case '_': /* APC -- Application Program Command */
+       case '^': /* PM -- Privacy Message */
+       case ']': /* OSC -- Operating System Command */
+       case 'k': /* old title set compatibility */
+               tstrsequence(ascii);
+               return 0;
+       case 'n': /* LS2 -- Locking shift 2 */
+       case 'o': /* LS3 -- Locking shift 3 */
+               term.charset = 2 + (ascii - 'n');
+               break;
+       case '(': /* GZD4 -- set primary charset G0 */
+       case ')': /* G1D4 -- set secondary charset G1 */
+       case '*': /* G2D4 -- set tertiary charset G2 */
+       case '+': /* G3D4 -- set quaternary charset G3 */
+               term.icharset = ascii - '(';
+               term.esc |= ESC_ALTCHARSET;
+               return 0;
+       case 'D': /* IND -- Linefeed */
+               if(term.c.y == term.bot) {
+                       tscrollup(term.top, 1);
+               } else {
+                       tmoveto(term.c.x, term.c.y+1);
+               }
+               break;
+       case 'E': /* NEL -- Next line */
+               tnewline(1); /* always go to first col */
+               break;
+       case 'H': /* HTS -- Horizontal tab stop */
+               term.tabs[term.c.x] = 1;
+               break;
+       case 'M': /* RI -- Reverse index */
+               if(term.c.y == term.top) {
+                       tscrolldown(term.top, 1);
+               } else {
+                       tmoveto(term.c.x, term.c.y-1);

                }
                }

+               break;
+       case 'Z': /* DECID -- Identify Terminal */
+               ttywrite(vtiden, sizeof(vtiden) - 1);
+               break;
+       case 'c': /* RIS -- Reset to inital state */
+               treset();
+               xresettitle();
+               xloadcols();
+               break;
+       case '=': /* DECPAM -- Application keypad */
+               term.mode |= MODE_APPKEYPAD;
+               break;
+       case '>': /* DECPNM -- Normal keypad */
+               term.mode &= ~MODE_APPKEYPAD;
+               break;
+       case '7': /* DECSC -- Save Cursor */
+               tcursor(CURSOR_SAVE);
+               break;
+       case '8': /* DECRC -- Restore Cursor */
+               tcursor(CURSOR_LOAD);
+               break;
+       case '\\': /* ST -- String Terminator */
+               if(term.esc & ESC_STR_END)
+                       strhandle();
+               break;
+       default:
+               fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
+                       (uchar) ascii, isprint(ascii)? ascii:'.');
+               break;

        }
        }

+       return 1;

 }
 
 void
 }
 
 void

-tputc(char *c, int len) {
-       uchar ascii;
+tputc(long u) {
+       char c[UTF_SIZ];

        bool control;
        bool control;

-       long unicodep;
-       int width;
+       int width, len;

        Glyph *gp;
 
        Glyph *gp;
 

-       if(len == 1) {
+       len = utf8encode(u, c);
+       if((width = wcwidth(u)) == -1) {
+               memcpy(c, "\357\277\275", 4); /* UTF_INVALID */

                width = 1;
                width = 1;

-               unicodep = ascii = *c;
-       } else {
-               utf8decode(c, &unicodep, UTF_SIZ);
-               width = wcwidth(unicodep);
-               control = ISCONTROLC1(unicodep);
-               ascii = unicodep;

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

-       control = ISCONTROL(unicodep);
+       control = ISCONTROL(u);

 
        /*
         * STR sequence must be checked before anything else
 
        /*
         * STR sequence must be checked before anything else


@@ -2468,11 +2683,9 @@ tputc(char *c, int len) {
         * character.
         */
        if(term.esc & ESC_STR) {
         * character.
         */
        if(term.esc & ESC_STR) {

-               if(width == 1 &&
-                  (ascii == '\a' || ascii == 030 ||
-                   ascii == 032  || ascii == 033 ||
-                   ISCONTROLC1(unicodep))) {
-                       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);
                        term.esc |= ESC_STR_END;
                } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) {
                        memmove(&strescseq.buf[strescseq.len], c, len);


@@ -2502,12 +2715,15 @@ tputc(char *c, int len) {
         * they must not cause conflicts with sequences.
         */
        if(control) {
         * they must not cause conflicts with sequences.
         */
        if(control) {

-               if (tcontrolcode(ascii))
-                       return;
+               tcontrolcode(u);
+               /*
+                * control codes are not shown ever
+                */
+               return;

        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
        } else if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {

-                       csiescseq.buf[csiescseq.len++] = ascii;
-                       if(BETWEEN(ascii, 0x40, 0x7E)
+                       csiescseq.buf[csiescseq.len++] = u;
+                       if(BETWEEN(u, 0x40, 0x7E)

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


@@ -2516,83 +2732,13 @@ tputc(char *c, int len) {
                        }
                        return;
                } else if(term.esc & ESC_ALTCHARSET) {
                        }
                        return;
                } else if(term.esc & ESC_ALTCHARSET) {

-                       tdeftran(ascii);
-                       tselcs();
+                       tdeftran(u);

                } else if(term.esc & ESC_TEST) {
                } else if(term.esc & ESC_TEST) {

-                       tdectest(ascii);
+                       tdectest(u);

                } else {
                } else {

-                       switch(ascii) {
-                       case '[':
-                               term.esc |= ESC_CSI;
-                               return;
-                       case '#':
-                               term.esc |= ESC_TEST;
-                               return;
-                       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;
-                               return;
-                       case '(': /* set primary charset G0 */
-                       case ')': /* set secondary charset G1 */
-                       case '*': /* set tertiary charset G2 */
-                       case '+': /* set quaternary charset G3 */
-                               term.icharset = ascii - '(';
-                               term.esc |= ESC_ALTCHARSET;
+                       if (!eschandle(u))

                                return;
                                return;

-                       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(VT102ID, sizeof(VT102ID) - 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;
-                       }
+                       /* sequence already finished */

                }
                term.esc = 0;
                /*
                }
                term.esc = 0;
                /*


@@ -2601,11 +2747,6 @@ tputc(char *c, int len) {
                 */
                return;
        }
                 */
                return;
        }

-       /*
-        * Display control codes only if we are in graphic mode
-        */
-       if(control && !(term.c.attr.mode & ATTR_GFX))
-               return;

        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
 
        if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y))
                selclear(NULL);
 


@@ -2613,20 +2754,23 @@ tputc(char *c, int len) {
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                gp->mode |= ATTR_WRAP;
                tnewline(1);
        if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) {
                gp->mode |= ATTR_WRAP;
                tnewline(1);

+               gp = &term.line[term.c.y][term.c.x];

        }
 
        }
 

-       if(IS_SET(MODE_INSERT) && term.c.x+1 < term.col)
-               memmove(gp+1, gp, (term.col - term.c.x - 1) * sizeof(Glyph));
+       if(IS_SET(MODE_INSERT) && term.c.x+width < term.col)
+               memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph));

 
 

-       if(term.c.x+width > term.col)
+       if(term.c.x+width > term.col) {

                tnewline(1);
                tnewline(1);

+               gp = &term.line[term.c.y][term.c.x];
+       }

 
 

-       tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+       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) {
 
        if(width == 2) {
                gp->mode |= ATTR_WIDE;
                if(term.c.x+1 < term.col) {

-                       gp[1].c[0] = '\0';
+                       gp[1].u = '\0';

                        gp[1].mode = ATTR_WDUMMY;
                }
        }
                        gp[1].mode = ATTR_WDUMMY;
                }
        }


@@ -2637,32 +2781,33 @@ tputc(char *c, int len) {
        }
 }
 
        }
 }
 

-int
+void

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

-       int slide = term.c.y - row + 1;

        bool *bp;
        bool *bp;

-       Line *orig;
+       TCursor c;

 
 

-       if(col < 1 || row < 1)
-               return 0;
+       if(col < 1 || row < 1) {
+               fprintf(stderr,
+                       "tresize: error resizing to %dx%d\n", col, row);
+               return;
+       }

 
 

-       /* free unneeded rows */
-       i = 0;
-       if(slide > 0) {
-               /*
-                * slide screen to keep cursor where we expect it -
-                * tscrollup would work here, but we can optimize to
-                * memmove because we're freeing the earlier lines
-                */
-               for(/* i = 0 */; i < slide; i++) {
-                       free(term.line[i]);
-                       free(term.alt[i]);
-               }
-               memmove(term.line, term.line + slide, row * sizeof(Line));
-               memmove(term.alt, term.alt + slide, row * sizeof(Line));
+       /*
+        * slide screen to keep cursor where we expect it -
+        * tscrollup would work here, but we can optimize to
+        * memmove because we're freeing the earlier lines
+        */
+       for(i = 0; i <= term.c.y - row; i++) {
+               free(term.line[i]);
+               free(term.alt[i]);
+       }
+       /* ensure that both src and dst are not NULL */
+       if (i > 0) {
+               memmove(term.line, term.line + i, row * sizeof(Line));
+               memmove(term.alt, term.alt + i, row * sizeof(Line));

        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);
        }
        for(i += row; i < term.row; i++) {
                free(term.line[i]);


@@ -2677,14 +2822,12 @@ tresize(int col, int row) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {

-               term.dirty[i] = 1;

                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = xrealloc(term.alt[i],  col * sizeof(Glyph));
        }
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {

-               term.dirty[i] = 1;

                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }
                term.line[i] = xmalloc(col * sizeof(Glyph));
                term.alt[i] = xmalloc(col * sizeof(Glyph));
        }


@@ -2704,21 +2847,19 @@ tresize(int col, int row) {
        tsetscroll(0, row-1);
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        tsetscroll(0, row-1);
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);

-       /* Clearing both screens */
-       orig = term.line;
-       do {
+       /* Clearing both screens (it makes dirty all lines) */
+       c = term.c;
+       for(i = 0; i < 2; i++) {

                if(mincol < col && 0 < minrow) {
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }
                if(0 < col && minrow < row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }
                if(mincol < col && 0 < minrow) {
                        tclearregion(mincol, 0, col - 1, minrow - 1);
                }
                if(0 < col && minrow < row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }

-               tcursor(CURSOR_SAVE);

                tswapscreen();
                tcursor(CURSOR_LOAD);
                tswapscreen();
                tcursor(CURSOR_LOAD);

-       } while(orig != term.line);
-
-       return (slide > 0);
+       }
+       term.c = c;

 }
 
 void
 }
 
 void


@@ -2733,87 +2874,68 @@ xresize(int col, int row) {
        xclear(0, 0, xw.w, xw.h);
 }
 
        xclear(0, 0, xw.w, xw.h);
 }
 

-static inline ushort
+ushort

 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 
 sixd_to_16bit(int x) {
        return x == 0 ? 0 : 0x3737 + 0x2828 * x;
 }
 

+bool
+xloadcolor(int i, const char *name, Color *ncolor) {
+       XRenderColor color = { .alpha = 0xffff };
+
+       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];
+       }
+       return XftColorAllocName(xw.dpy, xw.vis, xw.cmap, name, ncolor);
+}
+

 void
 xloadcols(void) {
 void
 xloadcols(void) {

-       int i, r, g, b;
-       XRenderColor color = { .alpha = 0xffff };
+       int i;

        static bool loaded;
        static bool loaded;

-       Colour *cp;
+       Color *cp;

 
        if(loaded) {
 
        if(loaded) {

-               for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp)
+               for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp)

                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 
                        XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
        }
 

-       /* 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]);
+       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);

                }
                }

-       }
-
-       /* 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++;
-                       }
-               }
-       }
-
-       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);
-               }
-       }

        loaded = true;
 }
 
 int
 xsetcolorname(int x, const char *name) {
        loaded = true;
 }
 
 int
 xsetcolorname(int x, const char *name) {

-       XRenderColor color = { .alpha = 0xffff };
-       Colour colour;
-       if(!BETWEEN(x, 0, LEN(colorname)))
-               return -1;
-       if(!name) {
-               if(BETWEEN(x, 16, 16 + 215)) {
-                       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(BETWEEN(x, 16 + 216, 255)) {
-                       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;
+       Color ncolor;
+
+       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;

 }
 
 void
 }
 
 void


@@ -2914,6 +3036,7 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;

+       float ceilf(float);

 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);


@@ -2924,7 +3047,7 @@ xloadfonts(char *fontstr, double fontsize) {
        if(!pattern)
                die("st: can't open font %s\n", fontstr);
 
        if(!pattern)
                die("st: can't open font %s\n", fontstr);
 

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

                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
                FcPatternDel(pattern, FC_PIXEL_SIZE);
                FcPatternDel(pattern, FC_SIZE);
                FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);


@@ -2944,6 +3067,7 @@ xloadfonts(char *fontstr, double fontsize) {
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }
                        FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
                        usedfontsize = 12;
                }

+               defaultfontsize = usedfontsize;

        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);
        }
 
        FcConfigSubstitute(0, pattern, FcMatchPattern);


@@ -2956,11 +3080,13 @@ xloadfonts(char *fontstr, double fontsize) {
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;
                FcPatternGetDouble(dc.font.match->pattern,
                                   FC_PIXEL_SIZE, 0, &fontval);
                usedfontsize = fontval;

+               if(fontsize == 0)
+                       defaultfontsize = fontval;

        }
 
        /* Setting character width and height. */
        }
 
        /* Setting character width and height. */

-       xw.cw = CEIL(dc.font.width * cwscale);
-       xw.ch = CEIL(dc.font.height * chscale);
+       xw.cw = ceilf(dc.font.width * cwscale);
+       xw.ch = ceilf(dc.font.height * chscale);

 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);


@@ -2980,15 +3106,6 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPatternDestroy(pattern);
 }
 
        FcPatternDestroy(pattern);
 }
 

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

 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);
 void
 xunloadfont(Font *f) {
        XftFontClose(xw.dpy, f->match);


@@ -2999,13 +3116,9 @@ xunloadfont(Font *f) {
 
 void
 xunloadfonts(void) {
 
 void
 xunloadfonts(void) {

-       int i;
-

        /* Free the loaded fonts in the font cache.  */
        /* Free the loaded fonts in the font cache.  */

-       for(i = 0; i < frclen; i++) {
-               XftFontClose(xw.dpy, frc[i].font);
-       }
-       frclen = 0;
+       while(frclen > 0)
+               XftFontClose(xw.dpy, frc[--frclen].font);

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


@@ -3015,10 +3128,29 @@ xunloadfonts(void) {
 
 void
 xzoom(const Arg *arg) {
 
 void
 xzoom(const Arg *arg) {

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

        xunloadfonts();
        xunloadfonts();

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

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

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

 }
 
 void
 }
 
 void


@@ -3061,8 +3193,8 @@ 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);
+       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
        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


@@ -3124,7 +3256,7 @@ 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;
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch,
            width = charlen * xw.cw, xp, i;

-       int frcflags;
+       int frcflags, charexists;

        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        long unicodep;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        long unicodep;


@@ -3133,7 +3265,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;
        FcPattern *fcpattern, *fontpattern;
        FcFontSet *fcsets[] = { NULL };
        FcCharSet *fccharset;

-       Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
+       Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;

        XRenderColor colfg, colbg;
        XRectangle r;
        int oneatatime;
        XRenderColor colfg, colbg;
        XRectangle r;
        int oneatatime;


@@ -3178,24 +3310,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        if(base.mode & ATTR_BOLD) {
        }
 
        if(base.mode & ATTR_BOLD) {

-               if(BETWEEN(base.fg, 0, 7)) {
-                       /* basic system colors */
-                       fg = &dc.col[base.fg + 8];
-               } else if(BETWEEN(base.fg, 16, 195)) {
-                       /* 256 colors */
-                       fg = &dc.col[base.fg + 36];
-               } else if(BETWEEN(base.fg, 232, 251)) {
-                       /* greyscale */
-                       fg = &dc.col[base.fg + 4];
-               }

                /*
                /*

-                * Those ranges will not be brightened:
-                *    8 - 15 – bright system colors
-                *    196 - 231 – highest 256 color cube
-                *    252 - 255 – brightest colors in greyscale
+                * change basic system colors [0-7]
+                * to bright system colors [8-15]

                 */
                 */

-               font = &dc.bfont;
-               frcflags = FRC_BOLD;
+               if(BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT))
+                       fg = &dc.col[base.fg + 8];
+
+               if(base.mode & ATTR_ITALIC) {
+                       font = &dc.ibfont;
+                       frcflags = FRC_ITALICBOLD;
+               } else {
+                       font = &dc.bfont;
+                       frcflags = FRC_BOLD;
+               }

        }
 
        if(IS_SET(MODE_REVERSE)) {
        }
 
        if(IS_SET(MODE_REVERSE)) {


@@ -3230,9 +3358,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                bg = temp;
        }
 
                bg = temp;
        }
 

+       if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) {
+               colfg.red = fg->color.red / 2;
+               colfg.green = fg->color.green / 2;
+               colfg.blue = fg->color.blue / 2;
+               XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+               fg = &revfg;
+       }
+

        if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 
        if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK)
                fg = bg;
 

+       if(base.mode & ATTR_INVISIBLE)
+               fg = bg;
+

        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,


@@ -3275,28 +3414,22 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        bytelen -= u8cblen;
 
                        doesexist = XftCharExists(xw.dpy, font->match, unicodep);
                        bytelen -= u8cblen;
 
                        doesexist = XftCharExists(xw.dpy, font->match, unicodep);

-                       if(oneatatime || !doesexist || bytelen <= 0) {
-                               if(oneatatime || bytelen <= 0) {
-                                       if(doesexist) {
-                                               u8fl++;
-                                               u8fblen += u8cblen;
-                                       }
-                               }
-
-                               if(u8fl > 0) {
-                                       XftDrawStringUtf8(xw.draw, fg,
-                                                       font->match, xp,
-                                                       winy + font->ascent,
-                                                       (FcChar8 *)u8fs,
-                                                       u8fblen);
-                                       xp += xw.cw * u8fl;
-
-                               }
-                               break;
+                       if(doesexist) {
+                                       u8fl++;
+                                       u8fblen += u8cblen;
+                                       if(!oneatatime && bytelen > 0)
+                                                       continue;

                        }
 
                        }
 

-                       u8fl++;
-                       u8fblen += u8cblen;
+                       if(u8fl > 0) {
+                               XftDrawStringUtf8(xw.draw, fg,
+                                               font->match, xp,
+                                               winy + font->ascent,
+                                               (FcChar8 *)u8fs,
+                                               u8fblen);
+                               xp += xw.cw * u8fl;
+                       }
+                       break;

                }
                if(doesexist) {
                        if(oneatatime)
                }
                if(doesexist) {
                        if(oneatatime)


@@ -3306,8 +3439,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {

-                       if(XftCharExists(xw.dpy, frc[i].font, unicodep)
-                                       && frc[i].flags == frcflags) {
+                       charexists = XftCharExists(xw.dpy, frc[i].font, unicodep);
+                       /* Everything correct. */
+                       if(charexists && frc[i].flags == frcflags)
+                               break;
+                       /* We got a default font for a not found glyph. */
+                       if(!charexists && frc[i].flags == frcflags \
+                                       && frc[i].unicodep == unicodep) {

                                break;
                        }
                }
                                break;
                        }
                }


@@ -3315,7 +3453,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)
                /* Nothing was found. */
                if(i >= frclen) {
                        if(!font->set)

-                               xloadfontset(font);
+                               font->set = FcFontSort(0, font->pattern,
+                                                      FcTrue, 0, &fcres);

                        fcsets[0] = font->set;
 
                        /*
                        fcsets[0] = font->set;
 
                        /*


@@ -3338,8 +3477,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 
                                        FcMatchPattern);
                        FcDefaultSubstitute(fcpattern);
 

-                       fontpattern = FcFontSetMatch(0, fcsets,
-                                       FcTrue, fcpattern, &fcres);
+                       fontpattern = FcFontSetMatch(0, fcsets, 1,
+                                       fcpattern, &fcres);

 
                        /*
                         * Overwrite or create the new cache entry.
 
                        /*
                         * Overwrite or create the new cache entry.


@@ -3347,11 +3486,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);
                        if(frclen >= LEN(frc)) {
                                frclen = LEN(frc) - 1;
                                XftFontClose(xw.dpy, frc[frclen].font);

+                               frc[frclen].unicodep = 0;

                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;
                        }
 
                        frc[frclen].font = XftFontOpenPattern(xw.dpy,
                                        fontpattern);
                        frc[frclen].flags = frcflags;

+                       frc[frclen].unicodep = unicodep;

 
                        i = frclen;
                        frclen++;
 
                        i = frclen;
                        frclen++;


@@ -3383,15 +3524,29 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                width, 1);
        }
 
                                width, 1);
        }
 

+       if(base.mode & ATTR_STRUCK) {
+               XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3,
+                               width, 1);
+       }
+

        /* Reset clip to none. */
        XftDrawSetClip(xw.draw, 0);
 }
 
        /* Reset clip to none. */
        XftDrawSetClip(xw.draw, 0);
 }
 

+void
+xdrawglyph(Glyph g, int x, int y) {
+       static char buf[UTF_SIZ];
+       size_t len = utf8encode(g.u, buf);
+       int width = g.mode & ATTR_WIDE ? 2 : 1;
+
+       xdraws(buf, g, x, y, width, len);
+}
+

 void
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;
 void
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;

-       int sl, width, curx;
-       Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
+       int curx;
+       Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs};

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


@@ -3404,47 +3559,63 @@ xdrawcursor(void) {
        if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
                curx--;
 
        if(term.line[term.c.y][curx].mode & ATTR_WDUMMY)
                curx--;
 

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

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

-       sl = utf8len(term.line[oldy][oldx].c);
-       width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;
-       xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
-                       oldy, width, sl);
+       xdrawglyph(term.line[oldy][oldx], oldx, oldy);
+
+       if(IS_SET(MODE_HIDE))
+               return;

 
        /* draw the new one */
 
        /* draw the new one */

-       if(!(IS_SET(MODE_HIDE))) {
-               if(xw.state & WIN_FOCUSED) {
-                       if(IS_SET(MODE_REVERSE)) {
-                               g.mode |= ATTR_REVERSE;
-                               g.fg = defaultcs;
-                               g.bg = defaultfg;
-                       }
+       if(xw.state & WIN_FOCUSED) {
+               switch (xw.cursor) {
+                       case 0: /* Blinking Block */
+                       case 1: /* Blinking Block (Default) */
+                       case 2: /* Steady Block */
+                               if(IS_SET(MODE_REVERSE)) {
+                                               g.mode |= ATTR_REVERSE;
+                                               g.fg = defaultcs;
+                                               g.bg = defaultfg;
+                                       }

 
 

-                       sl = utf8len(g.c);
-                       width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\
-                               ? 2 : 1;
-                       xdraws(g.c, g, term.c.x, term.c.y, width, sl);
-               } else {
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       xw.cw - 1, 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + (curx + 1) * xw.cw - 1,
-                                       borderpx + term.c.y * xw.ch,
-                                       1, xw.ch - 1);
-                       XftDrawRect(xw.draw, &dc.col[defaultcs],
-                                       borderpx + curx * xw.cw,
-                                       borderpx + (term.c.y + 1) * xw.ch - 1,
-                                       xw.cw, 1);
+                               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, &dc.col[defaultcs],
+                                               borderpx + curx * xw.cw,
+                                               borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+                                               xw.cw, cursorthickness);
+                               break;
+                       case 5: /* Blinking bar */
+                       case 6: /* Steady bar */
+                               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);
+                               break;

                }
                }

-               oldx = curx, oldy = term.c.y;
+       } else {
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               xw.cw - 1, 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + (curx + 1) * xw.cw - 1,
+                               borderpx + term.c.y * xw.ch,
+                               1, xw.ch - 1);
+               XftDrawRect(xw.draw, &dc.col[defaultcs],
+                               borderpx + curx * xw.cw,
+                               borderpx + (term.c.y + 1) * xw.ch - 1,
+                               xw.cw, 1);

        }
        }

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

 }
 
 
 }
 
 


@@ -3465,15 +3636,9 @@ xresettitle(void) {
 }
 
 void
 }
 
 void

-redraw(int timeout) {
-       struct timespec tv = {0, timeout * 1000};
-
+redraw(void) {
+       tfulldirt();

        draw();
        draw();

-
-       if(timeout > 0) {
-               nanosleep(&tv, NULL);
-               XSync(xw.dpy, False); /* necessary for a good tput flash */
-       }

 }
 
 void
 }
 
 void


@@ -3488,11 +3653,10 @@ draw(void) {
 
 void
 drawregion(int x1, int y1, int x2, int y2) {
 
 void
 drawregion(int x1, int y1, int x2, int y2) {

-       int ic, ib, x, y, ox, sl;
+       int ic, ib, x, y, ox;

        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN);

-       long unicodep;

 
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        if(!(xw.state & WIN_VISIBLE))
                return;


@@ -3521,9 +3685,7 @@ drawregion(int x1, int y1, int x2, int y2) {
                                base = new;
                        }
 
                                base = new;
                        }
 

-                       sl = utf8decode(new.c, &unicodep, UTF_SIZ);
-                       memcpy(buf+ib, new.c, sl);
-                       ib += sl;
+                       ib += utf8encode(new.u, buf+ib);

                        ic += (new.mode & ATTR_WIDE)? 2 : 1;
                }
                if(ib > 0)
                        ic += (new.mode & ATTR_WIDE)? 2 : 1;
                }
                if(ib > 0)


@@ -3534,25 +3696,14 @@ drawregion(int x1, int y1, int x2, int y2) {
 
 void
 expose(XEvent *ev) {
 
 void
 expose(XEvent *ev) {

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

 }
 
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
 
 }
 
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
 

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

 }
 
 void
 }
 
 void


@@ -3570,7 +3721,7 @@ void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 

-       h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
+       MODBIT(h->flags, add, XUrgencyHint);

        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
 }
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
 }


@@ -3596,7 +3747,7 @@ focus(XEvent *ev) {
        }
 }
 
        }
 }
 

-static inline bool
+bool

 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
 match(uint mask, uint state) {
        return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }


@@ -3680,7 +3831,7 @@ kpress(XEvent *ev) {
                if(IS_SET(MODE_8BIT)) {
                        if(*buf < 0177) {
                                c = *buf | 0x80;
                if(IS_SET(MODE_8BIT)) {
                        if(*buf < 0177) {
                                c = *buf | 0x80;

-                               len = utf8encode(c, buf, UTF_SIZ);
+                               len = utf8encode(c, buf);

                        }
                } else {
                        buf[1] = buf[0];
                        }
                } else {
                        buf[1] = buf[0];


@@ -3743,33 +3894,30 @@ run(void) {
        int w = xw.w, h = xw.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;
        int w = xw.w, h = xw.h;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0;

-       struct timeval drawtimeout, *tv = NULL, now, last, lastblink;
+       struct timespec drawtimeout, *tv = NULL, now, last, lastblink;
+       long deltatime;

 
        /* Waiting for window mapping */
 
        /* Waiting for window mapping */

-       while(1) {
+       do {

                XNextEvent(xw.dpy, &ev);
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                XNextEvent(xw.dpy, &ev);
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;

-               } else if(ev.type == MapNotify) {
-                       break;

                }
                }

-       }
+       } while(ev.type != MapNotify);

 
        ttynew();
        cresize(w, h);
 
 
        ttynew();
        cresize(w, h);
 

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

        lastblink = last;
 
        for(xev = actionfps;;) {
        lastblink = last;
 
        for(xev = actionfps;;) {

-               long deltatime;
-

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

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

                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", strerror(errno));


@@ -3786,9 +3934,9 @@ run(void) {
                if(FD_ISSET(xfd, &rfd))
                        xev = actionfps;
 
                if(FD_ISSET(xfd, &rfd))
                        xev = actionfps;
 

-               gettimeofday(&now, NULL);
+               clock_gettime(CLOCK_MONOTONIC, &now);

                drawtimeout.tv_sec = 0;
                drawtimeout.tv_sec = 0;

-               drawtimeout.tv_usec = (1000/xfps) * 1000;
+               drawtimeout.tv_nsec =  (1000 * 1E6)/ xfps;

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


@@ -3799,8 +3947,7 @@ run(void) {
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);

-               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
-                               || deltatime < 0) {
+               if(deltatime > 1000 / (xev ? xfps : actionfps)) {

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


@@ -3823,13 +3970,16 @@ run(void) {
                                if(blinkset) {
                                        if(TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {
                                if(blinkset) {
                                        if(TIMEDIFF(now, lastblink) \
                                                        > blinktimeout) {

-                                               drawtimeout.tv_usec = 1;
+                                               drawtimeout.tv_nsec = 1000;

                                        } else {
                                        } else {

-                                               drawtimeout.tv_usec = (1000 * \
+                                               drawtimeout.tv_nsec = (1E6 * \

                                                        (blinktimeout - \
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }
                                                        (blinktimeout - \
                                                        TIMEDIFF(now,
                                                                lastblink)));
                                        }

+                                       drawtimeout.tv_sec = \
+                                           drawtimeout.tv_nsec / 1E9;
+                                       drawtimeout.tv_nsec %= (long)1E9;

                                } else {
                                        tv = NULL;
                                }
                                } else {
                                        tv = NULL;
                                }


@@ -3840,18 +3990,21 @@ run(void) {
 
 void
 usage(void) {
 
 void
 usage(void) {

-       die("%s " VERSION " (c) 2010-2014 st engineers\n" \
-       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
-       " [-t title] [-w windowid] [-e command ...]\n", argv0);
+       die("%s " VERSION " (c) 2010-2015 st engineers\n"
+       "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n"
+       "       st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n"
+       "          [-i] [-t title] [-w windowid] [-l line] [stty_args ...]\n",
+       argv0);

 }
 
 int
 main(int argc, char *argv[]) {
 }
 
 int
 main(int argc, char *argv[]) {

-       char *titles;

        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;
        xw.isfixed = False;
        uint cols = 80, rows = 24;
 
        xw.l = xw.t = 0;
        xw.isfixed = False;

+       xw.cursor = 0;

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


@@ -3861,14 +4014,8 @@ main(int argc, char *argv[]) {
                opt_class = EARGF(usage());
                break;
        case 'e':
                opt_class = EARGF(usage());
                break;
        case 'e':

-               /* eat all remaining arguments */
-               if(argc > 1) {
-                       opt_cmd = &argv[1];
-                       if(argv[1] != NULL && opt_title == NULL) {
-                               titles = xstrdup(argv[1]);
-                               opt_title = basename(titles);
-                       }
-               }
+               if(argc > 1)
+                       --argc, ++argv;

                goto run;
        case 'f':
                opt_font = EARGF(usage());
                goto run;
        case 'f':
                opt_font = EARGF(usage());


@@ -3883,6 +4030,9 @@ main(int argc, char *argv[]) {
        case 'o':
                opt_io = EARGF(usage());
                break;
        case 'o':
                opt_io = EARGF(usage());
                break;

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

        case 't':
                opt_title = EARGF(usage());
                break;
        case 't':
                opt_title = EARGF(usage());
                break;


@@ -3895,9 +4045,15 @@ main(int argc, char *argv[]) {
        } ARGEND;
 
 run:
        } 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(cols? cols : 1, rows? rows : 1);
+       tnew(MAX(cols, 1), MAX(rows, 1));

        xinit();
        selinit();
        run();
        xinit();
        selinit();
        run();