Do not eat ESC character if control string is not properly terminated.

[st.git] / st.c

diff --git a/st.c b/st.c
index 9cdd969..d2261e2 100644 (file)
--- a/st.c
+++ b/st.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>

+#include <stdint.h>

 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>


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

+#include <wchar.h>

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


@@ -34,10 +36,6 @@ char *argv0;
 
 #define Glyph Glyph_
 #define Font Font_
 
 #define Glyph Glyph_
 #define Font Font_

-#define Draw XftDraw *
-#define Colour XftColor
-#define Colourmap Colormap
-#define Rectangle XRectangle

 
 #if   defined(__linux)
  #include <pty.h>
 
 #if   defined(__linux)
  #include <pty.h>


@@ -53,6 +51,7 @@ char *argv0;
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */

+#define UTF_INVALID   0xFFFD

 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
 #define UTF_SIZ       4
 #define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16


@@ -66,10 +65,9 @@ char *argv0;
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 /* macros */
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 /* macros */

-#define SERRNO strerror(errno)

 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))

-#define LEN(a)     (sizeof(a) / sizeof(a[0]))
+#define LEN(a)     (sizeof(a) / sizeof(a)[0])

 #define DEFAULT(a, b)     (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define DEFAULT(a, b)     (a) = (a) ? (a) : (b)
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)


@@ -77,6 +75,7 @@ char *argv0;
 #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 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 MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))

 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)    (1 << 24 & (x))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)    (1 << 24 & (x))


