add dirty flag for lines

[st.git] / st.c

diff --git a/st.c b/st.c
index 38c8658..ad6db0d 100644 (file)
--- a/st.c
+++ b/st.c
@@ -16,22 +16,30 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>

-#include <X11/Xlib.h>

 #include <X11/Xatom.h>
 #include <X11/Xatom.h>

-#include <X11/keysym.h>
+#include <X11/Xlib.h>

 #include <X11/Xutil.h>
 #include <X11/Xutil.h>

+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+#include <sys/time.h>
+#include <time.h>

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

-#elif defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)

  #include <util.h>
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #include <libutil.h>
 #endif
 
 #define USAGE \
  #include <util.h>
 #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #include <libutil.h>
 #endif
 
 #define USAGE \

-       "st-" VERSION ", (c) 2010 st engineers\n" \
-       "usage: st [-t title] [-c class] [-e cmd] [-v]\n"
+       "st " VERSION " (c) 2010-2011 st engineers\n" \
+       "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
+
+/* XEMBED messages */
+#define XEMBED_FOCUS_IN  4
+#define XEMBED_FOCUS_OUT 5

 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256
 
 /* Arbitrary sizes */
 #define ESC_TITLE_SIZ 256


@@ -39,16 +47,21 @@
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4
 #define ESC_ARG_SIZ   16
 #define DRAW_BUF_SIZ  1024
 #define UTF_SIZ       4

+#define XK_NO_MOD     UINT_MAX
+#define XK_ANY_MOD    0

 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define LEN(a)     (sizeof(a) / sizeof(a[0]))
 
 #define SERRNO strerror(errno)
 #define MIN(a, b)  ((a) < (b) ? (a) : (b))
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
 #define LEN(a)     (sizeof(a) / sizeof(a[0]))

-#define DEFAULT(a, b)     (a) = (a) ? (a) : (b)    
+#define DEFAULT(a, b)     (a) = (a) ? (a) : (b)

 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) (term.mode & (flag))
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) (term.mode & (flag))

+#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
+#define X2COL(x) (((x) - BORDER)/xw.cw)
+#define Y2ROW(y) (((y) - BORDER)/xw.ch)

 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };
 
 /* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */
 enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 };


@@ -56,10 +69,9 @@ enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT,
        CURSOR_SAVE, CURSOR_LOAD };
 enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };
        CURSOR_SAVE, CURSOR_LOAD };
 enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 };
 enum { GLYPH_SET=1, GLYPH_DIRTY=2 };

-enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, 
-       MODE_CRLF=16 };
+enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8,
+       MODE_CRLF=16, MODE_MOUSEBTN=32, MODE_MOUSEMOTION=64, MODE_MOUSE=32|64, MODE_REVERSE=128 };

 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };
 enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 };

-enum { SCREEN_UPDATE, SCREEN_REDRAW };

 enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
 
 #undef B0
 enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
 
 #undef B0


@@ -86,21 +98,22 @@ typedef struct {
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */
 /* ESC '[' [[ [<priv>] <arg> [;]] <mode>] */
 typedef struct {
        char buf[ESC_BUF_SIZ]; /* raw string */

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

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

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

        char mode;
 } CSIEscape;
 
 /* Internal representation of the screen */
 typedef struct {
        char mode;
 } CSIEscape;
 
 /* Internal representation of the screen */
 typedef struct {

-       int row;        /* nb row */  
+       int row;        /* nb row */

        int col;        /* nb col */
        Line* line;     /* screen */
        Line* alt;      /* alternate screen */
        int col;        /* nb col */
        Line* line;     /* screen */
        Line* alt;      /* alternate screen */

+       char* dirty; /* dirtyness of lines */

        TCursor c;      /* cursor */
        TCursor c;      /* cursor */

-       int top;        /* top    scroll limit */
+       int top;        /* top    scroll limit */

        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 */


@@ -110,41 +123,40 @@ typedef struct {
 
 /* Purely graphic info */
 typedef struct {
 
 /* Purely graphic info */
 typedef struct {

-       Display* dis;
+       Display* dpy;

        Colormap cmap;
        Window win;
        Pixmap buf;
        Colormap cmap;
        Window win;
        Pixmap buf;

+       Atom xembed;

        XIM xim;
        XIC xic;
        int scr;
        XIM xim;
        XIC xic;
        int scr;

-       int w;  /* window width  */
+       int w;  /* window width */

        int h;  /* window height */
        int bufw; /* pixmap width  */
        int bufh; /* pixmap height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
        int h;  /* window height */
        int bufw; /* pixmap width  */
        int bufh; /* pixmap height */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */

-} XWindow; 
+} XWindow;

 
 typedef struct {
        KeySym k;
 
 typedef struct {
        KeySym k;

+       unsigned int mask;

        char s[ESC_BUF_SIZ];
 } Key;
 
        char s[ESC_BUF_SIZ];
 } Key;
 

-typedef struct {
-       XFontSet fs;
-       short lbearing;
-       short rbearing;
-       int ascent;
-       int descent;
-} FontInfo;
-

 /* Drawing Context */
 typedef struct {
        unsigned long col[256];
 /* Drawing Context */
 typedef struct {
        unsigned long col[256];

-       FontInfo font;
-       FontInfo bfont;

        GC gc;
        GC gc;

+       struct {
+               int ascent;
+               int descent;
+               short lbearing;
+               short rbearing;
+               XFontSet set;
+       } font, bfont;

 } DC;
 
 /* TODO: use better name for vars... */
 } DC;
 
 /* TODO: use better name for vars... */


@@ -152,14 +164,18 @@ 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;
        char *clip;

+       Atom xtarget;
+       struct timeval tclick1;
+       struct timeval tclick2;

 } Selection;
 
 #include "config.h"
 
 } Selection;
 
 #include "config.h"
 

-static void die(const char *errstr, ...);
-static void draw(int);
+static void die(const char*, ...);
+static void draw(void);
+static void drawregion(int, int, int, int);

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


@@ -188,6 +204,7 @@ static void tsetattr(int*, int);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetchar(char*);
 static void tsetscroll(int, int);
 static void tswapscreen(void);

+static void tfulldirt(void);

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


@@ -207,8 +224,9 @@ static void xresize(int, int);
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);
 static void expose(XEvent *);
 static void visibility(XEvent *);
 static void unmap(XEvent *);

-static char* kmap(KeySym);
+static char* kmap(KeySym, unsigned int state);

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

+static void cmessage(XEvent *);

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


@@ -220,15 +238,17 @@ static void selrequest(XEvent *);
 static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);
 static void selinit(void);
 static inline int selected(int, int);
 static void selcopy(void);

-static void selpaste(void);
+static void selpaste();
+static void selscroll(int, int);

 
 

-static int stou(char *, long *);
-static int utos(long *, char *);
-static int slen(char *);
-static int canstou(char *, int);
+static int utf8decode(char *, long *);
+static int utf8encode(long *, char *);
+static int utf8size(char *);
+static int isfullutf8(char *, int);

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

+       [ClientMessage] = cmessage,

        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,
        [ConfigureNotify] = resize,
        [VisibilityNotify] = visibility,
        [UnmapNotify] = unmap,


@@ -250,12 +270,13 @@ static CSIEscape escseq;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;
 static int cmdfd;
 static pid_t pid;
 static Selection sel;

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

 static char *opt_title = NULL;
 static char *opt_title = NULL;

+static char *opt_embed = NULL;

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

