clean and name enum definitions.

[st.git] / st.c

diff --git a/st.c b/st.c
index ad6db0d..89d123c 100644 (file)
--- a/st.c
+++ b/st.c
@@ -6,6 +6,7 @@
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdarg.h>

+#include <stdbool.h>

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


@@ -13,8 +14,10 @@
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/stat.h>

+#include <sys/time.h>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/wait.h>

+#include <time.h>

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


@@ -22,9 +25,6 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 

-#include <sys/time.h>
-#include <time.h>
-

 #if   defined(__linux)
  #include <pty.h>
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
 #if   defined(__linux)
  #include <pty.h>
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)


@@ -34,7 +34,7 @@
 #endif
 
 #define USAGE \
 #endif
 
 #define USAGE \

-       "st " VERSION " (c) 2010-2011 st engineers\n" \
+       "st " VERSION " (c) 2010-2012 st engineers\n" \

        "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */
        "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n"
 
 /* XEMBED messages */


@@ -50,6 +50,9 @@
 #define XK_NO_MOD     UINT_MAX
 #define XK_ANY_MOD    0
 
 #define XK_NO_MOD     UINT_MAX
 #define XK_ANY_MOD    0
 

+#define SELECT_TIMEOUT (20*1000) /* 20 ms */
+#define DRAW_TIMEOUT  (20*1000) /* 20 ms */
+

 #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))


@@ -63,26 +66,75 @@
 #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)
 

-/* 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 };
-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 };
-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 { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 };
+enum glyph_attribute {
+       ATTR_NULL      = 0,
+       ATTR_REVERSE   = 1,
+       ATTR_UNDERLINE = 2,
+       ATTR_BOLD      = 4,
+       ATTR_GFX       = 8,
+};
+
+enum cursor_movement {
+       CURSOR_UP,
+       CURSOR_DOWN,
+       CURSOR_LEFT,
+       CURSOR_RIGHT,
+       CURSOR_SAVE,
+       CURSOR_LOAD
+};
+
+enum cursor_state {
+       CURSOR_DEFAULT  = 0,
+       CURSOR_HIDE     = 1,
+       CURSOR_WRAPNEXT = 2
+};

 
 

+enum glyph_state {
+       GLYPH_SET   = 1,
+       GLYPH_DIRTY = 2
+};
+
+enum term_mode {
+       MODE_WRAP        = 1,
+       MODE_INSERT      = 2,
+       MODE_APPKEYPAD   = 4,
+       MODE_ALTSCREEN   = 8,
+       MODE_CRLF        = 16,
+       MODE_MOUSEBTN    = 32,
+       MODE_MOUSEMOTION = 64,
+       MODE_MOUSE       = 32|64,
+       MODE_REVERSE     = 128
+};
+
+enum escape_state {
+       ESC_START      = 1,
+       ESC_CSI        = 2,
+       ESC_OSC        = 4,
+       ESC_TITLE      = 8,
+       ESC_ALTCHARSET = 16
+};
+
+enum window_state {
+       WIN_VISIBLE = 1,
+       WIN_REDRAW  = 2,
+       WIN_FOCUSED = 4
+};
+
+/* bit macro */

 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 
 #undef B0
 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 };
 

+typedef unsigned char uchar;
+typedef unsigned int uint;
+typedef unsigned long ulong;
+typedef unsigned short ushort;
+

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

-       char mode;  /* attribute flags */
-       int fg;     /* foreground      */
-       int bg;     /* background      */
-       char state; /* state flags     */
+       uchar mode;  /* attribute flags */
+       ushort fg;   /* foreground  */
+       ushort bg;   /* background  */
+       uchar state; /* state flags    */

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


