Applying the patch of the little girl <[email protected]> to make cjk input

[st.git] / st.c

diff --git a/st.c b/st.c
index 2767d54..c4ff67c 100644 (file)
--- a/st.c
+++ b/st.c
@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <locale.h>

+#include <pwd.h>

 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>


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

+#include <fontconfig/fontconfig.h>

 #define Glyph Glyph_
 #define Font Font_
 
 #define Glyph Glyph_
 #define Font Font_
 


@@ -39,8 +41,8 @@
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \
 
 #define USAGE \
        "st " VERSION " (c) 2010-2012 st engineers\n" \

-       "usage: st [-t title] [-c class] [-g geometry]" \
-       " [-w windowid] [-v] [-f file] [-e command...]\n"
+       "usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \
+       " [-t title] [-w windowid] [-e command ...]\n"

 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4


@@ -58,6 +60,8 @@
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 

+/* macros */
+#define CLEANMASK(mask) (mask & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))

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


@@ -71,6 +75,8 @@
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 
 #define X2COL(x) (((x) - BORDER)/xw.cw)
 #define Y2ROW(y) (((y) - BORDER)/xw.ch)
 

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

 enum glyph_attribute {
        ATTR_NULL      = 0,
        ATTR_REVERSE   = 1,
 enum glyph_attribute {
        ATTR_NULL      = 0,
        ATTR_REVERSE   = 1,


@@ -120,6 +126,7 @@ enum escape_state {
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */
        ESC_STR = 4, /* DSC, OSC, PM, APC */
        ESC_ALTCHARSET = 8,
        ESC_STR_END    = 16, /* a final string was encountered */

+       ESC_TEST       = 32, /* Enter in test mode */

 };
 
 enum window_state {
 };
 
 enum window_state {


@@ -179,9 +186,9 @@ typedef struct {
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */
 typedef struct {
        int row;        /* nb row */
        int col;        /* nb col */

-       Line* line;     /* screen */
-       Line* alt;      /* alternate screen */
-       bool* dirty;    /* dirtyness of lines */
+       Line *line;     /* screen */
+       Line *alt;      /* alternate screen */
+       bool *dirty;    /* dirtyness of lines */

        TCursor c;      /* cursor */
        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */
        TCursor c;      /* cursor */
        int top;        /* top    scroll limit */
        int bot;        /* bottom scroll limit */


@@ -196,7 +203,7 @@ typedef struct {
        Colormap cmap;
        Window win;
        XdbeBackBuffer buf;
        Colormap cmap;
        Window win;
        XdbeBackBuffer buf;

-       Atom xembed;
+       Atom xembed, wmdeletewin;

        XIM xim;
        XIC xic;
        XftDraw *xft_draw;
        XIM xim;
        XIC xic;
        XftDraw *xft_draw;


@@ -223,7 +230,9 @@ typedef struct {
        int mode;
        int bx, by;
        int ex, ey;
        int mode;
        int bx, by;
        int ex, ey;

-       struct {int x, y;} b, e;
+       struct {
+               int x, y;
+       } b, e;

        char *clip;
        Atom xtarget;
        bool alt;
        char *clip;
        Atom xtarget;
        bool alt;


@@ -231,27 +240,45 @@ typedef struct {
        struct timeval tclick2;
 } Selection;
 
        struct timeval tclick2;
 } Selection;
 

+typedef union {
+       int i;
+       unsigned int ui;
+       float f;
+       const void *v;
+} Arg;
+
+typedef struct {
+       unsigned int mod;
+       KeySym keysym;
+       void (*func)(const Arg *);
+       const Arg arg;
+} Shortcut;
+
+/* function definitions used in config.h */
+static void xzoom(const Arg *);
+
+/* Config.h for applying patches and the configuration. */

 #include "config.h"
 
 /* Font structure */
 typedef struct {
 #include "config.h"
 
 /* Font structure */
 typedef struct {

+       int height;
+       int width;

        int ascent;
        int descent;
        short lbearing;
        short rbearing;
        int ascent;
        int descent;
        short lbearing;
        short rbearing;

-       XFontSet set;
-       XftFont* xft_set;
+       XftFont *xft_set;

 } Font;
 
 /* Drawing Context */
 typedef struct {
 } Font;
 
 /* Drawing Context */
 typedef struct {

-       ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)];

        XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        GC gc;
        Font font, bfont, ifont, ibfont;
 } DC;
 
        XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
        GC gc;
        Font font, bfont, ifont, ibfont;
 } DC;
 

-static void die(const char*, ...);
+static void die(const char *, ...);

 static void draw(void);
 static void redraw(void);
 static void drawregion(int, int, int, int);
 static void draw(void);
 static void redraw(void);
 static void drawregion(int, int, int, int);


@@ -278,13 +305,13 @@ static void tmoveto(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(bool);

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

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

-static void tsetchar(char*);
+static void tsetchar(char *, Glyph *, int, int);

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


@@ -305,14 +332,16 @@ static void xloadcols(void);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);
 static void xresettitle(void);
 static void xseturgency(int);
 static void xsetsel(char*);

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

 static void xresize(int, int);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
 static void xresize(int, int);
 
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);

-static char* kmap(KeySym, uint);
+static char *kmap(KeySym, uint);

 static void kpress(XEvent *);
 static void cmessage(XEvent *);
 static void kpress(XEvent *);
 static void cmessage(XEvent *);

+static void cresize(int width, int height);

 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);
 static void resize(XEvent *);
 static void focus(XEvent *);
 static void brelease(XEvent *);


@@ -333,6 +362,7 @@ static int utf8encode(long *, char *);
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 
 static int utf8size(char *);
 static int isfullutf8(char *, int);
 

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

 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);
 static void *xmalloc(size_t);
 static void *xrealloc(void *, size_t);
 static void *xcalloc(size_t nmemb, size_t size);


@@ -364,17 +394,37 @@ static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;
 static pid_t pid;
 static Selection sel;
 static int iofd = -1;

-static char **opt_cmd  = NULL;
-static char *opt_io    = NULL;
+static char **opt_cmd = NULL;
+static char *opt_io = NULL;

 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_title = NULL;
 static char *opt_embed = NULL;
 static char *opt_class = NULL;

+static char *opt_font = NULL;
+
+static char *usedfont = NULL;
+static int usedfontsize = 0;
+
+ssize_t
+xwrite(int fd, char *s, size_t len) {
+       size_t aux = len;
+
+       while(len > 0) {
+               ssize_t r = write(fd, s, len);
+               if(r < 0)
+                       return r;
+               len -= r;
+               s += r;
+       }
+       return aux;
+}

 
 void *
 xmalloc(size_t len) {
        void *p = malloc(len);
 
 void *
 xmalloc(size_t len) {
        void *p = malloc(len);

+

        if(!p)
                die("Out of memory\n");
        if(!p)
                die("Out of memory\n");

+

        return p;
 }
 
        return p;
 }
 


@@ -382,14 +432,17 @@ void *
 xrealloc(void *p, size_t len) {
        if((p = realloc(p, len)) == NULL)
                die("Out of memory\n");
 xrealloc(void *p, size_t len) {
        if((p = realloc(p, len)) == NULL)
                die("Out of memory\n");

+

        return p;
 }
 
 void *
 xcalloc(size_t nmemb, size_t size) {
        void *p = calloc(nmemb, size);
        return p;
 }
 
 void *
 xcalloc(size_t nmemb, size_t size) {
        void *p = calloc(nmemb, size);

+

        if(!p)
                die("Out of memory\n");
        if(!p)
                die("Out of memory\n");

+

        return p;
 }
 
        return p;
 }
 


@@ -412,8 +465,10 @@ utf8decode(char *s, long *u) {
        } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
                *u = c & (B2|B1|B0);
                n = 3;
        } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
                *u = c & (B2|B1|B0);
                n = 3;