-/* UTF-8 decode */
-static int stou(char *s, long *u) {
+int
+utf8decode(char *s, long *u) {

        unsigned char c;
        int i, n, rtn;
 
        unsigned char c;
        int i, n, rtn;
 


@@ -264,28 +285,28 @@ static int stou(char *s, long *u) {
        if(~c&B7) { /* 0xxxxxxx */
                *u = c;
                return rtn;
        if(~c&B7) { /* 0xxxxxxx */
                *u = c;
                return rtn;

-       } else if ((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */
+       } else if((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */

                *u = c&(B4|B3|B2|B1|B0);
                n = 1;
                *u = c&(B4|B3|B2|B1|B0);
                n = 1;

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

                *u = c&(B3|B2|B1|B0);
                n = 2;
                *u = c&(B3|B2|B1|B0);
                n = 2;

-       } else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+       } else if((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */

                *u = c&(B2|B1|B0);
                n = 3;
        } else
                goto invalid;
                *u = c&(B2|B1|B0);
                n = 3;
        } else
                goto invalid;

-       for (i=n,++s; i>0; --i,++rtn,++s) {
+       for(i=n,++s; i>0; --i,++rtn,++s) {

                c = *s;
                c = *s;

-               if ((c&(B7|B6)) != B7) /* 10xxxxxx */
+               if((c&(B7|B6)) != B7) /* 10xxxxxx */

                        goto invalid;
                *u <<= 6;
                *u |= c&(B5|B4|B3|B2|B1|B0);
        }
                        goto invalid;
                *u <<= 6;
                *u |= c&(B5|B4|B3|B2|B1|B0);
        }

-       if ((n == 1 && *u < 0x80) ||
-           (n == 2 && *u < 0x800) ||
-           (n == 3 && *u < 0x10000) ||
-           (*u >= 0xD800 && *u <= 0xDFFF))
+       if((n == 1 && *u < 0x80) ||
+          (n == 2 && *u < 0x800) ||
+          (n == 3 && *u < 0x10000) ||
+          (*u >= 0xD800 && *u <= 0xDFFF))

                goto invalid;
        return rtn;
 invalid:
                goto invalid;
        return rtn;
 invalid:


@@ -293,30 +314,30 @@ invalid:
        return rtn;
 }
 
        return rtn;
 }
 

-/* UTF-8 encode */
-static int utos(long *u, char *s) {
+int
+utf8encode(long *u, char *s) {

        unsigned char *sp;
        unsigned long uc;
        int i, n;
 
        sp = (unsigned char*) s;
        uc = *u;
        unsigned char *sp;
        unsigned long uc;
        int i, n;
 
        sp = (unsigned char*) s;
        uc = *u;

-       if (uc < 0x80) {
+       if(uc < 0x80) {

                *sp = uc; /* 0xxxxxxx */
                return 1;
                *sp = uc; /* 0xxxxxxx */
                return 1;

-       } else if (*u < 0x800) {
+       } else if(*u < 0x800) {

                *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
                n = 1;
                *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */
                n = 1;

-       } else if (uc < 0x10000) {
+       } else if(uc < 0x10000) {

                *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
                n = 2;
                *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */
                n = 2;

-       } else if (uc <= 0x10FFFF) {
+       } else if(uc <= 0x10FFFF) {

                *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
                n = 3;
        } else {
                goto invalid;
        }
                *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */
                n = 3;
        } else {
                goto invalid;
        }

-       for (i=n,++sp; i>0; --i,++sp)
+       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:
                *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */
        return n+1;
 invalid:


@@ -329,83 +350,129 @@ invalid:
 
 /* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
    UTF-8 otherwise return 0 */
 
 /* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode
    UTF-8 otherwise return 0 */

-static int canstou(char *s, int b) {
-       unsigned char c = *s;
-       int n;
+int
+isfullutf8(char *s, int b) {
+       unsigned char *c1, *c2, *c3;

 
 

-       if (b < 1)
+       c1 = (unsigned char *) s;
+       c2 = (unsigned char *) ++s;
+       c3 = (unsigned char *) ++s;
+       if(b < 1)

                return 0;
                return 0;

-       else if (~c&B7)
-               return 1;
-       else if ((c&(B7|B6|B5)) == (B7|B6))
-               n = 1;
-       else if ((c&(B7|B6|B5|B4)) == (B7|B6|B5))
-               n = 2;
-       else if ((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4))
-               n = 3;
-       else
-               return 1;
-       for (--b,++s; n>0&&b>0; --n,--b,++s) {
-               c = *s;
-               if ((c&(B7|B6)) != B7)
-                       break; 
-       }
-       if (n > 0 && b == 0)
+       else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
+               return 0;
+       else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) &&
+           ((b == 1) ||
+           ((b == 2) && (*c2&(B7|B6)) == B7)))
+               return 0;
+       else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) &&
+           ((b == 1) ||
+           ((b == 2) && (*c2&(B7|B6)) == B7) ||
+           ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7)))

                return 0;
        else
                return 1;
 }
 
                return 0;
        else
                return 1;
 }
 

-static int slen(char *s) {
+int
+utf8size(char *s) {

        unsigned char c = *s;
 
        unsigned char 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;
 }
 

-static void selinit(void) {
+void
+selinit(void) {
+       sel.tclick1.tv_sec = 0;
+       sel.tclick1.tv_usec = 0;

        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;
        sel.mode = 0;
        sel.bx = -1;
        sel.clip = NULL;

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

 }
 
 }
 

-static inline int selected(int x, int y) {
+static inline int
+selected(int x, int y) {

        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
                int ex = MAX(sel.bx, sel.ex);
                return BETWEEN(x, bx, ex);
        }
        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
                int ex = MAX(sel.bx, sel.ex);
                return BETWEEN(x, bx, ex);
        }

-       return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) 
+       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));
 }
 
                || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y));
 }
 

-static void getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b) 
+void
+getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
+       if(b)

                *b = e->xbutton.button;
 
                *b = e->xbutton.button;
 

-       *x = e->xbutton.x/xw.cw;
-       *y = e->xbutton.y/xw.ch;
+       *x = X2COL(e->xbutton.x);
+       *y = Y2ROW(e->xbutton.y);

        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.e.y = MAX(sel.by, sel.ey);
 }
 
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
        sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx;
        sel.e.y = MAX(sel.by, sel.ey);
 }
 

-static void bpress(XEvent *e) {
-       sel.mode = 1;
-       sel.ex = sel.bx = e->xbutton.x/xw.cw;
-       sel.ey = sel.by = e->xbutton.y/xw.ch;
+void
+mousereport(XEvent *e) {
+       int x = X2COL(e->xbutton.x);
+       int y = Y2ROW(e->xbutton.y);
+       int button = e->xbutton.button;
+       int state = e->xbutton.state;
+       char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 };
+       static int ob, ox, oy;
+       
+       /* from urxvt */
+       if(e->xbutton.type == MotionNotify) {
+               if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy))
+                       return;
+               button = ob + 32;
+               ox = x, oy = y;
+       } else if(e->xbutton.type == ButtonRelease || button == AnyButton) {
+               button = 3;
+       } else {
+               button -= Button1;
+               if(button >= 3)
+                       button += 64 - 3;
+               if(e->xbutton.type == ButtonPress) {
+                       ob = button;
+                       ox = x, oy = y;
+               }
+       }
+       
+       buf[3] = 32 + button + (state & ShiftMask ? 4 : 0)
+               + (state & Mod4Mask    ? 8  : 0)
+               + (state & ControlMask ? 16 : 0);
+       
+       ttywrite(buf, sizeof(buf));

 }
 
 }
 