@@ -96,6 +95,8 @@ enum glyph_attribute {
        ATTR_ITALIC    = 16,
        ATTR_BLINK     = 32,
        ATTR_WRAP      = 64,
        ATTR_ITALIC    = 16,
        ATTR_BLINK     = 32,
        ATTR_WRAP      = 64,

+       ATTR_WIDE      = 128,
+       ATTR_WDUMMY    = 256,

 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {


@@ -129,14 +130,26 @@ enum term_mode {
        MODE_FOCUS       = 65536,
        MODE_MOUSEX10    = 131072,
        MODE_MOUSEMANY   = 262144,
        MODE_FOCUS       = 65536,
        MODE_MOUSEX10    = 131072,
        MODE_MOUSEMANY   = 262144,

+       MODE_BRCKTPASTE  = 524288,
+       MODE_PRINT       = 1048576,

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

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

 enum escape_state {
        ESC_START      = 1,
        ESC_CSI        = 2,
 enum escape_state {
        ESC_START      = 1,
        ESC_CSI        = 2,

-       ESC_STR        = 4,  /* DSC, OSC, PM, APC */
+       ESC_STR        = 4,  /* DCS, OSC, PM, APC */

        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_TEST       = 32, /* Enter in test mode */


@@ -163,11 +176,15 @@ typedef unsigned int uint;
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 

+typedef XftDraw *Draw;
+typedef XftColor Colour;
+typedef Colormap Colourmap;
+

 typedef struct {
        char c[UTF_SIZ]; /* character code */
 typedef struct {
        char c[UTF_SIZ]; /* character code */

-       uchar mode;      /* attribute flags */
-       ulong fg;        /* foreground  */
-       ulong bg;        /* background  */
+       ushort mode;      /* attribute flags */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */

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


@@ -212,6 +229,9 @@ typedef struct {
        int bot;      /* bottom scroll limit */
        int mode;     /* terminal mode flags */
        int esc;      /* escape state flags */
        int bot;      /* bottom scroll limit */
        int mode;     /* terminal mode flags */
        int esc;      /* escape state flags */

+       char trantbl[4]; /* charset table translation */
+       int charset;  /* current charset */
+       int icharset; /* selected charset for sequence */

        bool numlock; /* lock numbers in keyboard */
        bool *tabs;
 } Term;
        bool numlock; /* lock numbers in keyboard */
        bool *tabs;
 } Term;


@@ -222,7 +242,7 @@ typedef struct {
        Colourmap cmap;
        Window win;
        Drawable buf;
        Colourmap cmap;
        Window win;
        Drawable buf;

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

        XIM xim;
        XIC xic;
        Draw draw;
        XIM xim;
        XIC xic;
        Draw draw;


@@ -230,7 +250,8 @@ typedef struct {
        XSetWindowAttributes attrs;
        int scr;
        bool isfixed; /* is fixed geometry? */
        XSetWindowAttributes attrs;
        int scr;
        bool isfixed; /* is fixed geometry? */

-       int fx, fy, fw, fh; /* fixed geometry */
+       int l, t; /* left and top offset */
+       int gm; /* geometry mask */

        int tw, th; /* tty width and height */
        int w, h; /* window width and height */
        int ch; /* char height */
        int tw, th; /* tty width and height */
        int w, h; /* window width and height */
        int ch; /* char height */


@@ -239,15 +260,15 @@ typedef struct {
 } XWindow;
 
 typedef struct {
 } XWindow;
 
 typedef struct {

-       int b;
+       uint b;

        uint mask;
        uint mask;

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

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

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

        /* three valued logic variables: 0 indifferent, 1 on, -1 off */
        signed char appkey;    /* application keypad */
        signed char appcursor; /* application cursor */
        /* three valued logic variables: 0 indifferent, 1 on, -1 off */
        signed char appkey;    /* application keypad */
        signed char appcursor; /* application cursor */


@@ -278,13 +299,13 @@ typedef struct {
 
 typedef union {
        int i;
 
 typedef union {
        int i;

-       unsigned int ui;
+       uint ui;

        float f;
        const void *v;
 } Arg;
 
 typedef struct {
        float f;
        const void *v;
 } Arg;
 
 typedef struct {

-       unsigned int mod;
+       uint mod;

        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;
        KeySym keysym;
        void (*func)(const Arg *);
        const Arg arg;


@@ -295,6 +316,9 @@ static void clippaste(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);
 static void numlock(const Arg *);
 static void selpaste(const Arg *);
 static void xzoom(const Arg *);

+static void printsel(const Arg *);
+static void printscreen(const Arg *) ;
+static void toggleprinter(const Arg *);

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


@@ -337,6 +361,10 @@ static void strparse(void);
 static void strreset(void);
 
 static int tattrset(int);
 static void strreset(void);
 
 static int tattrset(int);

+static void tprinter(char *, size_t);
+static void tdumpsel(void);
+static void tdumpline(int);
+static void tdump(void);

 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);
 static void tclearregion(int, int, int, int);
 static void tcursor(int);
 static void tdeletechar(int);


@@ -344,16 +372,16 @@ static void tdeleteline(int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);
 static void tinsertblank(int);
 static void tinsertblankline(int);
 static void tmoveto(int, int);

-static void tmoveato(int x, int y);
+static void tmoveato(int, int);

 static void tnew(int, int);
 static void tnewline(int);
 static void tnew(int, int);
 static void tnewline(int);

-static void tputtab(bool);
+static void tputtab(int);

 static void tputc(char *, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tputc(char *, int);
 static void treset(void);
 static int tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);

-static void tsetattr(int*, int);
+static void tsetattr(int *, int);

 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetchar(char *, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);


@@ -362,11 +390,14 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);

-static ulong tdefcolor(int *, int *, int);
+static int32_t tdefcolor(int *, int *, int);
+static void tselcs(void);
+static void tdeftran(char);

 static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);

+static void ttysend(char *, size_t);

 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);


@@ -376,16 +407,17 @@ static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);
 static void xinit(void);
 static void xloadcols(void);
 static int xsetcolorname(int, const char *);

+static int xgeommasktogravity(int);

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

-static void xloadfonts(char *, int);
+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 int xloadfontset(Font *);
 static void xsettitle(char *);
 static void xresettitle(void);
 static void xsetpointermotion(int);
 static void xseturgency(int);

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

 static void xtermclear(int, int, int, int);
 static void xtermclear(int, int, int, int);

-static void xunloadfont(Font *f);
+static void xunloadfont(Font *);

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


@@ -408,19 +440,22 @@ static void selrequest(XEvent *);
 static void selinit(void);
 static void selsort(void);
 static inline bool selected(int, int);
 static void selinit(void);
 static void selsort(void);
 static inline bool selected(int, int);

+static char *getsel(void);

 static void selcopy(void);
 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);
 
 static void selcopy(void);
 static void selscroll(int, int);
 static void selsnap(int, int *, int *, int);
 

-static int utf8decode(char *, long *);
-static int utf8encode(long *, char *);
-static int utf8size(char *);
-static int isfullutf8(char *, int);
+static size_t utf8decode(char *, long *, size_t);
+static long utf8decodebyte(char, size_t *);
+static size_t utf8encode(long, char *, size_t);
+static char utf8encodebyte(long, size_t);
+static size_t utf8len(char *);
+static size_t utf8validate(long *, size_t);

 
 

-static ssize_t xwrite(int, char *, size_t);
+static ssize_t xwrite(int, const char *, size_t);

 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);

-static void *xcalloc(size_t, size_t);
+static char *xstrdup(char *);

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


@@ -448,7 +483,7 @@ static STREscape strescseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;

-static int iofd = -1;
+static int iofd = STDOUT_FILENO;

 static char **opt_cmd = NULL;
 static char *opt_io = NULL;
 static char *opt_title = NULL;
 static char **opt_cmd = NULL;
 static char *opt_io = NULL;
 static char *opt_title = NULL;


@@ -458,7 +493,12 @@ static char *opt_font = NULL;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;
 static int oldbutton = 3; /* button event on startup: 3 = release */
 
 static char *usedfont = NULL;

-static int usedfontsize = 0;
+static double usedfontsize = 0;
+
+static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
+static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
+static long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};

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


@@ -478,7 +518,7 @@ static Fontcache frc[16];
 static int frclen = 0;
 
 ssize_t
 static int frclen = 0;
 
 ssize_t

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

        size_t aux = len;
 
        while(len > 0) {
        size_t aux = len;
 
        while(len > 0) {


@@ -509,138 +549,77 @@ xrealloc(void *p, size_t len) {
        return p;
 }
 
        return p;
 }
 

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

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

-       return p;
+       return s;

 }
 
 }
 

-int
-utf8decode(char *s, long *u) {
-       uchar c;
-       int i, n, rtn;
-
-       rtn = 1;
-       c = *s;
-       if(~c & 0x80) { /* 0xxxxxxx */
-               *u = c;
-               return rtn;
-       } else if((c & 0xE0) == 0xC0) { /* 110xxxxx */
-               *u = c & 0x1F;
-               n = 1;
-       } else if((c & 0xF0) == 0xE0) { /* 1110xxxx */
-               *u = c & 0x0F;
-               n = 2;
-       } else if((c & 0xF8) == 0xF0) { /* 11110xxx */
-               *u = c & 0x07;
-               n = 3;
-       } else {
-               goto invalid;
-       }
-
-       for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
-               c = *s;
-               if((c & 0xC0) != 0x80) /* 10xxxxxx */
-                       goto invalid;
-               *u <<= 6;
-               *u |= c & 0x3F;
-       }
-
-       if((n == 1 && *u < 0x80) ||
-          (n == 2 && *u < 0x800) ||
-          (n == 3 && *u < 0x10000) ||
-          (*u >= 0xD800 && *u <= 0xDFFF)) {
-               goto invalid;
-       }
-
-       return rtn;
-invalid:
-       *u = 0xFFFD;
+size_t
+utf8decode(char *c, long *u, size_t clen) {
+       size_t i, j, len, type;
+       long udecoded;

 
 

-       return rtn;
-}
-
-int
-utf8encode(long *u, char *s) {
-       uchar *sp;
-       ulong uc;
-       int i, n;
-
-       sp = (uchar *)s;
-       uc = *u;
-       if(uc < 0x80) {
-               *sp = uc; /* 0xxxxxxx */
+       *u = UTF_INVALID;
+       if(!clen)
+               return 0;
+       udecoded = utf8decodebyte(c[0], &len);
+       if(!BETWEEN(len, 1, UTF_SIZ))

                return 1;
                return 1;

-       } else if(*u < 0x800) {
-               *sp = (uc >> 6) | 0xC0; /* 110xxxxx */
-               n = 1;
-       } else if(uc < 0x10000) {
-               *sp = (uc >> 12) | 0xE0; /* 1110xxxx */
-               n = 2;
-       } else if(uc <= 0x10FFFF) {
-               *sp = (uc >> 18) | 0xF0; /* 11110xxx */
-               n = 3;
-       } else {
-               goto invalid;
+       for(i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+               udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
+               if(type != 0)
+                       return j;

        }
        }

+       if(j < len)
+               return 0;
+       *u = udecoded;
+       utf8validate(u, len);
+       return len;
+}

 
 

-       for(i=n,++sp; i>0; --i,++sp)
-               *sp = ((uc >> 6*(i-1)) & 0x3F) | 0x80; /* 10xxxxxx */
-
-       return n+1;
-invalid:
-       /* U+FFFD */
-       *s++ = '\xEF';
-       *s++ = '\xBF';
-       *s = '\xBD';
-
-       return 3;
+long
+utf8decodebyte(char c, size_t *i) {
+       for(*i = 0; *i < LEN(utfmask); ++(*i))
+               if(((uchar)c & utfmask[*i]) == utfbyte[*i])
+                       return (uchar)c & ~utfmask[*i];
+       return 0;

 }
 
 }
 

-/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
-   UTF-8 otherwise return 0 */
-int
-isfullutf8(char *s, int b) {
-       uchar *c1, *c2, *c3;
+size_t
+utf8encode(long u, char *c, size_t clen) {
+       size_t len, i;

 
 

-       c1 = (uchar *)s;
-       c2 = (uchar *)++s;
-       c3 = (uchar *)++s;
-       if(b < 1) {
+       len = utf8validate(&u, 0);
+       if(clen < len)

                return 0;
                return 0;

-       } else if((*c1 & 0xE0) == 0xC0 && b == 1) {
-               return 0;
-       } else if((*c1 & 0xF0) == 0xE0 &&
-           ((b == 1) ||
-           ((b == 2) && (*c2 & 0xC0) == 0x80))) {
-               return 0;
-       } else if((*c1 & 0xF8) == 0xF0 &&
-           ((b == 1) ||
-           ((b == 2) && (*c2 & 0xC0) == 0x80) ||
-           ((b == 3) && (*c2 & 0xC0) == 0x80 && (*c3 & 0xC0) == 0x80))) {
-               return 0;
-       } else {
-               return 1;
+       for(i = len - 1; i != 0; --i) {
+               c[i] = utf8encodebyte(u, 0);
+               u >>= 6;

        }
        }

+       c[0] = utf8encodebyte(u, len);
+       return len;

 }
 
 }
 

-int
-utf8size(char *s) {
-       uchar c = *s;
+char
+utf8encodebyte(long u, size_t i) {
+       return utfbyte[i] | (u & ~utfmask[i]);
+}

 
 

-       if(~c & 0x80) {
-               return 1;
-       } else if((c & 0xE0) == 0xC0) {
-               return 2;
-       } else if((c & 0xF0) == 0xE0) {
-               return 3;
-       } else {
-               return 4;
-       }
+size_t
+utf8len(char *c) {
+       return utf8decode(c, &(long){0}, UTF_SIZ);
+}
+
+size_t
+utf8validate(long *u, size_t i) {
+       if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+               *u = UTF_INVALID;
+       for(i = 1; *u > utfmax[i]; ++i)
+               ;
+       return i;

 }
 
 static void
 }
 
 static void


@@ -730,8 +709,13 @@ selsnap(int mode, int *x, int *y, int direction) {
                                }
                        }
 
                                }
                        }
 

+                       if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) {
+                               *x += direction;
+                               continue;
+                       }
+

                        if(strchr(worddelimiters,
                        if(strchr(worddelimiters,

-                                       term.line[*y][*x + direction].c[0])) {
+                                       term.line[*y][*x+direction].c[0])) {

                                break;
                        }
 
                                break;
                        }
 