-       } else
+       } else {

                goto invalid;
                goto invalid;

+       }
+

        for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
                c = *s;
                if((c & (B7|B6)) != B7) /* 10xxxxxx */
        for(i = n, ++s; i > 0; --i, ++rtn, ++s) {
                c = *s;
                if((c & (B7|B6)) != B7) /* 10xxxxxx */


@@ -421,14 +476,18 @@ utf8decode(char *s, long *u) {
                *u <<= 6;
                *u |= c & (B5|B4|B3|B2|B1|B0);
        }
                *u <<= 6;
                *u |= c & (B5|B4|B3|B2|B1|B0);
        }

+

        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
           (n == 3 && *u < 0x10000) ||
        if((n == 1 && *u < 0x80) ||
           (n == 2 && *u < 0x800) ||
           (n == 3 && *u < 0x10000) ||

-          (*u >= 0xD800 && *u <= 0xDFFF))
+          (*u >= 0xD800 && *u <= 0xDFFF)) {

                goto invalid;
                goto invalid;

+       }
+

        return rtn;
 invalid:
        *u = 0xFFFD;
        return rtn;
 invalid:
        *u = 0xFFFD;

+

        return rtn;
 }
 
        return rtn;
 }
 


@@ -438,7 +497,7 @@ utf8encode(long *u, char *s) {
        ulong uc;
        int i, n;
 
        ulong uc;
        int i, n;
 

-       sp = (uchar*) s;
+       sp = (uchar *)s;

        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */
        uc = *u;
        if(uc < 0x80) {
                *sp = uc; /* 0xxxxxxx */


@@ -455,14 +514,17 @@ utf8encode(long *u, char *s) {
        } else {
                goto invalid;
        }
        } else {
                goto invalid;
        }

+

        for(i=n,++sp; i>0; --i,++sp)
                *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
        for(i=n,++sp; i>0; --i,++sp)
                *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */

+

        return n+1;
 invalid:
        /* U+FFFD */
        *s++ = '\xEF';
        *s++ = '\xBF';
        *s = '\xBD';
        return n+1;
 invalid:
        /* U+FFFD */
        *s++ = '\xEF';
        *s++ = '\xBF';
        *s = '\xBD';

+

        return 3;
 }
 
        return 3;
 }
 


@@ -472,38 +534,40 @@ int
 isfullutf8(char *s, int b) {
        uchar *c1, *c2, *c3;
 
 isfullutf8(char *s, int b) {
        uchar *c1, *c2, *c3;
 

-       c1 = (uchar *) s;
-       c2 = (uchar *) ++s;
-       c3 = (uchar *) ++s;
-       if(b < 1)
+       c1 = (uchar *)s;
+       c2 = (uchar *)++s;
+       c3 = (uchar *)++s;
+       if(b < 1) {

                return 0;
                return 0;

-       else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+       } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) {

                return 0;
                return 0;

-       else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+       } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&

            ((b == 1) ||
            ((b == 1) ||

-           ((b == 2) && (*c2&(B7|B6)) == B7)))
+           ((b == 2) && (*c2&(B7|B6)) == B7))) {

                return 0;
                return 0;

-       else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+       } else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&

            ((b == 1) ||
            ((b == 2) && (*c2&(B7|B6)) == B7) ||
            ((b == 1) ||
            ((b == 2) && (*c2&(B7|B6)) == B7) ||

-           ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))
+           ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) {

                return 0;
                return 0;

-       else
+       } else {

                return 1;
                return 1;

+       }

 }
 
 int
 utf8size(char *s) {
        uchar c = *s;
 
 }
 
 int
 utf8size(char *s) {
        uchar c = *s;
 

-       if(~c&B7)
+       if(~c&B7) {

                return 1;
                return 1;

-       else if((c&(B7|B6|B5)) == (B7|B6))
+       } else if((c&(B7|B6|B5)) == (B7|B6)) {

                return 2;
                return 2;

-       else if((c&(B7|B6|B5|B4)) == (B7|B6|B5))
+       } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) {

                return 3;
                return 3;

-       else
+       } else {

                return 4;
                return 4;

+       }

 }
 
 void
 }
 
 void


@@ -520,13 +584,18 @@ selinit(void) {
 
 static inline bool
 selected(int x, int y) {
 
 static inline bool
 selected(int x, int y) {

+       int bx, ex;
+

        if(sel.ey == y && sel.by == y) {
        if(sel.ey == y && sel.by == y) {

-               int bx = MIN(sel.bx, sel.ex);
-               int ex = MAX(sel.bx, sel.ex);
+               bx = MIN(sel.bx, sel.ex);
+               ex = MAX(sel.bx, sel.ex);

                return BETWEEN(x, bx, ex);
        }
                return BETWEEN(x, bx, ex);
        }

-       return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x))
-               || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
+
+       return ((sel.b.y < y && y < sel.e.y)
+                       || (y == sel.e.y && x <= sel.e.x))
+                       || (y == sel.b.y && x >= sel.b.x
+                               && (x <= sel.e.x || sel.b.y != sel.e.y));

 }
 
 void
 }
 
 void


