Xinqi Bao's Git

projects / st.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
use SHELL environment variable (thx Thomas Adam)
[st.git] / st.c
diff --git a/st.c b/st.c
old mode 100644 (file)
new mode 100755 (executable)
index fcb3d65..ee79a33
--- a/st.c
+++ b/st.c
@@ -57,7 +57,6 @@ typedef Glyph* Line;
 
 typedef struct {
        Glyph attr;  /* current char attributes */
 
 typedef struct {
        Glyph attr;  /* current char attributes */
-       char hidden;
        int x;
        int y;
 } TCursor;
        int x;
        int y;
 } TCursor;
@@ -79,6 +78,7 @@ typedef struct {
        int col;    /* nb col */
        Line* line; /* screen */
        TCursor c;  /* cursor */
        int col;    /* nb col */
        Line* line; /* screen */
        TCursor c;  /* cursor */
+       char hidec;
        int top;    /* top    scroll limit */
        int bot;    /* bottom scroll limit */
        int mode;   /* terminal mode flags */
        int top;    /* top    scroll limit */
        int bot;    /* bottom scroll limit */
        int mode;   /* terminal mode flags */
@@ -91,6 +91,7 @@ typedef struct {
 typedef struct {
        Display* dis;
        Window win;
 typedef struct {
        Display* dis;
        Window win;
+       Pixmap buf;
        int scr;
        int w;  /* window width  */
        int h;  /* window height */
        int scr;
        int w;  /* window width  */
        int h;  /* window height */
@@ -109,6 +110,7 @@ typedef struct {
 typedef struct {
        unsigned long col[LEN(colorname)];
        XFontStruct* font;
 typedef struct {
        unsigned long col[LEN(colorname)];
        XFontStruct* font;
+       XFontStruct* bfont;
        GC gc;
 } DC;
 
        GC gc;
 } DC;
 
@@ -135,8 +137,11 @@ static void tnew(int, int);
 static void tnewline(void);
 static void tputc(char);
 static void tputs(char*, int);
 static void tnewline(void);
 static void tputc(char);
 static void tputs(char*, int);
+static void treset(void);
 static void tresize(int, int);
 static void tscroll(void);
 static void tresize(int, int);
 static void tscroll(void);
+static void tscrollup(int);
+static void tscrolldown(int);
 static void tsetattr(int*, int);
 static void tsetchar(char);
 static void tsetscroll(int, int);
 static void tsetattr(int*, int);
 static void tsetchar(char);
 static void tsetscroll(int, int);
@@ -149,12 +154,10 @@ static void ttywrite(const char *, size_t);
 static unsigned long xgetcol(const char *);
 static void xclear(int, int, int, int);
 static void xcursor(int);
 static unsigned long xgetcol(const char *);
 static void xclear(int, int, int, int);
 static void xcursor(int);
-static void xdrawc(int, int, Glyph);
 static void xinit(void);
 static void xinit(void);
-static void xscroll(void);
 
 static void expose(XEvent *);
 
 static void expose(XEvent *);
-static char * kmap(KeySym);
+static char* kmap(KeySym);
 static void kpress(XEvent *);
 static void resize(XEvent *);
 
 static void kpress(XEvent *);
 static void resize(XEvent *);
 
@@ -205,14 +208,17 @@ die(const char *errstr, ...) {
 
 void
 execsh(void) {
 
 void
 execsh(void) {
-       char *args[3] = {SHELL, "-i", NULL};
+       char *shell = getenv("SHELL");
+       if(!shell)
+               shell = "/bin/sh";
+       char *args[3] = {shell, "-i", NULL};
        putenv("TERM=" TNAME);
        putenv("TERM=" TNAME);
-       execvp(SHELL, args);
+       execvp(shell, args);
 }
 
 void
 xbell(void) { /* visual bell */
 }
 
 void
 xbell(void) { /* visual bell */
-       XRectangle r = { 0, 0, xw.w, xw.h };
+       XRectangle r = { BORDER, BORDER, xw.w, xw.h };
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
        /* usleep(30000); */
        XSetForeground(xw.dis, dc.gc, dc.col[BellCol]);
        XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1);
        /* usleep(30000); */
@@ -312,6 +318,18 @@ tcursor(int mode) {
                term.c = c, tmoveto(c.x, c.y);
 }
 
                term.c = c, tmoveto(c.x, c.y);
 }
 
+void
+treset(void) {
+       term.c.attr.mode = ATTR_NULL;
+       term.c.attr.fg = DefaultFG;
+       term.c.attr.bg = DefaultBG;
+       term.c.x = term.c.y = 0;
+       term.hidec = 0;
+       term.top = 0, term.bot = term.row - 1;
+       term.mode = MODE_WRAP;
+       tclearregion(0, 0, term.col-1, term.row-1);
+}
+
 void
 tnew(int col, int row) {   /* screen size */
        term.row = row, term.col = col;
 void
 tnew(int col, int row) {   /* screen size */
        term.row = row, term.col = col;
@@ -323,25 +341,58 @@ tnew(int col, int row) {   /* screen size */
        term.c.attr.fg = DefaultFG;
        term.c.attr.bg = DefaultBG;
        term.c.x = term.c.y = 0;
        term.c.attr.fg = DefaultFG;
        term.c.attr.bg = DefaultBG;
        term.c.x = term.c.y = 0;
-       term.c.hidden = 0;
+       term.hidec = 0;
        /* allocate screen */
        term.line = calloc(term.row, sizeof(Line));
        for(row = 0 ; row < term.row; row++)
                term.line[row] = calloc(term.col, sizeof(Glyph));
 }
 
        /* allocate screen */
        term.line = calloc(term.row, sizeof(Line));
        for(row = 0 ; row < term.row; row++)
                term.line[row] = calloc(term.col, sizeof(Glyph));
 }
 
+/* TODO: Replace with scrollup/scolldown */
 void
 tscroll(void) {
        Line temp = term.line[term.top];
        int i;
 void
 tscroll(void) {
        Line temp = term.line[term.top];
        int i;
-       /* X stuff _before_ the line swapping (results in wrong line index) */
-       xscroll();
+
        for(i = term.top; i < term.bot; i++)
                term.line[i] = term.line[i+1];
        memset(temp, 0, sizeof(Glyph) * term.col);
        term.line[term.bot] = temp;
 }
 
        for(i = term.top; i < term.bot; i++)
                term.line[i] = term.line[i+1];
        memset(temp, 0, sizeof(Glyph) * term.col);
        term.line[term.bot] = temp;
 }
 
+void
+tscrolldown (int n) {
+       int i;
+       Line temp;
+       
+       LIMIT(n, 0, term.bot-term.top+1);
+
+       for(i = 0; i < n; i++)
+               memset(term.line[term.bot-i], 0, term.col*sizeof(Glyph));
+       
+       for(i = term.bot; i >= term.top+n; i--) {
+               temp = term.line[i];
+               term.line[i] = term.line[i-n];
+               term.line[i-n] = temp;
+       }
+}
+
+void
+tscrollup (int n) {
+       int i;
+       Line temp;
+       LIMIT(n, 0, term.bot-term.top+1);
+       
+       for(i = 0; i < n; i++)
+               memset(term.line[term.top+i], 0, term.col*sizeof(Glyph));
+       
+        for(i = term.top; i <= term.bot-n; i++) { 
+                temp = term.line[i];
+                term.line[i] = term.line[i+n]; 
+                term.line[i+n] = temp;
+        }
+}
+
 void
 tnewline(void) {
        int y = term.c.y + 1;
 void
 tnewline(void) {
        int y = term.c.y + 1;
@@ -415,24 +466,25 @@ void
 tsetchar(char c) {
        term.line[term.c.y][term.c.x] = term.c.attr;
        term.line[term.c.y][term.c.x].c = c;
 tsetchar(char c) {
        term.line[term.c.y][term.c.x] = term.c.attr;
        term.line[term.c.y][term.c.x].c = c;
-       term.line[term.c.y][term.c.x].state |= GLYPH_SET | GLYPH_DIRTY;
+       term.line[term.c.y][term.c.x].state |= GLYPH_SET;
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
 }
 
 void
 tclearregion(int x1, int y1, int x2, int y2) {
-       int x, y;
+       int y, temp;
+
+       if(x1 > x2)
+               temp = x1, x1 = x2, x2 = temp;
+       if(y1 > y2)
+               temp = y1, y1 = y2, y2 = temp;
 
        LIMIT(x1, 0, term.col-1);
        LIMIT(x2, 0, term.col-1);
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
 
        LIMIT(x1, 0, term.col-1);
        LIMIT(x2, 0, term.col-1);
        LIMIT(y1, 0, term.row-1);
        LIMIT(y2, 0, term.row-1);
 
-       /* XXX: could be optimized */
-       for(x = x1; x <= x2; x++)
-               for(y = y1; y <= y2; y++)
-                       memset(&term.line[y][x], 0, sizeof(Glyph));
-
-       xclear(x1, y1, x2, y2);
+       for(y = y1; y <= y2; y++)
+               memset(&term.line[y][x1], 0, sizeof(Glyph)*(x2-x1+1));
 }
 
 void
 }
 
 void
@@ -463,13 +515,6 @@ tinsertblank(int n) {
        tclearregion(src, term.c.y, dst, term.c.y);
 }
 
        tclearregion(src, term.c.y, dst, term.c.y);
 }
 
-void
-tsetlinestate(int n, int state) {
-       int i;
-       for(i = 0; i < term.col; i++)
-               term.line[n][i].state |= state;
-}
-
 void
 tinsertblankline(int n) {
        int i;
 void
 tinsertblankline(int n) {
        int i;
@@ -491,8 +536,6 @@ tinsertblankline(int n) {
                term.line[i-n] = blank;
                /* blank it */
                memset(blank, 0, term.col * sizeof(Glyph));
                term.line[i-n] = blank;
                /* blank it */
                memset(blank, 0, term.col * sizeof(Glyph));
-               tsetlinestate(i, GLYPH_DIRTY);
-               tsetlinestate(i-n, GLYPH_DIRTY);
        }
 }
 
        }
 }
 
@@ -517,8 +560,6 @@ tdeleteline(int n) {
                term.line[i+n] = blank;
                /* blank it */
                memset(blank, 0, term.col * sizeof(Glyph));
                term.line[i+n] = blank;
                /* blank it */
                memset(blank, 0, term.col * sizeof(Glyph));
-               tsetlinestate(i, GLYPH_DIRTY);
-               tsetlinestate(i-n, GLYPH_DIRTY);
        }
 }
 
        }
 }
 
@@ -542,9 +583,6 @@ tsetattr(int *attr, int l) {
                case 7: 
                        term.c.attr.mode |= ATTR_REVERSE;       
                        break;
                case 7: 
                        term.c.attr.mode |= ATTR_REVERSE;       
                        break;
-               case 8:
-                       term.c.hidden = CURSOR_HIDE;
-                       break;
                case 22: 
                        term.c.attr.mode &= ~ATTR_BOLD;  
                        break;
                case 22: 
                        term.c.attr.mode &= ~ATTR_BOLD;  
                        break;
@@ -565,6 +603,8 @@ tsetattr(int *attr, int l) {
                                term.c.attr.fg = attr[i] - 30;
                        else if(BETWEEN(attr[i], 40, 47))
                                term.c.attr.bg = attr[i] - 40;
                                term.c.attr.fg = attr[i] - 30;
                        else if(BETWEEN(attr[i], 40, 47))
                                term.c.attr.bg = attr[i] - 40;
+                       else 
+                               fprintf(stderr, "erresc: gfx attr %d unkown\n", attr[i]); 
                        break;
                }
        }
                        break;
                }
        }
@@ -590,7 +630,7 @@ csihandle(void) {
        switch(escseq.mode) {
        default:
        unknown:
        switch(escseq.mode) {
        default:
        unknown:
-               printf("erresc: unknown sequence -- ");
+               printf("erresc: unknown csi ");
                csidump();
                /* die(""); */
                break;
                csidump();
                /* die(""); */
                break;
@@ -665,7 +705,14 @@ csihandle(void) {
                        break;
                }
                break;
                        break;
                }
                break;
-       case 'S': /* XXX: SU -- Scroll <n> line up (faked) */ 
+       case 'S': /* SU -- Scroll <n> line up */
+               DEFAULT(escseq.arg[0], 1);
+               tscrollup(escseq.arg[0]);
+               break;
+       case 'T': /* SD -- Scroll <n> line down */
+               DEFAULT(escseq.arg[0], 1);
+               tscrolldown(escseq.arg[0]);
+               break;
        case 'L': /* IL -- Insert <n> blank lines */
                DEFAULT(escseq.arg[0], 1);
                tinsertblankline(escseq.arg[0]);
        case 'L': /* IL -- Insert <n> blank lines */
                DEFAULT(escseq.arg[0], 1);
                tinsertblankline(escseq.arg[0]);
@@ -682,7 +729,7 @@ csihandle(void) {
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Stop blinking cursor (IGNORED) */
                                break;
                        case 25:
-                               term.c.hidden = 1;
+                               term.hidec = 1;
                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:
                                break;
                        case 1048: /* XXX: no alt. screen to erase/save */
                        case 1049:
@@ -692,13 +739,24 @@ csihandle(void) {
                        default:
                                goto unknown;
                        }
                        default:
                                goto unknown;
                        }
-               } else goto unknown;
+               } else {
+                       switch(escseq.arg[0]) {
+                       case 4:
+                               term.mode &= ~MODE_INSERT;
+                               break;
+                       default:
+                               goto unknown;
+                       }
+               }
                break;
        case 'M': /* DL -- Delete <n> lines */
                DEFAULT(escseq.arg[0], 1);
                tdeleteline(escseq.arg[0]);
                break;
                break;
        case 'M': /* DL -- Delete <n> lines */
                DEFAULT(escseq.arg[0], 1);
                tdeleteline(escseq.arg[0]);
                break;
-       case 'X': /* ECH -- Erase <n> char XXX: same? */
+       case 'X': /* ECH -- Erase <n> char */
+               DEFAULT(escseq.arg[0], 1);
+               tclearregion(term.c.x, term.c.y, term.c.x + escseq.arg[0], term.c.y);
+               break;
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(escseq.arg[0], 1);
                tdeletechar(escseq.arg[0]);
        case 'P': /* DCH -- Delete <n> char */
                DEFAULT(escseq.arg[0], 1);
                tdeletechar(escseq.arg[0]);
@@ -720,17 +778,23 @@ csihandle(void) {
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
                        case 12: /* att610 -- Start blinking cursor (IGNORED) */
                                break;
                        case 25:
-                               term.c.hidden = 0;
+                               term.hidec = 0;
                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */
                                tcursor(CURSOR_SAVE);
                                tclearregion(0, 0, term.col-1, term.row-1);
                                break;
                                break;
                        case 1048: 
                        case 1049: /* XXX: no alt. screen to erase/save */
                                tcursor(CURSOR_SAVE);
                                tclearregion(0, 0, term.col-1, term.row-1);
                                break;
-                       default:
-                               goto unknown;
+                       default: goto unknown;
+                       }
+               } else {
+                       switch(escseq.arg[0]) {
+                       case 4:
+                               term.mode |= MODE_INSERT;
+                               break;
+                       default: goto unknown;
                        }
                        }
-               } else goto unknown;
+               };
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(escseq.arg, escseq.narg);
                break;
        case 'm': /* SGR -- Terminal attribute (color) */
                tsetattr(escseq.arg, escseq.narg);