@@ -826,18 +810,23 @@ mousereport(XEvent *e) {
                button = oldbutton + 32;
                ox = x;
                oy = y;
                button = oldbutton + 32;
                ox = x;
                oy = y;

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

        } else {
        } else {

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

                if(e->xbutton.type == ButtonPress) {
                        oldbutton = button;
                        ox = x;
                        oy = y;
                if(e->xbutton.type == ButtonPress) {
                        oldbutton = button;
                        ox = x;
                        oy = y;

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

                }
        }
 
                }
        }
 


@@ -854,8 +843,7 @@ mousereport(XEvent *e) {
                                e->xbutton.type == ButtonRelease ? 'm' : 'M');
        } else if(x < 223 && y < 223) {
                len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
                                e->xbutton.type == ButtonRelease ? 'm' : 'M');
        } else if(x < 223 && y < 223) {
                len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",

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

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


@@ -876,9 +864,7 @@ bpress(XEvent *e) {
        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
                if(e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {
        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
                if(e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {

-                       ttywrite(mk->s, strlen(mk->s));
-                       if(IS_SET(MODE_ECHO))
-                               techo(mk->s, strlen(mk->s));
+                       ttysend(mk->s, strlen(mk->s));

                        return;
                }
        }
                        return;
                }
        }


@@ -921,8 +907,8 @@ bpress(XEvent *e) {
        }
 }
 
        }
 }
 

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

        char *str, *ptr;
        int x, y, bufsize, size, i, ex;
        Glyph *gp, *last;
        char *str, *ptr;
        int x, y, bufsize, size, i, ex;
        Glyph *gp, *last;


@@ -936,17 +922,18 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
                /* 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;
+                       last = &gp[term.col-1];

 
 

-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+                       while(last >= gp && !(selected(last - gp, y) &&
+                                             strcmp(last->c, " ") != 0)) {
+                               --last;
+                       }

 
                        for(x = 0; gp <= last; x++, ++gp) {
 
                        for(x = 0; gp <= last; x++, ++gp) {

-                               if(!selected(x, y))
+                               if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))

                                        continue;
 
                                        continue;
 

-                               size = utf8size(gp->c);
+                               size = utf8len(gp->c);

                                memcpy(ptr, gp->c, size);
                                ptr += size;
                        }
                                memcpy(ptr, gp->c, size);
                                ptr += size;
                        }


@@ -960,7 +947,7 @@ selcopy(void) {
                         * st.
                         * FIXME: Fix the computer world.
                         */
                         * st.
                         * FIXME: Fix the computer world.
                         */

-                       if(y < sel.ne.y && !((gp-1)->mode & ATTR_WRAP))
+                       if(y < sel.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP))

                                *ptr++ = '\n';
 
                        /*
                                *ptr++ = '\n';
 
                        /*


@@ -980,7 +967,12 @@ selcopy(void) {
                }
                *ptr = 0;
        }
                }
                *ptr = 0;
        }

-       xsetsel(str);
+       return str;
+}
+
+void
+selcopy(void) {
+       xsetsel(getsel());

 }
 
 void
 }
 
 void


@@ -1000,7 +992,7 @@ selnotify(XEvent *e) {
                }
 
                /*
                }
 
                /*

-                * As seen in selcopy:
+                * As seen in getsel:

                 * Line endings are inconsistent in the terminal and GUI world
                 * copy and pasting. When receiving some selection data,
                 * replace all '\n' with '\r'.
                 * Line endings are inconsistent in the terminal and GUI world
                 * copy and pasting. When receiving some selection data,
                 * replace all '\n' with '\r'.


@@ -1012,7 +1004,11 @@ selnotify(XEvent *e) {
                        *repl++ = '\r';
                }
 
                        *repl++ = '\r';
                }
 

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

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


@@ -1185,7 +1181,7 @@ sigchld(int a) {
        int stat = 0;
 
        if(waitpid(pid, &stat, 0) < 0)
        int stat = 0;
 
        if(waitpid(pid, &stat, 0) < 0)

-               die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
+               die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));

 
        if(WIFEXITED(stat)) {
                exit(WEXITSTATUS(stat));
 
        if(WIFEXITED(stat)) {
                exit(WEXITSTATUS(stat));


@@ -1201,7 +1197,7 @@ ttynew(void) {
 
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)
 
        /* seems to work fine on linux, openbsd and freebsd */
        if(openpty(&m, &s, NULL, NULL, &w) < 0)

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

 
        switch(pid = fork()) {
        case -1:
 
        switch(pid = fork()) {
        case -1:


@@ -1213,7 +1209,7 @@ ttynew(void) {
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)
                dup2(s, STDOUT_FILENO);
                dup2(s, STDERR_FILENO);
                if(ioctl(s, TIOCSCTTY, NULL) < 0)

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

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


@@ -1223,6 +1219,7 @@ ttynew(void) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {
                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);
                        iofd = (!strcmp(opt_io, "-")) ?
                                  STDOUT_FILENO :
                                  open(opt_io, O_WRONLY | O_CREAT, 0666);


@@ -1250,19 +1247,18 @@ ttyread(void) {
        char *ptr;
        char s[UTF_SIZ];
        int charsize; /* size of utf8 char in bytes */
        char *ptr;
        char s[UTF_SIZ];
        int charsize; /* size of utf8 char in bytes */

-       long utf8c;
+       long unicodep;

        int ret;
 
        /* append read bytes to unprocessed bytes */
        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
        int ret;
 
        /* append read bytes to unprocessed bytes */
        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)

-               die("Couldn't read from shell: %s\n", SERRNO);
+               die("Couldn't read from shell: %s\n", strerror(errno));

 
        /* process every complete utf8 char */
        buflen += ret;
        ptr = buf;
 
        /* process every complete utf8 char */
        buflen += ret;
        ptr = buf;

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

                tputc(s, charsize);
                ptr += charsize;
                buflen -= charsize;
                tputc(s, charsize);
                ptr += charsize;
                buflen -= charsize;


@@ -1274,8 +1270,15 @@ ttyread(void) {
 
 void
 ttywrite(const char *s, size_t n) {
 
 void
 ttywrite(const char *s, size_t n) {

-       if(write(cmdfd, s, n) == -1)
-               die("write error on tty: %s\n", SERRNO);
+       if(xwrite(cmdfd, s, n) == -1)
+               die("write error on tty: %s\n", strerror(errno));
+}
+
+void
+ttysend(char *s, size_t n) {
+       ttywrite(s, n);
+       if(IS_SET(MODE_ECHO))
+               techo(s, n);

 }
 
 void
 }
 
 void


@@ -1287,7 +1290,7 @@ ttyresize(void) {
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)
        w.ws_xpixel = xw.tw;
        w.ws_ypixel = xw.th;
        if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0)

-               fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
+               fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno));

 }
 
 int
 }
 
 int


@@ -1336,13 +1339,14 @@ tfulldirt(void) {
 
 void
 tcursor(int mode) {
 
 void
 tcursor(int mode) {

-       static TCursor c;
+       static TCursor c[2];
+       bool alt = IS_SET(MODE_ALTSCREEN);

 
        if(mode == CURSOR_SAVE) {
 
        if(mode == CURSOR_SAVE) {

-               c = term.c;
+               c[alt] = term.c;

        } else if(mode == CURSOR_LOAD) {
        } else if(mode == CURSOR_LOAD) {

-               term.c = c;
-               tmoveto(c.x, c.y);
+               term.c = c[alt];
+               tmoveto(c[alt].x, c[alt].y);

        }
 }
 
        }
 }
 


@@ -1362,6 +1366,8 @@ 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);
+       term.charset = 0;

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