@@ -578,9 +647,9 @@ mousereport(XEvent *e) {
 
 void
 bpress(XEvent *e) {
 
 void
 bpress(XEvent *e) {

-       if(IS_SET(MODE_MOUSE))
+       if(IS_SET(MODE_MOUSE)) {

                mousereport(e);
                mousereport(e);

-       else if(e->xbutton.button == Button1) {
+       } else if(e->xbutton.button == Button1) {

                if(sel.bx != -1) {
                        sel.bx = -1;
                        tsetdirt(sel.b.y, sel.e.y);
                if(sel.bx != -1) {
                        sel.bx = -1;
                        tsetdirt(sel.b.y, sel.e.y);


@@ -594,25 +663,28 @@ bpress(XEvent *e) {
 
 void
 selcopy(void) {
 
 void
 selcopy(void) {

-       char *str, *ptr;
-       int x, y, bufsize, is_selected = 0;
+       char *str, *ptr, *p;
+       int x, y, bufsize, is_selected = 0, size;
+       Glyph *gp, *last;

 
 

-       if(sel.bx == -1)
+       if(sel.bx == -1) {

                str = NULL;
                str = NULL;

-
-       else {
+       } else {

                bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
                ptr = str = xmalloc(bufsize);
 
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {
                bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ;
                ptr = str = xmalloc(bufsize);
 
                /* append every set & selected glyph to the selection */
                for(y = 0; y < term.row; y++) {

-                       for(x = 0; x < term.col; x++) {
-                               int size;
-                               char *p;
-                               Glyph *gp = &term.line[y][x];
+                       gp = &term.line[y][0];
+                       last = gp + term.col;
+
+                       while(--last >= gp && !(last->state & GLYPH_SET))
+                               /* nothing */;

 
 

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

                                if(!(is_selected = selected(x, y)))
                                        continue;
                                if(!(is_selected = selected(x, y)))
                                        continue;

+

                                p = (gp->state & GLYPH_SET) ? gp->c : " ";
                                size = utf8size(p);
                                memcpy(ptr, p, size);
                                p = (gp->state & GLYPH_SET) ? gp->c : " ";
                                size = utf8size(p);
                                memcpy(ptr, p, size);


@@ -651,8 +723,9 @@ selnotify(XEvent *e) {
 }
 
 void
 }
 
 void

-selpaste() {
-       XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime);
+selpaste(void) {
+       XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY,
+                       xw.win, CurrentTime);

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


@@ -666,7 +739,7 @@ void
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
 selrequest(XEvent *e) {
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;

-       Atom xa_targets;
+       Atom xa_targets, string;

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


@@ -680,7 +753,7 @@ selrequest(XEvent *e) {
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
        if(xsre->target == xa_targets) {
                /* respond with the supported type */
        xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);
        if(xsre->target == xa_targets) {
                /* respond with the supported type */

-               Atom string = sel.xtarget;
+               string = sel.xtarget;

                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (uchar *) &string, 1);


@@ -713,18 +786,20 @@ xsetsel(char *str) {
 
 void
 brelease(XEvent *e) {
 
 void
 brelease(XEvent *e) {

+       struct timeval now;
+

        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }
        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }

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

                selpaste();
                selpaste();

-       else if(e->xbutton.button == Button1) {
+       } else if(e->xbutton.button == Button1) {

                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
                term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
                term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {

-                       struct timeval now;

                        sel.bx = -1;
                        gettimeofday(&now, NULL);
 
                        sel.bx = -1;
                        gettimeofday(&now, NULL);
 


@@ -738,34 +813,44 @@ brelease(XEvent *e) {
                                /* double click to select word */
                                sel.bx = sel.ex;
                                while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&
                                /* double click to select word */
                                sel.bx = sel.ex;
                                while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET &&

-                                         term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--;
+                                               term.line[sel.ey][sel.bx-1].c[0] != ' ') {
+                                       sel.bx--;
+                               }

                                sel.b.x = sel.bx;
                                while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&
                                sel.b.x = sel.bx;
                                while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET &&

-                                         term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++;
+                                               term.line[sel.ey][sel.ex+1].c[0] != ' ') {
+                                       sel.ex++;
+                               }

                                sel.e.x = sel.ex;
                                sel.b.y = sel.e.y = sel.ey;
                                selcopy();
                        }
                                sel.e.x = sel.ex;
                                sel.b.y = sel.e.y = sel.ey;
                                selcopy();
                        }

-               } else
+               } else {

                        selcopy();
                        selcopy();

+               }

        }
        }

+

        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
        gettimeofday(&sel.tclick1, NULL);
 }
 
 void
 bmotion(XEvent *e) {
        memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
        gettimeofday(&sel.tclick1, NULL);
 }
 
 void
 bmotion(XEvent *e) {

+       int starty, endy, oldey, oldex;
+

        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }
        if(IS_SET(MODE_MOUSE)) {
                mousereport(e);
                return;
        }

+

        if(sel.mode) {
        if(sel.mode) {

-               int oldey = sel.ey, oldex = sel.ex;
+               oldey = sel.ey;
+               oldex = sel.ex;

                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
                if(oldey != sel.ey || oldex != sel.ex) {
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
 
                if(oldey != sel.ey || oldex != sel.ex) {

-                       int starty = MIN(oldey, sel.ey);
-                       int endy = MAX(oldey, sel.ey);
+                       starty = MIN(oldey, sel.ey);
+                       endy = MAX(oldey, sel.ey);

                        tsetdirt(starty, endy);
                }
        }
                        tsetdirt(starty, endy);
                }
        }


@@ -785,11 +870,23 @@ void
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");
 execsh(void) {
        char **args;
        char *envshell = getenv("SHELL");

+       const struct passwd *pass = getpwuid(getuid());
+       char buf[sizeof(long) * 8 + 1];

 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 
 
        unsetenv("COLUMNS");
        unsetenv("LINES");
        unsetenv("TERMCAP");
 

+       if(pass) {
+               setenv("LOGNAME", pass->pw_name, 1);
+               setenv("USER", pass->pw_name, 1);
+               setenv("SHELL", pass->pw_shell, 0);
+               setenv("HOME", pass->pw_dir, 0);
+       }
+
+       snprintf(buf, sizeof(buf), "%lu", xw.win);
+       setenv("WINDOWID", buf, 1);
+

        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
        signal(SIGINT, SIG_DFL);


@@ -799,7 +896,7 @@ execsh(void) {
 
        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);
 
        DEFAULT(envshell, SHELL);
        putenv("TERM="TNAME);

-       args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL};
+       args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL};

        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }
        execvp(args[0], args);
        exit(EXIT_FAILURE);
 }


@@ -807,20 +904,23 @@ execsh(void) {
 void
 sigchld(int a) {
        int stat = 0;
 void
 sigchld(int a) {
        int stat = 0;

+

        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);
        if(waitpid(pid, &stat, 0) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, SERRNO);

-       if(WIFEXITED(stat))
+
+       if(WIFEXITED(stat)) {

                exit(WEXITSTATUS(stat));
                exit(WEXITSTATUS(stat));

-       else
+       } else {

                exit(EXIT_FAILURE);
                exit(EXIT_FAILURE);

+       }

 }
 
 void
 ttynew(void) {
        int m, s;
 }
 
 void
 ttynew(void) {
        int m, s;

+       struct winsize w = {term.row, term.col, 0, 0};

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

-       struct winsize w = {term.row, term.col, 0, 0};

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


@@ -844,13 +944,12 @@ ttynew(void) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {
                cmdfd = m;
                signal(SIGCHLD, sigchld);
                if(opt_io) {

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

                        }
                }
        }
                        }
                }
        }


@@ -859,6 +958,7 @@ ttynew(void) {
 void
 dump(char c) {
        static int col;
 void
 dump(char c) {
        static int col;

+

        fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
        if(++col % 10 == 0)
                fprintf(stderr, "\n");
        fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.');
        if(++col % 10 == 0)
                fprintf(stderr, "\n");


@@ -885,7 +985,7 @@ ttyread(void) {
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
                tputc(s, charsize);
                charsize = utf8decode(ptr, &utf8c);
                utf8encode(&utf8c, s);
                tputc(s, charsize);

-               ptr    += charsize;
+               ptr += charsize;

                buflen -= charsize;
        }
 
                buflen -= charsize;
        }
 


@@ -912,8 +1012,7 @@ ttyresize(void) {
 }
 
 void
 }
 
 void

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

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


@@ -924,8 +1023,7 @@ tsetdirt(int top, int bot)
 }
 
 void
 }
 
 void

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

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


@@ -933,15 +1031,18 @@ void
 tcursor(int mode) {
        static TCursor c;
 
 tcursor(int mode) {
        static TCursor c;
 

-       if(mode == CURSOR_SAVE)
+       if(mode == CURSOR_SAVE) {

                c = term.c;
                c = term.c;

-       else if(mode == CURSOR_LOAD)
-               term.c = c, tmoveto(c.x, c.y);
+       } else if(mode == CURSOR_LOAD) {
+               term.c = c;
+               tmoveto(c.x, c.y);
+       }

 }
 
 void
 treset(void) {
        uint i;
 }
 
 void
 treset(void) {
        uint i;

+

        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,
        term.c = (TCursor){{
                .mode = ATTR_NULL,
                .fg = DefaultFG,


@@ -951,7 +1052,8 @@ treset(void) {
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        for(i = TAB; i < term.col; i += TAB)
                term.tabs[i] = 1;
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        for(i = TAB; i < term.col; i += TAB)
                term.tabs[i] = 1;

-       term.top = 0, term.bot = term.row - 1;
+       term.top = 0;
+       term.bot = term.row - 1;

        term.mode = MODE_WRAP;
 
        tclearregion(0, 0, term.col-1, term.row-1);
        term.mode = MODE_WRAP;
 
        tclearregion(0, 0, term.col-1, term.row-1);


@@ -960,7 +1062,8 @@ treset(void) {
 void
 tnew(int col, int row) {
        /* set screen size */
 void
 tnew(int col, int row) {
        /* set screen size */

-       term.row = row, term.col = col;
+       term.row = row;
+       term.col = col;

        term.line = xmalloc(term.row * sizeof(Line));
        term.alt  = xmalloc(term.row * sizeof(Line));
        term.dirty = xmalloc(term.row * sizeof(*term.dirty));
        term.line = xmalloc(term.row * sizeof(Line));
        term.alt  = xmalloc(term.row * sizeof(Line));
        term.dirty = xmalloc(term.row * sizeof(*term.dirty));


@@ -978,7 +1081,8 @@ tnew(int col, int row) {
 
 void
 tswapscreen(void) {
 
 void
 tswapscreen(void) {

-       Line* tmp = term.line;
+       Line *tmp = term.line;
+

        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;


@@ -1052,10 +1156,12 @@ selscroll(int orig, int n) {
 void
 tnewline(int first_col) {
        int y = term.c.y;
 void
 tnewline(int first_col) {
        int y = term.c.y;

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

                tscrollup(term.top, 1);
                tscrollup(term.top, 1);

-       else
+       } else {

                y++;
                y++;

+       }

        tmoveto(first_col ? 0 : term.c.x, y);
 }
 
        tmoveto(first_col ? 0 : term.c.x, y);
 }
 


@@ -1073,11 +1179,12 @@ csiparse(void) {
                        csiescseq.arg[csiescseq.narg] *= 10;
                        csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
                }
                        csiescseq.arg[csiescseq.narg] *= 10;
                        csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
                }

-               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ)
+               if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) {

                        csiescseq.narg++, p++;
                        csiescseq.narg++, p++;

-               else {
+               } else {

                        csiescseq.mode = *p;
                        csiescseq.narg++;
                        csiescseq.mode = *p;
                        csiescseq.narg++;

+

                        return;
                }
        }
                        return;
                }
        }


@@ -1093,32 +1200,32 @@ tmoveto(int x, int y) {
 }
 
 void
 }
 
 void

-tsetchar(char *c) {
+tsetchar(char *c, Glyph *attr, int x, int y) {
+       static char *vt100_0[62] = { /* 0x41 - 0x7e */
+               "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+               0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+               0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+               0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+               "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+               "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+               "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+               "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+       };
+

        /*
         * The table is proudly stolen from rxvt.
         */
        /*
         * The table is proudly stolen from rxvt.
         */

-       if(term.c.attr.mode & ATTR_GFX) {
-               char *vt100_0[62] = { /* 0x41 - 0x7e */
-                       "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
-                       0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
-                       0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
-                       0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
-                       "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
-                       "␤", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
-                       "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
-                       "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
-               };
-
+       if(attr->mode & ATTR_GFX) {

                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 
                if(c[0] >= 0x41 && c[0] <= 0x7e
                                && vt100_0[c[0] - 0x41]) {
                        c = vt100_0[c[0] - 0x41];
                }
        }
 

-       term.dirty[term.c.y] = 1;
-       term.line[term.c.y][term.c.x] = term.c.attr;
-       memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
-       term.line[term.c.y][term.c.x].state |= GLYPH_SET;
+       term.dirty[y] = 1;
+       term.line[y][x] = *attr;
+       memcpy(term.line[y][x].c, c, UTF_SIZ);
+       term.line[y][x].state |= GLYPH_SET;

 }
 
 void
 }
 
 void


@@ -1154,7 +1261,9 @@ tdeletechar(int n) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }

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

        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 
        tclearregion(term.col-n, term.c.y, term.col-1, term.c.y);
 }
 


@@ -1170,7 +1279,9 @@ tinsertblank(int n) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        }

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

        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 
        tclearregion(src, term.c.y, dst - 1, term.c.y);
 }
 


@@ -1236,13 +1347,18 @@ tsetattr(int *attr, int l) {
                case 38:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
                case 38:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;

-                               if(BETWEEN(attr[i], 0, 255))
+                               if(BETWEEN(attr[i], 0, 255)) {

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

-                               else
-                                       fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
+                               } else {
+                                       fprintf(stderr,
+                                               "erresc: bad fgcolor %d\n",
+                                               attr[i]);
+                               }
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(38): gfx attr %d unknown\n",
+                                       attr[i]);

                        }
                        }

-                       else
-                               fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]);

                        break;
                case 39:
                        term.c.attr.fg = DefaultFG;
                        break;
                case 39:
                        term.c.attr.fg = DefaultFG;


@@ -1250,28 +1366,36 @@ tsetattr(int *attr, int l) {
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;
                case 48:
                        if(i + 2 < l && attr[i + 1] == 5) {
                                i += 2;

-                               if(BETWEEN(attr[i], 0, 255))
+                               if(BETWEEN(attr[i], 0, 255)) {

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

-                               else
-                                       fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
+                               } else {
+                                       fprintf(stderr,
+                                               "erresc: bad bgcolor %d\n",
+                                               attr[i]);
+                               }
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(48): gfx attr %d unknown\n",
+                                       attr[i]);

                        }
                        }

-                       else
-                               fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]);

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

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

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

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

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

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

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

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

                                term.c.attr.bg = attr[i] - 100 + 8;
                                term.c.attr.bg = attr[i] - 100 + 8;

-                       else
-                               fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump();
+                       } else {
+                               fprintf(stderr,
+                                       "erresc(default): gfx attr %d unknown\n",
+                                       attr[i]), csidump();
+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -1305,9 +1429,9 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;
                        case 1: /* DECCKM -- Cursor key */
                                MODBIT(term.mode, set, MODE_APPKEYPAD);
                                break;

-                       case 5: /* DECSCNM -- Reverve video */
+                       case 5: /* DECSCNM -- Reverse video */

                                mode = term.mode;
                                mode = term.mode;

-                               MODBIT(term.mode,set, MODE_REVERSE);
+                               MODBIT(term.mode, set, MODE_REVERSE);

                                if(mode != term.mode)
                                        redraw();
                                break;
                                if(mode != term.mode)
                                        redraw();
                                break;


@@ -1336,8 +1460,8 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                if((set && !IS_SET(MODE_ALTSCREEN)) ||
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                if((set && !IS_SET(MODE_ALTSCREEN)) ||

-                                   (!set && IS_SET(MODE_ALTSCREEN))) {
-                                           tswapscreen();
+                                               (!set && IS_SET(MODE_ALTSCREEN))) {
+                                       tswapscreen();

                                }
                                if(*args != 1049)
                                        break;
                                }
                                if(*args != 1049)
                                        break;


@@ -1406,6 +1530,10 @@ 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 'c': /* DA -- Device Attributes */
+               if(csiescseq.arg[0] == 0)
+                       ttywrite(VT102ID, sizeof(VT102ID) - 1);
+               break;

        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
                DEFAULT(csiescseq.arg[0], 1);
        case 'C': /* CUF -- Cursor <n> Forward */
        case 'a':
                DEFAULT(csiescseq.arg[0], 1);


@@ -1527,9 +1655,9 @@ csihandle(void) {
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */
                tsetattr(csiescseq.arg, csiescseq.narg);
                break;
        case 'r': /* DECSTBM -- Set Scrolling Region */

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

                        goto unknown;
                        goto unknown;

-               else {
+               } else {

                        DEFAULT(csiescseq.arg[0], 1);
                        DEFAULT(csiescseq.arg[1], term.row);
                        tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);
                        DEFAULT(csiescseq.arg[0], 1);
                        DEFAULT(csiescseq.arg[1], term.row);
                        tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1);


@@ -1548,14 +1676,22 @@ csihandle(void) {
 void
 csidump(void) {
        int i;
 void
 csidump(void) {
        int i;

+       uint c;
+

        printf("ESC[");
        for(i = 0; i < csiescseq.len; i++) {
        printf("ESC[");
        for(i = 0; i < csiescseq.len; i++) {

-               uint c = csiescseq.buf[i] & 0xff;
-               if(isprint(c)) putchar(c);
-               else if(c == '\n') printf("(\\n)");
-               else if(c == '\r') printf("(\\r)");
-               else if(c == 0x1b) printf("(\\e)");
-               else printf("(%02x)", c);
+               c = csiescseq.buf[i] & 0xff;
+               if(isprint(c)) {
+                       putchar(c);
+               } else if(c == '\n') {
+                       printf("(\\n)");
+               } else if(c == '\r') {
+                       printf("(\\r)");
+               } else if(c == 0x1b) {
+                       printf("(\\e)");
+               } else {
+                       printf("(%02x)", c);
+               }

        }
        putchar('\n');
 }
        }
        putchar('\n');
 }


@@ -1626,14 +1762,22 @@ strparse(void) {
 void
 strdump(void) {
        int i;
 void
 strdump(void) {
        int i;

+       uint c;
+

        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {
        printf("ESC%c", strescseq.type);
        for(i = 0; i < strescseq.len; i++) {

-               uint c = strescseq.buf[i] & 0xff;
-               if(isprint(c)) putchar(c);
-               else if(c == '\n') printf("(\\n)");
-               else if(c == '\r') printf("(\\r)");
-               else if(c == 0x1b) printf("(\\e)");
-               else printf("(%02x)", c);
+               c = strescseq.buf[i] & 0xff;
+               if(isprint(c)) {
+                       putchar(c);
+               } else if(c == '\n') {
+                       printf("(\\n)");
+               } else if(c == '\r') {
+                       printf("(\\r)");
+               } else if(c == 0x1b) {
+                       printf("(\\e)");
+               } else {
+                       printf("(%02x)", c);
+               }

        }
        printf("ESC\\\n");
 }
        }
        printf("ESC\\\n");
 }


@@ -1664,59 +1808,93 @@ tputtab(bool forward) {
 void
 tputc(char *c, int len) {
        uchar ascii = *c;
 void
 tputc(char *c, int len) {
        uchar ascii = *c;

-
-       if(iofd != -1)
-               write(iofd, c, len);
-
-       switch(ascii) {
-       case '\t':
-               tputtab(1);
-               return;
-       case '\b':
-               tmoveto(term.c.x-1, term.c.y);
-               return;
-       case '\r':
-               tmoveto(0, term.c.y);
-               return;
-       case '\f':
-       case '\v':
-       case '\n':
-               /* go to first col if the mode is set */
-               tnewline(IS_SET(MODE_CRLF));
-               return;
-       case '\a':
-               if(!(xw.state & WIN_FOCUSED))
-                       xseturgency(1);
-               return;
-       case '\033':
-               csireset();
-               term.esc = ESC_START;
+       bool control = ascii < '\x20' || ascii == 0177;
+
+       if(iofd != -1) {
+               if (xwrite(iofd, c, len) < 0) {
+                       fprintf(stderr, "Error writting in %s:%s\n",
+                               opt_io, strerror(errno));
+                       close(iofd);
+                       iofd = -1;
+               }
+       }
+       /*
+        * STR sequences must be checked before of anything
+        * because it can use some control codes as part of the sequence
+        */
+       if(term.esc & ESC_STR) {
+               switch(ascii) {
+               case '\033':
+                       term.esc = ESC_START | ESC_STR_END;
+                       break;
+               case '\a': /* backwards compatibility to xterm */
+                       term.esc = 0;
+                       strhandle();
+                       break;
+               default:
+                       strescseq.buf[strescseq.len++] = ascii;
+                       if(strescseq.len+1 >= STR_BUF_SIZ) {
+                               term.esc = 0;
+                               strhandle();
+                       }
+               }

                return;
        }
                return;
        }

-
-       if(term.esc & ESC_START) {
+       /*
+        * Actions of control codes must be performed as soon they arrive
+        * because they can be embedded inside a control sequence, and
+        * they must not cause conflicts with sequences.
+        */
+       if(control) {
+               switch(ascii) {
+               case '\t':      /* HT */
+                       tputtab(1);
+                       return;
+               case '\b':      /* BS */
+                       tmoveto(term.c.x-1, term.c.y);
+                       return;
+               case '\r':      /* CR */
+                       tmoveto(0, term.c.y);
+                       return;
+               case '\f':      /* LF */
+               case '\v':      /* VT */
+               case '\n':      /* LF */
+                       /* go to first col if the mode is set */
+                       tnewline(IS_SET(MODE_CRLF));
+                       return;
+               case '\a':      /* BEL */
+                       if(!(xw.state & WIN_FOCUSED))
+                               xseturgency(1);
+                       return;
+               case '\033':    /* ESC */
+                       csireset();
+                       term.esc = ESC_START;
+                       return;
+               case '\016':    /* SO */
+                       term.c.attr.mode |= ATTR_GFX;
+                       return;
+               case '\017':    /* SI */
+                       term.c.attr.mode &= ~ATTR_GFX;
+                       return;
+               case '\032':    /* SUB */
+               case '\030':    /* CAN */
+                       csireset();
+                       return;
+                case '\005':   /* ENQ (IGNORED) */
+                case '\000':   /* NUL (IGNORED) */
+                case '\021':   /* XON (IGNORED) */
+                case '\023':   /* XOFF (IGNORED) */
+                case 0177:     /* DEL (IGNORED) */
+                       return;
+               }
+       } else if(term.esc & ESC_START) {

                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;
                if(term.esc & ESC_CSI) {
                        csiescseq.buf[csiescseq.len++] = ascii;

-                       if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) {
+                       if(BETWEEN(ascii, 0x40, 0x7E)
+                                       || csiescseq.len >= ESC_BUF_SIZ) {

                                term.esc = 0;
                                csiparse(), csihandle();
                        }
                                term.esc = 0;
                                csiparse(), csihandle();
                        }

-               } else if(term.esc & ESC_STR) {
-                       switch(ascii) {
-                       case '\033':
-                               term.esc = ESC_START | ESC_STR_END;
-                               break;
-                       case '\a': /* backwards compatibility to xterm */
-                               term.esc = 0;
-                               strhandle();
-                               break;
-                       default:
-                               strescseq.buf[strescseq.len++] = ascii;
-                               if(strescseq.len+1 >= STR_BUF_SIZ) {
-                                       term.esc = 0;
-                                       strhandle();
-                               }
-                       }

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


@@ -1739,11 +1917,25 @@ tputc(char *c, int len) {
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;
                                fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
                        }
                        term.esc = 0;

+               } else if(term.esc & ESC_TEST) {
+                       if(ascii == '8') { /* DEC screen alignment test. */
+                               char E[UTF_SIZ] = "E";
+                               int x, y;
+
+                               for(x = 0; x < term.col; ++x) {
+                                       for(y = 0; y < term.row; ++y)
+                                               tsetchar(E, &term.c.attr, x, y);
+                               }
+                       }
+                       term.esc = 0;

                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;
                } else {
                        switch(ascii) {
                        case '[':
                                term.esc |= ESC_CSI;
                                break;

+                       case '#':
+                               term.esc |= ESC_TEST;
+                               break;

                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */
                        case 'P': /* DCS -- Device Control String */
                        case '_': /* APC -- Application Program Command */
                        case '^': /* PM -- Privacy Message */


@@ -1762,10 +1954,11 @@ tputc(char *c, int len) {
                                term.esc = 0;
                                break;
                        case 'D': /* IND -- Linefeed */
                                term.esc = 0;
                                break;
                        case 'D': /* IND -- Linefeed */

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

                                        tscrollup(term.top, 1);
                                        tscrollup(term.top, 1);

-                               else
+                               } else {

                                        tmoveto(term.c.x, term.c.y+1);
                                        tmoveto(term.c.x, term.c.y+1);

+                               }

                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */
                                term.esc = 0;
                                break;
                        case 'E': /* NEL -- Next line */


@@ -1777,16 +1970,20 @@ tputc(char *c, int len) {
                                term.esc = 0;
                                break;
                        case 'M': /* RI -- Reverse index */
                                term.esc = 0;
                                break;
                        case 'M': /* RI -- Reverse index */

-                               if(term.c.y == term.top)
+                               if(term.c.y == term.top) {

                                        tscrolldown(term.top, 1);
                                        tscrolldown(term.top, 1);

-                               else
+                               } else {

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

+                               }
+                               term.esc = 0;
+                               break;
+                       case 'Z': /* DECID -- Identify Terminal */
+                               ttywrite(VT102ID, sizeof(VT102ID) - 1);

                                term.esc = 0;
                                break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;
                                term.esc = 0;
                                break;
                        case 'c': /* RIS -- Reset to inital state */
                                treset();
                                term.esc = 0;

-                               xclear(0, 0, xw.w, xw.h);

                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */
                                xresettitle();
                                break;
                        case '=': /* DECPAM -- Application keypad */


@@ -1810,23 +2007,30 @@ tputc(char *c, int len) {
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",

-                                   (uchar) ascii, isprint(ascii)?ascii:'.');
+                                       (uchar) ascii, isprint(ascii)? ascii:'.');

                                term.esc = 0;
                        }
                }
                                term.esc = 0;
                        }
                }

-       } else {
-               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
-                       sel.bx = -1;
-               if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
-                       if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
-                               tnewline(1); /* always go to first col */
-                       tsetchar(c);
-                       if(term.c.x+1 < term.col)
-                               tmoveto(term.c.x+1, term.c.y);
-                       else
-                               term.c.state |= CURSOR_WRAPNEXT;
-               }
+               /*
+                * All characters which forms part of a sequence are not
+                * printed
+                */
+               return;

        }
        }

+       /*
+        * Display control codes only if we are in graphic mode
+        */
+       if(control && !(term.c.attr.mode & ATTR_GFX))
+               return;
+       if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+               sel.bx = -1;
+       if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
+               tnewline(1); /* always go to first col */
+       tsetchar(c, &term.c.attr, term.c.x, term.c.y);
+       if(term.c.x+1 < term.col)
+               tmoveto(term.c.x+1, term.c.y);
+       else
+               term.c.state |= CURSOR_WRAPNEXT;

 }
 
 int
 }
 
 int