-static void selcopy() {
+void
+bpress(XEvent *e) {
+       if(IS_SET(MODE_MOUSE))
+               mousereport(e);
+       else if(e->xbutton.button == Button1) {
+               sel.mode = 1;
+               sel.ex = sel.bx = X2COL(e->xbutton.x);
+               sel.ey = sel.by = Y2ROW(e->xbutton.y);
+       }
+}
+
+void
+selcopy(void) {

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

-       int ls, x, y, sz, sl;
+       int x, y, sz, sl, ls = 0;

 
        if(sel.bx == -1)
                str = NULL;
 
        if(sel.bx == -1)
                str = NULL;


@@ -415,28 +482,28 @@ static void selcopy() {
                for(y = 0; y < term.row; y++) {
                        for(x = 0; x < term.col; x++)
                                if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {
                for(y = 0; y < term.row; y++) {
                        for(x = 0; x < term.col; x++)
                                if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) {

-                                       sl = slen(term.line[y][x].c);
+                                       sl = utf8size(term.line[y][x].c);

                                        memcpy(ptr, term.line[y][x].c, sl);
                                        ptr += sl;
                                }
                                        memcpy(ptr, term.line[y][x].c, sl);
                                        ptr += sl;
                                }

-                       if(ls)
-                               *ptr = '\n', ptr++;
+                       if(ls && y < sel.e.y)
+                               *ptr++ = '\n';

                }
                *ptr = 0;
        }
        xsetsel(str);
 }
 
                }
                *ptr = 0;
        }
        xsetsel(str);
 }
 

-static void selnotify(XEvent *e) {
-       unsigned long nitems;
-       unsigned long ofs, rem;
+void
+selnotify(XEvent *e) {
+       unsigned long nitems, ofs, rem;

        int format;
        unsigned char *data;
        Atom type;
 
        ofs = 0;
        do {
        int format;
        unsigned char *data;
        Atom type;
 
        ofs = 0;
        do {

-               if(XGetWindowProperty(xw.dis, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,
+               if(XGetWindowProperty(xw.dpy, xw.win, XA_PRIMARY, ofs, BUFSIZ/4,

                                        False, AnyPropertyType, &type, &format,
                                        &nitems, &rem, &data)) {
                        fprintf(stderr, "Clipboard allocation failed\n");
                                        False, AnyPropertyType, &type, &format,
                                        &nitems, &rem, &data)) {
                        fprintf(stderr, "Clipboard allocation failed\n");


@@ -449,12 +516,13 @@ static void selnotify(XEvent *e) {
        } while(rem > 0);
 }
 
        } while(rem > 0);
 }
 

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

 }
 
 }
 

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

        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
        Atom xa_targets;
        XSelectionRequestEvent *xsre;
        XSelectionEvent xev;
        Atom xa_targets;


@@ -468,15 +536,15 @@ static void selrequest(XEvent *e)
        /* reject */
        xev.property = None;
 
        /* reject */
        xev.property = None;
 

-       xa_targets = XInternAtom(xw.dis, "TARGETS", 0);
+       xa_targets = XInternAtom(xw.dpy, "TARGETS", 0);

        if(xsre->target == xa_targets) {
                /* respond with the supported type */
        if(xsre->target == xa_targets) {
                /* respond with the supported type */

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

                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (unsigned char *) &string, 1);
                xev.property = xsre->property;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                                (unsigned char *) &string, 1);
                xev.property = xsre->property;

-       } else if(xsre->target == XA_STRING) {
+       } else if(xsre->target == sel.xtarget) {

                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,
                                (unsigned char *) sel.clip, strlen(sel.clip));
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,
                                (unsigned char *) sel.clip, strlen(sel.clip));


@@ -488,65 +556,81 @@ static void selrequest(XEvent *e)
                fprintf(stderr, "Error sending SelectionNotify event\n");
 }
 
                fprintf(stderr, "Error sending SelectionNotify event\n");
 }
 

-static void xsetsel(char *str) {
+void
+xsetsel(char *str) {

        /* register the selection for both the clipboard and the primary */
        Atom clipboard;
 
        free(sel.clip);
        sel.clip = str;
 
        /* register the selection for both the clipboard and the primary */
        Atom clipboard;
 
        free(sel.clip);
        sel.clip = str;
 

-       XSetSelectionOwner(xw.dis, XA_PRIMARY, xw.win, CurrentTime);
+       XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, CurrentTime);

 
 

-       clipboard = XInternAtom(xw.dis, "CLIPBOARD", 0);
-       XSetSelectionOwner(xw.dis, clipboard, xw.win, CurrentTime);
+       clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0);
+       XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime);

 
 

-       XFlush(xw.dis);
+       XFlush(xw.dpy);

 }
 
 }
 

-/* TODO: doubleclick to select word */
-static void brelease(XEvent *e) {
-       int b;
-       sel.mode = 0;
-       getbuttoninfo(e, &b, &sel.ex, &sel.ey);
-       if(sel.bx==sel.ex && sel.by==sel.ey) {
-               sel.bx = -1;
-               if(b==2)
-                       selpaste();
-       } else {
-               if(b==1)
-                       selcopy();
+void
+brelease(XEvent *e) {
+       if(IS_SET(MODE_MOUSE)) {
+               mousereport(e);
+               return;

        }
        }

-       draw(1);
-}
-
-static void bmotion(XEvent *e) {
-       if (sel.mode) {
+       if(e->xbutton.button == Button2)
+               selpaste();
+       else if(e->xbutton.button == Button1) {
+               sel.mode = 0;

                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);

-               /* XXX: draw() can't keep up, disabled for now.
-                  selection is visible on button release.
-                  draw(1); */
+               if(sel.bx == sel.ex && sel.by == sel.ey) {
+                       struct timeval now;
+                       sel.bx = -1;
+                       gettimeofday(&now, NULL);
+
+                       if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) {
+                               /* triple click on the line */
+                               sel.b.x = sel.bx = 0;
+                               sel.e.x = sel.ex = term.col;
+                               sel.b.y = sel.e.y = sel.ey;
+                               selcopy();
+                       } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) {
+                               /* 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--;
+                               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++;
+                               sel.e.x = sel.ex;
+                               sel.b.y = sel.e.y = sel.ey;
+                               selcopy();
+                       }
+               } else
+                       selcopy();

        }
        }

+       memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval));
+       gettimeofday(&sel.tclick1, NULL);
+       draw();

 }
 
 }
 

-#ifdef DEBUG

 void
 void

-tdump(void) {
-       int row, col;
-       Glyph c;
+bmotion(XEvent *e) {
+       if(IS_SET(MODE_MOUSE)) {
+               mousereport(e);
+               return;
+       }
+       if(sel.mode) {
+               int oldey = sel.ey, oldex = sel.ex;
+               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);

 
 

-       for(row = 0; row < term.row; row++) {
-               for(col = 0; col < term.col; col++) {
-                       if(col == term.c.x && row == term.c.y)
-                               putchar('#');
-                       else {
-                               c = term.line[row][col];
-                               putchar(c.state & GLYPH_SET ? c.c : '.');
-                       }
+               if(oldey != sel.ey || oldex != sel.ex) {
+                       int starty = MIN(oldey, sel.ey);
+                       int endy = MAX(oldey, sel.ey);
+                       drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row));

                }
                }

-               putchar('\n');

        }
 }
        }
 }

-#endif

 
 void
 die(const char *errstr, ...) {
 
 void
 die(const char *errstr, ...) {


@@ -560,16 +644,17 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 void
 execsh(void) {

-       char *args[] = {getenv("SHELL"), "-i", NULL};
-       if(opt_cmd)
-               args[0] = opt_cmd, args[1] = NULL;
-       else
-               DEFAULT(args[0], SHELL);
+       char **args;
+       char *envshell = getenv("SHELL");
+
+       DEFAULT(envshell, "sh");

        putenv("TERM="TNAME);
        putenv("TERM="TNAME);

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

        execvp(args[0], args);
        execvp(args[0], args);

+       exit(EXIT_FAILURE);

 }
 
 }
 

-void 
+void

 sigchld(int a) {
        int stat = 0;
        if(waitpid(pid, &stat, 0) < 0)
 sigchld(int a) {
        int stat = 0;
        if(waitpid(pid, &stat, 0) < 0)


@@ -621,24 +706,31 @@ dump(char c) {
 
 void
 ttyread(void) {
 
 void
 ttyread(void) {

-       char buf[BUFSIZ], *ptr;
-       char s[UTF_SIZ];
-       int ret, br;
+       static char buf[BUFSIZ];

        static int buflen = 0;
        static int buflen = 0;

-       long u;
+       char *ptr;
+       char s[UTF_SIZ];
+       int charsize; /* size of utf8 char in bytes */
+       long utf8c;
+       int ret;

 
 

+       /* append read bytes to unprocessed bytes */

        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
                die("Couldn't read from shell: %s\n", SERRNO);
        if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0)
                die("Couldn't read from shell: %s\n", SERRNO);

-       else {
-               buflen += ret;
-               for(ptr=buf; buflen>=UTF_SIZ||canstou(ptr,buflen); buflen-=br) {
-                       br = stou(ptr, &u);
-                       utos(&u, s);
-                       tputc(s);
-                       ptr += br;
-               }
-               memcpy(buf, ptr, buflen);
+
+       /* process every complete utf8 char */
+       buflen += ret;
+       ptr = buf;
+       while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
+               charsize = utf8decode(ptr, &utf8c);
+               utf8encode(&utf8c, s);
+               tputc(s);
+               ptr    += charsize;
+               buflen -= charsize;

        }
        }

+
+       /* keep any uncomplete utf8 char for the next call */
+       memmove(buf, ptr, buflen);

 }
 
 void
 }
 
 void