@@ -1370,7 +1376,7 @@ treset(void) {
 
 void
 tnew(int col, int row) {
 
 void
 tnew(int col, int row) {

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

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


@@ -1394,15 +1400,13 @@ tscrolldown(int orig, int n) {
 
        LIMIT(n, 0, term.bot-orig+1);
 
 
        LIMIT(n, 0, term.bot-orig+1);
 

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

        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
        tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
        for(i = term.bot; i >= orig+n; i--) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;

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

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


@@ -1412,17 +1416,16 @@ void
 tscrollup(int orig, int n) {
        int i;
        Line temp;
 tscrollup(int orig, int n) {
        int i;
        Line temp;

+

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

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

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

-                temp = term.line[i];
-                term.line[i] = term.line[i+n];
-                term.line[i+n] = temp;
-
-                term.dirty[i] = 1;
-                term.dirty[i+n] = 1;
+               temp = term.line[i];
+               term.line[i] = term.line[i+n];
+               term.line[i+n] = temp;

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


@@ -1538,12 +1541,21 @@ tsetchar(char *c, Glyph *attr, int x, int y) {
         * The table is proudly stolen from rxvt.
         */
        if(attr->mode & ATTR_GFX) {
         * The table is proudly stolen from rxvt.
         */
        if(attr->mode & ATTR_GFX) {

-               if(c[0] >= 0x41 && c[0] <= 0x7e
-                               && vt100_0[c[0] - 0x41]) {
+               if(BETWEEN(c[0], 0x41, 0x7e) && vt100_0[c[0] - 0x41]) {

                        c = vt100_0[c[0] - 0x41];
                }
        }
 
                        c = vt100_0[c[0] - 0x41];
                }
        }
 

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


@@ -1576,59 +1588,51 @@ tclearregion(int x1, int y1, int x2, int y2) {
 
 void
 tdeletechar(int n) {
 
 void
 tdeletechar(int n) {

-       int src = term.c.x + n;
-       int dst = term.c.x;
-       int size = term.col - src;
+       int dst, src, size;
+       Glyph *line;

 
 

-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);

 
 

-       if(src >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x;
+       src = term.c.x + n;
+       size = term.col - src;
+       line = term.line[term.c.y];

 
 

-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));

        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
 void
 tinsertblank(int n) {

-       int src = term.c.x;
-       int dst = src + n;
-       int size = term.col - dst;
+       int dst, src, size;
+       Glyph *line;

 
 

-       term.dirty[term.c.y] = 1;
+       LIMIT(n, 0, term.col - term.c.x);

 
 

-       if(dst >= term.col) {
-               tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
-               return;
-       }
+       dst = term.c.x + n;
+       src = term.c.x;
+       size = term.col - dst;
+       line = term.line[term.c.y];

 
 

-       memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src],
-                       size * sizeof(Glyph));
+       memmove(&line[dst], &line[src], size * sizeof(Glyph));

        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 tinsertblankline(int n) {
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
 void
 tinsertblankline(int n) {

-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrolldown(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrolldown(term.c.y, n);

 }
 
 void
 tdeleteline(int n) {
 }
 
 void
 tdeleteline(int n) {

-       if(term.c.y < term.top || term.c.y > term.bot)
-               return;
-
-       tscrollup(term.c.y, n);
+       if(BETWEEN(term.c.y, term.top, term.bot))
+               tscrollup(term.c.y, n);

 }
 
 }
 

-ulong
+int32_t

 tdefcolor(int *attr, int *npar, int l) {
 tdefcolor(int *attr, int *npar, int l) {

-       long idx = -1;
+       int32_t idx = -1;

        uint r, g, b;
 
        switch (attr[*npar + 1]) {
        uint r, g, b;
 
        switch (attr[*npar + 1]) {


@@ -1677,7 +1681,7 @@ tdefcolor(int *attr, int *npar, int l) {
 void
 tsetattr(int *attr, int l) {
        int i;
 void
 tsetattr(int *attr, int l) {
        int i;

-       ulong idx;
+       int32_t idx;

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


@@ -1769,8 +1773,6 @@ tsetscroll(int t, int b) {
        term.bot = b;
 }
 
        term.bot = b;
 }
 

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

 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;
 void
 tsetmode(bool priv, bool set, int *args, int narg) {
        int *lim, mode;


@@ -1779,7 +1781,6 @@ tsetmode(bool priv, bool set, int *args, int narg) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {
        for(lim = args + narg; args < lim; ++args) {
                if(priv) {
                        switch(*args) {

-                               break;

                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPCURSOR);
                                break;


@@ -1838,12 +1839,15 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1034:
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;
                        case 1034:
                                MODBIT(term.mode, set, MODE_8BIT);
                                break;

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

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

-

                                alt = IS_SET(MODE_ALTSCREEN);
                                if(alt) {
                                        tclearregion(0, 0, term.col-1,
                                alt = IS_SET(MODE_ALTSCREEN);
                                if(alt) {
                                        tclearregion(0, 0, term.col-1,


@@ -1857,6 +1861,9 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;
                        case 1048:
                                tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
                                break;

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

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


@@ -1900,6 +1907,9 @@ tsetmode(bool priv, bool set, int *args, int narg) {
 
 void
 csihandle(void) {
 
 void
 csihandle(void) {

+       char buf[40];
+       int len;
+

        switch(csiescseq.mode) {
        default:
        unknown:
        switch(csiescseq.mode) {
        default:
        unknown:


@@ -1920,6 +1930,25 @@ csihandle(void) {
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;
                DEFAULT(csiescseq.arg[0], 1);
                tmoveto(term.c.x, term.c.y+csiescseq.arg[0]);
                break;

+       case 'i': /* MC -- Media Copy */
+               switch(csiescseq.arg[0]) {
+               case 0:
+                       tdump();
+                       break;
+               case 1:
+                       tdumpline(term.c.y);
+                       break;
+               case 2:
+                       tdumpsel();
+                       break;
+               case 4:
+                       term.mode &= ~MODE_PRINT;
+                       break;
+               case 5:
+                       term.mode |= MODE_PRINT;
+                       break;
+               }
+               break;

        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
                        ttywrite(VT102ID, sizeof(VT102ID) - 1);
        case 'c': /* DA -- Device Attributes */
                if(csiescseq.arg[0] == 0)
                        ttywrite(VT102ID, sizeof(VT102ID) - 1);


@@ -1966,8 +1995,7 @@ csihandle(void) {
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'I': /* CHT -- Cursor Forward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);

-               while(csiescseq.arg[0]--)
-                       tputtab(1);
+               tputtab(csiescseq.arg[0]);

                break;
        case 'J': /* ED -- Clear screen */
                selclear(NULL);
                break;
        case 'J': /* ED -- Clear screen */
                selclear(NULL);


@@ -2035,8 +2063,7 @@ csihandle(void) {
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'Z': /* CBT -- Cursor Backward Tabulation <n> tab stops */
                DEFAULT(csiescseq.arg[0], 1);

-               while(csiescseq.arg[0]--)
-                       tputtab(0);
+               tputtab(-csiescseq.arg[0]);

                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);
                break;
        case 'd': /* VPA -- Move to <row> */
                DEFAULT(csiescseq.arg[0], 1);


@@ -2048,6 +2075,13 @@ csihandle(void) {
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;

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

        case 'r': /* DECSTBM -- Set Scrolling Region */
                if(csiescseq.priv) {
                        goto unknown;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                if(csiescseq.priv) {
                        goto unknown;


@@ -2098,20 +2132,21 @@ csireset(void) {
 void
 strhandle(void) {
        char *p = NULL;
 void
 strhandle(void) {
        char *p = NULL;

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

 
        strparse();
        narg = strescseq.narg;
 
        strparse();
        narg = strescseq.narg;

+       par = atoi(strescseq.args[0]);

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

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

                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);
                case 0:
                case 1:
                case 2:
                        if(narg > 1)
                                xsettitle(strescseq.args[1]);

-                       break;
+                       return;

                case 4: /* color set */
                        if(narg < 3)
                                break;
                case 4: /* color set */
                        if(narg < 3)
                                break;


@@ -2128,25 +2163,20 @@ strhandle(void) {
                                 */
                                redraw(0);
                        }
                                 */
                                redraw(0);
                        }

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

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

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

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

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

        }
        }

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

 }
 
 void
 }
 
 void


@@ -2190,19 +2220,75 @@ strreset(void) {
 }
 
 void
 }
 
 void

-tputtab(bool forward) {
+tprinter(char *s, size_t len) {
+       if(iofd != -1 && xwrite(iofd, s, len) < 0) {
+               fprintf(stderr, "Error writing in %s:%s\n",
+                       opt_io, strerror(errno));
+               close(iofd);
+               iofd = -1;
+       }
+}
+
+void
+toggleprinter(const Arg *arg) {
+       term.mode ^= MODE_PRINT;
+}
+
+void
+printscreen(const Arg *arg) {
+       tdump();
+}
+
+void
+printsel(const Arg *arg) {
+       tdumpsel();
+}
+
+void
+tdumpsel(void) {
+       char *ptr;
+
+       if((ptr = getsel())) {
+               tprinter(ptr, strlen(ptr));
+               free(ptr);
+       }
+}
+
+void
+tdumpline(int n) {
+       Glyph *bp, *end;
+
+       bp = &term.line[n][0];
+       end = &bp[term.col-1];
+       while(end > bp && !strcmp(" ", end->c))
+               --end;
+       if(bp != end || strcmp(bp->c, " ")) {
+               for( ;bp <= end; ++bp)
+                       tprinter(bp->c, strlen(bp->c));
+       }
+       tprinter("\n", 1);
+}
+
+void
+tdump(void) {
+       int i;
+
+       for(i = 0; i < term.row; ++i)
+               tdumpline(i);
+}
+
+void
+tputtab(int n) {

        uint x = term.c.x;
 
        uint x = term.c.x;
 

-       if(forward) {
-               if(x == term.col)
-                       return;
-               for(++x; x < term.col && !term.tabs[x]; ++x)
-                       /* nothing */ ;
-       } else {
-               if(x == 0)
-                       return;
-               for(--x; x > 0 && !term.tabs[x]; --x)
-                       /* nothing */ ;
+       if(n > 0) {
+               while(x < term.col && n--)
+                       for(++x; x < term.col && !term.tabs[x]; ++x)
+                               /* nothing */ ;
+       } else if(n < 0) {
+               while(x > 0 && n++)
+                       for(--x; x > 0 && !term.tabs[x]; --x)
+                               /* nothing */ ;

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


@@ -2212,12 +2298,9 @@ techo(char *buf, int len) {
        for(; len > 0; buf++, len--) {
                char c = *buf;
 
        for(; len > 0; buf++, len--) {
                char c = *buf;
 

-               if(c == '\033') { /* escape */
-                       tputc("^", 1);
-                       tputc("[", 1);
-               } else if(c < '\x20') { /* control code */
+               if(BETWEEN(c, 0x00, 0x1f) || c == 0x7f) { /* control code */

                        if(c != '\n' && c != '\r' && c != '\t') {
                        if(c != '\n' && c != '\r' && c != '\t') {

-                               c |= '\x40';
+                               c ^= '\x40';

                                tputc("^", 1);
                        }
                        tputc(&c, 1);
                                tputc("^", 1);
                        }
                        tputc(&c, 1);


@@ -2229,20 +2312,49 @@ techo(char *buf, int len) {
                tputc(buf, len);
 }
 
                tputc(buf, len);
 }
 

+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 */;
+
+       if (c == 0)
+               fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
+       else
+               term.trantbl[term.icharset] = (*bp)[1];
+}
+
+void
+tselcs(void) {
+       MODBIT(term.c.attr.mode,
+              term.trantbl[term.charset] == CS_GRAPHIC0,
+              ATTR_GFX);
+}
+

 void
 tputc(char *c, int len) {
        uchar ascii = *c;
        bool control = ascii < '\x20' || ascii == 0177;
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
        bool control = ascii < '\x20' || ascii == 0177;

+       long unicodep;
+       int width;

 
 

-       if(iofd != -1) {
-               if(xwrite(iofd, c, len) < 0) {
-                       fprintf(stderr, "Error writing in %s:%s\n",
-                               opt_io, strerror(errno));
-                       close(iofd);
-                       iofd = -1;
-               }
+       if(len == 1) {
+               width = 1;
+       } else {
+               utf8decode(c, &unicodep, UTF_SIZ);
+               width = wcwidth(unicodep);

        }
 
        }
 

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

        /*
         * STR sequences must be checked before anything else
         * because it can use some control codes as part of the sequence.
        /*
         * STR sequences must be checked before anything else
         * because it can use some control codes as part of the sequence.


@@ -2304,19 +2416,20 @@ tputc(char *c, int len) {
                case '\a':   /* BEL */
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);
                case '\a':   /* BEL */
                        if(!(xw.state & WIN_FOCUSED))
                                xseturgency(1);

+                       if (bellvolume)
+                               XBell(xw.dpy, bellvolume);

                        return;
                case '\033': /* ESC */
                        csireset();
                        term.esc = ESC_START;
                        return;
                case '\016': /* SO */
                        return;
                case '\033': /* ESC */
                        csireset();
                        term.esc = ESC_START;
                        return;
                case '\016': /* SO */

+                       term.charset = 0;
+                       tselcs();
+                       return;

                case '\017': /* SI */
                case '\017': /* SI */

-                       /*
-                        * Different charsets are hard to handle. Applications
-                        * should use the right alt charset escapes for the
-                        * only reason they still exist: line drawing. The
-                        * rest is incompatible history st should not support.
-                        */
+                       term.charset = 1;
+                       tselcs();

                        return;
                case '\032': /* SUB */
                case '\030': /* CAN */
                        return;
                case '\032': /* SUB */
                case '\030': /* CAN */


@@ -2339,27 +2452,9 @@ tputc(char *c, int len) {
                                csiparse();
                                csihandle();
                        }
                                csiparse();
                                csihandle();
                        }

-               } else if(term.esc & ESC_STR_END) {
-                       term.esc = 0;
-                       if(ascii == '\\')
-                               strhandle();

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

-                       switch(ascii) {
-                       case '0': /* Line drawing set */
-                               term.c.attr.mode |= ATTR_GFX;
-                               break;
-                       case 'B': /* USASCII */
-                               term.c.attr.mode &= ~ATTR_GFX;
-                               break;
-                       case 'A': /* UK (IGNORED) */
-                       case '<': /* multinational charset (IGNORED) */
-                       case '5': /* Finnish (IGNORED) */
-                       case 'C': /* Finnish (IGNORED) */
-                       case 'K': /* German (IGNORED) */
-                               break;
-                       default:
-                               fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
-                       }
+                       tdeftran(ascii);
+                       tselcs();

                        term.esc = 0;
                } else if(term.esc & ESC_TEST) {
                        if(ascii == '8') { /* DEC screen alignment test. */
                        term.esc = 0;
                } else if(term.esc & ESC_TEST) {
                        if(ascii == '8') { /* DEC screen alignment test. */


@@ -2390,13 +2485,12 @@ tputc(char *c, int len) {
                                term.esc |= ESC_STR;
                                break;
                        case '(': /* set primary charset G0 */
                                term.esc |= ESC_STR;
                                break;
                        case '(': /* set primary charset G0 */

+                       case ')': /* set secondary charset G1 */
+                       case '*': /* set tertiary charset G2 */
+                       case '+': /* set quaternary charset G3 */
+                               term.icharset = ascii - '(';

                                term.esc |= ESC_ALTCHARSET;
                                break;
                                term.esc |= ESC_ALTCHARSET;
                                break;

-                       case ')': /* set secondary charset G1 (IGNORED) */
-                       case '*': /* set tertiary charset G2 (IGNORED) */
-                       case '+': /* set quaternary charset G3 (IGNORED) */
-                               term.esc = 0;
-                               break;

                        case 'D': /* IND -- Linefeed */
                                if(term.c.y == term.bot) {
                                        tscrollup(term.top, 1);
                        case 'D': /* IND -- Linefeed */
                                if(term.c.y == term.bot) {
                                        tscrollup(term.top, 1);


@@ -2447,7 +2541,9 @@ tputc(char *c, int len) {
                                tcursor(CURSOR_LOAD);
                                term.esc = 0;
                                break;
                                tcursor(CURSOR_LOAD);
                                term.esc = 0;
                                break;

-                       case '\\': /* ST -- Stop */
+                       case '\\': /* ST -- String Terminator */
+                               if(term.esc & ESC_STR_END)
+                                       strhandle();

                                term.esc = 0;
                                break;
                        default:
                                term.esc = 0;
                                break;
                        default:


@@ -2480,9 +2576,20 @@ tputc(char *c, int len) {
                        (term.col - term.c.x - 1) * sizeof(Glyph));
        }
 
                        (term.col - term.c.x - 1) * sizeof(Glyph));
        }
 

+       if(term.c.x+width > term.col)
+               tnewline(1);
+

        tsetchar(c, &term.c.attr, term.c.x, term.c.y);
        tsetchar(c, &term.c.attr, term.c.x, term.c.y);

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

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


@@ -2536,8 +2643,8 @@ tresize(int col, int row) {
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.dirty[i] = 1;
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
                term.dirty[i] = 1;

-               term.line[i] = xcalloc(col, sizeof(Glyph));
-               term.alt [i] = xcalloc(col, sizeof(Glyph));
+               term.line[i] = xmalloc(col * sizeof(Glyph));
+               term.alt[i] = xmalloc(col * sizeof(Glyph));

        }
        if(col > term.col) {
                bp = term.tabs + term.col;
        }
        if(col > term.col) {
                bp = term.tabs + term.col;


@@ -2564,7 +2671,9 @@ tresize(int col, int row) {
                if(0 < col && minrow < row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }
                if(0 < col && minrow < row) {
                        tclearregion(0, minrow, col - 1, row - 1);
                }

+               tcursor(CURSOR_SAVE);

                tswapscreen();
                tswapscreen();

+               tcursor(CURSOR_LOAD);

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


@@ -2637,10 +2746,10 @@ int
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
        Colour colour;
 xsetcolorname(int x, const char *name) {
        XRenderColor color = { .alpha = 0xffff };
        Colour colour;

-       if (x < 0 || x > LEN(colorname))
+       if(!BETWEEN(x, 0, LEN(colorname)))

                return -1;
        if(!name) {
                return -1;
        if(!name) {

-               if(16 <= x && x < 16 + 216) {
+               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);
                        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);


@@ -2649,7 +2758,7 @@ xsetcolorname(int x, const char *name) {
                                return 0; /* something went wrong */
                        dc.col[x] = colour;
                        return 1;
                                return 0; /* something went wrong */
                        dc.col[x] = colour;
                        return 1;

-               } else if (16 + 216 <= x && x < 256) {
+               } 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 */
                        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 */


@@ -2692,24 +2801,44 @@ xhints(void) {
        XSizeHints *sizeh = NULL;
 
        sizeh = XAllocSizeHints();
        XSizeHints *sizeh = NULL;
 
        sizeh = XAllocSizeHints();

-       if(xw.isfixed == False) {
-               sizeh->flags = PSize | PResizeInc | PBaseSize;
-               sizeh->height = xw.h;
-               sizeh->width = xw.w;
-               sizeh->height_inc = xw.ch;
-               sizeh->width_inc = xw.cw;
-               sizeh->base_height = 2 * borderpx;
-               sizeh->base_width = 2 * borderpx;
-       } else {
-               sizeh->flags = PMaxSize | PMinSize;
-               sizeh->min_width = sizeh->max_width = xw.fw;
-               sizeh->min_height = sizeh->max_height = xw.fh;
-       }

 
 

-       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class);
+       sizeh->flags = PSize | PResizeInc | PBaseSize;
+       sizeh->height = xw.h;
+       sizeh->width = xw.w;
+       sizeh->height_inc = xw.ch;
+       sizeh->width_inc = xw.cw;
+       sizeh->base_height = 2 * borderpx;
+       sizeh->base_width = 2 * borderpx;
+       if(xw.isfixed == True) {
+               sizeh->flags |= PMaxSize | PMinSize;
+               sizeh->min_width = sizeh->max_width = xw.w;
+               sizeh->min_height = sizeh->max_height = xw.h;
+       }
+       if(xw.gm & (XValue|YValue)) {
+               sizeh->flags |= USPosition | PWinGravity;
+               sizeh->x = xw.l;
+               sizeh->y = xw.t;
+               sizeh->win_gravity = xgeommasktogravity(xw.gm);
+       }
+
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm,
+                       &class);

        XFree(sizeh);
 }
 
        XFree(sizeh);
 }
 

+int
+xgeommasktogravity(int mask) {
+       switch(mask & (XNegative|YNegative)) {
+       case 0:
+               return NorthWestGravity;
+       case XNegative:
+               return NorthEastGravity;
+       case YNegative:
+               return SouthWestGravity;
+       }
+       return SouthEastGravity;
+}
+

 int
 xloadfont(Font *f, FcPattern *pattern) {
        FcPattern *match;
 int
 xloadfont(Font *f, FcPattern *pattern) {
        FcPattern *match;


@@ -2739,9 +2868,9 @@ xloadfont(Font *f, FcPattern *pattern) {
 }
 
 void
 }
 
 void

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

        FcPattern *pattern;
        FcPattern *pattern;

-       FcResult result;
+       FcResult r_sz, r_psz;

        double fontval;
 
        if(fontstr[0] == '-') {
        double fontval;
 
        if(fontstr[0] == '-') {


@@ -2755,12 +2884,16 @@ xloadfonts(char *fontstr, int fontsize) {
 
        if(fontsize > 0) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);
 
        if(fontsize > 0) {
                FcPatternDel(pattern, FC_PIXEL_SIZE);

+               FcPatternDel(pattern, FC_SIZE);

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

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

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


@@ -2777,6 +2910,12 @@ xloadfonts(char *fontstr, int fontsize) {
        if(xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
 
        if(xloadfont(&dc.font, pattern))
                die("st: can't open font %s\n", fontstr);
 

+       if(usedfontsize < 0) {
+               FcPatternGetDouble(dc.font.match->pattern,
+                                  FC_PIXEL_SIZE, 0, &fontval);
+               usedfontsize = fontval;
+       }
+

        /* Setting character width and height. */
        xw.cw = CEIL(dc.font.width * cwscale);
        xw.ch = CEIL(dc.font.height * chscale);
        /* Setting character width and height. */
        xw.cw = CEIL(dc.font.width * cwscale);
        xw.ch = CEIL(dc.font.height * chscale);


@@ -2845,7 +2984,7 @@ xinit(void) {
        XGCValues gcvalues;
        Cursor cursor;
        Window parent;
        XGCValues gcvalues;
        Cursor cursor;
        Window parent;

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

 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");
 
        if(!(xw.dpy = XOpenDisplay(NULL)))
                die("Can't open display\n");


@@ -2864,23 +3003,12 @@ xinit(void) {
        xloadcols();
 
        /* adjust fixed window geometry */
        xloadcols();
 
        /* adjust fixed window geometry */

-       if(xw.isfixed) {
-               sw = DisplayWidth(xw.dpy, xw.scr);
-               sh = DisplayHeight(xw.dpy, xw.scr);
-               if(xw.fx < 0)
-                       xw.fx = sw + xw.fx - xw.fw - 1;
-               if(xw.fy < 0)
-                       xw.fy = sh + xw.fy - xw.fh - 1;
-
-               xw.h = xw.fh;
-               xw.w = xw.fw;
-       } else {
-               /* window - default size */
-               xw.h = 2 * borderpx + term.row * xw.ch;
-               xw.w = 2 * borderpx + term.col * xw.cw;
-               xw.fx = 0;
-               xw.fy = 0;
-       }
+       xw.w = 2 * borderpx + term.col * xw.cw;
+       xw.h = 2 * borderpx + term.row * xw.ch;
+       if(xw.gm & XNegative)
+               xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2;
+       if(xw.gm & YNegative)
+               xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2;

 
        /* Events */
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;
 
        /* Events */
        xw.attrs.background_pixel = dc.col[defaultbg].pixel;


@@ -2893,7 +3021,7 @@ xinit(void) {
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
                        XRootWindow(xw.dpy, xw.scr);
 
        parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
                        XRootWindow(xw.dpy, xw.scr);

-       xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
+       xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,

                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
                        | CWEventMask | CWColormap, &xw.attrs);
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
                        | CWEventMask | CWColormap, &xw.attrs);


@@ -2937,12 +3065,17 @@ xinit(void) {
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);

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

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

+       xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
+       XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
+                       PropModeReplace, (uchar *)&thispid, 1);
+

        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();
        xresettitle();
        XMapWindow(xw.dpy, xw.win);
        xhints();

-       XSync(xw.dpy, 0);
+       XSync(xw.dpy, False);

 }
 
 void
 }
 
 void


@@ -2952,7 +3085,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int frcflags;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
        int frcflags;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;

-       long u8char;
+       long unicodep;

        Font *font = &dc.font;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
        Font *font = &dc.font;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;


@@ -2960,7 +3093,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        FcCharSet *fccharset;
        Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
        XRenderColor colfg, colbg;
        FcCharSet *fccharset;
        Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg;
        XRenderColor colfg, colbg;

-       Rectangle r;
+       XRectangle r;

        int oneatatime;
 
        frcflags = FRC_NORMAL;
        int oneatatime;
 
        frcflags = FRC_NORMAL;


@@ -2979,7 +3112,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                if(base.fg == defaultfg)
                        base.fg = defaultunderline;
        }
                if(base.fg == defaultfg)
                        base.fg = defaultunderline;
        }

+

        if(IS_TRUECOL(base.fg)) {
        if(IS_TRUECOL(base.fg)) {

+               colfg.alpha = 0xffff;

                colfg.red = TRUERED(base.fg);
                colfg.green = TRUEGREEN(base.fg);
                colfg.blue = TRUEBLUE(base.fg);
                colfg.red = TRUERED(base.fg);
                colfg.green = TRUEGREEN(base.fg);
                colfg.blue = TRUEBLUE(base.fg);


@@ -2990,6 +3125,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        }
 
        if(IS_TRUECOL(base.bg)) {
        }
 
        if(IS_TRUECOL(base.bg)) {

+               colbg.alpha = 0xffff;

                colbg.green = TRUEGREEN(base.bg);
                colbg.red = TRUERED(base.bg);
                colbg.blue = TRUEBLUE(base.bg);
                colbg.green = TRUEGREEN(base.bg);
                colbg.red = TRUERED(base.bg);
                colbg.blue = TRUEBLUE(base.bg);


@@ -2999,8 +3135,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                bg = &dc.col[base.bg];
        }
 
                bg = &dc.col[base.bg];
        }
 

-
-

        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */
        if(base.mode & ATTR_BOLD) {
                if(BETWEEN(base.fg, 0, 7)) {
                        /* basic system colors */


@@ -3030,7 +3164,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;
                        colfg.green = ~fg->color.green;
                        colfg.blue = ~fg->color.blue;
                        colfg.alpha = fg->color.alpha;

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

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


@@ -3041,7 +3176,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;
                        colbg.green = ~bg->color.green;
                        colbg.blue = ~bg->color.blue;
                        colbg.alpha = bg->color.alpha;

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

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


@@ -3092,11 +3228,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                oneatatime = font->width != xw.cw;
                for(;;) {
                        u8c = s;
                oneatatime = font->width != xw.cw;
                for(;;) {
                        u8c = s;

-                       u8cblen = utf8decode(s, &u8char);
+                       u8cblen = utf8decode(s, &unicodep, UTF_SIZ);

                        s += u8cblen;
                        bytelen -= u8cblen;
 
                        s += u8cblen;
                        bytelen -= u8cblen;
 

-                       doesexist = XftCharExists(xw.dpy, font->match, u8char);
+                       doesexist = XftCharExists(xw.dpy, font->match, unicodep);

                        if(oneatatime || !doesexist || bytelen <= 0) {
                                if(oneatatime || bytelen <= 0) {
                                        if(doesexist) {
                        if(oneatatime || !doesexist || bytelen <= 0) {
                                if(oneatatime || bytelen <= 0) {
                                        if(doesexist) {


@@ -3111,7 +3247,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                                        winy + font->ascent,
                                                        (FcChar8 *)u8fs,
                                                        u8fblen);
                                                        winy + font->ascent,
                                                        (FcChar8 *)u8fs,
                                                        u8fblen);

-                                       xp += CEIL(font->width * cwscale * u8fl);
+                                       xp += xw.cw * u8fl;

 
                                }
                                break;
 
                                }
                                break;


@@ -3121,14 +3257,14 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                        u8fblen += u8cblen;
                }
                if(doesexist) {
                        u8fblen += u8cblen;
                }
                if(doesexist) {

-                       if (oneatatime);
+                       if(oneatatime)

                                continue;
                        break;
                }
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {
                                continue;
                        break;
                }
 
                /* Search the font cache. */
                for(i = 0; i < frclen; i++) {

-                       if(XftCharExists(xw.dpy, frc[i].font, u8char)
+                       if(XftCharExists(xw.dpy, frc[i].font, unicodep)

                                        && frc[i].flags == frcflags) {
                                break;
                        }
                                        && frc[i].flags == frcflags) {
                                break;
                        }


@@ -3144,11 +3280,13 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                         * font for one single character.
                         * Nothing was found in the cache. Now use
                         * some dozen of Fontconfig calls to get the
                         * font for one single character.

+                        *
+                        * Xft and fontconfig are design failures.

                         */
                        fcpattern = FcPatternDuplicate(font->pattern);
                        fccharset = FcCharSetCreate();
 
                         */
                        fcpattern = FcPatternDuplicate(font->pattern);
                        fccharset = FcCharSetCreate();
 

-                       FcCharSetAddChar(fccharset, u8char);
+                       FcCharSetAddChar(fccharset, unicodep);

                        FcPatternAddCharSet(fcpattern, FC_CHARSET,
                                        fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE,
                        FcPatternAddCharSet(fcpattern, FC_CHARSET,
                                        fccharset);
                        FcPatternAddBool(fcpattern, FC_SCALABLE,


@@ -3184,9 +3322,15 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                                xp, winy + frc[i].font->ascent,
                                (FcChar8 *)u8c, u8cblen);
 
                                xp, winy + frc[i].font->ascent,
                                (FcChar8 *)u8c, u8cblen);
 

-               xp += CEIL(font->width * cwscale);
+               xp += xw.cw * wcwidth(unicodep);

        }
 
        }
 

+       /*
+        * This is how the loop above actually should be. Why does the
+        * application have to care about font details?
+        *
+        * I have to repeat: Xft and Fontconfig are design failures.
+        */

        /*
        XftDrawStringUtf8(xw.draw, fg, font->set, winx,
                        winy + font->ascent, (FcChar8 *)s, bytelen);
        /*
        XftDrawStringUtf8(xw.draw, fg, font->set, winx,
                        winy + font->ascent, (FcChar8 *)s, bytelen);


@@ -3204,18 +3348,27 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 void
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;
 void
 xdrawcursor(void) {
        static int oldx = 0, oldy = 0;

-       int sl;
+       int sl, width, curx;

        Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
 
        Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs};
 
        LIMIT(oldx, 0, term.col-1);
        LIMIT(oldy, 0, term.row-1);
 

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

        memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        /* remove the old cursor */
        memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ);
 
        /* remove the old cursor */

-       sl = utf8size(term.line[oldy][oldx].c);
+       sl = utf8len(term.line[oldy][oldx].c);
+       width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1;

        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
        xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,

-                       oldy, 1, sl);
+                       oldy, width, sl);

 
        /* draw the new one */
        if(!(IS_SET(MODE_HIDE))) {
 
        /* draw the new one */
        if(!(IS_SET(MODE_HIDE))) {


@@ -3226,27 +3379,29 @@ xdrawcursor(void) {
                                g.bg = defaultfg;
                        }
 
                                g.bg = defaultfg;
                        }
 

-                       sl = utf8size(g.c);
-                       xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
+                       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],
                } else {
                        XftDrawRect(xw.draw, &dc.col[defaultcs],

-                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + curx * xw.cw,

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

-                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + curx * xw.cw,

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

-                                       borderpx + (term.c.x + 1) * xw.cw - 1,
+                                       borderpx + (curx + 1) * xw.cw - 1,

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

-                                       borderpx + term.c.x * xw.cw,
+                                       borderpx + curx * xw.cw,

                                        borderpx + (term.c.y + 1) * xw.ch - 1,
                                        xw.cw, 1);
                }
                                        borderpx + (term.c.y + 1) * xw.ch - 1,
                                        xw.cw, 1);
                }

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

        }
 }
 
        }
 }
 


@@ -3258,6 +3413,7 @@ xsettitle(char *p) {
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);

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

        XFree(prop.value);
 }
 
        XFree(prop.value);
 }
 


@@ -3270,7 +3426,6 @@ void
 redraw(int timeout) {
        struct timespec tv = {0, timeout * 1000};
 
 redraw(int timeout) {
        struct timespec tv = {0, timeout * 1000};
 

-       tfulldirt();

        draw();
 
        if(timeout > 0) {
        draw();
 
        if(timeout > 0) {


@@ -3295,8 +3450,9 @@ drawregion(int x1, int y1, int x2, int y2) {
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        bool ena_sel = sel.ob.x != -1;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        bool ena_sel = sel.ob.x != -1;

+       long unicodep;

 
 

-       if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
+       if(sel.alt != IS_SET(MODE_ALTSCREEN))

                ena_sel = 0;
 
        if(!(xw.state & WIN_VISIBLE))
                ena_sel = 0;
 
        if(!(xw.state & WIN_VISIBLE))


@@ -3312,6 +3468,8 @@ drawregion(int x1, int y1, int x2, int y2) {
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];
                ic = ib = ox = 0;
                for(x = x1; x < x2; x++) {
                        new = term.line[y][x];

+                       if(new.mode == ATTR_WDUMMY)
+                               continue;

                        if(ena_sel && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (ATTRCMP(base, new)
                        if(ena_sel && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (ATTRCMP(base, new)


@@ -3324,10 +3482,10 @@ drawregion(int x1, int y1, int x2, int y2) {
                                base = new;
                        }
 
                                base = new;
                        }
 

-                       sl = utf8size(new.c);
+                       sl = utf8decode(new.c, &unicodep, UTF_SIZ);

                        memcpy(buf+ib, new.c, sl);
                        ib += sl;
                        memcpy(buf+ib, new.c, sl);
                        ib += sl;

-                       ++ic;
+                       ic += (new.mode & ATTR_WIDE)? 2 : 1;

                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);


@@ -3401,15 +3559,7 @@ focus(XEvent *ev) {
 
 static inline bool
 match(uint mask, uint state) {
 
 static inline bool
 match(uint mask, uint state) {

-       state &= ~ignoremod;
-
-       if(mask == XK_NO_MOD && state)
-               return false;
-       if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
-               return false;
-       if(mask == XK_ANY_MOD)
-               return true;
-       return state == mask;
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);

 }
 
 void
 }
 
 void


@@ -3439,25 +3589,16 @@ kmap(KeySym k, uint state) {
                if(!match(kp->mask, state))
                        continue;
 
                if(!match(kp->mask, state))
                        continue;
 

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

                        continue;
                        continue;

-               }

 
 

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

                        continue;
                        continue;

-               }

 
 

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

                        continue;
                        continue;

-               }

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


@@ -3469,8 +3610,8 @@ void
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;

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

        long c;
        Status status;
        Shortcut *bp;
        long c;
        Status status;
        Shortcut *bp;


@@ -3478,8 +3619,7 @@ kpress(XEvent *ev) {
        if(IS_SET(MODE_KBDLOCK))
                return;
 
        if(IS_SET(MODE_KBDLOCK))
                return;
 

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

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


@@ -3490,33 +3630,26 @@ kpress(XEvent *ev) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {

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

 
 

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

                        }
                        }

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

                }
                }

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

        }
        }

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

 }
 
 
 }
 
 


@@ -3584,16 +3717,15 @@ run(void) {
                }
        }
 
                }
        }
 

-       if(!xw.isfixed)
-               cresize(w, h);
-       else
-               cresize(xw.fw, xw.fh);

        ttynew();
        ttynew();

+       cresize(w, h);

 
 

-       gettimeofday(&lastblink, NULL);

        gettimeofday(&last, NULL);
        gettimeofday(&last, NULL);

+       lastblink = last;

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

+               long deltatime;
+

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


@@ -3601,7 +3733,7 @@ run(void) {
                if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
                        if(errno == EINTR)
                                continue;
                if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) {
                        if(errno == EINTR)
                                continue;

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

                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();


@@ -3624,11 +3756,12 @@ run(void) {
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;

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

                        dodraw = 1;
                }
                        dodraw = 1;
                }

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

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


@@ -3668,18 +3801,17 @@ run(void) {
 
 void
 usage(void) {
 
 void
 usage(void) {

-       die("%s " VERSION " (c) 2010-2013 st engineers\n" \
+       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);
 }
 
 int
 main(int argc, char *argv[]) {
        "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]" \
        " [-t title] [-w windowid] [-e command ...]\n", argv0);
 }
 
 int
 main(int argc, char *argv[]) {

-       int bitm, xr, yr;
-       uint wr, hr;

        char *titles;
        char *titles;

+       uint cols = 80, rows = 24;

 
 

-       xw.fw = xw.fh = xw.fx = xw.fy = 0;
+       xw.l = xw.t = 0;

        xw.isfixed = False;
 
        ARGBEGIN {
        xw.isfixed = False;
 
        ARGBEGIN {


@@ -3694,7 +3826,7 @@ main(int argc, char *argv[]) {
                if(argc > 1) {
                        opt_cmd = &argv[1];
                        if(argv[1] != NULL && opt_title == NULL) {
                if(argc > 1) {
                        opt_cmd = &argv[1];
                        if(argv[1] != NULL && opt_title == NULL) {

-                               titles = strdup(argv[1]);
+                               titles = xstrdup(argv[1]);

                                opt_title = basename(titles);
                        }
                }
                                opt_title = basename(titles);
                        }
                }


@@ -3703,22 +3835,11 @@ main(int argc, char *argv[]) {
                opt_font = EARGF(usage());
                break;
        case 'g':
                opt_font = EARGF(usage());
                break;
        case 'g':

-               bitm = XParseGeometry(EARGF(usage()), &xr, &yr, &wr, &hr);
-               if(bitm & XValue)
-                       xw.fx = xr;
-               if(bitm & YValue)
-                       xw.fy = yr;
-               if(bitm & WidthValue)
-                       xw.fw = (int)wr;
-               if(bitm & HeightValue)
-                       xw.fh = (int)hr;
-               if(bitm & XNegative && xw.fx == 0)
-                       xw.fx = -1;
-               if(bitm & XNegative && xw.fy == 0)
-                       xw.fy = -1;
-
-               if(xw.fh != 0 && xw.fw != 0)
-                       xw.isfixed = True;
+               xw.gm = XParseGeometry(EARGF(usage()),
+                               &xw.l, &xw.t, &cols, &rows);
+               break;
+       case 'i':
+               xw.isfixed = True;

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


@@ -3737,7 +3858,7 @@ main(int argc, char *argv[]) {
 run:
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");
 run:
        setlocale(LC_CTYPE, "");
        XSetLocaleModifiers("");

-       tnew(80, 24);
+       tnew(cols? cols : 1, rows? rows : 1);

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