@@ -1835,6 +2039,7 @@ tresize(int col, int row) {
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int slide = term.c.y - row + 1;
        int minrow = MIN(row, term.row);
        int mincol = MIN(col, term.col);
        int slide = term.c.y - row + 1;

+       bool *bp;

 
        if(col < 1 || row < 1)
                return 0;
 
        if(col < 1 || row < 1)
                return 0;


@@ -1881,7 +2086,7 @@ tresize(int col, int row) {
                term.alt [i] = xcalloc(col, sizeof(Glyph));
        }
        if(col > term.col) {
                term.alt [i] = xcalloc(col, sizeof(Glyph));
        }
        if(col > term.col) {

-               bool *bp = term.tabs + term.col;
+               bp = term.tabs + term.col;

 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)
 
                memset(bp, 0, sizeof(*term.tabs) * (col - term.col));
                while(--bp > term.tabs && !*bp)


@@ -1890,7 +2095,8 @@ tresize(int col, int row) {
                        *bp = 1;
        }
        /* update terminal size */
                        *bp = 1;
        }
        /* update terminal size */

-       term.col = col, term.row = row;
+       term.col = col;
+       term.row = row;

        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */
        /* make use of the LIMIT in tmoveto */
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */


@@ -1911,50 +2117,58 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XRenderColor xft_color = { .alpha = 0 };
 xloadcols(void) {
        int i, r, g, b;
        XRenderColor xft_color = { .alpha = 0 };

-       ulong white = WhitePixel(xw.dpy, xw.scr);

 
        /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
                if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {
 
        /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */
        for(i = 0; i < LEN(colorname); i++) {
                if(!colorname[i])
                        continue;
                if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) {

-                       dc.col[i] = white;
-                       fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]);
-               } else
-                       dc.col[i] = dc.xft_col[i].pixel;
+                       die("Could not allocate color '%s'\n", colorname[i]);
+               }

        }
 
        /* load colors [16-255] ; same colors as xterm */
        }
 
        /* load colors [16-255] ; same colors as xterm */