@@ -658,6 +750,14 @@ ttyresize(int x, int y) {
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 
                fprintf(stderr, "Couldn't set window size: %s\n", SERRNO);
 }
 

+void
+tfulldirt(void)
+{
+       int i;
+       for(i = 0; i < term.row; i++)
+               term.dirty[i] = 1;
+}
+

 void
 tcursor(int mode) {
        static TCursor c;
 void
 tcursor(int mode) {
        static TCursor c;


@@ -671,8 +771,8 @@ tcursor(int mode) {
 void
 treset(void) {
        term.c = (TCursor){{
 void
 treset(void) {
        term.c = (TCursor){{

-               .mode = ATTR_NULL, 
-               .fg = DefaultFG, 
+               .mode = ATTR_NULL,
+               .fg = DefaultFG,

                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
        
                .bg = DefaultBG
        }, .x = 0, .y = 0, .state = CURSOR_DEFAULT};
        


@@ -687,9 +787,12 @@ tnew(int col, int row) {
        term.row = row, term.col = col;
        term.line = malloc(term.row * sizeof(Line));
        term.alt  = malloc(term.row * sizeof(Line));
        term.row = row, term.col = col;
        term.line = malloc(term.row * sizeof(Line));
        term.alt  = malloc(term.row * sizeof(Line));

-       for(row = 0 ; row < term.row; row++) {
+       term.dirty = malloc(term.row * sizeof(*term.dirty));
+
+       for(row = 0; row < term.row; row++) {

                term.line[row] = malloc(term.col * sizeof(Glyph));
                term.alt [row] = malloc(term.col * sizeof(Glyph));
                term.line[row] = malloc(term.col * sizeof(Glyph));
                term.alt [row] = malloc(term.col * sizeof(Glyph));

+               term.dirty[row] = 0;

        }
        /* setup screen */
        treset();
        }
        /* setup screen */
        treset();


@@ -701,6 +804,7 @@ tswapscreen(void) {
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;
        term.line = term.alt;
        term.alt = tmp;
        term.mode ^= MODE_ALTSCREEN;

+       tfulldirt();

 }
 
 void
 }
 
 void


@@ -716,7 +820,12 @@ tscrolldown(int orig, int n) {
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;
                temp = term.line[i];
                term.line[i] = term.line[i-n];
                term.line[i-n] = temp;

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

        }
        }

+
+       selscroll(orig, n);

 }
 
 void
 }
 
 void


@@ -727,10 +836,38 @@ tscrollup(int orig, int n) {
        
        tclearregion(0, orig, term.col-1, orig+n-1);
        
        
        tclearregion(0, orig, term.col-1, orig+n-1);
        

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

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

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

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

+
+                term.dirty[i] = 1;
+                term.dirty[i+n] = 1;
+       }
+
+       selscroll(orig, -n);
+}
+
+void
+selscroll(int orig, int n) {
+       if(sel.bx == -1)
+               return;
+       
+       if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) {
+               if((sel.by += n) > term.bot || (sel.ey += n) < term.top) {
+                       sel.bx = -1;
+                       return;
+               }
+               if(sel.by < term.top) {
+                       sel.by = term.top;
+                       sel.bx = 0;
+               }
+               if(sel.ey > term.bot) {
+                       sel.ey = term.bot;
+                       sel.ex = term.col;
+               }
+               sel.b.y = sel.by, sel.b.x = sel.bx;
+               sel.e.y = sel.ey, sel.e.x = sel.ex;

        }
 }
 
        }
 }
 


@@ -779,6 +916,7 @@ tmoveto(int x, int y) {
 
 void
 tsetchar(char *c) {
 
 void
 tsetchar(char *c) {

+       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.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;


@@ -798,9 +936,11 @@ tclearregion(int x1, int y1, int x2, int y2) {
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 

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

                for(x = x1; x <= x2; x++)
                        term.line[y][x].state = 0;
                for(x = x1; x <= x2; x++)
                        term.line[y][x].state = 0;

+       }

 }
 
 void
 }
 
 void


@@ -808,6 +948,8 @@ tdeletechar(int n) {
        int src = term.c.x + n;
        int dst = term.c.x;
        int size = term.col - src;
        int src = term.c.x + n;
        int dst = term.c.x;
        int size = term.col - src;

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

 
        if(src >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
 
        if(src >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);


@@ -823,6 +965,8 @@ tinsertblank(int n) {
        int dst = src + n;
        int size = term.col - dst;
 
        int dst = src + n;
        int size = term.col - dst;
 

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

        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;
        if(dst >= term.col) {
                tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                return;


@@ -859,47 +1003,47 @@ tsetattr(int *attr, int l) {
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:
                        term.c.attr.bg = DefaultBG;
                        break;
                case 1:

-                       term.c.attr.mode |= ATTR_BOLD;   
+                       term.c.attr.mode |= ATTR_BOLD;

                        break;
                        break;

-               case 4: 
+               case 4:

                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;

-               case 7: 
-                       term.c.attr.mode |= ATTR_REVERSE;       
+               case 7:
+                       term.c.attr.mode |= ATTR_REVERSE;

                        break;
                        break;

-               case 22: 
-                       term.c.attr.mode &= ~ATTR_BOLD;  
+               case 22:
+                       term.c.attr.mode &= ~ATTR_BOLD;

                        break;
                        break;

-               case 24: 
+               case 24:

                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;

-               case 27: 
-                       term.c.attr.mode &= ~ATTR_REVERSE;       
+               case 27:
+                       term.c.attr.mode &= ~ATTR_REVERSE;

                        break;
                case 38:
                        break;
                case 38:

-                       if (i + 2 < l && attr[i + 1] == 5) {
+                       if(i + 2 < l && attr[i + 1] == 5) {

                                i += 2;
                                i += 2;

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

                                        term.c.attr.fg = attr[i];
                                else
                                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
                        }
                        else
                                        term.c.attr.fg = attr[i];
                                else
                                        fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]);
                        }
                        else

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

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

-                       if (i + 2 < l && attr[i + 1] == 5) {
+                       if(i + 2 < l && attr[i + 1] == 5) {

                                i += 2;
                                i += 2;

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

                                        term.c.attr.bg = attr[i];
                                else
                                        fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
                        }
                        else
                                        term.c.attr.bg = attr[i];
                                else
                                        fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]);
                        }
                        else

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

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


@@ -913,7 +1057,7 @@ tsetattr(int *attr, int l) {
                                term.c.attr.fg = attr[i] - 90 + 8;
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;
                                term.c.attr.fg = attr[i] - 90 + 8;
                        else if(BETWEEN(attr[i], 100, 107))
                                term.c.attr.fg = attr[i] - 100 + 8;

-                       else 
+                       else

                                fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
                        
                        break;
                                fprintf(stderr, "erresc: gfx attr %d unknown\n", attr[i]), csidump();
                        
                        break;


@@ -933,7 +1077,7 @@ tsetscroll(int t, int b) {
                b = temp;
        }
        term.top = t;
                b = temp;
        }
        term.top = t;

-       term.bot = b;    
+       term.bot = b;

 }
 
 void
 }
 
 void