@@ -111,7 +163,7 @@ typedef struct {
        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 */
+       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 */


@@ -138,26 +190,15 @@ typedef struct {
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */
        int ch; /* char height */
        int cw; /* char width  */
        char state; /* focus, redraw, visible */

+       struct timeval lastdraw;

 } XWindow;
 
 typedef struct {
        KeySym k;
 } XWindow;
 
 typedef struct {
        KeySym k;

-       unsigned int mask;
+       uint mask;

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

-/* Drawing Context */
-typedef struct {
-       unsigned long col[256];
-       GC gc;
-       struct {
-               int ascent;
-               int descent;
-               short lbearing;
-               short rbearing;
-               XFontSet set;
-       } font, bfont;
-} DC;

 
 /* TODO: use better name for vars... */
 typedef struct {
 
 /* TODO: use better name for vars... */
 typedef struct {


@@ -173,12 +214,26 @@ typedef struct {
 
 #include "config.h"
 
 
 #include "config.h"
 

+/* Drawing Context */
+typedef struct {
+       ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)];
+       GC gc;
+       struct {
+               int ascent;
+               int descent;
+               short lbearing;
+               short rbearing;
+               XFontSet set;
+       } font, bfont;
+} DC;
+

 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 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 bool last_draw_too_old(void);

 
 static void csidump(void);
 static void csihandle(void);
 
 static void csidump(void);
 static void csihandle(void);


@@ -214,6 +269,7 @@ static void ttywrite(const char *, size_t);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);
 static void xdraws(char *, Glyph, int, int, int, int);
 static void xhints(void);
 static void xclear(int, int, int, int);

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

 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);
 static void xdrawcursor(void);
 static void xinit(void);
 static void xloadcols(void);


@@ -224,7 +280,7 @@ 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, unsigned int state);
+static char* kmap(KeySym, uint);

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


@@ -236,7 +292,7 @@ static void selnotify(XEvent *);
 static void selrequest(XEvent *);
 
 static void selinit(void);
 static void selrequest(XEvent *);
 
 static void selinit(void);

-static inline int selected(int, int);
+static inline bool selected(int, int);

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