-       for(i = 16, r = 0; r < 6; r++)
-               for(g = 0; g < 6; g++)
+       for(i = 16, r = 0; r < 6; r++) {
+               for(g = 0; g < 6; g++) {

                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
                                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
                        for(b = 0; b < 6; b++) {
                                xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
                                if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {

-                                       dc.col[i] = white;
-                                       fprintf(stderr, "Could not allocate color %d\n", i);
-                               } else
-                                       dc.col[i] = dc.xft_col[i].pixel;
+                                       die("Could not allocate color %d\n", i);
+                               }

                                i++;
                        }
                                i++;
                        }

+               }
+       }

 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;
 
        for(r = 0; r < 24; r++, i++) {
                xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r;

-               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) {
-                       dc.col[i] = white;
-                       fprintf(stderr, "Could not allocate color %d\n", i);
-               } else
-                       dc.col[i] = dc.xft_col[i].pixel;
+               if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color,
+                                       &dc.xft_col[i])) {
+                       die("Could not allocate color %d\n", i);
+               }

        }
 }
 
        }
 }
 

+void
+xtermclear(int col1, int row1, int col2, int row2) {
+       XftDrawRect(xw.xft_draw,
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+                       BORDER + col1 * xw.cw,
+                       BORDER + row1 * xw.ch,
+                       (col2-col1+1) * xw.cw,
+                       (row2-row1+1) * xw.ch);
+}
+
+/*
+ * Absolute coordinates.
+ */

 void
 xclear(int x1, int y1, int x2, int y2) {
 void
 xclear(int x1, int y1, int x2, int y2) {

-       XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
-       XFillRectangle(xw.dpy, xw.buf, dc.gc,
-                      BORDER + x1 * xw.cw, BORDER + y1 * xw.ch,
-                      (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
+       XftDrawRect(xw.xft_draw,
+                       &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG],
+                       x1, y1, x2-x1, y2-y1);

 }
 
 void
 }
 
 void


@@ -1982,25 +2196,88 @@ xhints(void) {
        XFree(sizeh);
 }
 
        XFree(sizeh);
 }
 