@@ -783,7 +847,6 @@ tputtab(void) {
 
 void
 tputc(char c) {
 
 void
 tputc(char c) {
-       /* dump(c); */
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        escseq.buf[escseq.len++] = c;
        if(term.esc & ESC_START) {
                if(term.esc & ESC_CSI) {
                        escseq.buf[escseq.len++] = c;
@@ -839,10 +902,25 @@ tputc(char c) {
                                tmoveto(term.c.x+1, term.c.y);
                                term.esc = 0;
                                break;
                                tmoveto(term.c.x+1, term.c.y);
                                term.esc = 0;
                                break;
-                       case 'D':
+                       case 'D': /* XXX: CUP (VT100) or IND (VT52) ... */
                                tmoveto(term.c.x-1, term.c.y);
                                term.esc = 0;
                                break;
                                tmoveto(term.c.x-1, term.c.y);
                                term.esc = 0;
                                break;
+                       case 'E': /* NEL -- Next line */
+                               tnewline();
+                               term.esc = 0;
+                               break;
+                       case 'M': /* RI -- Reverse index */
+                               if(term.c.y == term.top)
+                                       tscrolldown(1);
+                               else
+                                       tmoveto(term.c.x, term.c.y-1);
+                               term.esc = 0;
+                               break;
+                       case 'c': /* RIS -- Reset to inital state */
+                               treset();
+                               term.esc = 0;
+                               break;
                        case '=': /* DECPAM */
                                term.mode |= MODE_APPKEYPAD;
                                term.esc = 0;
                        case '=': /* DECPAM */
                                term.mode |= MODE_APPKEYPAD;
                                term.esc = 0;
@@ -851,8 +929,16 @@ tputc(char c) {
                                term.mode &= ~MODE_APPKEYPAD;
                                term.esc = 0;
                                break;
                                term.mode &= ~MODE_APPKEYPAD;
                                term.esc = 0;
                                break;
+                       case '7':
+                               tcursor(CURSOR_SAVE);
+                               term.esc = 0;
+                               break;
+                       case '8':
+                               tcursor(CURSOR_LOAD);
+                               term.esc = 0;
+                               break;
                        default:
                        default:
-                               fprintf(stderr, "erresc: unknown sequence ESC %02X '%c'\n", c, isprint(c)?c:'.');
+                               fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", c, isprint(c)?c:'.');
                                term.esc = 0;
                        }
                }
                                term.esc = 0;
                        }
                }
@@ -936,27 +1022,14 @@ xgetcol(const char *s) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
 
 void
 xclear(int x1, int y1, int x2, int y2) {
-       XClearArea(xw.dis, xw.win, 
-                       x1 * xw.cw, y1 * xw.ch, 
-                       (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch, 
-                       False);
-}
-
-void
-xscroll(void) {
-       int srcy = (term.top+1) * xw.ch;
-       int dsty = term.top * xw.ch;
-       int height = (term.bot-term.top) * xw.ch;
-
-       xcursor(CURSOR_HIDE);
-       XCopyArea(xw.dis, xw.win, xw.win, dc.gc, 0, srcy, xw.w, height, 0, dsty);
-       xclear(0, term.bot, term.col-1, term.bot);
+       XSetForeground(xw.dis, dc.gc, dc.col[DefaultBG]);
+       XFillRectangle(xw.dis, xw.buf, dc.gc,
+                                  x1 * xw.cw, y1 * xw.ch, 
+                                  (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch);
 }
 
 void
 xinit(void) {
 }
 
 void
 xinit(void) {
-       XGCValues values;
-       unsigned long valuemask;
        XClassHint chint;
        XWMHints wmhint;
        XSizeHints shint;
        XClassHint chint;
        XWMHints wmhint;
        XSizeHints shint;
@@ -969,11 +1042,12 @@ xinit(void) {
                die("Can't open display\n");
        
        /* font */
                die("Can't open display\n");
        
        /* font */
-       if(!(dc.font = XLoadQueryFont(xw.dis, FONT)))
-               die("Can't load font %s\n", FONT);
+       if(!(dc.font = XLoadQueryFont(xw.dis, FONT)) || !(dc.bfont = XLoadQueryFont(xw.dis, BOLDFONT)))
+               die("Can't load font %s\n", dc.font ? BOLDFONT : FONT);
 
 
+       /* XXX: Assuming same size for bold font */
        xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
        xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing;
-       xw.ch = dc.font->ascent + dc.font->descent + LINESPACE;
+       xw.ch = dc.font->ascent + dc.font->descent;
 
        /* colors */
        for(i = 0; i < LEN(colorname); i++)
 
        /* colors */
        for(i = 0; i < LEN(colorname); i++)
@@ -985,26 +1059,25 @@ xinit(void) {
        /* windows */
        xw.h = term.row * xw.ch;
        xw.w = term.col * xw.cw;
        /* windows */
        xw.h = term.row * xw.ch;
        xw.w = term.col * xw.cw;
-       /* XXX: this BORDER is useless after the first resize, handle it in xdraws() */
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
        xw.win = XCreateSimpleWindow(xw.dis, XRootWindow(xw.dis, xw.scr), 0, 0,
-                       xw.w, xw.h, BORDER, 
+                       xw.w + 2*BORDER, xw.h + 2*BORDER, 0, 
                        dc.col[DefaultBG],
                        dc.col[DefaultBG]);
                        dc.col[DefaultBG],
                        dc.col[DefaultBG]);
+       xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr));
        /* gc */
        /* gc */
-       values.foreground = XWhitePixel(xw.dis, xw.scr);
-       values.font = dc.font->fid;
-       valuemask = GCForeground | GCFont;
-       dc.gc = XCreateGC(xw.dis, xw.win, valuemask, &values);
+       dc.gc = XCreateGC(xw.dis, xw.win, 0, NULL);
        XMapWindow(xw.dis, xw.win);
        /* wm stuff */
        chint.res_name = TNAME, chint.res_class = TNAME;
        wmhint.input = 1, wmhint.flags = InputHint;
        shint.height_inc = xw.ch, shint.width_inc = xw.cw;
        XMapWindow(xw.dis, xw.win);
        /* wm stuff */
        chint.res_name = TNAME, chint.res_class = TNAME;
        wmhint.input = 1, wmhint.flags = InputHint;
        shint.height_inc = xw.ch, shint.width_inc = xw.cw;
-       shint.height = xw.h, shint.width = xw.w;
+       shint.height = xw.h + 2*BORDER, shint.width = xw.w + 2*BORDER;
        shint.flags = PSize | PResizeInc;
        XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
        XStoreName(xw.dis, xw.win, TNAME);
        shint.flags = PSize | PResizeInc;
        XSetWMProperties(xw.dis, xw.win, NULL, NULL, &args[0], 0, &shint, &wmhint, &chint);
        XStoreName(xw.dis, xw.win, TNAME);
+       XFillRectangle(xw.dis, xw.buf, dc.gc, 0, 0, xw.w, xw.h);
        XSync(xw.dis, 0);
        XSync(xw.dis, 0);
+
 }
 
 void
 }
 
 void
@@ -1024,27 +1097,12 @@ xdraws(char *s, Glyph base, int x, int y, int len) {
        if(base.mode & ATTR_GFX)
                for(i = 0; i < len; i++)
                        s[i] = gfx[s[i]];
        if(base.mode & ATTR_GFX)
                for(i = 0; i < len; i++)
                        s[i] = gfx[s[i]];
-       
-       XDrawImageString(xw.dis, xw.win, dc.gc, winx, winy, s, len);
+
+       XSetFont(xw.dis, dc.gc, base.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);  
+       XDrawImageString(xw.dis, xw.buf, dc.gc, winx, winy, s, len);
        
        if(base.mode & ATTR_UNDERLINE)
        
        if(base.mode & ATTR_UNDERLINE)
-               XDrawLine(xw.dis, xw.win, dc.gc, winx, winy+1, winx+width-1, winy+1);
-}
-
-void
-xdrawc(int x, int y, Glyph g) {
-       XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch };
-       unsigned long xfg, xbg;
-
-       /* reverse video */
-       if(g.mode & ATTR_REVERSE)
-               xfg = dc.col[g.bg], xbg = dc.col[g.fg];
-       else
-               xfg = dc.col[g.fg], xbg = dc.col[g.bg];
-       /* background */
-       XSetBackground(xw.dis, dc.gc, xbg);
-       XSetForeground(xw.dis, dc.gc, xfg);
-       XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+               XDrawLine(xw.dis, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1);
 }
 
 void
 }
 
 void
@@ -1058,18 +1116,49 @@ xcursor(int mode) {
        
        if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                g.c = term.line[term.c.y][term.c.x].c;
        
        if(term.line[term.c.y][term.c.x].state & GLYPH_SET)
                g.c = term.line[term.c.y][term.c.x].c;
+
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET)
        /* remove the old cursor */
        if(term.line[oldy][oldx].state & GLYPH_SET)
-               xdrawc(oldx, oldy, term.line[oldy][oldx]);
-       else 
+               xdraws(&term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1);
+       else
                xclear(oldx, oldy, oldx, oldy);
                xclear(oldx, oldy, oldx, oldy);
+       
        /* draw the new one */
        if(mode == CURSOR_DRAW) {
        /* draw the new one */
        if(mode == CURSOR_DRAW) {
-               xdrawc(term.c.x, term.c.y, g);
+               xdraws(&g.c, g, term.c.x, term.c.y, 1);
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
                oldx = term.c.x, oldy = term.c.y;
        }
 }
 
+
+#ifdef DEBUG
+/* basic drawing routines */
+void
+xdrawc(int x, int y, Glyph g) {
+       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]);
+       XSetFont(xw.dis, dc.gc, g.mode & ATTR_BOLD ? dc.bfont->fid : dc.font->fid);
+       XDrawImageString(xw.dis, xw.buf, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1);
+}
+
+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]);
+
+       if(!term.hidec)
+               xcursor(CURSOR_DRAW);
+       XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
+       XFlush(xw.dis);
+}
+#endif
+
 void
 draw(int redraw_all) {
        int i, x, y, ox;
 void
 draw(int redraw_all) {
        int i, x, y, ox;
@@ -1093,8 +1182,9 @@ draw(int redraw_all) {
                }
                xdraws(buf, base, ox, y, i);
        }
                }
                xdraws(buf, base, ox, y, i);
        }