@@ -941,7 +1085,7 @@ csihandle(void) {
        switch(escseq.mode) {
        default:
        unknown:
        switch(escseq.mode) {
        default:
        unknown:

-               printf("erresc: unknown csi ");
+               fprintf(stderr, "erresc: unknown csi ");

                csidump();
                /* die(""); */
                break;
                csidump();
                /* die(""); */
                break;


@@ -988,6 +1132,7 @@ csihandle(void) {
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */
                break;
        /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation <n> tab stops */
        case 'J': /* ED -- Clear screen */

+               sel.bx = -1;

                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);
                switch(escseq.arg[0]) {
                case 0: /* below */
                        tclearregion(term.c.x, term.c.y, term.col-1, term.c.y);


@@ -1037,7 +1182,11 @@ csihandle(void) {
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;
                        case 1:
                                term.mode &= ~MODE_APPKEYPAD;
                                break;

-                       case 5: /* TODO: DECSCNM -- Remove reverse video */
+                       case 5: /* DECSCNM -- Remove reverse video */
+                               if(IS_SET(MODE_REVERSE)) {
+                                       term.mode &= ~MODE_REVERSE;
+                                       draw();
+                               }

                                break;
                        case 7:
                                term.mode &= ~MODE_WRAP;
                                break;
                        case 7:
                                term.mode &= ~MODE_WRAP;


@@ -1050,13 +1199,20 @@ csihandle(void) {
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state |= CURSOR_HIDE;
                                break;

+                       case 1000: /* disable X11 xterm mouse reporting */
+                               term.mode &= ~MODE_MOUSEBTN;
+                               break;
+                       case 1002:
+                               term.mode &= ~MODE_MOUSEMOTION;
+                               break;

                        case 1049: /* = 1047 and 1048 */
                        case 1049: /* = 1047 and 1048 */

+                       case 47:

                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN)) {
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                        tswapscreen();
                                }

-                               if(escseq.arg[0] == 1047)
+                               if(escseq.arg[0] != 1049)

                                        break;
                        case 1048:
                                tcursor(CURSOR_LOAD);
                                        break;
                        case 1048:
                                tcursor(CURSOR_LOAD);


@@ -1098,7 +1254,10 @@ csihandle(void) {
                                term.mode |= MODE_APPKEYPAD;
                                break;
                        case 5: /* DECSCNM -- Reverve video */
                                term.mode |= MODE_APPKEYPAD;
                                break;
                        case 5: /* DECSCNM -- Reverve video */

-                               /* TODO: set REVERSE on the whole screen (f) */
+                               if(!IS_SET(MODE_REVERSE)) {
+                                       term.mode |= MODE_REVERSE;
+                                       draw();
+                               }

                                break;
                        case 7:
                                term.mode |= MODE_WRAP;
                                break;
                        case 7:
                                term.mode |= MODE_WRAP;


@@ -1113,13 +1272,20 @@ csihandle(void) {
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;
                        case 25:
                                term.c.state &= ~CURSOR_HIDE;
                                break;

+                       case 1000: /* 1000,1002: enable xterm mouse report */
+                               term.mode |= MODE_MOUSEBTN;
+                               break;
+                       case 1002:
+                               term.mode |= MODE_MOUSEMOTION;
+                               break;

                        case 1049: /* = 1047 and 1048 */
                        case 1049: /* = 1047 and 1048 */

+                       case 47:

                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();
                        case 1047:
                                if(IS_SET(MODE_ALTSCREEN))
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                else
                                        tswapscreen();

-                               if(escseq.arg[0] == 1047)
+                               if(escseq.arg[0] != 1049)

                                        break;
                        case 1048:
                                tcursor(CURSOR_SAVE);
                                        break;
                        case 1048:
                                tcursor(CURSOR_SAVE);


@@ -1158,7 +1324,7 @@ csihandle(void) {
 }
 
 void
 }
 
 void

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

        int i;
        printf("ESC [ %s", escseq.priv ? "? " : "");
        if(escseq.narg)
        int i;
        printf("ESC [ %s", escseq.priv ? "? " : "");
        if(escseq.narg)


@@ -1191,7 +1357,7 @@ tputc(char *c) {
                                csiparse(), csihandle();
                        }
                        /* TODO: handle other OSC */
                                csiparse(), csihandle();
                        }
                        /* TODO: handle other OSC */

-               } else if(term.esc & ESC_OSC) { 
+               } else if(term.esc & ESC_OSC) {

                        if(ascii == ';') {
                                term.titlelen = 0;
                                term.esc = ESC_START | ESC_TITLE;
                        if(ascii == ';') {
                                term.titlelen = 0;
                                term.esc = ESC_START | ESC_TITLE;


@@ -1200,7 +1366,7 @@ tputc(char *c) {
                        if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
                                term.esc = 0;
                                term.title[term.titlelen] = '\0';
                        if(ascii == '\a' || term.titlelen+1 >= ESC_TITLE_SIZ) {
                                term.esc = 0;
                                term.title[term.titlelen] = '\0';

-                               XStoreName(xw.dis, xw.win, term.title);
+                               XStoreName(xw.dpy, xw.win, term.title);

                        } else {
                                term.title[term.titlelen++] = ascii;
                        }
                        } else {
                                term.title[term.titlelen++] = ascii;
                        }


@@ -1213,7 +1379,7 @@ tputc(char *c) {
                                term.c.attr.mode &= ~ATTR_GFX;
                                break;
                        default:
                                term.c.attr.mode &= ~ATTR_GFX;
                                break;
                        default:

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

                        }
                        term.esc = 0;
                } else {
                        }
                        term.esc = 0;
                } else {


@@ -1272,6 +1438,8 @@ tputc(char *c) {
                        }
                }
        } else {
                        }
                }
        } else {

+               if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
+                       sel.bx = -1;

                switch(ascii) {
                case '\t':
                        tputtab();
                switch(ascii) {
                case '\t':
                        tputtab();


@@ -1304,7 +1472,6 @@ tputc(char *c) {
                                tmoveto(term.c.x+1, term.c.y);
                        else
                                term.c.state |= CURSOR_WRAPNEXT;
                                tmoveto(term.c.x+1, term.c.y);
                        else
                                term.c.state |= CURSOR_WRAPNEXT;

-                       break;

                }
        }
 }
                }
        }
 }