-void
-xinitfont(Font *f, char *fontstr) {
-       f->xft_set = XftFontOpenName(xw.dpy, xw.scr, fontstr);
+int
+xloadfont(Font *f, FcPattern *pattern) {
+       FcPattern *match;
+       FcResult result;

 
 

-       if(!f->xft_set)
-               die("st: can't open font %s.\n", fontstr);
+       match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
+       if(!match)
+               return 1;
+       if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) {
+               FcPatternDestroy(match);
+               return 1;
+       }

 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;
 
        f->ascent = f->xft_set->ascent;
        f->descent = f->xft_set->descent;
        f->lbearing = 0;
        f->rbearing = f->xft_set->max_advance_width;

+
+       f->height = f->xft_set->height;
+       f->width = f->lbearing + f->rbearing;
+
+       return 0;
+}
+
+void
+xloadfonts(char *fontstr, int fontsize) {
+       FcPattern *pattern;
+       FcResult result;
+       double fontval;
+
+       pattern = FcNameParse((FcChar8 *)fontstr);
+       if(!pattern)
+               die("st: can't open font %s\n", fontstr);
+
+       if(fontsize > 0) {
+               FcPatternDel(pattern, FC_PIXEL_SIZE);
+               FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize);
+               usedfontsize = fontsize;
+       } else {
+               result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval);
+               if(result == FcResultMatch) {
+                       usedfontsize = (int)fontval;
+               } else {
+                       /*
+                        * Default font size is 12, if none given. This is to
+                        * have a known usedfontsize value.
+                        */
+                       FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12);
+                       usedfontsize = 12;
+               }
+       }
+
+       if(xloadfont(&dc.font, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       /* Setting character width and height. */
+       xw.cw = dc.font.width;
+       xw.ch = dc.font.height;
+
+       FcPatternDel(pattern, FC_WEIGHT);
+       FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
+       if(xloadfont(&dc.bfont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDel(pattern, FC_SLANT);
+       FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
+       if(xloadfont(&dc.ibfont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDel(pattern, FC_WEIGHT);
+       if(xloadfont(&dc.ifont, pattern))
+               die("st: can't open font %s\n", fontstr);
+
+       FcPatternDestroy(pattern);

 }
 
 void
 }
 
 void

-initfonts(char *fontstr, char *bfontstr, char *ifontstr, char *ibfontstr) {
-       xinitfont(&dc.font, fontstr);
-       xinitfont(&dc.bfont, bfontstr);
-       xinitfont(&dc.ifont, ifontstr);
-       xinitfont(&dc.ibfont, ibfontstr);
+xzoom(const Arg *arg)
+{
+       xloadfonts(usedfont, usedfontsize + arg->i);
+       cresize(0, 0);
+       draw();

 }
 
 void
 }
 
 void


@@ -2016,11 +2293,8 @@ xinit(void) {
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */
        xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
        /* font */

-       initfonts(FONT, BOLDFONT, ITALICFONT, ITALICBOLDFONT);
-
-       /* XXX: Assuming same size for bold font */
-       xw.cw = dc.font.rbearing - dc.font.lbearing;
-       xw.ch = dc.font.ascent + dc.font.descent;
+       usedfont = (opt_font == NULL)? FONT : opt_font;
+       xloadfonts(usedfont, 0);

 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 
        /* colors */
        xw.cmap = XDefaultColormap(xw.dpy, xw.scr);


@@ -2045,8 +2319,8 @@ xinit(void) {
                xw.fy = 0;
        }
 
                xw.fy = 0;
        }
 

-       attrs.background_pixel = dc.col[DefaultBG];
-       attrs.border_pixel = dc.col[DefaultBG];
+       attrs.background_pixel = dc.xft_col[DefaultBG].pixel;
+       attrs.border_pixel = dc.xft_col[DefaultBG].pixel;

        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask


@@ -2085,6 +2359,8 @@ xinit(void) {
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
                &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);

+       xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+       XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);

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


@@ -2094,24 +2370,34 @@ xinit(void) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
 
 void
 xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {

-       int fg = base.fg, bg = base.bg, temp;
-       int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
+       int winx = BORDER + x * xw.cw, winy = BORDER + y * xw.ch,
+           width = charlen * xw.cw;

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

-
-       /* only switch default fg/bg if term is in RV mode */
-       if(IS_SET(MODE_REVERSE)) {
-               if(fg == DefaultFG)
-                       fg = DefaultBG;
-               if(bg == DefaultBG)
-                       bg = DefaultFG;
-       }
+       XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg],
+                *temp, revfg, revbg;
+       XRenderColor colfg, colbg;

 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
 
        if(base.mode & ATTR_BOLD) {
 
        if(base.mode & ATTR_REVERSE)
                temp = fg, fg = bg, bg = temp;
 
        if(base.mode & ATTR_BOLD) {

-               fg += 8;
+               if(BETWEEN(base.fg, 0, 7)) {
+                       /* basic system colors */
+                       fg = &dc.xft_col[base.fg + 8];
+               } else if(BETWEEN(base.fg, 16, 195)) {
+                       /* 256 colors */
+                       fg = &dc.xft_col[base.fg + 36];
+               } else if(BETWEEN(base.fg, 232, 251)) {
+                       /* greyscale */
+                       fg = &dc.xft_col[base.fg + 4];
+               }
+               /*
+                * Those ranges will not be brightened:
+                *      8 - 15 – bright system colors
+                *      196 - 231 – highest 256 color cube
+                *      252 - 255 – brightest colors in greyscale
+                */

                font = &dc.bfont;
        }
 
                font = &dc.bfont;
        }
 


@@ -2120,22 +2406,61 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 
        if(base.mode & (ATTR_ITALIC|ATTR_ITALIC))
                font = &dc.ibfont;
 

-       XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
-       XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
+       if(IS_SET(MODE_REVERSE)) {
+               if(fg == &dc.xft_col[DefaultFG]) {
+                       fg = &dc.xft_col[DefaultBG];
+               } else {
+                       colfg.red = ~fg->color.red;
+                       colfg.green = ~fg->color.green;
+                       colfg.blue = ~fg->color.blue;
+                       colfg.alpha = fg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg);
+                       fg = &revfg;
+               }
+
+               if(bg == &dc.xft_col[DefaultBG]) {
+                       bg = &dc.xft_col[DefaultFG];
+               } else {
+                       colbg.red = ~bg->color.red;
+                       colbg.green = ~bg->color.green;
+                       colbg.blue = ~bg->color.blue;
+                       colbg.alpha = bg->color.alpha;
+                       XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg);
+                       bg = &revbg;
+               }
+       }

 
 

-       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
+       XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen,
+                       &extents);

        width = extents.xOff;
        width = extents.xOff;