-       if(!term.c.hidden)
-               xcursor(CURSOR_DRAW);
+       xcursor(term.hidec ? CURSOR_HIDE : CURSOR_DRAW);
+       XCopyArea(xw.dis, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, BORDER, BORDER);
+       XFlush(xw.dis);
 }
 
 void
 }
 
 void
@@ -1143,7 +1233,7 @@ kpress(XEvent *ev) {
                        break;
                case XK_Insert:
                        if(shift)
                        break;
                case XK_Insert:
                        if(shift)
-                               /* XXX: paste X clipboard */;
+                               draw(1), puts("draw!")/* XXX: paste X clipboard */;
                        break;
                default:
                        fprintf(stderr, "errkey: %d\n", (int)ksym);
                        break;
                default:
                        fprintf(stderr, "errkey: %d\n", (int)ksym);
@@ -1162,6 +1252,8 @@ resize(XEvent *e) {
                ttyresize(col, row);
                xw.w = e->xconfigure.width;
                xw.h = e->xconfigure.height;
                ttyresize(col, row);
                xw.w = e->xconfigure.width;
                xw.h = e->xconfigure.height;
+               XFreePixmap(xw.dis, xw.buf);
+               xw.buf = XCreatePixmap(xw.dis, xw.win, xw.w, xw.h, XDefaultDepth(xw.dis, xw.scr));
                draw(SCREEN_REDRAW);
        }
 }
                draw(SCREEN_REDRAW);
        }
 }
@@ -1174,7 +1266,7 @@ run(void) {
 
        running = 1;
        XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
 
        running = 1;
        XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask);
-       XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */
+       XResizeWindow(xw.dis, xw.win, xw.w+2*BORDER, xw.h+2*BORDER); /* fix resize bug in wmii (?) */
 
        while(running) {
                FD_ZERO(&rfd);
 
        while(running) {
                FD_ZERO(&rfd);
@@ -1187,7 +1279,7 @@ run(void) {
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
                }
                if(FD_ISSET(cmdfd, &rfd)) {
                        ttyread();
-                       draw(SCREEN_UPDATE);
+                       draw(SCREEN_UPDATE); 
                }
                while(XPending(xw.dis)) {
                        XNextEvent(xw.dis, &ev);
                }
                while(XPending(xw.dis)) {
                        XNextEvent(xw.dis, &ev);