@@ -1340,9 +1507,11 @@ tresize(int col, int row) {
        /* resize to new height */
        term.line = realloc(term.line, row * sizeof(Line));
        term.alt  = realloc(term.alt,  row * sizeof(Line));
        /* resize to new height */
        term.line = realloc(term.line, row * sizeof(Line));
        term.alt  = realloc(term.alt,  row * sizeof(Line));

+       term.dirty = realloc(term.dirty, row * sizeof(*term.dirty));

 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {
 
        /* resize each row to new width, zero-pad if needed */
        for(i = 0; i < minrow; i++) {

+               term.dirty[i] = 1;

                term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
                for(x = mincol; x < col; x++) {
                term.line[i] = realloc(term.line[i], col * sizeof(Glyph));
                term.alt[i]  = realloc(term.alt[i],  col * sizeof(Glyph));
                for(x = mincol; x < col; x++) {


@@ -1353,6 +1522,7 @@ tresize(int col, int row) {
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {
 
        /* allocate any new rows */
        for(/* i == minrow */; i < row; i++) {

+               term.dirty[i] = 1;

                term.line[i] = calloc(col, sizeof(Glyph));
                term.alt [i] = calloc(col, sizeof(Glyph));
        }
                term.line[i] = calloc(col, sizeof(Glyph));
                term.alt [i] = calloc(col, sizeof(Glyph));
        }


@@ -1363,6 +1533,7 @@ tresize(int col, int row) {
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */
        tsetscroll(0, row-1);
        tmoveto(term.c.x, term.c.y);
        /* reset scrolling region */
        tsetscroll(0, row-1);

+

        return (slide > 0);
 }
 
        return (slide > 0);
 }
 


@@ -1375,22 +1546,22 @@ xresize(int col, int row) {
        oldh = xw.bufh;
        xw.bufw = MAX(1, col * xw.cw);
        xw.bufh = MAX(1, row * xw.ch);
        oldh = xw.bufh;
        xw.bufw = MAX(1, col * xw.cw);
        xw.bufh = MAX(1, row * xw.ch);

-       newbuf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
-       XCopyArea(xw.dis, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
-       XFreePixmap(xw.dis, xw.buf);
-       XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+       newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));
+       XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0);
+       XFreePixmap(xw.dpy, xw.buf);
+       XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]);

        if(xw.bufw > oldw)
        if(xw.bufw > oldw)

-               XFillRectangle(xw.dis, newbuf, dc.gc, oldw, 0,
+               XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0,

                                xw.bufw-oldw, MIN(xw.bufh, oldh));
        else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))
                                xw.bufw-oldw, MIN(xw.bufh, oldh));
        else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw))

-               XClearArea(xw.dis, xw.win, BORDER+xw.bufw, BORDER,
+               XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER,

                                xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
                                False);
        if(xw.bufh > oldh)
                                xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh),
                                False);
        if(xw.bufh > oldh)

-               XFillRectangle(xw.dis, newbuf, dc.gc, 0, oldh,
+               XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh,

                                xw.bufw, xw.bufh-oldh);
        else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))
                                xw.bufw, xw.bufh-oldh);
        else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh))

-               XClearArea(xw.dis, xw.win, BORDER, BORDER+xw.bufh,
+               XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh,

                                xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
                                False);
        xw.buf = newbuf;
                                xw.w-2*BORDER, xw.h-xw.bufh-BORDER,
                                False);
        xw.buf = newbuf;