-       XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
-       XftDrawStringUtf8(xw.xft_draw, &dc.xft_col[fg], font->xft_set, winx, winy, (FcChar8 *)s, bytelen);

 
 

-       if(base.mode & ATTR_UNDERLINE)
-               XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+       /* Intelligent cleaning up of the borders. */
+       if(x == 0) {
+               xclear(0, (y == 0)? 0 : winy, BORDER,
+                       winy + xw.ch + (y == term.row-1)? xw.h : 0);
+       }
+       if(x + charlen >= term.col-1) {
+               xclear(winx + width, (y == 0)? 0 : winy, xw.w,
+                       (y == term.row-1)? xw.h : (winy + xw.ch));
+       }
+       if(y == 0)
+               xclear(winx, 0, winx + width, BORDER);
+       if(y == term.row-1)
+               xclear(winx, winy + xw.ch, winx + width, xw.h);
+
+       XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch);
+       XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx,
+                       winy + font->ascent, (FcChar8 *)s, bytelen);
+
+       if(base.mode & ATTR_UNDERLINE) {
+               XftDrawRect(xw.xft_draw, fg, winx, winy + font->ascent + 1,
+                               width, 1);
+       }

 }
 
 void
 xdrawcursor(void) {
 }
 
 void
 xdrawcursor(void) {

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

        int sl;
        Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
 
        int sl;
        Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0};
 