@@ -277,31 +333,31 @@ static char *opt_class = NULL;
 
 int
 utf8decode(char *s, long *u) {
 
 int
 utf8decode(char *s, long *u) {

-       unsigned char c;
+       uchar c;

        int i, n, rtn;
 
        rtn = 1;
        c = *s;
        int i, n, rtn;
 
        rtn = 1;
        c = *s;

-       if(~c&B7) { /* 0xxxxxxx */
+       if(~c & B7) { /* 0xxxxxxx */

                *u = c;
                return rtn;
                *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 */
-               *u = c&(B2|B1|B0);
+       } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */
+               *u = c & (B2|B1|B0);

                n = 3;
        } else
                goto invalid;
                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;
                        goto invalid;
                *u <<= 6;

-               *u |= c&(B5|B4|B3|B2|B1|B0);
+               *u |= c & (B5|B4|B3|B2|B1|B0);

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


@@ -316,11 +372,11 @@ invalid:
 
 int
 utf8encode(long *u, char *s) {
 
 int
 utf8encode(long *u, char *s) {

-       unsigned char *sp;
-       unsigned long uc;
+       uchar *sp;
+       ulong uc;

        int i, n;
 
        int i, n;
 

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

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


@@ -352,11 +408,11 @@ invalid:
    UTF-8 otherwise return 0 */
 int
 isfullutf8(char *s, int b) {
    UTF-8 otherwise return 0 */
 int
 isfullutf8(char *s, int b) {

-       unsigned char *c1, *c2, *c3;
+       uchar *c1, *c2, *c3;

 
 

-       c1 = (unsigned char *) s;
-       c2 = (unsigned char *) ++s;
-       c3 = (unsigned char *) ++s;
+       c1 = (uchar *) s;
+       c2 = (uchar *) ++s;
+       c3 = (uchar *) ++s;

        if(b < 1)
                return 0;
        else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)
        if(b < 1)
                return 0;
        else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1)


@@ -376,7 +432,7 @@ isfullutf8(char *s, int b) {
 
 int
 utf8size(char *s) {
 
 int
 utf8size(char *s) {

-       unsigned char c = *s;
+       uchar c = *s;

 
        if(~c&B7)
                return 1;
 
        if(~c&B7)
                return 1;


@@ -400,7 +456,7 @@ selinit(void) {
                sel.xtarget = XA_STRING;
 }
 
                sel.xtarget = XA_STRING;
 }
 

-static inline int
+static inline bool

 selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);
 selected(int x, int y) {
        if(sel.ey == y && sel.by == y) {
                int bx = MIN(sel.bx, sel.ex);


@@ -463,6 +519,9 @@ bpress(XEvent *e) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {
        if(IS_SET(MODE_MOUSE))
                mousereport(e);
        else if(e->xbutton.button == Button1) {

+               if(sel.bx != -1)
+                       for(int i=sel.b.y; i<=sel.e.y; i++)
+                               term.dirty[i] = 1;

                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);
                sel.mode = 1;
                sel.ex = sel.bx = X2COL(e->xbutton.x);
                sel.ey = sel.by = Y2ROW(e->xbutton.y);


@@ -496,9 +555,9 @@ selcopy(void) {
 
 void
 selnotify(XEvent *e) {
 
 void
 selnotify(XEvent *e) {

-       unsigned long nitems, ofs, rem;
+       ulong nitems, ofs, rem;

        int format;
        int format;

-       unsigned char *data;
+       uchar *data;

        Atom type;
 
        ofs = 0;
        Atom type;
 
        ofs = 0;


@@ -542,12 +601,12 @@ selrequest(XEvent *e) {
                Atom string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,
                Atom string = sel.xtarget;
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                XA_ATOM, 32, PropModeReplace,

-                               (unsigned char *) &string, 1);
+                               (uchar *) &string, 1);

                xev.property = xsre->property;
                xev.property = xsre->property;

-       } else if(xsre->target == sel.xtarget) {
+       } else if(xsre->target == sel.xtarget && sel.clip != NULL) {

                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,
                XChangeProperty(xsre->display, xsre->requestor, xsre->property,
                                xsre->target, 8, PropModeReplace,

-                               (unsigned char *) sel.clip, strlen(sel.clip));
+                               (uchar *) sel.clip, strlen(sel.clip));

                xev.property = xsre->property;
        }
 
                xev.property = xsre->property;
        }
 


@@ -583,6 +642,7 @@ brelease(XEvent *e) {
        else if(e->xbutton.button == Button1) {
                sel.mode = 0;
                getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
        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) {
                        struct timeval now;
                        sel.bx = -1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        struct timeval now;
                        sel.bx = -1;


@@ -627,7 +687,9 @@ bmotion(XEvent *e) {
                if(oldey != sel.ey || oldex != sel.ex) {
                        int starty = MIN(oldey, sel.ey);
                        int endy = MAX(oldey, sel.ey);
                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));
+                       for(int i = starty; i <= endy; i++)
+                               term.dirty[i] = 1;
+                       draw();

                }
        }
 }
                }
        }
 }


@@ -1325,14 +1387,8 @@ csihandle(void) {
 
 void
 csidump(void) {
 
 void
 csidump(void) {

-       int i;
-       printf("ESC [ %s", escseq.priv ? "? " : "");
-       if(escseq.narg)
-               for(i = 0; i < escseq.narg; i++)
-                       printf("%d ", escseq.arg[i]);
-       if(escseq.mode)
-               putchar(escseq.mode);
-       putchar('\n');
+       fwrite("\033[", 1, 2, stdout);
+       fwrite(escseq.buf, 1, escseq.len, stdout);

 }
 
 void
 }
 
 void


@@ -1433,7 +1489,7 @@ tputc(char *c) {
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",
                                break;
                        default:
                                fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n",

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

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


@@ -1571,18 +1627,21 @@ void
 xloadcols(void) {
        int i, r, g, b;
        XColor color;
 xloadcols(void) {
        int i, r, g, b;
        XColor color;

-       unsigned long white = WhitePixel(xw.dpy, xw.scr);
+       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++) {
        for(i = 0; i < LEN(colorname); i++) {

+               if(!colorname[i])
+                       continue;

                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] = color.pixel;
        }
                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] = color.pixel;
        }

-
-       /* same colors as xterm */
-       for(r = 0; r < 6; r++)
+       
+       /* load colors [16-255] ; same colors as xterm */
+       for(i = 16, r = 0; r < 6; r++)

                for(g = 0; g < 6; g++)
                        for(b = 0; b < 6; b++) {
                                color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;
                for(g = 0; g < 6; g++)
                        for(b = 0; b < 6; b++) {
                                color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r;


@@ -1745,27 +1804,33 @@ 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) {

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

        int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
        int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw;

+       XFontSet fontset = dc.font.set;

        int i;
        
        /* only switch default fg/bg if term is in RV mode */
        if(IS_SET(MODE_REVERSE)) {
        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(fg == DefaultFG)
+                       fg = DefaultBG;
+               if(bg == DefaultBG)
+                       bg = DefaultFG;

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

-               temp = xfg, xfg = xbg, xbg = temp;
+               temp = fg, fg = bg, bg = temp;

 
 

-       XSetBackground(xw.dpy, dc.gc, xbg);
-       XSetForeground(xw.dpy, dc.gc, xfg);
+       if(base.mode & ATTR_BOLD) {
+               fg += 8;
+               fontset = dc.bfont.set;
+       }
+
+       XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
+       XSetForeground(xw.dpy, dc.gc, dc.col[fg]);

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

-                       char c = gfx[(unsigned int)s[i] % 256];
+                       char c = gfx[(uint)s[i] % 256];

                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)
                        if(c)
                                s[i] = c;
                        else if(s[i] > 0x5f)


@@ -1773,13 +1838,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                }
        }
 
                }
        }
 

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

        
        if(base.mode & ATTR_UNDERLINE)
                XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
 
        
        if(base.mode & ATTR_UNDERLINE)
                XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
 

+/* copy buffer pixmap to screen pixmap */
+void
+xcopy(int x, int y, int cols, int rows) {
+       int src_x = x*xw.cw, src_y = y*xw.ch, src_w = cols*xw.cw, src_h = rows*xw.ch;
+       int dst_x = BORDER+src_x, dst_y = BORDER+src_y;
+       XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, src_x, src_y, src_w, src_h, dst_x, dst_y);
+}
+

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


@@ -1799,20 +1871,29 @@ xdrawcursor(void) {
                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
                xclear(oldx, oldy, oldx, oldy);

-       
+
+       xcopy(oldx, oldy, 1, 1);
+

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

-       if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) {
-               sl = utf8size(g.c);
+       if(!(term.c.state & CURSOR_HIDE)) {
+               if(!(xw.state & WIN_FOCUSED))
+                       g.bg = DefaultUCS;
+

                if(IS_SET(MODE_REVERSE))
                        g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;
                if(IS_SET(MODE_REVERSE))
                        g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG;

+
+               sl = utf8size(g.c);

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

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

 }
 
 void
 draw() {
        drawregion(0, 0, term.col, term.row);
 }
 
 void
 draw() {
        drawregion(0, 0, term.col, term.row);

+       gettimeofday(&xw.lastdraw, NULL);

 }
 
 void
 }
 
 void


@@ -1853,9 +1934,9 @@ drawregion(int x1, int y1, int x2, int y2) {
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);
                }
                if(ib > 0)
                        xdraws(buf, base, ox, y, ic, ib);