@@ -1400,10 +1571,10 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XColor color;
 xloadcols(void) {
        int i, r, g, b;
        XColor color;

-       unsigned long white = WhitePixel(xw.dis, xw.scr);
+       unsigned long white = WhitePixel(xw.dpy, xw.scr);

 
 

-       for(i = 0; i < 16; i++) {
-               if (!XAllocNamedColor(xw.dis, xw.cmap, colorname[i], &color, &color)) {
+       for(i = 0; i < LEN(colorname); i++) {
+               if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) {

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


@@ -1417,7 +1588,7 @@ xloadcols(void) {
                                color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;
                                color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                                color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g;
                                color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b;

-                               if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+                               if(!XAllocColor(xw.dpy, xw.cmap, &color)) {

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


@@ -1427,7 +1598,7 @@ xloadcols(void) {
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;
 
        for(r = 0; r < 24; r++, i++) {
                color.red = color.green = color.blue = 0x0808 + 0x0a0a * r;

-               if (!XAllocColor(xw.dis, xw.cmap, &color)) {
+               if (!XAllocColor(xw.dpy, xw.cmap, &color)) {

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


@@ -1437,15 +1608,14 @@ xloadcols(void) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {

-       XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
-       XFillRectangle(xw.dis, xw.buf, dc.gc,
+       XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]);
+       XFillRectangle(xw.dpy, xw.buf, dc.gc,

                       x1 * xw.cw, y1 * xw.ch,
                       (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void
                       x1 * xw.cw, y1 * xw.ch,
                       (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void

-xhints(void)
-{
+xhints(void) {

        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints size = {
        XClassHint class = {opt_class ? opt_class : TNAME, TNAME};
        XWMHints wm = {.flags = InputHint, .input = 1};
        XSizeHints size = {


@@ -1457,64 +1627,77 @@ xhints(void)
                .base_height = 2*BORDER,
                .base_width = 2*BORDER,
        };
                .base_height = 2*BORDER,
                .base_width = 2*BORDER,
        };

-       XSetWMProperties(xw.dis, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+       XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, &size, &wm, &class);
+}
+
+XFontSet
+xinitfont(char *fontstr) {
+       XFontSet set;
+       char *def, **missing;
+       int n;
+
+       missing = NULL;
+       set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def);
+       if(missing) {
+               while(n--)
+                       fprintf(stderr, "st: missing fontset: %s\n", missing[n]);
+               XFreeStringList(missing);
+       }
+       return set;

 }
 
 void
 }
 
 void

-xsetfontinfo(FontInfo *fi)
-{
+xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) {

        XFontStruct **xfonts;
        XFontStruct **xfonts;

-       int fnum;
-       int i;
-       char **fontnames;
-
-       fi->lbearing = 0;
-       fi->rbearing = 0;
-       fi->ascent = 0;
-       fi->descent = 0;
-       fnum = XFontsOfFontSet(fi->fs, &xfonts, &fontnames);
-       for(i=0; i<fnum; i++,xfonts++,fontnames++) {
-               puts(*fontnames);
-               if(fi->ascent < (*xfonts)->ascent)
-                       fi->ascent = (*xfonts)->ascent;
-               if(fi->descent < (*xfonts)->descent)
-                       fi->descent = (*xfonts)->descent;
-               if(fi->rbearing < (*xfonts)->max_bounds.rbearing)
-                       fi->rbearing = (*xfonts)->max_bounds.rbearing;
-               if(fi->lbearing < (*xfonts)->min_bounds.lbearing)
-                       fi->lbearing = (*xfonts)->min_bounds.lbearing;
+       char **font_names;
+       int i, n;
+
+       *ascent = *descent = *lbearing = *rbearing = 0;
+       n = XFontsOfFontSet(set, &xfonts, &font_names);
+       for(i = 0; i < n; i++) {
+               *ascent = MAX(*ascent, (*xfonts)->ascent);
+               *descent = MAX(*descent, (*xfonts)->descent);
+               *lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing);
+               *rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing);
+               xfonts++;

        }
 }
 
        }
 }
 

+void
+initfonts(char *fontstr, char *bfontstr) {
+       if((dc.font.set = xinitfont(fontstr)) == NULL ||
+          (dc.bfont.set = xinitfont(bfontstr)) == NULL)
+               die("Can't load font %s\n", dc.font.set ? BOLDFONT : FONT);
+       xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent,
+           &dc.font.lbearing, &dc.font.rbearing);
+       xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent,
+           &dc.bfont.lbearing, &dc.bfont.rbearing);
+}
+

 void
 xinit(void) {
        XSetWindowAttributes attrs;
 void
 xinit(void) {
        XSetWindowAttributes attrs;

-       char **mc;
-       char *ds;
-       int nmc;
+       Cursor cursor;
+       Window parent;

 
 

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

                die("Can't open display\n");
                die("Can't open display\n");

-       xw.scr = XDefaultScreen(xw.dis);
+       xw.scr = XDefaultScreen(xw.dpy);

        
        /* font */
        
        /* font */

-       if ((dc.font.fs = XCreateFontSet(xw.dis, FONT, &mc, &nmc, &ds)) == NULL ||
-           (dc.bfont.fs = XCreateFontSet(xw.dis, BOLDFONT, &mc, &nmc, &ds)) == NULL)
-               die("Can't load font %s\n", dc.font.fs ? BOLDFONT : FONT); 
-       xsetfontinfo(&dc.font);
-       xsetfontinfo(&dc.bfont);
+       initfonts(FONT, BOLDFONT);

 
        /* XXX: Assuming same size for bold font */
 
        /* XXX: Assuming same size for bold font */

-       xw.cw = dc.font.rbearing - dc.font.lbearing;
+       xw.cw = dc.font.rbearing - dc.font.lbearing;

        xw.ch = dc.font.ascent + dc.font.descent;
 
        /* colors */
        xw.ch = dc.font.ascent + dc.font.descent;
 
        /* colors */

-       xw.cmap = XDefaultColormap(xw.dis, xw.scr);
+       xw.cmap = XDefaultColormap(xw.dpy, xw.scr);

        xloadcols();
 
        /* window - default size */
        xloadcols();
 
        /* window - default size */

-       xw.bufh = 24 * xw.ch;
-       xw.bufw = 80 * xw.cw;
+       xw.bufh = term.row * xw.ch;
+       xw.bufw = term.col * xw.cw;

        xw.h = xw.bufh + 2*BORDER;
        xw.w = xw.bufw + 2*BORDER;
 
        xw.h = xw.bufh + 2*BORDER;
        xw.w = xw.bufw + 2*BORDER;
 


@@ -1523,60 +1706,78 @@ xinit(void) {
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask
        attrs.bit_gravity = NorthWestGravity;
        attrs.event_mask = FocusChangeMask | KeyPressMask
                | ExposureMask | VisibilityChangeMask | StructureNotifyMask

-               | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+               | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask
+               | EnterWindowMask | LeaveWindowMask;

        attrs.colormap = xw.cmap;
 
        attrs.colormap = xw.cmap;
 

-       xw.win = XCreateWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-                       xw.w, xw.h, 0, XDefaultDepth(xw.dis, xw.scr), InputOutput,
-                       XDefaultVisual(xw.dis, xw.scr),
+       parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+       xw.win = XCreateWindow(xw.dpy, parent, 0, 0,
+                       xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
+                       XDefaultVisual(xw.dpy, xw.scr),

                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        &attrs);
                        CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
                        | CWColormap,
                        &attrs);

-       xw.buf = XCreatePixmap(xw.dis, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dis, xw.scr));
+       xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr));

 
 
        /* input methods */
 
 
        /* input methods */

-       xw.xim = XOpenIM(xw.dis, NULL, NULL, NULL);
-       xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing 
-                                          | XIMStatusNothing, XNClientWindow, xw.win, 
+       xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
+       xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
+                                          | XIMStatusNothing, XNClientWindow, xw.win,

                                           XNFocusWindow, xw.win, NULL);
        /* gc */
                                           XNFocusWindow, xw.win, NULL);
        /* gc */

-       dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
+       dc.gc = XCreateGC(xw.dpy, xw.win, 0, NULL);

        
        

-       XMapWindow(xw.dis, xw.win);
+       /* white cursor, black outline */
+       cursor = XCreateFontCursor(xw.dpy, XC_xterm);
+       XDefineCursor(xw.dpy, xw.win, cursor);
+       XRecolorCursor(xw.dpy, cursor,
+               &(XColor){.red = 0xffff, .green = 0xffff, .blue = 0xffff},
+               &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000});
+
+       xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
+
+       XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st");
+       XMapWindow(xw.dpy, xw.win);

        xhints();
        xhints();

-       XStoreName(xw.dis, xw.win, opt_title ? opt_title : "st");
-       XSync(xw.dis, 0);
+       XSync(xw.dpy, 0);

 }
 
 void
 }
 
 void

-xdraws(char *s, Glyph base, int x, int y, int cl, int sl) {
-       unsigned long xfg, xbg;
-       int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = cl*xw.cw;
+xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
+       unsigned long xfg = dc.col[base.fg], xbg = dc.col[base.bg], temp;
+       int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;

        int i;
        int i;

+       
+       /* only switch default fg/bg if term is in RV mode */
+       if(IS_SET(MODE_REVERSE)) {
+               if(base.fg == DefaultFG)
+                       xfg = dc.col[DefaultBG];
+               if(base.bg == DefaultBG)
+                       xbg = dc.col[DefaultFG];
+       }

 
        if(base.mode & ATTR_REVERSE)
 
        if(base.mode & ATTR_REVERSE)

-               xfg = dc.col[base.bg], xbg = dc.col[base.fg];
-       else
-               xfg = dc.col[base.fg], xbg = dc.col[base.bg];
+               temp = xfg, xfg = xbg, xbg = temp;

 
 

-       XSetBackground(xw.dis, dc.gc, xbg);
-       XSetForeground(xw.dis, dc.gc, xfg);
+       XSetBackground(xw.dpy, dc.gc, xbg);
+       XSetForeground(xw.dpy, dc.gc, xfg);

 
 

-       if(base.mode & ATTR_GFX)
-               for(i = 0; i < cl; i++) {
+       if(base.mode & ATTR_GFX) {
+               for(i = 0; i < bytelen; i++) {

                        char c = gfx[(unsigned int)s[i] % 256];
                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)
                                s[i] -= 0x5f;
                }
                        char c = gfx[(unsigned int)s[i] % 256];
                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)
                                s[i] -= 0x5f;
                }

+       }

 
 

-       XmbDrawImageString(xw.dis, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.fs : dc.font.fs,
-           dc.gc, winx, winy, s, sl);
+       XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set,
+               dc.gc, winx, winy, s, bytelen);

        
        if(base.mode & ATTR_UNDERLINE)
        
        if(base.mode & ATTR_UNDERLINE)

-               XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
+               XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);

 }
 
 void
 }
 
 void