@@ -2148,9 +2473,11 @@ xdrawcursor(void) {
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET) {
                sl = utf8size(term.line[oldy][oldx].c);
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET) {
                sl = utf8size(term.line[oldy][oldx].c);

-               xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
-       } else
-               xclear(oldx, oldy, oldx, oldy);
+               xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx,
+                               oldy, 1, sl);
+       } else {
+               xtermclear(oldx, oldy, oldx, oldy);
+       }

 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {
 
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE)) {


@@ -2175,7 +2502,6 @@ void
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
 
 redraw(void) {
        struct timespec tv = {0, REDRAW_TIMEOUT * 1000};
 

-       xclear(0, 0, xw.w, xw.h);

        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */
        tfulldirt();
        draw();
        XSync(xw.dpy, False); /* necessary for a good tput flash */


@@ -2183,7 +2509,7 @@ redraw(void) {
 }
 
 void
 }
 
 void

-draw() {
+draw(void) {

        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 
        drawregion(0, 0, term.col, term.row);
        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 
        drawregion(0, 0, term.col, term.row);


@@ -2205,7 +2531,8 @@ drawregion(int x1, int y1, int x2, int y2) {
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;
        for(y = y1; y < y2; y++) {
                if(!term.dirty[y])
                        continue;

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

                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;
                term.dirty[y] = 0;
                base = term.line[y][0];
                ic = ib = ox = 0;


@@ -2213,8 +2540,9 @@ drawregion(int x1, int y1, int x2, int y2) {
                        new = term.line[y][x];
                        if(ena_sel && *(new.c) && selected(x, y))
                                new.mode ^= ATTR_REVERSE;
                        new = term.line[y][x];
                        if(ena_sel && *(new.c) && selected(x, y))
                                new.mode ^= ATTR_REVERSE;

-                       if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
-                                                 ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+                       if(ib > 0 && (!(new.state & GLYPH_SET)
+                                       || ATTRCMP(base, new)
+                                       || ib >= DRAW_BUF_SIZ-UTF_SIZ)) {

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


@@ -2238,6 +2566,7 @@ drawregion(int x1, int y1, int x2, int y2) {
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;
 void
 expose(XEvent *ev) {
        XExposeEvent *e = &ev->xexpose;

+

        if(xw.state & WIN_REDRAW) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;
        if(xw.state & WIN_REDRAW) {
                if(!e->count)
                        xw.state &= ~WIN_REDRAW;


@@ -2247,11 +2576,13 @@ expose(XEvent *ev) {
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;
 void
 visibility(XEvent *ev) {
        XVisibilityEvent *e = &ev->xvisibility;

-       if(e->state == VisibilityFullyObscured)
+
+       if(e->state == VisibilityFullyObscured) {

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

-       else if(!(xw.state & WIN_VISIBLE))
+       } else if(!(xw.state & WIN_VISIBLE)) {

                /* need a full redraw for next Expose, not just a buf copy */
                xw.state |= WIN_VISIBLE | WIN_REDRAW;
                /* need a full redraw for next Expose, not just a buf copy */
                xw.state |= WIN_VISIBLE | WIN_REDRAW;

+       }

 }
 
 void
 }
 
 void


@@ -2262,6 +2593,7 @@ unmap(XEvent *ev) {
 void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);
 void
 xseturgency(int add) {
        XWMHints *h = XGetWMHints(xw.dpy, xw.win);

+

        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);
        h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint);
        XSetWMHints(xw.dpy, xw.win, h);
        XFree(h);


@@ -2270,20 +2602,28 @@ xseturgency(int add) {
 void
 focus(XEvent *ev) {
        if(ev->type == FocusIn) {
 void
 focus(XEvent *ev) {
        if(ev->type == FocusIn) {

+               XSetICFocus(xw.xic);

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

-       } else
+       } else {
+               XUnsetICFocus(xw.xic);

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

+       }

 }
 
 char*
 kmap(KeySym k, uint state) {
        int i;
 }
 
 char*
 kmap(KeySym k, uint state) {
        int i;

+       uint mask;
+

        state &= ~Mod2Mask;
        for(i = 0; i < LEN(key); i++) {
        state &= ~Mod2Mask;
        for(i = 0; i < LEN(key); i++) {

-               uint mask = key[i].mask;
-               if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
+               mask = key[i].mask;
+
+               if(key[i].k == k && ((state & mask) == mask
+                               || (mask == XK_NO_MOD && !state))) {

                        return (char*)key[i].s;
                        return (char*)key[i].s;

+               }

        }
        return NULL;
 }
        }
        return NULL;
 }


@@ -2292,31 +2632,41 @@ void
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;

-       char buf[32];
-       char *customkey;
-       int len;
-       int meta;
-       int shift;
+       char buf[32], *customkey;
+       int len, meta, shift, i;

        Status status;
 
        if (IS_SET(MODE_KBDLOCK))
                return;
        Status status;
 
        if (IS_SET(MODE_KBDLOCK))
                return;

+

        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 
        meta = e->state & Mod1Mask;
        shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
 

-       /* 1. custom keys from config.h */
-       if((customkey = kmap(ksym, e->state)))
+       /* 1. shortcuts */
+       for(i = 0; i < LEN(shortcuts); i++) {
+               if((ksym == shortcuts[i].keysym)
+                               && (CLEANMASK(shortcuts[i].mod) == \
+                                       CLEANMASK(e->state))
+                               && shortcuts[i].func) {
+                       shortcuts[i].func(&(shortcuts[i].arg));
+               }
+       }
+
+       /* 2. custom keys from config.h */
+       if((customkey = kmap(ksym, e->state))) {

                ttywrite(customkey, strlen(customkey));
        /* 2. hardcoded (overrides X lookup) */
                ttywrite(customkey, strlen(customkey));
        /* 2. hardcoded (overrides X lookup) */

-       else
+       } else {

                switch(ksym) {
                case XK_Up:
                case XK_Down:
                case XK_Left:
                case XK_Right:
                        /* XXX: shift up/down doesn't work */
                switch(ksym) {
                case XK_Up:
                case XK_Down:
                case XK_Left:
                case XK_Right:
                        /* XXX: shift up/down doesn't work */

-                       sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]);
+                       sprintf(buf, "\033%c%c",
+                               IS_SET(MODE_APPKEYPAD) ? 'O' : '[',
+                               (shift ? "dacb":"DACB")[ksym - XK_Left]);

                        ttywrite(buf, 3);
                        break;
                case XK_Insert:
                        ttywrite(buf, 3);
                        break;
                case XK_Insert:


@@ -2324,10 +2674,11 @@ kpress(XEvent *ev) {
                                selpaste();
                        break;
                case XK_Return:
                                selpaste();
                        break;
                case XK_Return:

-                       if(IS_SET(MODE_CRLF))
+                       if(IS_SET(MODE_CRLF)) {

                                ttywrite("\r\n", 2);
                                ttywrite("\r\n", 2);

-                       else
+                       } else {

                                ttywrite("\r", 1);
                                ttywrite("\r", 1);

+                       }

                        break;
                        /* 3. X lookup  */
                default:
                        break;
                        /* 3. X lookup  */
                default:


@@ -2338,6 +2689,7 @@ kpress(XEvent *ev) {
                        }
                        break;
                }
                        }
                        break;
                }

+       }

 }
 
 void
 }
 
 void


@@ -2351,29 +2703,41 @@ cmessage(XEvent *e) {
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }
                } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
                        xw.state &= ~WIN_FOCUSED;
                }

+       } else if(e->xclient.data.l[0] == xw.wmdeletewin) {
+               /* Send SIGHUP to shell */
+               kill(pid, SIGHUP);
+               exit(EXIT_SUCCESS);

        }
 }
 
 void
        }
 }
 
 void

-resize(XEvent *e) {
+cresize(int width, int height)
+{

        int col, row;
 
        int col, row;
 

-       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
-               return;
+       if(width != 0)
+               xw.w = width;
+       if(height != 0)
+               xw.h = height;

 
 

-       xw.w = e->xconfigure.width;
-       xw.h = e->xconfigure.height;

        col = (xw.w - 2*BORDER) / xw.cw;
        row = (xw.h - 2*BORDER) / xw.ch;
        if(col == term.col && row == term.row)
                return;
 
        col = (xw.w - 2*BORDER) / xw.cw;
        row = (xw.h - 2*BORDER) / xw.ch;
        if(col == term.col && row == term.row)
                return;
 

-       xclear(0, 0, xw.w, xw.h);

        tresize(col, row);
        xresize(col, row);
        ttyresize();
 }
 
        tresize(col, row);
        xresize(col, row);
        ttyresize();
 }
 

+void
+resize(XEvent *e) {
+       if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h)
+               return;
+
+       cresize(e->xconfigure.width, e->xconfigure.height);
+}
+

 void
 run(void) {
        XEvent ev;
 void
 run(void) {
        XEvent ev;


@@ -2412,7 +2776,7 @@ run(void) {
 
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);
 
                while(XPending(xw.dpy)) {
                        XNextEvent(xw.dpy, &ev);

-                       if(XFilterEvent(&ev, xw.win))
+                       if(XFilterEvent(&ev, None))

                                continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);
                                continue;
                        if(handler[ev.type])
                                (handler[ev.type])(&ev);


@@ -2433,22 +2797,19 @@ main(int argc, char *argv[]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {
 
        for(i = 1; i < argc; i++) {
                switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) {

-               case 't':
-                       if(++i < argc) opt_title = argv[i];
-                       break;

                case 'c':
                case 'c':

-                       if(++i < argc) opt_class = argv[i];
-                       break;
-               case 'w':
-                       if(++i < argc) opt_embed = argv[i];
-                       break;
-               case 'f':
-                       if(++i < argc) opt_io = argv[i];
+                       if(++i < argc)
+                               opt_class = argv[i];

                        break;
                case 'e':
                        /* eat every remaining arguments */
                        break;
                case 'e':
                        /* eat every remaining arguments */

-                       if(++i < argc) opt_cmd = &argv[i];
+                       if(++i < argc)
+                               opt_cmd = &argv[i];

                        goto run;
                        goto run;

+               case 'f':
+                       if(++i < argc)
+                               opt_font = argv[i];
+                       break;

                case 'g':
                        if(++i >= argc)
                                break;
                case 'g':
                        if(++i >= argc)
                                break;


@@ -2470,17 +2831,30 @@ main(int argc, char *argv[]) {
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;
                        if(xw.fh != 0 && xw.fw != 0)
                                xw.isfixed = True;
                        break;

+               case 'o':
+                       if(++i < argc)
+                               opt_io = argv[i];
+                       break;
+               case 't':
+                       if(++i < argc)
+                               opt_title = argv[i];
+                       break;

                case 'v':
                default:
                        die(USAGE);
                case 'v':
                default:
                        die(USAGE);

+               case 'w':
+                       if(++i < argc)
+                               opt_embed = argv[i];
+                       break;

                }
        }
 
                }
        }
 

- run:
+run:

        setlocale(LC_CTYPE, "");
        setlocale(LC_CTYPE, "");

+       XSetLocaleModifiers("");

        tnew(80, 24);
        tnew(80, 24);

-       ttynew();

        xinit();
        xinit();

+       ttynew();

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