+               xcopy(0, y, term.col, 1);

        }
        xdrawcursor();
        }
        xdrawcursor();

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

 }
 
 void
 }
 
 void


@@ -1864,7 +1945,7 @@ expose(XEvent *ev) {
        if(xw.state & WIN_REDRAW) {
                if(!e->count) {
                        xw.state &= ~WIN_REDRAW;
        if(xw.state & WIN_REDRAW) {
                if(!e->count) {
                        xw.state &= ~WIN_REDRAW;

-                       draw();
+                       xcopy(0, 0, term.col, term.row);

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


@@ -1905,11 +1986,11 @@ focus(XEvent *ev) {
 }
 
 char*
 }
 
 char*

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

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

-               unsigned int mask = key[i].mask;
+               uint mask = key[i].mask;

                if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
                        return (char*)key[i].s;
        }
                if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
                        return (char*)key[i].s;
        }


@@ -2000,25 +2081,42 @@ resize(XEvent *e) {
        xresize(col, row);
 }
 
        xresize(col, row);
 }
 

+bool
+last_draw_too_old(void) {
+       struct timeval now;
+       gettimeofday(&now, NULL);
+       return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000;
+}
+

 void
 run(void) {
        XEvent ev;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy);
 void
 run(void) {
        XEvent ev;
        fd_set rfd;
        int xfd = XConnectionNumber(xw.dpy);

-
+       struct timeval timeout = {0};
+       bool stuff_to_print = 0;
+       

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

-               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) {
+               timeout.tv_sec  = 0;
+               timeout.tv_usec = SELECT_TIMEOUT;
+               if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) {

                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                        if(errno == EINTR)
                                continue;
                        die("select failed: %s\n", SERRNO);
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();

+                       stuff_to_print = 1;
+               }
+
+               if(stuff_to_print && last_draw_too_old()) {
+                       stuff_to_print = 0;

                        draw();
                }
                        draw();
                }

+

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


@@ -2044,7 +2142,7 @@ main(int argc, char *argv[]) {
                case 'w':
                        if(++i < argc) opt_embed = argv[i];
                        break;
                case 'w':
                        if(++i < argc) opt_embed = argv[i];
                        break;

-               case 'e': 
+               case 'e':

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