@@ -1594,50 +1795,28 @@ xdrawcursor(void) {
 
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET) {
 
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET) {

-               sl = slen(term.line[oldy][oldx].c);
+               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);
        
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
                xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl);
        } else
                xclear(oldx, oldy, oldx, oldy);
        
        /* draw the new one */
        if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {

-               sl = slen(g.c);
+               sl = utf8size(g.c);
+               if(IS_SET(MODE_REVERSE))
+                       g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;

                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
                xdraws(g.c, g, term.c.x, term.c.y, 1, sl);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 

-#ifdef DEBUG
-/* basic drawing routines */

 void
 void

-xdrawc(int x, int y, Glyph g) {
-       int sl = slen(g.c);
-       XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
-       XSetBackground(xw.dis, dc.gc, dc.col[g.bg]);
-       XSetForeground(xw.dis, dc.gc, dc.col[g.fg]);
-       XmbDrawImageString(xw.dis, xw.buf, g.mode&ATTR_BOLD?dc.bfont.fs:dc.font.fs,
-           dc.gc, r.x, r.y+dc.font.ascent, g.c, sl);
+draw() {
+       drawregion(0, 0, term.col, term.row);

 }
 
 void
 }
 
 void

-draw(int dummy) {
-       int x, y;
-
-       xclear(0, 0, term.col-1, term.row-1);
-       for(y = 0; y < term.row; y++)
-               for(x = 0; x < term.col; x++)
-                       if(term.line[y][x].state & GLYPH_SET)
-                               xdrawc(x, y, term.line[y][x]);
-
-       xdrawcursor();
-       XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
-       XFlush(xw.dis);
-}
-
-#else
-/* optimized drawing routine */
-void
-draw(int redraw_all) {
+drawregion(int x1, int y1, int x2, int y2) {

        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];


@@ -1645,16 +1824,19 @@ draw(int redraw_all) {
        if(!(xw.state & WIN_VISIBLE))
                return;
 
        if(!(xw.state & WIN_VISIBLE))
                return;
 

-       xclear(0, 0, term.col-1, term.row-1);
-       for(y = 0; y < term.row; y++) {
+       for(y = y1; y < y2; y++) {
+               if(!term.dirty[y])
+                       continue;
+               xclear(0, y, term.col, y);
+               term.dirty[y] = 0;

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

-               for(x = 0; x < term.col; x++) {
+               for(x = x1; x < x2; x++) {

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

-                       if(sel.bx!=-1 && *(new.c) && selected(x, y))
+                       if(sel.bx != -1 && *(new.c) && selected(x, y))

                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||
                                new.mode ^= ATTR_REVERSE;
                        if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) ||

-                                       ib >= DRAW_BUF_SIZ-UTF_SIZ)) {
+                                                 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;
                        }


@@ -1663,7 +1845,7 @@ draw(int redraw_all) {
                                        ox = x;
                                        base = new;
                                }
                                        ox = x;
                                        base = new;
                                }

-                               sl = slen(new.c);
+                               sl = utf8size(new.c);

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


@@ -1673,21 +1855,19 @@ draw(int redraw_all) {
                        xdraws(buf, base, ox, y, ic, ib);
        }
        xdrawcursor();
                        xdraws(buf, base, ox, y, ic, ib);
        }
        xdrawcursor();

-       XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);
+       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER);

 }
 
 }
 

-#endif
-

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

-                       draw(SCREEN_REDRAW);
+                       draw();

                }
        } else
                }
        } else

-               XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,
+               XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER,

                                e->width, e->height, e->x, e->y);
 }
 
                                e->width, e->height, e->x, e->y);
 }
 


@@ -1708,9 +1888,9 @@ unmap(XEvent *ev) {
 
 void
 xseturgency(int add) {
 
 void
 xseturgency(int add) {

-       XWMHints *h = XGetWMHints(xw.dis, xw.win);
+       XWMHints *h = XGetWMHints(xw.dpy, xw.win);

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

-       XSetWMHints(xw.dis, xw.win, h);
+       XSetWMHints(xw.dpy, xw.win, h);

        XFree(h);
 }
 
        XFree(h);
 }
 


@@ -1721,15 +1901,18 @@ focus(XEvent *ev) {
                xseturgency(0);
        } else
                xw.state &= ~WIN_FOCUSED;
                xseturgency(0);
        } else
                xw.state &= ~WIN_FOCUSED;

-       draw(SCREEN_UPDATE);
+       draw();

 }
 
 char*
 }
 
 char*

-kmap(KeySym k) {
+kmap(KeySym k, unsigned int state) {

        int i;
        int i;

-       for(i = 0; i < LEN(key); i++)
-               if(key[i].k == k)
+       state &= ~Mod2Mask;
+       for(i = 0; i < LEN(key); i++) {
+               unsigned int 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;
 }
 


@@ -1749,7 +1932,7 @@ kpress(XEvent *ev) {
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
        
        /* 1. custom keys from config.h */
        len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
        
        /* 1. custom keys from config.h */

-       if((customkey = kmap(ksym)))
+       if((customkey = kmap(ksym, e->state)))

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


@@ -1758,7 +1941,8 @@ kpress(XEvent *ev) {
                case XK_Down:
                case XK_Left:
                case XK_Right:
                case XK_Down:
                case XK_Left:
                case XK_Right:

-                       sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', "DACB"[ksym - XK_Left]);
+                       /* XXX: shift up/down doesn't work */
+                       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:


@@ -1774,16 +1958,29 @@ kpress(XEvent *ev) {
                        /* 3. X lookup  */
                default:
                        if(len > 0) {
                        /* 3. X lookup  */
                default:
                        if(len > 0) {

-                               buf[sizeof(buf)-1] = '\0';

                                if(meta && len == 1)
                                        ttywrite("\033", 1);
                                ttywrite(buf, len);
                                if(meta && len == 1)
                                        ttywrite("\033", 1);
                                ttywrite(buf, len);

-                       } else /* 4. nothing to send */
-                               fprintf(stderr, "errkey: %d\n", (int)ksym);
+                       }

                        break;
                }
 }
 
                        break;
                }
 }
 

+void
+cmessage(XEvent *e) {
+       /* See xembed specs
+          http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html */
+       if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) {
+               if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) {
+                       xw.state |= WIN_FOCUSED;
+                       xseturgency(0);
+               } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) {
+                       xw.state &= ~WIN_FOCUSED;
+               }
+               draw();
+       }
+}
+

 void
 resize(XEvent *e) {
        int col, row;
 void
 resize(XEvent *e) {
        int col, row;


@@ -1798,7 +1995,7 @@ resize(XEvent *e) {
        if(col == term.col && row == term.row)
                return;
        if(tresize(col, row))
        if(col == term.col && row == term.row)
                return;
        if(tresize(col, row))

-               draw(SCREEN_REDRAW);
+               draw();

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


@@ -1807,7 +2004,7 @@ void
 run(void) {
        XEvent ev;
        fd_set rfd;
 run(void) {
        XEvent ev;
        fd_set rfd;

-       int xfd = XConnectionNumber(xw.dis);
+       int xfd = XConnectionNumber(xw.dpy);

 
        for(;;) {
                FD_ZERO(&rfd);
 
        for(;;) {
                FD_ZERO(&rfd);


@@ -1820,11 +2017,11 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();

-                       draw(SCREEN_UPDATE); 
+                       draw();

                }
                }

-               while(XPending(xw.dis)) {
-                       XNextEvent(xw.dis, &ev);
-                       if (XFilterEvent(&ev, xw.win))
+               while(XPending(xw.dpy)) {
+                       XNextEvent(xw.dpy, &ev);
+                       if(XFilterEvent(&ev, xw.win))

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


@@ -1844,14 +2041,20 @@ main(int argc, char *argv[]) {
                case 'c':
                        if(++i < argc) opt_class = argv[i];
                        break;
                case 'c':
                        if(++i < argc) opt_class = argv[i];
                        break;

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

                        break;
                        break;

+               case 'e': 
+                       /* eat every remaining arguments */
+                       if(++i < argc) opt_cmd = &argv[i];
+                       goto run;

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

+
+ run:

        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        ttynew();
        setlocale(LC_CTYPE, "");
        tnew(80, 24);
        ttynew();